Commit cbf64490 authored by Yu Kuai's avatar Yu Kuai Committed by Li Lingfeng
Browse files

blk-throttle: factor out code to calculate ios/bytes_allowed 

mainline inclusion
from mainline-v6.1-rc1
commit 681cd46f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IA8QFN

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=681cd46fff8cd81e387747c7850f2e730d3e0b74



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

No functional changes, new apis will be used in later patches to
calculate wait time for throttled bios when new configuration is
submitted.

Noted this patch also rename tg_with_in_iops/bps_limit() to
tg_within_iops/bps_limit().

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220829022240.3348319-4-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>

Conflicts:
  block/blk-throttle.c
[Commit 34841e6f ("block: revert 4f1e9630 ("blk-throtl: optimize
IOPS throttle for large IO scenarios")") remove the judgment of
iops_limit]
Signed-off-by: default avatarLi Lingfeng <lilingfeng3@huawei.com>
parent 5b8dd9be

block/blk-throttle.c

+35 −24
Original line number Diff line number Diff line
@@ -913,33 +913,20 @@ static inline void throtl_trim_slice(struct throtl_grp *tg, bool rw) 
		   tg->slice_start[rw], tg->slice_end[rw], jiffies);

}



static bool tg_with_in_iops_limit(struct throtl_grp *tg, struct bio *bio,

				  u32 iops_limit, unsigned long *wait)

static unsigned int calculate_io_allowed(u32 iops_limit,

					 unsigned long jiffy_elapsed)

{

	bool rw = bio_data_dir(bio);

	unsigned int io_allowed;

	unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd;

	u64 tmp;



	if (iops_limit == UINT_MAX) {

		if (wait)

			*wait = 0;

		return true;

	}



	jiffy_elapsed = jiffies - tg->slice_start[rw];



	/* Round up to the next throttle slice, wait time must be nonzero */

	jiffy_elapsed_rnd = roundup(jiffy_elapsed + 1, tg->td->throtl_slice);



	/*

	 * jiffy_elapsed_rnd should not be a big value as minimum iops can be

	 * jiffy_elapsed should not be a big value as minimum iops can be

	 * 1 then at max jiffy elapsed should be equivalent of 1 second as we

	 * will allow dispatch after 1 second and after that slice should

	 * have been trimmed.

	 */



	tmp = (u64)iops_limit * jiffy_elapsed_rnd;

	tmp = (u64)iops_limit * jiffy_elapsed;

	do_div(tmp, HZ);



	if (tmp > UINT_MAX)
@@ -947,6 +934,32 @@ static bool tg_with_in_iops_limit(struct throtl_grp *tg, struct bio *bio, 
	else

		io_allowed = tmp;



	return io_allowed;

}



static u64 calculate_bytes_allowed(u64 bps_limit, unsigned long jiffy_elapsed)

{

	return mul_u64_u64_div_u64(bps_limit, (u64)jiffy_elapsed, (u64)HZ);

}



static bool tg_within_iops_limit(struct throtl_grp *tg, struct bio *bio,

				 u32 iops_limit, unsigned long *wait)

{

	bool rw = bio_data_dir(bio);

	unsigned int io_allowed;

	unsigned long jiffy_elapsed, jiffy_wait, jiffy_elapsed_rnd;



	if (iops_limit == UINT_MAX) {

		if (wait)

			*wait = 0;

		return true;

	}



	jiffy_elapsed = jiffies - tg->slice_start[rw];



	/* Round up to the next throttle slice, wait time must be nonzero */

	jiffy_elapsed_rnd = roundup(jiffy_elapsed + 1, tg->td->throtl_slice);

	io_allowed = calculate_io_allowed(iops_limit, jiffy_elapsed_rnd);

	if (tg->io_disp[rw] + 1 <= io_allowed) {

		if (wait)

			*wait = 0;
@@ -961,7 +974,7 @@ static bool tg_with_in_iops_limit(struct throtl_grp *tg, struct bio *bio, 
	return false;

}



static bool tg_with_in_bps_limit(struct throtl_grp *tg, struct bio *bio,

static bool tg_within_bps_limit(struct throtl_grp *tg, struct bio *bio,

				u64 bps_limit, unsigned long *wait)

{

	bool rw = bio_data_dir(bio);
@@ -982,9 +995,7 @@ static bool tg_with_in_bps_limit(struct throtl_grp *tg, struct bio *bio, 
		jiffy_elapsed_rnd = tg->td->throtl_slice;



	jiffy_elapsed_rnd = roundup(jiffy_elapsed_rnd, tg->td->throtl_slice);

	bytes_allowed = mul_u64_u64_div_u64(bps_limit, (u64)jiffy_elapsed_rnd,

					    (u64)HZ);



	bytes_allowed = calculate_bytes_allowed(bps_limit, jiffy_elapsed_rnd);

	if (tg->bytes_disp[rw] + bio_size <= bytes_allowed) {

		if (wait)

			*wait = 0;
@@ -1055,8 +1066,8 @@ static bool tg_may_dispatch(struct throtl_grp *tg, struct bio *bio, 
	if (iops_limit != UINT_MAX)

		tg->io_disp[rw] += atomic_xchg(&tg->io_split_cnt[rw], 0);



	if (tg_with_in_bps_limit(tg, bio, bps_limit, &bps_wait) &&

	    tg_with_in_iops_limit(tg, bio, iops_limit, &iops_wait)) {

	if (tg_within_bps_limit(tg, bio, bps_limit, &bps_wait) &&

	    tg_within_iops_limit(tg, bio, iops_limit, &iops_wait)) {

		if (wait)

			*wait = 0;

		return true;