md: fix mssing blktrace bio split events

[ Upstream commit 22f166218f7313e8fe2d19213b5f4b3265f8c39e ]

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: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c
index 369aed044b409f14bb5a84b9158f1514c888f66f..d733ebee624b7ea91859bf1b4818bedf957f6421 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 67ec633d27e26b42bd96f7f9e1edec260a7442f1..db1ab214250f9184e07f193e5a72e8f2372fe17d 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -470,7 +470,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;
@@ -618,7 +620,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 31081d9e94025222f11fd1b9950d17728f170504..4c6b1bd6da9bb1cbbb896a19609318bcb7e5915e 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;
@@ -1574,7 +1576,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 d02bd096824c8026e00da62bab1fcb05df4e17b5..b0062ad9b1d95fcf986e240416b387214deef35c 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1208,7 +1208,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);
@@ -1484,7 +1486,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);
@@ -1669,7 +1673,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);
@@ -1684,7 +1690,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 39e7596e78c0b07c926789c5bf797d4828b5eaca..4fae8ade24090f8d33182b0a4a6b6988c0be5b73 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5484,8 +5484,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;
        }