From: Ming Lei <ming.lei@redhat.com>
To: zhengbin <zhengbin13@huawei.com>
Cc: axboe@kernel.dk, bvanassche@acm.org, jejb@linux.ibm.com,
martin.petersen@oracle.com, linux-block@vger.kernel.org,
houtao1@huawei.com
Subject: Re: [PATCH] blk-mq: move cancel of requeue_work to the front of blk_exit_queue
Date: Mon, 12 Aug 2019 21:00:20 +0800 [thread overview]
Message-ID: <20190812130018.GA29359@ming.t460p> (raw)
In-Reply-To: <1565613415-24807-1-git-send-email-zhengbin13@huawei.com>
On Mon, Aug 12, 2019 at 08:36:55PM +0800, zhengbin wrote:
> blk_exit_queue will free elevator_data, while blk_mq_requeue_work
> will access it. Move cancel of requeue_work to the front of
> blk_exit_queue to avoid use-after-free.
>
> blk_exit_queue blk_mq_requeue_work
> __elevator_exit blk_mq_run_hw_queues
> blk_mq_exit_sched blk_mq_run_hw_queue
> dd_exit_queue blk_mq_hctx_has_pending
> kfree(elevator_data) blk_mq_sched_has_work
> dd_has_work
>
> Fixes: fbc2a15e3433 ("blk-mq: move cancel of requeue_work into blk_mq_release")
> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> ---
> block/blk-mq.c | 2 --
> block/blk-sysfs.c | 3 +++
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index f78d328..a8e6a58 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -2666,8 +2666,6 @@ void blk_mq_release(struct request_queue *q)
> struct blk_mq_hw_ctx *hctx, *next;
> int i;
>
> - cancel_delayed_work_sync(&q->requeue_work);
> -
> queue_for_each_hw_ctx(q, hctx, i)
> WARN_ON_ONCE(hctx && list_empty(&hctx->hctx_list));
>
> diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
> index 977c659..9bfa3ea 100644
> --- a/block/blk-sysfs.c
> +++ b/block/blk-sysfs.c
> @@ -892,6 +892,9 @@ static void __blk_release_queue(struct work_struct *work)
>
> blk_free_queue_stats(q->stats);
>
> + if (queue_is_mq(q))
> + cancel_delayed_work_sync(&q->requeue_work);
> +
> blk_exit_queue(q);
>
> blk_queue_free_zone_bitmaps(q);
Looks fine:
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Thanks,
Ming
next prev parent reply other threads:[~2019-08-12 13:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 12:36 [PATCH] blk-mq: move cancel of requeue_work to the front of blk_exit_queue zhengbin
2019-08-12 13:00 ` Ming Lei [this message]
2019-08-12 14:14 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190812130018.GA29359@ming.t460p \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=houtao1@huawei.com \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=zhengbin13@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).