scsi: ufs: Improve SCSI abort handling further

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").

Link: https://lore.kernel.org/r/20211203231950.193369-14-bvanassche@acm.org
Fixes: 7a3e97b0dc4b ("[SCSI] ufshcd: UFS Host controller driver")
Tested-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 5a641610dd743050b666a157ddfdd8b6168e2a00..06954a6e9d5d37b3362e71b83d12a49ad102e2bd 100644 (file)
--- 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: