| Message ID | c865c0c9789d428494b67b820a78923e@hyperstone.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [PATCHv2,1/2] mmc: block: Remove error check of hw_reset on reset | expand |
On 7/10/22 18:43, Christian Löhle wrote: > To prevent any recovery work running after the queue cleanup cancel it. > Any recovery running post-cleanup dereferenced mq->card as NULL > and was not meaningful to begin with. > > Cc: stable@vger.kernel.org > > Signed-off-by: Christian Loehle <cloehle@hyperstone.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > -v2: Use cancel instead of flush > > drivers/mmc/core/queue.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c > index fefaa901b50f..86be55d7cf55 100644 > --- a/drivers/mmc/core/queue.c > +++ b/drivers/mmc/core/queue.c > @@ -493,6 +493,13 @@ void mmc_cleanup_queue(struct mmc_queue *mq) > if (blk_queue_quiesced(q)) > blk_mq_unquiesce_queue(q); > > + /* > + * If the recovery completes the last (and only remaining) request in > + * the queue, and the card has been removed, we could end up here with > + * the recovery not quite finished yet, so cancel it. > + */ > + cancel_work_sync(&mq->recovery_work); > + > blk_mq_free_tag_set(&mq->tag_set); > > /*
On Fri, 7 Oct 2022 at 17:43, Christian Löhle <CLoehle@hyperstone.com> wrote: > > To prevent any recovery work running after the queue cleanup cancel it. > Any recovery running post-cleanup dereferenced mq->card as NULL > and was not meaningful to begin with. > > Cc: stable@vger.kernel.org > > Signed-off-by: Christian Loehle <cloehle@hyperstone.com> Applied for fixes, thanks! Kind regards Uffe > --- > -v2: Use cancel instead of flush > > drivers/mmc/core/queue.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c > index fefaa901b50f..86be55d7cf55 100644 > --- a/drivers/mmc/core/queue.c > +++ b/drivers/mmc/core/queue.c > @@ -493,6 +493,13 @@ void mmc_cleanup_queue(struct mmc_queue *mq) > if (blk_queue_quiesced(q)) > blk_mq_unquiesce_queue(q); > > + /* > + * If the recovery completes the last (and only remaining) request in > + * the queue, and the card has been removed, we could end up here with > + * the recovery not quite finished yet, so cancel it. > + */ > + cancel_work_sync(&mq->recovery_work); > + > blk_mq_free_tag_set(&mq->tag_set); > > /* > -- > 2.37.3 > > Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz > Managing Director: Dr. Jan Peter Berns. > Commercial register of local courts: Freiburg HRB381782 >
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index fefaa901b50f..86be55d7cf55 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -493,6 +493,13 @@ void mmc_cleanup_queue(struct mmc_queue *mq) if (blk_queue_quiesced(q)) blk_mq_unquiesce_queue(q); + /* + * If the recovery completes the last (and only remaining) request in + * the queue, and the card has been removed, we could end up here with + * the recovery not quite finished yet, so cancel it. + */ + cancel_work_sync(&mq->recovery_work); + blk_mq_free_tag_set(&mq->tag_set); /*
To prevent any recovery work running after the queue cleanup cancel it. Any recovery running post-cleanup dereferenced mq->card as NULL and was not meaningful to begin with. Cc: stable@vger.kernel.org Signed-off-by: Christian Loehle <cloehle@hyperstone.com> --- -v2: Use cancel instead of flush drivers/mmc/core/queue.c | 7 +++++++ 1 file changed, 7 insertions(+)