| Message ID | 20221020130123.4033218-1-vincent.whitchurch@axis.com |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: core: Fix WRITE_ZEROES CQE handling | expand |
> 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@nvidia.com> > Tested-by: Jon Hunter <jonathanh@nvidia.com> > Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> Reviewed-by: Avri Altman <avri.altman@wdc.com> > --- > 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 > fefaa901b50f..3661ba0bbc87 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.28.0
On Thu, 20 Oct 2022 at 15:01, Vincent Whitchurch <vincent.whitchurch@axis.com> wrote: > > 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@nvidia.com> > Tested-by: Jon Hunter <jonathanh@nvidia.com> > Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> Applied for fixes and by adding a stable tag, thanks! Kind regards Uffe > --- > 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 fefaa901b50f..3661ba0bbc87 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.28.0 >
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index fefaa901b50f..3661ba0bbc87 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;
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@nvidia.com> Tested-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> --- drivers/mmc/core/queue.c | 1 + 1 file changed, 1 insertion(+)