Commit f71209b1 authored by Yu Kuai's avatar Yu Kuai Committed by Song Liu

md: enhance checking in md_check_recovery()

For md_check_recovery():

1) if 'MD_RECOVERY_RUNING' is not set, register new sync_thread.
2) if 'MD_RECOVERY_RUNING' is set:
 a) if 'MD_RECOVERY_DONE' is not set, don't do anything, wait for
   md_do_sync() to be done.
 b) if 'MD_RECOVERY_DONE' is set, unregister sync_thread. Current code
   expects that sync_thread is not NULL, otherwise new sync_thread will
   be registered, which will corrupt the array.

Make sure md_check_recovery() won't register new sync_thread if
'MD_RECOVERY_RUNING' is still set, and a new WARN_ON_ONCE() is added for
the above corruption,
Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarXiao Ni <xni@redhat.com>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20230529132037.2124527-7-yukuai1@huaweicloud.com
parent 753260ed
...@@ -9388,16 +9388,24 @@ void md_check_recovery(struct mddev *mddev) ...@@ -9388,16 +9388,24 @@ void md_check_recovery(struct mddev *mddev)
if (mddev->sb_flags) if (mddev->sb_flags)
md_update_sb(mddev, 0); md_update_sb(mddev, 0);
if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery) && /*
!test_bit(MD_RECOVERY_DONE, &mddev->recovery)) { * Never start a new sync thread if MD_RECOVERY_RUNNING is
/* resync/recovery still happening */ * still set.
clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery); */
goto unlock; if (test_bit(MD_RECOVERY_RUNNING, &mddev->recovery)) {
} if (!test_bit(MD_RECOVERY_DONE, &mddev->recovery)) {
if (mddev->sync_thread) { /* resync/recovery still happening */
clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
goto unlock;
}
if (WARN_ON_ONCE(!mddev->sync_thread))
goto unlock;
md_reap_sync_thread(mddev); md_reap_sync_thread(mddev);
goto unlock; goto unlock;
} }
/* Set RUNNING before clearing NEEDED to avoid /* Set RUNNING before clearing NEEDED to avoid
* any transients in the value of "sync_action". * any transients in the value of "sync_action".
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment