]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
block: serialize elevator changes for the same queue using a writer lock
authorShin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Thu, 16 Jul 2026 09:22:37 +0000 (18:22 +0900)
committerJens Axboe <axboe@kernel.dk>
Thu, 16 Jul 2026 12:08:38 +0000 (06:08 -0600)
commit4ff58d6bc9dd4c7fe6092d0ab5677a79ebc788af
treecbd11b104eea2fb0e2ed0abed0d5f0a8419f4029
parentbd2df8dc72201f626d66ca97f2afc8b7f2740713
block: serialize elevator changes for the same queue using a writer lock

When elevator_change() is called concurrently for the same queue, the
elevator_change_done() function runs concurrently as well. This function
adds or deletes kobjects for the debugfs entry of the queue. Then the
concurrent calls cause memory corruption of the kobjects and result in a
process hang. The core part of the elevator switch is protected by queue
freeze and q->elevator_lock. However, since the commit 559dc11143eb
("block: move elv_register[unregister]_queue out of elevator_lock"), the
elevator_change_done() is not serialized. Hence the memory corruption
and the hang.

The failures are observed when udev-worker writes to a sysfs
queue/scheduler attribute file while the blktests test case block/005
writes to the same attribute file. The failure also can be recreated by
running two processes that write to the same queue/scheduler file
concurrently. The failure is observed since another commit 370ac285f23a
("block: avoid cpu_hotplug_lock depedency on freeze_lock"). This commit
changed the behavior of queue freeze and it unveiled the failure.

Fix the failure by changing elv_iosched_store() to acquire
update_nr_hwq_lock as the writer lock instead of the reader lock. This
serializes the whole elevator switch steps, including the
elevator_change_done() call.

Fixes: 559dc11143eb ("block: move elv_register[unregister]_queue out of elevator_lock")
Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Reviewed-by: Ming Lei <tom.leiming@gmail.com>
Link: https://patch.msgid.link/20260716092237.1305030-1-shinichiro.kawasaki@wdc.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/elevator.c