]> git.baikalelectronics.ru Git - kernel.git/commit
block: don't release queue's sysfs lock during switching elevator
authorMing Lei <ming.lei@redhat.com>
Mon, 23 Sep 2019 15:12:09 +0000 (23:12 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 26 Sep 2019 06:45:51 +0000 (00:45 -0600)
commitc03f09c9d4eec808c4b1f5111187dc076084b1bc
tree473504d2f44f9ec2ff427649a8434b2faccec793
parent46718724aa7c97b6ccbb6c42634ffe85f8b819d5
block: don't release queue's sysfs lock during switching elevator

e2fc0270e742 ("block: split .sysfs_lock into two locks") starts to
release & acquire sysfs_lock before registering/un-registering elevator
queue during switching elevator for avoiding potential deadlock from
showing & storing 'queue/iosched' attributes and removing elevator's
kobject.

Turns out there isn't such deadlock because 'q->sysfs_lock' isn't
required in .show & .store of queue/iosched's attributes, and just
elevator's sysfs lock is acquired in elv_iosched_store() and
elv_iosched_show(). So it is safe to hold queue's sysfs lock when
registering/un-registering elevator queue.

The biggest issue is that commit e2fc0270e742 assumes that concurrent
write on 'queue/scheduler' can't happen. However, this assumption isn't
true, because kernfs_fop_write() only guarantees that concurrent write
aren't called on the same open file, but the write could be from
different open on the file. So we can't release & re-acquire queue's
sysfs lock during switching elevator, otherwise use-after-free on
elevator could be triggered.

Fixes the issue by not releasing queue's sysfs lock during switching
elevator.

Fixes: e2fc0270e742 ("block: split .sysfs_lock into two locks")
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Cc: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-sysfs.c
block/elevator.c