]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
mmc: block: Fix request completion in the CQE timeout path
authorAdrian Hunter <adrian.hunter@intel.com>
Fri, 8 May 2020 06:22:27 +0000 (09:22 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Fri, 8 May 2020 08:15:51 +0000 (10:15 +0200)
commitc077dc5e0620508a29497dac63a2822324ece52a
tree285692fe786944e903751cc15180fd7778b4bf4c
parent39a22f73744d5baee30b5f134ae2e30b668b66ed
mmc: block: Fix request completion in the CQE timeout path

First, it should be noted that the CQE timeout (60 seconds) is substantial
so a CQE request that times out is really stuck, and the race between
timeout and completion is extremely unlikely. Nevertheless this patch
fixes an issue with it.

Commit ad73d6feadbd7b ("mmc: complete requests from ->timeout")
preserved the existing functionality, to complete the request.
However that had only been necessary because the block layer
timeout handler had been marking the request to prevent it from being
completed normally. That restriction was removed at the same time, the
result being that a request that has gone will have been completed anyway.
That is, the completion was unnecessary.

At the time, the unnecessary completion was harmless because the block
layer would ignore it, although that changed in kernel v5.0.

Note for stable, this patch will not apply cleanly without patch "mmc:
core: Fix recursive locking issue in CQE recovery path"

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Fixes: ad73d6feadbd7b ("mmc: complete requests from ->timeout")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200508062227.23144-1-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/queue.c