md: fix mssing blktrace bio split events

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>

diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index 5d9b081153757eda44a93f3cd9d56ee9258e0c00..59d7963c7843b244651338533cf5148e898c0758 100644 (file)
--- a/drivers/md/md-linear.c
+++ b/drivers/md/md-linear.c
@@ -266,6 +266,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 f1d8811a542ae238a65d3cd0388b882ff16ec325..1ba7d0c090f7efbdebc744138066763fa8e50e1e 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -472,7 +472,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;
@@ -620,7 +622,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 f096f4d0fca7d06a830aee7fad6f0bac3baffeb0..64a1e0b47e87043fbee3fe797f35a753118ecf86 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1384,7 +1384,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;
@@ -1616,7 +1618,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 312e8a0e93e7b9291af206a1a74ad9c37fbb4dcc..3d7b24d6b4eb492152ed6ce1cf418d05e2ebdf88 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 5112658ef5f68bc2a18fc7e7994991d4ffef995f..96a6d63b3d62ede097f4ed01990abed21c0aa5e0 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5493,8 +5493,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;
        }