md: fix mssing blktrace bio split events

commit 22f166218f7313e8fe2d19213b5f4b3265f8c39e upstream.

If bio is split by internal handling like chunksize or badblocks, the
corresponding trace_block_split() is missing, resulting in blktrace
inability to catch BIO split events and making it harder to analyze the
BIO sequence.

Cc: stable@vger.kernel.org
Fixes: 4b1faf931650 ("block: Kill bio_pair_split()")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index 3e1f165c2d20f6b55865c0e2fa7087048f9c3b41..2379ddb69ac4f56f8aea94ea8529328db6f309b0 100644 (file)
--- a/drivers/md/md-linear.c
+++ b/drivers/md/md-linear.c
@@ -267,6 +267,7 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)
                }
 
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                submit_bio_noacct(bio);
                bio = split;
        }

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 419139ad7663ccf40bc547bd650f0520ac216b9e..c4d5ddee57fa82852aa9366bf6567c7d8790b1bf 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -473,7 +473,9 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)
                        bio_endio(bio);
                        return;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                submit_bio_noacct(bio);
                bio = split;
                end = zone->zone_end;
@@ -621,7 +623,9 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio)
                        bio_endio(bio);
                        return true;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                raid0_map_submit_bio(mddev, bio);
                bio = split;
        }

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index d30b82beeb92fb80ac936e79f1c013f83a908929..20facad2c271e178e296abdb29a827531ff63e09 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1383,7 +1383,9 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio,
                        error = PTR_ERR(split);
                        goto err_handle;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                submit_bio_noacct(bio);
                bio = split;
                r1_bio->master_bio = bio;
@@ -1591,7 +1593,9 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                        error = PTR_ERR(split);
                        goto err_handle;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                submit_bio_noacct(bio);
                bio = split;
                r1_bio->master_bio = bio;

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 9832eefb2f157bf4fab115a2b8e85eb5f603acb0..1baa1851a0dbb8826975542fe9131ff7d1d31aa6 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1209,7 +1209,9 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio,
                        error = PTR_ERR(split);
                        goto err_handle;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                allow_barrier(conf);
                submit_bio_noacct(bio);
                wait_barrier(conf, false);
@@ -1495,7 +1497,9 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio,
                        error = PTR_ERR(split);
                        goto err_handle;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                allow_barrier(conf);
                submit_bio_noacct(bio);
                wait_barrier(conf, false);
@@ -1679,7 +1683,9 @@ static int raid10_handle_discard(struct mddev *mddev, struct bio *bio)
                        bio_endio(bio);
                        return 0;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                allow_barrier(conf);
                /* Resend the fist split part */
                submit_bio_noacct(split);
@@ -1694,7 +1700,9 @@ static int raid10_handle_discard(struct mddev *mddev, struct bio *bio)
                        bio_endio(bio);
                        return 0;
                }
+
                bio_chain(split, bio);
+               trace_block_split(split, bio->bi_iter.bi_sector);
                allow_barrier(conf);
                /* Resend the second split part */
                submit_bio_noacct(bio);

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index e385ef1355e8b3660963b6cec777247a382d59f2..771ac1cbab995e0737871828f0d53c093563e4fb 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5475,8 +5475,10 @@ static struct bio *chunk_aligned_read(struct mddev *mddev, struct bio *raid_bio)
 
        if (sectors < bio_sectors(raid_bio)) {
                struct r5conf *conf = mddev->private;
+
                split = bio_split(raid_bio, sectors, GFP_NOIO, &conf->bio_split);
                bio_chain(split, raid_bio);
+               trace_block_split(split, raid_bio->bi_iter.bi_sector);
                submit_bio_noacct(raid_bio);
                raid_bio = split;
        }