From patchwork Mon Jan 16 09:51:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977168wrn; Sun, 15 Jan 2023 17:56:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXvkU1EXrmzDR5kkHkE5EV4dYO0zR/lqD7wAmjL8qIFPkQmi1j7xrEGXAnfX2TATWz9+VlDX X-Received: by 2002:a17:902:6906:b0:194:6e70:8eea with SMTP id j6-20020a170902690600b001946e708eeamr11453072plk.7.1673834159920; Sun, 15 Jan 2023 17:55:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834159; cv=none; d=google.com; s=arc-20160816; b=LmAYITpUNsEvSOfDFDt1PJ+I2813ziEc97jIk3LEz8rrXttMQHPUoInpEmHTGuZd3H lB+qJWob1Z1tcGbo1jExpejvllcTwu6DS/w50W0ecV0MFXjrA99SE6113/EQ50vGhe5/ b/OsUq0w5FRhgR1mpojk4I9FLSI/tqEjWuHYgv/6oPv2Xm9q9HJdGBoMmaKqxmqvORtg qlijh1paYWDKmocQVfuy0hLpbMM6NxH/uL63lKy4ilPBO5oBAcHdZnHsfYQReuq4ewl/ X9fCa6Ss6hU8kcZxL5HHPC9dC4D1qsOZsiu0y8/PB2DCLohR6f/YSkGo43FAD1iCxs05 jtMg== 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=nLc3av5/Waqbjx0bV9LbeX3QPGlA5GYodZ5Et8UcGAA=; b=Md+tvHjo+w0wttY/J6HDBGO15dSLJDGXpHTDe9gkrjHgwo+0CKoVb8Gq5/g4vE6un3 19Hjlh7r4+HZ3DdbmTJibb/7uj7z7Vy7fsvj5qzomNmMLbXnKkKtcowCXJbWdd2Jx+8R aE0fNjPSIxS4KkJsN3gQxbELdvF1Uc1XpbhS/wtZ0xdo5xgcDBh5cUd7n8DKzIb7B8f3 sF14ka7tNvdh/t+MBSI6ghmObTOmSCYeHsoS2VcTam+xiRwmX6BD6II+7tWjfRiHga8A mSJPoaQsqoo4j0L//Umsls+eA9XsLm3VAbWd/KHFr47tLX5DlMVxlP/hX35A/UZq/wmw a8WQ== 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 o11-20020a170902778b00b0017123d2abd5si27295830pll.457.2023.01.15.17.55.48; Sun, 15 Jan 2023 17:55:59 -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 S231819AbjAPByG (ORCPT + 99 others); Sun, 15 Jan 2023 20:54:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231531AbjAPBxa (ORCPT ); Sun, 15 Jan 2023 20:53:30 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3261544B9; Sun, 15 Jan 2023 17:53:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NwFRN5dpGz4f3v7h; Mon, 16 Jan 2023 09:53:20 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S3; Mon, 16 Jan 2023 09:53:23 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/8] block, bfq: correctly raise inject limit in bfq_choose_bfqq_for_injection Date: Mon, 16 Jan 2023 17:51:46 +0800 Message-Id: <20230116095153.3810101-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S3 X-Coremail-Antispam: 1UD129KBjvJXoW7uF4xCr1xXrWruF18AF45trb_yoW8ZF17pa y7Ka47u348JF1ruFyjq3WfZFyYqan5CrnrtF13G34Fqr97ur92gasFg3y5Xa1ftFZ3Aw4j v3WUWa4q9F15CaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUsgyZUUUUU 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_NONE 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?1755142328079161752?= X-GMAIL-MSGID: =?utf-8?q?1755142328079161752?= Function bfq_choose_bfqq_for_injection may temporarily raise inject limit to one request if current inject_limit is 0 before search of the source queue for injection. However the search below will reset inject limit to bfqd->in_service_queue which is zero for raised inject limit. Then the temporarily raised inject limit never works as expected. Assigment limit to bfqd->in_service_queue in search is needed as limit maybe overwriten to min_t(unsigned int, 1, limit) for condition that a large in-flight request is on non-rotational devices in found queue. So we need to reset limit to bfqd->in_service_queue for normal case. Actually, we have already make sure bfqd->rq_in_driver is < limit before search, then -Limit is >= 1 as bfqd->rq_in_driver is >= 0. Then min_t(unsigned int, 1, limit) is always 1. So we can simply check bfqd->rq_in_driver with 1 instead of result of min_t(unsigned int, 1, limit) for larget request in non-rotational device case to avoid overwritting limit and the bug is gone. -For normal case, we have already check bfqd->rq_in_driver is < limit, so we can return found bfqq unconditionally to remove unncessary check. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 815b884d6c5a..8836221a2673 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4730,12 +4730,10 @@ bfq_choose_bfqq_for_injection(struct bfq_data *bfqd) */ if (blk_queue_nonrot(bfqd->queue) && blk_rq_sectors(bfqq->next_rq) >= - BFQQ_SECT_THR_NONROT) - limit = min_t(unsigned int, 1, limit); - else - limit = in_serv_bfqq->inject_limit; - - if (bfqd->tot_rq_in_driver < limit) { + BFQQ_SECT_THR_NONROT && + bfqd->tot_rq_in_driver >= 1) + continue; + else { bfqd->rqs_injected = true; return bfqq; } From patchwork Mon Jan 16 09:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43925 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977163wrn; Sun, 15 Jan 2023 17:55:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXv7JCQgPSMlAmW5ClKqA+b6OOBWIiRyCkiIvLCtVHKluzhDzBgcgqL+tVALTJawHXenusnK X-Received: by 2002:a17:90a:5783:b0:229:7b29:54ac with SMTP id g3-20020a17090a578300b002297b2954acmr1599833pji.35.1673834159257; Sun, 15 Jan 2023 17:55:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834159; cv=none; d=google.com; s=arc-20160816; b=b3tcSaP7/SkNtXksuczYsNTEdk9fSpBzQSpu9iQ9wFYHBGdXA3EFoJIBpNl7sAHYFK y9y10UL+qsouQxON5ut8j+hI37QGQ0YyKZoa58Ef9t8eb0+lCiokZNZCDGPz6buIMbZT b+6sVL2tdeJHQ6qVQHCU1gC2BDgUFHqSo3UhNTZuekCZEA+Tbj+Fns5K/cwPdjEyyhAE l957h70sw5FC0u+2NAH/xCd+5HOC9In82q/hACtMKatqFov8JICIgouEYNEoYgwvGvSc 6zQbadkloKgt6Mskq+ntgff2+Hi5MgsTIj+LW2uBZZWoQ148/dhlPBzzBL8WqVwhI3wl XADA== 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=QQxLJXauoHq16UuxRkl7kfq+Yy1nU0U6ulT1HyPx93g=; b=jS+2UD0ttuWWKV/77R/q9AxeOmec/H1QDaZ77WlPw1dLjCcnCVEX66O7/057SdMXj0 M8OFrYS0ALWdlu5X2SMDq80b9dasDjjlwJfctNMGh2WQg9HRzCW2vHeSMjQlhn6N5QR1 UEH5lR9+pUQPUE14S6e8bz9gLn6puKxAZ0o7FTE3aGnjh31zqSlPa6d/qCHr/K3YeUkz oZiCuILny61p7w9UgntGAfTUAE1xc5f4/XZt9WAmSDdSeYg5fwb5NlrTdieSIo/iAagi lvQiFb6HNURoJ5SuEA3V45qAxncWVDlRNYLOIqkJN6PodxEDsMcorZ2EfJM+JGL/FY84 L4TQ== 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 16-20020a630010000000b00476759b8788si28669676pga.861.2023.01.15.17.55.47; Sun, 15 Jan 2023 17:55:59 -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 S231810AbjAPByC (ORCPT + 99 others); Sun, 15 Jan 2023 20:54:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231748AbjAPBxb (ORCPT ); Sun, 15 Jan 2023 20:53:31 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AC3D4684; Sun, 15 Jan 2023 17:53:29 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NwFRP2lZjz4f3wQy; Mon, 16 Jan 2023 09:53:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S4; Mon, 16 Jan 2023 09:53:23 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/8] block, bfq: remove unsed parameter reason in bfq_bfqq_is_slow Date: Mon, 16 Jan 2023 17:51:47 +0800 Message-Id: <20230116095153.3810101-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S4 X-Coremail-Antispam: 1UD129KBjvdXoWrtF4UJr4kCFyfGw4rWw15Arb_yoWkWrgEq3 WUKrn3ZF1DJryxCFy2krW5X34j9FZ5X3Wj9F90grZ8uF1UJa1DZ3srtrW5Crs3WFsF9a43 AF1Yva1UJF4j9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwI xGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480 Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcVC0I7 IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k2 6cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxV AFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jy9aPUUUUU= 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_NONE 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?1755142327638782517?= X-GMAIL-MSGID: =?utf-8?q?1755142327638782517?= Parameter reason is never used, just remove it. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 8836221a2673..f038b4d16d86 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4152,8 +4152,7 @@ static void __bfq_bfqq_recalc_budget(struct bfq_data *bfqd, * function to evaluate the I/O speed of a process. */ static bool bfq_bfqq_is_slow(struct bfq_data *bfqd, struct bfq_queue *bfqq, - bool compensate, enum bfqq_expiration reason, - unsigned long *delta_ms) + bool compensate, unsigned long *delta_ms) { ktime_t delta_ktime; u32 delta_usecs; @@ -4349,7 +4348,7 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, /* * Check whether the process is slow (see bfq_bfqq_is_slow). */ - slow = bfq_bfqq_is_slow(bfqd, bfqq, compensate, reason, &delta); + slow = bfq_bfqq_is_slow(bfqd, bfqq, compensate, &delta); /* * As above explained, charge slow (typically seeky) and From patchwork Mon Jan 16 09:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977110wrn; Sun, 15 Jan 2023 17:55:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXt5QPoIQcYeNjKKQkGzsJ9bSKEQEE+tOyGQp93PQ2kHYEIo0w7bDAGCKXiClk+6wVo1v9FV X-Received: by 2002:a17:902:d710:b0:194:6afa:ca with SMTP id w16-20020a170902d71000b001946afa00camr12087881ply.56.1673834153355; Sun, 15 Jan 2023 17:55:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834153; cv=none; d=google.com; s=arc-20160816; b=MFFkITgfCBfUlpdHhFuN8FNwOyyU4uRkaVGs6Uz7paBI3sqiAO0eXUnsNzwSQrh1Ys sentoVK/xsYF7NyWxPIPlUNcD6T3YHpyYWP9vvacJ4G2vX5hZUQ2U4c+r+5FBbHq4k3F sOcf1WEjvrR2CZCRGbeiPYJh6DIvIvlmqWX9qkUsbtXduPDqf2nBtGE59BSxH0U4O5y2 xC8/5z25Vk4A5cKNU7nuSizOe2eAC+BRAkETpTQ/3PUlMdDrKmBAX10AEZC7VvWUImtu 0mM7u9iDOGjCi/MfnY6bKLbEwEbfwujj4Fn0gGMMGG04lIrr4+BTd5AjrE9L32hIoixL iATw== 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=ntFr8PQBYpNG4p5bOrxVMxbsz/7rWf9BE3zbh5QtqKc=; b=v/tBkyJ2DdHdi7YLN63ZHQUs51wAlIFFoLpaXvWCOH+wSJaHc+5dDFuY8KMBoGueIH wbaexN34mPULkqOt5XbVLco2+u0OB4w6ZJPxgfpOXUNs8I6WNDR45KLYEOfKRpJ9lh3s g/8ymv1ou0hNgbVCvXPCBtVWQctGVPUNTsuuvjV4xJulFM22MZGRcJq+1aT+pYxECEeN RSxYT3AH8wOGmWiIR3vQ8DYoLte99iB5nllLe7zEfudDsujQ6AhvT46Psomf4c+snJcJ YBpDvuCUJT7+NEySJq5ab/yivVwbelCHgq+p2A223bO7JCYk/GzVS/RihKpHbFUuLuHQ PSSw== 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 i4-20020a17090332c400b0019303698a94si5030782plr.149.2023.01.15.17.55.41; Sun, 15 Jan 2023 17:55: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 S231796AbjAPBxu (ORCPT + 99 others); Sun, 15 Jan 2023 20:53:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231742AbjAPBx3 (ORCPT ); Sun, 15 Jan 2023 20:53:29 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FB9A4C0E; Sun, 15 Jan 2023 17:53:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NwFRP56MHz4f3wR6; Mon, 16 Jan 2023 09:53:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S5; Mon, 16 Jan 2023 09:53:24 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/8] block, bfq: initialize bfqq->decrease_time_jif correctly Date: Mon, 16 Jan 2023 17:51:48 +0800 Message-Id: <20230116095153.3810101-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S5 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr4Utw1kuw4fJr45tF4ruFg_yoW8Aw4xpa 9Fgr47KF1jqFW3Wr1UAa1kGF90grs09ry7J3WUW392y3yUArnFgFsYkrWYvFyfGrs7Cw10 qw4vqF9ruw1FkFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK 8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I 0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIq2MUUUUU 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_NONE 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?1755142320861576929?= X-GMAIL-MSGID: =?utf-8?q?1755142320861576929?= Inject limit is updated or reset when time_is_before_eq_jiffies( decrease_time_jif + several msecs) or think-time state changes. decrease_time_jif is initialized to 0 and will be set to current jiffies when inject limit is updated or reset. If the jiffies is slightly greater than LONG_MAX, time_is_after_eq_jiffies(0) will keep for a long time, so as time_is_after_eq_jiffies(decrease_time_jif + several msecs). If the think-time state never chages, then the injection will not work as expected for long time. To be more specific: Function bfq_update_inject_limit maybe triggered when jiffies pasts decrease_time_jif + msecs_to_jiffies(10) in bfq_add_request by setting bfqd->wait_dispatch to true. Function bfq_reset_inject_limit are called in two conditions: 1. jiffies pasts bfqq->decrease_time_jif + msecs_to_jiffies(1000) in function bfq_add_request. 2. jiffies pasts bfqq->decrease_time_jif + msecs_to_jiffies(100) or bfq think-time state change from short to long. Fix this by initializing bfqq->decrease_time_jif to current jiffies to trigger service injection soon when service injection conditions are met. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index f038b4d16d86..698c5918ad10 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5654,6 +5654,8 @@ static void bfq_init_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq, /* first request is almost certainly seeky */ bfqq->seek_history = 1; + + bfqq->decrease_time_jif = jiffies; } static struct bfq_queue **bfq_async_queue_prio(struct bfq_data *bfqd, From patchwork Mon Jan 16 09:51:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977064wrn; Sun, 15 Jan 2023 17:55:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXs+kTHJuubEaUehYqHhgMe4yFsNrno1JalhavDJCXiGcQbK1ZleRghRUEM9yhuT8YQk7488 X-Received: by 2002:a17:902:e0ca:b0:193:2fdb:db07 with SMTP id e10-20020a170902e0ca00b001932fdbdb07mr23299867pla.43.1673834144706; Sun, 15 Jan 2023 17:55:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834144; cv=none; d=google.com; s=arc-20160816; b=Eq09JxKWjpqMI461wE/7Cv5NbKEWP/i756HaFJYrbo5Osy2fQLhq54Bfc1Xwn2oTdd mx3tObJ09O6jMsRDK9dRaZgZ7phZsb3USP507cSrj6NJjMR5E9nsWz6qvuO2vNM6PRSX ak0JQeVvpU48OpWeh1UuJvjqmNGXyvBkurUZOIw48bF8JTqdQYzTu64kWq82nDqRTl+z J5t2dbHryZB0vugQq0AaVJBt0CMHMX+saOCWn+qPfD+UtQaXpu+kBaGmA5P75DgXYN/j lOpDfVgBf8INOj8z8RUA7YcB/la2RlHiygca9UOIikp7H39Hyu2BL8Yl+eK58BJiXHyL qgyQ== 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=IiFRsOrsI6/U2VXJksExxMrVTXZItqwcJ9a3/fH8m6U=; b=pFIDoFU8hooyvmo3+y2I0T4rdsbrmB/TbcUts0CPQ+v4PsJ/ptbPk9NUwJ3ZyLVkTc snCCrMZSH1GeBsd3QJlpw0e7VFPlzHv22O+q00vEtf+YMMaTxQ8Vm/i1ygHBZtfApKHY E+mbR5TFvfXADPbhvECnAxmjXeOs3AewkKOr/XXXeyheSxJuDVr4TYZzGvNqZQv1DimW /KakGZfaYX+4WuyaLndfhKWtiLOP7QO10fSewkEPTu/bCda5xVva3oY2W6Cf286FJamC QkgNFh/EhWZTqZvtXxtNZVJWL/0lFNocLZY23+3nj/QdF8VcMGtyZKRTTv4O1vvX0mb0 aDkg== 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 q16-20020a17090311d000b001930df7387bsi30334560plh.304.2023.01.15.17.55.33; Sun, 15 Jan 2023 17:55:44 -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 S231760AbjAPBxq (ORCPT + 99 others); Sun, 15 Jan 2023 20:53:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231744AbjAPBx3 (ORCPT ); Sun, 15 Jan 2023 20:53:29 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 648FC4C33; Sun, 15 Jan 2023 17:53:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NwFRP6L1Wz4f436w; Mon, 16 Jan 2023 09:53:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S6; Mon, 16 Jan 2023 09:53:24 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/8] block, bfq: use helper macro RQ_BFQQ to get bfqq of request Date: Mon, 16 Jan 2023 17:51:49 +0800 Message-Id: <20230116095153.3810101-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S6 X-Coremail-Antispam: 1UD129KBjvdXoWrZF47Xry3Xry7Cr4Utw47Jwb_yoWfKFg_Ca y8KF93Jr4kA3y5Zr4FyFWYqF47CFWaqF15ur98tFs8Wa43Canayr9FqrsxZFZ8ua1UCa9x tFn0v343Jr9F9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= 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_NONE 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?1755142312056921775?= X-GMAIL-MSGID: =?utf-8?q?1755142312056921775?= Use helper macro RQ_BFQQ to get bfqq of request. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 698c5918ad10..6f38a0130034 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6859,14 +6859,14 @@ static struct bfq_queue *bfq_init_rq(struct request *rq) return NULL; /* - * Assuming that elv.priv[1] is set only if everything is set + * Assuming that RQ_BFQQ(rq) is set only if everything is set * for this rq. This holds true, because this function is * invoked only for insertion or merging, and, after such * events, a request cannot be manipulated any longer before * being removed from bfq. */ - if (rq->elv.priv[1]) - return rq->elv.priv[1]; + if (RQ_BFQQ(rq)) + return RQ_BFQQ(rq); bic = icq_to_bic(rq->elv.icq); From patchwork Mon Jan 16 09:51:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43920 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp976791wrn; Sun, 15 Jan 2023 17:54:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXsf5cibRb3DjbS2N5e41rBU2rqJAFXAuZjUkMGoasbei4vnyjzA84T5LelEXiW1/LWkB2oD X-Received: by 2002:a17:90a:7f86:b0:225:c085:2ed3 with SMTP id m6-20020a17090a7f8600b00225c0852ed3mr79163679pjl.39.1673834078366; Sun, 15 Jan 2023 17:54:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834078; cv=none; d=google.com; s=arc-20160816; b=FTHZb81JsPcjEyAadPMCLJP1HTrzrwWd/HULY0rxDR5JuGwnLx5DoPghL/OasdNLGU cD24xxsfJdXS0WUA/cQQ8TPtXOFXzoSrKxL0C+8cCP4T2tkuye5yZM3LZZQzcw0WFbCQ ks9ODXT3nFdxSs7rSe0IjiYDFLk6AhOremQkIbVoWFWMC7Q+kR9o0lww2PCm4Qu26QQ0 OX72BFq94wonR9brBvQK9ds456NGSdaEdYwEuDgg6dGzFcZILk3JSGiq/TnnhQi3QYRX 9cwr0HTeJE9dnqEJVe3oOoTa0S30Hytd7ut23VIifnhEZ9M33K0T5k5YcgVqlAxx7gLm 848g== 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=ftXQ2IxwmN+Fy/xkSg4dUj9XHIyptMFAxttbZYZ7sEE=; b=YzapTKqCVsMA4t5Y5Yn6W+NbVu5xI8/+c82mpO8uwFM+y8bsUaYP9Byo2wdG3ZpU1Z CJ6O1wJBd4GTbYInmVFLfutOapzGS4XzFmehDWUQFTY+CJYoZg2s6x3hTEz2JeetfyGI IdsjINVmHgylkbiZ0aXjjXk3Ozw0x8ES3tQMk0pJVb/ZRh3D3RGlgjSrw7QgciWgjT01 AoihhpEpuPH5SSiddGSowu626hpXRZIFU5d5zTdUCfblmXFK85xwRwCRGRvjNullUb6P M7RKCy2r04r+n3xEa5qfbTrj03US6DimONgH3BeyKh1knFeZJL+BID+wggaREZeluFVk IDjA== 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 12-20020a630d4c000000b004b4caee62cbsi10793711pgn.570.2023.01.15.17.54.26; Sun, 15 Jan 2023 17:54:38 -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 S231765AbjAPBxm (ORCPT + 99 others); Sun, 15 Jan 2023 20:53:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231743AbjAPBx3 (ORCPT ); Sun, 15 Jan 2023 20:53:29 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF3314EFD; Sun, 15 Jan 2023 17:53:27 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NwFRQ3SDkz4f3nVG; Mon, 16 Jan 2023 09:53:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S7; Mon, 16 Jan 2023 09:53:24 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 5/8] block, bfq: remove unnecessary dereference to get async_bfqq Date: Mon, 16 Jan 2023 17:51:50 +0800 Message-Id: <20230116095153.3810101-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S7 X-Coremail-Antispam: 1UD129KBjvdXoWruFW7tryDWw13Xw4rAFWxtFb_yoWfJrX_C3 W8K3Z3uF1kGFy3Cr4rAry3tws0kryFqa1rCF90qry5WFnrAan8CasFqrZ0va98Zay7GFya gr9rur13AF1q9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= 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_NONE 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?1755142242432276683?= X-GMAIL-MSGID: =?utf-8?q?1755142242432276683?= The async_bfqq is assigned with bfqq->bic->bfqq[0], use it directly. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 6f38a0130034..4a17b22327f1 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4989,7 +4989,7 @@ static struct bfq_queue *bfq_select_queue(struct bfq_data *bfqd) icq_to_bic(async_bfqq->next_rq->elv.icq) == bfqq->bic && bfq_serv_to_charge(async_bfqq->next_rq, async_bfqq) <= bfq_bfqq_budget_left(async_bfqq)) - bfqq = bfqq->bic->bfqq[0][act_idx]; + bfqq = async_bfqq; else if (bfqq->waker_bfqq && bfq_bfqq_busy(bfqq->waker_bfqq) && bfqq->waker_bfqq->next_rq && From patchwork Mon Jan 16 09:51:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43927 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977312wrn; Sun, 15 Jan 2023 17:56:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXuR4ngvXonRZSETVfJXo6Q8k4LxOu0IdSX5Vj5XTpHrlMGIHrQ5SKjgPj9SAHJPq3fHAB7w X-Received: by 2002:a17:902:c948:b0:188:c395:1756 with SMTP id i8-20020a170902c94800b00188c3951756mr122648455pla.41.1673834199531; Sun, 15 Jan 2023 17:56:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834199; cv=none; d=google.com; s=arc-20160816; b=nnbdm1I2MruYHiWq/XkyphtcspcEkxN/Mkkp8a+w12d09ALjGm0xvZ6wc3wtggGK5L V2CCNGzzN55pAjxmX941rtpQ+YaRPj+naXSV0PRWiilFLeA2/sGaMu9NR1ZKcdF0eGV2 GWT+Lpa0ZxXWGmoYGeAcAGDVb1EQhukpgZS5eIwq+hc75KAJIpilErklagkabOV6yzjs 6Cu2+vkGmqL5tlU+Vn39U1gDNRAtHWTMu4Zk71uDCFEjqJrbVL5CE/6jJXiHxbFzkyj3 CArS4lD1+I9WmlPXGAv29yOsNqNQ7HRj+6MqdmsUqIHGTox3tjdUjQsHW4NK5AMvjNC0 E0DQ== 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=+ZDa07BnE1yuPLKRFth3fmDeM5F8qAqN7ROe3VUXP/Y=; b=mkzXi6zGxZcAygTKH/92rChqNDzlODyTSePPXMFY2vKdgE6j5Y7tszKAKf8Sm0HpLQ kVN/PbHjORhx5SqDSNpqtUdKrC4RYgV7MXJukVKxZLMN8Huba1tEjAQrbmpmDCzqsBLQ Wfdx0MOFMzgvlUvUIx0ocZ5DloC93AgF9YZDKrVjP58BB9arf1BvwtPo5PUbCEs4RyLr JUhI+bDRj4XCNG+8niIZM7vA2RGOjPN4O+veP5jzEITXNXZQDFXsa673Q1fGciiEZICk J9MM4G4nZeH7EBstphvKD934sRuMzjOGjaSXb9K0PPiwoWjqp6vgXNKYvvS1VNctzId+ QENQ== 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 l4-20020a170902f68400b00192ab6aa296si30093596plg.243.2023.01.15.17.56.27; Sun, 15 Jan 2023 17:56:39 -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 S231680AbjAPByJ (ORCPT + 99 others); Sun, 15 Jan 2023 20:54:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231722AbjAPBxa (ORCPT ); Sun, 15 Jan 2023 20:53:30 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAC1B44BF; Sun, 15 Jan 2023 17:53:28 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NwFRQ4bjJz4f4374; Mon, 16 Jan 2023 09:53:22 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S8; Mon, 16 Jan 2023 09:53:25 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 6/8] block, bfq: remove redundant check in bfq_put_cooperator Date: Mon, 16 Jan 2023 17:51:51 +0800 Message-Id: <20230116095153.3810101-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S8 X-Coremail-Antispam: 1UD129KBjvdXoWrKrWxAFWUXr1xWw48Gw1Utrb_yoW3GFc_t3 9YkFWrJrW8G345Ar1ftF95Jw1jyayxJF1DJF4Fqw4DXF1UWFn5Aa9FgFWayF45Gay7Ca4a ya40q3WDtr1DWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbS8YFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF 04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7 CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jstxDUUUUU= 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_NONE 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?1755142369499728129?= X-GMAIL-MSGID: =?utf-8?q?1755142369499728129?= We have already avoided a circular list in bfq_setup_merge (see comments in bfq_setup_merge() for details), so bfq_queue will not appear in it's new_bfqq list. Just remove this check. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 4a17b22327f1..dbee5c61830c 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5429,8 +5429,6 @@ void bfq_put_cooperator(struct bfq_queue *bfqq) */ __bfqq = bfqq->new_bfqq; while (__bfqq) { - if (__bfqq == bfqq) - break; next = __bfqq->new_bfqq; bfq_put_queue(__bfqq); __bfqq = next; From patchwork Mon Jan 16 09:51:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43921 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977046wrn; Sun, 15 Jan 2023 17:55:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXuii+OAt3wDB1I2P3sVJEllp1y56tHsxQU4Kd+Ia3/8VIuugLzQMeEjsWbotVPMAopPj9p+ X-Received: by 2002:a17:902:ef8e:b0:193:2bed:3325 with SMTP id iz14-20020a170902ef8e00b001932bed3325mr21136839plb.15.1673834141352; Sun, 15 Jan 2023 17:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834141; cv=none; d=google.com; s=arc-20160816; b=QHQjiDkk80bObM75XG/H7sPmgbTmW2aqtabJS2A2t+Rvsr4mMrw5lAEV/3wYOmNM4D AkR37qB2cgkOJvY14RpyJx1clWgcuZfZ9HTlmWKsM/Td4YzbzWLsb3rbUuqc1XBDvslq etUiIA+O7BxEnyfPDE7I1BQ1xZT7/MZXG3aNrMlbwVODWOJIRN3TqJ6pLxKNwdHV9QUt Sgy+WCb4H4UkNMNUAv7aveeVNtIzarZHL+/Vy/Wl4CYl6XgkZqeFEbYVB7xoJUaHOxTU SpvqQ8EBhXjQMLl4uExC0Yq809GjIQE27gRhC5SBwx7EOqL7viR7Sa3AKBv9VBqRHo3g lpzg== 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=wWapbINdK8tzDosQc+gikAL1fA9ULaYNPC8DxLHkePY=; b=qA2lkdnqSrlx5+7fpdW/EVoM8dKspUF1+C9aFS37lLqN6IvAXPt6z5cCqnGqoR7Xtn 2VV47k1GJAqtjByqnpElBWVaBb0ycJQXTbJfJC8F3o1Rx6efiRSTOlCv5n1g8INI/4H7 dCBgk51opHvC+FPpOK62zEA0yifPC7KfLTs+PQr3SfXSy4PMIPkx3iWKlquTqQ0KjzKV aFhLb0tgxs+XtfuAOyFDiM64bLL/Ss+WGsdxpOKWS8SxVele7YcSLc69oYn+fHOJ3ubr YTn0A82cFqadLNxp9PMXU7IU3Bxahib+wjIjCM/znFEOWd39mhcPVsgXS/ytM93C2XZX D2VA== 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 p11-20020a1709026b8b00b00189de92ab32si25772044plk.22.2023.01.15.17.55.29; Sun, 15 Jan 2023 17:55:41 -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 S231576AbjAPBx5 (ORCPT + 99 others); Sun, 15 Jan 2023 20:53:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231747AbjAPBxb (ORCPT ); Sun, 15 Jan 2023 20:53:31 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3D8C44BC; Sun, 15 Jan 2023 17:53:28 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NwFRR1g6zz4f3wRJ; Mon, 16 Jan 2023 09:53:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S9; Mon, 16 Jan 2023 09:53:25 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 7/8] block, bfq: remove unnecessary goto tag in bfq_dispatch_rq_from_bfqq Date: Mon, 16 Jan 2023 17:51:52 +0800 Message-Id: <20230116095153.3810101-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S9 X-Coremail-Antispam: 1UD129KBjvJXoW7AF1fZryrKr48CF47AF17trb_yoW8JF43p3 WfGa1Y93WfKa1FqFW8Xa1Iyr17J3WfC3s7tw1UWw4rA3yUZwnF93Way340vanagrZ5Canx Xa4Iq3s0vw1DJrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0TqcUUUUUU== 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_NONE 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?1755142308617703791?= X-GMAIL-MSGID: =?utf-8?q?1755142308617703791?= We jump to tag only for returning current rq. Return directly to remove this tag. Reviewed-by: Jan Kara Reviewed-by: Damien Le Moal Signed-off-by: Kemeng Shi --- block/bfq-iosched.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index dbee5c61830c..0416dfe05983 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5120,7 +5120,7 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, bfq_dispatch_remove(bfqd->queue, rq); if (bfqq != bfqd->in_service_queue) - goto return_rq; + return rq; /* * If weight raising has to terminate for bfqq, then next @@ -5140,12 +5140,9 @@ static struct request *bfq_dispatch_rq_from_bfqq(struct bfq_data *bfqd, * belongs to CLASS_IDLE and other queues are waiting for * service. */ - if (!(bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq))) - goto return_rq; + if (bfq_tot_busy_queues(bfqd) > 1 && bfq_class_idle(bfqq)) + bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED); - bfq_bfqq_expire(bfqd, bfqq, false, BFQQE_BUDGET_EXHAUSTED); - -return_rq: return rq; } From patchwork Mon Jan 16 09:51:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 43924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp977156wrn; Sun, 15 Jan 2023 17:55:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXt6yXeU69HXazeuc72Ti2NVdoCzgosmRS3LXi4JtoTXGNE6J9xhUMa4CR5QDrBXJ1ux05Dw X-Received: by 2002:a05:6a00:4519:b0:58b:cacd:2d12 with SMTP id cw25-20020a056a00451900b0058bcacd2d12mr6901467pfb.28.1673834158270; Sun, 15 Jan 2023 17:55:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673834158; cv=none; d=google.com; s=arc-20160816; b=gjUJa9x4/eXKTM5GgjyL3lQY2o2WT1qzRCaizsY+cKrr3ZVUw6kPG8333xxBeO8J7N jfBYQ7B6+gPXvYiRuRgIrpn835wEivuVQsueKM9aBQ8aKL4zOR1OEBToPlZDpbVBRp+O Pn7V9JHtk3fQrLlo6dwpWiiGpdzf1bPNwQwQ/kifP+siqjM15dUyQBViDg+QkMaYq17Y 4eibUuIWK9QOAfAo+tsobiHHWWdgNs8mlrHzhWfH5uJFEUixCPwVqjcgMd7oL414PnH6 Di8QR+qTv+q6BQDjdiRACraN+zHkHzb3Q4Lcy6hiJPf8Ty3wSDW2qT+qwoYhWGYwZvry UNoQ== 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=ERhY569NzeOh5VelOKyVlO9SOdVFb2XXwnUDiEitLXQ=; b=YjdlBwg6ac3OM7BSwEqHkk0Ql8m+4ozN+7KQwTjZKDojeRwrLZ9nEaI3pddxjpAEzc moMjtEnAUnqdbRlUYytjaZVJGW8U2gj1gnHaRPUXJzA9J/w8qix7h9GKnCKOLSgzo9Ob oEbJdLtr+L7pFldAnpPt+8pygfH4U2F/sxJ+6j1TUPnQEMvflpejaYqukGzYLNtLnsGf plUZWzN1tcDn/iLmJQYer2Xeicc+AteZGBsEXTQafshOaQBVKPRs9AeLT5QdF8PVIcW9 EkBA/s8caZQkQTBiFO8ncvXcGfMP9GbDXAl7XMvQB9exCcRhWGzPdp/41OVKFHoHbf53 TtUg== 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 d19-20020a056a00199300b00575757288e4si268893pfl.90.2023.01.15.17.55.46; Sun, 15 Jan 2023 17:55: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 S231784AbjAPBxy (ORCPT + 99 others); Sun, 15 Jan 2023 20:53:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231749AbjAPBxb (ORCPT ); Sun, 15 Jan 2023 20:53:31 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5C2044A8; Sun, 15 Jan 2023 17:53:28 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NwFRR2fk0z4f42hw; Mon, 16 Jan 2023 09:53:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgD3rbERrsRj9iw3Bw--.37368S10; Mon, 16 Jan 2023 09:53:25 +0800 (CST) From: Kemeng Shi To: jack@suse.com, damien.lemoal@opensource.wdc.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 8/8] block, bfq: remove unused bfq_wr_max_time in struct bfq_data Date: Mon, 16 Jan 2023 17:51:53 +0800 Message-Id: <20230116095153.3810101-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230116095153.3810101-1-shikemeng@huaweicloud.com> References: <20230116095153.3810101-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgD3rbERrsRj9iw3Bw--.37368S10 X-Coremail-Antispam: 1UD129KBjvJXoW7KFyUJw1kCr15GFyUtry3twb_yoW8WFWxpa 1DK347WF17tr4FgF1DAa4rXF13ta1fCF9rKa1a9w4YyFW8XF1a93ZYyw1fX3Z2vFZ3Cr4f Zw1Fqa4Dtw18K3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0TqcUUUUUU== 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_NONE 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?1755142326475491919?= X-GMAIL-MSGID: =?utf-8?q?1755142326475491919?= bfqd->bfq_wr_max_time is set to 0 in bfq_init_queue and is never changed. It is only used in bfq_wr_duration when bfq_wr_max_time > 0 which never meets, so bfqd->bfq_wr_max_time is not used actually. Just remove it. Signed-off-by: Kemeng Shi Reviewed-by: Jan Kara --- block/bfq-iosched.c | 4 ---- block/bfq-iosched.h | 2 -- 2 files changed, 6 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 0416dfe05983..4705c4be90e7 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1093,9 +1093,6 @@ static unsigned int bfq_wr_duration(struct bfq_data *bfqd) { u64 dur; - if (bfqd->bfq_wr_max_time > 0) - return bfqd->bfq_wr_max_time; - dur = bfqd->rate_dur_prod; do_div(dur, bfqd->peak_rate); @@ -7299,7 +7296,6 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) */ bfqd->bfq_wr_coeff = 30; bfqd->bfq_wr_rt_max_time = msecs_to_jiffies(300); - bfqd->bfq_wr_max_time = 0; bfqd->bfq_wr_min_idle_time = msecs_to_jiffies(2000); bfqd->bfq_wr_min_inter_arr_async = msecs_to_jiffies(500); bfqd->bfq_wr_max_softrt_rate = 7000; /* diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h index 058af701bbbe..ed2be7d32151 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -769,8 +769,6 @@ struct bfq_data { * is multiplied. */ unsigned int bfq_wr_coeff; - /* maximum duration of a weight-raising period (jiffies) */ - unsigned int bfq_wr_max_time; /* Maximum weight-raising duration for soft real-time processes */ unsigned int bfq_wr_rt_max_time;