From patchwork Thu May 11 01:45:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 92338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4045807vqo; Wed, 10 May 2023 18:50:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4CaVilwErrxNH7nDXcezM4D1XaWwY/GzViH80UF0KB+47j6Oj8FxHkS1IcGlPw21+jZkgg X-Received: by 2002:a05:6a21:998c:b0:100:49d1:6fc7 with SMTP id ve12-20020a056a21998c00b0010049d16fc7mr18371645pzb.34.1683769809901; Wed, 10 May 2023 18:50:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683769809; cv=none; d=google.com; s=arc-20160816; b=Emli+dYk/W3xS/Nzg8i7i+JHn/D8oCSnUuU7YeCxA6Bg5TEyseFWI6Bf/8YmgkmjRg yn5bAeY1/XXMEcZx1fcVS70ZVU14/aZVsGB0OPgjX6gqR7uOuleJiWOE+XvSRFM9Sps9 GmQGzbjF3GdXwbg7ayQeBioTsaUMSAQ50F1uNygIplXq4KhKwz4YRT4HgFukV7ztYdPS DdUHluID/AC3OO5KjzNOUh50KKv9DnrLNTquF4Tm0/xJZD/qPczfiNIsIw/KJPqHpyJQ 94uGmzORsO27XMWvdNdWlZimWTCHvb2necD6Cyo0+fyuoUeTZjjUBHFQPFa9ePGchhFK XR1A== 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=yL6KzORqL9sjdoU+XxVB6/VpB2hIafJ5Xg1rFOCpaDU=; b=NKoxoc5QY+BL8AdPqaDRFLJRrcCmdoFIapOuPbSPID+jmWhdQkFcDfG97OMBEe+YTk UIeKV1dNWUnm+u/ZQaCIiEDNJUbWGlAwB/bSYoSxb4XireFnmi8FqGwgYczH5v5c1QSV f0X0AMdUOjBGbINyhsuBsUBba2K05JLsHfLBAc3iLm2Q+gIBFdi9aNl5CqTS14VKazTc RE79Tbmu1NM0O7fUqy36X2bR/4c2FffBzBu2ZbrWPkh9Rs5nyv5bTsej4wrKryU9mHLP GyX0FJACz5tR8g4/2QXbLwPyVg4XV37NXHJvJC+/eMEs3br6ul5ZZXEEEwiKpD+Q9lMY 49xw== 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 p37-20020a635b25000000b004fbd2a5db20si5217607pgb.538.2023.05.10.18.49.55; Wed, 10 May 2023 18:50: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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237037AbjEKBr4 (ORCPT + 99 others); Wed, 10 May 2023 21:47:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231183AbjEKBru (ORCPT ); Wed, 10 May 2023 21:47:50 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B31855BA9; Wed, 10 May 2023 18:47:49 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4QGvss3Czrz4f3jYH; Thu, 11 May 2023 09:47:45 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP2 (Coremail) with SMTP id Syh0CgA33eo_SVxkrgJdJA--.7260S5; Thu, 11 May 2023 09:47:46 +0800 (CST) From: Yu Kuai To: hch@lst.de, tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk, yukuai3@huawei.com Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next 1/6] blk-wbt: fix that wbt can't be disabled by default Date: Thu, 11 May 2023 09:45:04 +0800 Message-Id: <20230511014509.679482-2-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230511014509.679482-1-yukuai1@huaweicloud.com> References: <20230511014509.679482-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: Syh0CgA33eo_SVxkrgJdJA--.7260S5 X-Coremail-Antispam: 1UD129KBjvJXoW7Ww1Duw4UWrW3Zw48Cry5CFg_yoW8JFyfp3 WfGrW0kF92gr1UZ3W3Kw15X39xGF4vqr17GaySkw45Xr12kr9Fva9YkFyFqF1UZFs3GFZI vFnrXFWUZFyUX3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JU2_M3UUUUU = 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,T_SCC_BODY_TEXT_LINE 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?1765560612118411603?= X-GMAIL-MSGID: =?utf-8?q?1765560612118411603?= From: Yu Kuai commit b11d31ae01e6 ("blk-wbt: remove unnecessary check in wbt_enable_default()") removes the checking of CONFIG_BLK_WBT_MQ by mistake, which is used to control enable or disable wbt by default. Fix the problem by adding back the checking. Fixes: b11d31ae01e6 ("blk-wbt: remove unnecessary check in wbt_enable_default()") Reported-by: Lukas Bulwahn Link: https://lore.kernel.org/lkml/CAKXUXMzfKq_J9nKHGyr5P5rvUETY4B-fxoQD4sO+NYjFOfVtZA@mail.gmail.com/t/ Signed-off-by: Yu Kuai --- block/blk-wbt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index e49a48684532..b1ab4688eb5c 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -730,8 +730,9 @@ void wbt_enable_default(struct gendisk *disk) { struct request_queue *q = disk->queue; struct rq_qos *rqos; - bool disable_flag = q->elevator && - test_bit(ELEVATOR_FLAG_DISABLE_WBT, &q->elevator->flags); + bool disable_flag = (q->elevator && + test_bit(ELEVATOR_FLAG_DISABLE_WBT, &q->elevator->flags)) || + !IS_ENABLED(CONFIG_BLK_WBT_MQ); /* Throttling already enabled? */ rqos = wbt_rq_qos(q);