kevin/linux
1
Fork 0
Code

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

Browse Source 
Pull MD fixes from Song.

* tag 'md-6.12-20241018' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid10: fix null ptr dereference in raid10_size()
  md: ensure child flush IO does not affect origin bio->bi_status
This commit is contained in:
Jens Axboe 2024-10-18 10:58:24 -06:00
commit 49c234b50a
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/md/md.c
View File

@ -546,6 +546,26 @@ static int mddev_set_closing_and_sync_blockdev(struct mddev *mddev, int opener_n
return 0; return 0;
} }
/*
* The only difference from bio_chain_endio() is that the current
* bi_status of bio does not affect the bi_status of parent.
*/
static void md_end_flush(struct bio *bio)
{
struct bio *parent = bio->bi_private;
/*
* If any flush io error before the power failure,
* disk data may be lost.
*/
if (bio->bi_status)
pr_err("md: %pg flush io error %d\n", bio->bi_bdev,
blk_status_to_errno(bio->bi_status));
bio_put(bio);
bio_endio(parent);
}
bool md_flush_request(struct mddev *mddev, struct bio *bio) bool md_flush_request(struct mddev *mddev, struct bio *bio)
{ {
struct md_rdev *rdev; struct md_rdev *rdev;
@ -565,7 +585,9 @@ bool md_flush_request(struct mddev *mddev, struct bio *bio)
new = bio_alloc_bioset(rdev->bdev, 0, new = bio_alloc_bioset(rdev->bdev, 0,
REQ_OP_WRITE | REQ_PREFLUSH, GFP_NOIO, REQ_OP_WRITE | REQ_PREFLUSH, GFP_NOIO,
&mddev->bio_set); &mddev->bio_set);
bio_chain(new, bio); new->bi_private = bio;
new->bi_end_io = md_end_flush;
bio_inc_remaining(bio);
submit_bio(new); submit_bio(new);
} }

7
drivers/md/raid10.c
View File

@ -4061,10 +4061,13 @@ static int raid10_run(struct mddev *mddev)
} }
if (!mddev_is_dm(conf->mddev)) { if (!mddev_is_dm(conf->mddev)) {
ret = raid10_set_queue_limits(mddev); int err = raid10_set_queue_limits(mddev);
if (ret)
if (err) {
ret = err;
goto out_free_conf; goto out_free_conf;
} }
}
/* need to check that every block has at least one working mirror */ /* need to check that every block has at least one working mirror */
if (!enough(conf, -1)) { if (!enough(conf, -1)) {