This is a note to let you know that I've just added the patch titled
mmc: core: Fix WRITE_ZEROES CQE handling
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mmc-core-fix-write_zeroes-cqe-handling.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 028822b714bd3a159d65416c53f1549345b53d9e Mon Sep 17 00:00:00 2001
From: Vincent Whitchurch <vincent.whitchurch@xxxxxxxx>
Date: Thu, 20 Oct 2022 15:01:23 +0200
Subject: mmc: core: Fix WRITE_ZEROES CQE handling
From: Vincent Whitchurch <vincent.whitchurch@xxxxxxxx>
commit 028822b714bd3a159d65416c53f1549345b53d9e upstream.
WRITE_ZEROES requests use TRIM, so mark them as needing to be issued
synchronously even when a CQE is being used. Without this,
mmc_blk_mq_issue_rq() triggers a WARN_ON_ONCE() and fails the request
since we don't have any handling for issuing this asynchronously.
Fixes: f7b6fc327327 ("mmc: core: Support zeroout using TRIM for eMMC")
Reported-by: Jon Hunter <jonathanh@xxxxxxxxxx>
Tested-by: Jon Hunter <jonathanh@xxxxxxxxxx>
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@xxxxxxxx>
Reviewed-by: Avri Altman <avri.altman@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/20221020130123.4033218-1-vincent.whitchurch@xxxxxxxx
Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/core/queue.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 86be55d7cf55..b396e3900717 100644
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -48,6 +48,7 @@ static enum mmc_issue_type mmc_cqe_issue_type(struct mmc_host *host,
case REQ_OP_DRV_OUT:
case REQ_OP_DISCARD:
case REQ_OP_SECURE_ERASE:
+ case REQ_OP_WRITE_ZEROES:
return MMC_ISSUE_SYNC;
case REQ_OP_FLUSH:
return mmc_cqe_can_dcmd(host) ? MMC_ISSUE_DCMD : MMC_ISSUE_SYNC;
--
2.38.1
Patches currently in stable-queue which might be from vincent.whitchurch@xxxxxxxx are
queue-6.0/mmc-core-fix-write_zeroes-cqe-handling.patch
