From: Adrian Hunter <adrian.hunter@intel.com>
To: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>,
ulf.hansson@linaro.org
Cc: stummala@codeaurora.org, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
Sarthak Garg <sartgarg@codeaurora.org>,
stable@vger.kernel.org, Baolin Wang <baolin.wang@linaro.org>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Andreas Koop <andreas.koop@zf.com>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH V1 2/2] mmc: core: Fix recursive locking issue in CQE recovery path
Date: Thu, 7 May 2020 14:48:42 +0300 [thread overview]
Message-ID: <b4a01f2c-479a-2a23-58b7-64f16cbc17a2@intel.com> (raw)
In-Reply-To: <1588775643-18037-3-git-send-email-vbadigan@codeaurora.org>
On 6/05/20 5:34 pm, Veerabhadrarao Badiganti wrote:
> From: Sarthak Garg <sartgarg@codeaurora.org>
>
> Consider the following stack trace
>
> -001|raw_spin_lock_irqsave
> -002|mmc_blk_cqe_complete_rq
> -003|__blk_mq_complete_request(inline)
> -003|blk_mq_complete_request(rq)
> -004|mmc_cqe_timed_out(inline)
> -004|mmc_mq_timed_out
>
> mmc_mq_timed_out acquires the queue_lock for the first
> time. The mmc_blk_cqe_complete_rq function also tries to acquire
> the same queue lock resulting in recursive locking where the task
> is spinning for the same lock which it has already acquired leading
> to watchdog bark.
>
> Fix this issue with the lock only for the required critical section.
>
> Cc: <stable@vger.kernel.org> # v4.19+
> Suggested-by: Sahitya Tummala <stummala@codeaurora.org>
> Signed-off-by: Sarthak Garg <sartgarg@codeaurora.org>
> ---
> drivers/mmc/core/queue.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
> index 25bee3d..72bef39 100644
> --- a/drivers/mmc/core/queue.c
> +++ b/drivers/mmc/core/queue.c
> @@ -107,7 +107,7 @@ static enum blk_eh_timer_return mmc_cqe_timed_out(struct request *req)
> case MMC_ISSUE_DCMD:
> if (host->cqe_ops->cqe_timeout(host, mrq, &recovery_needed)) {
> if (recovery_needed)
> - __mmc_cqe_recovery_notifier(mq);
> + mmc_cqe_recovery_notifier(mrq);
> return BLK_EH_RESET_TIMER;
> }
> /* No timeout (XXX: huh? comment doesn't make much sense) */
> @@ -131,12 +131,13 @@ static enum blk_eh_timer_return mmc_mq_timed_out(struct request *req,
>
> spin_lock_irqsave(&mq->lock, flags);
>
> - if (mq->recovery_needed || !mq->use_cqe || host->hsq_enabled)
> + if (mq->recovery_needed || !mq->use_cqe || host->hsq_enabled) {
> ret = BLK_EH_RESET_TIMER;
> - else
> + spin_unlock_irqrestore(&mq->lock, flags);
> + } else {
> + spin_unlock_irqrestore(&mq->lock, flags);
> ret = mmc_cqe_timed_out(req);
> -
> - spin_unlock_irqrestore(&mq->lock, flags);
> + }
This looks good, but I think there needs to be another change also. I will
send a patch for that, but in the meantime maybe you could straighten up the
code flow through the spinlock e.g.
spin_lock_irqsave(&mq->lock, flags);
ignore = mq->recovery_needed || !mq->use_cqe || host->hsq_enabled;
spin_unlock_irqrestore(&mq->lock, flags);
return ignore ? BLK_EH_RESET_TIMER : mmc_cqe_timed_out(req);
And add a fixes tag.
>
> return ret;
> }
>
next prev parent reply other threads:[~2020-05-07 11:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 14:34 [PATCH V1 0/2] CQE fixes Veerabhadrarao Badiganti
2020-05-06 14:34 ` [PATCH V1 1/2] mmc: core: Check request type before completing the request Veerabhadrarao Badiganti
2020-05-06 17:06 ` Adrian Hunter
2020-05-08 8:12 ` Ulf Hansson
2020-05-06 14:34 ` [PATCH V1 2/2] mmc: core: Fix recursive locking issue in CQE recovery path Veerabhadrarao Badiganti
2020-05-07 11:48 ` Adrian Hunter [this message]
2020-05-07 14:06 ` [PATCH] mmc: block: Fix request completion in the CQE timeout path Adrian Hunter
2020-05-08 5:25 ` Ulf Hansson
2020-05-08 6:22 ` [PATCH RESEND] " Adrian Hunter
2020-05-08 8:17 ` Ulf Hansson
2020-05-07 16:15 ` [PATCH V2] mmc: core: Fix recursive locking issue in CQE recovery path Veerabhadrarao Badiganti
2020-05-07 17:21 ` Adrian Hunter
2020-05-08 8:12 ` Ulf Hansson
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=b4a01f2c-479a-2a23-58b7-64f16cbc17a2@intel.com \
--to=adrian.hunter@intel.com \
--cc=andreas.koop@zf.com \
--cc=baolin.wang@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=sartgarg@codeaurora.org \
--cc=stable@vger.kernel.org \
--cc=stummala@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=ulf.hansson@linaro.org \
--cc=vbadigan@codeaurora.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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).