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 5/9] blk-throttle: improve handling of re-entered bio for bps limit Date: Tue, 2 Aug 2022 22:04:11 +0800 [thread overview] Message-ID: <20220802140415.2960284-6-yukuai1@huaweicloud.com> (raw) In-Reply-To: <20220802140415.2960284-1-yukuai1@huaweicloud.com> From: Yu Kuai <yukuai3@huawei.com> Currently, if new slice is started while bio is re-entered, such bio will count multiple times for bps limit. Since 'bytes_skipped' represents how many bytes will be skipped while dispatching bios, which can handle that case, increasing it instead of decreasing 'bytes_disp'. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- block/blk-throttle.c | 8 ++++---- block/blk-throttle.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 621402cf2576..237668328e98 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -2183,14 +2183,14 @@ bool __blk_throtl_bio(struct bio *bio) * Splited bios can be re-entered because iops limit should be * counted again, however, bps limit should not. Since bps limit * will be counted again while dispatching it, compensate the - * over-accounting here. Noted that compensation can fail if - * new slice is started. + * over-accounting here. Since decrement of 'bytes_disp' can't + * handle the case that new slice is started, increase + * 'bytes_skipped' instead. */ if (bio_flagged(bio, BIO_THROTTLED)) { unsigned int bio_size = throtl_bio_data_size(bio); - if (tg->bytes_disp[rw] >= bio_size) - tg->bytes_disp[rw] -= bio_size; + tg->bytes_skipped[rw] += bio_size; if (tg->last_bytes_disp[rw] >= bio_size) tg->last_bytes_disp[rw] -= bio_size; } diff --git a/block/blk-throttle.h b/block/blk-throttle.h index 0163aa9104c3..c9545616ba12 100644 --- a/block/blk-throttle.h +++ b/block/blk-throttle.h @@ -121,7 +121,9 @@ struct throtl_grp { * bytes/io are waited already in previous configuration, and they will * be used to calculate wait time under new configuration. * - * Number of bytes will be skipped in current slice + * Number of bytes will be skipped in current slice. In addition, this + * field will help to handle re-entered bio for bps limit, see details + * in __blk_throtl_bio(). */ uint64_t bytes_skipped[2]; /* Number of bio will be skipped in current slice */ -- 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 5/9] blk-throttle: improve handling of re-entered bio for bps limit Date: Tue, 2 Aug 2022 22:04:11 +0800 [thread overview] Message-ID: <20220802140415.2960284-6-yukuai1@huaweicloud.com> (raw) In-Reply-To: <20220802140415.2960284-1-yukuai1-XF6JlduFytWkHkcT6e4Xnw@public.gmane.org> From: Yu Kuai <yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> Currently, if new slice is started while bio is re-entered, such bio will count multiple times for bps limit. Since 'bytes_skipped' represents how many bytes will be skipped while dispatching bios, which can handle that case, increasing it instead of decreasing 'bytes_disp'. Signed-off-by: Yu Kuai <yukuai3-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> --- block/blk-throttle.c | 8 ++++---- block/blk-throttle.h | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 621402cf2576..237668328e98 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -2183,14 +2183,14 @@ bool __blk_throtl_bio(struct bio *bio) * Splited bios can be re-entered because iops limit should be * counted again, however, bps limit should not. Since bps limit * will be counted again while dispatching it, compensate the - * over-accounting here. Noted that compensation can fail if - * new slice is started. + * over-accounting here. Since decrement of 'bytes_disp' can't + * handle the case that new slice is started, increase + * 'bytes_skipped' instead. */ if (bio_flagged(bio, BIO_THROTTLED)) { unsigned int bio_size = throtl_bio_data_size(bio); - if (tg->bytes_disp[rw] >= bio_size) - tg->bytes_disp[rw] -= bio_size; + tg->bytes_skipped[rw] += bio_size; if (tg->last_bytes_disp[rw] >= bio_size) tg->last_bytes_disp[rw] -= bio_size; } diff --git a/block/blk-throttle.h b/block/blk-throttle.h index 0163aa9104c3..c9545616ba12 100644 --- a/block/blk-throttle.h +++ b/block/blk-throttle.h @@ -121,7 +121,9 @@ struct throtl_grp { * bytes/io are waited already in previous configuration, and they will * be used to calculate wait time under new configuration. * - * Number of bytes will be skipped in current slice + * Number of bytes will be skipped in current slice. In addition, this + * field will help to handle re-entered bio for bps limit, see details + * in __blk_throtl_bio(). */ uint64_t bytes_skipped[2]; /* Number of bio will be skipped in current slice */ -- 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 ` [PATCH v7 3/9] blk-throttle: factor out code to calculate ios/bytes_allowed Yu Kuai 2022-08-02 14:04 ` 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 ` Yu Kuai [this message] 2022-08-02 14:04 ` [PATCH v7 5/9] blk-throttle: improve handling of re-entered bio for bps limit 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-6-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.