Skip to content

Commit 705cda9

Browse files
Bart Van Asscheaxboe
authored andcommitted
blk-mq: Make it safe to use RCU to iterate over blk_mq_tag_set.tag_list
Since the next patch in this series will use RCU to iterate over tag_list, make this safe. Add lockdep_assert_held() statements in functions that iterate over tag_list to make clear that using list_for_each_entry() instead of list_for_each_entry_rcu() is fine in these functions. Signed-off-by: Bart Van Assche <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Hannes Reinecke <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent d945a36 commit 705cda9

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

block/blk-mq.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2111,6 +2111,8 @@ static void blk_mq_update_tag_set_depth(struct blk_mq_tag_set *set, bool shared)
21112111
{
21122112
struct request_queue *q;
21132113

2114+
lockdep_assert_held(&set->tag_list_lock);
2115+
21142116
list_for_each_entry(q, &set->tag_list, tag_set_list) {
21152117
blk_mq_freeze_queue(q);
21162118
queue_set_hctx_shared(q, shared);
@@ -2123,14 +2125,17 @@ static void blk_mq_del_queue_tag_set(struct request_queue *q)
21232125
struct blk_mq_tag_set *set = q->tag_set;
21242126

21252127
mutex_lock(&set->tag_list_lock);
2126-
list_del_init(&q->tag_set_list);
2128+
list_del_rcu(&q->tag_set_list);
2129+
INIT_LIST_HEAD(&q->tag_set_list);
21272130
if (list_is_singular(&set->tag_list)) {
21282131
/* just transitioned to unshared */
21292132
set->flags &= ~BLK_MQ_F_TAG_SHARED;
21302133
/* update existing queue */
21312134
blk_mq_update_tag_set_depth(set, false);
21322135
}
21332136
mutex_unlock(&set->tag_list_lock);
2137+
2138+
synchronize_rcu();
21342139
}
21352140

21362141
static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set,
@@ -2148,7 +2153,7 @@ static void blk_mq_add_queue_tag_set(struct blk_mq_tag_set *set,
21482153
}
21492154
if (set->flags & BLK_MQ_F_TAG_SHARED)
21502155
queue_set_hctx_shared(q, true);
2151-
list_add_tail(&q->tag_set_list, &set->tag_list);
2156+
list_add_tail_rcu(&q->tag_set_list, &set->tag_list);
21522157

21532158
mutex_unlock(&set->tag_list_lock);
21542159
}
@@ -2639,6 +2644,8 @@ void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)
26392644
{
26402645
struct request_queue *q;
26412646

2647+
lockdep_assert_held(&set->tag_list_lock);
2648+
26422649
if (nr_hw_queues > nr_cpu_ids)
26432650
nr_hw_queues = nr_cpu_ids;
26442651
if (nr_hw_queues < 1 || nr_hw_queues == set->nr_hw_queues)

0 commit comments

Comments
 (0)