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; }