]> www.infradead.org Git - users/hch/misc.git/commit
block: move removing elevator after deleting disk->queue_kobj
authorMing Lei <ming.lei@redhat.com>
Thu, 8 May 2025 08:58:05 +0000 (16:58 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 8 May 2025 15:03:44 +0000 (09:03 -0600)
commit824afb9b04648ea11531fc9047923ec07e7a943d
tree39c1e87c850effdb6e4a8e1462c02fd412fa4e89
parent8336d18c6b57a603aaa4db76bbf4f8cb08acfa5e
block: move removing elevator after deleting disk->queue_kobj

When blk_unregister_queue() is called from add_disk() failure path,
there is race in registering/unregistering elevator queue kobject
from the two code paths, because commit 559dc11143eb ("block: move
elv_register[unregister]_queue out of elevator_lock") moves elevator
queue register/unregister out of elevator lock.

Fix the race by removing elevator after deleting disk->queue_kobj,
because kobject_del(&disk->queue_kobj) drains in-progress sysfs
show()/store() of all attributes.

Fixes: 559dc11143eb ("block: move elv_register[unregister]_queue out of elevator_lock")
Reported-by: Nilay Shroff <nilay@linux.ibm.com>
Suggested-by: Nilay Shroff <nilay@linux.ibm.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Nilay Shroff <nilay@linux.ibm.com>
Link: https://lore.kernel.org/r/20250508085807.3175112-3-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-sysfs.c