From: John Garry <john.garry@huawei.com> To: <axboe@kernel.dk>, <damien.lemoal@opensource.wdc.com>, <bvanassche@acm.org>, <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <hch@lst.de>, <ming.lei@redhat.com>, <hare@suse.de> Cc: <chenxiang66@hisilicon.com>, <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-ide@vger.kernel.org>, <linux-scsi@vger.kernel.org>, <dm-devel@redhat.com>, <beanhuo@micron.com>, John Garry <john.garry@huawei.com> Subject: [PATCH 07/11] scsi: libsas: Send internal abort commands through the block layer Date: Tue, 22 Mar 2022 18:39:41 +0800 [thread overview] Message-ID: <1647945585-197349-8-git-send-email-john.garry@huawei.com> (raw) In-Reply-To: <1647945585-197349-1-git-send-email-john.garry@huawei.com> Like what we did for SMP commands, send internal abort commands through the block layer. At this point no code in libsas relies on the sas_slow_task.timer; unfortunately we can't delete it as some LLDDs (pm8001) still rely on it - let's try to remove them in future. But we can delete the legacy timeout handler, sas_task_internal_timedout(). Signed-off-by: John Garry <john.garry@huawei.com> --- drivers/scsi/libsas/sas_scsi_host.c | 59 +++++++++++++++-------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 04c6298d1340..f139977098c2 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -899,24 +899,6 @@ void sas_task_internal_done(struct sas_task *task) 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); -} - #define TASK_TIMEOUT (20 * HZ) #define TASK_RETRY 3 @@ -979,35 +961,52 @@ static int sas_execute_internal_abort(struct domain_device *device, { struct sas_ha_struct *ha = device->port->ha; struct sas_internal *i = to_sas_internal(ha->core.shost->transportt); + struct Scsi_Host *shost = ha->core.shost; struct sas_task *task = NULL; int res, retry; + struct request_queue *request_queue; + struct request *rq; + + request_queue = sas_alloc_request_queue(shost); + if (IS_ERR(request_queue)) + return PTR_ERR(request_queue); for (retry = 0; retry < TASK_RETRY; retry++) { + struct scsi_cmnd *scmd; + task = sas_alloc_slow_task(GFP_KERNEL); - if (!task) - return -ENOMEM; + if (!task) { + res = -ENOMEM; + break; + } task->dev = device; task->task_proto = SAS_PROTOCOL_INTERNAL_ABORT; task->task_done = sas_task_internal_done; - task->slow_task->timer.function = sas_task_internal_timedout; - task->slow_task->timer.expires = jiffies + TASK_TIMEOUT; - add_timer(&task->slow_task->timer); task->abort_task.tag = tag; task->abort_task.type = type; task->abort_task.qid = qid; - res = i->dft->lldd_execute_task(task, GFP_KERNEL); - if (res) { - del_timer_sync(&task->slow_task->timer); - pr_err("Executing internal abort failed %016llx (%d)\n", - SAS_ADDR(device->sas_addr), res); + rq = scsi_alloc_request_hwq(request_queue, REQ_OP_DRV_IN, BLK_MQ_REQ_NOWAIT, qid); + if (!rq) { + res = PTR_ERR(rq); break; } + scmd = blk_mq_rq_to_pdu(rq); + scmd->submitter = SUBMITTED_BY_SCSI_CUSTOM_OPS; + ASSIGN_SAS_TASK(scmd, task); + + task->uldd_task = scmd; + + rq->timeout = TASK_TIMEOUT; + + blk_execute_rq_nowait(rq, true, NULL); + wait_for_completion(&task->slow_task->completion); res = TMF_RESP_FUNC_FAILED; + __blk_mq_end_request(rq, BLK_STS_OK); /* Even if the internal abort timed out, return direct. */ if (task->task_state_flags & SAS_TASK_STATE_ABORTED) { @@ -1042,7 +1041,11 @@ static int sas_execute_internal_abort(struct domain_device *device, task = NULL; } BUG_ON(retry == TASK_RETRY && task != NULL); + sas_free_task(task); + + blk_cleanup_queue(request_queue); + return res; } -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: John Garry <john.garry@huawei.com> To: <axboe@kernel.dk>, <damien.lemoal@opensource.wdc.com>, <bvanassche@acm.org>, <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <hch@lst.de>, <ming.lei@redhat.com>, <hare@suse.de> Cc: linux-scsi@vger.kernel.org, chenxiang66@hisilicon.com, John Garry <john.garry@huawei.com>, linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-ide@vger.kernel.org, dm-devel@redhat.com, beanhuo@micron.com Subject: [dm-devel] [PATCH 07/11] scsi: libsas: Send internal abort commands through the block layer Date: Tue, 22 Mar 2022 18:39:41 +0800 [thread overview] Message-ID: <1647945585-197349-8-git-send-email-john.garry@huawei.com> (raw) In-Reply-To: <1647945585-197349-1-git-send-email-john.garry@huawei.com> Like what we did for SMP commands, send internal abort commands through the block layer. At this point no code in libsas relies on the sas_slow_task.timer; unfortunately we can't delete it as some LLDDs (pm8001) still rely on it - let's try to remove them in future. But we can delete the legacy timeout handler, sas_task_internal_timedout(). Signed-off-by: John Garry <john.garry@huawei.com> --- drivers/scsi/libsas/sas_scsi_host.c | 59 +++++++++++++++-------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 04c6298d1340..f139977098c2 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c @@ -899,24 +899,6 @@ void sas_task_internal_done(struct sas_task *task) 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); -} - #define TASK_TIMEOUT (20 * HZ) #define TASK_RETRY 3 @@ -979,35 +961,52 @@ static int sas_execute_internal_abort(struct domain_device *device, { struct sas_ha_struct *ha = device->port->ha; struct sas_internal *i = to_sas_internal(ha->core.shost->transportt); + struct Scsi_Host *shost = ha->core.shost; struct sas_task *task = NULL; int res, retry; + struct request_queue *request_queue; + struct request *rq; + + request_queue = sas_alloc_request_queue(shost); + if (IS_ERR(request_queue)) + return PTR_ERR(request_queue); for (retry = 0; retry < TASK_RETRY; retry++) { + struct scsi_cmnd *scmd; + task = sas_alloc_slow_task(GFP_KERNEL); - if (!task) - return -ENOMEM; + if (!task) { + res = -ENOMEM; + break; + } task->dev = device; task->task_proto = SAS_PROTOCOL_INTERNAL_ABORT; task->task_done = sas_task_internal_done; - task->slow_task->timer.function = sas_task_internal_timedout; - task->slow_task->timer.expires = jiffies + TASK_TIMEOUT; - add_timer(&task->slow_task->timer); task->abort_task.tag = tag; task->abort_task.type = type; task->abort_task.qid = qid; - res = i->dft->lldd_execute_task(task, GFP_KERNEL); - if (res) { - del_timer_sync(&task->slow_task->timer); - pr_err("Executing internal abort failed %016llx (%d)\n", - SAS_ADDR(device->sas_addr), res); + rq = scsi_alloc_request_hwq(request_queue, REQ_OP_DRV_IN, BLK_MQ_REQ_NOWAIT, qid); + if (!rq) { + res = PTR_ERR(rq); break; } + scmd = blk_mq_rq_to_pdu(rq); + scmd->submitter = SUBMITTED_BY_SCSI_CUSTOM_OPS; + ASSIGN_SAS_TASK(scmd, task); + + task->uldd_task = scmd; + + rq->timeout = TASK_TIMEOUT; + + blk_execute_rq_nowait(rq, true, NULL); + wait_for_completion(&task->slow_task->completion); res = TMF_RESP_FUNC_FAILED; + __blk_mq_end_request(rq, BLK_STS_OK); /* Even if the internal abort timed out, return direct. */ if (task->task_state_flags & SAS_TASK_STATE_ABORTED) { @@ -1042,7 +1041,11 @@ static int sas_execute_internal_abort(struct domain_device *device, task = NULL; } BUG_ON(retry == TASK_RETRY && task != NULL); + sas_free_task(task); + + blk_cleanup_queue(request_queue); + return res; } -- 2.26.2 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2022-03-22 10:47 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-22 10:39 [PATCH RFC 00/11] blk-mq/libata/scsi: SCSI driver tagging improvements John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 01/11] blk-mq: Add blk_mq_init_queue_ops() John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 11:18 ` Christoph Hellwig 2022-03-22 11:18 ` [dm-devel] " Christoph Hellwig 2022-03-22 11:33 ` John Garry 2022-03-22 11:33 ` [dm-devel] " John Garry 2022-03-22 12:16 ` Hannes Reinecke 2022-03-22 12:16 ` [dm-devel] " Hannes Reinecke 2022-03-22 12:30 ` John Garry 2022-03-22 12:30 ` [dm-devel] " John Garry 2022-03-22 14:03 ` Hannes Reinecke 2022-03-22 14:03 ` [dm-devel] " Hannes Reinecke 2022-03-22 15:17 ` John Garry 2022-03-22 15:17 ` [dm-devel] " John Garry 2022-03-22 15:31 ` Hannes Reinecke 2022-03-22 15:31 ` [dm-devel] " Hannes Reinecke 2022-03-23 2:57 ` Bart Van Assche 2022-03-23 2:57 ` [dm-devel] " Bart Van Assche 2022-03-23 9:01 ` John Garry 2022-03-23 9:01 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 02/11] scsi: core: Add SUBMITTED_BY_SCSI_CUSTOM_OPS John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 11:20 ` Christoph Hellwig 2022-03-22 11:20 ` [dm-devel] " Christoph Hellwig 2022-03-22 10:39 ` [PATCH 03/11] libata: Send internal commands through the block layer John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 11:20 ` Christoph Hellwig 2022-03-22 11:20 ` [dm-devel] " Christoph Hellwig 2022-03-22 11:36 ` John Garry 2022-03-22 11:36 ` [dm-devel] " John Garry 2022-04-07 14:32 ` John Garry 2022-04-07 14:32 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 04/11] scsi: libsas: Send SMP " John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 11:23 ` Christoph Hellwig 2022-03-22 11:23 ` [dm-devel] " Christoph Hellwig 2022-03-22 14:37 ` John Garry 2022-03-22 14:37 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 05/11] scsi: libsas: Send TMF " John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 06/11] scsi: core: Add scsi_alloc_request_hwq() John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 10:39 ` John Garry [this message] 2022-03-22 10:39 ` [dm-devel] [PATCH 07/11] scsi: libsas: Send internal abort commands through the block layer John Garry 2022-03-22 10:39 ` [PATCH 08/11] scsi: libsas: Change ATA support to deal with each qc having a SCSI command John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 09/11] scsi: libsas: Add sas_task_to_unique_tag() John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 10/11] scsi: libsas: Add sas_task_to_hwq() John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 10:39 ` [PATCH 11/11] scsi: hisi_sas: Remove private tag management John Garry 2022-03-22 10:39 ` [dm-devel] " John Garry 2022-03-22 11:30 ` [PATCH RFC 00/11] blk-mq/libata/scsi: SCSI driver tagging improvements Hannes Reinecke 2022-03-22 11:30 ` [dm-devel] " Hannes Reinecke 2022-03-22 12:17 ` John Garry 2022-03-22 12:17 ` [dm-devel] " 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=1647945585-197349-8-git-send-email-john.garry@huawei.com \ --to=john.garry@huawei.com \ --cc=axboe@kernel.dk \ --cc=beanhuo@micron.com \ --cc=bvanassche@acm.org \ --cc=chenxiang66@hisilicon.com \ --cc=damien.lemoal@opensource.wdc.com \ --cc=dm-devel@redhat.com \ --cc=hare@suse.de \ --cc=hch@lst.de \ --cc=jejb@linux.ibm.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=martin.petersen@oracle.com \ --cc=ming.lei@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.