blk-mq: move lockdep_assert_held() into elevator_exit
PATCH 1/1 blk-mq: move lockdep_assert_held() into elevator_exit
Commit c48dac137a62 ("block: don't hold q->sysfs_lock in elevator_init_mq") removes q->sysfs_lock from elevator_init_mq(), but forgot to deal with lockdep_assert_held() called in blk_mq_sched_free_requests() which is run in failure path of elevator_init_mq().
blk_mq_sched_free_requests() is called in the following 3 functions:
elevator_init_mq()
elevator_exit()
blk_cleanup_queue()
In blk_cleanup_queue(), blk_mq_sched_free_requests() is followed exactly by 'mutex_lock(&q->sysfs_lock)'.
So moving the lockdep_assert_held() from blk_mq_sched_free_requests() into elevator_exit() for fixing the report by syzbot.
Fixed: c48dac137a62 ("block: don't hold q->sysfs_lock in elevator_init_mq")
--- block/blk-mq-sched.c | 2 -- block/blk.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
block/blk-mq-sched.c +0 -2
@@ -555,8 +555,6 @@ void blk_mq_sched_free_requests(struct request_queue *q)struct blk_mq_hw_ctx *hctx;int i; -lockdep_assert_held (&q->sysfs_lock); -queue_for_each_hw_ctx (q, hctx, i) {if (hctx->sched_tags)blk_mq_free_rqs (q->tag_set, hctx->sched_tags, i);
block/blk.h +2 -0
@@ -194,6 +194,8 @@ void elv_unregister_queue(struct request_queue *q);static inline void elevator_exit (struct request_queue *q,struct elevator_queue *e) { +lockdep_assert_held (&q->sysfs_lock); +blk_mq_sched_free_requests (q);__elevator_exit (q, e); }
Signature · 1 line
2.20.1
Quoted 11 lines · Ming Lei
Commit
c48dac137a62("block: don't holdq->sysfs_lockinelevator_init_mq") removesq->sysfs_lockfromelevator_init_mq(), but forgot to deal withlockdep_assert_held()called inblk_mq_sched_free_requests()which is run in failure path ofelevator_init_mq().
blk_mq_sched_free_requests()is called in the following 3 functions:
elevator_init_mq()
elevator_exit()
blk_cleanup_queue()
Quoted 5 lines
In
blk_cleanup_queue(),blk_mq_sched_free_requests()is followed exactly by 'mutex_lock(&q->sysfs_lock)'.So moving the
lockdep_assert_held()fromblk_mq_sched_free_requests()intoelevator_exit()for fixing the report by syzbot.
Quoted 46 lines · Ming Lei
Commit
c48dac137a62("block: don't holdq->sysfs_lockinelevator_init_mq") removesq->sysfs_lockfromelevator_init_mq(), but forgot to deal withlockdep_assert_held()called inblk_mq_sched_free_requests()which is run in failure path ofelevator_init_mq().
blk_mq_sched_free_requests()is called in the following 3 functions:
elevator_init_mq()
elevator_exit()
blk_cleanup_queue()In
blk_cleanup_queue(),blk_mq_sched_free_requests()is followed exactly by 'mutex_lock(&q->sysfs_lock)'.So moving the
lockdep_assert_held()fromblk_mq_sched_free_requests()intoelevator_exit()for fixing the report by syzbot.Cc Bart Van Assche <[email protected]>Cc Damien Le Moal <[email protected]>Reported-by [email protected]Fixed:
c48dac137a62("block: don't holdq->sysfs_lockinelevator_init_mq")Signed-off-by Ming Lei <[email protected]>--- block/blk-mq-sched.c | 2 -- block/blk.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)block/blk-mq-sched.c +0
-2@@ -555,8 +555,6 @@ void blk_mq_sched_free_requests(struct request_queue *q)struct blk_mq_hw_ctx *hctx;int i; -lockdep_assert_held (&q->sysfs_lock); -queue_for_each_hw_ctx (q, hctx, i) {if (hctx->sched_tags)blk_mq_free_rqs (q->tag_set, hctx->sched_tags, i);block/blk.h +0
-0
block/blk.h void elv_unregister_queue(struct request_queue *q); · line 201
Quoted 8 lines
block/blk.h +2
-0@@ -194,6 +194,8 @@ void elv_unregister_queue(struct request_queue *q);static inline void elevator_exit (struct request_queue *q,struct elevator_queue *e) { +lockdep_assert_held (&q->sysfs_lock); +blk_mq_sched_free_requests (q);__elevator_exit (q, e); }
Signature · 2 lines
Damien Le Moal Western Digital Research
Quoted 11 lines · Ming Lei
Commit
c48dac137a62("block: don't holdq->sysfs_lockinelevator_init_mq") removesq->sysfs_lockfromelevator_init_mq(), but forgot to deal withlockdep_assert_held()called inblk_mq_sched_free_requests()which is run in failure path ofelevator_init_mq().
blk_mq_sched_free_requests()is called in the following 3 functions:
elevator_init_mq()
elevator_exit()
blk_cleanup_queue()
Quoted 5 lines
In
blk_cleanup_queue(),blk_mq_sched_free_requests()is followed exactly by 'mutex_lock(&q->sysfs_lock)'.So moving the
lockdep_assert_held()fromblk_mq_sched_free_requests()intoelevator_exit()for fixing the report by syzbot.
Applied, thanks Ming.
Signature · 1 line
Jens Axboe