From patchwork Wed Oct 19 12:15:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 5409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp313692wrs; Wed, 19 Oct 2022 06:03:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4NN80J/bxpM4ZbFm47z6nS7jIlHfHZsGTBwMGwyNNaVotPf9pw1tiSXDFoXwlaNBjEMOA3 X-Received: by 2002:a05:6a02:192:b0:43c:a0cb:44d3 with SMTP id bj18-20020a056a02019200b0043ca0cb44d3mr7353394pgb.139.1666184609262; Wed, 19 Oct 2022 06:03:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666184609; cv=none; d=google.com; s=arc-20160816; b=rQhD6o2irXHVDLPq5dC2CQM2cSBU1gyYnYS1YXsHhNg6L8oCLwJDL2EADv5Wuhj4lm Eq/e/Zt/Dye/Pep1M5kI8YMHuquFGvhIPW2M7w3M9RF8vccYbqyBx13d6aIwb6+LKhe9 wtDCRp01DsAxUbaxjnvUAbkiXJls+hKOyUdPaG+7WCd6MQPJUMCIw+6ZZwZ/WVb7fxnb C4ENkjBlcWHBEDbpdDcoo85t58GoOnyi4qJFhGI01eep+pOxPlifUj2eubriBAFlFkv2 NcP1hVbBISgNwLYt+4qF/S1GmomngWBHA8OeROegwxqDlBxYGKESys85UEvinUs9M0S6 rAnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=4R0oM1OLgmitzjiaMP4xiEy8ahI0qYz46F7h37vSACY=; b=0rTFmxRVX+o96kzhqvG+Su9+rABZnGbfOytyQrAXV1u/uef3444UAERyk5qOCOnbXC SJBpGjnpac+LNhDN6Cf/y7RcVLXY3iT7jyCJtXg5E2S9GSYWAh2JrxVIUvDcGyVKo9sW nDS2Ew/ccTpYzEmpd5F7PEbjXmfOdXqfG3s86Vxu8ldFzXlYbjJfB+a/a9o36NIJq5VZ wvJwciLyt9dh9NgsD7H8uhrxn6RuSu0qkOt8eOdqDrVXB+kba2C1ca8pRoO7tvfqYnqx W+GeFBCk3q784mwt862Mb4RwTW8oSDUAttuTcHxyx/m+aobDDEU88msUct4qkmmp1YdF d8Ig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pg10-20020a17090b1e0a00b00200919a55b1si21684069pjb.180.2022.10.19.06.02.59; Wed, 19 Oct 2022 06:03:29 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229993AbiJSMt5 (ORCPT + 99 others); Wed, 19 Oct 2022 08:49:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233380AbiJSMs7 (ORCPT ); Wed, 19 Oct 2022 08:48:59 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AE4015835; Wed, 19 Oct 2022 05:31:39 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4MspwM2PQnzl9fD; Wed, 19 Oct 2022 19:51:15 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgCX0DAq5U9jgItmAA--.58124S5; Wed, 19 Oct 2022 19:53:16 +0800 (CST) From: Yu Kuai To: hch@lst.de, ebiggers@google.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v5 1/6] elevator: remove redundant code in elv_unregister_queue() Date: Wed, 19 Oct 2022 20:15:13 +0800 Message-Id: <20221019121518.3865235-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019121518.3865235-1-yukuai1@huaweicloud.com> References: <20221019121518.3865235-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCX0DAq5U9jgItmAA--.58124S5 X-Coremail-Antispam: 1UD129KBjvdXoW7Wr43GF13Kr13AFWfXFyrWFg_yoW3ArbEya y8Kw1kX398Gr1akr1YyF4avF1vvan3JFyfW34aqrn7Ja18XFyFyryxCr45CrsrGay7Ca90 ywn7urs3Zrn2gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-kFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY02 0Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUbec_DUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1747121192856152649?= X-GMAIL-MSGID: =?utf-8?q?1747121192856152649?= From: Yu Kuai "elevator_queue *e" is already declared and initialized in the beginning of elv_unregister_queue(). Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig Reviewed-by: Eric Biggers --- block/elevator.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index bd71f0fc4e4b..20e70fd3f77f 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -524,8 +524,6 @@ void elv_unregister_queue(struct request_queue *q) lockdep_assert_held(&q->sysfs_lock); if (e && e->registered) { - struct elevator_queue *e = q->elevator; - kobject_uevent(&e->kobj, KOBJ_REMOVE); kobject_del(&e->kobj); From patchwork Wed Oct 19 12:15:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 5404 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp312045wrs; Wed, 19 Oct 2022 06:01:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5uXcFX2b3hpLyUFCyDGdffQsGq3uPwLzNGPHtnNLg9OYMBw9F1dQ9WT5vBBn0laH66dTJg X-Received: by 2002:a63:dc54:0:b0:44c:ce26:fa35 with SMTP id f20-20020a63dc54000000b0044cce26fa35mr7294387pgj.374.1666184477555; Wed, 19 Oct 2022 06:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666184477; cv=none; d=google.com; s=arc-20160816; b=Q+qVsOEnjdacefbkVJBBlYMEl60X7f/5rl2pvzxOb+ipVfUaIEVvRLlLInbe5zs+t1 d/T0OkeeIpp5OYahX4zi9oPP8ZsrsxXA37CZPphndmPUPhUUZ1a4ZZs7NUADzv1+WoyV bYYCOrcyOMECgy/aFGOjdtHGr/3aiKZtE6acIpO3m/LbDhy5LtR+PU0Zj/Z3l8hkPA4g pQ5mWrSM7Loop0Y9vd4vsoKM5eXL028NHr7OdQtJ1wLQgOUz61uxOTdHiL6GBRuBB6ny a+lNxIGJVFsUakIVU1AduIexVFUVc9iGoIvcHudvqoZa6WyTKD//6sm3MNBMX5vyc7Mn Gl1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=fgoiNmops452C0Y2sZrgPRYyQkJOTTvnAKdfXC5XlJQ=; b=TG7lGS1Tt90M0h52ghlI+gvOO0Exzcai/f+uldi3obRatD39bK/XeyldKJ6hGdmywz 3oLEM0jPIq6vMpzYD7Sf3PqouPdIgB69wM6baVN5RFvhphNKGfz3wdSYQbmlyalJ2cbT 4ugOsZOjhlQgMNTsl2An4VJGqBCMW80troPJWDthlE5O8wF4B6SHaN4ZDAiJp8w8Xnqb 0sXwdMfcKb++uGNJkoWBwYUOs0Vkjj93AU4Ab7U2mMq3TuoAJsFukb/g85nL2vntne0L kd/TTLZeWxsoGSNGgvqUXS626xDSxO37d4g+eK1frksh188k483BkAvYNes8btQfoUe6 2faw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s7-20020a17090302c700b0017532e01e57si17465504plk.200.2022.10.19.06.00.40; Wed, 19 Oct 2022 06:01:17 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232509AbiJSMtx (ORCPT + 99 others); Wed, 19 Oct 2022 08:49:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232650AbiJSMsx (ORCPT ); Wed, 19 Oct 2022 08:48:53 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CE4618356; Wed, 19 Oct 2022 05:31:37 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4MspwM5vjszl9fN; Wed, 19 Oct 2022 19:51:15 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgCX0DAq5U9jgItmAA--.58124S6; Wed, 19 Oct 2022 19:53:17 +0800 (CST) From: Yu Kuai To: hch@lst.de, ebiggers@google.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v5 2/6] blk-wbt: remove unnecessary check in wbt_enable_default() Date: Wed, 19 Oct 2022 20:15:14 +0800 Message-Id: <20221019121518.3865235-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019121518.3865235-1-yukuai1@huaweicloud.com> References: <20221019121518.3865235-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCX0DAq5U9jgItmAA--.58124S6 X-Coremail-Antispam: 1UD129KBjvdXoWrKry8GF45Zr17CFy7ZF13Arb_yoWxurgEqF yxGrs2vFn5Ga1fCF45Aa45XFyIkws5ZF4Uur4xJ3s0qFn3JFn2k393Xr43ArZxWa92krWa qa1DWrW3Ar4IqjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb-kFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY02 0Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM2 8EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AI xVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JV W8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUjYiiDUUUUU== X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1747121054529587886?= X-GMAIL-MSGID: =?utf-8?q?1747121054529587886?= From: Yu Kuai If CONFIG_BLK_WBT_MQ is disabled, wbt_init() won't do anything. Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig --- block/blk-wbt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index c293e08b301f..c5a8c10028a0 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -651,7 +651,7 @@ void wbt_enable_default(struct request_queue *q) if (!blk_queue_registered(q)) return; - if (queue_is_mq(q) && IS_ENABLED(CONFIG_BLK_WBT_MQ)) + if (queue_is_mq(q)) wbt_init(q); } EXPORT_SYMBOL_GPL(wbt_enable_default); From patchwork Wed Oct 19 12:15:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 5401 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp311737wrs; Wed, 19 Oct 2022 06:00:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4nHZ4X2KVzLehY7wRIHoN37E4p0BjrXagpxDQk2MvLe30wyZ2nPpWa3OMFR+lfk8EBRWC1 X-Received: by 2002:a17:90b:3b8b:b0:20d:4fd9:9a0f with SMTP id pc11-20020a17090b3b8b00b0020d4fd99a0fmr43333292pjb.17.1666184440639; Wed, 19 Oct 2022 06:00:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666184440; cv=none; d=google.com; s=arc-20160816; b=pX4hY5jRQ7EBpJj1o5u/yZ0NAEVbdZLZp4YOwQUcL3Hl56UFEoxaOuK4L/FFLSm3MN BShEgyTvQg43hdZy1B9CfR+2Czz5CNonw6DtRt2MjMHWUx7BfEZ/J4ElXlMt1Fp8tXf0 q4CWCvlVT6e96HJIhaRuns+XO/zUPZNw1lVCTTSVUy3HEv6DAgKKcV0M8zH+IIzvPaHr QIpyZFBsxgm1hkmeL/+xouC4YGR/OYVhjgpPAR+0X4EF2TUIOfqV8Xfk1oIwMXs7cAQS vetDQKmF4nwXhBIX0SM7FXU2H1t0zHnITkwD9fVX01on3HAHYj4G1hYaXErQxvnLWlW+ gZGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=G6PjCYv/4IMwim39XvPMC5JxrObzXP91uSIZ7xeDehg=; b=cAa+irxw6DvQO6ElmZOQwcMnQHHMlnfIP/iMthrUdvKzH0RcNXvSJU/ZyRjQV9g94L celeKsEGzugiH/J21bRVD6YMU4Sv+w4/ovPLIeZXeuoK6mBZpK84gS4DHdiObihMXCxO Cl3aWm8fzz+3FmJlPQJaMIw/tgkI/54zowSYb/Se0bSbKe3xKipvLk+k7KxSYLkckJeE 962bcTdNQ+xvIbFV3N4pmPPuqE9vXPS8UjRKoEKiU/fvIAoPZTM+Xd7n0HvEWTFZJDod 48I/ZjkPA19qNCwJ7v2DRzPqTDGMD5F1CqxF+CPnokiFV6EopWsuscimoljo+r7BGoPu 2/aQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u6-20020a170902e80600b001781f860a6dsi21587405plg.228.2022.10.19.06.00.13; Wed, 19 Oct 2022 06:00: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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233244AbiJSMth (ORCPT + 99 others); Wed, 19 Oct 2022 08:49:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233390AbiJSMtA (ORCPT ); Wed, 19 Oct 2022 08:49:00 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBD06BC1E; Wed, 19 Oct 2022 05:31:42 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Mspvy6r6pzKHgk; Wed, 19 Oct 2022 19:50:54 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgCX0DAq5U9jgItmAA--.58124S7; Wed, 19 Oct 2022 19:53:17 +0800 (CST) From: Yu Kuai To: hch@lst.de, ebiggers@google.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v5 3/6] blk-wbt: make enable_state more accurate Date: Wed, 19 Oct 2022 20:15:15 +0800 Message-Id: <20221019121518.3865235-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019121518.3865235-1-yukuai1@huaweicloud.com> References: <20221019121518.3865235-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCX0DAq5U9jgItmAA--.58124S7 X-Coremail-Antispam: 1UD129KBjvJXoW7ZF47CF4Utw47WFyfZw4xWFg_yoW8AFW5pa srGrW7KrnFgFn7Za1xA3W7JrWfCa1jyF45Gay5Zr1SgF15urW2v3WvkrWUXFnYvFW3Ca1I g34DJr9rJa4jvrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9m14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrwCFx2 IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v2 6r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67 AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IY s7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr 0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUd8n5UUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1747121015766186715?= X-GMAIL-MSGID: =?utf-8?q?1747121015766186715?= From: Yu Kuai Currently, if user disable wbt through sysfs, 'enable_state' will be 'WBT_STATE_ON_MANUAL', which will be confusing. Add a new state 'WBT_STATE_OFF_MANUAL' to cover that case. Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig --- block/blk-wbt.c | 7 ++++++- block/blk-wbt.h | 12 +++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index c5a8c10028a0..4680691a96bc 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -435,8 +435,13 @@ void wbt_set_min_lat(struct request_queue *q, u64 val) struct rq_qos *rqos = wbt_rq_qos(q); if (!rqos) return; + RQWB(rqos)->min_lat_nsec = val; - RQWB(rqos)->enable_state = WBT_STATE_ON_MANUAL; + if (val) + RQWB(rqos)->enable_state = WBT_STATE_ON_MANUAL; + else + RQWB(rqos)->enable_state = WBT_STATE_OFF_MANUAL; + wbt_update_limits(RQWB(rqos)); } diff --git a/block/blk-wbt.h b/block/blk-wbt.h index 7e44eccc676d..7fe98638fff5 100644 --- a/block/blk-wbt.h +++ b/block/blk-wbt.h @@ -28,13 +28,15 @@ enum { }; /* - * Enable states. Either off, or on by default (done at init time), - * or on through manual setup in sysfs. + * If current state is WBT_STATE_ON/OFF_DEFAULT, it can be covered to any other + * state, if current state is WBT_STATE_ON/OFF_MANUAL, it can only be covered + * to WBT_STATE_OFF/ON_MANUAL. */ enum { - WBT_STATE_ON_DEFAULT = 1, - WBT_STATE_ON_MANUAL = 2, - WBT_STATE_OFF_DEFAULT + WBT_STATE_ON_DEFAULT = 1, /* on by default */ + WBT_STATE_ON_MANUAL = 2, /* on manually by sysfs */ + WBT_STATE_OFF_DEFAULT = 3, /* off by default */ + WBT_STATE_OFF_MANUAL = 4, /* off manually by sysfs */ }; struct rq_wb { From patchwork Wed Oct 19 12:15:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 5592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp355205wrs; Wed, 19 Oct 2022 07:22:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5dIkO7RzXm4L4hFc1vXO69qyCKN/K+iGpKimLD6znytlbMkovzJaxBZ148ebsvuicNJPPk X-Received: by 2002:a17:906:9b93:b0:78d:eb36:1ce7 with SMTP id dd19-20020a1709069b9300b0078deb361ce7mr7026243ejc.621.1666189326572; Wed, 19 Oct 2022 07:22:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666189326; cv=none; d=google.com; s=arc-20160816; b=gZ8Z8VErPIfjoiF62I79B1PXMt/QO14LgQShbE2bpwBCfv4Agf1FpEGAqvFvSknIRy VqEPvxnosMbuqYWlsL7whFqIy/GLA9Ez8czgsuh+HvBsdRVUBFu+B7anjs/WWxviXgG4 gCbH1ksUQ0qeHm1UsibMDcv6bOE95WGoA3/UNFw1c6BMERq3DSUNxARkksVCDCUASCZY QkU38xlZLhigB+OgzcPOzTAu6lpF9OST5qT+z+nOXIwZZSRErpdtQlJrd4MVUHx48cSV lPuS5ruVtczy+ZzTyw8DcFF8M3L4eP4/LhhlR1I+iyEGqq7Z1BioYrmP1P9ItHmsdyRc dn/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=i5vkW26Apdgn+d2rklW2x6KxALTU53k8Km/WWg4dlHI=; b=YhZiMlVvUFSzOgz2HIjxMesSJFS8wzdBCDcmm0ubbNAljEAWxnRkaF4KdQBNT39CwP qmdnWt9FyBK7VuiOISaUmf/RAmf53NPfqNstzOHVe87+oFGCWpvhOLycarTZf1QCr2oX MJNXFeT6SmvUGhQBsG3NoHtS+hUlPndScISzY/yZ9mGxDR4cMabHOklhEYjhDolaZxE9 Sjp6yaS7pbtEbT7i7GoxekhE0IYoCapX4qpIwIWFrVmVxKeZ5IsKvq/i4CDaSy0QKtUo bCGQZFdjF/gSNKWsL5Pxo6R6M0tUu02Ue4hUFlbfRKQrCLLtbvgneGQrBmHNtaT1MBJ4 Knmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q4-20020a170906388400b00781b66e7065si12527360ejd.240.2022.10.19.07.21.41; Wed, 19 Oct 2022 07:22:06 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231770AbiJSOTi (ORCPT + 99 others); Wed, 19 Oct 2022 10:19:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233880AbiJSOTF (ORCPT ); Wed, 19 Oct 2022 10:19:05 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C5FC16CA53; Wed, 19 Oct 2022 07:02:29 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4MspwN4PhTzl9hk; Wed, 19 Oct 2022 19:51:16 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgCX0DAq5U9jgItmAA--.58124S8; Wed, 19 Oct 2022 19:53:18 +0800 (CST) From: Yu Kuai To: hch@lst.de, ebiggers@google.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v5 4/6] blk-wbt: don't show valid wbt_lat_usec in sysfs while wbt is disabled Date: Wed, 19 Oct 2022 20:15:16 +0800 Message-Id: <20221019121518.3865235-5-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019121518.3865235-1-yukuai1@huaweicloud.com> References: <20221019121518.3865235-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCX0DAq5U9jgItmAA--.58124S8 X-Coremail-Antispam: 1UD129KBjvJXoW7trWxZw1ruw4fWFWkGF13XFb_yoW8tF18pa y7GFy2kF42gF4UWFyxJF4DWrWakw4Fkry7GrW8GrWYvr12kry2vF4vkrW8XF95ZrWxCFsx Xr1YyrZ5ur4jg3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9C14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxK x2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI 0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQSdkUUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1747126139135380822?= X-GMAIL-MSGID: =?utf-8?q?1747126139135380822?= From: Yu Kuai Currently, if wbt is initialized and then disabled by wbt_disable_default(), sysfs will still show valid wbt_lat_usec, which will confuse users that wbt is still enabled. This patch shows wbt_lat_usec as zero if it's disabled. Signed-off-by: Yu Kuai Reported-and-tested-by: Holger Hoffstätte Reviewed-by: Christoph Hellwig --- block/blk-sysfs.c | 3 +++ block/blk-wbt.c | 8 ++++++++ block/blk-wbt.h | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index e71b3b43927c..7b98c7074771 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -470,6 +470,9 @@ static ssize_t queue_wb_lat_show(struct request_queue *q, char *page) if (!wbt_rq_qos(q)) return -EINVAL; + if (wbt_disabled(q)) + return sprintf(page, "0\n"); + return sprintf(page, "%llu\n", div_u64(wbt_get_min_lat(q), 1000)); } diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 4680691a96bc..07ed0b0aee1f 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -422,6 +422,14 @@ static void wbt_update_limits(struct rq_wb *rwb) rwb_wake_all(rwb); } +bool wbt_disabled(struct request_queue *q) +{ + struct rq_qos *rqos = wbt_rq_qos(q); + + return !rqos || RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT || + RQWB(rqos)->enable_state == WBT_STATE_OFF_MANUAL; +} + u64 wbt_get_min_lat(struct request_queue *q) { struct rq_qos *rqos = wbt_rq_qos(q); diff --git a/block/blk-wbt.h b/block/blk-wbt.h index 7fe98638fff5..e3ea6e7e2900 100644 --- a/block/blk-wbt.h +++ b/block/blk-wbt.h @@ -96,6 +96,7 @@ void wbt_enable_default(struct request_queue *); u64 wbt_get_min_lat(struct request_queue *q); void wbt_set_min_lat(struct request_queue *q, u64 val); +bool wbt_disabled(struct request_queue *); void wbt_set_write_cache(struct request_queue *, bool); @@ -127,6 +128,10 @@ static inline u64 wbt_default_latency_nsec(struct request_queue *q) { return 0; } +static inline bool wbt_disabled(struct request_queue *q) +{ + return true; +} #endif /* CONFIG_BLK_WBT */ From patchwork Wed Oct 19 12:15:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 5415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp315620wrs; Wed, 19 Oct 2022 06:06:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6fjavhRdIgJMD0bP8jYsXSASLhQvYCRvN7imTYzuO5r9ThG0MWdeoAxjCEfwXwqDXPoXSx X-Received: by 2002:a17:90b:3892:b0:20d:4bb5:91fe with SMTP id mu18-20020a17090b389200b0020d4bb591femr9950029pjb.31.1666184772255; Wed, 19 Oct 2022 06:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666184772; cv=none; d=google.com; s=arc-20160816; b=AH29VEvC9nqT+orQYsadOmTJGMYq5mss4rJgtJ5LRsDJ9IfK8foULEkoxwskUl+sjp vBo3jAvLogqzC4DxPvx5bapLVgoypoCGP+XkGcPwA8/Grfk3q4XEzR4hawtClmJp79lF 3pURKRovhmOIjpZRQatDCePmLi+MvlNO42CopHsdVS4+BYk3okK5uWoVtB7k23tomFsU gh2TnwkuiCanJ7leCeXoFsYRaELZ4+3Tixj0vcJEE+caxne+lN0dw7Z6lLeZZvi1oKm7 E5swmEg3XKdJ64Mh8O5HCbp2GA+bWAt7ZWMcABMNkFBvw8qDuDG74BJpurBjRosI9ka8 rsEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=RDXuV4zwoRLxoAz2+tkufup/m51VTQpFWJSe1wWbDU8=; b=patI2j4RHAzQ2XHjTwD9QAbLFZEcu/eh0Iquu4o0thfvm2d2hnuA6yXHpIPcfy0wyD F4ljrEsHUpdaetyTy/yyGCe8O0oNElFQlrZzg+CILgebshjweE61A5sJvBfwkRU/21Ys MUJEZ9I+ZJgd0v/QSAGeAu4UoBeQQXIlg5dXeezc9eta6Pwi3wx30SVO3+NLVRJTNXZk DZyYSyQQ1LPuyQElItIYCOhXuGGXHiDdE5Ka9jvHhvgZ6vglO/8NAxOCCLL5K4/zqFnU Jm8uCqze5X9WOlQ+7nlxM+UOv+g4+ShEjj5c+opCPZdnXxwfcK0kIbkcJ7ldBEWpZmRb iz8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x12-20020a056a00188c00b005410d1ea0e5si20762019pfh.14.2022.10.19.06.05.24; Wed, 19 Oct 2022 06:06:12 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231831AbiJSNAN (ORCPT + 99 others); Wed, 19 Oct 2022 09:00:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231355AbiJSM60 (ORCPT ); Wed, 19 Oct 2022 08:58:26 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3089B1C5A61; Wed, 19 Oct 2022 05:41:46 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4Mspw12MRvz6R55S; Wed, 19 Oct 2022 19:50:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgCX0DAq5U9jgItmAA--.58124S9; Wed, 19 Oct 2022 19:53:18 +0800 (CST) From: Yu Kuai To: hch@lst.de, ebiggers@google.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v5 5/6] elevator: add new field flags in struct elevator_queue Date: Wed, 19 Oct 2022 20:15:17 +0800 Message-Id: <20221019121518.3865235-6-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019121518.3865235-1-yukuai1@huaweicloud.com> References: <20221019121518.3865235-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCX0DAq5U9jgItmAA--.58124S9 X-Coremail-Antispam: 1UD129KBjvJXoW7tr17WF1ruF4fuFW8tr47Arb_yoW8XFWUp3 Z3Gws8K3yqqF4UuF4DJ3W3Wa4ak34v9rnxur4kA34UKr17GrWagF18CFy0qF4Utrs7JFsF vF18tayjvFyUCw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9C14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxK x2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI 0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQSdkUUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1747121363805620445?= X-GMAIL-MSGID: =?utf-8?q?1747121363805620445?= From: Yu Kuai There are only one flag to indicate that elevator is registered currently, prepare to add a flag to disable wbt if default elevator is bfq. Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig --- block/elevator.c | 6 ++---- block/elevator.h | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index 20e70fd3f77f..9e12706e8d8c 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -512,7 +512,7 @@ int elv_register_queue(struct request_queue *q, bool uevent) if (uevent) kobject_uevent(&e->kobj, KOBJ_ADD); - e->registered = 1; + set_bit(ELEVATOR_FLAG_REGISTERED, &e->flags); } return error; } @@ -523,11 +523,9 @@ void elv_unregister_queue(struct request_queue *q) lockdep_assert_held(&q->sysfs_lock); - if (e && e->registered) { + if (e && test_and_clear_bit(ELEVATOR_FLAG_REGISTERED, &e->flags)) { kobject_uevent(&e->kobj, KOBJ_REMOVE); kobject_del(&e->kobj); - - e->registered = 0; } } diff --git a/block/elevator.h b/block/elevator.h index 3f0593b3bf9d..ed574bf3e629 100644 --- a/block/elevator.h +++ b/block/elevator.h @@ -100,10 +100,12 @@ struct elevator_queue void *elevator_data; struct kobject kobj; struct mutex sysfs_lock; - unsigned int registered:1; + unsigned long flags; DECLARE_HASHTABLE(hash, ELV_HASH_BITS); }; +#define ELEVATOR_FLAG_REGISTERED 0 + /* * block elevator interface */ From patchwork Wed Oct 19 12:15:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 5618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp377526wrs; Wed, 19 Oct 2022 08:07:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6rQslwe3HKdbwyTtZ7QYFIx87yhs7MIu3KGwq21LY/NAfx5l0uW1WhJguvn4uP8OepQQVo X-Received: by 2002:a05:6402:b35:b0:45c:9c9d:2531 with SMTP id bo21-20020a0564020b3500b0045c9c9d2531mr7885750edb.410.1666192046813; Wed, 19 Oct 2022 08:07:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666192046; cv=none; d=google.com; s=arc-20160816; b=NK3uydegT9D7x4qxuUfhYihEWEp0T7+1ZuyFeb59M+iI90PpXRl2h7UcfjC9ASbS2H VWs5P7DmNYg3TFVI8kuXhWO2jVEpUS1NHTcYYPba8jChfhzw/gVha++JhsJDNC22j/gi 2wkIu0IG4t1sVk1LKcOt1UIoTRDkHFjX7dqxnU0HHc8vCfhmgF39PJixblYzv0RhxdLS 6eKbFhmLGsYRldSGjikg77jvSKdslXIsUVYXj0pAPk0pAPC6qx9CIZM0dbSZNRvwPxfz cxjlTBapFHkncqO6z9Utl+Pno1gUqlOsETSk+8l9e8dKf7qpvqOuxm6KZzYz266g4iaS tbTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=T3B/n5eW0PGFnmLnk+uZ417lj26aOUXC/VJgW7fFhA8=; b=dDhKkmoYFzntNB8r94sTEbP1jxVxmGTCQjz9GM1EVtssKNlFR2EnNQ6xgUf1dXF1TJ rsbaauSnm7nw71umcWiO3ZTi8lj6Z5838szVtOk9vsYJNIyxlnPVHR42TYjiyA+5RsZk kfTig2zQJK8/arD4t7Lj6fdGXPjEooAnvPhtzFw+ChrEMgVMxIRQeZDEFd7iwr3xLnIy U9aD6198CNjFzemPuQJGsnjYloREU1p940iW/LyeU+Dh4jm0Ny3QzQFmPrRkmd/MSNIc Fao/3fZi9WWdnv8Y+iR59g6v15RiGUs7m1a1B4GYQD4LcGdW1QUW6LszB84OOg+ksWuP A94Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m19-20020a17090679d300b0078b8bc456dcsi12302256ejo.315.2022.10.19.08.06.52; Wed, 19 Oct 2022 08:07:26 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231150AbiJSO73 (ORCPT + 99 others); Wed, 19 Oct 2022 10:59:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231447AbiJSO6m (ORCPT ); Wed, 19 Oct 2022 10:58:42 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C318237D3; Wed, 19 Oct 2022 07:53:14 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Mspw11YZzzKHkv; Wed, 19 Oct 2022 19:50:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgCX0DAq5U9jgItmAA--.58124S10; Wed, 19 Oct 2022 19:53:18 +0800 (CST) From: Yu Kuai To: hch@lst.de, ebiggers@google.com, axboe@kernel.dk Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH v5 6/6] blk-wbt: don't enable throttling if default elevator is bfq Date: Wed, 19 Oct 2022 20:15:18 +0800 Message-Id: <20221019121518.3865235-7-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019121518.3865235-1-yukuai1@huaweicloud.com> References: <20221019121518.3865235-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCX0DAq5U9jgItmAA--.58124S10 X-Coremail-Antispam: 1UD129KBjvJXoWxAw1kCw15ZFWDAryDWFy5XFb_yoW5Zr15p3 Z5GFySkrZ2gr4xuF97Jr13Xr17Cw4F9ry7Cr48C3yF93W3CrZaqa1vkFyrZF40qrs7JF43 Xw18KFWDZFy0gw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9K14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrw CFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE 14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2 IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAv wI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14 v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfUOBTYUUUUU X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1747128991922133830?= X-GMAIL-MSGID: =?utf-8?q?1747128991922133830?= From: Yu Kuai Commit b5dc5d4d1f4f ("block,bfq: Disable writeback throttling") tries to disable wbt for bfq, it's done by calling wbt_disable_default() in bfq_init_queue(). However, wbt is still enabled if default elevator is bfq: device_add_disk elevator_init_mq bfq_init_queue wbt_disable_default -> done nothing blk_register_queue wbt_enable_default -> wbt is enabled Fix the problem by adding a new flag ELEVATOR_FLAG_DISBALE_WBT, bfq will set the flag in bfq_init_queue, and following wbt_enable_default() won't enable wbt while the flag is set. Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig --- block/bfq-iosched.c | 2 ++ block/blk-wbt.c | 11 ++++++++--- block/elevator.h | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 24649c34cd35..42aa5fc7f17b 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6994,6 +6994,7 @@ static void bfq_exit_queue(struct elevator_queue *e) #endif blk_stat_disable_accounting(bfqd->queue); + clear_bit(ELEVATOR_FLAG_DISABLE_WBT, &e->flags); wbt_enable_default(bfqd->queue); kfree(bfqd); @@ -7139,6 +7140,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) /* We dispatch from request queue wide instead of hw queue */ blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q); + set_bit(ELEVATOR_FLAG_DISABLE_WBT, &eq->flags); wbt_disable_default(q); blk_stat_enable_accounting(q); diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 07ed0b0aee1f..68a774d7a7c9 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -27,6 +27,7 @@ #include "blk-wbt.h" #include "blk-rq-qos.h" +#include "elevator.h" #define CREATE_TRACE_POINTS #include @@ -651,11 +652,15 @@ void wbt_set_write_cache(struct request_queue *q, bool write_cache_on) */ void wbt_enable_default(struct request_queue *q) { - struct rq_qos *rqos = wbt_rq_qos(q); + struct rq_qos *rqos; + bool disable_flag = q->elevator && + test_bit(ELEVATOR_FLAG_DISABLE_WBT, &q->elevator->flags); /* Throttling already enabled? */ + rqos = wbt_rq_qos(q); if (rqos) { - if (RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT) + if (!disable_flag && + RQWB(rqos)->enable_state == WBT_STATE_OFF_DEFAULT) RQWB(rqos)->enable_state = WBT_STATE_ON_DEFAULT; return; } @@ -664,7 +669,7 @@ void wbt_enable_default(struct request_queue *q) if (!blk_queue_registered(q)) return; - if (queue_is_mq(q)) + if (queue_is_mq(q) && !disable_flag) wbt_init(q); } EXPORT_SYMBOL_GPL(wbt_enable_default); diff --git a/block/elevator.h b/block/elevator.h index ed574bf3e629..75382471222d 100644 --- a/block/elevator.h +++ b/block/elevator.h @@ -104,7 +104,8 @@ struct elevator_queue DECLARE_HASHTABLE(hash, ELV_HASH_BITS); }; -#define ELEVATOR_FLAG_REGISTERED 0 +#define ELEVATOR_FLAG_REGISTERED 0 +#define ELEVATOR_FLAG_DISABLE_WBT 1 /* * block elevator interface