block: fix race between switching elevator and removing queues
PATCH 1/1 block: fix race between switching elevator and removing queues
cecf5d87ff20 ("block: split .sysfs_lock into two locks") starts to release & actuire sysfs_lock again during switching elevator. So it isn't enough to prevent switching elevator from happening by simply clearing QUEUE_FLAG_REGISTERED with holding sysfs_lock, because in-progress switch still can move on after re-acquiring the lock, meantime the flag of QUEUE_FLAG_REGISTERED won't get checked.
Fixes this issue by checking 'q->elevator' directly & locklessly after q->kobj is removed in blk_unregister_queue(), this way is safe because q->elevator can't be changed at that time.
--- block/blk-sysfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
block/blk-sysfs.c +5 -3
@@ -1030,7 +1030,6 @@ EXPORT_SYMBOL_GPL(blk_register_queue);void blk_unregister_queue (struct gendisk *disk) {struct request_queue *q = disk->queue; -bool has_elevator;if (WARN_ON (!q))return ;
@@ -1046,7 +1045,6 @@ void blk_unregister_queue(struct gendisk *disk)*/ mutex_lock (&q->sysfs_lock);blk_queue_flag_clear (QUEUE_FLAG_REGISTERED , q); - has_elevator = !!q->elevator;mutex_unlock (&q->sysfs_lock);mutex_lock (&q->sysfs_dir_lock);
@@ -1061,7 +1059,11 @@ void blk_unregister_queue(struct gendisk *disk)kobject_del (&q->kobj);blk_trace_remove_sysfs (disk_to_dev (disk)); -if (has_elevator) +/* +* q->kobj has been removed, so it is safe to check if elevator +* exists without holding q->sysfs_lock. +*/ +if (q->elevator)elv_unregister_queue (q);mutex_unlock (&q->sysfs_dir_lock);
Signature · 1 line
2.20.1
Jens Axboe
maintainerQuoted 10 lines · Ming Lei
cecf5d87ff20("block: split .sysfs_lock into two locks") starts to release & actuiresysfs_lockagain during switching elevator. So it isn't enough to prevent switching elevator from happening by simply clearingQUEUE_FLAG_REGISTEREDwith holdingsysfs_lock, because in-progress switch still can move on after re-acquiring the lock, meantime the flag ofQUEUE_FLAG_REGISTEREDwon't get checked.Fixes this issue by checking '
q->elevator' directly & locklessly afterq->kobjis removed inblk_unregister_queue(), this way is safe becauseq->elevatorcan't be changed at that time.
Thanks Ming, looks good to me and cleaner than before too.
Signature · 1 line
Jens Axboe