Skip to content

Commit a8d5fdd

Browse files
YuKuai-huaweiliu-song-6
authored andcommitted
raid10: avoid spin_lock from fastpath from raid10_unplug()
Commit 0c0be98 ("md/raid10: prevent unnecessary calls to wake_up() in fast path") missed one place, for example, with: fio -direct=1 -rw=write/randwrite -iodepth=1 ... Plug and unplug are called for each io, then wake_up() from raid10_unplug() will cause lock contention as well. Avoid this contention by using wake_up_barrier() instead of wake_up(), where spin_lock is not held if waitqueue is empty. Fio test script: [global] name=random reads and writes ioengine=libaio direct=1 readwrite=randrw rwmixread=70 iodepth=64 buffered=0 filename=/dev/md0 size=1G runtime=30 time_based randrepeat=0 norandommap refill_buffers ramp_time=10 bs=4k numjobs=400 group_reporting=1 [job1] Test result with ramdisk raid10(By Ali): Before this patch With this patch READ IOPS=2033k IOPS=3642k WRITE IOPS=871k IOPS=1561K By the way, in this scenario, blk_plug_cb() will be allocated and freed for each io, this seems need to be optimized as well. Reported-and-tested-by: Ali Gholami Rudi <aligrudi@gmail.com> Closes: https://lore.kernel.org/all/20231606122233@laper.mirepesht/ Signed-off-by: Yu Kuai <yukuai3@huawei.com> Signed-off-by: Song Liu <song@kernel.org> Link: https://lore.kernel.org/r/20230621105728.1268542-1-yukuai1@huaweicloud.com
1 parent 4934b64 commit a8d5fdd

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/md/raid10.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)
11181118
spin_lock_irq(&conf->device_lock);
11191119
bio_list_merge(&conf->pending_bio_list, &plug->pending);
11201120
spin_unlock_irq(&conf->device_lock);
1121-
wake_up(&conf->wait_barrier);
1121+
wake_up_barrier(conf);
11221122
md_wakeup_thread(mddev->thread);
11231123
kfree(plug);
11241124
return;
@@ -1127,7 +1127,7 @@ static void raid10_unplug(struct blk_plug_cb *cb, bool from_schedule)
11271127
/* we aren't scheduling, so we can do the write-out directly. */
11281128
bio = bio_list_get(&plug->pending);
11291129
raid1_prepare_flush_writes(mddev->bitmap);
1130-
wake_up(&conf->wait_barrier);
1130+
wake_up_barrier(conf);
11311131

11321132
while (bio) { /* submit pending writes */
11331133
struct bio *next = bio->bi_next;

0 commit comments

Comments
 (0)