2024-01-10 18:42:14

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH] scsi: fnic: unlock on error path in fnic_queuecommand()

Call spin_unlock_irqrestore(&fnic->wq_copy_lock[hwq], flags) before
returning.

Fixes: c81df08cd294 ("scsi: fnic: Add support for multiqueue (MQ) in fnic driver")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/scsi/fnic/fnic_scsi.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 4d6db4509e75..8d7fc5284293 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -546,6 +546,7 @@ int fnic_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc)
if (fnic->sw_copy_wq[hwq].io_req_table[blk_mq_unique_tag_to_tag(mqtag)] != NULL) {
WARN(1, "fnic<%d>: %s: hwq: %d tag 0x%x already exists\n",
fnic->fnic_num, __func__, hwq, blk_mq_unique_tag_to_tag(mqtag));
+ spin_unlock_irqrestore(&fnic->wq_copy_lock[hwq], flags);
return SCSI_MLQUEUE_HOST_BUSY;
}

--
2.42.0



Subject: RE: [PATCH] scsi: fnic: unlock on error path in fnic_queuecommand()

On Wednesday, January 10, 2024 10:42 AM, Dan Carpenter <[email protected]> wrote:
>
> Call spin_unlock_irqrestore(&fnic->wq_copy_lock[hwq], flags) before
> returning.
>
> Fixes: c81df08cd294 ("scsi: fnic: Add support for multiqueue (MQ) in fnic driver")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> drivers/scsi/fnic/fnic_scsi.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
> index 4d6db4509e75..8d7fc5284293 100644
> --- a/drivers/scsi/fnic/fnic_scsi.c
> +++ b/drivers/scsi/fnic/fnic_scsi.c
> @@ -546,6 +546,7 @@ int fnic_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc)
> if (fnic->sw_copy_wq[hwq].io_req_table[blk_mq_unique_tag_to_tag(mqtag)] != NULL) {
> WARN(1, "fnic<%d>: %s: hwq: %d tag 0x%x already exists\n",
> fnic->fnic_num, __func__, hwq, blk_mq_unique_tag_to_tag(mqtag));
> + spin_unlock_irqrestore(&fnic->wq_copy_lock[hwq], flags);
> return SCSI_MLQUEUE_HOST_BUSY;
> }
>
> --
> 2.42.0
>
>

Thanks for your change, Dan.
Looks good to me.

Reviewed-by: Karan Tilak Kumar <[email protected]>

Regards,
Karan

2024-01-12 02:36:52

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH] scsi: fnic: unlock on error path in fnic_queuecommand()


Dan,

> Call spin_unlock_irqrestore(&fnic->wq_copy_lock[hwq], flags) before
> returning.

Applied to 6.8/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2024-01-17 20:10:44

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH] scsi: fnic: unlock on error path in fnic_queuecommand()

On Wed, 10 Jan 2024 21:41:55 +0300, Dan Carpenter wrote:

> Call spin_unlock_irqrestore(&fnic->wq_copy_lock[hwq], flags) before
> returning.
>
>

Applied to 6.8/scsi-queue, thanks!

[1/1] scsi: fnic: unlock on error path in fnic_queuecommand()
https://git.kernel.org/mkp/scsi/c/38945c2b006b

--
Martin K. Petersen Oracle Linux Engineering