From patchwork Tue Oct 18 01:43:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 3867 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1728515wrs; Mon, 17 Oct 2022 18:41:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6uVEycPmbcArmcZ8jxF5ZHjBd/Dn/odddw0Ri4Ayon0F+C2nB41Nco46mEbL4PmObuT9X0 X-Received: by 2002:aa7:c054:0:b0:453:98c6:f6c4 with SMTP id k20-20020aa7c054000000b0045398c6f6c4mr464369edo.2.1666057300833; Mon, 17 Oct 2022 18:41:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666057300; cv=none; d=google.com; s=arc-20160816; b=NfHcM+Q37Xoh+WvZ/xFrKhcs8qGH9IY55X2bRPcJwL7wsYwVQplDWX39VVUGEHIfkY bEvb5Z2f18RLjQzDSzqGRfW/Tnl+5/yzdX73jGzthE2lf0tMUmIhLr8CbVTH4cm2Eu0p /hISwoR3SJ5xVuM2eQv34nw0R25C2YjlRwevpdJ09mBT6arSBksP2Ii7IV6mjlUk7S3C 5rqDYzreWzkROiwqWo+RoPX+vQcUKpTrlt8nBwZt8/D+zBb2UVa30BNiM/aglnGGAp1o 9X/3ByBoe7PDm8OdoCKusos5p9jP9vW2u95rnIc4cjY9rVk3ftFcz0zhMtFxJSLpATqk wZpQ== 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=uSOLkffTcF6qeT5v9T4I0vnGU2x1NrlUXveLmfWLiL8=; b=UDj5kmwkavwj9QxlJ/nnquiUd/x8vQInCa1clmlliO/X7j4rpDWhZJPeu9LyqubZ64 VUScq8ZHRNn499C0lggyQ1LY8bbrqx3cTRb7NURFg+INgBfUtFeC+NjmIHite6rweSe3 jmDKzM1rHllDfzoov+VPOrMLwrBMjLsF45YWVoruiruNJYqAoQYD0v79CyB+JFgNQ+6U ka1za/xIpXClxyj63+wPLXhJRC8KLSvEI1ESvKYE8R9Lo8iPcHhBA+TcCC7MEOjtfRlr 0+x9uyCzS9wRx7pmWidYuU8CqyYC65k3DZWgJ7QcrmcZsWCEc2Mu3L2xyjRHpPKpaL97 c15A== 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 qf38-20020a1709077f2600b007823754ecd5si11410549ejc.43.2022.10.17.18.41.14; Mon, 17 Oct 2022 18:41: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 S230229AbiJRBVq (ORCPT + 99 others); Mon, 17 Oct 2022 21:21:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230119AbiJRBVd (ORCPT ); Mon, 17 Oct 2022 21:21:33 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1DED7EFFD; Mon, 17 Oct 2022 18:21:28 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4MrwxP0NXNzKHXR; Tue, 18 Oct 2022 09:19:05 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgAXCzKR_01jxSkfAA--.17823S7; Tue, 18 Oct 2022 09:21:26 +0800 (CST) From: Yu Kuai To: gregkh@linuxfoundation.org, axboe@kernel.dk, yukuai3@huawei.com Cc: stable@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai1@huaweicloud.com, yi.zhang@hawei.com Subject: [PATCH 5.10 3/3] blk-wbt: fix that 'rwb->wc' is always set to 1 in wbt_init() Date: Tue, 18 Oct 2022 09:43:26 +0800 Message-Id: <20221018014326.467842-4-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221018014326.467842-1-yukuai1@huaweicloud.com> References: <20221018014326.467842-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXCzKR_01jxSkfAA--.17823S7 X-Coremail-Antispam: 1UD129KBjvJXoW7ur1kXw48KrWfJFW8CF4fGrg_yoW8Ar17pa yIk3yUGFWjgr4I93WxGa1ruFWDKan5AFy3Cr43Gw15Zay2vr4Uurs29FWUWrykZrZakFWa vr4furWqvFyUGaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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?1746987700041219755?= X-GMAIL-MSGID: =?utf-8?q?1746987700041219755?= From: Yu Kuai commit 285febabac4a16655372d23ff43e89ff6f216691 upstream. commit 8c5035dfbb94 ("blk-wbt: call rq_qos_add() after wb_normal is initialized") moves wbt_set_write_cache() before rq_qos_add(), which is wrong because wbt_rq_qos() is still NULL. Fix the problem by removing wbt_set_write_cache() and setting 'rwb->wc' directly. Noted that this patch also remove the redundant setting of 'rab->wc'. Fixes: 8c5035dfbb94 ("blk-wbt: call rq_qos_add() after wb_normal is initialized") Reported-by: kernel test robot Link: https://lore.kernel.org/r/202210081045.77ddf59b-yujie.liu@intel.com Signed-off-by: Yu Kuai Reviewed-by: Ming Lei Link: https://lore.kernel.org/r/20221009101038.1692875-1-yukuai1@huaweicloud.com Signed-off-by: Jens Axboe --- block/blk-wbt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index bafdb8098893..6f63920f073c 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -838,12 +838,11 @@ int wbt_init(struct request_queue *q) rwb->last_comp = rwb->last_issue = jiffies; rwb->win_nsec = RWB_WINDOW_NSEC; rwb->enable_state = WBT_STATE_ON_DEFAULT; - rwb->wc = 1; + rwb->wc = test_bit(QUEUE_FLAG_WC, &q->queue_flags); rwb->rq_depth.default_depth = RWB_DEF_DEPTH; rwb->min_lat_nsec = wbt_default_latency_nsec(q); wbt_queue_depth_changed(&rwb->rqos); - wbt_set_write_cache(q, test_bit(QUEUE_FLAG_WC, &q->queue_flags)); /* * Assign rwb and add the stats callback.