The patch below does not apply to the 6.0-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Possible dependencies:
813e693023ba ("blk-iolatency: Fix memory leak on add_disk() failures") 00ad6991bbae ("blk-cgroup: pass a gendisk to blkg_destroy_all") e13793bae659 ("blk-throttle: pass a gendisk to blk_throtl_init and blk_throtl_exit") 9823538fb7ef ("blk-cgroup: pass a gendisk to blkcg_init_queue and blkcg_exit_queue") 4a69f325aa43 ("blk-cgroup: cleanup the blkg_lookup family of functions") 928f6f00a91e ("blk-cgroup: remove blk_queue_root_blkg") 33dc62796cb6 ("blk-cgroup: fix error unwinding in blkcg_init_queue")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 813e693023ba10da9e75067780f8378465bf27cc Mon Sep 17 00:00:00 2001 From: Tejun Heo tj@kernel.org Date: Sat, 10 Dec 2022 08:33:10 -1000 Subject: [PATCH] blk-iolatency: Fix memory leak on add_disk() failures
When a gendisk is successfully initialized but add_disk() fails such as when a loop device has invalid number of minor device numbers specified, blkcg_init_disk() is called during init and then blkcg_exit_disk() during error handling. Unfortunately, iolatency gets initialized in the former but doesn't get cleaned up in the latter.
This is because, in non-error cases, the cleanup is performed by del_gendisk() calling rq_qos_exit(), the assumption being that rq_qos policies, iolatency being one of them, can only be activated once the disk is fully registered and visible. That assumption is true for wbt and iocost, but not so for iolatency as it gets initialized before add_disk() is called.
It is desirable to lazy-init rq_qos policies because they are optional features and add to hot path overhead once initialized - each IO has to walk all the registered rq_qos policies. So, we want to switch iolatency to lazy init too. However, that's a bigger change. As a fix for the immediate problem, let's just add an extra call to rq_qos_exit() in blkcg_exit_disk(). This is safe because duplicate calls to rq_qos_exit() become noop's.
Signed-off-by: Tejun Heo tj@kernel.org Reported-by: darklight2357@icloud.com Cc: Josef Bacik josef@toxicpanda.com Cc: Linus Torvalds torvalds@linux-foundation.org Fixes: d70675121546 ("block: introduce blk-iolatency io controller") Cc: stable@vger.kernel.org # v4.19+ Reviewed-by: Christoph Hellwig hch@lst.de Link: https://lore.kernel.org/r/Y5TQ5gm3O4HXrXR3@slm.duckdns.org Signed-off-by: Jens Axboe axboe@kernel.dk
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 50ac0dce95b8..ce6a2b7d3dfb 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -33,6 +33,7 @@ #include "blk-cgroup.h" #include "blk-ioprio.h" #include "blk-throttle.h" +#include "blk-rq-qos.h"
/* * blkcg_pol_mutex protects blkcg_policy[] and policy [de]activation. @@ -1322,6 +1323,7 @@ int blkcg_init_disk(struct gendisk *disk) void blkcg_exit_disk(struct gendisk *disk) { blkg_destroy_all(disk); + rq_qos_exit(disk->queue); blk_throtl_exit(disk); }