* [PATCH] block: release rq qos structures for queue without disk
@ 2022-03-14 4:30 Ming Lei
2022-03-14 6:18 ` Christoph Hellwig
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ming Lei @ 2022-03-14 4:30 UTC (permalink / raw)
To: Jens Axboe
Cc: linux-block, Ming Lei, Christoph Hellwig, stable,
syzbot+b42749a851a47a0f581b
blkcg_init_queue() may add rq qos structures to request queue, previously
blk_cleanup_queue() calls rq_qos_exit() to release them, but commit
8e141f9eb803 ("block: drain file system I/O on del_gendisk")
moves rq_qos_exit() into del_gendisk(), so memory leak is caused
because queues may not have disk, such as un-present scsi luns, nvme
admin queue, ...
Fixes the issue by adding rq_qos_exit() to blk_cleanup_queue() back.
BTW, v5.18 won't need this patch any more since we move
blkcg_init_queue()/blkcg_exit_queue() into disk allocation/release
handler, and patches have been in for-5.18/block.
Cc: Christoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org
Fixes: 8e141f9eb803 ("block: drain file system I/O on del_gendisk")
Reported-by: syzbot+b42749a851a47a0f581b@syzkaller.appspotmail.com
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
block/blk-core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/block/blk-core.c b/block/blk-core.c
index ce08f0aa9dfc..4965307cf7d6 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -50,6 +50,7 @@
#include "blk-pm.h"
#include "blk-cgroup.h"
#include "blk-throttle.h"
+#include "blk-rq-qos.h"
struct dentry *blk_debugfs_root;
@@ -321,6 +322,9 @@ void blk_cleanup_queue(struct request_queue *q)
*/
blk_freeze_queue(q);
+ /* cleanup rq qos structures for queue without disk */
+ rq_qos_exit(q);
+
blk_queue_flag_set(QUEUE_FLAG_DEAD, q);
blk_sync_queue(q);
--
2.31.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] block: release rq qos structures for queue without disk
2022-03-14 4:30 [PATCH] block: release rq qos structures for queue without disk Ming Lei
@ 2022-03-14 6:18 ` Christoph Hellwig
2022-03-14 17:26 ` Bart Van Assche
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2022-03-14 6:18 UTC (permalink / raw)
To: Ming Lei
Cc: Jens Axboe, linux-block, Christoph Hellwig, stable,
syzbot+b42749a851a47a0f581b
Looks good (for 5.17 only):
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] block: release rq qos structures for queue without disk
2022-03-14 4:30 [PATCH] block: release rq qos structures for queue without disk Ming Lei
2022-03-14 6:18 ` Christoph Hellwig
@ 2022-03-14 17:26 ` Bart Van Assche
2022-03-14 20:06 ` Jens Axboe
2022-03-14 20:23 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Bart Van Assche @ 2022-03-14 17:26 UTC (permalink / raw)
To: Ming Lei, Jens Axboe
Cc: linux-block, Christoph Hellwig, stable, syzbot+b42749a851a47a0f581b
On 3/13/22 21:30, Ming Lei wrote:
> blkcg_init_queue() may add rq qos structures to request queue, previously
> blk_cleanup_queue() calls rq_qos_exit() to release them, but commit
> 8e141f9eb803 ("block: drain file system I/O on del_gendisk")
> moves rq_qos_exit() into del_gendisk(), so memory leak is caused
> because queues may not have disk, such as un-present scsi luns, nvme
> admin queue, ...
>
> Fixes the issue by adding rq_qos_exit() to blk_cleanup_queue() back.
>
> BTW, v5.18 won't need this patch any more since we move
> blkcg_init_queue()/blkcg_exit_queue() into disk allocation/release
> handler, and patches have been in for-5.18/block.
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] block: release rq qos structures for queue without disk
2022-03-14 4:30 [PATCH] block: release rq qos structures for queue without disk Ming Lei
2022-03-14 6:18 ` Christoph Hellwig
2022-03-14 17:26 ` Bart Van Assche
@ 2022-03-14 20:06 ` Jens Axboe
2022-03-14 20:23 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Jens Axboe @ 2022-03-14 20:06 UTC (permalink / raw)
To: Ming Lei
Cc: linux-block, Christoph Hellwig, stable, syzbot+b42749a851a47a0f581b
On 3/13/22 10:30 PM, Ming Lei wrote:
> blkcg_init_queue() may add rq qos structures to request queue, previously
> blk_cleanup_queue() calls rq_qos_exit() to release them, but commit
> 8e141f9eb803 ("block: drain file system I/O on del_gendisk")
> moves rq_qos_exit() into del_gendisk(), so memory leak is caused
> because queues may not have disk, such as un-present scsi luns, nvme
> admin queue, ...
>
> Fixes the issue by adding rq_qos_exit() to blk_cleanup_queue() back.
>
> BTW, v5.18 won't need this patch any more since we move
> blkcg_init_queue()/blkcg_exit_queue() into disk allocation/release
> handler, and patches have been in for-5.18/block.
Applied, but it's a bit strange to send a 5.17 only patch against the
5.18 tree... Hand applied.
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] block: release rq qos structures for queue without disk
2022-03-14 4:30 [PATCH] block: release rq qos structures for queue without disk Ming Lei
` (2 preceding siblings ...)
2022-03-14 20:06 ` Jens Axboe
@ 2022-03-14 20:23 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Jens Axboe @ 2022-03-14 20:23 UTC (permalink / raw)
To: Ming Lei
Cc: syzbot+b42749a851a47a0f581b, linux-block, Christoph Hellwig, stable
On Mon, 14 Mar 2022 12:30:18 +0800, Ming Lei wrote:
> blkcg_init_queue() may add rq qos structures to request queue, previously
> blk_cleanup_queue() calls rq_qos_exit() to release them, but commit
> 8e141f9eb803 ("block: drain file system I/O on del_gendisk")
> moves rq_qos_exit() into del_gendisk(), so memory leak is caused
> because queues may not have disk, such as un-present scsi luns, nvme
> admin queue, ...
>
> [...]
Applied, thanks!
[1/1] block: release rq qos structures for queue without disk
commit: daaca3522a8e67c46e39ef09c1d542e866f85f3b
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-14 20:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-14 4:30 [PATCH] block: release rq qos structures for queue without disk Ming Lei
2022-03-14 6:18 ` Christoph Hellwig
2022-03-14 17:26 ` Bart Van Assche
2022-03-14 20:06 ` Jens Axboe
2022-03-14 20:23 ` Jens Axboe
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).