All of lore.kernel.org
 help / color / mirror / Atom feed
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 7/8] blk-throttle: cleanup tg_update_disptime()
Date: Sat, 28 May 2022 14:43:29 +0800	[thread overview]
Message-ID: <20220528064330.3471000-8-yukuai3@huawei.com> (raw)
In-Reply-To: <20220528064330.3471000-1-yukuai3@huawei.com>

th_update_disptime() only need to adjust postion for 'tg' in
'parent_sq', there is no need to call throtl_enqueue/dequeue_tg().

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 block/blk-throttle.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index e6ae86d284b9..297ce54ceaa3 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -520,7 +520,6 @@ static void throtl_rb_erase(struct rb_node *n,
 {
 	rb_erase_cached(n, &parent_sq->pending_tree);
 	RB_CLEAR_NODE(n);
-	--parent_sq->nr_pending;
 }
 
 static void update_min_dispatch_time(struct throtl_service_queue *parent_sq)
@@ -572,7 +571,11 @@ static void throtl_enqueue_tg(struct throtl_grp *tg)
 static void throtl_dequeue_tg(struct throtl_grp *tg)
 {
 	if (tg->flags & THROTL_TG_PENDING) {
-		throtl_rb_erase(&tg->rb_node, 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;
 	}
 }
@@ -1034,9 +1037,9 @@ static void tg_update_disptime(struct throtl_grp *tg)
 	disptime = jiffies + min_wait;
 
 	/* Update dispatch time */
-	throtl_dequeue_tg(tg);
+	throtl_rb_erase(&tg->rb_node, tg->service_queue.parent_sq);
 	tg->disptime = disptime;
-	throtl_enqueue_tg(tg);
+	tg_service_queue_add(tg);
 
 	/* see throtl_add_bio_tg() */
 	tg->flags &= ~THROTL_TG_WAS_EMPTY;
-- 
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 7/8] blk-throttle: cleanup tg_update_disptime()
Date: Sat, 28 May 2022 14:43:29 +0800	[thread overview]
Message-ID: <20220528064330.3471000-8-yukuai3@huawei.com> (raw)
In-Reply-To: <20220528064330.3471000-1-yukuai3@huawei.com>

th_update_disptime() only need to adjust postion for 'tg' in
'parent_sq', there is no need to call throtl_enqueue/dequeue_tg().

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
---
 block/blk-throttle.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index e6ae86d284b9..297ce54ceaa3 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -520,7 +520,6 @@ static void throtl_rb_erase(struct rb_node *n,
 {
 	rb_erase_cached(n, &parent_sq->pending_tree);
 	RB_CLEAR_NODE(n);
-	--parent_sq->nr_pending;
 }
 
 static void update_min_dispatch_time(struct throtl_service_queue *parent_sq)
@@ -572,7 +571,11 @@ static void throtl_enqueue_tg(struct throtl_grp *tg)
 static void throtl_dequeue_tg(struct throtl_grp *tg)
 {
 	if (tg->flags & THROTL_TG_PENDING) {
-		throtl_rb_erase(&tg->rb_node, 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;
 	}
 }
@@ -1034,9 +1037,9 @@ static void tg_update_disptime(struct throtl_grp *tg)
 	disptime = jiffies + min_wait;
 
 	/* Update dispatch time */
-	throtl_dequeue_tg(tg);
+	throtl_rb_erase(&tg->rb_node, tg->service_queue.parent_sq);
 	tg->disptime = disptime;
-	throtl_enqueue_tg(tg);
+	tg_service_queue_add(tg);
 
 	/* see throtl_add_bio_tg() */
 	tg->flags &= ~THROTL_TG_WAS_EMPTY;
-- 
2.31.1


  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 ` Yu Kuai [this message]
2022-05-28  6:43   ` [PATCH -next v5 7/8] blk-throttle: cleanup tg_update_disptime() Yu Kuai
2022-05-28  6:43 ` [PATCH -next v5 8/8] blk-throttle: clean up flag 'THROTL_TG_PENDING' Yu Kuai
2022-05-28  6:43   ` 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-8-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: link
Be 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.