Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp2003689rwi; Tue, 1 Nov 2022 02:36:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6WsV7zh4PDuOWySQrbiXKfpNSvSo49r9TOfVFtEJznH44iw2GopGppc773w2VdGz2pEIXG X-Received: by 2002:a17:902:bcc4:b0:181:899a:ac9c with SMTP id o4-20020a170902bcc400b00181899aac9cmr18632312pls.124.1667295379263; Tue, 01 Nov 2022 02:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295379; cv=none; d=google.com; s=arc-20160816; b=QkqOl29OMkZsKb28K1f1H2FDhXU4GRRf6/bHptVWuQH2y1vpsro7FcWu0Qzxzo+/K/ 9D2gso40y2prYZ47NCcawKkmYN4eb6gEDuqwLJv9ekAIU7dl335Vlp+Gz6ani0k6L7TI s9PFLDunhp+Y/8TXI8H6CBdXcBo7g93W/IINhcQs+FNlWKfNAbch04dLhpK9ZXm4aOzI Ezuu9isLjb86HVCJ3MS0Wqms5iFczDAVEAPXVtnFx8WP1jT+nQYDoqXhBeYPCzy9i90b G2fKv0Nilz/4KCMNEbpkpEfx6ZLyaGFDxVqVGQaK3n4LXWmC94R0DwmC7ZNZDULhwvSp cuzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=aNw9zIoZKIu/yOhhooCnaKKyGmtcE5V7IuJEg1G4scc=; b=zasILvqi7KeOrcTvUzVz0mcGlIUkLUm6ZDqOt6sjSbriL1TPgjacvJoUV4A6FtVUVx dahBgf7MBZsmuLGkPCbTlbn7xzlhHEez0S3xnrXIB8D8pwT3JpwQZB4MrcJpWpEzWiVR kiGbjkpCbYdg9Nvh2ZhDmuuVm/qMb/EY40D9iAaDvNKSVn2S3aN6JOPakzggIHYi8294 +TQ7P27NzkBfZUs1Kf7Z/kUsOx8No/5icCGQhlESeyOBOnDmKcfZfTQn8ynW9YS4njYC QWo6uH9qT5XouFHinv4Spvnnupuj4E0tm239R1vqsQlS0kzzD/YFpylaP0PS7JZ1Rt1F owuA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e13-20020a6558cd000000b0046f33e0f911si11275295pgu.563.2022.11.01.02.36.05; Tue, 01 Nov 2022 02:36:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbiKAJee (ORCPT + 97 others); Tue, 1 Nov 2022 05:34:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230134AbiKAJeY (ORCPT ); Tue, 1 Nov 2022 05:34:24 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26EFF18E05; Tue, 1 Nov 2022 02:34:24 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBL0FpnzpW45; Tue, 1 Nov 2022 17:30:50 +0800 (CST) Received: from huawei.com (10.174.178.129) by kwepemi500016.china.huawei.com (7.221.188.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 1 Nov 2022 17:34:21 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 03/20] block, bfq: correct bfq_max_budget and bfq_min_budget Date: Tue, 1 Nov 2022 17:34:00 +0800 Message-ID: <20221101093417.10540-4-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221101093417.10540-1-shikemeng@huawei.com> References: <20221101093417.10540-1-shikemeng@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500016.china.huawei.com (7.221.188.220) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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