[PATCH] block: release rq qos structures for queue without disk

[PATCH] block: release rq qos structures for queue without disk

[Ming Lei]

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

Re: [PATCH] block: release rq qos structures for queue without disk

[Christoph Hellwig]

Looks good (for 5.17 only):

Reviewed-by: Christoph Hellwig <hch@lst.de>

Re: [PATCH] block: release rq qos structures for queue without disk

[Bart Van Assche]

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>

Re: [PATCH] block: release rq qos structures for queue without disk

[Jens Axboe]

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

Re: [PATCH] block: release rq qos structures for queue without disk

[Jens Axboe]

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