Commit a737e9b3 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Zheng Zengkai
Browse files

md/raid10: enable io accounting 

mainline inclusion
from mainline-v5.14-rc1
commit 528bc2cf
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I587H6
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=528bc2cf2fccef2c2c17263f9932094bf81fee5a



-------------------------------

For raid10, we record the start time between split bio and clone bio,
and finish the accounting in the final endio.

Also introduce start_time in r10bio accordingly.

Signed-off-by: default avatarGuoqing Jiang <jiangguoqing@kylinos.cn>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 3232bfe2

drivers/md/raid10.c

+6 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ static void raid_end_bio_io(struct r10bio *r10_bio) 
	if (!test_bit(R10BIO_Uptodate, &r10_bio->state))

		bio->bi_status = BLK_STS_IOERR;



	if (blk_queue_io_stat(bio->bi_disk->queue))

		bio_end_io_acct(bio, r10_bio->start_time);

	bio_endio(bio);

	/*

	 * Wake up any possible resync thread that waits for the device
@@ -1185,6 +1187,8 @@ static void raid10_read_request(struct mddev *mddev, struct bio *bio, 
	}

	slot = r10_bio->read_slot;



	if (blk_queue_io_stat(bio->bi_disk->queue))

		r10_bio->start_time = bio_start_io_acct(bio);

	read_bio = bio_clone_fast(bio, gfp, &mddev->bio_set);



	r10_bio->devs[slot].bio = read_bio;
@@ -1468,6 +1472,8 @@ static void raid10_write_request(struct mddev *mddev, struct bio *bio, 
		r10_bio->master_bio = bio;

	}



	if (blk_queue_io_stat(bio->bi_disk->queue))

		r10_bio->start_time = bio_start_io_acct(bio);

	atomic_set(&r10_bio->remaining, 1);

	md_bitmap_startwrite(mddev->bitmap, r10_bio->sector, r10_bio->sectors, 0);

drivers/md/raid10.h

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ struct r10bio { 
	sector_t		sector;	/* virtual sector number */

	int			sectors;

	unsigned long		state;

	unsigned long		start_time;

	struct mddev		*mddev;

	/*

	 * original bio going to /dev/mdx