dm-raid: Fix WARN_ON_ONCE check for sync_thread in raid_resume
Subsystems (2)
Benjamin Marzinski
maintainerPATCH v2 1/1 dm-raid: Fix WARN_ON_ONCE check for sync_thread in raid_resume
rm-raid devices will occasionally trigger the following warning when being resumed after a table load because DM_RECOVERY_RUNNING is set:
WARNING: CPU: 7 PID: 5660 at drivers/md/dm-raid.c:4105 raid_resume+0xee/0x100 [dm_raid]
The failing check is:WARN_ON_ONCE(test_bit(MD_RECOVERY_RUNNING, &mddev->recovery));
This check is designed to make sure that the sync thread isn't registered, but md_check_recovery can set MD_RECOVERY_RUNNING without the sync_thread ever getting registered. Instead of checking if MD_RECOVERY_RUNNING is set, check if sync_thread is non-NULL.
---
Changes in v2:
- Move mddev_lock_nointr() earlier to protect dereference and use rcu_dereference_protected() to access sync_thread
drivers/md/dm-raid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/md/dm-raid.c +3 -2
@@ -4101,10 +4101,11 @@ static void raid_resume(struct dm_target *ti)if (mddev->delta_disks <0 )rs_set_capacity (rs); +mddev_lock_nointr (mddev);WARN_ON_ONCE (!test_bit (MD_RECOVERY_FROZEN , &mddev->recovery)); -WARN_ON_ONCE (test_bit (MD_RECOVERY_RUNNING , &mddev->recovery)); +WARN_ON_ONCE (rcu_dereference_protected (mddev->sync_thread, +lockdep_is_held (&mddev->reconfig_mutex)));clear_bit (RT_FLAG_RS_FROZEN , &rs->runtime_flags); -mddev_lock_nointr (mddev); mddev->ro =0 ; mddev->in_sync =0 ;md_unfrozen_sync_thread (mddev);
Signature · 1 line
2.43.0
Hi,
Quoted 1 line · Benjamin Marzinski
rm-raid devices will occasionally trigger the following warning when
dm-raid
Quoted 7 lines
being resumed after a table load because
DM_RECOVERY_RUNNINGis set:WARNING: CPU: 7 PID: 5660 at drivers/md/dm-raid.c:4105 raid_resume+0xee/0x100 [dm_raid]The failing check is:
WARN_ON_ONCE(test_bit(MD_RECOVERY_RUNNING, &mddev->recovery));
Quoted 7 lines
This check is designed to make sure that the sync thread isn't registered, but
md_check_recoverycan setMD_RECOVERY_RUNNINGwithout thesync_threadever getting registered. Instead of checking ifMD_RECOVERY_RUNNINGis set, check ifsync_threadis non-NULL.Fixes 16c4770c75b1 ("dm-raid: really frozen sync_thread during suspend")Suggested-by Yu Kuai <[email protected]>
Please use the address [email protected]
Quoted 14 lines
Signed-off-by Benjamin Marzinski <[email protected]>---
Changes in v2:
- Movemddev_lock_nointr()earlier to protect dereference and usercu_dereference_protected()to accesssync_threaddrivers/md/dm-raid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/md/dm-raid.c +0
-0
drivers/md/dm-raid.c static void raid_resume(struct dm_target *ti) · line 4107
Quoted 10 lines
drivers/md/dm-raid.c +3
-2@@ -4101,10 +4101,11 @@ static void raid_resume(struct dm_target *ti)if (mddev->delta_disks <0 )rs_set_capacity (rs); +mddev_lock_nointr (mddev);WARN_ON_ONCE (!test_bit (MD_RECOVERY_FROZEN , &mddev->recovery)); -WARN_ON_ONCE (test_bit (MD_RECOVERY_RUNNING , &mddev->recovery)); +WARN_ON_ONCE (rcu_dereference_protected (mddev->sync_thread, +lockdep_is_held (&mddev->reconfig_mutex)));clear_bit (RT_FLAG_RS_FROZEN , &rs->runtime_flags); -mddev_lock_nointr (mddev);
Other than the typo, LGTM
Quoted 4 lines
drivers/md/dm-raid.c +0
-0mddev->ro =0 ; mddev->in_sync =0 ;md_unfrozen_sync_thread (mddev);