From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
To: John Garry <john.garry@huawei.com>,
axboe@kernel.dk, jejb@linux.ibm.com, martin.petersen@oracle.com,
jinpu.wang@cloud.ionos.com, hare@suse.de, bvanassche@acm.org,
hch@lst.de, ming.lei@redhat.com, niklas.cassel@wdc.com
Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org,
linuxarm@huawei.com
Subject: Re: [PATCH RFC v3 18/22] scsi: libsas: Queue SMP commands as requests
Date: Thu, 27 Oct 2022 10:36:48 +0900 [thread overview]
Message-ID: <9376e947-ba53-2fb9-a0af-8435d58347c1@opensource.wdc.com> (raw)
In-Reply-To: <1666693096-180008-19-git-send-email-john.garry@huawei.com>
On 10/25/22 19:18, John Garry wrote:
> Send SMP commands through the block layer so that each command gets a
> unique tag associated.
>
> Function sas_task_complete_internal() is what the LLDD calls to signal
> that the CQ is complete and this calls into the SCSI midlayer. And then
> sas_blk_end_sync_rq() is called when the request completes.
>
> Signed-off-by: John Garry <john.garry@huawei.com>
> ---
> drivers/scsi/libsas/sas_expander.c | 23 ++++++++---------------
> drivers/scsi/libsas/sas_init.c | 3 +++
> drivers/scsi/libsas/sas_internal.h | 3 +++
> drivers/scsi/libsas/sas_scsi_host.c | 16 ++++++++++++++++
> 4 files changed, 30 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
> index e7cb95683522..cc41127ea5cc 100644
> --- a/drivers/scsi/libsas/sas_expander.c
> +++ b/drivers/scsi/libsas/sas_expander.c
> @@ -43,34 +43,27 @@ static int smp_execute_task_sg(struct domain_device *dev,
> pm_runtime_get_sync(ha->dev);
> mutex_lock(&dev->ex_dev.cmd_mutex);
> for (retry = 0; retry < 3; retry++) {
> + struct request *rq;
> +
> if (test_bit(SAS_DEV_GONE, &dev->state)) {
> res = -ECOMM;
> break;
> }
>
> - task = sas_alloc_slow_task(GFP_KERNEL);
> + task = sas_alloc_slow_task_rq(dev, GFP_KERNEL);
> if (!task) {
> res = -ENOMEM;
> break;
> }
> - task->dev = dev;
> +
> + rq = scsi_cmd_to_rq(task->uldd_task);
> + rq->timeout = SMP_TIMEOUT*HZ;
Missing spaces around "*"
> +
> task->task_proto = dev->tproto;
> task->smp_task.smp_req = *req;
> task->smp_task.smp_resp = *resp;
>
> - task->task_done = sas_task_internal_done;
> -
> - task->slow_task->timer.function = sas_task_internal_timedout;
> - task->slow_task->timer.expires = jiffies + SMP_TIMEOUT*HZ;
> - add_timer(&task->slow_task->timer);
> -
> - res = i->dft->lldd_execute_task(task, GFP_KERNEL);
> -
> - if (res) {
> - del_timer_sync(&task->slow_task->timer);
> - pr_notice("executing SMP task failed:%d\n", res);
> - break;
> - }
> + blk_execute_rq_nowait(rq, true);
>
> wait_for_completion(&task->slow_task->completion);
> res = -ECOMM;
> diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
> index 90e63ff5e966..5f9e71a54799 100644
> --- a/drivers/scsi/libsas/sas_init.c
> +++ b/drivers/scsi/libsas/sas_init.c
> @@ -84,6 +84,7 @@ struct sas_task *sas_alloc_slow_task_rq(struct domain_device *device, gfp_t flag
> return NULL;
>
> task->dev = device;
> + task->task_done = sas_task_complete_internal;
>
> rq = scsi_alloc_request(sdev->request_queue, REQ_OP_DRV_IN,
> BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT);
> @@ -95,6 +96,8 @@ struct sas_task *sas_alloc_slow_task_rq(struct domain_device *device, gfp_t flag
> scmd = blk_mq_rq_to_pdu(rq);
>
> task->uldd_task = scmd;
> +
> + rq->end_io = sas_blk_end_sync_rq;
> rq->end_io_data = task;
>
> return task;
> diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
> index f5ae4de382f7..9b58948c57c2 100644
> --- a/drivers/scsi/libsas/sas_internal.h
> +++ b/drivers/scsi/libsas/sas_internal.h
> @@ -104,6 +104,9 @@ int sas_execute_tmf(struct domain_device *device, void *parameter,
> int para_len, int force_phy_id,
> struct sas_tmf_task *tmf);
>
> +void sas_task_complete_internal(struct sas_task *task);
> +enum rq_end_io_ret sas_blk_end_sync_rq(struct request *rq, blk_status_t error);
> +
> #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 b7d1994a8f1b..2c734a87bb7c 100644
> --- a/drivers/scsi/libsas/sas_scsi_host.c
> +++ b/drivers/scsi/libsas/sas_scsi_host.c
> @@ -913,6 +913,13 @@ void sas_task_internal_done(struct sas_task *task)
> complete(&task->slow_task->completion);
> }
>
> +void sas_task_complete_internal(struct sas_task *task)
> +{
> + struct scsi_cmnd *scmd = task->uldd_task;
> +
> + scsi_done(scmd);
> +}
> +
> void sas_task_internal_timedout(struct timer_list *t)
> {
> struct sas_task_slow *slow = from_timer(slow, t, timer);
> @@ -952,6 +959,15 @@ EXPORT_SYMBOL_GPL(sas_internal_timeout);
> #define TASK_TIMEOUT (20 * HZ)
> #define TASK_RETRY 3
>
> +enum rq_end_io_ret sas_blk_end_sync_rq(struct request *rq, blk_status_t error)
> +{
> + struct scsi_cmnd *scmd = blk_mq_rq_to_pdu(rq);
> + struct sas_task *task = TO_SAS_TASK(scmd);
> + complete(&task->slow_task->completion);
> +
> + return RQ_END_IO_NONE;
> +}
> +
> static int sas_execute_internal_abort(struct domain_device *device,
> enum sas_internal_abort type, u16 tag,
> unsigned int qid, void *data)
--
Damien Le Moal
Western Digital Research
next prev parent reply other threads:[~2022-10-27 1:37 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-25 10:17 [PATCH RFC v3 00/22] blk-mq/libata/scsi: SCSI driver tagging improvements Part I John Garry
2022-10-25 10:11 ` John Garry
2022-10-25 10:17 ` [PATCH RFC v3 01/22] blk-mq: Don't get budget for reserved requests John Garry
2022-10-27 1:16 ` Damien Le Moal
2022-10-27 9:09 ` John Garry
2022-10-25 10:17 ` [PATCH RFC v3 02/22] scsi: core: Add scsi_get_dev() John Garry
2022-10-25 10:17 ` [PATCH RFC v3 03/22] scsi: core: Implement reserved command handling John Garry
2022-10-27 1:18 ` Damien Le Moal
2022-10-27 7:51 ` Hannes Reinecke
2022-10-27 8:16 ` John Garry
2022-10-27 9:11 ` John Garry
2022-10-25 10:17 ` [PATCH RFC v3 04/22] scsi: core: Add support to send reserved commands John Garry
2022-10-27 1:21 ` Damien Le Moal
2022-10-27 9:13 ` John Garry
2022-10-27 9:18 ` Damien Le Moal
2022-10-25 10:17 ` [PATCH RFC v3 05/22] scsi: core: Add support for reserved command timeout handling John Garry
2022-10-25 10:18 ` [PATCH RFC v3 06/22] scsi: libsas: Improve sas_ex_discover_expander() error handling John Garry
2022-10-25 10:18 ` [PATCH RFC v3 07/22] scsi: libsas: Notify LLDD expander found before calling sas_rphy_add() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 08/22] scsi: scsi_transport_sas: Alloc sdev for expander John Garry
2022-10-25 10:18 ` [PATCH RFC v3 09/22] scsi: libsas: Add sas_alloc_slow_task_rq() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 10/22] scsi: libsas: Add sas_queuecommand_internal() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 11/22] scsi: libsas: Add sas_internal_timeout() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 12/22] scsi: core: Use SCSI_SCAN_RESCAN in __scsi_add_device() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 13/22] scsi: scsi_transport_sas: Allocate end device target id in the rphy alloc John Garry
2022-10-25 10:18 ` [PATCH RFC v3 14/22] ata: libata-scsi: Add ata_scsi_setup_sdev() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 15/22] scsi: libsas: Add sas_ata_setup_device() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 16/22] ata: libata-scsi: Allocate sdev early in port probe John Garry
2022-10-27 1:34 ` Damien Le Moal
2022-10-27 8:11 ` Hannes Reinecke
2022-10-27 9:16 ` Damien Le Moal
2022-10-27 9:51 ` Hannes Reinecke
2022-11-07 10:09 ` John Garry
2022-11-07 10:20 ` Hannes Reinecke
2022-10-25 10:18 ` [PATCH RFC v3 17/22] scsi: libsas drivers: Reserve tags John Garry
2022-10-25 10:18 ` [PATCH RFC v3 18/22] scsi: libsas: Queue SMP commands as requests John Garry
2022-10-27 1:36 ` Damien Le Moal [this message]
2022-10-27 10:45 ` John Garry
2022-10-25 10:18 ` [PATCH RFC v3 19/22] scsi: libsas: Queue TMF " John Garry
2022-10-25 10:18 ` [PATCH RFC v3 20/22] scsi: core: Add scsi_alloc_request_hwq() John Garry
2022-10-25 10:18 ` [PATCH RFC v3 21/22] scsi: libsas: Queue internal abort commands as requests John Garry
2022-10-29 1:15 ` chenxiang (M)
2022-11-02 10:04 ` John Garry
2022-11-03 3:09 ` chenxiang (M)
2022-10-25 10:18 ` [PATCH RFC v3 22/22] scsi: libsas: Delete sas_task_slow.timer John Garry
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=9376e947-ba53-2fb9-a0af-8435d58347c1@opensource.wdc.com \
--to=damien.lemoal@opensource.wdc.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=john.garry@huawei.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=niklas.cassel@wdc.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).