linux-block.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kemeng Shi <shikemeng@huawei.com>
To: <paolo.valente@linaro.org>, <axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<shikemeng@huawei.com>
Subject: [PATCH 03/20] block, bfq: correct bfq_max_budget and bfq_min_budget
Date: Tue, 1 Nov 2022 17:34:00 +0800	[thread overview]
Message-ID: <20221101093417.10540-4-shikemeng@huawei.com> (raw)
In-Reply-To: <20221101093417.10540-1-shikemeng@huawei.com>

The budgets_assigned is checked to make sure enough samples have been
computed for auto-tuning. Ignore budgets_assigned if auto-tuning is
disabled as bfq_default_max_budget is set by user.
The bfq_default_max_budget check is added after budgets_assigned check,
so no extra cost is added for normal branch to return bfqd->bfq_max_budget.

Signed-off-by: Kemeng Shi <shikemeng@huawei.com>
---
 block/bfq-iosched.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 13370c41ad36..b21c3711d69d 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -1485,7 +1485,8 @@ static int bfq_bfqq_budget_left(struct bfq_queue *bfqq)
  */
 static int bfq_max_budget(struct bfq_data *bfqd)
 {
-	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
+	if (bfqd->budgets_assigned < bfq_stats_min_budgets &&
+			bfqd->bfq_user_max_budget == 0)
 		return bfq_default_max_budget;
 	else
 		return bfqd->bfq_max_budget;
@@ -1497,7 +1498,8 @@ static int bfq_max_budget(struct bfq_data *bfqd)
  */
 static int bfq_min_budget(struct bfq_data *bfqd)
 {
-	if (bfqd->budgets_assigned < bfq_stats_min_budgets)
+	if (bfqd->budgets_assigned < bfq_stats_min_budgets &&
+			bfqd->bfq_user_max_budget == 0)
 		return bfq_default_max_budget / 32;
 	else
 		return bfqd->bfq_max_budget / 32;
-- 
2.30.0


  parent reply	other threads:[~2022-11-01  9:34 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-01  9:33 [PATCH 00/20] A few bugfix and cleanup patches for bfq-iosched Kemeng Shi
2022-11-01  9:33 ` [PATCH 01/20] block, bfq: fix typo in comment Kemeng Shi
2022-11-01  9:33 ` [PATCH 02/20] block, bfq: Update bfqd->max_budget with bfqd->lock held Kemeng Shi
2022-11-01  9:34 ` Kemeng Shi [this message]
2022-11-01  9:34 ` [PATCH 04/20] block, bfq: simpfy computation of bfqd->budgets_assigned Kemeng Shi
2022-11-01  9:34 ` [PATCH 05/20] block, bfq: recover the "service hole" if enough budget is left Kemeng Shi
2022-11-01  9:34 ` [PATCH 06/20] block, bfq: correct interactive weight-raise check in bfq_set_budget_timeout Kemeng Shi
2022-11-01  9:34 ` [PATCH 07/20] block, bfq: simpfy check for interactive bfqq in bfq_update_wr_data Kemeng Shi
2022-11-01  9:34 ` [PATCH 08/20] block, bfq: do srt filtering for interactive queues in bfq_completed_request Kemeng Shi
2022-11-01  9:34 ` [PATCH 09/20] block, bfq: remove redundant check if (bfqq->dispatched > 0) Kemeng Shi
2022-11-01  9:34 ` [PATCH 10/20] block, bfq: define and use soft_rt, in_burst and wr_or_deserves_wr only low_latency is enable Kemeng Shi
2022-11-01  9:34 ` [PATCH 11/20] block, bfq: remove unnecessary "wr" part of wr_or_deserves_wr Kemeng Shi
2022-11-01  9:34 ` [PATCH 12/20] block, bfq: start/restart service_from_wr accumulating correctly Kemeng Shi
2022-11-01  9:34 ` [PATCH 13/20] block,bfq: remove redundant nonrot_with_queueing check in bfq_setup_cooperator Kemeng Shi
2022-11-01  9:34 ` [PATCH 14/20] block, bfq: remove redundant oom_bfqq check for bfqq from bfq_find_close_cooperator Kemeng Shi
2022-11-01  9:34 ` [PATCH 15/20] block, bfq: some cleanups for function bfq_pos_tree_add_move Kemeng Shi
2022-11-01  9:34 ` [PATCH 16/20] block, bfq: remove unnecessary goto tag in __bfq_weights_tree_remove Kemeng Shi
2022-11-01  9:34 ` [PATCH 17/20] block, bfq: remove unnecessary traverse in bfq_add_to_burst Kemeng Shi
2022-11-01  9:34 ` [PATCH 18/20] block, bfq: remove unnecessary bfqq->next_rq = NULL in bfq_remove_request Kemeng Shi
2022-11-01  9:34 ` [PATCH 19/20] block, bfq: remove unnecessary local variable __bfqq in bfq_setup_merge Kemeng Shi
2022-11-01  9:34 ` [PATCH 20/20] block, bfq: remove unncessary process_ref check for merged queue " Kemeng Shi

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=20221101093417.10540-4-shikemeng@huawei.com \
    --to=shikemeng@huawei.com \
    --cc=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=paolo.valente@linaro.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).