Commit e6bfb1bf authored May 06, 2020 by Veerabhadrarao Badiganti Committed by Ulf Hansson May 08, 2020

mmc: core: Check request type before completing the request



In the request completion path with CQE, request type is being checked
after the request is getting completed. This is resulting in returning
the wrong request type and leading to the IO hang issue.

ASYNC request type is getting returned for DCMD type requests.
Because of this mismatch, mq->cqe_busy flag is never getting cleared
and the driver is not invoking blk_mq_hw_run_queue. So requests are not
getting dispatched to the LLD from the block layer.

All these eventually leading to IO hang issues.
So, get the request type before completing the request.

Cc: <stable@vger.kernel.org>
Fixes: 1e8e55b6 ("mmc: block: Add CQE support")
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/1588775643-18037-2-git-send-email-vbadigan@codeaurora.org


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent b56ff195

drivers/mmc/core/block.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1370,6 +1370,7 @@ static void mmc_blk_cqe_complete_rq(struct mmc_queue mq, struct request req)
		struct mmc_request *mrq = &mqrq->brq.mrq;
		struct request_queue *q = req->q;
		struct mmc_host *host = mq->card->host;
		enum mmc_issue_type issue_type = mmc_issue_type(mq, req);
		unsigned long flags;
		bool put_card;
		int err;
		@@ -1399,7 +1400,7 @@ static void mmc_blk_cqe_complete_rq(struct mmc_queue mq, struct request req)

		spin_lock_irqsave(&mq->lock, flags);

		mq->in_flight[mmc_issue_type(mq, req)] -= 1;
		mq->in_flight[issue_type] -= 1;

		put_card = (mmc_tot_in_flight(mq) == 0);

Admin message