[RFC,v2,23/24] scsi: libsas: aic94xx: hisi_sas: mvsas: pm8001: Allocate Scsi_cmd for slow task

Message ID	1583857550-12049-24-git-send-email-john.garry@huawei.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=5EYj=43=vger.kernel.org=linux-block-owner@kernel.org> From: John Garry <john.garry@huawei.com> To: <axboe@kernel.dk>, <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <hare@suse.de>, <ming.lei@redhat.com>, <bvanassche@acm.org>, <hch@infradead.org> CC: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-scsi@vger.kernel.org>, <virtualization@lists.linux-foundation.org>, <esc.storagedev@microsemi.com>, <chenxiang66@hisilicon.com>, John Garry <john.garry@huawei.com> Subject: [PATCH RFC v2 23/24] scsi: libsas: aic94xx: hisi_sas: mvsas: pm8001: Allocate Scsi_cmd for slow task Date: Wed, 11 Mar 2020 00:25:49 +0800 Message-ID: <1583857550-12049-24-git-send-email-john.garry@huawei.com> In-Reply-To: <1583857550-12049-1-git-send-email-john.garry@huawei.com> References: <1583857550-12049-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-block-owner@vger.kernel.org Precedence: bulk
Series	scsi: enable reserved commands for LLDDs \| expand [RFC,v2,00/24] scsi: enable reserved commands for LLDDs [RFC,v2,01/24] scsi: add 'nr_reserved_cmds' field to the SCSI host template [RFC,v2,02/24] scsi: allocate separate queue for reserved commands [RFC,v2,03/24] blk-mq: Implement blk_mq_rq_is_reserved() [RFC,v2,04/24] scsi: Add scsi_{get, put}_reserved_cmd() [RFC,v2,05/24] csiostor: use reserved command for LUN reset [RFC,v2,06/24] scsi: add scsi_cmd_from_priv() [RFC,v2,07/24] virtio_scsi: use reserved commands for TMF [RFC,v2,08/24] scsi: add host tagset busy iterator [RFC,v2,09/24] fnic: use reserved commands [RFC,v2,10/24] fnic: use scsi_host_tagset_busy_iter() to traverse commands [RFC,v2,11/24] hpsa: move hpsa_hba_inquiry after scsi_add_host() [RFC,v2,12/24] hpsa: use reserved commands [RFC,v2,13/24] hpsa: use blk_mq_tagset_busy_iter() to traverse outstanding commands [RFC,v2,14/24] hpsa: drop refcount field from CommandList [RFC,v2,15/24] snic: use reserved commands [RFC,v2,16/24] snic: use tagset iter for traversing commands [RFC,v2,17/24] aacraid: move scsi_add_host() [RFC,v2,18/24] aacraid: use private commands [RFC,v2,19/24] aacraid: replace cmd_list with scsi_host_tagset_busy_iter() [RFC,v2,20/24] aacraid: use scsi_host_tagset_busy_iter() to traverse outstanding commands [RFC,v2,21/24] dpt_i2o: drop cmd_list usage [RFC,v2,22/24] scsi: drop scsi command list [RFC,v2,23/24] scsi: libsas: aic94xx: hisi_sas: mvsas: pm8001: Allocate Scsi_cmd for slow task [RFC,v2,24/24] scsi: hisi_sas: Use libsas slow task SCSI command

diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 9a6deb21fe4d..c7951ac8b075 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -1182,12 +1182,13 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device, { struct hisi_sas_device *sas_dev = device->lldd_dev; struct hisi_hba *hisi_hba = sas_dev->hisi_hba; + struct sas_ha_struct *sha = &hisi_hba->sha; struct device *dev = hisi_hba->dev; struct sas_task *task; int res, retry; for (retry = 0; retry < TASK_RETRY; retry++) { - task = sas_alloc_slow_task(GFP_KERNEL); + task = sas_alloc_slow_task(GFP_KERNEL, sha); if (!task) return -ENOMEM; @@ -2022,9 +2023,10 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, struct domain_device *device, int abort_flag, int tag, struct hisi_sas_dq *dq) { - struct sas_task *task; struct hisi_sas_device *sas_dev = device->lldd_dev; + struct sas_ha_struct *sha = &hisi_hba->sha; struct device *dev = hisi_hba->dev; + struct sas_task *task; int res; /* @@ -2036,7 +2038,7 @@ _hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba, if (!hisi_hba->hw->prep_abort) return TMF_RESP_FUNC_FAILED; - task = sas_alloc_slow_task(GFP_KERNEL); + task = sas_alloc_slow_task(GFP_KERNEL, sha); if (!task) return -ENOMEM; diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index ab671cdd4cfb..24626acc6a11 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c @@ -56,6 +56,7 @@ static int smp_execute_task_sg(struct domain_device *dev, { int res, retry; struct sas_task *task = NULL; + struct sas_ha_struct *sha = dev->port->ha; struct sas_internal *i = to_sas_internal(dev->port->ha->core.shost->transportt); @@ -66,7 +67,7 @@ static int smp_execute_task_sg(struct domain_device *dev, break; } - task = sas_alloc_slow_task(GFP_KERNEL); + task = sas_alloc_slow_task(GFP_KERNEL, sha); if (!task) { res = -ENOMEM; break; diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index 21c43b18d5d5..493caaf50a12 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -14,6 +14,7 @@ #include <scsi/sas_ata.h> #include <scsi/scsi_host.h> #include <scsi/scsi_device.h> +#include <scsi/scsi_tcq.h> #include <scsi/scsi_transport.h> #include <scsi/scsi_transport_sas.h> @@ -37,16 +38,23 @@ struct sas_task *sas_alloc_task(gfp_t flags) } EXPORT_SYMBOL_GPL(sas_alloc_task); -struct sas_task *sas_alloc_slow_task(gfp_t flags) +struct sas_task *sas_alloc_slow_task(gfp_t flags, struct sas_ha_struct *sha) { struct sas_task *task = sas_alloc_task(flags); - struct sas_task_slow *slow = kmalloc(sizeof(*slow), flags); + struct Scsi_Host *shost = sha->core.shost; + struct sas_task_slow *slow; - if (!task || !slow) { - if (task) - kmem_cache_free(sas_task_cache, task); - kfree(slow); + if (!task) return NULL; + + slow = kzalloc(sizeof(*slow), flags); + if (!slow) + goto out_err_slow; + + if (shost->reserved_cmd_q) { + slow->scmd = scsi_get_reserved_cmd(shost); + if (!slow->scmd) + goto out_err_scmd; } task->slow_task = slow; @@ -55,13 +63,27 @@ struct sas_task *sas_alloc_slow_task(gfp_t flags) init_completion(&slow->completion); return task; + +out_err_scmd: + kfree(slow); +out_err_slow: + kmem_cache_free(sas_task_cache, task); + return NULL; } EXPORT_SYMBOL_GPL(sas_alloc_slow_task); void sas_free_task(struct sas_task *task) { if (task) { - kfree(task->slow_task); + /* + * It could be good to just introduce separate sas_free_slow_task() to + * avoid the following in the fastpath. + */ + if (task->slow_task) { + if (task->slow_task->scmd) + scsi_put_reserved_cmd(task->slow_task->scmd); + kfree(task->slow_task); + } kmem_cache_free(sas_task_cache, task); } } diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c index a920eced92ec..2ef37d634c22 100644 --- a/drivers/scsi/mvsas/mv_sas.c +++ b/drivers/scsi/mvsas/mv_sas.c @@ -1283,7 +1283,7 @@ static int mvs_exec_internal_tmf_task(struct domain_device *dev, struct sas_task *task = NULL; for (retry = 0; retry < 3; retry++) { - task = sas_alloc_slow_task(GFP_KERNEL); + task = sas_alloc_slow_task(GFP_KERNEL, dev->port->ha); if (!task) return -ENOMEM; diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 2328ff1349ac..e9d759f64b3b 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c @@ -1743,7 +1743,7 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, return; } - task = sas_alloc_slow_task(GFP_ATOMIC); + task = sas_alloc_slow_task(GFP_ATOMIC, pm8001_ha->sas); if (!task) { PM8001_FAIL_DBG(pm8001_ha, pm8001_printk("cannot " @@ -1789,7 +1789,7 @@ static void pm8001_send_read_log(struct pm8001_hba_info *pm8001_ha, struct inbound_queue_table *circularQ; u32 opc = OPC_INB_SATA_HOST_OPSTART; - task = sas_alloc_slow_task(GFP_ATOMIC); + task = sas_alloc_slow_task(GFP_ATOMIC, pm8001_ha->sas); if (!task) { PM8001_FAIL_DBG(pm8001_ha, diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index b7cbc312843e..ac41a907447d 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -718,7 +718,7 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev, DECLARE_COMPLETION_ONSTACK(completion_setstate); for (retry = 0; retry < 3; retry++) { - task = sas_alloc_slow_task(GFP_KERNEL); + task = sas_alloc_slow_task(GFP_KERNEL, pm8001_ha->sas); if (!task) return -ENOMEM; @@ -805,7 +805,7 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha, struct sas_task *task = NULL; for (retry = 0; retry < 3; retry++) { - task = sas_alloc_slow_task(GFP_KERNEL); + task = sas_alloc_slow_task(GFP_KERNEL, pm8001_ha->sas); if (!task) return -ENOMEM; diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index d1d95f1a2c6a..e09e8d54f4f1 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -1625,7 +1625,7 @@ static void pm80xx_send_abort_all(struct pm8001_hba_info *pm8001_ha, return; } - task = sas_alloc_slow_task(GFP_ATOMIC); + task = sas_alloc_slow_task(GFP_ATOMIC, pm8001_ha->sas); if (!task) { PM8001_FAIL_DBG(pm8001_ha, pm8001_printk("cannot " @@ -1676,7 +1676,7 @@ static void pm80xx_send_read_log(struct pm8001_hba_info *pm8001_ha, struct inbound_queue_table *circularQ; u32 opc = OPC_INB_SATA_HOST_OPSTART; - task = sas_alloc_slow_task(GFP_ATOMIC); + task = sas_alloc_slow_task(GFP_ATOMIC, pm8001_ha->sas); if (!task) { PM8001_FAIL_DBG(pm8001_ha, diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 4e2d61e8fb1e..25c0f0b94d27 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -608,6 +608,7 @@ struct sas_task_slow { struct timer_list timer; struct completion completion; struct sas_task *task; + struct scsi_cmnd *scmd; }; #define SAS_TASK_STATE_PENDING 1 @@ -617,7 +618,8 @@ struct sas_task_slow { #define SAS_TASK_AT_INITIATOR 16 extern struct sas_task *sas_alloc_task(gfp_t flags); -extern struct sas_task *sas_alloc_slow_task(gfp_t flags); +extern struct sas_task *sas_alloc_slow_task(gfp_t flags, + struct sas_ha_struct *sha); extern void sas_free_task(struct sas_task *task); struct sas_domain_function_template {

[RFC,v2,23/24] scsi: libsas: aic94xx: hisi_sas: mvsas: pm8001: Allocate Scsi_cmd for slow task

Commit Message

Patch