public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag 'md-6.11-20240815' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-6.11

Browse source 
Pull MD fix from Song:

"This patch fixes a potential data corruption in degraded raid0 array
 with slow (WriteMostly) drives. This issue was introduced in upstream
 6.9 kernel."

* tag 'md-6.11-20240815' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid1: Fix data corruption for degraded array with slow disk
This commit is contained in:
Jens Axboe 2024-08-15 14:53:08 -06:00
commit 50faba7771
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/md/raid1.c
View file

@ -617,6 +617,12 @@ static int choose_first_rdev(struct r1conf *conf, struct r1bio *r1_bio,
return -1; return -1;
} }
static bool rdev_in_recovery(struct md_rdev *rdev, struct r1bio *r1_bio)
{
return !test_bit(In_sync, &rdev->flags) &&
rdev->recovery_offset < r1_bio->sector + r1_bio->sectors;
}
static int choose_bb_rdev(struct r1conf *conf, struct r1bio *r1_bio, static int choose_bb_rdev(struct r1conf *conf, struct r1bio *r1_bio,
int *max_sectors) int *max_sectors)
{ {
@ -635,6 +641,7 @@ static int choose_bb_rdev(struct r1conf *conf, struct r1bio *r1_bio,
rdev = conf->mirrors[disk].rdev; rdev = conf->mirrors[disk].rdev;
if (!rdev || test_bit(Faulty, &rdev->flags) || if (!rdev || test_bit(Faulty, &rdev->flags) ||
rdev_in_recovery(rdev, r1_bio) ||
test_bit(WriteMostly, &rdev->flags)) test_bit(WriteMostly, &rdev->flags))
continue; continue;
@ -673,7 +680,8 @@ static int choose_slow_rdev(struct r1conf *conf, struct r1bio *r1_bio,
rdev = conf->mirrors[disk].rdev; rdev = conf->mirrors[disk].rdev;
if (!rdev || test_bit(Faulty, &rdev->flags) || if (!rdev || test_bit(Faulty, &rdev->flags) ||
!test_bit(WriteMostly, &rdev->flags)) !test_bit(WriteMostly, &rdev->flags) ||
rdev_in_recovery(rdev, r1_bio))
continue; continue;
/* there are no bad blocks, we can use this disk */ /* there are no bad blocks, we can use this disk */
@ -733,9 +741,7 @@ static bool rdev_readable(struct md_rdev *rdev, struct r1bio *r1_bio)
if (!rdev || test_bit(Faulty, &rdev->flags)) if (!rdev || test_bit(Faulty, &rdev->flags))
return false; return false;
/* still in recovery */ if (rdev_in_recovery(rdev, r1_bio))
if (!test_bit(In_sync, &rdev->flags) &&
rdev->recovery_offset < r1_bio->sector + r1_bio->sectors)
return false; return false;
/* don't read from slow disk unless have to */ /* don't read from slow disk unless have to */