diff options
| author | Benjamin Marzinski <[email protected]> | 2024-07-02 15:02:48 +0000 |
|---|---|---|
| committer | Mikulas Patocka <[email protected]> | 2024-07-03 19:41:11 +0000 |
| commit | 3199a34bfaf7561410e0be1e33a61eba870768fc (patch) | |
| tree | f4f3a5735387c178b120159a82a291909fcc7b96 /drivers/md/dm-raid.c | |
| parent | dm-verity: hash blocks with shash import+finup when possible (diff) | |
| download | kernel-3199a34bfaf7561410e0be1e33a61eba870768fc.tar.gz kernel-3199a34bfaf7561410e0be1e33a61eba870768fc.zip | |
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.
Fixes: 16c4770c75b1 ("dm-raid: really frozen sync_thread during suspend")
Suggested-by: Yu Kuai <[email protected]>
Signed-off-by: Benjamin Marzinski <[email protected]>
Reviewed-by: Yu Kuai <[email protected]>
Signed-off-by: Mikulas Patocka <[email protected]>
Diffstat (limited to 'drivers/md/dm-raid.c')
| -rw-r--r-- | drivers/md/dm-raid.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 052c00c1eb15..a790d6a82e14 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -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); |