Skip to content

Commit fb01a29

Browse files
Ming Leiaxboe
authored andcommitted
blk-mq: add new API of blk_mq_hctx_set_fq_lock_class
flush_end_io() may be called recursively from some driver, such as nvme-loop, so lockdep may complain 'possible recursive locking'. Commit b3c6a59("block: Fix a lockdep complaint triggered by request queue flushing") tried to address this issue by assigning dynamically allocated per-flush-queue lock class. This solution adds synchronize_rcu() for each hctx's release handler, and causes horrible SCSI MQ probe delay(more than half an hour on megaraid sas). Add new API of blk_mq_hctx_set_fq_lock_class() for these drivers, so we just need to use driver specific lock class for avoiding the lockdep warning of 'possible recursive locking'. Tested-by: Kashyap Desai <[email protected]> Reported-by: Qian Cai <[email protected]> Cc: Sumit Saxena <[email protected]> Cc: John Garry <[email protected]> Cc: Kashyap Desai <[email protected]> Cc: Bart Van Assche <[email protected]> Cc: Hannes Reinecke <[email protected]> Signed-off-by: Ming Lei <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent cc29e1b commit fb01a29

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

block/blk-flush.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,3 +490,28 @@ void blk_free_flush_queue(struct blk_flush_queue *fq)
490490
kfree(fq->flush_rq);
491491
kfree(fq);
492492
}
493+
494+
/*
495+
* Allow driver to set its own lock class to fq->mq_flush_lock for
496+
* avoiding lockdep complaint.
497+
*
498+
* flush_end_io() may be called recursively from some driver, such as
499+
* nvme-loop, so lockdep may complain 'possible recursive locking' because
500+
* all 'struct blk_flush_queue' instance share same mq_flush_lock lock class
501+
* key. We need to assign different lock class for these driver's
502+
* fq->mq_flush_lock for avoiding the lockdep warning.
503+
*
504+
* Use dynamically allocated lock class key for each 'blk_flush_queue'
505+
* instance is over-kill, and more worse it introduces horrible boot delay
506+
* issue because synchronize_rcu() is implied in lockdep_unregister_key which
507+
* is called for each hctx release. SCSI probing may synchronously create and
508+
* destroy lots of MQ request_queues for non-existent devices, and some robot
509+
* test kernel always enable lockdep option. It is observed that more than half
510+
* an hour is taken during SCSI MQ probe with per-fq lock class.
511+
*/
512+
void blk_mq_hctx_set_fq_lock_class(struct blk_mq_hw_ctx *hctx,
513+
struct lock_class_key *key)
514+
{
515+
lockdep_set_class(&hctx->fq->mq_flush_lock, key);
516+
}
517+
EXPORT_SYMBOL_GPL(blk_mq_hctx_set_fq_lock_class);

include/linux/blk-mq.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <linux/blkdev.h>
66
#include <linux/sbitmap.h>
77
#include <linux/srcu.h>
8+
#include <linux/lockdep.h>
89

910
struct blk_mq_tags;
1011
struct blk_flush_queue;
@@ -594,5 +595,7 @@ static inline void blk_mq_cleanup_rq(struct request *rq)
594595
}
595596

596597
blk_qc_t blk_mq_submit_bio(struct bio *bio);
598+
void blk_mq_hctx_set_fq_lock_class(struct blk_mq_hw_ctx *hctx,
599+
struct lock_class_key *key);
597600

598601
#endif

0 commit comments

Comments
 (0)