| Message ID | 20230814085108.991040-3-xueshi.hu@smartx.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | md/raid1: don't allow_barrier() before r1bio got freed | expand |
在 2023/08/14 16:51, Xueshi Hu 写道: > Raid1 reshape will change mempool and r1conf::raid_disks which are > necessary when freeing r1bio. allow_barrier() make an concurrent > raid1_reshape() possible. So, free the in-flight r1bio firstly before > waiting blocked rdev. > > Fixes: 6bfe0b499082 ("md: support blocking writes to an array on device failure") LGTM Reviewed-by: Yu Kuai <yukuai3@huawei.com> > Signed-off-by: Xueshi Hu <xueshi.hu@smartx.com> > --- > drivers/md/raid1.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c > index dbbee0c14a5b..5f17f30a00a9 100644 > --- a/drivers/md/raid1.c > +++ b/drivers/md/raid1.c > @@ -1374,6 +1374,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, > return; > } > > + retry_write: > r1_bio = alloc_r1bio(mddev, bio); > r1_bio->sectors = max_write_sectors; > > @@ -1389,7 +1390,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, > */ > > disks = conf->raid_disks * 2; > - retry_write: > blocked_rdev = NULL; > rcu_read_lock(); > max_sectors = r1_bio->sectors; > @@ -1469,7 +1469,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, > for (j = 0; j < i; j++) > if (r1_bio->bios[j]) > rdev_dec_pending(conf->mirrors[j].rdev, mddev); > - r1_bio->state = 0; > + free_r1bio(r1_bio); > allow_barrier(conf, bio->bi_iter.bi_sector); > > if (bio->bi_opf & REQ_NOWAIT) { >
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index dbbee0c14a5b..5f17f30a00a9 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -1374,6 +1374,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, return; } + retry_write: r1_bio = alloc_r1bio(mddev, bio); r1_bio->sectors = max_write_sectors; @@ -1389,7 +1390,6 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, */ disks = conf->raid_disks * 2; - retry_write: blocked_rdev = NULL; rcu_read_lock(); max_sectors = r1_bio->sectors; @@ -1469,7 +1469,7 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, for (j = 0; j < i; j++) if (r1_bio->bios[j]) rdev_dec_pending(conf->mirrors[j].rdev, mddev); - r1_bio->state = 0; + free_r1bio(r1_bio); allow_barrier(conf, bio->bi_iter.bi_sector); if (bio->bi_opf & REQ_NOWAIT) {
Raid1 reshape will change mempool and r1conf::raid_disks which are necessary when freeing r1bio. allow_barrier() make an concurrent raid1_reshape() possible. So, free the in-flight r1bio firstly before waiting blocked rdev. Fixes: 6bfe0b499082 ("md: support blocking writes to an array on device failure") Signed-off-by: Xueshi Hu <xueshi.hu@smartx.com> --- drivers/md/raid1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)