From: Yu Kuai <yukuai3@huawei.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>, <yi.zhang@huawei.com> Subject: [PATCH -next v5 8/8] blk-throttle: clean up flag 'THROTL_TG_PENDING' Date: Sat, 28 May 2022 14:43:30 +0800 [thread overview] Message-ID: <20220528064330.3471000-9-yukuai3@huawei.com> (raw) In-Reply-To: <20220528064330.3471000-1-yukuai3@huawei.com> All related operations are inside 'queue_lock', there is no need to use the flag, we only need to make sure throtl_enqueue_tg() is called when the first bio is throttled, and throtl_dequeue_tg() is called when the last throttled bio is dispatched. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- block/blk-throttle.c | 22 ++++++++-------------- block/blk-throttle.h | 7 +++---- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 297ce54ceaa3..fe7f01c61ba8 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -561,23 +561,16 @@ static void tg_service_queue_add(struct throtl_grp *tg) static void throtl_enqueue_tg(struct throtl_grp *tg) { - if (!(tg->flags & THROTL_TG_PENDING)) { - tg_service_queue_add(tg); - tg->flags |= THROTL_TG_PENDING; - tg->service_queue.parent_sq->nr_pending++; - } + tg_service_queue_add(tg); + tg->service_queue.parent_sq->nr_pending++; } static void throtl_dequeue_tg(struct throtl_grp *tg) { - if (tg->flags & THROTL_TG_PENDING) { - struct throtl_service_queue *parent_sq = - tg->service_queue.parent_sq; + struct throtl_service_queue *parent_sq = tg->service_queue.parent_sq; - throtl_rb_erase(&tg->rb_node, parent_sq); - --parent_sq->nr_pending; - tg->flags &= ~THROTL_TG_PENDING; - } + throtl_rb_erase(&tg->rb_node, parent_sq); + --parent_sq->nr_pending; } /* Call with queue lock held */ @@ -1015,8 +1008,9 @@ static void throtl_add_bio_tg(struct bio *bio, struct throtl_qnode *qn, throtl_qnode_add_bio(bio, qn, &sq->queued[rw]); + if (!sq->nr_queued[READ] && !sq->nr_queued[WRITE]) + throtl_enqueue_tg(tg); sq->nr_queued[rw]++; - throtl_enqueue_tg(tg); } static void tg_update_disptime(struct throtl_grp *tg) @@ -1371,7 +1365,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global) throtl_start_new_slice(tg, READ, false); throtl_start_new_slice(tg, WRITE, false); - if (tg->flags & THROTL_TG_PENDING) { + if (sq->nr_queued[READ] || sq->nr_queued[WRITE]) { tg_update_disptime(tg); throtl_schedule_next_dispatch(sq->parent_sq, true); } diff --git a/block/blk-throttle.h b/block/blk-throttle.h index b8178e6b4d30..f68b95999f83 100644 --- a/block/blk-throttle.h +++ b/block/blk-throttle.h @@ -53,10 +53,9 @@ struct throtl_service_queue { }; enum tg_state_flags { - THROTL_TG_PENDING = 1 << 0, /* on parent's pending tree */ - THROTL_TG_WAS_EMPTY = 1 << 1, /* bio_lists[] became non-empty */ - THROTL_TG_HAS_IOPS_LIMIT = 1 << 2, /* tg has iops limit */ - THROTL_TG_CANCELING = 1 << 3, /* starts to cancel bio */ + THROTL_TG_WAS_EMPTY = 1 << 0, /* bio_lists[] became non-empty */ + THROTL_TG_HAS_IOPS_LIMIT = 1 << 1, /* tg has iops limit */ + THROTL_TG_CANCELING = 1 << 2, /* starts to cancel bio */ }; enum { -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Yu Kuai <yukuai3@huawei.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, yi.zhang@huawei.com Subject: [PATCH -next v5 8/8] blk-throttle: clean up flag 'THROTL_TG_PENDING' Date: Sat, 28 May 2022 14:43:30 +0800 [thread overview] Message-ID: <20220528064330.3471000-9-yukuai3@huawei.com> (raw) In-Reply-To: <20220528064330.3471000-1-yukuai3@huawei.com> All related operations are inside 'queue_lock', there is no need to use the flag, we only need to make sure throtl_enqueue_tg() is called when the first bio is throttled, and throtl_dequeue_tg() is called when the last throttled bio is dispatched. Signed-off-by: Yu Kuai <yukuai3@huawei.com> --- block/blk-throttle.c | 22 ++++++++-------------- block/blk-throttle.h | 7 +++---- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 297ce54ceaa3..fe7f01c61ba8 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -561,23 +561,16 @@ static void tg_service_queue_add(struct throtl_grp *tg) static void throtl_enqueue_tg(struct throtl_grp *tg) { - if (!(tg->flags & THROTL_TG_PENDING)) { - tg_service_queue_add(tg); - tg->flags |= THROTL_TG_PENDING; - tg->service_queue.parent_sq->nr_pending++; - } + tg_service_queue_add(tg); + tg->service_queue.parent_sq->nr_pending++; } static void throtl_dequeue_tg(struct throtl_grp *tg) { - if (tg->flags & THROTL_TG_PENDING) { - struct throtl_service_queue *parent_sq = - tg->service_queue.parent_sq; + struct throtl_service_queue *parent_sq = tg->service_queue.parent_sq; - throtl_rb_erase(&tg->rb_node, parent_sq); - --parent_sq->nr_pending; - tg->flags &= ~THROTL_TG_PENDING; - } + throtl_rb_erase(&tg->rb_node, parent_sq); + --parent_sq->nr_pending; } /* Call with queue lock held */ @@ -1015,8 +1008,9 @@ static void throtl_add_bio_tg(struct bio *bio, struct throtl_qnode *qn, throtl_qnode_add_bio(bio, qn, &sq->queued[rw]); + if (!sq->nr_queued[READ] && !sq->nr_queued[WRITE]) + throtl_enqueue_tg(tg); sq->nr_queued[rw]++; - throtl_enqueue_tg(tg); } static void tg_update_disptime(struct throtl_grp *tg) @@ -1371,7 +1365,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global) throtl_start_new_slice(tg, READ, false); throtl_start_new_slice(tg, WRITE, false); - if (tg->flags & THROTL_TG_PENDING) { + if (sq->nr_queued[READ] || sq->nr_queued[WRITE]) { tg_update_disptime(tg); throtl_schedule_next_dispatch(sq->parent_sq, true); } diff --git a/block/blk-throttle.h b/block/blk-throttle.h index b8178e6b4d30..f68b95999f83 100644 --- a/block/blk-throttle.h +++ b/block/blk-throttle.h @@ -53,10 +53,9 @@ struct throtl_service_queue { }; enum tg_state_flags { - THROTL_TG_PENDING = 1 << 0, /* on parent's pending tree */ - THROTL_TG_WAS_EMPTY = 1 << 1, /* bio_lists[] became non-empty */ - THROTL_TG_HAS_IOPS_LIMIT = 1 << 2, /* tg has iops limit */ - THROTL_TG_CANCELING = 1 << 3, /* starts to cancel bio */ + THROTL_TG_WAS_EMPTY = 1 << 0, /* bio_lists[] became non-empty */ + THROTL_TG_HAS_IOPS_LIMIT = 1 << 1, /* tg has iops limit */ + THROTL_TG_CANCELING = 1 << 2, /* starts to cancel bio */ }; enum { -- 2.31.1
next prev parent reply other threads:[~2022-05-28 6:30 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-28 6:43 [PATCH -next v5 0/8] bugfix and cleanup for blk-throttle Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-05-28 6:43 ` [PATCH -next v5 1/8] blk-throttle: fix that io throttle can only work for single bio Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-05-28 6:43 ` [PATCH -next v5 2/8] blk-throttle: prevent overflow while calculating wait time Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-05-28 6:43 ` [PATCH -next v5 3/8] blk-throttle: factor out code to calculate ios/bytes_allowed Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-06-22 17:27 ` Michal Koutný 2022-06-23 12:03 ` Yu Kuai 2022-06-23 12:03 ` Yu Kuai 2022-05-28 6:43 ` [PATCH -next v5 4/8] blk-throttle: fix io hung due to config updates Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-06-22 17:26 ` Michal Koutný 2022-06-23 12:27 ` Yu Kuai 2022-06-23 12:27 ` Yu Kuai 2022-06-23 16:26 ` Michal Koutný 2022-06-25 8:36 ` Yu Kuai 2022-06-25 8:36 ` Yu Kuai 2022-06-25 16:41 ` Jens Axboe 2022-06-25 16:41 ` Jens Axboe 2022-06-26 2:39 ` Yu Kuai 2022-06-26 2:39 ` Yu Kuai 2022-07-05 11:42 ` Yu Kuai 2022-07-05 11:42 ` Yu Kuai 2022-05-28 6:43 ` [PATCH -next v5 5/8] blk-throttle: use 'READ/WRITE' instead of '0/1' Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-05-28 6:43 ` [PATCH -next v5 6/8] blk-throttle: calling throtl_dequeue/enqueue_tg in pairs Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-05-28 6:43 ` [PATCH -next v5 7/8] blk-throttle: cleanup tg_update_disptime() Yu Kuai 2022-05-28 6:43 ` Yu Kuai 2022-05-28 6:43 ` Yu Kuai [this message] 2022-05-28 6:43 ` [PATCH -next v5 8/8] blk-throttle: clean up flag 'THROTL_TG_PENDING' Yu Kuai 2022-06-02 11:14 ` [PATCH -next v5 0/8] bugfix and cleanup for blk-throttle Yu Kuai 2022-06-02 11:14 ` Yu Kuai 2022-06-09 0:59 ` Yu Kuai 2022-06-09 0:59 ` Yu Kuai 2022-06-17 1:15 ` Yu Kuai 2022-06-17 1:15 ` 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=20220528064330.3471000-9-yukuai3@huawei.com \ --to=yukuai3@huawei.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 \ /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.