From: Can Guo <cang@codeaurora.org>
To: asutoshd@codeaurora.org, nguyenb@codeaurora.org,
hongwus@codeaurora.org, ziqichen@codeaurora.org,
linux-scsi@vger.kernel.org, kernel-team@android.com,
cang@codeaurora.org
Cc: Alim Akhtar <alim.akhtar@samsung.com>,
Avri Altman <avri.altman@wdc.com>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Stanley Chu <stanley.chu@mediatek.com>,
Bean Huo <beanhuo@micron.com>, Jaegeuk Kim <jaegeuk@kernel.org>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v4 09/10] scsi: ufs: Update the fast abort path in ufshcd_abort() for PM requests
Date: Wed, 23 Jun 2021 00:35:09 -0700 [thread overview]
Message-ID: <1624433711-9339-11-git-send-email-cang@codeaurora.org> (raw)
In-Reply-To: <1624433711-9339-1-git-send-email-cang@codeaurora.org>
If PM requests fail during runtime suspend/resume, RPM framework saves the
error to dev->power.runtime_error. Before the runtime_error gets cleared,
runtime PM on this specific device won't work again, leaving the device
either runtime active or runtime suspended permanently.
When task abort happens to a PM request sent during runtime suspend/resume,
even if it can be successfully aborted, RPM framework anyways saves the
(TIMEOUT) error. In this situation, we can leverage error handling to
recover and clear the runtime_error. So, let PM requests take the fast
abort path in ufshcd_abort().
Signed-off-by: Can Guo <cang@codeaurora.org>
---
drivers/scsi/ufs/ufshcd.c | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index d739401..59fc521 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -2737,7 +2737,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
* err handler blocked for too long. So, just fail the scsi cmd
* sent from PM ops, err handler can recover PM error anyways.
*/
- if (hba->wlu_pm_op_in_progress) {
+ if (cmd->request->rq_flags & RQF_PM) {
hba->force_reset = true;
set_host_byte(cmd, DID_BAD_TARGET);
cmd->scsi_done(cmd);
@@ -6981,11 +6981,14 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
int err = 0;
struct ufshcd_lrb *lrbp;
u32 reg;
+ bool need_eh = false;
host = cmd->device->host;
hba = shost_priv(host);
tag = cmd->request->tag;
lrbp = &hba->lrb[tag];
+
+ dev_info(hba->dev, "%s: Device abort task at tag %d\n", __func__, tag);
if (!ufshcd_valid_tag(hba, tag)) {
dev_err(hba->dev,
"%s: invalid command tag %d: cmd=0x%p, cmd->request=0x%p",
@@ -7003,9 +7006,6 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
goto out;
}
- /* Print Transfer Request of aborted task */
- dev_info(hba->dev, "%s: Device abort task at tag %d\n", __func__, tag);
-
/*
* Print detailed info about aborted request.
* As more than one request might get aborted at the same time,
@@ -7033,21 +7033,21 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
}
/*
- * Task abort to the device W-LUN is illegal. When this command
- * will fail, due to spec violation, scsi err handling next step
- * will be to send LU reset which, again, is a spec violation.
- * To avoid these unnecessary/illegal steps, first we clean up
- * the lrb taken by this cmd and re-set it in outstanding_reqs,
- * then queue the eh_work and bail.
+ * This fast path guarantees the cmd always gets aborted successfully,
+ * meanwhile it invokes the error handler. It allows contexts, which
+ * are blocked by this cmd, to fail fast. It serves multiple purposes:
+ * #1 To avoid unnecessary/illagal abort attempts to the W-LU.
+ * #2 To avoid live lock between eh_work and specific contexts, i.e.,
+ * suspend/resume and eh_work itself.
+ * #3 To let eh_work recover runtime PM error in case abort happens
+ * to cmds sent from runtime suspend/resume ops.
*/
- if (lrbp->lun == UFS_UPIU_UFS_DEVICE_WLUN) {
+ if (lrbp->lun == UFS_UPIU_UFS_DEVICE_WLUN ||
+ (cmd->request->rq_flags & RQF_PM)) {
ufshcd_update_evt_hist(hba, UFS_EVT_ABORT, lrbp->lun);
__ufshcd_transfer_req_compl(hba, (1UL << tag));
set_bit(tag, &hba->outstanding_reqs);
- spin_lock_irqsave(host->host_lock, flags);
- hba->force_reset = true;
- ufshcd_schedule_eh_work(hba);
- spin_unlock_irqrestore(host->host_lock, flags);
+ need_eh = true;
goto out;
}
@@ -7061,6 +7061,12 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)
cleanup:
__ufshcd_transfer_req_compl(hba, (1UL << tag));
out:
+ if (cmd->request->rq_flags & RQF_PM || need_eh) {
+ spin_lock_irqsave(host->host_lock, flags);
+ hba->force_reset = true;
+ ufshcd_schedule_eh_work(hba);
+ spin_unlock_irqrestore(host->host_lock, flags);
+ }
err = SUCCESS;
} else {
dev_err(hba->dev, "%s: failed with err %d\n", __func__, err);
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2021-06-23 7:37 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1624433711-9339-1-git-send-email-cang@codeaurora.org>
2021-06-23 7:35 ` [PATCH v4 01/10] scsi: ufs: Rename flags pm_op_in_progress and is_sys_suspended Can Guo
2021-06-23 20:05 ` Bart Van Assche
2021-06-23 20:57 ` Bart Van Assche
2021-06-24 2:02 ` Can Guo
2021-06-24 2:34 ` Can Guo
2021-06-24 6:04 ` Adrian Hunter
2021-06-23 20:42 ` Bjorn Andersson
2021-06-23 22:41 ` Bart Van Assche
2021-06-24 2:04 ` Can Guo
2021-06-24 17:32 ` Bart Van Assche
2021-06-24 23:42 ` Bart Van Assche
2021-06-28 7:01 ` Can Guo
2021-06-28 7:35 ` Can Guo
2021-06-28 17:07 ` Bart Van Assche
2021-06-23 7:35 ` [PATCH v4 02/10] scsi: ufs: Add " Can Guo
2021-06-23 12:33 ` Adrian Hunter
2021-06-24 2:05 ` Can Guo
2021-06-23 20:59 ` Bart Van Assche
2021-06-24 2:07 ` Can Guo
2021-06-24 17:35 ` Bart Van Assche
2021-06-28 7:11 ` Can Guo
2021-06-23 7:35 ` [PATCH v4 03/10] scsi: ufs: Update the return value of supplier pm ops Can Guo
2021-06-23 21:08 ` Bart Van Assche
2021-06-24 2:11 ` Can Guo
2021-06-23 7:35 ` [PATCH v4 04/10] scsi: ufs: Enable IRQ after enabling clocks in error handling preparation Can Guo
2021-06-23 21:20 ` Bart Van Assche
2021-06-23 7:35 ` [PATCH 05/10] scsi: ufs: Complete the cmd before returning in queuecommand Can Guo
2021-06-23 7:39 ` Can Guo
2021-06-23 7:35 ` [PATCH v4 05/10] scsi: ufs: Remove a redundant tag check in ufshcd_queuecommand() Can Guo
2021-06-23 21:24 ` Bart Van Assche
2021-06-23 7:35 ` [PATCH v4 06/10] scsi: ufs: Remove host_sem used in suspend/resume Can Guo
2021-06-23 14:30 ` Adrian Hunter
2021-06-24 2:16 ` Can Guo
2021-06-24 5:52 ` Adrian Hunter
2021-06-24 6:12 ` Can Guo
2021-06-24 6:23 ` Adrian Hunter
2021-06-24 6:31 ` Can Guo
2021-06-24 10:04 ` Adrian Hunter
2021-06-28 7:26 ` Can Guo
2021-07-07 19:04 ` Adrian Hunter
2021-06-24 17:11 ` Bart Van Assche
2021-06-28 8:17 ` Can Guo
2021-06-28 17:31 ` Bart Van Assche
2021-06-29 6:23 ` Can Guo
2021-06-29 18:01 ` Bart Van Assche
2021-06-29 21:50 ` Can Guo
2021-06-23 7:35 ` [PATCH v4 07/10] scsi: ufs: Simplify error handling preparation Can Guo
2021-06-23 21:30 ` Bart Van Assche
2021-06-23 7:35 ` [PATCH v4 08/10] scsi: ufs: Update ufshcd_recover_pm_error() Can Guo
2021-06-23 7:35 ` Can Guo [this message]
2021-06-23 21:33 ` [PATCH v4 09/10] scsi: ufs: Update the fast abort path in ufshcd_abort() for PM requests Bart Van Assche
2021-06-24 4:16 ` Can Guo
2021-06-24 16:57 ` Bart Van Assche
2021-06-23 7:35 ` [PATCH v4 10/10] scsi: ufs: Apply more limitations to user access Can Guo
2021-06-23 21:51 ` Bart Van Assche
2021-06-24 2:23 ` Can Guo
2021-06-24 22:25 ` Bart Van Assche
2021-06-28 7:16 ` Can Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1624433711-9339-11-git-send-email-cang@codeaurora.org \
--to=cang@codeaurora.org \
--cc=alim.akhtar@samsung.com \
--cc=asutoshd@codeaurora.org \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=hongwus@codeaurora.org \
--cc=jaegeuk@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=nguyenb@codeaurora.org \
--cc=stanley.chu@mediatek.com \
--cc=ziqichen@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).