Skip to contentSkip to conversation

block: release rq qos structures for queue without disk

PATCH Applied Ming Lei 4 participants 5 messages Mar 14, 2022

Subsystems (2)
lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 block: release rq qos structures for queue without disk

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 <[email protected]>
Fixes 8e141f9eb803 ("block: drain file system I/O on del_gendisk")
Reported-by [email protected]
---
 block/blk-core.c | 4 ++++
 1 file changed, 4 insertions(+)
block/blk-core.c +4 -0
index ce08f0aa9dfc..4965307cf7d6 100644
@@ -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);
Signature · 1 line
2.31.1
Reviewed-by on v1 1/1
#2 lore raw
In reply to Ming Lei
Quoted 7 lines · 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, ...

Quoted 5 lines

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.

maintainer Applied
#3 lore raw
In reply to Ming Lei
Quoted 7 lines · 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, ...

Quoted 5 lines

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.

Signature · 1 line
Jens Axboe
maintainer Applied
#4 lore raw
In reply to Ming Lei
Quoted 8 lines · 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, ...

[...]

Applied, thanks!

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

      commit: daaca3522a8e67c46e39ef09c1d542e866f85f3b

Best regards,

Signature · 1 line
Jens Axboe