]> git.baikalelectronics.ru Git - kernel.git/commit
block: release rq qos structures for queue without disk
authorMing Lei <ming.lei@redhat.com>
Mon, 14 Mar 2022 04:30:18 +0000 (12:30 +0800)
committerJens Axboe <axboe@kernel.dk>
Mon, 14 Mar 2022 20:05:41 +0000 (14:05 -0600)
commitfabf83312e18af91676a1619dfc234486edc6c0c
treef2e3ea824b72c3fe400e05162b6752e98bdd8012
parent5664e97abe0fa466f662438a09e5152fee77cad8
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
7786af00b12a ("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: 7786af00b12a ("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>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220314043018.177141-1-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c