From patchwork Sat May 27 01:06:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Kuai X-Patchwork-Id: 99731 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp62990vqr; Fri, 26 May 2023 18:21:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ70HMj62s1d0MKJulOBvYO/wWaXySb184LsUZG8K8QxFYVD6qfX+lsVK7uFqvrSv+ND/QPh X-Received: by 2002:a05:6a00:2288:b0:63a:ea82:b7b7 with SMTP id f8-20020a056a00228800b0063aea82b7b7mr6653299pfe.28.1685150507956; Fri, 26 May 2023 18:21:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685150507; cv=none; d=google.com; s=arc-20160816; b=bei/AndnuC+duTH3UITsdWicgjrzrlua9WHgL3dTl/WBlLLRcAsL8CNdoVmUwnwhWz 5gYZmEkX/eIKRzMjhOEaNXGaegleKA1NxZb/1lPBTlQVOgCphGozfF4vTxtT+adGW3fj AHKypWCB80wGIiyJMW1ePuCCjcs+BHlzb+EUGTdu5cGr9ctI84BEVVjO6vB9IqJ41kNA mr2O4p2+VeTavib3r8BGzK7kMsMAvP8HlliVjOqLR6FDb7voLbwHUR8qd8g4m9kbcS3s vKSM/T1+WoYMgjcBa/TAx3uj95okfcAekFWIY5S64GAR71Y83jX1uav+vTZazpYK+a6D GIWA== 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=YIf72Ml2CN/wMDwm+9vEVETHDvM72keuGJvD3CM7Ze4=; b=LLWSmsWGpYMbDKMOZrFmxeF96Ih1+A+c9uYIoY0QgKTJ1AjOdNSs/Vmf8fL+8e+jVF 7Be6+OLncu+sof/PwUzRyWdVELnDZSe42hvTTVF+Dd3LP/yPtQ1L/O7VLwSGCZ/R7hHH YkYt2yKxWhYJxXv2MmPz+iahkwU5KToJ8Qt/Z8KkQ/vk2Xo2DCOmZzbc2e8DRX9VRvmm fX/yHNpkOjY3cKN1xdYMaYPJ1/kA2KPz7SR+qCZowz3TSYGPDe98gTkQ9iDn1yQjqXXt WRLuXyd6YAjlJPOSIG6opewvkWOrAS4n4yUFFlbLuAJun+Ro22ciKZH+U1kvMa0I1S8N 1lVw== 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 q24-20020aa79618000000b0063d289b8d47si2412520pfg.126.2023.05.26.18.21.36; Fri, 26 May 2023 18:21:47 -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 S237407AbjE0BKW (ORCPT + 99 others); Fri, 26 May 2023 21:10:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229977AbjE0BKT (ORCPT ); Fri, 26 May 2023 21:10:19 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3C27189; Fri, 26 May 2023 18:10:17 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4QSkH86Q3Mz4f3s5f; Sat, 27 May 2023 09:10:12 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.104.67]) by APP4 (Coremail) with SMTP id gCh0CgCH77J0WHFkNZwtKQ--.29147S6; Sat, 27 May 2023 09:10:14 +0800 (CST) From: Yu Kuai To: hch@lst.de, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com, yangerkun@huawei.com Subject: [PATCH -next v3 2/5] blk-wbt: remove dead code to handle wbt enable/disable with io inflight Date: Sat, 27 May 2023 09:06:41 +0800 Message-Id: <20230527010644.647900-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230527010644.647900-1-yukuai1@huaweicloud.com> References: <20230527010644.647900-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgCH77J0WHFkNZwtKQ--.29147S6 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr17uFyrCrWUWF4DuFW3Wrg_yoW8Xw15pr W3C34qkFsFqFn29anFqr4xXrWayw4kGryxGFW5CrZxZr1UCr1a9F97Wr109a4FvrWFkanI gr1I9FyrCF4rJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9m14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrwCFx2 IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v2 6r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67 AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IY s7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr 0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUc6pPUUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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?1767008378817682918?= X-GMAIL-MSGID: =?utf-8?q?1767008378817682918?= From: Yu Kuai enable or disable wbt is always called with queue freezed, so that wbt can never be enabled or disabled while io is still inflight, and this behaviour should always hold to avoid io hang(There have been reported several times). Therefor, the code to handle wbt enable/diskble with io inflight is not and never will be used, hence remove such dead code. Signed-off-by: Yu Kuai Reviewed-by: Christoph Hellwig --- block/blk-wbt.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 9ec2a2f1eda3..cb464c572840 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -200,15 +200,6 @@ static void wbt_rqw_done(struct rq_wb *rwb, struct rq_wait *rqw, inflight = atomic_dec_return(&rqw->inflight); - /* - * wbt got disabled with IO in flight. Wake up any potential - * waiters, we don't have to do more than that. - */ - if (unlikely(!rwb_enabled(rwb))) { - rwb_wake_all(rwb); - return; - } - /* * For discards, our limit is always the background. For writes, if * the device does write back caching, drop further down before we @@ -545,13 +536,6 @@ static inline unsigned int get_limit(struct rq_wb *rwb, blk_opf_t opf) { unsigned int limit; - /* - * If we got disabled, just return UINT_MAX. This ensures that - * we'll properly inc a new IO, and dec+wakeup at the end. - */ - if (!rwb_enabled(rwb)) - return UINT_MAX; - if ((opf & REQ_OP_MASK) == REQ_OP_DISCARD) return rwb->wb_background;