diff options
| author | Yu Kuai <yukuai3@huawei.com> | 2023-06-10 10:20:03 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-14 20:24:03 -0600 |
| commit | dd7de3704af9989b780693d51eaea49a665bd9c2 (patch) | |
| tree | 7b42d8662e6287cb7271b5da027eeecaee6dedb5 /block/genhd.c | |
| parent | db59133e927916d8a25ee1fd8264f2808040909d (diff) | |
| download | linux-stable-dd7de3704af9989b780693d51eaea49a665bd9c2.tar.gz linux-stable-dd7de3704af9989b780693d51eaea49a665bd9c2.tar.bz2 linux-stable-dd7de3704af9989b780693d51eaea49a665bd9c2.zip | |
block: fix blktrace debugfs entries leakage
Commit 99d055b4fd4b ("block: remove per-disk debugfs files in
blk_unregister_queue") moves blk_trace_shutdown() from
blk_release_queue() to blk_unregister_queue(), this is safe if blktrace
is created through sysfs, however, there is a regression in corner
case.
blktrace can still be enabled after del_gendisk() through ioctl if
the disk is opened before del_gendisk(), and if blktrace is not shutdown
through ioctl before closing the disk, debugfs entries will be leaked.
Fix this problem by shutdown blktrace in disk_release(), this is safe
because blk_trace_remove() is reentrant.
Fixes: 99d055b4fd4b ("block: remove per-disk debugfs files in blk_unregister_queue")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230610022003.2557284-4-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/genhd.c b/block/genhd.c index 2c2f9a716822..f71f82991434 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -25,8 +25,9 @@ #include <linux/pm_runtime.h> #include <linux/badblocks.h> #include <linux/part_stat.h> -#include "blk-throttle.h" +#include <linux/blktrace_api.h> +#include "blk-throttle.h" #include "blk.h" #include "blk-mq-sched.h" #include "blk-rq-qos.h" @@ -1147,6 +1148,8 @@ static void disk_release(struct device *dev) might_sleep(); WARN_ON_ONCE(disk_live(disk)); + blk_trace_remove(disk->queue); + /* * To undo the all initialization from blk_mq_init_allocated_queue in * case of a probe failure where add_disk is never called we have to |