From patchwork Tue Nov 8 04:52:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16859 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2484850wru; Mon, 7 Nov 2022 20:54:11 -0800 (PST) X-Google-Smtp-Source: AMsMyM4WZpkrgmXtwzH0w+t7rEI/RxM8EZzERfrZY7aAVS2mlhF/oQhv0dHWMySWtSQo6QPCHJJb X-Received: by 2002:a17:906:4791:b0:7ac:98e7:eda7 with SMTP id cw17-20020a170906479100b007ac98e7eda7mr51518187ejc.321.1667883251744; Mon, 07 Nov 2022 20:54:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883251; cv=none; d=google.com; s=arc-20160816; b=B04i1729XOLxnkRPRRAaoyHObsUCvqQGxppcVvYKICafASMJ+0M/7EumdDBWVTf0gI JbXm5EK9aSm3pVsGM/KF6ccCpIk669NJHythK+eKlUH75fjAouO+4cDB60a7vUQdvDKb hatfhs4NcQQE2yPE1SB96gm/CNHgsGI2y4bRuN4rL/xgm32zdwButUkGVXS3h/BNVWfX dZO5ybKqVnL6vFhad9yct0mTy3BI4gZjKCbxccm44fepdA7fjwK3W1RNdYYoT3r1zbBb aTujgcCHfbD38r1EHcqQpUu6MPL7u0pLyutl5XWTRbC5PLzrR84khiM2FrK10PEqpZpb 8zzg== 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=BW/yb+hMr7r/gjiEagoL1D0XYGXD8oxmR6RdGIgtHFs=; b=IGVGle831kyKyajJWpiQ+yJTt8u94DlAh9BGQrgU9ZvbmjYGGmVtcnVZaXO4E7HFRc C9Sr8ge8XDf88DXColgpS/JAg+k4ZzQp8UESqixXoxCOmeH4KwLFX6rFrZvoiZp96VDB 7kDj15z55x5v26ypNu/2oaDEqmb2oeQqNmY7W3m3Ic93fRxUPgARSBrYPvM0BkYGuR6+ fbyyK/mIM9B8DySEtpVPMLtbt/YRxAAJacnTEQ2xoyEBjcIdRiJ645g8mKA5rd4Kl7LG +ewWJ2Y4MAxWUo2NgLA9wL3DLn8rRt4XdwQPnb2ImRyMW/Lt74JBGJjG+KjxJZ8GN5Mr aIMA== 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 v22-20020a170906489600b00782e85ae302si8817993ejq.574.2022.11.07.20.53.44; Mon, 07 Nov 2022 20:54:11 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231974AbiKHEwv (ORCPT + 99 others); Mon, 7 Nov 2022 23:52:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232984AbiKHEwh (ORCPT ); Mon, 7 Nov 2022 23:52:37 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DDBA1BEB5; Mon, 7 Nov 2022 20:52:31 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgS5XbdzHvmS; Tue, 8 Nov 2022 12:52:04 +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, 8 Nov 2022 12:52:27 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 01/10] block, bfq: correctly raise inject limit in bfq_choose_bfqq_for_injection Date: Tue, 8 Nov 2022 12:52:15 +0800 Message-ID: <20221108045224.19092-2-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902349072940737?= X-GMAIL-MSGID: =?utf-8?q?1748902349072940737?= Inject limit could be temporarily raised if current inject_limit is 0. raised limit is saved in local variable "limit". The traverse below will reset raised "limit" to bfqd->in_service_queue which is 0 for limit raised condition and will invalidate the raised limit. After passing bfqd->rq_in_driver >= limit check above, we can be sure about two things in traverse: 1. Local variable "limit" is greater than 0 or bfqd->rq_in_driver >= limit check is always met. 2. For normal case (else case for large request to non-rotational drives), no need to check bfqd->rq_in_driver < limit again if local variable "limit" is not changed. Fix this by not overwriting local variable "limit" in traverse. As metioned in first thing above that limit is greater than 0, so result of min_t(unsigned int, 1, limit) is always 1. we can simply check whether rq_in_driver is less than 1 for case of large request to non-rotational drives and remove assignment to local variable "limit" in traverse. As metioned in second thing above, in normal case no futher check is needed if local variable "limit" is not chaged, so return directly in normal case. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 7ea427817f7f..b0bee8ab65e6 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4707,12 +4707,10 @@ bfq_choose_bfqq_for_injection(struct bfq_data *bfqd) */ if (blk_queue_nonrot(bfqd->queue) && blk_rq_sectors(bfqq->next_rq) >= - BFQQ_SECT_THR_NONROT) - limit = min_t(unsigned int, 1, limit); - else - limit = in_serv_bfqq->inject_limit; - - if (bfqd->rq_in_driver < limit) { + BFQQ_SECT_THR_NONROT && + bfqd->rq_in_driver >= 1) + continue; + else { bfqd->rqs_injected = true; return bfqq; } From patchwork Tue Nov 8 04:52:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2484880wru; Mon, 7 Nov 2022 20:54:16 -0800 (PST) X-Google-Smtp-Source: AMsMyM7yFh5kBiJzw71ZBeYQpVjSEb/ttPRUd0aJBhcLRkZHZqXw+A6RFZrOcZWaKNa6oNRD918E X-Received: by 2002:a05:6402:2994:b0:453:4c5c:d31c with SMTP id eq20-20020a056402299400b004534c5cd31cmr53680917edb.412.1667883256155; Mon, 07 Nov 2022 20:54:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883256; cv=none; d=google.com; s=arc-20160816; b=sC1vQB5brb02BhwOF0CWQdDFLG3q4HxVBXHYcl5ag/gX/RhKlJqvLVzeUEVjVDrYZz 08m2J1iQ3Vwnkh2okBOKIVBQjHm/mC6iVP8vuc4mmJvzV6CMbcVgpoS8QBOsMti7A97F FVREbj2P5q9yCaLR5zj0vFQ9SybH7SfHEqv1QjPsLbDMdx5jscgIsI5l/SDoeWqC5xxL L5gGWZy0HduqsQ7w2WdCUYBwZ6LY3270cobeBoiEmznbGLWM9dXP7gv8s0R1w3Nr6OHX m/puLegPXLmR61h0H0y2H9rbq/kr8fbimbd894ND9F1VVOjtoKM9oEEF4T/XIL18ZNtU dK5A== 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=bhcqDaIk68P0EyazZTqm3+GV+bhSyo2EnM/ocR+3GBE=; b=XzoPvdzPlfgeLh/hrazdvgqxVLhykD7Z2jXR9xR+l28MWpHB4neh0rPq9983noF9k7 dySwke0pQwjKgcCJRi8pEKJN6acSWq9zKjs5FNo8GN1rMWv80JWkpH0tCKeRK0Dzahpk OZ1E7QZwrZuVamJ+IT7Vhf2g20rBJ6K7A6ct0kkx4Vr3gL3tabIwM4BWkTiXVI7tgZ/1 CF0TFhJLdlSmI0B5frZA+agrQHe2UXj9ohz7j2OuKML2rxLoOzJU5jhjkaddYtvrPELa 9RRPAA6S878Tsvxksaz7YdqVD6w3LWUP/8jxCwYHX/ycLRQyTD+sr2QjDB2sRd0NyX+u v71w== 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 i9-20020a0564020f0900b0044e8fe826a0si12172446eda.156.2022.11.07.20.53.51; Mon, 07 Nov 2022 20:54:16 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233235AbiKHEwy (ORCPT + 99 others); Mon, 7 Nov 2022 23:52:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233045AbiKHEwh (ORCPT ); Mon, 7 Nov 2022 23:52:37 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3887F1BE9F; Mon, 7 Nov 2022 20:52:31 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgn4djDzRp44; Tue, 8 Nov 2022 12:52:21 +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, 8 Nov 2022 12:52:28 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 02/10] block, bfq: remove unsed parameter reason in bfq_bfqq_is_slow Date: Tue, 8 Nov 2022 12:52:16 +0800 Message-ID: <20221108045224.19092-3-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902353045265012?= X-GMAIL-MSGID: =?utf-8?q?1748902353045265012?= Parameter reason is never used, just remove it. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index b0bee8ab65e6..fc71181a7e5d 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4132,8 +4132,7 @@ static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd, * function to evaluate the I/O speed of a process. */ static bool bfq_bfqq_is_slow(struct bfq_data *bfqd, struct bfq_queue *bfqq, - bool compensate, enum bfqq_expiration reason, - unsigned long *delta_ms) + bool compensate, unsigned long *delta_ms) { ktime_t delta_ktime; u32 delta_usecs; @@ -4329,7 +4328,7 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, /* * Check whether the process is slow (see bfq_bfqq_is_slow). */ - slow = bfq_bfqq_is_slow(bfqd, bfqq, compensate, reason, &delta); + slow = bfq_bfqq_is_slow(bfqd, bfqq, compensate, &delta); /* * As above explained, charge slow (typically seeky) and From patchwork Tue Nov 8 04:52:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16861 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485050wru; Mon, 7 Nov 2022 20:54:55 -0800 (PST) X-Google-Smtp-Source: AMsMyM7iQiE/R/I2g0N84I9EWMdnwB0ckLmY6pXq31zXpVWuAp9KbyQVRKMyB3qSd45uOXYaul6P X-Received: by 2002:a17:907:b17:b0:78b:b909:e91a with SMTP id h23-20020a1709070b1700b0078bb909e91amr49318476ejl.687.1667883295763; Mon, 07 Nov 2022 20:54:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883295; cv=none; d=google.com; s=arc-20160816; b=J3p9erXMmOTsvDyOmup0JDPNydkWJlEeunEg/18e42G0juo4RBW1qSfyvPVpQtk/qy Z8Iv3PT9+nq7SykkNBNuOAcHmqpxhKeqbU0xyLwwwBdQpJudC5Ni2eoReXADuuNmCpg3 OpWAR2WXN9GD887ewbBg9+/s3abpwuhZ76g319X2wsNlEOcJZQYvE9V4qswgm1+6jFyP TP9gtvcfoBkxTH8rwqBVuZN2oBD6hwH2VKzFqV23zaDqYSp6KaEP8vFvrRHP1oQNV8DO 1Ny4j7bNvrWxQooye0OiC/CpFzdi3MXltfXyIjft1oEIqSLqt5kVKvmQb39h2Z90a1+a Y3mQ== 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=AyhqVkolz+o+u42l2HQ+BMMcM2gHV92hgd1ZCJNT55g=; b=0MtAcr8hk81Jv3DO8nr+AIGVd42G8AgI49vbc4qayzbRct0YzaL6/BV5vhHuBXP5Fd eiF4iFdfOlsKeE9Txf7qa/iskPWVDVMSWtFtlnsG2aKxMaesKw+zgsclrRhccEmJMlVX Uk8lWcHhBTFuXZYh8+zaQYsY7cr7OUZrgE7/L7mIJqJUO+RDQ56lbWLkefxi6FdLBuIn gkdQoAvuxeBqFXPeEBMjCB4zii3K/Upq7YO0w2oK1f73bJEvWFsrujP6hBxtdp1fzfoB O/CdXJA5FziSaYm20goGyBslYlDLl7qAv6WFewc+x1JKr7VABl+vgCsOYZIt0g5JFHBc EY3g== 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 dm20-20020a170907949400b00782ff2649a7si12574002ejc.346.2022.11.07.20.54.32; Mon, 07 Nov 2022 20:54:55 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233273AbiKHExE (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233071AbiKHEwi (ORCPT ); Mon, 7 Nov 2022 23:52:38 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67E221C413; Mon, 7 Nov 2022 20:52:31 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N5wgk1SlFzmVhW; Tue, 8 Nov 2022 12:52:18 +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, 8 Nov 2022 12:52:29 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 03/10] block, bfq: initialize bfqq->decrease_time_jif correctly Date: Tue, 8 Nov 2022 12:52:17 +0800 Message-ID: <20221108045224.19092-4-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902395198076000?= X-GMAIL-MSGID: =?utf-8?q?1748902395198076000?= Currently, decrease_time_jif is initialized to 0 and will be updated in function bfq_reset_inject_limit and bfq_update_inject_limit while these two functions are called when jiffies pasts decrease_time_jif with some extra time or think-time state changes. If jiffies is slightly larger than MAX_JIFFY_OFFSET, it will take a long time to meet the first condition. The second condition is heavily relies on process behavior. To be more specific: Function bfq_update_inject_limit maybe triggered when jiffies pasts decrease_time_jif + msecs_to_jiffies(10) in bfq_add_request by setting bfqd->wait_dispatch to true. Function bfq_reset_inject_limit are called in two conditions: 1. jiffies pasts bfqq->decrease_time_jif + msecs_to_jiffies(1000) in function bfq_add_request. 2. jiffies pasts bfqq->decrease_time_jif + msecs_to_jiffies(100) or bfq think-time state change from short to long. In worst case that jiffies is slightly larger than MAX_JIFFY_OFFSET and think-time state never changes, the service injection may be not triggered for a long time. Fix this by initializing bfqq->decrease_time_jif to current jiffies to trigger service injection soon when service injection conditions are met. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index fc71181a7e5d..01fa16047eb5 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5557,6 +5557,8 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, /* first request is almost certainly seeky */ bfqq->seek_history = 1; + + bfqq->decrease_time_jif = jiffies; } static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd, From patchwork Tue Nov 8 04:52:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485419wru; Mon, 7 Nov 2022 20:56:09 -0800 (PST) X-Google-Smtp-Source: AMsMyM6WoKKNctNG5WccRKILI8cHs9nLiNYC19UYLM1zpKi232VgnL3RUiybO4wGN6P1kiwuaARR X-Received: by 2002:a17:906:2a93:b0:78d:b87e:6aab with SMTP id l19-20020a1709062a9300b0078db87e6aabmr51845035eje.157.1667883369450; Mon, 07 Nov 2022 20:56:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883369; cv=none; d=google.com; s=arc-20160816; b=qtypCzugDQ9e3ieI20AoDzdGGTESTK0uKWYdzCbTxtEw28JKL8H5ZvOlWWIWu/J/7p HVyGTDKOBaoilr0l/vKym1wsA3xdVkM7PBd1CiX0LBMgWU59wJWlnGsp0XKmPxHW+PaI ElvWdk6R5c+Bi1lipjAqxv0Deh8o0B08Kh4iGjYkTLuQ2wCqXpz/d7uhPUx3QRBlqWz6 JlI3/CoWg7AsQMjr/Od8kdjjQFlATkmKUoA3S4644TQHf+0Kv6Bx8x1n7EuryV466Gp8 g4y/R+nCOm3yqvk7WJyntuzMz7v8FAvYONKwyYVRc0BgFxWToVfCV219gS13yVqtwaO8 7yew== 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=mTVyxTtvuvFm31FVLAG6lca90vlQ8MBnuBQQtyYLs1g=; b=fCKMJh4Bm94iY/I0LVFcBw+vvvlPLnpTuLKByTO40Y8VIUPG7zjlSfjk/FcHiv4/lN fdlLGzHzcHqEl6wblLIObZEWgbWOlbBlhConcQM9Zy33wtvBytxKO0GSBFXfsIMP2CNK XVpFr15pjy160gohE4zKeloTNgngp4D6Uv36vfK9Ebcpnew8lI8y8AT/B2vCskEA+UIa u5MKIpSM1+AfwM+UyReyobzvreiOvYPbSlTOHg5ku3o09ApdutC2hxGgsvgSI1SiqAL4 h/i2wSlkJ538htJkvY8+iuDNhkMLjJiKOFu97mqKK9XYnJ1tYf0VPmlBiN0ST+Zi1QQN GDaw== 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 m13-20020a056402430d00b00458bbd3a0d2si13133361edc.602.2022.11.07.20.55.44; Mon, 07 Nov 2022 20:56:09 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232308AbiKHEw5 (ORCPT + 99 others); Mon, 7 Nov 2022 23:52:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232967AbiKHEwi (ORCPT ); Mon, 7 Nov 2022 23:52:38 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C7D61C909; Mon, 7 Nov 2022 20:52:32 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgV4YjwzHvfn; Tue, 8 Nov 2022 12:52:06 +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, 8 Nov 2022 12:52:29 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 04/10] block, bfq: use helper macro RQ_BFQQ to get bfqq of request Date: Tue, 8 Nov 2022 12:52:18 +0800 Message-ID: <20221108045224.19092-5-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902471579603137?= X-GMAIL-MSGID: =?utf-8?q?1748902471579603137?= Use helper macro RQ_BFQQ to get bfqq of request. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 01fa16047eb5..2c4fe286ead7 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6748,14 +6748,14 @@ static struct bfq_queue *bfq_init_rq(struct request *rq) return NULL; /* - * Assuming that elv.priv[1] is set only if everything is set + * Assuming that RQ_BFQQ(rq) is set only if everything is set * for this rq. This holds true, because this function is * invoked only for insertion or merging, and, after such * events, a request cannot be manipulated any longer before * being removed from bfq. */ - if (rq->elv.priv[1]) - return rq->elv.priv[1]; + if (RQ_BFQQ(rq)) + return RQ_BFQQ(rq); bic = icq_to_bic(rq->elv.icq); From patchwork Tue Nov 8 04:52:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16868 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485433wru; Mon, 7 Nov 2022 20:56:12 -0800 (PST) X-Google-Smtp-Source: AMsMyM69hltGSt4jQ4OKg9zpQ+kUQlbJlRFwsThMrHyyLjDoE/vUiLYjl/2bnOqgA+TzsuiKFat8 X-Received: by 2002:a17:907:1dd1:b0:7ae:1075:202 with SMTP id og17-20020a1709071dd100b007ae10750202mr26627138ejc.118.1667883372224; Mon, 07 Nov 2022 20:56:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883372; cv=none; d=google.com; s=arc-20160816; b=AZWpmEJQAkhFQR/XuMWx5qEMG9srJLDBqEXJXbJwPKPZQsVx62aO7lw2UijgSqSTJB V6HwBK//dRxIPug3mFoXxFtfZZGUy3ZSBYe7nMpy70CFrqcPUmefVDGMzZLQkGWlntuQ 5NRBHF707wh0YM+DF1eR1dV6w/d7KgiauwjtU4H8slPaxVzIP+AxSusxlAOhoodHM7uG bwpXPqKEycqdd2LBkcic024dcmhABa51U1j2cDDloAkvahW/h1FWVuPpb8GPDMCzw4iA KaapPlvmJ4MqjhOWB0yKbk3wfP2p8fBUNn1So/NLrvnloVYS6L6Fay3QCSnVT7VSouys rT1Q== 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=Jo4ZxGruwRRpQse7bEMgMFNg5YNydAZ1D+xv2kVzpc0=; b=gAMJ6aOyjTZxQkRaNQZlctfugn8psbqkSPbdTl/LWwKXwmqkOBuLyH6/OwWmvw6HlU lnxbgPhKv7N/XAiFD218JGs1VuUddkD+Ct/rDgUHS5XAV8Uq+OADA8qYqM3qH93ohN4Q H5gfI8rPN0iohLCC59eQDjJIql1px66DP9x4ln7JfBvSMIxQ9EwPVZplb0xwrRACZJHZ D3jvDyZ15pmIMQryLsnNi7IG/jI67hftNBa3rx5XEMSvroFFUu85lNAr6Hsjbv6AVeNv BY717/fhEACqaA0jeNvQKqFHQGdgnwDy2lXLKm98lts7KaQNbBZd/zcvftgnZwxXbtAZ x5yw== 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 u1-20020a1709064ac100b007811ace1701si7660231ejt.445.2022.11.07.20.55.47; Mon, 07 Nov 2022 20:56:12 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233278AbiKHExH (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233074AbiKHEwj (ORCPT ); Mon, 7 Nov 2022 23:52:39 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95F492ED7A; Mon, 7 Nov 2022 20:52:32 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgq3Y4dzRp5C; Tue, 8 Nov 2022 12:52:23 +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, 8 Nov 2022 12:52:30 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 05/10] block, bfq: remove unnecessary pointer reference to get async_bfqq Date: Tue, 8 Nov 2022 12:52:19 +0800 Message-ID: <20221108045224.19092-6-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902475119968980?= X-GMAIL-MSGID: =?utf-8?q?1748902475119968980?= The async_bfqq is assigned with bfqq->bic->bfqq[0], use it directly. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 2c4fe286ead7..aad88ca5e5a5 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4901,7 +4901,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) icq_to_bic(async_bfqq->next_rq->elv.icq) == bfqq->bic && bfq_serv_to_charge(async_bfqq->next_rq, async_bfqq) <= bfq_bfqq_budget_left(async_bfqq)) - bfqq = bfqq->bic->bfqq[0]; + bfqq = async_bfqq; else if (bfqq->waker_bfqq && bfq_bfqq_busy(bfqq->waker_bfqq) && bfqq->waker_bfqq->next_rq && From patchwork Tue Nov 8 04:52:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16866 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485200wru; Mon, 7 Nov 2022 20:55:22 -0800 (PST) X-Google-Smtp-Source: AMsMyM5DqivPchDWwBRFdiKc/1mnTJTESBkmj2/30uWF8M+oLzBOd+s7rLHPRjdtSr7/ddKfSrVZ X-Received: by 2002:a17:907:a087:b0:7ae:4290:267 with SMTP id hu7-20020a170907a08700b007ae42900267mr16266691ejc.694.1667883321992; Mon, 07 Nov 2022 20:55:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883321; cv=none; d=google.com; s=arc-20160816; b=EX7o/egbtft+SbWoOJCzr82z79UJxMVYS3OTjXm6kJFgYWb58+0+GhVBEqYu0SfBM0 OQvT34K2aeUDqU1b4wgBC10LY8zJcfJ9NMrzywdeFFmANS3TCDf5SrRLmGDN62+saJhH a/ObQW0UgllVvY6QFCNgB+q6KtvbV6oDkAy3lzKmX+gbJQIRPh0FBhlofPz6tSoXxgSy KrY0Wb9PnPE4DGp3Fbw+Q8vjUVwhd30Mw+0KLGJs8qWyJy2O8OsnuUYIcG3bp9eKEXpT 4EzG5uCjRPbc0/35Xm28C0sQqz5eYZw49XXzxAtKG1+2K714XDobjorr29OaWXqiMjNg aJEA== 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=izPjKyrWuTiTktJ9sW/TzG49HTVf9+7eNEFM0MIRLDE=; b=ad6iFIhyrrdCszCaA1Sj21d8QAS5lep54FOGA9F+PcWcHIQGrVwzdu4mRz/1gtQ+eP DFqIZtsCf/dnWGlMFi/HaPMg6SMxhVw08WPUnAx+cqOp6PxsllwY8r7yYJ6kpULZY2CH Fsw+8LVMkj6ik0oBUNQProGnsZOYTcluaGuHpjCGfhdYi1bAp7Bq3Gd3yBlX3hECYfNl 2lEoqqKfk7vZpHAuczUWTcxoGWp6ZeMrTIYGN6tUA/SVpi/mbV5LqB/d+25CRxX9CuAd ac7H6Ht3fjcOTPRjOi8mpSlXc/W49g/QuRHRBAaTKxqwcMT2ATuZ492GHmeSvMM9vBDG wnqw== 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 g13-20020a1709065d0d00b007313312730esi12534334ejt.85.2022.11.07.20.54.57; Mon, 07 Nov 2022 20:55:21 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233295AbiKHExN (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233035AbiKHEwl (ORCPT ); Mon, 7 Nov 2022 23:52:41 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3783E2F028; Mon, 7 Nov 2022 20:52:33 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgW63ZjzHvms; Tue, 8 Nov 2022 12:52:07 +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, 8 Nov 2022 12:52:31 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 06/10] block, bfq: remove redundant bfqd->rq_in_driver > 0 check in bfq_add_request Date: Tue, 8 Nov 2022 12:52:20 +0800 Message-ID: <20221108045224.19092-7-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902422188836664?= X-GMAIL-MSGID: =?utf-8?q?1748902422188836664?= The bfqd->rq_in_driver > 0 check is along with previous "bfqd->rq_in_driver == 0 ||" check, so no need to re-check bfqd->rq_in_driver > 0. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index aad88ca5e5a5..be923be48647 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2254,8 +2254,7 @@ static void bfq_add_request(struct request *rq) */ if (bfqq == bfqd->in_service_queue && (bfqd->rq_in_driver == 0 || - (bfqq->last_serv_time_ns > 0 && - bfqd->rqs_injected && bfqd->rq_in_driver > 0)) && + (bfqq->last_serv_time_ns > 0 && bfqd->rqs_injected)) && time_is_before_eq_jiffies(bfqq->decrease_time_jif + msecs_to_jiffies(10))) { bfqd->last_empty_occupied_ns = ktime_get_ns(); From patchwork Tue Nov 8 04:52:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16862 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485067wru; Mon, 7 Nov 2022 20:54:59 -0800 (PST) X-Google-Smtp-Source: AMsMyM7TnKchYO8cK4k3A/+SO3Pqi7xlSmmlb2r1fRzRH3Hg3JUGV/leE4Ydtewz4krf5SkX3Ge/ X-Received: by 2002:a17:907:1c9e:b0:79e:6d97:5e0 with SMTP id nb30-20020a1709071c9e00b0079e6d9705e0mr49976732ejc.534.1667883299269; Mon, 07 Nov 2022 20:54:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883299; cv=none; d=google.com; s=arc-20160816; b=OgG+77CMbpPOsZ+mdFW7SqnPra7eM8CoWqlbWhoSa/tLu6vTlAJ3PIanBW2LQ0/Tre RR7kjCt/LH21UOed+r0498IstaHvDlKbwmyiYZYn9k7bYMbZddDTKAvHDjfF0DBfar8J ijiHBH7TPuKF4iZoXz72l4y9WWUGreT6qk+9fkJrXxqwWLmX5cLufBIE3249bIjJidOO wQsHt8F2jKnuqV7aFrFzU+5dDs2csGNerRO8ibcnbi4Szwaup204nU2nKn2fxhcWiRDx S+gGtGNoX3RLkNrq7Vl1ohm2CRM/QEEc2Qzf5OGXUZZc+WWyHq/WuoFHeHN1a3boem0+ aLgg== 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=K9k//iMqnVw52UybEPsNp9kgL4YmZ65wQqeCi/3JWVQ=; b=vlgPeSqrIfIUSHGD7XhENv59an73yO5XLM0DiEHw0ihBkSKz2X+8xrtWjeacFnXNnT g5u/KFjvVG8a29Q8LNxADWoQ3e/wNU9nV6jg1MEnWBWupdNZiSfweH7GIfiuCBkz8S7V diaTMKDbdWBDJU0vALe6LgNUp8URCVUDODx9gFopmNVPw/WMvOFZzyLUPCAdlUGRdpQd 6wz22NZIURhZvSAfaf8mZw3qYimQa7c/vOE8ehJc88YSWRJX2EWIpqw4hl9SUwh1DsB4 dHsz0+RhNc9p8jfA0Q83Gj80CWZn1UMkgmSboM7rVeXLXQIC/ZG+RFHEX87wAK7O17C/ YitQ== 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 ga11-20020a1709070c0b00b00732fa9d3df0si13333059ejc.795.2022.11.07.20.54.35; Mon, 07 Nov 2022 20:54:59 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233315AbiKHExS (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233098AbiKHEwm (ORCPT ); Mon, 7 Nov 2022 23:52:42 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE4D8326DE; Mon, 7 Nov 2022 20:52:33 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N5wbm6s1szpWBX; Tue, 8 Nov 2022 12:48:52 +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, 8 Nov 2022 12:52:31 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 07/10] block, bfq: remove redundant check in bfq_put_cooperator Date: Tue, 8 Nov 2022 12:52:21 +0800 Message-ID: <20221108045224.19092-8-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902398090605762?= X-GMAIL-MSGID: =?utf-8?q?1748902398090605762?= We have already avoided a circular list in bfq_setup_merge (see comments in bfq_setup_merge() for details), so bfq_queue will not appear in it's new_bfqq list. Just remove this check. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index be923be48647..cffc5ff66ee6 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5339,8 +5339,6 @@ void bfq_put_cooperator(struct bfq_queue *bfqq) */ __bfqq = bfqq->new_bfqq; while (__bfqq) { - if (__bfqq == bfqq) - break; next = __bfqq->new_bfqq; bfq_put_queue(__bfqq); __bfqq = next; From patchwork Tue Nov 8 04:52:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485092wru; Mon, 7 Nov 2022 20:55:04 -0800 (PST) X-Google-Smtp-Source: AMsMyM6qSZDfBRMHtmTROaSjnke//UAR1N00Dk7cGfyqw/WMYULQ5D4TzOviQExvSbj8ATFMLJLd X-Received: by 2002:a17:906:5d10:b0:7ad:e132:bb85 with SMTP id g16-20020a1709065d1000b007ade132bb85mr40331917ejt.367.1667883304124; Mon, 07 Nov 2022 20:55:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883304; cv=none; d=google.com; s=arc-20160816; b=z8SvvMPBTS3/9enqCgr9nKdhcx2mSG3SEBJ61K6r30Vc9AEQfgIyfQ3D5+FJVsYjxC f7lxUd4xBE66GFXpgQJIyWOYKK+v25QvlajPCxkCgyjcO5BoRMuW+p70vS3ci3TMXEEF fz1bD2FoPTsrQLjQ56PoYYXisD58oiQgrjFpbOraBXETN9yLd4rZf2hog0Q6RQlZva+c LBc4iKJFvkrtNsMAml53JzD6rOy0zcIYOfCOeO46lK8psiSDnySfR82H+TRRfvuf3DS9 Q19T6qQ0AwhO2ebjJbHVAt+KtTHPpswTvTqN+ly5qnZxU2EfQY3KP/g/YSexRoI+5AR0 m4ng== 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=Q+3TVrmx9Om1trGYVtqJYiR85Jw9MmR5N70cW3+xGE8=; b=HJh3eBJhZZey7JqqDfZL7bY9QrOBBqgKn6hzucZp4RIIu6rAOYiK4vjlBIDnk+WFT2 WWo7KNudCAOPjGfWI13NW6b4YTUK3ZhOuJZ7mHP/Vp0KADI48/oEDIyLSOs+H158gm5F 06mpQ9Al1wtvZtJjH5iGMjU1/YTchTe7k91rjlb1BUqCwZ7+G3u3tA6bdpjLtjKoSnoE RZJCw+XJi6Rn8jyBj93DMlxSRFr7HV43RILUQjU/4UlgLISdQ1KJ9eLI7NFugG8smGWc eSInsQ5C2MvUaEeuJ1EfE4KFm3lgQ0mM+ksLv56uiexBQ1BN+Ris5WA72AeQKHF3W5uU ncSw== 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 g20-20020a056402181400b0045829a1c0b3si10126391edy.251.2022.11.07.20.54.39; Mon, 07 Nov 2022 20:55:04 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233338AbiKHExY (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233135AbiKHEwn (ORCPT ); Mon, 7 Nov 2022 23:52:43 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76D8B326E2; Mon, 7 Nov 2022 20:52:34 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N5wgp0BfMz15MSb; Tue, 8 Nov 2022 12:52:22 +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, 8 Nov 2022 12:52:32 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 08/10] block, bfq: remove unnecessary goto tag in bfq_dispatch_rq_from_bfqq Date: Tue, 8 Nov 2022 12:52:22 +0800 Message-ID: <20221108045224.19092-9-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902403534399107?= X-GMAIL-MSGID: =?utf-8?q?1748902403534399107?= We jump to tag only for returning current rq. Return directly to remove this tag. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index cffc5ff66ee6..64c1249d8eda 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5031,7 +5031,7 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, bfq_dispatch_remove(bfqd->queue, rq); if (bfqq != bfqd->in_service_queue) - goto return_rq; + return rq; /* * If weight raising has to terminate for bfqq, then next @@ -5051,12 +5051,9 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, * belongs to CLASS_IDLE and other queues are waiting for * service. */ - if (!(bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq))) - goto return_rq; + if ((bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq))) + bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED); - bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED); - -return_rq: return rq; } From patchwork Tue Nov 8 04:52:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16864 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485110wru; Mon, 7 Nov 2022 20:55:08 -0800 (PST) X-Google-Smtp-Source: AMsMyM7+4jTWDmsUYICW7FlK8BjOC+2OPUuyTpxoYnC979iTj71si+KLzEwQdCz7vL0JrOU72Yn2 X-Received: by 2002:a50:9fae:0:b0:464:472e:cbc4 with SMTP id c43-20020a509fae000000b00464472ecbc4mr25433107edf.143.1667883308114; Mon, 07 Nov 2022 20:55:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883308; cv=none; d=google.com; s=arc-20160816; b=lY++JJ0kwHE7kz4LJPL1M+nFmFRVY7aOQrcqjTb7GJ3u0qxI13GD6vzcyXFosIv1RE ghjUjeb2pEQ6/7DSK3C5VV4EVitnmKGXj7WBLccGCpN4m102MSjN/6uoqzVMm9RlH9tr TsaDfIh7g/teVOYt+aAlLH2fkQLpJnooUPf8YD1M4iQyCsaI36iXs2BdyvMwsW8lSsv+ Kjx90l6bCf+YEZxXwo3kRMBQO6879YP7/o+3t5S5DULXJeL+RsIRYCNvirvhu5ktRanL j0BN4DyHfZWnegTuVhtL1NmPc6kmsmb259EyL4lwm6YgcXxBkitHo7kK5vT3c93Z3iVU TIyg== 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=dC/F2o7WbwN0l/inK0Pvrbg3OBsf8DF/1CKz1y8CArA=; b=TtaGhe5OjDX2Co7dkQdhdayIwLepsK7cClS2/TTDppiXjVVk1M/sM7OBpbJ4xwb/aY iLPMh4tLX9Ozg0lRx46ZKkdL1TrGH7bKxHbJJ485xcoCZIiK3/KE20tWVg3xh/ypK7/l chWdQPljja7ZF+1tDL2lMQ4QYtlEJNRRqqc6OSfCYAv3nX4W137wBuAvEoeE6ZPMzpBt 9l0f4uGydp+KScdE9Xp+XOlZM5SnYMX1XQ+f7m3nFfPqGNyhlMvSeJ8ax2ibT/GVluJ8 w87GW4UUHsI8BH6t2Q80r2HIfugz165ECmgmVfw1a7dl+7O/IljUFmHkCh4DXbUPzEXa Ih0A== 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 hr15-20020a1709073f8f00b007ae64410b4bsi872521ejc.741.2022.11.07.20.54.43; Mon, 07 Nov 2022 20:55:08 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233352AbiKHExb (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233140AbiKHEwn (ORCPT ); Mon, 7 Nov 2022 23:52:43 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A5121B1F2; Mon, 7 Nov 2022 20:52:35 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N5wgs6vr6zRp5b; Tue, 8 Nov 2022 12:52:25 +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, 8 Nov 2022 12:52:32 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 09/10] block, bfq: remove unused bfq_wr_max_time in struct bfq_data Date: Tue, 8 Nov 2022 12:52:23 +0800 Message-ID: <20221108045224.19092-10-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902407604037424?= X-GMAIL-MSGID: =?utf-8?q?1748902407604037424?= bfqd->bfq_wr_max_time is set to 0 in bfq_init_queue and is never changed. It is only used in bfq_wr_duration when bfq_wr_max_time > 0 which never meets, so bfqd->bfq_wr_max_time is not used actually. Just remove it. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 4 ---- block/bfq-iosched.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 64c1249d8eda..40ac219b2d8f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1120,9 +1120,6 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd) { u64 dur; - if (bfqd->bfq_wr_max_time > 0) - return bfqd->bfq_wr_max_time; - dur = bfqd->rate_dur_prod; do_div(dur, bfqd->peak_rate); @@ -7138,7 +7135,6 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) */ bfqd->bfq_wr_coeff = 30; bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300); - bfqd->bfq_wr_max_time = 0; bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000); bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500); bfqd->bfq_wr_max_softrt_rate = 7000; /* diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 71f721670ab6..48c147e5f9e0 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -719,8 +719,6 @@ struct bfq_data { * is multiplied. */ unsigned int bfq_wr_coeff; - /* maximum duration of a weight-raising period (jiffies) */ - unsigned int bfq_wr_max_time; /* Maximum weight-raising duration for soft real-time processes */ unsigned int bfq_wr_rt_max_time; From patchwork Tue Nov 8 04:52:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485186wru; Mon, 7 Nov 2022 20:55:18 -0800 (PST) X-Google-Smtp-Source: AMsMyM48RVTljOE+kxrmIXyS1asK13J4mZydwNylbWdHBSbBV4jwofcM5ABxjs4AzGs9OQAMItYP X-Received: by 2002:a17:906:8a57:b0:7ad:69fb:3a with SMTP id gx23-20020a1709068a5700b007ad69fb003amr49866725ejc.179.1667883318331; Mon, 07 Nov 2022 20:55:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883318; cv=none; d=google.com; s=arc-20160816; b=RgpVAHJl+/h4rIO3qwQn4ahA8MkDwUoXDVMc5LKlx44shoy4Mf+8BKCt1J4w+p8Ntx qKdd4GH/EZ8PWRIOj9owsZW93bWvtuLH9gnKhFbRQ4Yu91WJuO5PVNSaA9+27/5KhOnv pk4cdfokp93MP55vEOR3noF8rOQw3TN7whroz+QXZRdgBWYZnqUz2uByKt81NQAU49Vc DbrIBZDeZbhbeyw7nVFjFQFh9NbY7YFebm2W++W9ER9Q1JdRCLqZfGjt2N7ZoQ8raPFQ X/CMJImokkdxs8RIG8H5FtMXeLGH/Zaq1gJQAZIEZ8d7/x40Dr524i6DdfGHTGHhlqpe llEA== 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=nwIyP8sfa7W7QTv+lh5zr76n7mBm//mbeRytK4uzegM=; b=JZwtpSXQh4umpjmWfsC2GYZXm+xdmhG4u6ceF7dNiMClKqY8aiGJ/66Dfdz8S9bSve 9Moo0CMnQKACMF1gl4VnfkBSjwkveTP3iCSGvBL1srQszqp02wZkQ9/oeY7W1S7Eqr74 o2qd4i2cHttfqPjbk2IhCQCAyUqIbeTwXaUO44/6qyUOwKFZn30KMZIDkLYyzUZgFLKd hjqHISxQDCSKSf9N3Yf+F7kHs8kB5FJRVbc5NkL1sSxqP3Is/aFyNks3YyG++4lot465 nfM9A1022VOiF5oHIdLDduRuY73qbfjvKGqrJrR6ZACbjBj1HA3ElxFmFiLhzxKQx/LR Q9nw== 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 e10-20020a17090658ca00b007a835c56b70si12093102ejs.267.2022.11.07.20.54.53; Mon, 07 Nov 2022 20:55:18 -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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233371AbiKHExi (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233175AbiKHEwo (ORCPT ); Mon, 7 Nov 2022 23:52:44 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1889F326F9; Mon, 7 Nov 2022 20:52:36 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N5wcZ1b8DzJnVD; Tue, 8 Nov 2022 12:49:34 +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, 8 Nov 2022 12:52:33 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 10/10] block, bfq: remove check of bfq_wr_max_softrt_rate which is always greater than 0 Date: Tue, 8 Nov 2022 12:52:24 +0800 Message-ID: <20221108045224.19092-11-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) 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?1748902418834558657?= X-GMAIL-MSGID: =?utf-8?q?1748902418834558657?= bfqd->bfq_wr_max_softrt_rate is assigned with 7000 in bfq_init_queue and never changed. So we can remove bfqd->bfq_wr_max_softrt_rate > 0 check which is always true. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 40ac219b2d8f..d0a867b2569b 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1840,8 +1840,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, * to control its weight explicitly) */ in_burst = bfq_bfqq_in_large_burst(bfqq); - soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 && - !BFQQ_TOTALLY_SEEKY(bfqq) && + soft_rt = !BFQQ_TOTALLY_SEEKY(bfqq) && !in_burst && time_is_before_jiffies(bfqq->soft_rt_next_start) && bfqq->dispatched == 0 && @@ -4350,8 +4349,7 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, if (bfqd->low_latency && bfqq->wr_coeff == 1) bfqq->last_wr_start_finish = jiffies; - if (bfqd->low_latency && bfqd->bfq_wr_max_softrt_rate > 0 && - RB_EMPTY_ROOT(&bfqq->sort_list)) { + if (bfqd->low_latency && RB_EMPTY_ROOT(&bfqq->sort_list)) { /* * If we get here, and there are no outstanding * requests, then the request pattern is isochronous