| From 97fb71831a9e8a8a97e65415a833f2a41e56167f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 6 May 2020 20:04:02 +0530 |
| Subject: mmc: core: Check request type before completing the request |
| |
| From: Veerabhadrarao Badiganti <vbadigan@codeaurora.org> |
| |
| [ Upstream commit e6bfb1bf00852b55f4c771f47ae67004c04d3c87 ] |
| |
| 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: 1e8e55b67030 ("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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mmc/core/block.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c |
| index 663d87924e5e8..32db16f6debc7 100644 |
| --- a/drivers/mmc/core/block.c |
| +++ b/drivers/mmc/core/block.c |
| @@ -1417,6 +1417,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; |
| @@ -1446,7 +1447,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); |
| |
| -- |
| 2.20.1 |
| |
