From: John Garry <john.garry@huawei.com>
To: <jejb@linux.ibm.com>, <martin.petersen@oracle.com>,
<artur.paszkiewicz@intel.com>, <jinpu.wang@cloud.ionos.com>,
<chenxiang66@hisilicon.com>, <damien.lemoal@opensource.wdc.com>,
<hch@lst.de>
Cc: <Ajish.Koshy@microchip.com>, <yanaijie@huawei.com>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-scsi@vger.kernel.org>, <linuxarm@huawei.com>,
<liuqi115@huawei.com>, <Viswas.G@microchip.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH v2 06/18] scsi: libsas: Move SMP task handlers to core
Date: Thu, 17 Feb 2022 23:42:34 +0800 [thread overview]
Message-ID: <1645112566-115804-7-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1645112566-115804-1-git-send-email-john.garry@huawei.com>
Move the SMP task handlers to the core host code as they will be re-used
for executing internal abort and TMF tasks.
Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Yihang Li <liyihang6@hisilicon.com>
---
drivers/scsi/libsas/sas_expander.c | 24 ++----------------------
drivers/scsi/libsas/sas_internal.h | 3 +++
drivers/scsi/libsas/sas_scsi_host.c | 24 ++++++++++++++++++++++++
3 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 6abce9dfc17b..260e735d06fa 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -28,26 +28,6 @@ static int sas_disable_routing(struct domain_device *dev, u8 *sas_addr);
/* ---------- SMP task management ---------- */
-static void smp_task_timedout(struct timer_list *t)
-{
- struct sas_task_slow *slow = from_timer(slow, t, timer);
- struct sas_task *task = slow->task;
- unsigned long flags;
-
- spin_lock_irqsave(&task->task_state_lock, flags);
- if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
- task->task_state_flags |= SAS_TASK_STATE_ABORTED;
- complete(&task->slow_task->completion);
- }
- spin_unlock_irqrestore(&task->task_state_lock, flags);
-}
-
-static void smp_task_done(struct sas_task *task)
-{
- del_timer(&task->slow_task->timer);
- complete(&task->slow_task->completion);
-}
-
/* Give it some long enough timeout. In seconds. */
#define SMP_TIMEOUT 10
@@ -78,9 +58,9 @@ static int smp_execute_task_sg(struct domain_device *dev,
task->smp_task.smp_req = *req;
task->smp_task.smp_resp = *resp;
- task->task_done = smp_task_done;
+ task->task_done = sas_task_internal_done;
- task->slow_task->timer.function = smp_task_timedout;
+ task->slow_task->timer.function = sas_task_internal_timedout;
task->slow_task->timer.expires = jiffies + SMP_TIMEOUT*HZ;
add_timer(&task->slow_task->timer);
diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index acd515c01861..cd6aa723c3e1 100644
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -95,6 +95,9 @@ void sas_destruct_devices(struct asd_sas_port *port);
extern const work_func_t sas_phy_event_fns[PHY_NUM_EVENTS];
extern const work_func_t sas_port_event_fns[PORT_NUM_EVENTS];
+void sas_task_internal_done(struct sas_task *task);
+void sas_task_internal_timedout(struct timer_list *t);
+
#ifdef CONFIG_SCSI_SAS_HOST_SMP
extern void sas_smp_host_handler(struct bsg_job *job, struct Scsi_Host *shost);
#else
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 387083a16a79..40dcb4e8a747 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -893,6 +893,30 @@ int sas_bios_param(struct scsi_device *scsi_dev,
}
EXPORT_SYMBOL_GPL(sas_bios_param);
+void sas_task_internal_done(struct sas_task *task)
+{
+ del_timer(&task->slow_task->timer);
+ complete(&task->slow_task->completion);
+}
+
+void sas_task_internal_timedout(struct timer_list *t)
+{
+ struct sas_task_slow *slow = from_timer(slow, t, timer);
+ struct sas_task *task = slow->task;
+ bool is_completed = true;
+ unsigned long flags;
+
+ spin_lock_irqsave(&task->task_state_lock, flags);
+ if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
+ task->task_state_flags |= SAS_TASK_STATE_ABORTED;
+ is_completed = false;
+ }
+ spin_unlock_irqrestore(&task->task_state_lock, flags);
+
+ if (!is_completed)
+ complete(&task->slow_task->completion);
+}
+
/*
* Tell an upper layer that it needs to initiate an abort for a given task.
* This should only ever be called by an LLDD.
--
2.26.2
next prev parent reply other threads:[~2022-02-17 15:49 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 15:42 [PATCH v2 00/18] scsi: libsas and users: Factor out LLDD TMF code John Garry
2022-02-17 15:42 ` [PATCH v2 01/18] scsi: libsas: Handle non-TMF codes in sas_scsi_find_task() John Garry
2022-02-17 15:42 ` [PATCH v2 02/18] scsi: libsas: Use enum for response frame DATAPRES field John Garry
2022-02-17 15:42 ` [PATCH v2 03/18] scsi: libsas: Delete lldd_clear_aca callback John Garry
2022-02-17 15:42 ` [PATCH v2 04/18] scsi: libsas: Delete SAS_SG_ERR John Garry
2022-02-17 15:42 ` [PATCH v2 05/18] scsi: hisi_sas: Delete unused I_T_NEXUS_RESET_PHYUP_TIMEOUT John Garry
2022-02-17 15:42 ` John Garry [this message]
2022-02-17 15:42 ` [PATCH v2 07/18] scsi: libsas: Add struct sas_tmf_task John Garry
2022-02-17 15:42 ` [PATCH v2 08/18] scsi: libsas: Add sas_task.tmf John Garry
2022-02-17 15:42 ` [PATCH v2 09/18] scsi: libsas: Add sas_execute_tmf() John Garry
2022-02-17 15:42 ` [PATCH v2 10/18] scsi: libsas: Add sas_execute_ssp_tmf() John Garry
2022-02-17 15:42 ` [PATCH v2 11/18] scsi: libsas: Add TMF handler exec complete callback John Garry
2022-02-17 15:42 ` [PATCH v2 12/18] scsi: libsas: Add TMF handler aborted callback John Garry
2022-02-17 15:42 ` [PATCH v2 13/18] scsi: libsas: Add sas_abort_task_set() John Garry
2022-02-17 15:42 ` [PATCH v2 14/18] scsi: libsas: Add sas_clear_task_set() John Garry
2022-02-17 15:42 ` [PATCH v2 15/18] scsi: libsas: Add sas_lu_reset() John Garry
2022-02-17 15:42 ` [PATCH v2 16/18] scsi: libsas: Add sas_query_task() John Garry
2022-02-17 15:42 ` [PATCH v2 17/18] scsi: libsas: Add sas_abort_task() John Garry
2022-02-17 15:42 ` [PATCH v2 18/18] scsi: libsas: Add sas_execute_ata_cmd() John Garry
2022-02-18 4:18 ` [PATCH v2 00/18] scsi: libsas and users: Factor out LLDD TMF code Damien Le Moal
2022-02-18 4:28 ` Martin K. Petersen
2022-02-19 21:53 ` Martin K. Petersen
2022-02-19 23:05 ` Damien Le Moal
2022-02-21 8:36 ` John Garry
2022-02-19 21:55 ` Martin K. Petersen
2022-02-20 0:38 ` Damien Le Moal
2022-02-20 1:31 ` Martin K. Petersen
2022-02-20 1:37 ` Damien Le Moal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1645112566-115804-7-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=Ajish.Koshy@microchip.com \
--cc=Viswas.G@microchip.com \
--cc=artur.paszkiewicz@intel.com \
--cc=chenxiang66@hisilicon.com \
--cc=damien.lemoal@opensource.wdc.com \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=liuqi115@huawei.com \
--cc=martin.petersen@oracle.com \
--cc=yanaijie@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).