scsi: libsas: Add sas_task.tmf

Add a pointer to a sas_tmf_task to the sas_task struct, as this will be
used when the common LLDD TMF code is factored out.

Also set it for the LLDDs to store per-sas_task TMF info.

Link: https://lore.kernel.org/r/1645112566-115804-9-git-send-email-john.garry@huawei.com
Tested-by: Yihang Li <liyihang6@hisilicon.com>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 88e641143b820c94018619515bc5bdb83dcec775..bd40323f70538af9a15ae62a361433cceaf951e0 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -463,8 +463,7 @@ void hisi_sas_task_deliver(struct hisi_hba *hisi_hba,
        spin_unlock(&dq->lock);
 }
 
-static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags,
-                             struct sas_tmf_task *tmf)
+static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags)
 {
        int n_elem = 0, n_elem_dif = 0, n_elem_req = 0;
        struct domain_device *device = task->dev;
@@ -575,8 +574,8 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags,
        slot->task = task;
        slot->port = port;
 
-       slot->tmf = tmf;
-       slot->is_internal = tmf;
+       slot->tmf = task->tmf;
+       slot->is_internal = task->tmf;
 
        /* protect task_prep and start_delivery sequence */
        hisi_sas_task_deliver(hisi_hba, slot, dq, sas_dev, NULL);
@@ -1106,11 +1105,6 @@ static void hisi_sas_dev_gone(struct domain_device *device)
        up(&hisi_hba->sem);
 }
 
-static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags)
-{
-       return hisi_sas_task_exec(task, gfp_flags, NULL);
-}
-
 static int hisi_sas_phy_set_linkrate(struct hisi_hba *hisi_hba, int phy_no,
                        struct sas_phy_linkrates *r)
 {
@@ -1264,7 +1258,9 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,
                task->slow_task->timer.expires = jiffies + TASK_TIMEOUT;
                add_timer(&task->slow_task->timer);
 
-               res = hisi_sas_task_exec(task, GFP_KERNEL, tmf);
+               task->tmf = tmf;
+
+               res = hisi_sas_queue_command(task, GFP_KERNEL);
                if (res) {
                        del_timer_sync(&task->slow_task->timer);
                        dev_err(dev, "abort tmf: executing internal task failed: %d\n",

diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index 53509996db9fef5f48431c6f98e1f794c963e8e9..47fcd8de9ecef4e962d78fbc0be4a452bb0567af 100644 (file)
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -837,14 +837,14 @@ prep_out:
        return rc;
 }
 
-static int mvs_task_exec(struct sas_task *task, gfp_t gfp_flags,
-                               struct completion *completion, int is_tmf,
-                               struct sas_tmf_task *tmf)
+int mvs_queue_command(struct sas_task *task, gfp_t gfp_flags)
 {
        struct mvs_info *mvi = NULL;
        u32 rc = 0;
        u32 pass = 0;
        unsigned long flags = 0;
+       struct sas_tmf_task *tmf = task->tmf;
+       int is_tmf = !!task->tmf;
 
        mvi = ((struct mvs_device *)task->dev->lldd_dev)->mvi_info;
 
@@ -861,11 +861,6 @@ static int mvs_task_exec(struct sas_task *task, gfp_t gfp_flags,
        return rc;
 }
 
-int mvs_queue_command(struct sas_task *task, gfp_t gfp_flags)
-{
-       return mvs_task_exec(task, gfp_flags, NULL, 0, NULL);
-}
-
 static void mvs_slot_free(struct mvs_info *mvi, u32 rx_desc)
 {
        u32 slot_idx = rx_desc & RXQ_SLOT_MASK;
@@ -1297,7 +1292,9 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev,
                task->slow_task->timer.expires = jiffies + MVS_TASK_TIMEOUT*HZ;
                add_timer(&task->slow_task->timer);
 
-               res = mvs_task_exec(task, GFP_KERNEL, NULL, 1, tmf);
+               task->tmf = tmf;
+
+               res = mvs_queue_command(task, GFP_KERNEL);
 
                if (res) {
                        del_timer(&task->slow_task->timer);

diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index a93b7f0bb3587933bed8159fee9c35eae26b4238..a53e4b54154fc225c0ade809b5b0baa4e04e04e3 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -371,15 +371,14 @@ static int sas_find_local_port_id(struct domain_device *dev)
 
 #define DEV_IS_GONE(pm8001_dev)        \
        ((!pm8001_dev || (pm8001_dev->dev_type == SAS_PHY_UNUSED)))
+
 /**
-  * pm8001_task_exec - queue the task(ssp, smp && ata) to the hardware.
+  * pm8001_queue_command - register for upper layer used, all IO commands sent
+  * to HBA are from this interface.
   * @task: the task to be execute.
-  * @gfp_flags: gfp_flags.
-  * @is_tmf: if it is task management task.
-  * @tmf: the task management IU
+  * @gfp_flags: gfp_flags
   */
-static int pm8001_task_exec(struct sas_task *task,
-       gfp_t gfp_flags, int is_tmf, struct sas_tmf_task *tmf)
+int pm8001_queue_command(struct sas_task *task, gfp_t gfp_flags)
 {
        struct domain_device *dev = task->dev;
        struct pm8001_hba_info *pm8001_ha;
@@ -390,6 +389,8 @@ static int pm8001_task_exec(struct sas_task *task,
        u32 tag = 0xdeadbeef, rc = 0, n_elem = 0;
        unsigned long flags = 0;
        enum sas_protocol task_proto = t->task_proto;
+       struct sas_tmf_task *tmf = task->tmf;
+       int is_tmf = !!task->tmf;
 
        if (!dev->port) {
                struct task_status_struct *tsm = &t->task_status;
@@ -504,17 +505,6 @@ out_done:
        return rc;
 }
 
-/**
-  * pm8001_queue_command - register for upper layer used, all IO commands sent
-  * to HBA are from this interface.
-  * @task: the task to be execute.
-  * @gfp_flags: gfp_flags
-  */
-int pm8001_queue_command(struct sas_task *task, gfp_t gfp_flags)
-{
-       return pm8001_task_exec(task, gfp_flags, 0, NULL);
-}
-
 /**
   * pm8001_ccb_task_free - free the sg for ssp and smp command, free the ccb.
   * @pm8001_ha: our hba card information
@@ -749,7 +739,9 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev,
                task->slow_task->timer.expires = jiffies + PM8001_TASK_TIMEOUT*HZ;
                add_timer(&task->slow_task->timer);
 
-               res = pm8001_task_exec(task, GFP_KERNEL, 1, tmf);
+               task->tmf = tmf;
+
+               res = pm8001_queue_command(task, GFP_KERNEL);
 
                if (res) {
                        del_timer(&task->slow_task->timer);

diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 7a55853fad7b2ee06cc373b09c8d0e7f8e4661b0..9c181ebccfeefff8f4913d099731a2b89563095b 100644 (file)
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -610,6 +610,7 @@ struct sas_task {
        void   *lldd_task;        /* for use by LLDDs */
        void   *uldd_task;
        struct sas_task_slow *slow_task;
+       struct sas_tmf_task *tmf;
 };
 
 struct sas_task_slow {