[PATCH -next 24/29] md: suspend array in md_start_sync() if array need reconfiguration
From: Yu Kuai <hidden>
Date: 2023-08-03 13:35:53
Also in:
lkml
Subsystem:
software raid (multiple disks) support, the rest · Maintainers:
Song Liu, Yu Kuai, Linus Torvalds
From: Yu Kuai <redacted> So that io won't concurrent with array reconfiguration, and now that all callers of md_kick_rdev_from_array() suspend the array, change the second parameter to true and prepare to remove the mddev_suspend() from mddev_create/destroy_serial_pool(). Signed-off-by: Yu Kuai <redacted> --- drivers/md/md.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index d5c061c87b2e..9bfa15b2fa97 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c@@ -9358,12 +9358,20 @@ static void md_start_sync(struct work_struct *ws) { struct mddev *mddev = container_of(ws, struct mddev, sync_work); int spares = 0; + bool suspended = false; + + if (md_spares_need_change(mddev)) { + __mddev_suspend(mddev); + suspended = true; + } mddev_lock_nointr(mddev); if (!md_is_rdwr(mddev)) { remove_and_add_spares(mddev); mddev_unlock(mddev); + if (suspended) + __mddev_resume(mddev); return; }
@@ -9412,6 +9420,9 @@ static void md_start_sync(struct work_struct *ws) } mddev_unlock(mddev); + if (suspended) + __mddev_resume(mddev); + md_wakeup_thread(mddev->sync_thread); sysfs_notify_dirent_safe(mddev->sysfs_action); md_new_event();
@@ -9424,6 +9435,8 @@ static void md_start_sync(struct work_struct *ws) clear_bit(MD_RECOVERY_CHECK, &mddev->recovery); clear_bit(MD_RECOVERY_RUNNING, &mddev->recovery); mddev_unlock(mddev); + if (suspended) + __mddev_resume(mddev); wake_up(&resync_wait); if (test_and_clear_bit(MD_RECOVERY_RECOVER, &mddev->recovery) &&
--
2.39.2