Commit 80fbdf77 authored by Yu Kuai's avatar Yu Kuai Committed by Jialin Zhang
Browse files

block: add precise io accouting apis 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6L586


CVE: NA

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

Currently, for bio-based device, 'ios' and 'sectors' is counted while
io is started, while 'nsecs' is counted while io is done.

This behaviour is obviously wrong, however we can't fix exist kapis
because this will require new parameter, which will cause kapi broken.
Hence this patch add some new apis, which will make sure io accounting
for bio-based device is precise.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent bfdad57d

block/blk-core.c

+50 −9
Original line number Diff line number Diff line
@@ -1374,15 +1374,18 @@ void blk_account_io_start(struct request *rq) 
}



static unsigned long __part_start_io_acct(struct hd_struct *part,

					  unsigned int sectors, unsigned int op)

					  unsigned int sectors, unsigned int op,

					  bool precise)

{

	const int sgrp = op_stat_group(op);

	unsigned long now = READ_ONCE(jiffies);



	part_stat_lock();

	update_io_ticks(part, now, false);

	if (!precise) {

		part_stat_inc(part, ios[sgrp]);

		part_stat_add(part, sectors[sgrp], sectors);

	}

	part_stat_local_inc(part, in_flight[op_is_write(op)]);

	part_stat_unlock();
@@ -1394,19 +1397,21 @@ unsigned long part_start_io_acct(struct gendisk *disk, struct hd_struct **part, 
{

	*part = disk_map_sector_rcu(disk, bio->bi_iter.bi_sector);



	return __part_start_io_acct(*part, bio_sectors(bio), bio_op(bio));

	return __part_start_io_acct(*part, bio_sectors(bio), bio_op(bio),

				    false);

}

EXPORT_SYMBOL_GPL(part_start_io_acct);



unsigned long disk_start_io_acct(struct gendisk *disk, unsigned int sectors,

				 unsigned int op)

{

	return __part_start_io_acct(&disk->part0, sectors, op);

	return __part_start_io_acct(&disk->part0, sectors, op, false);

}

EXPORT_SYMBOL(disk_start_io_acct);



static void __part_end_io_acct(struct hd_struct *part, unsigned int op,

			       unsigned long start_time)

static void __part_end_io_acct(struct hd_struct *part, unsigned int sectors,

			       unsigned int op, unsigned long start_time,

			       bool precise)

{

	const int sgrp = op_stat_group(op);

	unsigned long now = READ_ONCE(jiffies);
@@ -1414,6 +1419,10 @@ static void __part_end_io_acct(struct hd_struct *part, unsigned int op, 


	part_stat_lock();

	update_io_ticks(part, now, true);

	if (precise) {

		part_stat_inc(part, ios[sgrp]);

		part_stat_add(part, sectors[sgrp], sectors);

	}

	part_stat_add(part, nsecs[sgrp], jiffies_to_nsecs(duration));

	part_stat_local_dec(part, in_flight[op_is_write(op)]);

	part_stat_unlock();
@@ -1422,7 +1431,7 @@ static void __part_end_io_acct(struct hd_struct *part, unsigned int op, 
void part_end_io_acct(struct hd_struct *part, struct bio *bio,

		      unsigned long start_time)

{

	__part_end_io_acct(part, bio_op(bio), start_time);

	__part_end_io_acct(part, 0, bio_op(bio), start_time, false);

	hd_struct_put(part);

}

EXPORT_SYMBOL_GPL(part_end_io_acct);
@@ -1430,10 +1439,42 @@ EXPORT_SYMBOL_GPL(part_end_io_acct); 
void disk_end_io_acct(struct gendisk *disk, unsigned int op,

		      unsigned long start_time)

{

	__part_end_io_acct(&disk->part0, op, start_time);

	__part_end_io_acct(&disk->part0, 0, op, start_time, false);

}

EXPORT_SYMBOL(disk_end_io_acct);



unsigned long part_start_precise_io_acct(struct gendisk *disk,

					 struct hd_struct **part,

					 struct bio *bio)

{

	*part = disk_map_sector_rcu(disk, bio->bi_iter.bi_sector);



	return __part_start_io_acct(*part, 0, bio_op(bio), true);

}

EXPORT_SYMBOL_GPL(part_start_precise_io_acct);



unsigned long disk_start_precise_io_acct(struct gendisk *disk, unsigned int op)

{

	return __part_start_io_acct(&disk->part0, 0, op, true);

}

EXPORT_SYMBOL(disk_start_precise_io_acct);



void part_end_precise_io_acct(struct hd_struct *part, struct bio *bio,

			      unsigned long start_time)

{

	__part_end_io_acct(part, bio_sectors(bio), bio_op(bio), start_time,

			   true);

	hd_struct_put(part);

}

EXPORT_SYMBOL_GPL(part_end_precise_io_acct);



void disk_end_precise_io_acct(struct gendisk *disk, unsigned int sectors,

			      unsigned int op, unsigned long start_time)

{

	__part_end_io_acct(&disk->part0, sectors, op, start_time, true);

}

EXPORT_SYMBOL(disk_end_precise_io_acct);



/*

 * Steal bios from a request and add them to a bio list.

 * The request must not have been partially completed before.

include/linux/blkdev.h

+21 −0
Original line number Diff line number Diff line
@@ -2027,6 +2027,27 @@ static inline void bio_end_io_acct(struct bio *bio, unsigned long start_time) 
	return disk_end_io_acct(bio->bi_disk, bio_op(bio), start_time);

}



unsigned long disk_start_precise_io_acct(struct gendisk *disk, unsigned int op);

void disk_end_precise_io_acct(struct gendisk *disk, unsigned int sectors,

			      unsigned int op, unsigned long start_time);

unsigned long part_start_precise_io_acct(struct gendisk *disk,

					 struct hd_struct **part,

					 struct bio *bio);

void part_end_precise_io_acct(struct hd_struct *part, struct bio *bio,

			      unsigned long start_time);



static inline unsigned long bio_start_precise_io_acct(struct bio *bio)

{

	return disk_start_precise_io_acct(bio->bi_disk, bio_op(bio));

}



static inline void bio_end_precise_io_acct(struct bio *bio,

					   unsigned long start_time)

{

	return disk_end_precise_io_acct(bio->bi_disk, bio_sectors(bio),

					bio_op(bio), start_time);

}



int bdev_read_only(struct block_device *bdev);

int set_blocksize(struct block_device *bdev, int size);