[PATCH v7 1/3] md: suspend array when sync_action=reshape
"Chen Cheng" <[email protected]>
| Newsgroups | gmane.linux.raid,gmane.linux.kernel |
|---|---|
| Message-ID | <[email protected]> |
From: Chen Cheng <[email protected]> raid10 needs to resize/swap r10bio_pool when reshape changes raid_disks, and, don't let new requests keep allocating r10bio objects from the old pool while that transition is in progress. suspend and lock array before mddev_start_reshape(), and resume it on exit. Other sync_action ops are unchanged. Signed-off-by: Chen Cheng <[email protected]> --- drivers/md/md.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 096bb64e87bd..8ee2dcc116eb 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5261,25 +5261,32 @@ action_store(struct mddev *mddev, const char *page, size_t len) enum sync_action action; if (!mddev->pers || !mddev->pers->sync_request) return -EINVAL; + action = md_sync_action_by_name(page); + if (action == ACTION_RESHAPE) { + ret = mddev_suspend(mddev, true); + if (ret) + return ret; + } retry: if (work_busy(&mddev->sync_work)) flush_work(&mddev->sync_work); ret = mddev_lock(mddev); - if (ret) + if (ret) { + if (action == ACTION_RESHAPE) + mddev_resume(mddev); return ret; + } if (work_busy(&mddev->sync_work)) { mddev_unlock(mddev); goto retry; } - action = md_sync_action_by_name(page); - /* TODO: mdadm rely on "idle" to start sync_thread. */ if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) { switch (action) { case ACTION_FROZEN: md_frozen_sync_thread(mddev); @@ -5345,10 +5352,12 @@ action_store(struct mddev *mddev, const char *page, size_t len) sysfs_notify_dirent_safe(mddev->sysfs_action); ret = len; out: mddev_unlock(mddev); + if (action == ACTION_RESHAPE) + mddev_resume(mddev); return ret; } static struct md_sysfs_entry md_scan_mode = __ATTR_PREALLOC(sync_action, S_IRUGO|S_IWUSR, action_show, action_store); -- 2.54.0