Skip to content

Commit 1966554

Browse files
shroffniaxboe
authored andcommitted
block: fix module reference leak in mq-deadline I/O scheduler
During probe, when the block layer registers a request queue, it defaults to the mq-deadline I/O scheduler if the device is single-queue and the mq-deadline module is available. To determine availability, the elevator_set_default() invokes elevator_find_get(), which increments the module's reference count. However, this reference is never released, resulting in a module reference leak that prevents the mq-deadline module from being unloaded. This patch fixes the issue by ensuring the acquired module reference is properly released. Fixes: 1e44bed ("block: unifying elevator change") Signed-off-by: Nilay Shroff <nilay@linux.ibm.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Link: https://lore.kernel.org/r/20250719132722.769536-1-nilay@linux.ibm.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 2680efd commit 1966554

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

block/elevator.c

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,8 @@ void elevator_set_default(struct request_queue *q)
719719
.name = "mq-deadline",
720720
.no_uevent = true,
721721
};
722-
int err = 0;
722+
int err;
723+
struct elevator_type *e;
723724

724725
/* now we allow to switch elevator */
725726
blk_queue_flag_clear(QUEUE_FLAG_NO_ELV_SWITCH, q);
@@ -732,12 +733,18 @@ void elevator_set_default(struct request_queue *q)
732733
* have multiple queues or mq-deadline is not available, default
733734
* to "none".
734735
*/
735-
if (elevator_find_get(ctx.name) && (q->nr_hw_queues == 1 ||
736-
blk_mq_is_shared_tags(q->tag_set->flags)))
736+
e = elevator_find_get(ctx.name);
737+
if (!e)
738+
return;
739+
740+
if ((q->nr_hw_queues == 1 ||
741+
blk_mq_is_shared_tags(q->tag_set->flags))) {
737742
err = elevator_change(q, &ctx);
738-
if (err < 0)
739-
pr_warn("\"%s\" elevator initialization, failed %d, "
740-
"falling back to \"none\"\n", ctx.name, err);
743+
if (err < 0)
744+
pr_warn("\"%s\" elevator initialization, failed %d, falling back to \"none\"\n",
745+
ctx.name, err);
746+
}
747+
elevator_put(e);
741748
}
742749

743750
void elevator_set_none(struct request_queue *q)

0 commit comments

Comments
 (0)