block: do not allow updates through sysfs until registration completes
PATCH 1/1 block: do not allow updates through sysfs until registration completes
When a new disk shows up, sysfs queue directory is created before elevator is registered. This allows a user to attempt a scheduler switch even though the initial registration hasn't completed yet.
In one scenario, blk_register_queue() calls elv_register_queue() and right before cfq_registered_queue() is called, another process executes elevator_switch() and replaces q->elevator with deadline scheduler. When cfq_registered_queue() executes it interprets e->elevator_data as struct cfq_data even though it is actually struct deadline_data.
Grab q->sysfs_lock in blk_register_queue() to synchronize with sysfs callers.
--- block/blk-sysfs.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
block/blk-sysfs.c +12 -7
@@ -902,17 +902,20 @@ int blk_register_queue(struct gendisk *disk)if (ret)return ret; +if (q->mq_ops) +blk_mq_register_dev (dev, q); + +/* Prevent changes through sysfs until registration is completed. */ +mutex_lock (&q->sysfs_lock); + ret =kobject_add (&q->kobj,kobject_get (&dev->kobj),"%s" ,"queue" );if (ret <0 ) {blk_trace_remove_sysfs (dev); -return ret; + goto unlock; }kobject_uevent (&q->kobj,KOBJ_ADD ); -if (q->mq_ops) -blk_mq_register_dev (dev, q); -blk_wb_init (q);if (q->request_fn || (q->mq_ops && q->elevator)) {
@@ -922,11 +925,13 @@ int blk_register_queue(struct gendisk *disk)kobject_del (&q->kobj);blk_trace_remove_sysfs (dev);kobject_put (&dev->kobj); -return ret; + goto unlock; } } - -return 0 ; + ret =0 ; +unlock: +mutex_unlock (&q->sysfs_lock); +return ret; }void blk_unregister_queue (struct gendisk *disk)
Signature · 1 line
2.11.0.483.g087da7b7c-goog
Jens Axboe
maintainerQuoted 4 lines · Tahsin Erdogan
When a new disk shows up, sysfs queue directory is created before elevator is registered. This allows a user to attempt a scheduler switch even though the initial registration hasn't completed yet.
Quoted 8 lines
In one scenario,
blk_register_queue()callselv_register_queue()and right beforecfq_registered_queue()is called, another process executeselevator_switch()and replacesq->elevatorwith deadline scheduler. Whencfq_registered_queue()executes it interpretse->elevator_dataas structcfq_dataeven though it is actually structdeadline_data.Grab
q->sysfs_lockinblk_register_queue()to synchronize with sysfs callers.
Thanks, this looks good to me - both the grabbing of the lock, and the ordering wrt UDEV_ADD. Queued up.
Signature · 1 line
Jens Axboe