From patchwork Sun Feb 19 10:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 59063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp656178wrn; Sat, 18 Feb 2023 18:42:36 -0800 (PST) X-Google-Smtp-Source: AK7set8LCLMy5HiJaK5CoK/MWrWeoDMOeX2dTpFH7f888DBSRzLVfAoDc6wi+/7/Yn3HKC6vaR8E X-Received: by 2002:a17:90b:390f:b0:234:9fa0:300c with SMTP id ob15-20020a17090b390f00b002349fa0300cmr3222980pjb.22.1676774556191; Sat, 18 Feb 2023 18:42:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676774556; cv=none; d=google.com; s=arc-20160816; b=X6I9cUjsVOgtPtJgoW42GqqRXs4QZcNycBLPdd/awhnmKAPjNnGgGfqB/JJF5mAbAV sQX8E152wzwnyWFLGeaygghf0YgoqKQfXUZxUaUmlB1ZvakIRlCyBdNdUplxoOtBdpYp IVKyg82+fKTva4S90EJ4ggEj9b0WPRw597+Wt4I1jm2gIwYXmHQGw3F/6GestbFwVcHx nEBfKNwnOdkVqtINagFuOnPe8kfWEpSWx5xcH/eVG5b+SHskUG4+OIDpu8r8FsAYfMZn GiZ9YiZx2T3mcCS8w8lYhyxD5xU1mOuOFoBZOyB0BcXK6M6Lmi8UB24/uM5goSHwmcnb aVzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=FK30+cxL73kfuGD1AlgwGOkqHcJXiIJxMYhfrWmLaLw=; b=SPxjA8oZL5CW/P5x9/Lmf1CxKvet/drLnNdCX3gSRZXDaXaackEK7OAE7KlPtOyL3w QtM+gFf2uFWOXaWW+jcofmt46QPaAqLeB8HuKjMts9AOOhloMcI9wU0RDQ986bv5Fp9g ElfM9SgGJS71eLnNbCBX6nxBcn8pYyyOuW/WYhP4oBW5mrYtyl7vNEP/Bm7BKd6dmPSn ltzPx+n6qK7oQpsb5e41b8NFhr/RjdDJGFpR+SNjVPccQvkKqG6x3wTxkGEsu7+cGVMa VFlCvN0D7wszsA4tGuIy8GH75H8gasqgYk8X6KVVBgR3dRaTS5HBrtqIV+lqo8Pk+zHZ r2hw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y65-20020a638a44000000b005021cf73d48si3703802pgd.190.2023.02.18.18.42.23; Sat, 18 Feb 2023 18:42:36 -0800 (PST) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229743AbjBSClq (ORCPT + 99 others); Sat, 18 Feb 2023 21:41:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbjBSCl2 (ORCPT ); Sat, 18 Feb 2023 21:41:28 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 079E912057; Sat, 18 Feb 2023 18:41:26 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PK8v635HWz4f3p1D; Sun, 19 Feb 2023 10:41:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP2 (Coremail) with SMTP id Syh0CgBH7utQjPFjPmleDw--.7604S9; Sun, 19 Feb 2023 10:41:24 +0800 (CST) From: Kemeng Shi To: paolo.valente@linaro.org, axboe@kernel.dk, jack@suse.cz Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH 07/17] block, bfq: correct interactive weight-raise check in bfq_set_budget_timeout Date: Sun, 19 Feb 2023 18:42:59 +0800 Message-Id: <20230219104309.1511562-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230219104309.1511562-1-shikemeng@huaweicloud.com> References: <20230219104309.1511562-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgBH7utQjPFjPmleDw--.7604S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtF17AF1UJFyUZF47AFW3trb_yoWkWFb_C3 Z5tr1rJF1kGr93CFsrt34rAryDKw18J3WkC34xKrnFgr42yFs2k34qgr90yFZ8Za9F9Fy3 JFsYqF1UJrsrZjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758225557484343083?= X-GMAIL-MSGID: =?utf-8?q?1758225557484343083?= After weight-raise finished, bfqq->wr_coeff is reset to 1 while bfqq->wr_cur_max_time may not be reset. For example, Function bfq_update_bfqq_wr_on_rq_arrival will only reset wr_coeff to 1 if bfqq is created in burst creation. Function bfq_set_budget_timeout will be called when bfqq is selected while it's wr_cur_max_time is set and wr_coeff is 1. Fix this by check wr_coeff > 1 along with check wr_cur_max_time check like other code do. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index b32bae5259d5..5610a7dcacdf 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3297,7 +3297,8 @@ static void bfq_set_budget_timeout(struct bfq_data *bfqd, { unsigned int timeout_coeff; - if (bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time) + if (bfqq->wr_coeff > 1 && + bfqq->wr_cur_max_time == bfqd->bfq_wr_rt_max_time) timeout_coeff = 1; else timeout_coeff = bfqq->entity.weight / bfqq->entity.orig_weight;