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

md/raid1: enable io accounting 

mainline inclusion
from mainline-v5.14-rc1
commit a0159832
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=a0159832e51e3af03b89ecc5d6b9db451e529b5f



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

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

Also introduce start_time in r1bio accordingly.

Signed-off-by: default avatarGuoqing Jiang <jiangguoqing@kylinos.cn>
Signed-off-by: default avatarSong Liu <song@kernel.org>
Conflict:
	drivers/md/raid1.c
Signed-off-by: default avatarZhang Wensheng <zhangwensheng5@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent a6502b42

drivers/md/raid1.c

+7 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ static void call_bio_endio(struct r1bio *r1_bio) 
	if (!test_bit(R1BIO_Uptodate, &r1_bio->state))

		bio->bi_status = BLK_STS_IOERR;



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

		bio_end_io_acct(bio, r1_bio->start_time);

	bio_endio(bio);

}
@@ -1292,6 +1294,9 @@ static void raid1_read_request(struct mddev *mddev, struct bio *bio, 


	r1_bio->read_disk = rdisk;



	if (!r1bio_existed && blk_queue_io_stat(bio->bi_disk->queue))

		r1_bio->start_time = bio_start_io_acct(bio);



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



	r1_bio->bios[rdisk] = read_bio;
@@ -1481,6 +1486,8 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio, 
		r1_bio->sectors = max_sectors;

	}



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

		r1_bio->start_time = bio_start_io_acct(bio);

	atomic_set(&r1_bio->remaining, 1);

	atomic_set(&r1_bio->behind_remaining, 0);

drivers/md/raid1.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ struct r1bio { 
	sector_t		sector;

	int			sectors;

	unsigned long		state;

	unsigned long		start_time;

	struct mddev		*mddev;

	/*

	 * original bio going to /dev/mdx