Skip to content

Commit 8ee1b7b

Browse files
Kosuke Tatsukawaaxboe
authored andcommitted
blk-mq: fix waitqueue_active without memory barrier in block/blk-mq-tag.c
blk_mq_tag_update_depth() seems to be missing a memory barrier which might cause the waker to not notice the waiter and fail to send a wake_up as in the following figure. blk_mq_tag_update_depth bt_get ------------------------------------------------------------------------ if (waitqueue_active(&bs->wait)) /* The CPU might reorder the test for the waitqueue up here, before prior writes complete */ prepare_to_wait(&bs->wait, &wait, TASK_UNINTERRUPTIBLE); tag = __bt_get(hctx, bt, last_tag, tags); /* Value set in bt_update_count not visible yet */ bt_update_count(&tags->bitmap_tags, tdepth); /* blk_mq_tag_wakeup_all(tags, false); */ bt = &tags->bitmap_tags; wake_index = atomic_read(&bt->wake_index); ... io_schedule(); ------------------------------------------------------------------------ This patch adds the missing memory barrier. I found this issue when I was looking through the linux source code for places calling waitqueue_active() before wake_up*(), but without preceding memory barriers, after sending a patch to fix a similar issue in drivers/tty/n_tty.c (Details about the original issue can be found here: https://lkml.org/lkml/2015/9/28/849). Signed-off-by: Kosuke Tatsukawa <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent fd48ca3 commit 8ee1b7b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

block/blk-mq-tag.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ void blk_mq_tag_wakeup_all(struct blk_mq_tags *tags, bool include_reserve)
7575
struct blk_mq_bitmap_tags *bt;
7676
int i, wake_index;
7777

78+
/*
79+
* Make sure all changes prior to this are visible from other CPUs.
80+
*/
81+
smp_mb();
7882
bt = &tags->bitmap_tags;
7983
wake_index = atomic_read(&bt->wake_index);
8084
for (i = 0; i < BT_WAIT_QUEUES; i++) {

0 commit comments

Comments
 (0)