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
Subject: Re: [PATCH 05/10] scsi: ufs: Complete the cmd before returning in queuecommand
Date: Wed, 23 Jun 2021 15:39:46 +0800 [thread overview]
Message-ID: <b9a95d55856c0530659cb2f364e5a525@codeaurora.org> (raw)
In-Reply-To: <1624433711-9339-6-git-send-email-cang@codeaurora.org>
Sorry, please ignore this change, it is wrongly sent out along with this
series...
On 2021-06-23 15:35, Can Guo wrote:
> Commit 7a7e66c65d4148fc3f23b058405bc9f102414fcb ("scsi: ufs: Fix a race
> condition between ufshcd_abort() and eh_work()") forgot to complete the
> cmd, which takes an occupied lrb, before returning in queuecommand.
> This
> change adds the missing codes.
>
> Fixes: 7a7e66c65d414 ("scsi: ufs: Fix a race condition between
> ufshcd_abort() and eh_work()")
> Signed-off-by: Can Guo <cang@codeaurora.org>
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 5f837c4..7fbc63e 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -2758,6 +2758,16 @@ static int ufshcd_queuecommand(struct Scsi_Host
> *host, struct scsi_cmnd *cmd)
> goto out;
> }
>
> + if (unlikely(test_bit(tag, &hba->outstanding_reqs))) {
> + if (hba->wlu_pm_op_in_progress) {
> + set_host_byte(cmd, DID_BAD_TARGET);
> + cmd->scsi_done(cmd);
> + } else {
> + err = SCSI_MLQUEUE_HOST_BUSY;
> + }
> + goto out;
> + }
> +
> hba->req_abort_count = 0;
>
> err = ufshcd_hold(hba, true);
> @@ -2768,15 +2778,6 @@ static int ufshcd_queuecommand(struct Scsi_Host
> *host, struct scsi_cmnd *cmd)
> WARN_ON(ufshcd_is_clkgating_allowed(hba) &&
> (hba->clk_gating.state != CLKS_ON));
>
> - if (unlikely(test_bit(tag, &hba->outstanding_reqs))) {
> - if (hba->wlu_pm_op_in_progress)
> - set_host_byte(cmd, DID_BAD_TARGET);
> - else
> - err = SCSI_MLQUEUE_HOST_BUSY;
> - ufshcd_release(hba);
> - goto out;
> - }
> -
> lrbp = &hba->lrb[tag];
> WARN_ON(lrbp->cmd);
> lrbp->cmd = cmd;
next prev parent reply other threads:[~2021-06-23 7:40 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 [this message]
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 ` [PATCH v4 09/10] scsi: ufs: Update the fast abort path in ufshcd_abort() for PM requests Can Guo
2021-06-23 21:33 ` 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=b9a95d55856c0530659cb2f364e5a525@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).