Skip to contentSkip to conversation

block: fix module reference leak in mq-deadline I/O scheduler

PATCH Applied Nilay Shroff 4 participants 4 messages Jul 19, 2025 – Jul 21, 2025 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 1e44bedbc921 ("block: unifying elevator change")

---
Note: This patch is based on https://lore.kernel.org/all/[email protected]/
So please apply this patch after the above is merged.

---
 block/elevator.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
block/elevator.c +13 -6
index 83d0bfb90a03..2bbf7ad7f4db 100644
@@ -719,7 +719,8 @@ void elevator_set_default(struct request_queue *q)
 		.name = "mq-deadline",
 		.no_uevent = true,
 	};
-	int err = 0;
+	int err;
+	struct elevator_type *e;
 
 	/* now we allow to switch elevator */
 	blk_queue_flag_clear(QUEUE_FLAG_NO_ELV_SWITCH, q);
@@ -732,12 +733,18 @@ void elevator_set_default(struct request_queue *q)
 	 * have multiple queues or mq-deadline is not available, default
 	 * to "none".
 	 */
-	if (elevator_find_get(ctx.name) && (q->nr_hw_queues == 1 ||
-			 blk_mq_is_shared_tags(q->tag_set->flags)))
+	e = elevator_find_get(ctx.name);
+	if (!e)
+		return;
+
+	if ((q->nr_hw_queues == 1 ||
+			blk_mq_is_shared_tags(q->tag_set->flags))) {
 		err = elevator_change(q, &ctx);
-	if (err < 0)
-		pr_warn("\"%s\" elevator initialization, failed %d, "
-			"falling back to \"none\"\n", ctx.name, err);
+		if (err < 0)
+			pr_warn("\"%s\" elevator initialization, failed %d, falling back to \"none\"\n",
+					ctx.name, err);
+	}
+	elevator_put(e);
 }
 
 void elevator_set_none(struct request_queue *q)
Signature · 1 line
2.50.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 45 lines · Nilay Shroff

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 1e44bedbc921 ("block: unifying elevator change")

---
Note: This patch is based on https://lore.kernel.org/all/[email protected]/
So please apply this patch after the above is merged.

---
 block/elevator.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
block/elevator.c +7 -3
index 83d0bfb90a03..2bbf7ad7f4db 100644
@@ -719,7 +719,8 @@ void elevator_set_default(struct request_queue *q)
 		.name = "mq-deadline",
 		.no_uevent = true,
 	};
-	int err = 0;
+	int err;
+	struct elevator_type *e;
 
 	/* now we allow to switch elevator */
 	blk_queue_flag_clear(QUEUE_FLAG_NO_ELV_SWITCH, q);
@@ -732,12 +733,18 @@ void elevator_set_default(struct request_queue *q)
 	 * have multiple queues or mq-deadline is not available, default
 	 * to "none".
 	 */
-	if (elevator_find_get(ctx.name) && (q->nr_hw_queues == 1 ||
-			 blk_mq_is_shared_tags(q->tag_set->flags)))
+	e = elevator_find_get(ctx.name);
+	if (!e)
+		return;
+
+	if ((q->nr_hw_queues == 1 ||

block/elevator.c void elevator_set_default(struct request_queue *q) · line 747

Quoted 10 lines
block/elevator.c +6 -3
+			blk_mq_is_shared_tags(q->tag_set->flags))) {
 		err = elevator_change(q, &ctx);
-	if (err < 0)
-		pr_warn("\"%s\" elevator initialization, failed %d, "
-			"falling back to \"none\"\n", ctx.name, err);
+		if (err < 0)
+			pr_warn("\"%s\" elevator initialization, failed %d, falling back to \"none\"\n",
+					ctx.name, err);
+	}
+	elevator_put(e);

Looks fine,

Thanks,
Ming

Reviewed-by on v1 1/1
#2 lore raw
In reply to Nilay Shroff
Quoted 11 lines · Nilay Shroff

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.

Quoted 9 lines
Fixes 1e44bedbc921 ("block: unifying elevator change")

---
Note: This patch is based on https://lore.kernel.org/all/[email protected]/
So please apply this patch after the above is merged.

---
  block/elevator.c | 19 +++++++++++++------
  1 file changed, 13 insertions(+), 6 deletions(-)

Cheers,

Hannes

Signature · 4 lines
Dr. Hannes Reinecke                  Kernel Storage Architect
[email protected]                                +49 911 74053 688
SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg
HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich
maintainer Applied
#3 lore raw
In reply to Nilay Shroff
Quoted 9 lines · Nilay Shroff

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.

[...]

Applied, thanks!

[1/1] block: fix module reference leak in mq-deadline I/O scheduler

      commit: 1966554b2e82b89d4f6490f430ce76a379e23f1f

Best regards,

Signature · 1 line
Jens Axboe