From patchwork Tue Nov 1 09:33:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13569 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845164wru; Tue, 1 Nov 2022 02:35:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6SAH/PYxMAiA4ir6Dvc++AbuK+ma6yXtFx/hhsK9CpxGsx5UTo/FEQ9+vEY1xwlwLC966M X-Received: by 2002:a17:902:e5c1:b0:186:897f:b8ee with SMTP id u1-20020a170902e5c100b00186897fb8eemr18494060plf.151.1667295319817; Tue, 01 Nov 2022 02:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295319; cv=none; d=google.com; s=arc-20160816; b=PyhLnJSdazfVjX16oD+m87Idv+Omb6k10FekdfEZVPaKhHanxs5P6L+RLg+vNIdhnU 2e6WSVz2eT4hwWQqaPbjnabKM43JLcKG8rBqbviVHQz5kKXd72I6UVfdEz3RD8WnkXQ/ 4EaK0ZnCFPlNEQ7567yo3D1DqYlTq85qgnfMSdLni7RIs/vJw+/Uzw1NwBBpyhAwZRKB fyuyzwW5mJegvYRxpg41l61Lr5HlN9M0hMw2BTm2MNGsAQ0JVyoiE8uw39ffMMTQ17Hx 3wKbN96k4+ls75dXkOGQQLqiiovPSi6LID5KWhfvfyutX0rchaIX0JS+Sp9yVcsOt5KQ IsnA== 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=Md1aRFN2ve0OZNq0DQn/IpkuwfchE010IpXnWSOfdsE=; b=nfN1h8w1eQaMMYdWpaJQ9oQrTBxdGtW0bWjgZhijX+IdADWWvZVNhQwcatULykwaqw bja9APg6apKlJNrnF2TWS+/CZgAnOEWXfsp0tujEHWdJlE2YFMkpPEGdpxut8rVw5Mhm JUXW02285pBud6pt7AsMbNj108VKXTWxPN/LwMDL0X+WkpqjgyTjLhqOTFLBuhm2XALK NSjbta6GZcTY2LztNCg9wmDUIzX0fYJQ6YJF015tlOO2OSO+6Sqy+4xWubAWeoq6kJr9 DP9SLPij/Ru1wjCFvG+8/KOX/K6crJ7aBVRSK3ZCGdDIDGddcSMyGcK2plRQWZw/fT1Y /1jg== 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 p12-20020a17090a868c00b00213393ff173si9883377pjn.75.2022.11.01.02.35.05; Tue, 01 Nov 2022 02:35: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 S230158AbiKAJe1 (ORCPT + 99 others); Tue, 1 Nov 2022 05:34:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229982AbiKAJeX (ORCPT ); Tue, 1 Nov 2022 05:34:23 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EB7918E05; Tue, 1 Nov 2022 02:34:22 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N1lGM04Flz15MCf; Tue, 1 Nov 2022 17:34: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, 1 Nov 2022 17:34:20 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 01/20] block, bfq: fix typo in comment Date: Tue, 1 Nov 2022 17:33:58 +0800 Message-ID: <20221101093417.10540-2-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?1748285857327885829?= X-GMAIL-MSGID: =?utf-8?q?1748285857327885829?= IO/ -> I/0 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 7ea427817f7f..25a88ffd997e 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5633,7 +5633,7 @@ bfq_do_early_stable_merge(struct bfq_data *bfqd, struct bfq_queue *bfqq, * * Putting these two facts together, this commits merges stably the * bfq_queues associated with these I/O flows, i.e., with the - * processes that generate these IO/ flows, regardless of how many the + * processes that generate these I/O flows, regardless of how many the * involved processes are. * * To decide whether a set of bfq_queues is actually associated with From patchwork Tue Nov 1 09:33:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13570 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845265wru; Tue, 1 Nov 2022 02:35:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6uCKR59bS/fbI5HF507TP4kZ81PSjpFjJvPzXA3vXEhFvHbNEq8SgVu+2kVjU/zrGQ987/ X-Received: by 2002:a17:902:7792:b0:182:9404:f226 with SMTP id o18-20020a170902779200b001829404f226mr18751406pll.76.1667295332718; Tue, 01 Nov 2022 02:35:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295332; cv=none; d=google.com; s=arc-20160816; b=RYIk1w7fDA0JneSMdAPmcVh+gGTvmOB1PySIsa+fyJxVq2HTu+CrX/+4s9O3w1VZGS IeXgrXp8xJuT9/wDJ9x5cQG5RHuCkUEhzZp10na+iMqNdHp0QdZdUCypZ96G4omxCo5/ Erm0OhuePi6wXinT8KIRGBAz8atcSgc2wpke2C2xVigcUWyBJSz9/AxjNWmuqiv1NZ+W YuGAuLQ+q/SWed5J2b1KZFVJyvXxcLtnmYToWdwW5R3/StrEWOA0FfDmPoLXHmkTLC+z 1ZN+ENchs6e8xBT9EjOdSFE01w+nRBg7g+kBZF1Xjge5gq+o0i5TNo35BUkGktKmF7Qg XCaw== 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=DWpSAJ3mMXs4hYRWvmKDogPn8sNF/1rN32P/ORd+vOk=; b=mlffZOs9cNE8qbLzGVPaeH43/vYKSjJ1ft2StXR4ZKVtkS1QVPuc3TNDA5WkD12TOa aCePJK1Tdt9zHqYthTYmd0ZfTDJgHnCTUj5Ov806qQ1stfcSdV7Ehf6Kr73FVf3cPBKt gDjT/UoucvPeEQSDN8g7BXIEAeXTesoYm/daSWwpdmvjCZ6Cit1RaHk292PtYqeFIF8x fxvBqljubDjvgZic8iycmxZ5TtpJ/O3fdcfLovNUF2fNqcEYGfra5wL3f4VD8RaZQrfN e6uss+yX9ym2t3IrKuJ35srZGgD14jUeiiYMsda/bRNmhQdFKlEih41/oTt8xWm42u/4 s58A== 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 m4-20020aa78a04000000b0056dde98957dsi448352pfa.210.2022.11.01.02.35.15; Tue, 01 Nov 2022 02:35:32 -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 S230175AbiKAJeb (ORCPT + 99 others); Tue, 1 Nov 2022 05:34:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbiKAJeX (ORCPT ); Tue, 1 Nov 2022 05:34:23 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B5D618E11; Tue, 1 Nov 2022 02:34:23 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lGL65LYzmVW6; Tue, 1 Nov 2022 17:34: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, 1 Nov 2022 17:34:20 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 02/20] block, bfq: Update bfqd->max_budget with bfqd->lock held Date: Tue, 1 Nov 2022 17:33:59 +0800 Message-ID: <20221101093417.10540-3-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?1748285870795273124?= X-GMAIL-MSGID: =?utf-8?q?1748285870795273124?= bfq_max_budget and bfq_user_max_budget maybe be in inconsisten state if bfq_max_budget configuration and bfq_max_budget auto-update happen concurrently. Example sequence: config auto-update bfqd->bfq_max_budget = __data if (bfqd->bfq_user_max_budget == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); bfqd->bfq_user_max_budget = __data; bfq_max_budget is only update in update_thr_responsiveness_params and configuration code. As update_thr_responsiveness_params is always called under bfqd->lock, fix this by holding lock in configuration code. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 25a88ffd997e..13370c41ad36 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -7328,6 +7328,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e, if (ret) return ret; + spin_lock_irq(&bfqd->lock); if (__data == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); else { @@ -7337,6 +7338,7 @@ static ssize_t bfq_max_budget_store(struct elevator_queue *e, } bfqd->bfq_user_max_budget = __data; + spin_unlock_irq(&bfqd->lock); return count; } @@ -7362,8 +7364,11 @@ static ssize_t bfq_timeout_sync_store(struct elevator_queue *e, __data = INT_MAX; bfqd->bfq_timeout = msecs_to_jiffies(__data); + + spin_lock_irq(&bfqd->lock); if (bfqd->bfq_user_max_budget == 0) bfqd->bfq_max_budget = bfq_calc_max_budget(bfqd); + spin_unlock_irq(&bfqd->lock); return count; } From patchwork Tue Nov 1 09:34:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13571 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845286wru; Tue, 1 Nov 2022 02:35:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5YWDJaf64MuvnzBCBS14Si4u54tBngFYUm/mIQtGxq5p34hvopDHzFuMyoCJOdp34JheIF X-Received: by 2002:a63:eb03:0:b0:46f:80a3:737d with SMTP id t3-20020a63eb03000000b0046f80a3737dmr100705pgh.447.1667295336402; Tue, 01 Nov 2022 02:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295336; cv=none; d=google.com; s=arc-20160816; b=Q3vDgiWEyXsITfdzK4vmKIbkgEJ+fOcsYS9rBJ2HcPm0Xih3lWGeVhvqu2kV+ChjQU gLgn9cXR+mTk1i2tdfS2pG/FH+8HY8xTnqiZWekb9VyBakApuu6yVWNk5Ir2QTRIJNqP 76acVOCQa1fJh+HCl4ekLAj8MpmcC9cDN4BUwJqFlb8znA1UJCmWZcq6wu33hLCem6O4 vQ9ijvQEOlD4DSVvK6Zj0H+LDUFkHWb3oPQ5Bduqao220oHlqEj8QKPK1MJmOUEHoOwk mjXwkMQMOyxCDt96+V+DvK1GDL2Qz0gDC4SC+yTz/OVt1lcjBNCSvj6MAKgTzoksOnvt aHTA== 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 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.35.17; Tue, 01 Nov 2022 02:35:36 -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 + 99 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 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?1748285874371836108?= X-GMAIL-MSGID: =?utf-8?q?1748285874371836108?= 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; From patchwork Tue Nov 1 09:34:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845323wru; Tue, 1 Nov 2022 02:35:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5zr9G798Mszqd5XhwQoHaSdZNUqzQEs71e2SWw7IJBGmC3d5wiLKZ8XPdkPIkXB+GQfJAu X-Received: by 2002:a17:90a:bd04:b0:213:f087:446b with SMTP id y4-20020a17090abd0400b00213f087446bmr7871238pjr.122.1667295340220; Tue, 01 Nov 2022 02:35:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295340; cv=none; d=google.com; s=arc-20160816; b=CBohD+XMddVD5XainkLjXfY1EPDHuKZxK98Lx+JOs7Q4mNx7cRKx0rXyLwitTDpOlv sk5qFpZprBrGZn7iuZbQ3Pp/Y418/YnJxUoB24TKRv9blpZCq1MwrgpkgG4b9mEXUB90 I5kLpfU51Ri6Cm9fW2Y+8kGruDuTk0A7xZH21E/cOU2cnx+AY3xhPfgEqBmygjKLeCu/ 1Z8SnldGmayayJTf/7MGMP5fATD0fH1zJ5gUGydxMgq2rmpMQKBkbIP2dVj2uHWt38Ca 5hieIVXijg/i38HbQUHUaeXAMZop0pdknor47ITRLzUcQWlF04Zu8IE0xVTNI88vAVDh Hvlg== 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=u5j7fm0LBphbIJZ/07ORqbMzU7iyQfhl0suwAD5sQ6k=; b=raCIB9bcI1uBuuij07QOU8YU5i90x+3mVtG1l9OLmJp57XgPx+G1yQVQtKa4OhGGOd yzUBXd3uoh2w8y9Yea3PnaoOuVEUIdZ3ld4uCYcULjpRYU85oQgrIhsbwJbmUp8hE8UI pTJFg8YN+lxHR+9cW4U3zcO2J20oBTJ2KJRGSSCH1JTJBGEl1Sc/a25qOpbvNDNuEhoj PmwSv7TFuU6dkV1pvByM7MvAbXlnCP8+9NuzRTcL8GY2qUvY00t5ZG1Yz9YLuNW69dW9 vZuY+Q5op1ti+LVrlD5pWJHPjhHUOYcgSKTyENqJ+bYDG8cA1OqAnsw4eZ6RXTrFykI4 fUIg== 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 fz16-20020a17090b025000b0021305ca5933si10132412pjb.42.2022.11.01.02.35.22; Tue, 01 Nov 2022 02:35:40 -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 S230194AbiKAJeh (ORCPT + 99 others); Tue, 1 Nov 2022 05:34:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230137AbiKAJeY (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 3997918B13; Tue, 1 Nov 2022 02:34:24 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBL3twtzpW4d; 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:22 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 04/20] block, bfq: simpfy computation of bfqd->budgets_assigned Date: Tue, 1 Nov 2022 17:34:01 +0800 Message-ID: <20221101093417.10540-5-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?1748285878515725047?= X-GMAIL-MSGID: =?utf-8?q?1748285878515725047?= The computation of budgets_assigned is a little confusing as we only need to check if it's updated more than 10 times. Simpfy the computation to improve readability. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index b21c3711d69d..be69b0e061f7 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -175,7 +175,7 @@ static const int bfq_back_penalty = 2; static u64 bfq_slice_idle = NSEC_PER_SEC / 125; /* Minimum number of assigned budgets for which stats are safe to compute. */ -static const int bfq_stats_min_budgets = 194; +static const int bfq_stats_min_budgets = 11; /* Default maximum budget values, in sectors and number of requests. */ static const int bfq_default_max_budget = 16 * 1024; @@ -3288,7 +3288,7 @@ static void __bfq_set_in_service_queue(struct bfq_data *bfqd, if (bfqq) { bfq_clear_bfqq_fifo_expire(bfqq); - bfqd->budgets_assigned = (bfqd->budgets_assigned * 7 + 256) / 8; + bfqd->budgets_assigned++; if (time_is_before_jiffies(bfqq->last_wr_start_finish) && bfqq->wr_coeff > 1 && From patchwork Tue Nov 1 09:34:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845363wru; Tue, 1 Nov 2022 02:35:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5N14kvkk9kYHqsZLXnkDB1FQar6hFhiaE774hGmaJy8ibE+ri3cNDyXWaLdKkekpmIYE61 X-Received: by 2002:a05:6a00:18a8:b0:56c:702a:5f49 with SMTP id x40-20020a056a0018a800b0056c702a5f49mr19171823pfh.1.1667295346556; Tue, 01 Nov 2022 02:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295346; cv=none; d=google.com; s=arc-20160816; b=m3eRNRiGq0VhVKJmZG1L8hPq4YPUch/uGTc5Jqp7apPPFDIho9a59irnkf+FetqH16 0ngK6UxXDse0VgWI8VobbSjh9cxIyWHCmwdozZ1VjATInZ5ZgMReLOfU7fwG0M31Z7uy 8+FIA8TvpmXGteVZX9aoWY/QuLm4ay108MA5UNcxlDQsnz19EiDyS/msdkQe6lPJqU4I kbweaYCMyqmYt1pSf0vi1vf1/0y58ebw3EbvkHv/hcNyj53WEvimykISJChFeTpbl4Dm MJAX+fO9Ne+X1285IwdPe7K7zzA0PoAZhlwG54gWx1QY31pPyaQzfWEi89Czgo1awBnY HLWw== 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=BY/9DoMhT8HZDoRHSOR85JKwfuZs6vv/i0OS/chmxI0=; b=pFvJqzrbElXzunbVeTViB1V8dnwXP0GS9WBm94XEIByR1bJomolwRXr7hQ6TzFRAG+ 1eU4K1XJuwT+Es+SNKLQo9xz9bzqO1iHh/GMpteZ3PICMvfAil9YYtpEnVMiMFKxbRcu cm9YfHBXvay2zn0Iap7HvlK2PZVmadVthOkcTAUtNpqg7sv7e3KKeO89W/6pAxZaXdDw 2aBW/+lHmicVxRsQXBZ8yR+w4+iouN6M797+yUk5vpo6XvK7C6K9KHohmhvnZ5oGAK06 bu+ZXdzi2aFqZXdsp+ezwbrZ01PZSU/ffVwV7v1gcrKm21Qe3tBf7ufealOUrll7iN+F zdfQ== 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 b5-20020a170902e94500b0017829e27195si11544847pll.521.2022.11.01.02.35.29; Tue, 01 Nov 2022 02:35:46 -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 S230078AbiKAJeo (ORCPT + 99 others); Tue, 1 Nov 2022 05:34:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230142AbiKAJeZ (ORCPT ); Tue, 1 Nov 2022 05:34:25 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8DE818E11; Tue, 1 Nov 2022 02:34:24 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lGN4RbhzmVT7; Tue, 1 Nov 2022 17:34:20 +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:22 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 05/20] block, bfq: recover the "service hole" if enough budget is left Date: Tue, 1 Nov 2022 17:34:02 +0800 Message-ID: <20221101093417.10540-6-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?1748285884990933455?= X-GMAIL-MSGID: =?utf-8?q?1748285884990933455?= If budget left is less than budget need by next request, the activated bfqq will be expired if it preempts the in-service queue. Avoid to cause useless overhead to check budget left is enough for next request. 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 be69b0e061f7..f4b4ba05f804 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1623,7 +1623,7 @@ static bool bfq_bfqq_update_budg_for_activation(struct bfq_data *bfqd, * service. This would only cause useless overhead. */ if (bfq_bfqq_non_blocking_wait_rq(bfqq) && arrived_in_time && - bfq_bfqq_budget_left(bfqq) > 0) { + bfq_bfqq_budget_left(bfqq) >= bfq_serv_to_charge(bfqq->next_rq, bfqq)) { /* * We do not clear the flag non_blocking_wait_rq here, as * the latter is used in bfq_activate_bfqq to signal 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; From patchwork Tue Nov 1 09:34:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13579 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845670wru; Tue, 1 Nov 2022 02:36:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5LGzJoHGH5ndPq7givPG86QC8FDiyKLtZK12clJHabqZkYblX8OiobqDT2gf87DFqec7PO X-Received: by 2002:a17:903:251:b0:186:5613:becf with SMTP id j17-20020a170903025100b001865613becfmr99241plh.46.1667295390039; Tue, 01 Nov 2022 02:36:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295390; cv=none; d=google.com; s=arc-20160816; b=BLYfSfwunExcuZ4bzFGAlI+yh7dUcS0Tnf/20GRrRiwM10rXJ8XkTQvTSM/WQqASa2 KQoBMoOeEn6P1+jqSZe0Umx0rU6rojDzRMop96gSeOIANQvUAqjt8kREGvd+PaqSKSGu KBlshumYHqevdLbtoHnbagxrFEy6wIbt2cDMjl0kco8NqUdviziRd1bnG5t377Clv7RA U7ONC6ggg2e7KVZS4dFXUJW34ydW+b84mtrJhwvHEGfrECPXAOTpKfJIRQ9kD14Vts4Z TemN2tGIPstMe/AiQr7VplwsXxlMqfHp7oONSta+pFm1UiFLaRvxeq2EKdZTe6Ce+q2H K+Vw== 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=GtZxyyNZ208dqt8mYIqM2sVUcXt4H5XOo2GKGR5IExM=; b=ENVioWrVQen/VXrnwtYJnGfgHLWVRGOh3KJ+9TvEC1ChrlcW3mZP2HBI4NPSKyNi6z L9HHn4RJHgaayt1SKYf/ZaNjzhPjKkbhbxnvNQyfQoG7DcWyCf/KJWFOah4p5OhYO/XY 8gn62W9DJ1IDhSHLkkAHSXjPy82Bh8xXzfyyE/n1qQ5NpzQmDbpPUPK2CbKUeRW5AI0C sXICuzVzfEP8JPjbMd/HJC/euHG2LrEpi3mY1eOHlXbMw8XVgRqztC6e74qIoBxngGUz kEHtdoV2rO0VBXG/UxvPOpaUElwvgsQwRj+pQdQi+sIHdJp90G2EcP3ydtUkpSi/ZzOR UhNg== 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 w2-20020a63f502000000b0046f1263abd6si12467827pgh.661.2022.11.01.02.36.16; Tue, 01 Nov 2022 02:36:30 -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 S230239AbiKAJew (ORCPT + 99 others); Tue, 1 Nov 2022 05:34:52 -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 S230150AbiKAJe0 (ORCPT ); Tue, 1 Nov 2022 05:34:26 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02DA018B13; Tue, 1 Nov 2022 02:34:26 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1l8m1Xl4zRnsP; Tue, 1 Nov 2022 17:29:28 +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 07/20] block, bfq: simpfy check for interactive bfqq in bfq_update_wr_data Date: Tue, 1 Nov 2022 17:34:04 +0800 Message-ID: <20221101093417.10540-8-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?1748285930829396334?= X-GMAIL-MSGID: =?utf-8?q?1748285930829396334?= The bfqq->wr_coeff will be set to bfqd->bfq_wr_coeff if bfqq is in interactive weight raising. So we can simpfy interactive weight raising check in function bfq_update_wr_data. 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 20ae52882235..15e7d6c6fa83 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4997,8 +4997,7 @@ static void bfq_update_wr_data(struct bfq_data *bfqd, struct bfq_queue *bfqq) bfqq->entity.prio_changed = 1; } } - if (bfqq->wr_coeff > 1 && - bfqq->wr_cur_max_time != bfqd->bfq_wr_rt_max_time && + if (bfqq->wr_coeff == bfqd->bfq_wr_coeff && bfqq->service_from_wr > max_service_from_wr) { /* see comments on max_service_from_wr */ bfq_bfqq_end_wr(bfqq); From patchwork Tue Nov 1 09:34:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13578 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845527wru; Tue, 1 Nov 2022 02:36:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7WL3AP3IZm7BAUig6TCzDMY0F/nL/Su9FA8m/FEwsOa5wZapGnEewvGa6R+H+yw/v/cXDg X-Received: by 2002:a17:902:ec86:b0:187:2430:d377 with SMTP id x6-20020a170902ec8600b001872430d377mr8348962plg.33.1667295369555; Tue, 01 Nov 2022 02:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295369; cv=none; d=google.com; s=arc-20160816; b=iqqUNpxlBbPbMbQh1DDFpegugYVwjIBre6ezNjRsHjRv0ZEsxrPGQSGvVmfetcOYRU /4B2QcKaw7TUWy7QfjaDtXuB8tMMaprYFMKFdGPAiOzMRBY+kKjfB7Y5bAPrk9wobLLh de3NdzAg09rZebhzbL0n7JBrLsA2bjjjRWVg4sueDOdBDUFoH7dzw+GimlIeKpvBn4oj 1IkKKK3FWNqKC5qs+j0OvEi9WSzO2gGrv9D5PkhRp9MaiGX4dE8tJXqugHjagZjcHXGF UYajwcxkQ85ml4BivO3+T8mKNzJWSRRBoWbTDXKqPMwIi421EbLLNj7Ct8jFYIRcUzqA Ultw== 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=P/36bzO8WObcj+ZSRbkHDjsgQ2Weyo6AyzG1xWKCnR4=; b=Fw7gU6hBquVQBIR1sQWG4CWanIznSbhDNIkS3GYJrlnSBiTeQ/i/oJulzHg6pGrGS6 hTyBY/bMGa8wgk1aNhnntn2aX+N5HqPRIBkboKK0OfxDs4qZ9OlMMlVNI96/1U361x45 AO0dpA7LuGoOTT/jZ1sB7yH8w7mpwDDQgOpXEIeHWyZwEzZMOjkiHubPUST0V6ZficS5 4fS6E02b7jGQFdiUbo2kpz/d2Uc+/PkVSAPNoxPfHjEfw9OKVjdD4VhvLkl6xiDu9Ejc ymNx3yIo7aQCoDCs00j9n9GcZDRtuThjP2eLvERXuVVV4Fq4U6HBKG9b12cvGf5jNM/D LiEA== 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 c18-20020a6566d2000000b0046b158da2d9si11579583pgw.528.2022.11.01.02.35.54; Tue, 01 Nov 2022 02:36:09 -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 S230254AbiKAJe5 (ORCPT + 99 others); Tue, 1 Nov 2022 05:34:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230164AbiKAJe2 (ORCPT ); Tue, 1 Nov 2022 05:34:28 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B054918E2C; Tue, 1 Nov 2022 02:34:26 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1lG70LybzHvXl; Tue, 1 Nov 2022 17:34: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, 1 Nov 2022 17:34:24 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 08/20] block, bfq: do srt filtering for interactive queues in bfq_completed_request Date: Tue, 1 Nov 2022 17:34:05 +0800 Message-ID: <20221101093417.10540-9-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?1748285909224971586?= X-GMAIL-MSGID: =?utf-8?q?1748285909224971586?= Commit 20cd32450bcbec ("block, bfq: do not consider interactive queues in srt filtering") remove the updating of soft_rt_next_start for bfq_queues in interactive weight raising. Commit 3c337690d2ebb7 ("block, bfq: avoid spurious switches to soft_rt of interactive queues") try to revert the first commit to add back updating of soft_rt_next_start for bfq_queues in interactive weight raising and fix original problem by reset consumed bandwidth if a bfq_queue switches from interactive to normal mode. The problem this patch fixes is that first commit is not fully reverted as updating of soft_rt_next_start for bfq_queues in interactive weight raising is still removed in bfq_completed_request. Fix this by updating soft_rt_next_start for bfq_queues in interactive weight raising in bfq_completed_request. 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 15e7d6c6fa83..fa96cbca7814 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6317,14 +6317,11 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd) * isochronous, and both requisites for this condition to hold * are now satisfied, then compute soft_rt_next_start (see the * comments on the function bfq_bfqq_softrt_next_start()). We - * do not compute soft_rt_next_start if bfqq is in interactive - * weight raising (see the comments in bfq_bfqq_expire() for - * an explanation). We schedule this delayed update when bfqq - * expires, if it still has in-flight requests. + * schedule this delayed update when bfqq expires, if it still + * has in-flight requests. */ if (bfq_bfqq_softrt_update(bfqq) && bfqq->dispatched == 0 && - RB_EMPTY_ROOT(&bfqq->sort_list) && - bfqq->wr_coeff != bfqd->bfq_wr_coeff) + RB_EMPTY_ROOT(&bfqq->sort_list)) bfqq->soft_rt_next_start = bfq_bfqq_softrt_next_start(bfqd, bfqq); From patchwork Tue Nov 1 09:34:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845464wru; Tue, 1 Nov 2022 02:36:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6IjEEORX3mPi5biWqhGVn9075+3eU7BrxM67TgjzzqsDtGB+m6tg4AqRGlf49QPQHKTXA8 X-Received: by 2002:a05:6a02:199:b0:469:d0e6:dab8 with SMTP id bj25-20020a056a02019900b00469d0e6dab8mr16738226pgb.97.1667295360753; Tue, 01 Nov 2022 02:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295360; cv=none; d=google.com; s=arc-20160816; b=hREBV8dBJiBSw0F/uzKD3OkQqXeRpqA9Cm72F+deg0mbvFJ2P5uihrDUeLqBzeGIpx 5VL4uzZXuctdW70/W5cOIrcrwjgfM4UEM9rrddRIYAWLDwlOsf/sScVU3mYXTIpOuCze Dbl3Oq8YO0VODGf33ocaF7Chm+oBWjgUWa4IlmWQvy/0f4wnngeVjXdcDNu9lsX5Z/v/ 5wrmOe8KCMC3RzyrULYFRYhA1/NJlbsXbZuCRKkOxvH8OUZTaCFft5PRnBRWdvEiJQgz /8HEADKGT4gCXVuPOaA1m7aFyrRZpaB7oDrBJTBxUzjzu3cBNAbzUEKToo4E8sbxF0/3 Fbrg== 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=UX4xBuxErd49qHaLRPwS2Cw8V0LgSrFpbZO/E3wwKZQ=; b=KjN/0mRQj0vcNLVlZkyUND8WbuVqrrY2XMqSWXDpulm+kXvkvZgpBG2mGVDgPOd1hm FGHw1zLjj0nJslFkLH7Eoy28ko7jThwRTHJd9rTO2iMLAFODzpDQ5BKdlFsuK/KyRbR2 M1ERH6WWCgJWygYsp0/ym6FJhULZ3A7pqVPs0UhDogOewLWu0bVPVgpfkfRD7IdvznXJ G0g/j2uH/X9+X8aK1cPLtpTRolTVYPWs3h29DAgMELkN/2hHwUV+l+eZP+o5miT2peJM NvfdNHrOfD7m6FpBxChLLkG5zfwi5a0y8DZBgVDz6a0EfcI6+Kb1NAayAhD8EaLImFS1 f1Cg== 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 73-20020a63064c000000b0041b7a0b673fsi6551802pgg.449.2022.11.01.02.35.46; Tue, 01 Nov 2022 02:36:00 -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 S230258AbiKAJfA (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230169AbiKAJe2 (ORCPT ); Tue, 1 Nov 2022 05:34:28 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3797218E35; Tue, 1 Nov 2022 02:34:27 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBP3k1czpW4d; Tue, 1 Nov 2022 17:30:53 +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:25 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 09/20] block, bfq: remove redundant check if (bfqq->dispatched > 0) Date: Tue, 1 Nov 2022 17:34:06 +0800 Message-ID: <20221101093417.10540-10-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?1748285900366914782?= X-GMAIL-MSGID: =?utf-8?q?1748285900366914782?= Commit 3c337690d2ebb7 ("block, bfq: avoid spurious switches to soft_rt of interactive queues") remove bfqq->wr_coeff != bfqd->bfq_wr_coeff check along with bfqq->dispatched == 0 to update soft_rt_next_start for interactive bfq_queues. So we can remove redundant bfqq->dispatched > 0 in else branch with current bfqq->dispatched == 0 check. 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 fa96cbca7814..8f6d05258f22 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4375,7 +4375,7 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, if (bfqq->dispatched == 0) bfqq->soft_rt_next_start = bfq_bfqq_softrt_next_start(bfqd, bfqq); - else if (bfqq->dispatched > 0) { + else { /* * Schedule an update of soft_rt_next_start to when * the task may be discovered to be isochronous. From patchwork Tue Nov 1 09:34:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845492wru; Tue, 1 Nov 2022 02:36:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4+th8MqIyfLbYDUJMwlv+XSA9amSXu1CvXZnmwDDdKyG2isyZzXq/4iyx8HW0hyNFZ74Pt X-Received: by 2002:a17:90b:3148:b0:214:199e:7e6f with SMTP id ip8-20020a17090b314800b00214199e7e6fmr637289pjb.126.1667295363568; Tue, 01 Nov 2022 02:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295363; cv=none; d=google.com; s=arc-20160816; b=ZaxquvIf9y2pbXOOeKaUCuJV+B8Yr4/4TYJyslk0XyIesUlrcatCmBFwvu9U8gQcHS PvR5+UF+LEUM8ezBMwbOfP04oInRonruOGCmt7dUcfF+Aquz6GoerR/uYEGAQYlHMWxf dC804JwvBVAgs/bfrYwn7xSEkQyFLCKlMzYXuIJQk1YHbdRyLsfW2CkeqvPRcihKLn24 B0lnAJph0/POKFSEI+yeyMJgKVY4+L6n49a1U26MH2jZjaq/3EWCMUmx5KTuqMnSruxv 0js8/d0GtOtpFVwR8vIi7Fqi7jrSJZgh2eSDjbF56Bj9xY8szonfnfJZY0mxENuGofA+ GhlQ== 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=Duo6OxtLROf1IqgAH7JzX0XhphqNRu0OAiRWfvM4rrQ=; b=zc+Mtbdd17ZJ4b0EreYq5Vsn1No6sZmpWjdde5ZuYWAd0/cZSEDJsFp9173OUC8OVZ BQqbnlnAlu9y1Plt2Tk5NLIA9ombVbQPyKUyTTKH0oqnokVZgGM/gs0cq+ftLZ8xt1+0 jwyZjU0Rnu/m7B6qibDqK7QC0ybYr7lu9vVteydOvbYKAfkTeLER4JQrgNdu2ESsBjJY VXfZCetgAxEg1O2H1T1R8IaKSqWWUekYADxv5arR4Ku2G4aA67AgJN/fJCc472wn1ZeU uC10K0SO0KABUEePTO714ThAtRS97iTUVXtPSO4yW6YrjN007babQyIrms1Xp9633HCz EyfA== 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 c6-20020a655a86000000b0045b22d763a3si12791207pgt.483.2022.11.01.02.35.50; Tue, 01 Nov 2022 02:36:03 -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 S230285AbiKAJfK (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230183AbiKAJec (ORCPT ); Tue, 1 Nov 2022 05:34:32 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7206118E25; Tue, 1 Nov 2022 02:34:27 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBQ10wBzpW50; Tue, 1 Nov 2022 17:30:54 +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:25 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 10/20] block, bfq: define and use soft_rt, in_burst and wr_or_deserves_wr only low_latency is enable Date: Tue, 1 Nov 2022 17:34:07 +0800 Message-ID: <20221101093417.10540-11-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?1748285902977923279?= X-GMAIL-MSGID: =?utf-8?q?1748285902977923279?= The soft_rt, in_burst and wr_or_deserves_wr are only used when low_latency is enable. Currently, these variables are computed even low_latency is disable. Define these variables in successful branch of bfqd->low_latency check and compute them if needed to remove redundant computation and improve readability. The interactive parameter will be used only if low_latency is enabled outside bfq_bfqq_handle_idle_busy_switch, so it's safe to move interactive assignment inside branch where low_latency is true. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 77 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 8f6d05258f22..0ecb3640d715 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1822,8 +1822,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, struct request *rq, bool *interactive) { - bool soft_rt, in_burst, wr_or_deserves_wr, - bfqq_wants_to_preempt, + bool bfqq_wants_to_preempt, idle_for_long_time = bfq_bfqq_idle_for_long_time(bfqd, bfqq), /* * See the comments on @@ -1834,43 +1833,6 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, bfqq->ttime.last_end_request + bfqd->bfq_slice_idle * 3; - - /* - * bfqq deserves to be weight-raised if: - * - it is sync, - * - it does not belong to a large burst, - * - it has been idle for enough time or is soft real-time, - * - is linked to a bfq_io_cq (it is not shared in any sense), - * - has a default weight (otherwise we assume the user wanted - * 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) && - !in_burst && - time_is_before_jiffies(bfqq->soft_rt_next_start) && - bfqq->dispatched == 0 && - bfqq->entity.new_weight == 40; - *interactive = !in_burst && idle_for_long_time && - bfqq->entity.new_weight == 40; - /* - * Merged bfq_queues are kept out of weight-raising - * (low-latency) mechanisms. The reason is that these queues - * are usually created for non-interactive and - * non-soft-real-time tasks. Yet this is not the case for - * stably-merged queues. These queues are merged just because - * they are created shortly after each other. So they may - * easily serve the I/O of an interactive or soft-real time - * application, if the application happens to spawn multiple - * processes. So let also stably-merged queued enjoy weight - * raising. - */ - wr_or_deserves_wr = bfqd->low_latency && - (bfqq->wr_coeff > 1 || - (bfq_bfqq_sync(bfqq) && - (bfqq->bic || RQ_BIC(rq)->stably_merged) && - (*interactive || soft_rt))); - /* * Using the last flag, update budget and check whether bfqq * may want to preempt the in-service queue. @@ -1904,6 +1866,20 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, bfq_clear_bfqq_just_created(bfqq); if (bfqd->low_latency) { + bool soft_rt, in_burst, wr_or_deserves_wr; + /* + * bfqq deserves to be weight-raised if: + * - it is sync, + * - it does not belong to a large burst, + * - it has been idle for enough time or is soft real-time, + * - is linked to a bfq_io_cq (it is not shared in any sense), + * - has a default weight (otherwise we assume the user wanted + * to control its weight explicitly) + */ + in_burst = bfq_bfqq_in_large_burst(bfqq); + *interactive = !in_burst && idle_for_long_time && + bfqq->entity.new_weight == 40; + if (unlikely(time_is_after_jiffies(bfqq->split_time))) /* wraparound */ bfqq->split_time = @@ -1911,6 +1887,29 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, if (time_is_before_jiffies(bfqq->split_time + bfqd->bfq_wr_min_idle_time)) { + soft_rt = bfqd->bfq_wr_max_softrt_rate > 0 && + !BFQQ_TOTALLY_SEEKY(bfqq) && + !in_burst && + time_is_before_jiffies(bfqq->soft_rt_next_start) && + bfqq->dispatched == 0 && + bfqq->entity.new_weight == 40; + /* + * Merged bfq_queues are kept out of weight-raising + * (low-latency) mechanisms. The reason is that these queues + * are usually created for non-interactive and + * non-soft-real-time tasks. Yet this is not the case for + * stably-merged queues. These queues are merged just because + * they are created shortly after each other. So they may + * easily serve the I/O of an interactive or soft-real time + * application, if the application happens to spawn multiple + * processes. So let also stably-merged queued enjoy weight + * raising. + */ + wr_or_deserves_wr = (bfqq->wr_coeff > 1 || + (bfq_bfqq_sync(bfqq) && + (bfqq->bic || RQ_BIC(rq)->stably_merged) && + (*interactive || soft_rt))); + bfq_update_bfqq_wr_on_rq_arrival(bfqd, bfqq, old_wr_coeff, wr_or_deserves_wr, From patchwork Tue Nov 1 09:34:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13575 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845463wru; Tue, 1 Nov 2022 02:36:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7chiS8gPc29XtZut55ntsdhDNSkaRmAMVxAEctWrsat7nrjgpymXwoll4T0YUIcPovV9Cd X-Received: by 2002:a63:8641:0:b0:46e:c693:2e57 with SMTP id x62-20020a638641000000b0046ec6932e57mr15913089pgd.341.1667295360675; Tue, 01 Nov 2022 02:36:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295360; cv=none; d=google.com; s=arc-20160816; b=p6FBKALA7GXrpi47DLoOSB4AjWX6C8fhu26f4FSZfUcTix84lzPBljObNMJP5sJ9AV ayD8ixaVE5B0dtLinQHsx1306IOsOIpcNlRiD5H8m3gJD793cZ1AA5okXB0WT1MPGWdx gsCGR23sZ7CQw7tspG77k1xQBnVvRJonwXHevNUX4f6ljkIFre163ETMqNsuTr0PJb9n bmFzoS/DcaOSoTSkKCUNdfc1k0xOyGwzHJD1at0B3ieY7HRYBISR51Hhvrik37aBVY1y dJVfifF4SVsXqSpZLfyJn7gJmB05Cv9DHvliO54PbhpfTfndOUFVI6xbwXvI/urL2ASW pxOg== 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=GTjsU6OkFxNxlEA5hCSaWgWI9RoENmBwY14UUbIpBIw=; b=ZMFAdiWzSCCnA5IiCDarFtenprth1XOwSJKdLMOyhifyf38oMiUJmRy0Xg6oM30HMk yPO7j1VNeNZXROSwpH5dlcOGDCEV9t5yj58E2KxxogqIIeZpSK88zEGgLVA2mKLWujo8 sKLBPP8UMFynmSnAJlS8NlsBqtQKEh/huW0qApqpOk7YZhvfiYmvuIgc3Rr97EtiviY0 S2VN/sEdgPBM0rAzUaAtnn/N1DrUpbpTrV6oCMNt7gKFVbN62MKQLuvSmKEkIxQsq+/D scxjyamZzfID4hobq3MLRgdFQu+fRE4FfMiBy5oi2lTo4ujRUYlHdn3dVZMXD3iE7D0N mJIQ== 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 om5-20020a17090b3a8500b0020addb2c6e7si13440832pjb.85.2022.11.01.02.35.47; Tue, 01 Nov 2022 02:36:00 -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 S230269AbiKAJfD (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:03 -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 S230177AbiKAJeb (ORCPT ); Tue, 1 Nov 2022 05:34:31 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 925951900B; Tue, 1 Nov 2022 02:34:28 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1l8p4gBtzRnsP; Tue, 1 Nov 2022 17:29:30 +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:26 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 11/20] block, bfq: remove unnecessary "wr" part of wr_or_deserves_wr Date: Tue, 1 Nov 2022 17:34:08 +0800 Message-ID: <20221101093417.10540-12-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?1748285900431769925?= X-GMAIL-MSGID: =?utf-8?q?1748285900431769925?= Before commit 96a291c38c3299 ("block, bfq: preempt lower-weight or lower-priority queues"), wr_or_deserves_wr is used to check if preempt is wanted. Currently, wr_or_deserves_wr is only used in bfq_update_bfqq_wr_on_rq_arrival to check if weight raising is needed, so the "wr" part of wr_or_deserves_wr is not needed anymore. Rename wr_or_deserves_wr to deserves_wr and remove unnecessary bfqq->wr_coeff > 1 for original wr_or_deserves_wr. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 0ecb3640d715..261ba2d63925 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1681,12 +1681,12 @@ static unsigned long bfq_smallest_from_now(void) static void bfq_update_bfqq_wr_on_rq_arrival(struct bfq_data *bfqd, struct bfq_queue *bfqq, unsigned int old_wr_coeff, - bool wr_or_deserves_wr, + bool deserves_wr, bool interactive, bool in_burst, bool soft_rt) { - if (old_wr_coeff == 1 && wr_or_deserves_wr) { + if (old_wr_coeff == 1 && deserves_wr) { /* start a weight-raising period */ if (interactive) { bfqq->service_from_wr = 0; @@ -1866,7 +1866,7 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, bfq_clear_bfqq_just_created(bfqq); if (bfqd->low_latency) { - bool soft_rt, in_burst, wr_or_deserves_wr; + bool soft_rt, in_burst, deserves_wr; /* * bfqq deserves to be weight-raised if: * - it is sync, @@ -1905,14 +1905,13 @@ static void bfq_bfqq_handle_idle_busy_switch(struct bfq_data *bfqd, * processes. So let also stably-merged queued enjoy weight * raising. */ - wr_or_deserves_wr = (bfqq->wr_coeff > 1 || - (bfq_bfqq_sync(bfqq) && + deserves_wr = (bfq_bfqq_sync(bfqq) && (bfqq->bic || RQ_BIC(rq)->stably_merged) && - (*interactive || soft_rt))); + (*interactive || soft_rt)); bfq_update_bfqq_wr_on_rq_arrival(bfqd, bfqq, old_wr_coeff, - wr_or_deserves_wr, + deserves_wr, *interactive, in_burst, soft_rt); From patchwork Tue Nov 1 09:34:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13581 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2846185wru; Tue, 1 Nov 2022 02:37:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM62YsESaWyyr527hZ1ApmQ1QN+LpnuTfTp5tdXslxZST5Ob38gwzg5qkPJ607isvZMd+nC6 X-Received: by 2002:a17:90a:71ca:b0:213:c03a:1b07 with SMTP id m10-20020a17090a71ca00b00213c03a1b07mr15278734pjs.67.1667295451253; Tue, 01 Nov 2022 02:37:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295451; cv=none; d=google.com; s=arc-20160816; b=m2mBIJ0slZl9mJO13TXxCPBAUx/9XnRg9/WMsf9ZT5QblPpG4aZJkXi/3t+2VvSxEL Sv0eLgaTTzlxPPAwG0y/R1W3jpjD+4ER893f5aKeUsXx4clhzSWqAFEZzZ5YqP8Q65Tz ahf+howZTZekuu9JEsBiCPMFGhhD7Eh1lwb250zMgK011RnGvzeR7R9/aqBjhS2w1BcG a24zH3jS9rGSxORREMgOl+dmRieTqKSCq+JsqtRFEYRfAibn4GxwNQBZFA0boHl7ygRL FYNxW4oCiweegc8BpQAIAMCI3FANjMxrMpMWaoYGWtw1a4ZckwO3E9VodaIkvqh7QtmG Ls6w== 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=DfwUEjqPXJAHi9LhQuHjy3/4likQXFxHZFTiK1p65M8=; b=axLK+r/WXTgprQPo89lH0yyR7fdGso3n/+5Cmcoh1M2fRO0gFmq5cORDJ8E21Q+2AX lVNxDfq/bOtO/30+lkBjdZLSuNAMukjLkNTAvH4cwOfBoj3wB/hnR1WvSUQCOzhOcxOs A1FCTVv140Jn9zgqAvm+teBHBYdhln22Zw5xmweTgGzd/NuPuOd50kveUAl7ezp5yuNR iDcwI/0DL8IO2X1/2txEdhcTVsG4utHz1dyjqBg03kyCG8W8Pp3OdQ5R56cfvRXujfBT tk8Qmjs+omycQ8ZWVA1L8RCJcrIVbFBn2rZNp6NmYL/XlmjPx8oIfYQaIriVtBYRPKH7 LN6Q== 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 n6-20020a170902d2c600b00186e21234f2si13282620plc.177.2022.11.01.02.37.16; Tue, 01 Nov 2022 02:37:31 -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 S230307AbiKAJfU (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230201AbiKAJei (ORCPT ); Tue, 1 Nov 2022 05:34:38 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2454F1901B; Tue, 1 Nov 2022 02:34:30 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N1lCB3wcMzJnM3; Tue, 1 Nov 2022 17:31: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, 1 Nov 2022 17:34:26 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 12/20] block, bfq: start/restart service_from_wr accumulating correctly Date: Tue, 1 Nov 2022 17:34:09 +0800 Message-ID: <20221101093417.10540-13-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?1748285995402770836?= X-GMAIL-MSGID: =?utf-8?q?1748285995402770836?= 1. Start accumulating service_from_wr when async queues are weight raised. The service_from_wr for async queues is accumulated and checked to finish weight-raise as sync queues. We need to charge service_from_wr for async queues about to weight-raise. 2. Restart accumulating service_from_wr when queues are deemed interactive again The weight-raising period is restarted when queues are deemed interactive again in bfq_add_request. It's more reasonable to restart service_from_wr accumulating too. 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 261ba2d63925..a46e49de895a 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1726,6 +1726,7 @@ static void bfq_update_bfqq_wr_on_rq_arrival(struct bfq_data *bfqd, 2 * bfq_min_budget(bfqd)); } else if (old_wr_coeff > 1) { if (interactive) { /* update wr coeff and duration */ + bfqq->service_from_wr = 0; bfqq->wr_coeff = bfqd->bfq_wr_coeff; bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); } else if (in_burst) @@ -2311,6 +2312,7 @@ static void bfq_add_request(struct request *rq) time_is_before_jiffies( bfqq->last_wr_start_finish + bfqd->bfq_wr_min_inter_arr_async)) { + bfqq->service_from_wr = 0; bfqq->wr_coeff = bfqd->bfq_wr_coeff; bfqq->wr_cur_max_time = bfq_wr_duration(bfqd); From patchwork Tue Nov 1 09:34:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13580 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2845716wru; Tue, 1 Nov 2022 02:36:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM52BGvsLXlEe1IZaW10XU4GniImdcbBczkDFohvANB+2m8NRCc4He0P4BsQnk8MkVcF7jLb X-Received: by 2002:a63:2cd2:0:b0:41c:5901:67d8 with SMTP id s201-20020a632cd2000000b0041c590167d8mr16389302pgs.365.1667295396428; Tue, 01 Nov 2022 02:36:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295396; cv=none; d=google.com; s=arc-20160816; b=i4kUbdAJ8yruAUFAuAZjCYPOjINH/ajwmGjwpjhAl9D4NlOjZTehH5tVeko+8VX9fY i7BP+Wk/e63Gu8AaUUxUg2ixPedUAt9ru83gfCmYOp3VMPfHz4xblLb44MyIxYFbb6JM 8C2/xN52CNZ+V6gGi2xVZdHVa1bBzMVwdCi3gtrGR3dQ41TP7qnyuQtHuHuDfEDWvpky kOz4s3+8vxo2ukNrJyU1O7AKyDFdTqJlqFyvrxkQbwWu48EQzYKI/MFf7DLOek9RLQJb 9GGKqWMxZQjJilSdsJ7od6uv06+8XkFNfeEQDwgcMG1xCV0LUfndMS9HYS/fLpzmiPxl N1pA== 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=SI3PjZ5bXOBygfs6taitnug571/HMmGwRZhDgBpNHok=; b=DCiC7mNlQiaOF8pCn4IowwvECJBKby7ahP6FVs5C+2ZDogTgEZoYMKuLC70+5DZ5p9 EAykWm/x3KybIeYFRiXPbkvgsLhBzfxn8m21jkUvscoT+6lEPItrAMMGCG0BBvBHTpPV 5iHbE7LXDSI/0nAdw+UIrdLNVph9oJsEClcSrzLlYFc5s8GtSKlsn6xeaojkld7rHYmo mVWw7MBcE4Uey6RxERTkQOcjHlNDJECGpz8Mz+30pFVDIhAF1grPv8Em09BwgRRtzL02 wXW3iTkFp+98l9v7PztQnXzd1c0TB7uzr376ft59o7lkXJc59RV3DjSvCJvDftRzMyK+ vZ2g== 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 n12-20020a635c4c000000b004609faa2dbesi13574172pgm.285.2022.11.01.02.36.22; Tue, 01 Nov 2022 02:36:36 -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 S230294AbiKAJfP (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbiKAJei (ORCPT ); Tue, 1 Nov 2022 05:34:38 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 247201901C; Tue, 1 Nov 2022 02:34:30 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N1lCC0pDLzJnMC; Tue, 1 Nov 2022 17:31:35 +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:27 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 13/20] block,bfq: remove redundant nonrot_with_queueing check in bfq_setup_cooperator Date: Tue, 1 Nov 2022 17:34:10 +0800 Message-ID: <20221101093417.10540-14-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?1748285938042373474?= X-GMAIL-MSGID: =?utf-8?q?1748285938042373474?= Commit 430a67f9d6169 ("block, bfq: merge bursts of newly-created queues") add stable merge logic in bfq_setup_cooperator and will only be executed for !nonrot_with_queueing device. Actually, bfq_setup_cooperator is designed for only !nonrot_with_queueing and has already returned NULL before doing real work if device is nonrot_with_queueing. We can add stable merge after existing nonrot_with_queueing check and no need to re-check nonrot_with_queueing. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 97 ++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index a46e49de895a..b8af0bb98d66 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2886,56 +2886,6 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, if (bfqq->new_bfqq) return bfqq->new_bfqq; - /* - * Check delayed stable merge for rotational or non-queueing - * devs. For this branch to be executed, bfqq must not be - * currently merged with some other queue (i.e., bfqq->bic - * must be non null). If we considered also merged queues, - * then we should also check whether bfqq has already been - * merged with bic->stable_merge_bfqq. But this would be - * costly and complicated. - */ - if (unlikely(!bfqd->nonrot_with_queueing)) { - /* - * Make sure also that bfqq is sync, because - * bic->stable_merge_bfqq may point to some queue (for - * stable merging) also if bic is associated with a - * sync queue, but this bfqq is async - */ - if (bfq_bfqq_sync(bfqq) && bic->stable_merge_bfqq && - !bfq_bfqq_just_created(bfqq) && - time_is_before_jiffies(bfqq->split_time + - msecs_to_jiffies(bfq_late_stable_merging)) && - time_is_before_jiffies(bfqq->creation_time + - msecs_to_jiffies(bfq_late_stable_merging))) { - struct bfq_queue *stable_merge_bfqq = - bic->stable_merge_bfqq; - int proc_ref = min(bfqq_process_refs(bfqq), - bfqq_process_refs(stable_merge_bfqq)); - - /* deschedule stable merge, because done or aborted here */ - bfq_put_stable_ref(stable_merge_bfqq); - - bic->stable_merge_bfqq = NULL; - - if (!idling_boosts_thr_without_issues(bfqd, bfqq) && - proc_ref > 0) { - /* next function will take at least one ref */ - struct bfq_queue *new_bfqq = - bfq_setup_merge(bfqq, stable_merge_bfqq); - - if (new_bfqq) { - bic->stably_merged = true; - if (new_bfqq->bic) - new_bfqq->bic->stably_merged = - true; - } - return new_bfqq; - } else - return NULL; - } - } - /* * Do not perform queue merging if the device is non * rotational and performs internal queueing. In fact, such a @@ -2976,6 +2926,53 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, if (likely(bfqd->nonrot_with_queueing)) return NULL; + /* + * Check delayed stable merge for rotational or non-queueing + * devs. For this branch to be executed, bfqq must not be + * currently merged with some other queue (i.e., bfqq->bic + * must be non null). If we considered also merged queues, + * then we should also check whether bfqq has already been + * merged with bic->stable_merge_bfqq. But this would be + * costly and complicated. + * Make sure also that bfqq is sync, because + * bic->stable_merge_bfqq may point to some queue (for + * stable merging) also if bic is associated with a + * sync queue, but this bfqq is async + */ + if (bfq_bfqq_sync(bfqq) && bic->stable_merge_bfqq && + !bfq_bfqq_just_created(bfqq) && + time_is_before_jiffies(bfqq->split_time + + msecs_to_jiffies(bfq_late_stable_merging)) && + time_is_before_jiffies(bfqq->creation_time + + msecs_to_jiffies(bfq_late_stable_merging))) { + struct bfq_queue *stable_merge_bfqq = + bic->stable_merge_bfqq; + int proc_ref = min(bfqq_process_refs(bfqq), + bfqq_process_refs(stable_merge_bfqq)); + + /* deschedule stable merge, because done or aborted here */ + bfq_put_stable_ref(stable_merge_bfqq); + + bic->stable_merge_bfqq = NULL; + + if (!idling_boosts_thr_without_issues(bfqd, bfqq) && + proc_ref > 0) { + /* next function will take at least one ref */ + struct bfq_queue *new_bfqq = + bfq_setup_merge(bfqq, stable_merge_bfqq); + + if (new_bfqq) { + bic->stably_merged = true; + if (new_bfqq->bic) + new_bfqq->bic->stably_merged = + true; + } + return new_bfqq; + } else + return NULL; + } + + /* * Prevent bfqq from being merged if it has been created too * long ago. The idea is that true cooperating processes, and From patchwork Tue Nov 1 09:34:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2846240wru; Tue, 1 Nov 2022 02:37:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7P8V0rzr16qpbQnJLbfD4Mc5aE5NZJh4uFCvlMmd0xkF8B+7DOqdX1WbFrGG/sam1EskZC X-Received: by 2002:a17:903:2cd:b0:182:f36b:31ef with SMTP id s13-20020a17090302cd00b00182f36b31efmr17863764plk.171.1667295459133; Tue, 01 Nov 2022 02:37:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295459; cv=none; d=google.com; s=arc-20160816; b=bYZXUoa/ov/eH+U2ct+lwnpBQ8rFzbsboWC8tve4otHhbbOnU5ZSpDK+OtUYQ+Xs4n Zudff9NfGS8tKrZKtJIGdmLa4aYU0v/SY4nFT8+6rHqIDHJcwBhMLbmX5VNVIeVxIcyB sKzJcdNPFjtZtz2sUCeOka1NICSI4X3sY83aoOp9hMG/MXnqKEfJyLNa/BX9mdu1Oqan AtUWo8MvrwNLjlOvL841g82mvnWiNU3IDiZm4Za0IOxF7efErXiIU3H6w5Rm6QLPW4ic wxeVGtPGed4rd1LO9AeFWx5eZOWQe5Sxk8UJ+ixc1z3btgX6yRwtgLBvk+uw3G4kZCAo iDhw== 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=hHLk4KSBYaQuI3bbOQp5LuZNFQZ3qORrU5tJKRaeTMY=; b=q8Hpf3lWgI70GyY0ql4Q0DVg/ChE1vamBwZD/YCdwKybXDy8G+Ww8vaO7PKBLVIlWD QC9m58cc1Ak0f4gicpbbvl4KdrEyRO6Frm2gB1AKxM2T9ohliQ+1h0IXwpNee3CcNsig hC15BYz7d2DqGpzOgsTvv3OWnM7Uy0Qfr4VyRxjz0iGRxjKkyr+hBtgp9ObUkGlMvsZf 96fpbjy/Vo+LRxdrpsXS8V76bSmbuvBjKboIGFHgllrx1SeXqYAx4WfGg4C7Q7XO8sQC i3KVte//eqSNXcoKEIrP43nJBsO2nLKNBhdmYuwIkuBPxQx3nQMS+CEKmaIwLfHTVPux P4+w== 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 g23-20020a635217000000b0044a0b2e174asi11868335pgb.83.2022.11.01.02.37.25; Tue, 01 Nov 2022 02:37:39 -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 S230302AbiKAJfR (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230203AbiKAJei (ORCPT ); Tue, 1 Nov 2022 05:34:38 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5644218E30; Tue, 1 Nov 2022 02:34:30 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1l8r2g2YzRnsw; Tue, 1 Nov 2022 17:29:32 +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:27 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 14/20] block, bfq: remove redundant oom_bfqq check for bfqq from bfq_find_close_cooperator Date: Tue, 1 Nov 2022 17:34:11 +0800 Message-ID: <20221101093417.10540-15-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?1748286003478340360?= X-GMAIL-MSGID: =?utf-8?q?1748286003478340360?= The oom_bfqq is never added to tree in bfq_pos_tree_add_move, so bfqq returned from bfq_find_close_cooperator is no need to be checked if it's oom_bfqq. 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 b8af0bb98d66..776951156fbc 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -3014,8 +3014,7 @@ bfq_setup_cooperator(struct bfq_data *bfqd, struct bfq_queue *bfqq, new_bfqq = bfq_find_close_cooperator(bfqd, bfqq, bfq_io_struct_pos(io_struct, request)); - if (new_bfqq && likely(new_bfqq != &bfqd->oom_bfqq) && - bfq_may_be_close_cooperator(bfqq, new_bfqq)) + if (new_bfqq && bfq_may_be_close_cooperator(bfqq, new_bfqq)) return bfq_setup_merge(bfqq, new_bfqq); return NULL; From patchwork Tue Nov 1 09:34:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13584 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2846820wru; Tue, 1 Nov 2022 02:38:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6cxo3WOuvl8N/HMud2fkLhJnprUfGcSrxqAr/2wkkDtK2OkHps2hnOm4YVyrfVvlZ+U+qo X-Received: by 2002:a17:90a:bf15:b0:213:2ef9:18d6 with SMTP id c21-20020a17090abf1500b002132ef918d6mr37479522pjs.70.1667295529259; Tue, 01 Nov 2022 02:38:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295529; cv=none; d=google.com; s=arc-20160816; b=zLN9ns21Tp6p7GSRXyrmSDWu/88DZUDKGnwp/byb2yEo50V3PYOR1mMtMjnXzPPbbP eBXhn6rZxRk/+FNc4jla8L2jlmN146zBCS8PwH/XSXEu/4Z490E9YK4jJcvcSxnMr9/m NTESsjnOjhDHOJ6U31d4nANaMSah5OK9QuqLavwFsiVZuzmErlz576YrQ+kYbRwz8ln2 f1eAldV/TnH0+Z+NJ8IN62KtUOTNUaA1sHJ3c1XgtM4a8q5O5GTcDXh0Z5wOeKl+82pK ObsmMW4rJksp8hTEZVPGImotn5Xg5VPMmf5uPGqN9Y9xnH9v9dK0XXnAWiLqRtF2QBKr DFVQ== 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=IbqMZi+QSQygCDAX0VIGATvGkAqj54LVO4TcAgQJmaI=; b=GcHHJbiRn+n1W9cMuygJPQTs2186vxkQ9zxC0UigBzVQH0E+7ViAiE+O6QbxPHVM2J 9XkdMKsznKYX9waBga9lO6d4EkGtnPmRiefngQTFheLXx951bDiZUw3QccIpm7aNODpP 6eETZLEOpUkCsIZIMWVBTCpLltfPUWAC3bEQZX3JozJ23oisNXzHLmpzvGYMHhcZXe8B igthwXd40H0Go25GtI/gWm8w+boIfRLBJRwcxNcgfd9wtUCWIU7Dc/+Zs0kgxNWRkUgK bgmFoP2nS0K9TvH4gDJ02KVGwbJ1K/qUTt7WGVS0fbbPKROtalKaQLDzE9jYN13XOXsJ lsGg== 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 l71-20020a63914a000000b0046eecbac482si12269942pge.415.2022.11.01.02.38.36; Tue, 01 Nov 2022 02:38: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 S230314AbiKAJfZ (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:25 -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 S230063AbiKAJen (ORCPT ); Tue, 1 Nov 2022 05:34:43 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB09119027; Tue, 1 Nov 2022 02:34:30 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N1l8r705dzRnsb; Tue, 1 Nov 2022 17:29:32 +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:28 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 15/20] block, bfq: some cleanups for function bfq_pos_tree_add_move Date: Tue, 1 Nov 2022 17:34:12 +0800 Message-ID: <20221101093417.10540-16-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?1748286076706031839?= X-GMAIL-MSGID: =?utf-8?q?1748286076706031839?= There are three cleanups in this patch: 1. The oom_bfqq is never inserted to tree, so return immediately for oom_bfqq before unnecessary NULL check of bfqq->pos_root. 2. Only set bfqq->pos_root after bfq_rq_pos_tree_lookup successes rather than set bfqq->pos_root unconditionally and reset to NULL if bfq_rq_pos_tree_lookup fails. 3. Remove unnecessary local variable __bfqq which is only used to check return value of bfq_rq_pos_tree_lookup. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 776951156fbc..dd9a51255a0f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -758,17 +758,16 @@ void __cold bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq) { struct rb_node **p, *parent; - struct bfq_queue *__bfqq; + + /* oom_bfqq does not participate in queue merging */ + if (bfqq == &bfqd->oom_bfqq) + return; if (bfqq->pos_root) { rb_erase(&bfqq->pos_node, bfqq->pos_root); bfqq->pos_root = NULL; } - /* oom_bfqq does not participate in queue merging */ - if (bfqq == &bfqd->oom_bfqq) - return; - /* * bfqq cannot be merged any longer (see comments in * bfq_setup_cooperator): no point in adding bfqq into the @@ -782,14 +781,13 @@ bfq_pos_tree_add_move(struct bfq_data *bfqd, struct bfq_queue *bfqq) if (!bfqq->next_rq) return; + if (bfq_rq_pos_tree_lookup(bfqd, &bfqq_group(bfqq)->rq_pos_tree, + blk_rq_pos(bfqq->next_rq), &parent, &p)) + return; + bfqq->pos_root = &bfqq_group(bfqq)->rq_pos_tree; - __bfqq = bfq_rq_pos_tree_lookup(bfqd, bfqq->pos_root, - blk_rq_pos(bfqq->next_rq), &parent, &p); - if (!__bfqq) { - rb_link_node(&bfqq->pos_node, parent, p); - rb_insert_color(&bfqq->pos_node, bfqq->pos_root); - } else - bfqq->pos_root = NULL; + rb_link_node(&bfqq->pos_node, parent, p); + rb_insert_color(&bfqq->pos_node, bfqq->pos_root); } /* From patchwork Tue Nov 1 09:34:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13588 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2847208wru; Tue, 1 Nov 2022 02:39:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4mOeFVZR/msTzxaPjbWDtj7Qh8IMD34AbU82WBBuia36PeKxrwBE8pKLZn/rojsINbJ37s X-Received: by 2002:a05:6a00:16c4:b0:535:890:d52 with SMTP id l4-20020a056a0016c400b0053508900d52mr18727299pfc.9.1667295580160; Tue, 01 Nov 2022 02:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295580; cv=none; d=google.com; s=arc-20160816; b=vR21APZ+gs3hk+POtg94KGJhRIQStGuiNF1nqJolYZNxBJ/kH9a7YbKIzQDuDTGFjN 45nYckpM/0ODpx7/IknXZgtfL46n1ek1PSDl/wduvCUSskN2QbEzlJzblTQABF2hqutX 1s64F7b9AGaK3sWGjUdUYDrLtB/s2ZpO/JN4opT3Tnxjr9lIfWA6mmsgaXQlDyMW7Gim mvW81FFybeQXFhoth7u2WMSzM9qJf960i/8C2H1QRNyijQ8a0bjuqGUqyhNf4vZVOjgx vkAPjBLrX3G2LjBTH/7gepJaHi5OFS/G8u0PR8QVBxLt0ViEyMJntTc0azGRczyBbUOt Fuww== 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=IddvZ5eOU0SzhSoKwM8QpMkVhssvwRL1GS61izpXw3g=; b=GluZOnJDH8O27KH2DL39Tqn4ip7NMSKCEKW3SLMuSfzPpGCjRUvwVLR/SEMmaZTtbh 1nxq8C689teDNuXu4ASRsuikBXW5TmMiYbg16BcwJxiygzOZSTANCZWH/9LY7DQIoq7R m/NU7M6z0NPu/JOUhxDZfsHqicyefh7FyF+XgsmkDv6xqitPcU+nBbI8NZvFTdwD6FPu svArgt5eazi31o41tSbD4ZLzcNK8OyOSi5lsYTSF+amovXWK4KkZwjghyKFWbmE0YVWD pIAeMRma7iL24qoSb5F9Xud0Pux1VZIvS3hr6l05oUr+hU3G/rQDKj0NyuCKF8GfRM5C Y1fw== 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 g23-20020a635217000000b0044a0b2e174asi11868335pgb.83.2022.11.01.02.39.26; Tue, 01 Nov 2022 02:39:40 -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 S230318AbiKAJf1 (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230214AbiKAJen (ORCPT ); Tue, 1 Nov 2022 05:34:43 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B0CF1902C; Tue, 1 Nov 2022 02:34:31 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4N1lCD6NPRzJnMm; Tue, 1 Nov 2022 17:31:36 +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:29 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 16/20] block, bfq: remove unnecessary goto tag in __bfq_weights_tree_remove Date: Tue, 1 Nov 2022 17:34:13 +0800 Message-ID: <20221101093417.10540-17-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?1748286129868675128?= X-GMAIL-MSGID: =?utf-8?q?1748286129868675128?= Do free work if num_active == 0 and remove unnecessary tag reset_entity_pointer. 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 dd9a51255a0f..1402dfd9f448 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -950,13 +950,11 @@ void __bfq_weights_tree_remove(struct bfq_data *bfqd, return; bfqq->weight_counter->num_active--; - if (bfqq->weight_counter->num_active > 0) - goto reset_entity_pointer; - - rb_erase_cached(&bfqq->weight_counter->weights_node, root); - kfree(bfqq->weight_counter); + if (bfqq->weight_counter->num_active == 0) { + rb_erase_cached(&bfqq->weight_counter->weights_node, root); + kfree(bfqq->weight_counter); + } -reset_entity_pointer: bfqq->weight_counter = NULL; bfq_put_queue(bfqq); } From patchwork Tue Nov 1 09:34:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13585 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2846818wru; Tue, 1 Nov 2022 02:38:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Px5Td+Ou0GggjuZvIZjVKOLOse+loY5NYpK9GYXhhYeDGQyBz/rHa3RjXKbSyg/vU08Bk X-Received: by 2002:a17:902:dac3:b0:186:a437:f4b8 with SMTP id q3-20020a170902dac300b00186a437f4b8mr18428218plx.70.1667295528971; Tue, 01 Nov 2022 02:38:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295528; cv=none; d=google.com; s=arc-20160816; b=vi6tVBI9I31XhMbNgP05q/4wBaGhJfj/ycotYDV5vKrlPZ2IvDJ/ypOv1EnVgGkEQU 25UWH8vDKf+aStyq37YEDE4h+hgIhfrEmkkAAP2RCKXVuniknaRDA9IthURrnr6NZ3Dd ORN6yLu2mhoYCUhzV3JTRKQx69BRqEqjqnLtvc9rRQhPNPUxN5gtXhflFc8eUOSqMR0o hhYmQq9rTEV2IiicyabU2oH79glM5NHa7RyYGCOfvkd3N3pZAgeFiDOwDkXoSuogYW4H cPg6A7Jb5ycsQtHxnA+HwF2g0RXlS83r37UN6ySTe2kE4S6eTb+cXN5y93u25sQq89zE Upwg== 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=58FzTm/j5h6mDZlYaUc+Sp03Qdfc5LFeCrFhvkQ+Eow=; b=Ty7w+45duei8BCaZCMO4+97H7LD+g1Wp94LxAbNzJe6Lsdr0fkrlWQX/WqhVP/yoru Qg8G1nEaqqRdSGOyr79hjoLTOjEPz2VcNd7dHDdKeyR8qfIorcCEvUofvTp+E6ELCzBC 4656DEU2JTaTqIMrafRxBbi3OjiT0gQYziWlM2QqaQBhSbOm7UNsju69qi7phw5znpLo vWZrqR5BIURRMD4R00Qo7aCov7hplg6+/dxnlW9nX02+lyfciEkbrx8k8aumJgy0Dtyg lA+9MJh4StXIMr7eU8bZW0ibBdaxYkYn9zMCTs7we9xTNJKBBdwfmn6vjzbwh1tawbWb l/Ng== 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 m4-20020aa78a04000000b0056dde98957dsi450953pfa.210.2022.11.01.02.38.36; Tue, 01 Nov 2022 02:38:48 -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 S230324AbiKAJfb (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230216AbiKAJeo (ORCPT ); Tue, 1 Nov 2022 05:34:44 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2233119032; Tue, 1 Nov 2022 02:34:32 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBV20yGzpW3w; Tue, 1 Nov 2022 17:30:58 +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:29 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 17/20] block, bfq: remove unnecessary traverse in bfq_add_to_burst Date: Tue, 1 Nov 2022 17:34:14 +0800 Message-ID: <20221101093417.10540-18-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?1748286076660048991?= X-GMAIL-MSGID: =?utf-8?q?1748286076660048991?= Do mark burst and remove from list in a single traverse to remove unnecessary re-traverse. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 1402dfd9f448..0864254b8dcd 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1255,7 +1255,7 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq) bfqd->burst_size++; if (bfqd->burst_size == bfqd->bfq_large_burst_thresh) { - struct bfq_queue *pos, *bfqq_item; + struct bfq_queue *pos; struct hlist_node *n; /* @@ -1267,13 +1267,6 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq) /* * We can now mark all queues in the burst list as * belonging to a large burst. - */ - hlist_for_each_entry(bfqq_item, &bfqd->burst_list, - burst_list_node) - bfq_mark_bfqq_in_large_burst(bfqq_item); - bfq_mark_bfqq_in_large_burst(bfqq); - - /* * From now on, and until the current burst finishes, any * new queue being activated shortly after the last queue * was inserted in the burst can be immediately marked as @@ -1281,8 +1274,11 @@ static void bfq_add_to_burst(struct bfq_data *bfqd, struct bfq_queue *bfqq) * needed any more. Remove it. */ hlist_for_each_entry_safe(pos, n, &bfqd->burst_list, - burst_list_node) + burst_list_node) { + bfq_mark_bfqq_in_large_burst(pos); hlist_del_init(&pos->burst_list_node); + } + bfq_mark_bfqq_in_large_burst(bfqq); } else /* * Burst not yet large: add bfqq to the burst list. Do * not increment the ref counter for bfqq, because bfqq From patchwork Tue Nov 1 09:34: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: 13586 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2847004wru; Tue, 1 Nov 2022 02:39:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5d/nVDfusV4BA1/Y+jjP9/pAzBL1dksdbP45Pjzfg4utFDcB4u2f9qgskZ+FZuxgaeQyM0 X-Received: by 2002:a62:4c2:0:b0:52e:bd4d:50e1 with SMTP id 185-20020a6204c2000000b0052ebd4d50e1mr19142686pfe.8.1667295549448; Tue, 01 Nov 2022 02:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295549; cv=none; d=google.com; s=arc-20160816; b=08pg9/YWL75OzMIHMHQ/3MQBTgT5Txh5tI7t+NUOUyTK2YY8ef4oC9qnGDmeWGI3su HTPfrUxH1UMaY6sNW6DlF8nK+V3ui2TATlJgZTGAkNu9u7SBLSORpfsgZ/N3S14E7dDn YIW8nDTUJxxPCtjSTiKOcAKmfSxf/a0ndyvV7GISCnfXGLyE/xroyfM0UC6ABYXL2dSl bMIWtMJHSxym456fa99CaRSUXyQHc3BBboPJafcm9LvmJYijK5yq2ZngvuDAYNqpky/N iB9cb42Xq8y50tB5zRkKIXYbn0n87mI7I1tW8Fqdg7CkusmmAQ7ZiI6xgtza/qmN4XkO i/IA== 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=pPX8RVjPyCrtH5q54jjC7lfSixLgYOA8y5JahRs7m/4=; b=E7q22j1vY9yGZxlosjYYifqqVl5jpcKaTL9w4WTnD7LvVEDkdyWwWijttfb4FOfr9a oa+5ba/PteuNfagBFMZUMf5DlQ2e9gKEPqSzG0uNjctgqd6VQetdK91T4D5cAeoIlSi7 1qYK0b0zxq151aqAKJnPYKc2TH/y23YAp90OwjQj4ssPEK9P/uGPzXJyq4Xl/F+oD++a oSiej6vQxez3YmsLN3HH07mIcvsczsckqeIcRaMcfPDpf9/UNka2HDkLK16VIontzic1 qy2gEWJAG0VJ5skobyhWx+06pTnqjjeGxs2BeUjiAIXAfotOXeQLD8aH7dtg5c8RxA0e MxCw== 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 u10-20020a17090ae00a00b0020579d99c4dsi10940214pjy.138.2022.11.01.02.38.56; Tue, 01 Nov 2022 02:39:09 -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 S230334AbiKAJff (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbiKAJeq (ORCPT ); Tue, 1 Nov 2022 05:34:46 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D35E41903C; Tue, 1 Nov 2022 02:34:32 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBV6DDpzpW4M; Tue, 1 Nov 2022 17:30:58 +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:30 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 18/20] block, bfq: remove unnecessary bfqq->next_rq = NULL in bfq_remove_request Date: Tue, 1 Nov 2022 17:34:15 +0800 Message-ID: <20221101093417.10540-19-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?1748286098029483022?= X-GMAIL-MSGID: =?utf-8?q?1748286098029483022?= bfqq->next_rq is properly assigned at beginning of bfq_remove_request for condition that bfq_queue will be empty as bfqq->next_rq will be NULL only if bfqq->next_rq is removed and bfqq->next_rq is the last request existing are both met. Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 0864254b8dcd..d3f4d995f84a 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2410,8 +2410,6 @@ static void bfq_remove_request(struct request_queue *q, q->last_merge = NULL; if (RB_EMPTY_ROOT(&bfqq->sort_list)) { - bfqq->next_rq = NULL; - if (bfq_bfqq_busy(bfqq) && bfqq != bfqd->in_service_queue) { bfq_del_bfqq_busy(bfqq, false); /* @@ -2445,7 +2443,6 @@ static void bfq_remove_request(struct request_queue *q, if (rq->cmd_flags & REQ_META) bfqq->meta_pending--; - } static bool bfq_bio_merge(struct request_queue *q, struct bio *bio, From patchwork Tue Nov 1 09:34: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: 13589 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2847644wru; Tue, 1 Nov 2022 02:40:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5zD4oGmO3elB7fpIOL62C1rT15AQ9dSk5nc3wuPlNY30qT6vquMc7GW4sRa8iDU3yWELrN X-Received: by 2002:a17:906:cecc:b0:78d:408a:4a18 with SMTP id si12-20020a170906cecc00b0078d408a4a18mr88735ejb.261.1667295645300; Tue, 01 Nov 2022 02:40:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295645; cv=none; d=google.com; s=arc-20160816; b=Irjx8f5gKVPCSYSGOXp178B88YgEAwIVozlIzTFe03gsakyXyjmQj/2sEF8OqwHDrF luMF/j++J1WiQKrsScK3bJqGSvnr0syBux2VZO3P+Ex1h4DtpLM50MzSEy1HyDFjMNEx MDS2Yg1anrc1mI1Ba4yae5bOY+SV/Z1JgnYLZU+Bc1YLJt/RQA5Wnbj9rrFVpHDWxV40 Ks3ssagOyaeQVXmLOsAoRvtq/e3La6dAXUvn1IDxUIbWZmeipYRVria4ojq7HOz1a+ng yfS8VrAuEtb+HjhX+Xi2IERyes+aEmTyAhEWZCalwPV57IuyGNjQmTvWMmo1H8yNmv6G eHzg== 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=Ikn10qeC2zv7iWipkTXziQpW+TINbgrgyaqH4nEVTi0=; b=G9c+R2yo8qvo6LYduMIXarfNqrXwSCQ5dWTyJ473QQC0WxpoP5sJWIRPXFZ5xZWY8c X6Tfda58vEC7Yn3M3OgvGQXozd7Zy/p97ZHeyX7he/FjMPEgC5VjV99+7o3Ss3r4sx0P Y/HkB8IAQWwW3pmhwt6t8/sqhVHmNAC7ydcsFJ1UDlXwKXi3K6g98cYVX7Dr5zIY6meB 7ANiwwNAihs8Xg/fLSNI/DKulwaHGoVwANW6zBMli262qKvCpBP7z4CMgtdC4frJ6HOg 3GZEko1mv/+FGZLxqRhvtpB9IyfgXP0GcDhVvD9olBRia01RfT+kE+0WhcgtDAvHYMaV nuwQ== 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 w10-20020a1709064a0a00b00780a882d337si8648326eju.480.2022.11.01.02.40.21; Tue, 01 Nov 2022 02:40:45 -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 S230374AbiKAJft (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230242AbiKAJex (ORCPT ); Tue, 1 Nov 2022 05:34:53 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 391AC19002; Tue, 1 Nov 2022 02:34:33 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lGX6lj2zmVYP; Tue, 1 Nov 2022 17:34:28 +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:30 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 19/20] block, bfq: remove unnecessary local variable __bfqq in bfq_setup_merge Date: Tue, 1 Nov 2022 17:34:16 +0800 Message-ID: <20221101093417.10540-20-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?1748286198937023973?= X-GMAIL-MSGID: =?utf-8?q?1748286198937023973?= We could traversal bfqq->new_bfqq list without a local variable easily and intuitively. So remove unnecessary local variable __bfqq. 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 d3f4d995f84a..589ab59abcf5 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2741,7 +2741,6 @@ static struct bfq_queue * bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) { int process_refs, new_process_refs; - struct bfq_queue *__bfqq; /* * If there are no process references on the new_bfqq, then it is @@ -2753,10 +2752,9 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) return NULL; /* Avoid a circular list and skip interim queue merges. */ - while ((__bfqq = new_bfqq->new_bfqq)) { - if (__bfqq == bfqq) + while ((new_bfqq = new_bfqq->new_bfqq)) { + if (new_bfqq == bfqq) return NULL; - new_bfqq = __bfqq; } process_refs = bfqq_process_refs(bfqq); From patchwork Tue Nov 1 09:34: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: 13587 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2847093wru; Tue, 1 Nov 2022 02:39:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM43DaklywIcwtdnVmqc5lLHAZf9Q8RPwnVxt4lTjuAO4QQS24G4Kg5NmT3rEbtAe6QfBJla X-Received: by 2002:a17:90b:3851:b0:213:7a2e:898a with SMTP id nl17-20020a17090b385100b002137a2e898amr28713531pjb.130.1667295563254; Tue, 01 Nov 2022 02:39:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295563; cv=none; d=google.com; s=arc-20160816; b=B+g5Yk+0sL1ZdH/a493IAQKEQFQilo/QkaH+KNatbIPEvfU/n+XuqknvIZ+VKvAIJP Frq59i6f57W05LWfPFQNacEtWHyoP1wcZz86nviA0Fk7LFfybV5NVWEVbglJX9cgzTgt /D7gB+uo86fLXacCXVe/g80UgAiK6SgE+fALYK/XQyqwJK0tlmY58h6zuHnmGGyn2nHD XWe1w4B1K+9jQ9Az9MHRKKtGUg+HUaj8qwthum8xXCf8gVSrCJWRk/zkilY7CI50aQQv S1i6QmgLD5E/fKsVXanq073KntQ9xbr/IbIctJhDZBv88eFm+/vHm1XoM+Kv0UU8F3CO VWlA== 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=JL9PLbMEZTN1EJSejvtngnCHZeE8NWsJZrzJQTiHCos=; b=wcgIkIx+yf2wnaKg9CGOm7SeF03mhe7uZ9X2RtGGRHRiglw9DDIbutrOiiM8rig95u RSVS7WtMyCiNCPSMSTnoSTBUrptw8FnLbDfcqH2AeCmDnZK71UUtLzR9+JSRJDsAzPk8 6G5b8yE9wxYnV/2AtQu5qD8mkUp0C0ApXfC+xecZCi4Qy82Zsxowh+eU3imDgVOazB8K ouyxcqJ2yBO6wSwmcamKUH1KOozIaWLAF9JJl98ar5CE0PFnI5Yrce+l6fe0dKOD5qrX wX1kH1avVCRloTAyFagqyk4SxZXGTu86w9MT+Rm6QB4UY0a8WVE3HG+SkRO02+tSu30p Ptqw== 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 ge13-20020a17090b0e0d00b0021330e6afdfsi10854166pjb.146.2022.11.01.02.39.09; Tue, 01 Nov 2022 02:39:23 -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 S230244AbiKAJfq (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbiKAJew (ORCPT ); Tue, 1 Nov 2022 05:34:52 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8434419283; Tue, 1 Nov 2022 02:34:33 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBX0NsGzpW59; Tue, 1 Nov 2022 17:31:00 +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:31 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 20/20] block, bfq: remove unncessary process_ref check for merged queue in bfq_setup_merge Date: Tue, 1 Nov 2022 17:34:17 +0800 Message-ID: <20221101093417.10540-21-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?1748286112166692059?= X-GMAIL-MSGID: =?utf-8?q?1748286112166692059?= As we already check process_refs of original new_bfqq is not zero. The later new_bfqq maybe the merged queue of original new_bfqq which inherit the process_refs of original new_bfqq which is not zero, so process_refs of merged queue will not be zero. Remove unncessary check for merged queue and remove new_process_refs which will not be used. 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 589ab59abcf5..0736577bfbfe 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2740,7 +2740,7 @@ static struct bfq_queue *bfq_find_close_cooperator(struct bfq_data *bfqd, static struct bfq_queue * bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) { - int process_refs, new_process_refs; + int process_refs; /* * If there are no process references on the new_bfqq, then it is @@ -2758,12 +2758,11 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) } process_refs = bfqq_process_refs(bfqq); - new_process_refs = bfqq_process_refs(new_bfqq); /* * If the process for the bfqq has gone away, there is no * sense in merging the queues. */ - if (process_refs == 0 || new_process_refs == 0) + if (process_refs == 0) return NULL; /*