| Message ID | 20211130233324.1402448-14-bvanassche@acm.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | UFS patches for kernel v5.17 | expand |
On 01/12/2021 01:33, Bart Van Assche wrote: > Release resources when aborting a command. Make sure that aborted commands > are completed once by clearing the corresponding tag bit from > hba->outstanding_reqs. This patch is an improved version of commit > 3ff1f6b6ba6f ("scsi: ufs: core: Improve SCSI abort handling"). > > Fixes: 7a3e97b0dc4b ("[SCSI] ufshcd: UFS Host controller driver") > Signed-off-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/scsi/ufs/ufshcd.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 8703e4a70256..1a4f2ebf955e 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -6984,6 +6984,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) > struct ufshcd_lrb *lrbp = &hba->lrb[tag]; > unsigned long flags; > int err = FAILED; > + bool outstanding; > u32 reg; > > WARN_ONCE(tag < 0, "Invalid tag %d\n", tag); > @@ -7061,6 +7062,17 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) > goto release; > } > > + /* > + * Clear the corresponding bit from outstanding_reqs since the command > + * has been aborted successfully. > + */ > + spin_lock_irqsave(&hba->outstanding_lock, flags); > + outstanding = __test_and_clear_bit(tag, &hba->outstanding_reqs); > + spin_unlock_irqrestore(&hba->outstanding_lock, flags); > + > + if (outstanding) > + ufshcd_release_scsi_cmd(hba, lrbp); > + > err = SUCCESS; > > release: >
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 8703e4a70256..1a4f2ebf955e 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -6984,6 +6984,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) struct ufshcd_lrb *lrbp = &hba->lrb[tag]; unsigned long flags; int err = FAILED; + bool outstanding; u32 reg; WARN_ONCE(tag < 0, "Invalid tag %d\n", tag); @@ -7061,6 +7062,17 @@ static int ufshcd_abort(struct scsi_cmnd *cmd) goto release; } + /* + * Clear the corresponding bit from outstanding_reqs since the command + * has been aborted successfully. + */ + spin_lock_irqsave(&hba->outstanding_lock, flags); + outstanding = __test_and_clear_bit(tag, &hba->outstanding_reqs); + spin_unlock_irqrestore(&hba->outstanding_lock, flags); + + if (outstanding) + ufshcd_release_scsi_cmd(hba, lrbp); + err = SUCCESS; release:
Release resources when aborting a command. Make sure that aborted commands are completed once by clearing the corresponding tag bit from hba->outstanding_reqs. This patch is an improved version of commit 3ff1f6b6ba6f ("scsi: ufs: core: Improve SCSI abort handling"). Fixes: 7a3e97b0dc4b ("[SCSI] ufshcd: UFS Host controller driver") Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/ufs/ufshcd.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)