scsi: fnic: Replace sgreset tag with max_tag_id
Subsystems (2)
Karan Tilak Kumar
maintainerPATCH 1/1 scsi: fnic: Replace sgreset tag with max_tag_id
sgreset is issued with a scsi command pointer. The device reset code assumes that it was issued on a hardware queue, and calls block multiqueue layer. However, the assumption is broken, and there is no hardware queue associated with the sgreset, and this leads to a crash due to a null pointer exception.
Fix the code to use the max_tag_id as a tag which does not overlap with the other tags issued by mid layer.
Tested by running FC traffic for a few minutes, and by issuing sgreset on the device in parallel. Without the fix, the crash is observed right away. With this fix, no crash is observed.
--- drivers/scsi/fnic/fnic.h | 3 ++- drivers/scsi/fnic/fnic_scsi.c | 20 +++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-)
drivers/scsi/fnic/fnic.h +2 -1
@@ -27,7 +27,7 @@#define DRV_NAME "fnic"#define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.55" +#define DRV_VERSION "1.6.0.56"#define PFX DRV_NAME ": "#define DFX DRV_NAME "%d: "
@@ -236,6 +236,7 @@ struct fnic {unsigned int wq_count;unsigned int cq_count; +struct mutex sgreset_mutex;struct dentry *fnic_stats_debugfs_host;struct dentry *fnic_stats_debugfs_file;struct dentry *fnic_reset_debugfs_file;
drivers/scsi/fnic/fnic_scsi.c +9 -11
@@ -2222,7 +2222,6 @@ int fnic_device_reset(struct scsi_cmnd *sc)struct reset_stats *reset_stats;int tag = rq->tag;DECLARE_COMPLETION_ONSTACK (tm_done); -int tag_gen_flag =0 ;/*to track tags allocated by fnic driver*/ bool new_sc =0 ;/* Wait for rport to unblock */
@@ -2252,17 +2251,17 @@ int fnic_device_reset(struct scsi_cmnd *sc) }fnic_priv (sc)->flags =FNIC_DEVICE_RESET ; -/* Allocate tag if not present */ if (unlikely (tag <0 )) {/* -* Really should fix the midlayer to pass in a proper -* request for ioctls... +* For device reset issued through sg3utils, we let +* only one LUN_RESET to go through and use a special +* tag equal to max_tag_id so that we don't have to allocate +* or free it. It won't interact with tags +* allocated by mid layer. */ - tag =fnic_scsi_host_start_tag (fnic, sc); -if (unlikely (tag ==SCSI_NO_TAG )) - goto fnic_device_reset_end; - tag_gen_flag =1 ; +mutex_lock (&fnic->sgreset_mutex); + tag = fnic->fnic_max_tag_id; new_sc =1 ; } io_lock =fnic_io_lock_hash (fnic, sc);
@@ -2434,9 +2433,8 @@ int fnic_device_reset(struct scsi_cmnd *sc) (u64)sc->cmnd[4] << 8 | sc->cmnd[5]), fnic_flags_and_state(sc)); -/* free tag if it is allocated */ -if (unlikely (tag_gen_flag)) -fnic_scsi_host_end_tag (fnic, sc); +if (new_sc) +mutex_unlock (&fnic->sgreset_mutex); FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host, "Returning from device reset %s\n",
Signature · 1 line
2.31.1
Martin K. Petersen
AppliedKaran,
Quoted 5 lines
sgreset is issued with a scsi command pointer. The device reset code assumes that it was issued on a hardware queue, and calls block multiqueue layer. However, the assumption is broken, and there is no hardware queue associated with the sgreset, and this leads to a crash due to a null pointer exception.
Applied to 6.6/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Thanks Martin.
Do I need to send out a patch request to apply this patch to 6.5/scsi-fixes?
Regards,
Karan
-----Original Message-----
From: Martin K. Petersen <[email protected]>
Sent: Friday, August 25, 2023 2:16 PM
To: Karan Tilak Kumar (kartilak) <[email protected]>
Cc: Sesidhar Baddela (sebaddel) <[email protected]>; Arulprabhu Ponnusamy (arulponn) <[email protected]>; Dhanraj Jhawar (djhawar) <[email protected]>; Gian Carlo Boffa (gcboffa) <[email protected]>; Masa Kai (mkai2) <[email protected]>; Satish Kharat (satishkh) <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] scsi: fnic: Replace sgreset tag with max_tag_id
Karan,
Quoted 5 lines
sgreset is issued with a scsi command pointer. The device reset code assumes that it was issued on a hardware queue, and calls block multiqueue layer. However, the assumption is broken, and there is no hardware queue associated with the sgreset, and this leads to a crash due to a null pointer exception.
Applied to 6.6/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Karan,
Quoted 2 lines
Do I need to send out a patch request to apply this patch to 6.5/scsi-fixes?
You can request a stable backport once the commit is in Linus' tree.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Karan Tilak Kumar (kartilak)
maintainerHi Martin,
Would I receive an email when the patch has been applied to Linus' tree?
I just checked out master branch from this repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
The fix has not been applied there yet. Am I looking in the right place?
Quoted 1 line
Quoted 1 line
You can request a stable backport once the commit is in Linus' tree.
Can you please let me know the procedure to request for this?
Thanks,
Karan
-----Original Message-----
From: Martin K. Petersen <[email protected]>
Sent: Wednesday, August 30, 2023 6:13 PM
To: Karan Tilak Kumar (kartilak) <[email protected]>
Cc: Martin K. Petersen <[email protected]>; Sesidhar Baddela (sebaddel) <[email protected]>; Arulprabhu Ponnusamy (arulponn) <[email protected]>; Dhanraj Jhawar (djhawar) <[email protected]>; Gian Carlo Boffa (gcboffa) <[email protected]>; Masa Kai (mkai2) <[email protected]>; Satish Kharat (satishkh) <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] scsi: fnic: Replace sgreset tag with max_tag_id
Karan,
Quoted 2 lines
Do I need to send out a patch request to apply this patch to 6.5/scsi-fixes?
You can request a stable backport once the commit is in Linus' tree.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Karan Tilak Kumar (kartilak)
maintainerHi Martin,
The fix has been merged into Linus' tree.
Quoted 1 line
Quoted 1 line
You can request a stable backport once the commit is in Linus' tree.
Please advise how I can request for this.
Regards,
Karan
-----Original Message-----
From: Karan Tilak Kumar (kartilak)
Sent: Thursday, September 7, 2023 2:09 PM
To: Martin K. Petersen <[email protected]>
Cc: Sesidhar Baddela (sebaddel) <[email protected]>; Arulprabhu Ponnusamy (arulponn) <[email protected]>; Dhanraj Jhawar (djhawar) <[email protected]>; Gian Carlo Boffa (gcboffa) <[email protected]>; Masa Kai (mkai2) <[email protected]>; Satish Kharat (satishkh) <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: RE: [PATCH] scsi: fnic: Replace sgreset tag with max_tag_id
Hi Martin,
Would I receive an email when the patch has been applied to Linus' tree?
I just checked out master branch from this repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/
The fix has not been applied there yet. Am I looking in the right place?
Quoted 1 line
Quoted 1 line
You can request a stable backport once the commit is in Linus' tree.
Can you please let me know the procedure to request for this?
Thanks,
Karan
-----Original Message-----
From: Martin K. Petersen <[email protected]>
Sent: Wednesday, August 30, 2023 6:13 PM
To: Karan Tilak Kumar (kartilak) <[email protected]>
Cc: Martin K. Petersen <[email protected]>; Sesidhar Baddela (sebaddel) <[email protected]>; Arulprabhu Ponnusamy (arulponn) <[email protected]>; Dhanraj Jhawar (djhawar) <[email protected]>; Gian Carlo Boffa (gcboffa) <[email protected]>; Masa Kai (mkai2) <[email protected]>; Satish Kharat (satishkh) <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH] scsi: fnic: Replace sgreset tag with max_tag_id
Karan,
Quoted 2 lines
Do I need to send out a patch request to apply this patch to 6.5/scsi-fixes?
You can request a stable backport once the commit is in Linus' tree.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering