From: "yukuai (C)" <yukuai3@huawei.com>
To: Bart Van Assche <bvanassche@acm.org>, <axboe@kernel.dk>,
<ming.lei@redhat.com>, <chaitanya.kulkarni@wdc.com>,
<damien.lemoal@wdc.com>, <dhowells@redhat.com>,
<asml.silence@gmail.com>, <ajay.joshi@wdc.com>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<yi.zhang@huawei.com>, <zhangxiaoxu5@huawei.com>,
<luoshijie1@huawei.com>, jan kara <jack@suse.cz>
Subject: Re: [PATCH] block: revert pushing the final release of request_queue to a workqueue.
Date: Mon, 10 Feb 2020 10:13:22 +0800 [thread overview]
Message-ID: <f89ae154-d6b7-0a3b-060d-f3131b0c1c1d@huawei.com> (raw)
In-Reply-To: <70ce8830-2594-2b7b-9ca9-5fb7edd374d7@acm.org>
On 2020/2/10 9:00, Bart Van Assche wrote:
> Have you already noticed patch "[PATCH] blktrace: Protect q->blk_trace
> with RCU"? If not, have you already tried to verify whether that patch
> fixes the use-after-free detected by syzbot?
I just tested and confirmed the patch didn't fix the problem.
By the way, I think Ming is right about "So release not by wq just
reduces the chance, instead of fixing it completely.", and "move
blk_mq_debugfs_unregister() into blk_unregister_queue()" is a good
choice. However, blk_trace_shutdown() and blk_mq_exit_queue() also
remove some files or dirs, and they may need to move to
blk_unregister_queue().
I tested following patch fixes the problem, however I'm not sure if
move blk_trace_shutdown() and blk_mu_exit_queue() is ok or we should
just move debgfs-related part.
---
block/blk-core.c | 3 ---
block/blk-sysfs.c | 12 ++++++------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/block/blk-core.c b/block/blk-core.c
index 50a5de025d5e..1ab9808e73c7 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -395,9 +395,6 @@ void blk_cleanup_queue(struct request_queue *q)
del_timer_sync(&q->backing_dev_info->laptop_mode_wb_timer);
blk_sync_queue(q);
- if (queue_is_mq(q))
- blk_mq_exit_queue(q);
-
/*
┊* In theory, request pool of sched_tags belongs to request queue.
┊* However, the current implementation requires tag_set for freeing
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index fca9b158f4a0..a0f64d641cb0 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -893,11 +893,6 @@ static void __blk_release_queue(struct work_struct
*work)
if (queue_is_mq(q))
blk_mq_release(q);
- blk_trace_shutdown(q);
-
- if (queue_is_mq(q))
- blk_mq_debugfs_unregister(q);
-
bioset_exit(&q->bio_split);
ida_simple_remove(&blk_queue_ida, q->id);
@@ -1043,8 +1038,13 @@ void blk_unregister_queue(struct gendisk *disk)
┊* Remove the sysfs attributes before unregistering the queue data
┊* structures that can be modified through sysfs.
┊*/
- if (queue_is_mq(q))
+
+ blk_trace_shutdown(q);
+ if (queue_is_mq(q)) {
blk_mq_unregister_dev(disk_to_dev(disk), q);
+ blk_mq_exit_queue(q);
+ blk_mq_debugfs_unregister(q);
+ }
kobject_uevent(&q->kobj, KOBJ_REMOVE);
kobject_del(&q->kobj);
--
2.17.2
next prev parent reply other threads:[~2020-02-10 2:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 11:10 [PATCH] block: revert pushing the final release of request_queue to a workqueue yu kuai
2020-02-07 4:09 ` Bart Van Assche
2020-02-07 6:02 ` yukuai (C)
2020-02-07 7:10 ` yukuai (C)
2020-02-07 9:30 ` Ming Lei
2020-02-07 10:26 ` yukuai (C)
2020-02-07 12:24 ` yukuai (C)
2020-02-07 13:04 ` Ming Lei
2020-02-08 6:12 ` yukuai (C)
2020-02-10 1:00 ` Bart Van Assche
2020-02-10 2:13 ` yukuai (C) [this message]
2020-02-10 2:32 ` Ming Lei
2020-02-10 3:14 ` Bart Van Assche
2020-02-10 8:49 ` yukuai (C)
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=f89ae154-d6b7-0a3b-060d-f3131b0c1c1d@huawei.com \
--to=yukuai3@huawei.com \
--cc=ajay.joshi@wdc.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=chaitanya.kulkarni@wdc.com \
--cc=damien.lemoal@wdc.com \
--cc=dhowells@redhat.com \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luoshijie1@huawei.com \
--cc=ming.lei@redhat.com \
--cc=yi.zhang@huawei.com \
--cc=zhangxiaoxu5@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).