From patchwork Thu Feb 9 20:11:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54906 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298164wrn; Thu, 9 Feb 2023 04:13:53 -0800 (PST) X-Google-Smtp-Source: AK7set9Uxw9wvxnhiAdM2EUep0KTh6OJZ/OEsev8nkPhTHAtHiC94Ry8n5m0Hkj0NhvMHVd2UUrX X-Received: by 2002:a17:902:da83:b0:196:5b76:8e6e with SMTP id j3-20020a170902da8300b001965b768e6emr13088720plx.1.1675944833170; Thu, 09 Feb 2023 04:13:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944833; cv=none; d=google.com; s=arc-20160816; b=vELR2gPr3KuMGuOfZKtrNWvA5irPIU05VPk4jHavfVFKeP6MjDImELPc2CjLoeHLf9 dp1D2h0oaucD0CC+dffT81eLzIiq34dWEQRx9ZJ3QuCmYuOhJClyMr1Uk84NQhGjWrvW 6N8QxIb/AJTIetqX+VROj671J2+xpO0v5tlVNxLT00VTbso8j0AfsB58Lo0U7GpdQWwU uPjwonLxLIU2NCSr5zSl4zGMbSXof+umzceZ2TGiCJJTzRluuu4syXctv2oS3pFivA8u ObZ0j0uE8zjwjU4gjF9Vw7tpsH4d9BxxMD7LR05WbZ66xQsFP0m6WLbukbt+EcpH1FH+ w1RQ== 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=cXiui9/DfakaO6dteIFPR0V0j6MIemsq2bvjfI64mok=; b=stpWmbXKyFZ9DbLrriU8AEIcyQtuoaUDeGDCf5Dscq7h0TkXq8GXOIg4g10UmPR0V9 KdnQrsiO5kXLeoSh5jN23XeuQ6L+K1Twh83iCqcIabf9ShAxR34DC5TRQUNMNdiCRpec LxnjKbQX6g4UTxHWkhuyUrKd55erhzPYOxGHNdYJ8CfnyUx3NcgT6XB6Io2Tcf0++Ci1 f6jzfsoqvymlArzFruzlTDLMgn1nZtihxGxnVu0+U8pgGfWpJCAQIuzLdqJzT+kSi3Hj i0veu97ttNjrTmxy3eHMUF4zi5Ng0cM2FKhB06nHle8NwM1kX3qTxNZ+v9jMf0Fe+yoc 1eNg== 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 t7-20020a170902e84700b0019937768786si1782725plg.290.2023.02.09.04.13.40; Thu, 09 Feb 2023 04:13:53 -0800 (PST) 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 S230009AbjBIMLq (ORCPT + 99 others); Thu, 9 Feb 2023 07:11:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229571AbjBIMLN (ORCPT ); Thu, 9 Feb 2023 07:11:13 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 906FE4C31; Thu, 9 Feb 2023 04:09:21 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFyz2wPhz4f3l7J; Thu, 9 Feb 2023 20:09:15 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFr4uRj4rAuDQ--.53349S3; Thu, 09 Feb 2023 20:09:17 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, hch@lst.de, jack@suse.cz Cc: andriy.shevchenko@linux.intel.com, qiulaibin@huawei.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] blk-mq: sync wake_batch update and users number change Date: Fri, 10 Feb 2023 04:11:10 +0800 Message-Id: <20230209201116.579809-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209201116.579809-1-shikemeng@huaweicloud.com> References: <20230209201116.579809-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFr4uRj4rAuDQ--.53349S3 X-Coremail-Antispam: 1UD129KBjvJXoWxXF15ur4DGF17tryrAF4ktFb_yoW5WFyxpa y7ta17Kw1Fvry2qFW7JwsrXF4S9F4DKr13WrZaqa4rAw1Ykw1rur1kGrWkWrW0qr4kCr4x Aw47trZYyFsrAF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBYb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I 0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU0PPEDUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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?1757355529699389452?= X-GMAIL-MSGID: =?utf-8?q?1757355529699389452?= Commit 180dccb0dba4f ("blk-mq: fix tag_get wait task can't be awakened") added recalculation of wake_batch when active_queues changes to avoid io hung. Function blk_mq_tag_idle and blk_mq_tag_busy can be called concurrently, then wake_batch maybe updated with old users number. For example, if tag alloctions for two shared queue happen concurrently, blk_mq_tag_busy maybe executed as following: thread1 thread2 atomic_inc_return atomic_inc_return blk_mq_update_wake_batch blk_mq_update_wake_batch 1.Thread1 adds active_queues from zero to one. 2.Thread2 adds active_queues from one to two. 3.Thread2 calculates wake_batch with latest active_queues number two. 4.Thread1 calculates wake_batch with stale active_queues number one. Then wake_batch is inconsistent with actual active_queues. If wake_batch is calculated with active_queues number smaller than actual active_queues number, wake_batch will be greater than it supposed to be and cause io hung. Sync wake_batch update and users number change to keep wake_batch consistent with active_queues to fix this. Fixes: 180dccb0dba4 ("blk-mq: fix tag_get wait task can't be awakened") Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/blk-mq-tag.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 9eb968e14d31..1d3135acfc98 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -39,7 +39,9 @@ static void blk_mq_update_wake_batch(struct blk_mq_tags *tags, */ void __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx) { + struct blk_mq_tags *tags = hctx->tags; unsigned int users; + unsigned long flags; if (blk_mq_is_shared_tags(hctx->flags)) { struct request_queue *q = hctx->queue; @@ -53,9 +55,11 @@ void __blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx) set_bit(BLK_MQ_S_TAG_ACTIVE, &hctx->state); } - users = atomic_inc_return(&hctx->tags->active_queues); + spin_lock_irqsave(&tags->lock, flags); + users = atomic_inc_return(&tags->active_queues); - blk_mq_update_wake_batch(hctx->tags, users); + blk_mq_update_wake_batch(tags, users); + spin_unlock_irqrestore(&tags->lock, flags); } /* @@ -76,6 +80,7 @@ void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx) { struct blk_mq_tags *tags = hctx->tags; unsigned int users; + unsigned long flags; if (blk_mq_is_shared_tags(hctx->flags)) { struct request_queue *q = hctx->queue; @@ -88,9 +93,11 @@ void __blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx) return; } + spin_lock_irqsave(&tags->lock, flags); users = atomic_dec_return(&tags->active_queues); blk_mq_update_wake_batch(tags, users); + spin_unlock_irqrestore(&tags->lock, flags); blk_mq_tag_wakeup_all(tags, false); } From patchwork Thu Feb 9 20:11:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54907 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298210wrn; Thu, 9 Feb 2023 04:13:58 -0800 (PST) X-Google-Smtp-Source: AK7set/bQ/wD+5LRJNswHHghA8+jYcRCaJidIpsjxEtzQlM2Ei6T+t3tNej4T0JRV03hBS0bGdXj X-Received: by 2002:a17:902:e881:b0:199:4d25:6a4d with SMTP id w1-20020a170902e88100b001994d256a4dmr4646470plg.10.1675944838419; Thu, 09 Feb 2023 04:13:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944838; cv=none; d=google.com; s=arc-20160816; b=iJDu2drxg88sdLspZh12wBSpOL66lwkHlSm8kI2bgMU4CL2WbPpX3+S08cA2ohuRC6 YFnDX/RSO1WogqSKcugiT3eZ8mqkb99gyI8hqpYOAUz2trkKcPDlRKmReranx46S/Zox rIckG8ACN+iWV5u6OEbZeiOaKV3315e9Fp70SgiVD+q93dPsJ1U9sKj7SLotHxL4fERy PBe3yD/bLvLWJ5v31mtREuqWSkq//z5hYgWaZMPGwUvJrNiTB82IUeUG1rSGYmA0Mrr7 j7eztfRVm4wCiIkwCQFL2RO+mZ6YBxW7JNtL204EAqMHSzeHSxXTWnagdsilXS6+ywBH T0GA== 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=OOtM+X5/jViqFTq8V0TFIeiSlSb5o8vpNcDxHfGU+5Y=; b=VABMi5nB/ADOkn1CazVMejqTy92VNddn+ThMZDzv4bncfJ/WM7L4AK02syOW6Y/pHz G6lyzR+zLxEB7p/c+ak7qgFWiM+AJwO9ozKChy6xo1DXHWksBgT0Gx7/UxCVDnKU2rR9 8jkD/QFvVC72SroP6pOsD4ADmB75AZYo+tnFNDk/HsY8tAdWgrEtozrYil+fWuJ72lm7 DyTC2IziS5K7IUmk1vPJIpJMkyNp1CHIweNoqoocfw9JmNRM+CzzE3L6CzO3wM6gMMBG gMRFKlul9WWXBgh1HE2Na1V2ARuHjG7vYrzG8hy2ha2/y4oHVKLJ3di8rv6bCgQCxD6r QQlw== 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 g2-20020a636b02000000b004cee5a04b5esi1910124pgc.143.2023.02.09.04.13.45; Thu, 09 Feb 2023 04:13:58 -0800 (PST) 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 S229628AbjBIMLv (ORCPT + 99 others); Thu, 9 Feb 2023 07:11:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229721AbjBIMLN (ORCPT ); Thu, 9 Feb 2023 07:11:13 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 907A57A9B; Thu, 9 Feb 2023 04:09:21 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4PCFyz5cttz4f3mJK; Thu, 9 Feb 2023 20:09:15 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFr4uRj4rAuDQ--.53349S4; Thu, 09 Feb 2023 20:09:18 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, hch@lst.de, jack@suse.cz Cc: andriy.shevchenko@linux.intel.com, qiulaibin@huawei.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] blk-mq: count changed hctx as active in blk_mq_get_tag Date: Fri, 10 Feb 2023 04:11:11 +0800 Message-Id: <20230209201116.579809-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209201116.579809-1-shikemeng@huaweicloud.com> References: <20230209201116.579809-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFr4uRj4rAuDQ--.53349S4 X-Coremail-Antispam: 1UD129KBjvJXoW7AFyUZw15ury7ZFy7XryUGFg_yoW8Xr4kp3 yrta1UKw1ftr4qvF48Gay7Zr1UKan7Wr45J3Z3Xw1rZryDK34Sgw4v9w18ta4FvrZ3CrW3 Zw1jkrW5tF98C37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBYb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW5JVW7JwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I 0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IUnwa9DUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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?1757355535025568291?= X-GMAIL-MSGID: =?utf-8?q?1757355535025568291?= Commit d263ed9926823 ("blk-mq: count the hctx as active before allocating tag") active hctx before blk_mq_get_tag to avoid petential starvation. However, the hctx to alloc tag may change in blk_mq_get_tag if BLK_MQ_REQ_NOWAIT is not set, then there are two problems: 1. The hctx without real allocation is marked active. 2. The starvation problem mentioned in Commit d263ed9926823 ("blk-mq: count the hctx as active before allocating tag") still exists on the changed hctx as it maybe not marked active before tag allocation. For problem 1, the hctx which is marked active probably gets IO soon or will be marked inactive after lazy detection of tag idle. Mark changed hctx active to fix problem 2. Fixes: d263ed992682 ("blk-mq: count the hctx as active before allocating tag") Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/blk-mq-tag.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 1d3135acfc98..e566fd96dc26 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -191,6 +191,9 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) data->ctx = blk_mq_get_ctx(data->q); data->hctx = blk_mq_map_queue(data->q, data->cmd_flags, data->ctx); + if (!(data->rq_flags & RQF_ELV)) + blk_mq_tag_busy(data->hctx); + tags = blk_mq_tags_from_data(data); if (data->flags & BLK_MQ_REQ_RESERVED) bt = &tags->breserved_tags; From patchwork Thu Feb 9 20:11:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54909 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298387wrn; Thu, 9 Feb 2023 04:14:14 -0800 (PST) X-Google-Smtp-Source: AK7set+fEFo3B75pEMwErBhX+dLUD1LM/67GxvXi5TllZ8crCtUep7kSEALl4j+Uxu+ufrzuO3lE X-Received: by 2002:a17:90a:313:b0:230:c87e:2b2d with SMTP id 19-20020a17090a031300b00230c87e2b2dmr11990093pje.40.1675944854393; Thu, 09 Feb 2023 04:14:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944854; cv=none; d=google.com; s=arc-20160816; b=r8eVcQWhneWyZWiabP2mHwexu4x/vVtD/qHMn2wdNj18MBhnW0Rmkl9XX4iVYUVk3s K3Scn24Qpcp76rASPsSSB8z4TKGsM4UnWoNQyk3TZJCUZI1/59hiuSmYGRlFC0NhsReY XTHgRcNj11ZAW0erYh+r6idaPltXRBiUTTX/PP6NkfTaiZSbXcCRw6sIQzZ7mlp752rr KJnv7YyaP/JUlxX0NQsMXEu2LqhpEJrv/pamBzRiewLpqpUD1fqYK0r5ebWfLpeifYXs 9weObCjDT+AJ1rFKZDs5fwwn1w3lNoqSv1cxhVbdTPgXsLtn6+Ug0YcTssoUQsY9zxfE MY9A== 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=VSOIdyBAcmjsoWx9sPpzfUfNq5O84Fi3I7YV8TRm4YQ=; b=sPW3gw3BFrqL9K2SLk3BVQPTaNWDors2+jCVnI+7QrPRJ8cSgqtv7N5JZfE3wTGUAz WgEQtihT7udcDFzyVDv9n6R4t8YYidKFsp/Pa3x6ilpBm3VPF3bklD/YchqWW6AEs4iz r7uIHBN6BwZ6gJmB6xwtEvyEHykNhj0DiZ8A3X75IlF5VlOaa6rLzKxGsCVjbhFi9iOR 7amPwwlFSJlFbY97zbG6e0hh3Qa3NZGmwvUR8qrgPuCY/ORMTRFCHvVb60PKXMAv3O2p vgR04aMlM+Z5Zo1CVPu8jpjV2reGp4Xdjr5jMsiu/t1xgmNjD5PihY2HsvRPFmZmOAwZ jRXA== 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 p3-20020a637403000000b004df0d68adf2si1698512pgc.629.2023.02.09.04.13.59; Thu, 09 Feb 2023 04:14:14 -0800 (PST) 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 S229586AbjBIMLy (ORCPT + 99 others); Thu, 9 Feb 2023 07:11:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229461AbjBIMLN (ORCPT ); Thu, 9 Feb 2023 07:11:13 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9091086A8; Thu, 9 Feb 2023 04:09:21 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFz02C9Lz4f3m6j; Thu, 9 Feb 2023 20:09:16 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFr4uRj4rAuDQ--.53349S5; Thu, 09 Feb 2023 20:09:18 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, hch@lst.de, jack@suse.cz Cc: andriy.shevchenko@linux.intel.com, qiulaibin@huawei.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] blk-mq: remove wake_batch recalculation for reserved tags Date: Fri, 10 Feb 2023 04:11:12 +0800 Message-Id: <20230209201116.579809-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209201116.579809-1-shikemeng@huaweicloud.com> References: <20230209201116.579809-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFr4uRj4rAuDQ--.53349S5 X-Coremail-Antispam: 1UD129KBjvdXoW7XF4rWF45tr4xur13tF18Zrb_yoWkKFb_Wr 9rCa1ktFZ7ZFn3u3WjvF13trsYk3ykJry8Gan0qrZIkrn7JF95G390ka1FqFZxGFW8ur9x KF1kXw4jkrn7ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfkYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r1rM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUIq2MUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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?1757355551290536252?= X-GMAIL-MSGID: =?utf-8?q?1757355551290536252?= Commit 180dccb0dba4f ("blk-mq: fix tag_get wait task can't be awakened") added wake_batch recalculation when user number of shared tags changes to avoid hung as user number increases, then hctx_max_depth limit for a single user decreases and may trigger hung if wake_batch > hctx_max_depth is met. Commit 285008501c65a ("blk-mq: always allow reserved allocation in hctx_may_queue") removed hctx_max_depth limit to alloc reserved tags, so hctx_max_depth limit for reserved tags is not exisiting anymore so we can remove recalculation for reserved tags. Fixes: 285008501c65 ("blk-mq: always allow reserved allocation in hctx_may_queue") Signed-off-by: Kemeng Shi --- block/blk-mq-tag.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index e566fd96dc26..7f1777dc11e5 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -27,8 +27,6 @@ static void blk_mq_update_wake_batch(struct blk_mq_tags *tags, sbitmap_queue_recalculate_wake_batch(&tags->bitmap_tags, users); - sbitmap_queue_recalculate_wake_batch(&tags->breserved_tags, - users); } /* From patchwork Thu Feb 9 20:11:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298105wrn; Thu, 9 Feb 2023 04:13:45 -0800 (PST) X-Google-Smtp-Source: AK7set/UiiTjoUiORpw5k7+4Dme8WqDrHwhDMTq7ob5oq0iwQlUBQYkHT2dYfg5FgTEtORTrfzhG X-Received: by 2002:a05:6a20:42a0:b0:bf:51a0:2a06 with SMTP id o32-20020a056a2042a000b000bf51a02a06mr13199375pzj.10.1675944825691; Thu, 09 Feb 2023 04:13:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944825; cv=none; d=google.com; s=arc-20160816; b=v6y2aw7InSHC0nFdG6cAFFxs6zM0gJPnJXcB6XszcPL6KyryV3IU/VKrFkktby79as UeOKwkVzwj/lrq/LWHdV5Wif8RU5h+n/K5W8R2t4I16i4qX7YDeb6DXjxGZ4/v6RUQk1 Wz+w4kdKN1NUSY6k7DBkwYZZPDd6EsgSV0Jlyt/eL9ZMPVJSBeDSWT4rDKIycoqyZxGD GMc8AoaqhOjHSGf659WL1jTNz/FWsC0uq0yL5fhaFXK/qcVWc7A91XCcT1ft+Rt9Rl+n SSKmfE0mj1ucx3pjHeiC1UpQqTaZr++BwTPm/0rpkdF3M8NNGsz88ciiL1N1sqpEp0XT q9GA== 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=7T1Lv5QpNH3KlaWdvhw3+dsuhkXznLhiDtxKx3OCPlE=; b=lsWEhKLBAuGyvsU5lGvecjywtFkOMXL15N3XK3DIPle/UfTxjKZPXQ9CJk/EhFXSyE dVogjSgwA+1qOnDG8Pq5IxmbpgC5UJ1vymdc7aEuXBBjev3Jf+sjhvu2OQZLlGygLmcE vqMoTuxao0LfcRfO9z62BKPH7WoXZ9SgBnnSSBvxooM41yUWky+qH90EWLfRE8NnX3dD 3d8JZmU8KNQ9Hepv3BEx3qhlC8d8V+oBm2+K6V99LOrLfeIHzNSujRIVZZaEzQu5gBsr yixa1Bzxq9ikbnvh5wdFEN5WvWrh2jnB3bgNiNi1cUFaTPxXcup68cXeQXIS154ZCLp3 0xqw== 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 m2-20020a638c02000000b00479018c4634si1834895pgd.671.2023.02.09.04.13.33; Thu, 09 Feb 2023 04:13:45 -0800 (PST) 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 S229967AbjBIMLn (ORCPT + 99 others); Thu, 9 Feb 2023 07:11:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229646AbjBIMLM (ORCPT ); Thu, 9 Feb 2023 07:11:12 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 905EF40FE; Thu, 9 Feb 2023 04:09:21 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFz04Pxbz4f3jZX; Thu, 9 Feb 2023 20:09:16 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFr4uRj4rAuDQ--.53349S6; Thu, 09 Feb 2023 20:09:18 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, hch@lst.de, jack@suse.cz Cc: andriy.shevchenko@linux.intel.com, qiulaibin@huawei.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] blk-mq: remove unnecessary bit clear in __blk_mq_alloc_requests_batch Date: Fri, 10 Feb 2023 04:11:13 +0800 Message-Id: <20230209201116.579809-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209201116.579809-1-shikemeng@huaweicloud.com> References: <20230209201116.579809-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFr4uRj4rAuDQ--.53349S6 X-Coremail-Antispam: 1UD129KBjvdXoW7XrWkZrWrurWrWFy8tw13urg_yoWxArX_W3 Wjkr1xZFZ8CF4fCrs0ka4rtr4jk395Ary2ka4kKrZIva1xJFn3ArsxWr4Ykwsxuay7C34r Gw1UXr18JF1ktjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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?1757355521686901600?= X-GMAIL-MSGID: =?utf-8?q?1757355521686901600?= Bits in tag_mask will not be accessed after it's cleared. So we can remove this unnecessary clear. Signed-off-by: Kemeng Shi --- block/blk-mq.c | 1 - 1 file changed, 1 deletion(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 89b4dd81ae17..6014d9b5e296 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -456,7 +456,6 @@ __blk_mq_alloc_requests_batch(struct blk_mq_alloc_data *data, continue; tag = tag_offset + i; prefetch(tags->static_rqs[tag]); - tag_mask &= ~(1UL << i); rq = blk_mq_rq_ctx_init(data, tags, tag, alloc_time_ns); rq_list_add(data->cached_rq, rq); nr++; From patchwork Thu Feb 9 20:11:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54908 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298368wrn; Thu, 9 Feb 2023 04:14:14 -0800 (PST) X-Google-Smtp-Source: AK7set94DylsoWEiUGwOD7i8nq6bLj6oJMdj00m6a/sp8TEgfat4JpqzKo6GdPusBchsbvgpwYpU X-Received: by 2002:a62:64c7:0:b0:5a8:4ba7:5842 with SMTP id y190-20020a6264c7000000b005a84ba75842mr3955845pfb.30.1675944853826; Thu, 09 Feb 2023 04:14:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944853; cv=none; d=google.com; s=arc-20160816; b=rdf27tWFZiBdSyynTS6PD1xifeEDIGH25dP7FRSZ0betEi0KeG43utqV2P5B+KVKgg f2P1tdbaAY80vtFFH+8Sca3WbjuZn7ooCMOgnYOVDOHNv+s+ESbqPU9Xm/yQNpbbm+Yt gStTWv5jn3qTGTdxL4jniHKUB8zFeA63JJVvOIqL7JzY6zCqhfc/8FNDO28d+Y2Gn/vB bTBlU7nDCj3iLyrvWF4sAdm+BZkl6Kvff7wx7tat8wFkrxYh4CUPEsFsHaEeM7cSGC3g AZRQpHXsVDGYXuzDDxw8LNSX2RVxUU/xGa1G8UYCQ2etAWdWjdYS3RDw9oVLpq6c0hsj y/Cw== 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=c766LZTlj9Hv9IniFGHXpMZ4VHi1MobeSyRfAxubx8Y=; b=p4rH3zquz/45aOsqd3sEmzbYgEs9TOBMFAGgcrzqoukYDUF5FhawtoyvzE+oYjCXtu jLk+m0ht5nlNChO1mImzra1cWFdAjJE6tEp9uqTBoUutDJ5WTAMZciqv7CHQUT0rcEcu QcIunttw5F/7sHEWj9Z1lTMZIFv2kXJu6VnPbEzDK7qUCoGTWwS8xnBN6VkOdO2toc1j ZA4wOuSMyCEMm7PAL37UArHdhwHPniS4vv96q1LF/1qzFA2tyK3UNmbYNmSDM5ZGg9t7 JkOvkMd/3plcXoToSoNZNis0JTxfYxscXtGJ2aDvaKMPP0SQHRqZG9iiBXEVPS1D3qPA xO/g== 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 y24-20020aa79af8000000b0057d34473bc6si1628168pfp.147.2023.02.09.04.14.01; Thu, 09 Feb 2023 04:14:13 -0800 (PST) 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 S229862AbjBIML5 (ORCPT + 99 others); Thu, 9 Feb 2023 07:11:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229698AbjBIMLO (ORCPT ); Thu, 9 Feb 2023 07:11:14 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD505B461; Thu, 9 Feb 2023 04:09:21 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFz074J6z4f3jZj; Thu, 9 Feb 2023 20:09:16 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFr4uRj4rAuDQ--.53349S7; Thu, 09 Feb 2023 20:09:19 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, hch@lst.de, jack@suse.cz Cc: andriy.shevchenko@linux.intel.com, qiulaibin@huawei.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] blk-mq: remove unnecessary "set->queue_depth == 0" check in blk_mq_alloc_set_map_and_rqs Date: Fri, 10 Feb 2023 04:11:14 +0800 Message-Id: <20230209201116.579809-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209201116.579809-1-shikemeng@huaweicloud.com> References: <20230209201116.579809-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFr4uRj4rAuDQ--.53349S7 X-Coremail-Antispam: 1UD129KBjvJXoW7ArWxAr47WF4xJw4fCrWrAFb_yoW8JF4kpr 4rJF1kGa4IgrsYkrW2kay7WF1jk398Wr4UJF4Sq345ArZrKrWa9F4rJF4jqryxZrZ3Cw4j 93y5K3yDXa1UGaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7IU0TqcUUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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?1757355551146613631?= X-GMAIL-MSGID: =?utf-8?q?1757355551146613631?= We will break the loop and set err to -ENOMEM if "set->queue_depth" is less than "set->reserved_tags + BLK_MQ_TAG_MIN". set->reserved_tags is unsigned int and should not be less than 0 logically. BLK_MQ_TAG_MIN is 1 and should be greater than 0 logically. So "set->reserved_tags + BLK_MQ_TAG_MIN" should be greater than 0. For case set->queue_depth is halved to zero, "set->queue_depth < set->reserved_tags + BLK_MQ_TAG_MIN" check is always met first, then this branch will set err to -ENOMEM and break the loop. Then the loop break condition "while(set->queue_depth)" is never met and set->queue_depth check in "if (!set->queue_depth || err)" is redundant. Just remove these checks. Signed-off-by: Kemeng Shi --- block/blk-mq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 6014d9b5e296..4d2ab01549cd 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -4324,9 +4324,9 @@ static int blk_mq_alloc_set_map_and_rqs(struct blk_mq_tag_set *set) err = -ENOMEM; break; } - } while (set->queue_depth); + } while (true); - if (!set->queue_depth || err) { + if (err) { pr_err("blk-mq: failed to allocate request map\n"); return -ENOMEM; } From patchwork Thu Feb 9 20:11:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54910 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298394wrn; Thu, 9 Feb 2023 04:14:16 -0800 (PST) X-Google-Smtp-Source: AK7set8/mQoerMAyK1rWT4gZy0qINV3PqIMBsA1yOdeHKogHFoHTBlPAHZSedLVilLLR8XsZDojw X-Received: by 2002:a17:90b:3145:b0:230:c14d:54c1 with SMTP id ip5-20020a17090b314500b00230c14d54c1mr12146399pjb.11.1675944856112; Thu, 09 Feb 2023 04:14:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944856; cv=none; d=google.com; s=arc-20160816; b=viq03h2WUOGixXpzu7JGMFmY9DYGFSpnMDstiKtw+MzGTiRGTs7JX9PV5OtgzLozwn G6ijGuju0dwy0R13FuH2mjS3WJNnCpEPcwx637fbG/RHQELVBbEIHDr7eZpfXG3OHDEO JxIEWBNsSLHKO6qxkXwkNauqOaoQX0+BsRZMXvbOVDMShuq0H883HRmQe2M1/5t8GWPr nR1MGHu4r6GbUwHHFrug1E8OxpxbQxtzhAQBwnKaEQ29PPaMdqVIMWgQEy5MU4OgIy92 n66seLxrKb98QBpsUZUxHpBLoFyRArhha81etzViejcKZkqm9px3qTEQmUL78+wnxXWQ pb+g== 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=CcUokz5G6XMa+6jNShXbFBYhk/MmdLrGT5U6Gu7dDfI=; b=dWraqf+3GLRPwc16OVi02UHLDSyeCS2YGLGO8p4II07JkVJw7Oxg3YBWU14gN5Gbn6 fSprQvwgHnsglw9r44/moyhMtc7377uGsEMg81D1ctBLysMVckUskk8hze4c03HuOHll 3afUnzCEMCrTbjxr2W0SPpHUsWyEx3VwsQb2tKlK3jwtbobmwxx9cEWgZuqliQu0x8V1 V/95OQq36bh2ekalwiA8ECuffrwriUW6cjwUxXR5InYgfu/arfkWiU04XOb4H4TDTHgq B6yBkK/smjx7SneBaoj6JH1wMHAHMT69r1vIfyvj56p+Gplk8iSDmwUqwS5fnMAVPheR Qqeg== 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 gf18-20020a17090ac7d200b0022c24bf1810si1735272pjb.29.2023.02.09.04.14.03; Thu, 09 Feb 2023 04:14:16 -0800 (PST) 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 S230076AbjBIMMA (ORCPT + 99 others); Thu, 9 Feb 2023 07:12:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229765AbjBIMLO (ORCPT ); Thu, 9 Feb 2023 07:11:14 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A8BB2D41; Thu, 9 Feb 2023 04:09:22 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFz135z3z4f3m7G; Thu, 9 Feb 2023 20:09:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFr4uRj4rAuDQ--.53349S8; Thu, 09 Feb 2023 20:09:19 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, hch@lst.de, jack@suse.cz Cc: andriy.shevchenko@linux.intel.com, qiulaibin@huawei.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] blk-mq: Remove unnecessary hctx check in function blk_mq_alloc_and_init_hctx Date: Fri, 10 Feb 2023 04:11:15 +0800 Message-Id: <20230209201116.579809-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209201116.579809-1-shikemeng@huaweicloud.com> References: <20230209201116.579809-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFr4uRj4rAuDQ--.53349S8 X-Coremail-Antispam: 1UD129KBjvdXoWrZryDur47Ary3CF1kWFyUZFb_yoWxKrg_ua 4Ivr18XF4DAFyfCr4jka40yF17Crs5Xw12kryIkry7tF18GFyqkw4rWr15Z39xWFW7C393 Wr1kXry7Gr1fWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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?1757355553468356796?= X-GMAIL-MSGID: =?utf-8?q?1757355553468356796?= We can remove hctx from list when a valid hctx is found to avoid extra valid check. Signed-off-by: Kemeng Shi --- block/blk-mq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 4d2ab01549cd..1aa3cdc55c4e 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -4121,11 +4121,10 @@ static struct blk_mq_hw_ctx *blk_mq_alloc_and_init_hctx( list_for_each_entry(tmp, &q->unused_hctx_list, hctx_list) { if (tmp->numa_node == node) { hctx = tmp; + list_del_init(&hctx->hctx_list); break; } } - if (hctx) - list_del_init(&hctx->hctx_list); spin_unlock(&q->unused_hctx_lock); if (!hctx) From patchwork Thu Feb 9 20:11:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 54911 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp298393wrn; Thu, 9 Feb 2023 04:14:16 -0800 (PST) X-Google-Smtp-Source: AK7set+FlGT9ItqkR7VisJ5ar/wPbY3eRUlDTsNv5uNxNJ2HwaZPbQxmA+4mIozWiijqmz87x3wD X-Received: by 2002:a62:1787:0:b0:5a8:4e9c:32a9 with SMTP id 129-20020a621787000000b005a84e9c32a9mr2593341pfx.32.1675944856118; Thu, 09 Feb 2023 04:14:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675944856; cv=none; d=google.com; s=arc-20160816; b=ec5jmxZ7px0E64AycG4klh1wwcF4otT8ucpyM+A1SKUHid0Th9tqXe6oSBxmhnZPQA 6vLyr6IjOhknK48D6qggd61UtRcwRa080P1x31nnsbbWxZb0cGs/2Jnf+MdLsSjwQdcG 3eQBg2uZqENoKqkITMb0Gjnh0tWeZsPv/aQ3/lnWciolIaqvq7CRLG+AQMw2/PtVgZ9S ch0V2UCXpOIO2cPJOf5q6gXxQFsPjd/cO55EBp8+xd+zF394EMuZ3fbXTHRhDhhhFkxu vo1pTV+PUNPTT4MBe9lyBaQaMXoELuFeTyGZmHzqmvi1UrQgE1xsIIFmwRkR3kA94T8J 4EyA== 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=EFhrrOiOc0V5xiT/F85Otb4topHDSGlffRFDiXjPwpo=; b=sG9jNQSVIsu0Gu2mb+CPzsZzXrucGegbDFIp6FMXetpqpAumJVZ4sp+Xme0r2R0TFt vtPhwwHm0rSNm+Oy1J53xRcfC5gdpJiD2IbIRVCY10tq2e1h5vtfLm1qP7Hap2nE61ET hPHe8xabvwRjBfpGKZyjjtljwTrbu0O+FaZRAIbbtrftzPgemcbq+u/J0EKZttGUEoqa YO6wkSHQ1soZ0oDGEd/5kFTi+G/T53Lwe3hz5bGC3KdPKQqhYQkBunzG3cwCAoJiA4B9 Tet7RT0YqGtR8cS1Z7tPsapu8O9jGiafN2R4SSFF2/koC+iwr16yMw+R7R4eMwaKJr3Z JOmw== 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 t126-20020a625f84000000b00593e4fbaa3esi1551730pfb.69.2023.02.09.04.14.03; Thu, 09 Feb 2023 04:14:16 -0800 (PST) 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 S230246AbjBIMME (ORCPT + 99 others); Thu, 9 Feb 2023 07:12:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbjBIMLP (ORCPT ); Thu, 9 Feb 2023 07:11:15 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EEAED50B; Thu, 9 Feb 2023 04:09:23 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PCFz15pJ3z4f3m7Y; Thu, 9 Feb 2023 20:09:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrFr4uRj4rAuDQ--.53349S9; Thu, 09 Feb 2023 20:09:19 +0800 (CST) From: Kemeng Shi To: axboe@kernel.dk, hch@lst.de, jack@suse.cz Cc: andriy.shevchenko@linux.intel.com, qiulaibin@huawei.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] blk-mq: remove stale comment of function called for iterated request Date: Fri, 10 Feb 2023 04:11:16 +0800 Message-Id: <20230209201116.579809-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230209201116.579809-1-shikemeng@huaweicloud.com> References: <20230209201116.579809-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrFr4uRj4rAuDQ--.53349S9 X-Coremail-Antispam: 1UD129KBjvJXoWxZrWUWFy7uF4fKw1fGryDWrg_yoWrCF4DpF Wava1vkr4Fqr1xCr4DA3y8Cr95urs3trnrGan3t34F9wn0krs5Xr4DKrW8Xr4jkF48uay8 Ars0y34kuw1DX3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJw A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aV CY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, 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?1757355553657504035?= X-GMAIL-MSGID: =?utf-8?q?1757355553657504035?= We call function with type "bool (busy_tag_iter_fn)(struct request *, void *)" for each iterated request now. Remove the stale arguments @hctx and @reserved in comment which are not needed by iterate function. Signed-off-by: Kemeng Shi --- block/blk-mq-tag.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 7f1777dc11e5..f1187c901019 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -303,9 +303,9 @@ static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) * or the bitmap_tags member of struct blk_mq_tags. * @fn: Pointer to the function that will be called for each request * associated with @hctx that has been assigned a driver tag. - * @fn will be called as follows: @fn(@hctx, rq, @data, @reserved) - * where rq is a pointer to a request. Return true to continue - * iterating tags, false to stop. + * @fn will be called as follows: @fn(@rq, @data) where rq is a + * pointer to a request. Return true to continue iterating tags, + * false to stop. * @data: Will be passed as third argument to @fn. * @reserved: Indicates whether @bt is the breserved_tags member or the * bitmap_tags member of struct blk_mq_tags. @@ -372,9 +372,9 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) * @bt: sbitmap to examine. This is either the breserved_tags member * or the bitmap_tags member of struct blk_mq_tags. * @fn: Pointer to the function that will be called for each started - * request. @fn will be called as follows: @fn(rq, @data, - * @reserved) where rq is a pointer to a request. Return true - * to continue iterating tags, false to stop. + * request. @fn will be called as follows: @fn(rq, @data) where + * rq is a pointer to a request. Return true to continue + * iterating tags, false to stop. * @data: Will be passed as second argument to @fn. * @flags: BT_TAG_ITER_* */ @@ -407,10 +407,9 @@ static void __blk_mq_all_tag_iter(struct blk_mq_tags *tags, * blk_mq_all_tag_iter - iterate over all requests in a tag map * @tags: Tag map to iterate over. * @fn: Pointer to the function that will be called for each - * request. @fn will be called as follows: @fn(rq, @priv, - * reserved) where rq is a pointer to a request. 'reserved' - * indicates whether or not @rq is a reserved request. Return - * true to continue iterating tags, false to stop. + * request. @fn will be called as follows: @fn(rq, @priv) + * where rq is a pointer to a request. Return true to + * continue iterating tags, false to stop. * @priv: Will be passed as second argument to @fn. * * Caller has to pass the tag map from which requests are allocated. @@ -425,10 +424,9 @@ void blk_mq_all_tag_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn, * blk_mq_tagset_busy_iter - iterate over all started requests in a tag set * @tagset: Tag set to iterate over. * @fn: Pointer to the function that will be called for each started - * request. @fn will be called as follows: @fn(rq, @priv, - * reserved) where rq is a pointer to a request. 'reserved' - * indicates whether or not @rq is a reserved request. Return - * true to continue iterating tags, false to stop. + * request. @fn will be called as follows: @fn(rq, @priv) where + * rq is a pointer to a request. Return true to continue + * iterating tags, false to stop. * @priv: Will be passed as second argument to @fn. * * We grab one request reference before calling @fn and release it after @@ -484,10 +482,9 @@ EXPORT_SYMBOL(blk_mq_tagset_wait_completed_request); * blk_mq_queue_tag_busy_iter - iterate over all requests with a driver tag * @q: Request queue to examine. * @fn: Pointer to the function that will be called for each request - * on @q. @fn will be called as follows: @fn(hctx, rq, @priv, - * reserved) where rq is a pointer to a request and hctx points - * to the hardware queue associated with the request. 'reserved' - * indicates whether or not @rq is a reserved request. + * on @q. @fn will be called as follows: @fn(rq, @priv) where + * rq is a pointer to a request. Return true to continue + * iterating tags, false to stop. * @priv: Will be passed as third argument to @fn. * * Note: if @q->tag_set is shared with other request queues then @fn will be