From: Yu Kuai <yukuai1@huaweicloud.com> To: tj@kernel.org, mkoutny@suse.com, axboe@kernel.dk, ming.lei@redhat.com Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v7 3/9] blk-throttle: factor out code to calculate ios/bytes_allowed Date: Tue, 2 Aug 2022 22:04:09 +0800 [thread overview] Message-ID: <20220802140415.2960284-4-yukuai1@huaweicloud.com> (raw) In-Reply-To: <20220802140415.2960284-1-yukuai1@huaweicloud.com> From: Yu Kuai <yukuai3@huawei.com> No functional changes, new apis will be used in later patches to calculate wait time for throttled bios when new configuration is submitted. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- block/blk-throttle.c | 51 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index da1fae243321..0d9719c41fe2 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -754,33 +754,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) @@ -788,6 +775,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_with_in_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; @@ -824,9 +837,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; -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Yu Kuai <yukuai1-XF6JlduFytWkHkcT6e4Xnw@public.gmane.org> To: tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, mkoutny-IBi9RG/b67k@public.gmane.org, axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org, ming.lei-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Cc: cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-block-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org, yukuai1-XF6JlduFytWkHkcT6e4Xnw@public.gmane.org, yi.zhang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org Subject: [PATCH v7 3/9] blk-throttle: factor out code to calculate ios/bytes_allowed Date: Tue, 2 Aug 2022 22:04:09 +0800 [thread overview] Message-ID: <20220802140415.2960284-4-yukuai1@huaweicloud.com> (raw) In-Reply-To: <20220802140415.2960284-1-yukuai1-XF6JlduFytWkHkcT6e4Xnw@public.gmane.org> From: Yu Kuai <yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> No functional changes, new apis will be used in later patches to calculate wait time for throttled bios when new configuration is submitted. Signed-off-by: Yu Kuai <yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> --- block/blk-throttle.c | 51 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index da1fae243321..0d9719c41fe2 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -754,33 +754,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) @@ -788,6 +775,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_with_in_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; @@ -824,9 +837,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; -- 2.31.1
next prev parent reply other threads:[~2022-08-02 13:52 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-08-02 14:04 [PATCH v7 0/9] bugfix and cleanup for blk-throttle Yu Kuai 2022-08-02 14:04 ` Yu Kuai 2022-08-02 14:04 ` [PATCH v7 1/9] blk-throttle: fix that io throttle can only work for single bio Yu Kuai 2022-08-16 19:37 ` Tejun Heo 2022-08-17 1:13 ` Yu Kuai 2022-08-17 1:13 ` Yu Kuai 2022-08-17 17:50 ` Tejun Heo 2022-08-18 1:23 ` Yu Kuai 2022-08-18 1:23 ` Yu Kuai 2022-08-22 3:06 ` Yu Kuai 2022-08-22 3:06 ` Yu Kuai 2022-08-22 7:25 ` Tejun Heo 2022-08-22 7:25 ` Tejun Heo 2022-08-22 7:44 ` Yu Kuai 2022-08-22 7:44 ` Yu Kuai 2022-08-02 14:04 ` [PATCH v7 2/9] blk-throttle: prevent overflow while calculating wait time Yu Kuai 2022-08-02 14:04 ` Yu Kuai [this message] 2022-08-02 14:04 ` [PATCH v7 3/9] blk-throttle: factor out code to calculate ios/bytes_allowed Yu Kuai 2022-08-16 19:47 ` Tejun Heo 2022-08-17 1:32 ` Yu Kuai 2022-08-17 1:32 ` Yu Kuai 2022-08-02 14:04 ` [PATCH v7 4/9] blk-throttle: fix io hung due to configuration updates Yu Kuai 2022-08-02 14:04 ` Yu Kuai 2022-08-16 20:01 ` Tejun Heo 2022-08-16 20:01 ` Tejun Heo 2022-08-17 1:30 ` Yu Kuai 2022-08-17 1:30 ` Yu Kuai 2022-08-17 17:52 ` Tejun Heo 2022-08-17 17:52 ` Tejun Heo 2022-08-18 1:16 ` Yu Kuai 2022-08-18 1:16 ` Yu Kuai 2022-08-19 17:33 ` Tejun Heo 2022-08-19 17:33 ` Tejun Heo 2022-08-02 14:04 ` [PATCH v7 5/9] blk-throttle: improve handling of re-entered bio for bps limit Yu Kuai 2022-08-02 14:04 ` Yu Kuai 2022-08-16 20:02 ` Tejun Heo 2022-08-16 20:02 ` Tejun Heo 2022-08-02 14:04 ` [PATCH v7 6/9] blk-throttle: use 'READ/WRITE' instead of '0/1' Yu Kuai 2022-08-02 14:04 ` Yu Kuai 2022-08-16 20:03 ` Tejun Heo 2022-08-17 1:33 ` Yu Kuai 2022-08-17 1:33 ` Yu Kuai 2022-08-02 14:04 ` [PATCH v7 7/9] blk-throttle: calling throtl_dequeue/enqueue_tg in pairs Yu Kuai 2022-08-02 14:04 ` Yu Kuai 2022-08-02 14:04 ` [PATCH v7 8/9] blk-throttle: cleanup tg_update_disptime() Yu Kuai 2022-08-02 14:04 ` Yu Kuai 2022-08-16 20:09 ` Tejun Heo 2022-08-17 1:38 ` Yu Kuai 2022-08-17 1:38 ` Yu Kuai 2022-08-02 14:04 ` [PATCH v7 9/9] blk-throttle: clean up flag 'THROTL_TG_PENDING' Yu Kuai 2022-08-02 14:04 ` Yu Kuai 2022-08-16 20:14 ` Tejun Heo 2022-08-17 1:45 ` Yu Kuai 2022-08-17 1:45 ` Yu Kuai 2022-08-17 17:54 ` Tejun Heo 2022-08-17 17:54 ` Tejun Heo 2022-08-18 9:29 ` Yu Kuai 2022-08-18 9:29 ` Yu Kuai 2022-08-19 17:35 ` Tejun Heo 2022-08-19 17:35 ` Tejun Heo 2022-08-13 5:59 ` [PATCH v7 0/9] bugfix and cleanup for blk-throttle Yu Kuai 2022-08-13 5:59 ` Yu Kuai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220802140415.2960284-4-yukuai1@huaweicloud.com \ --to=yukuai1@huaweicloud.com \ --cc=axboe@kernel.dk \ --cc=cgroups@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ming.lei@redhat.com \ --cc=mkoutny@suse.com \ --cc=tj@kernel.org \ --cc=yi.zhang@huawei.com \ --cc=yukuai3@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.