From patchwork Tue Nov 1 09:34:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13574 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845385wru; Tue, 1 Nov 2022 02:35:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vcRK0fBQ5lGKNhMVehS+Mc5UtAUBtSLMQd5UT9i41NkLxnEL2ZamuPO1NhV4q4w8qB50z X-Received: by 2002:a63:4e66:0:b0:456:b3a7:7a80 with SMTP id o38-20020a634e66000000b00456b3a77a80mr16067421pgl.467.1667295349469; Tue, 01 Nov 2022 02:35:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295349; cv=none; d=google.com; s=arc-20160816; b=p4hNYAdEcK/un7sHycn9WVJC3dv4v7STTqwbqYusGt6IKBMNq1s4WbkU47gxAZtQM5 5241ZegE4Iku3HBokyNTpKoaYrOv/qWFhkMJ51n+ERv9fhaQ0VPHaQPtWZ6rRS4uW6CR ft8Tanl5GUcnfsm+Iz+qbCCf3xkhbrox7hgSC6j6fzw581XKIqYP4v55DF+CSEgIM+pt E9kTubYFAOpR/vGyrCCPqVohCLw1u91d9g6FHgTMIZIrkMeIX7l69ZbhoYx8XjFWBAEj 06PdtKdPlx3YP+aN/bj/HY5tLOZ4t0DjX0LOjIu3yNIOQjLVy+JiAKH33iuntMMo5hSV Rlwg== 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=RzZ3cvseT6b8edPx4trNZPuXQALpyab92ou2DyupnGc=; b=l/iGExpketybLecmalwVULe4uqvX5SjuXEql5foZgBAuawXkGjG2mMDPrGPPJxO4Ab JVKj/N01avDHxkBF68bEi8m8TSWUw0use9BtrtOe2pxTb5EaX3wrrTqmRkmNjM9tmYS4 TpizSa112ipjQPVdq/4QG4Xu5bWLrOnfEXSgExsCj2keqkA6Nt47BMKAzsZwDEGvIvjp eoATgs6eiRyWtBSONPRjMNApNv8sl8+AC1z378Sygh/hUmdW/cUszrqR7AnAQHP4WoEq ouHYEUdShAwRTCAdgG36G8s+TboGhbSoyygoU+4PWq49t42QJTU69/wNhHFP/ZhA2lsa NgLQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p2-20020a170902e74200b0018663949529si8544188plf.162.2022.11.01.02.35.33; Tue, 01 Nov 2022 02:35:49 -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 S230196AbiKAJet (ORCPT + 99 others); Tue, 1 Nov 2022 05:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230146AbiKAJe0 (ORCPT ); Tue, 1 Nov 2022 05:34:26 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66CA018E05; Tue, 1 Nov 2022 02:34:25 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBM5CnNzpW50; Tue, 1 Nov 2022 17:30:51 +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:23 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 06/20] block, bfq: correct interactive weight-raise check in bfq_set_budget_timeout Date: Tue, 1 Nov 2022 17:34:03 +0800 Message-ID: <20221101093417.10540-7-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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748285888565294764?= X-GMAIL-MSGID: =?utf-8?q?1748285888565294764?= 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 before check wr_cur_max_time. 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 f4b4ba05f804..20ae52882235 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3271,7 +3271,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;