Commit dbf3bbd13627dd640276a298012a22373ccf7bd1

Authored by NeilBrown
Committed by Greg Kroah-Hartman
1 parent f2ee626bf6

md/raid5: Fix livelock when array is both resyncing and degraded.

commit 26ac107378c4742978216be1005b7291b799c7b2 upstream.

Commit a7854487cd7128a30a7f4f5259de9f67d5efb95f:
  md: When RAID5 is dirty, force reconstruct-write instead of read-modify-write.

Causes an RCW cycle to be forced even when the array is degraded.
A degraded array cannot support RCW as that requires reading all data
blocks, and one may be missing.

Forcing an RCW when it is not possible causes a live-lock and the code
spins, repeatedly deciding to do something that cannot succeed.

So change the condition to only force RCW on non-degraded arrays.

Reported-by: Manibalan P <pmanibalan@amiindia.co.in>
Bisected-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Tested-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Fixes: a7854487cd7128a30a7f4f5259de9f67d5efb95f
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -3102,7 +3102,8 @@
3102 3102 * generate correct data from the parity.
3103 3103 */
3104 3104 if (conf->max_degraded == 2 ||
3105   - (recovery_cp < MaxSector && sh->sector >= recovery_cp)) {
  3105 + (recovery_cp < MaxSector && sh->sector >= recovery_cp &&
  3106 + s->failed == 0)) {
3106 3107 /* Calculate the real rcw later - for now make it
3107 3108 * look like rcw is cheaper
3108 3109 */