From: Yu Kuai Date: Tue, 14 Mar 2023 01:22:58 +0000 (+0800) Subject: md/raid10: don't call bio_start_io_acct twice for bio which experienced read error X-Git-Tag: Ubuntu-6.2.0-32.32~1093 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6c95cb07c7b7a850400bc87fe286499d50edb393;p=mirror_ubuntu-kernels.git md/raid10: don't call bio_start_io_acct twice for bio which experienced read error BugLink: https://bugs.launchpad.net/bugs/2025067 [ Upstream commit 7cddb055bfda5f7b0be931e8ea750fc28bc18a27 ] handle_read_error() will resumit r10_bio by raid10_read_request(), which will call bio_start_io_acct() again, while bio_end_io_acct() will only be called once. Fix the problem by don't account io again from handle_read_error(). Fixes: 528bc2cf2fcc ("md/raid10: enable io accounting") Suggested-by: Song Liu Signed-off-by: Yu Kuai Signed-off-by: Song Liu Link: https://lore.kernel.org/r/20230314012258.2395894-1-yukuai1@huaweicloud.com Signed-off-by: Sasha Levin Signed-off-by: Kamal Mostafa Signed-off-by: Stefan Bader --- diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 20522af894e0..0193cc7a6c8e 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1248,7 +1248,8 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, } slot = r10_bio->read_slot; - if (blk_queue_io_stat(bio->bi_bdev->bd_disk->queue)) + if (!r10_bio->start_time && + blk_queue_io_stat(bio->bi_bdev->bd_disk->queue)) r10_bio->start_time = bio_start_io_acct(bio); read_bio = bio_alloc_clone(rdev->bdev, bio, gfp, &mddev->bio_set); @@ -1578,6 +1579,7 @@ static void __make_request(struct mddev *mddev, struct bio *bio, int sectors) r10_bio->sector = bio->bi_iter.bi_sector; r10_bio->state = 0; r10_bio->read_slot = -1; + r10_bio->start_time = 0; memset(r10_bio->devs, 0, sizeof(r10_bio->devs[0]) * conf->geo.raid_disks);