From patchwork Tue Jan 3 09:52:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4394083wrt; Mon, 2 Jan 2023 17:57:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXvkZChAOWZp/Ydv4zoPiqJotXui/A2cjZZmNJkkgIL1uThQ9abeuPOjXohQILaRriQe/HMa X-Received: by 2002:a05:6402:2482:b0:47a:e008:8662 with SMTP id q2-20020a056402248200b0047ae0088662mr41121481eda.34.1672711064852; Mon, 02 Jan 2023 17:57:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672711064; cv=none; d=google.com; s=arc-20160816; b=zRwMlKytg18roPsavMUjC3SoEZDxM7Uq2JXGs/eJhAewpQ8ZtK71WEdIBNlWsIyxbM 2dszOZ2ptliLx26+7wsSOL7EDWsuA6kAPkFWWKx2sP+UT2+wyZ+dEIG1LgDcC3AtTOfv 1Q70czigbEUiPCuuA1uCOtkZ50lXwvyRRA5tC2jUc0Z82y23kwxCl1D3JlN1/bB4mjCG JdaUeD3ou3uVOaAdgl7Boi2FVYn/63dym57O5DC5j0ikxfNdDdVqrzWFHEGMO2h0zhE0 3efKBvm7DrGHJKJvZzzzAGjHun2Y2Zyhl+SOz6g9NqOMuf7/e7zmbbpw5pAuw2mVMt/P Xa4Q== 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=VKiAbMRIbtHNXVeCxBqN49kSvMl7/Y5eJu2IkOgfXzU=; b=ImrO/g99neyQ1WPJwhEgcsnN7IisPbhbEsV5wPOjsIhf0BYmVKZWOhr4u4Er9r3D7V H+gyCb1nhBUp4wy9b3zeINTFuIiKW80X9KYcrlL7tLZ1tpVGZELyJ4zutFTgS1I0xhen SSjtP6OkujkJluBFdlaVEyu9Oa/6pBaqDKTJkcZUr0oHwON7n5aSk9TuaxnXXtnXbt3z Filbucr5s01e5u41Dkz3YR0rrbufgdlMLDfcJNJezrjuIv4TCpitW69bLnHzUevayeZ5 31D2SNwd5AcU/ncDY2WfhYQKVsiAkxOzu3PBF8tb2iE8x8kpYunQiVbpKpVkeHhFBhzz 6aOg== 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 fi13-20020a056402550d00b00486120b4969si16362602edb.394.2023.01.02.17.57.21; Mon, 02 Jan 2023 17:57: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 S231338AbjACByw (ORCPT + 99 others); Mon, 2 Jan 2023 20:54:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232362AbjACByY (ORCPT ); Mon, 2 Jan 2023 20:54:24 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A356766C; Mon, 2 Jan 2023 17:54:22 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NmG4T1575z4f3kph; Tue, 3 Jan 2023 09:54:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S3; Tue, 03 Jan 2023 09:54:19 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/8] block, bfq: correctly raise inject limit in bfq_choose_bfqq_for_injection Date: Tue, 3 Jan 2023 17:52:56 +0800 Message-Id: <20230103095303.2223546-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S3 X-Coremail-Antispam: 1UD129KBjvJXoW7uF4xCr1xXrWruF18AF45trb_yoW8ZrW3pa 47K347C348JF1ruF1jq3WfZFyYqan3CrnrtF13W34Fqryxur92gasFg3y5Za1ftFZ3Aw4j v3WUWa4q9F15CaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 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_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?1753964677417535019?= X-GMAIL-MSGID: =?utf-8?q?1753964677417535019?= 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 a72304c728fc..1220c41fc767 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4641,12 +4641,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->rq_in_driver < limit) { + BFQQ_SECT_THR_NONROT && + bfqd->rq_in_driver >= 1) + continue; + else { bfqd->rqs_injected = true; return bfqq; } From patchwork Tue Jan 3 09:52:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38239 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4393754wrt; Mon, 2 Jan 2023 17:56:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXv57TJ4PQCoSkUzqycF9wiOA7qkv7ZGWHv0d7OGskizfy0C8gvlmlnE5Za4PYTAX39fCGd3 X-Received: by 2002:a17:906:354c:b0:7c0:e988:4157 with SMTP id s12-20020a170906354c00b007c0e9884157mr36593810eja.40.1672710986608; Mon, 02 Jan 2023 17:56:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672710986; cv=none; d=google.com; s=arc-20160816; b=IxRkVs0PToLu6PZv68hbcgGovgLEmBlUNMyxsvQlx4UhzYDIpzE1pGLL0Jd9ZNnnAX xmrUk0aaj3iYHqOLB9N+TRIPe4tlaSR9xG7QuCNvx4Yezrz1Udy+qgMiQicqBpf9L/sr LATSlVy0f50BUthNz/3iCmo91qAr4dCZq13lP+IF5HXVy+wCIFvJDSjMC8K4ud6Yd/vJ R6uw7JGYMLFrXRd2iyBiW7FQDxqkLnrNjD66GeutH6gDTlv9/qtVdcv3FbvL3W89CVvR UL1FCJixnZI/c/aPHpX2c3a1G25saNazn4Rx3oZ0Sb6A5bhjNjJTTMthzKFwxmzjeGgF T90w== 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=IT85o6sYioGQ0bY4Rs90TLuneQC6cVSTc4B38KzCCgQ=; b=wmJv6UQJ4bozgkuKLdZr0uT5MpZtQIi4ldOQriB83EOt1Z6JNjyY5wVayNlLBKHs9K vQ5TnSs8ULTypxa9mbwdAILNkUfbp3ieV0b+uAWbUCnOX6mMDAH7Qq7gYkrGlOypyLK1 8SipIwmkATKuYr0ewk81k9JxxYeh/wVKIrhVq8VwP2LjFtNGEyLwaoHv4lQWPFMNhKhh A1xxpgfetmPmkxNJTKUcyMEi2GxZr+fjTqL4AkZT+lPZnyVBidCZScc6m3/XvaISqFvd 3nBRG4QBWNqKg0VR3cNVc9yPJ1AmkvD5MXjE5oaj1o8QpkQ0ELCNsyi2xhiTLCI9mLcD 1MMg== 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 co27-20020a0564020c1b00b0046ac358ed89si23963570edb.219.2023.01.02.17.56.03; Mon, 02 Jan 2023 17:56:26 -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 S236604AbjACBzF (ORCPT + 99 others); Mon, 2 Jan 2023 20:55:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232504AbjACByY (ORCPT ); Mon, 2 Jan 2023 20:54:24 -0500 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D6097672; Mon, 2 Jan 2023 17:54:23 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4NmG4T356pz4f3lJw; Tue, 3 Jan 2023 09:54:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S4; Tue, 03 Jan 2023 09:54:20 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/8] block, bfq: remove unsed parameter reason in bfq_bfqq_is_slow Date: Tue, 3 Jan 2023 17:52:57 +0800 Message-Id: <20230103095303.2223546-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S4 X-Coremail-Antispam: 1UD129KBjvdXoWrtF4UJr4kCFyfGw4rAF43ZFb_yoWkWrgEq3 W8tws7AF1kAryfCFyakrWrXw1j9FWfJ3Wj9F90grZ8WF1UJ3Z8Z3srtrW5Crs3WFsF9a4a yr1Fvw4UJF409jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbfxYFVCjjxCrM7AC8VAFwI0_Xr0_Wr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r15M28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7 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_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?1753964595604193291?= X-GMAIL-MSGID: =?utf-8?q?1753964595604193291?= 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 1220c41fc767..5a6d9e8c329d 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4066,8 +4066,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; @@ -4263,7 +4262,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 Tue Jan 3 09:52:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38243 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4393994wrt; Mon, 2 Jan 2023 17:57:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXvpDhZgVNuzbHqbSrVx5cHOKwsirqPDabL94rNNwDRVM5y5rZUE+nWdGOkxankSI+9nsp38 X-Received: by 2002:a05:6402:4141:b0:461:8be6:1ac4 with SMTP id x1-20020a056402414100b004618be61ac4mr37256771eda.20.1672711045860; Mon, 02 Jan 2023 17:57:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672711045; cv=none; d=google.com; s=arc-20160816; b=w+oOu2kPM6BAUgu3VVQUkHjzyLBqFYYnHJcpu77Dg09h/jQjA1n1ABt3cjxbLrgTcp 4P2gSHRnA9BvqT/8Uvg1g7h+B9O1M9f2tVHdCo+Bfp4TByHKi5fN+BlFBMOr2Fapfelo Gt1yf3KBD06aNfa/5dwHRcEUrtZ2KjfnhgXCw37ILlx6TpMjw3rIPfHx81b9by67o6XO 9JtZ8Az3NrDi5cSdC6PpwkTvz9P5F29rzrYcqqZD/PDl0BEAaEK+63xogEUlg8ZgeVZB GTAMi+jlT3MIXiFe+OHBMVfXoiGxMK2dc7HIXB/ReA5+c1XTp+kKI0lGBIh3/W/MX1dW bZ/Q== 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=jAK0peKqc2Z4Q+qg3rSq2oJmGikYu9+n91Bky5X7kfE=; b=XyIQKkboaSTI/g9G1RLcTkFJqfHnWE0cVmdbwpV+FMchvrrbqOGkQ7v4GrbGuli3vA +PuYkNN8XZL69bioksx0x7ydZoZmfNSKQZS009p6BJSkY/oL4nmoCL77c02m3NoWnpgw O+9Ra15mcZ4vxgcbSI1s72mtPEb5b2t9ujJsbg5Gvar/iNanHX4Aoml9Lqo+AsUo2ac1 VU4DljRhzMEDiY5J9Jw9efpOyZJXVY9Jsy6XTjeaQ8zDEOdEqVqVyChe/M7vJ/L3YJ7k kNsFxUf5pLjII24lP8eNxFkFT540NRAC9nb/DPROAxwPhZKOOCJ8HsBR65gRTgS5AQex NHog== 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 r16-20020a05640251d000b004736734f6cesi28436941edd.558.2023.01.02.17.57.02; Mon, 02 Jan 2023 17:57:25 -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 S236580AbjACByj (ORCPT + 99 others); Mon, 2 Jan 2023 20:54:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230389AbjACByY (ORCPT ); Mon, 2 Jan 2023 20:54:24 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01C0C766F; Mon, 2 Jan 2023 17:54:23 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NmG4T6xhLz4f3v4j; Tue, 3 Jan 2023 09:54:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S5; Tue, 03 Jan 2023 09:54:20 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/8] block, bfq: initialize bfqq->decrease_time_jif correctly Date: Tue, 3 Jan 2023 17:52:58 +0800 Message-Id: <20230103095303.2223546-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S5 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr4Utw1kuw4fJr45tF4ruFg_yoW8Aw4xpa 9Fgr47KF1jqFy3WF1UA3WDGFy5Krs09ry7J3W2g392y3yUArnF9FsYkrWYvFWfGrs7Aw10 qw4vqr9ruw1F9FJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB0b4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 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_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?1753964657836132704?= X-GMAIL-MSGID: =?utf-8?q?1753964657836132704?= 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 5a6d9e8c329d..9441fc98961a 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5491,6 +5491,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 Tue Jan 3 09:52:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38242 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4393886wrt; Mon, 2 Jan 2023 17:57:05 -0800 (PST) X-Google-Smtp-Source: AMrXdXt+UGqyV2LeY+uNy++mqTvFpxLOY3QF7OBcmbLDqN+D5gfty1kbsGEjhBOd6RkNem9iYldU X-Received: by 2002:a17:907:7f8a:b0:7c0:e4b7:517e with SMTP id qk10-20020a1709077f8a00b007c0e4b7517emr50020383ejc.16.1672711024827; Mon, 02 Jan 2023 17:57:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672711024; cv=none; d=google.com; s=arc-20160816; b=H1Z5NdC3eIM5OrYnOIWs5s60PNKaMeH6MW2/ABMVsz6+GKJ6XmCTXF5tVmDMLs/7CW 3kc2DOPp4RKIdPtuJG6DHD7RzV/mxbq9OZRZnFFn7t1UUNNY9qzLgxtnOzblcAfkXPfq cPoIFd8+XvJbE5vdG7iYNDjCOc/V95Z3FYMDe3WcoxVCsHnTRNg6mo+7x7NB3bO3RJ0Z 9ds92TmnQXkdGkfuTQkCtWt30q0C29XAt9SJyZq2fqpVdIY6hmiwTsV7bbAxgyRWk6dE sJcG2ThZZ7KOlPDllZdeQ/HOFiR07ddj7cpzfWLapGSLg/LY6P3OX7Htr7lu7LsorAgR UrOw== 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=vyjGw6Iv/jUlvaMbQL9Hsn9bDkHICPiMhevkFaUT8No=; b=xOq01R4/uDJHmjlJOO7deVLnaxMCgGE2IsKFmNkLM711twcPYM2fLOBWx1gF6CvfQp Ws10J5hAt4MZW43uWigcr8/6ltPwc8kqAzz9XkOvPpQmrnHlwsK/k09+CNbVVycqKtF8 5WdDR3MGizeJL6FSSqhrRtL6i3nl5iCwObxLJNMWbNb8jyX05j8igVq4qkQY1SlieL3T a3/lJQ8CcG9iU64T+uFMHiPimQVxVnTFfBTfsYIn3E9s8SNwnkRInDh30bGoDjGpxYz/ vdlrcc0G6s/wbL2KWjkH4zAGWHrm97mxGZvOFhuHvcZ6sPR0HIzfKQLjLcQwxDoEciG2 uv2g== 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 g16-20020a056402321000b0048a3681fca7si11250571eda.437.2023.01.02.17.56.41; Mon, 02 Jan 2023 17:57:04 -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 S236371AbjACByZ (ORCPT + 99 others); Mon, 2 Jan 2023 20:54:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232144AbjACByY (ORCPT ); Mon, 2 Jan 2023 20:54:24 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66944767F; Mon, 2 Jan 2023 17:54:23 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NmG4V2V3jz4f3v4q; Tue, 3 Jan 2023 09:54:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S6; Tue, 03 Jan 2023 09:54:20 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/8] block, bfq: use helper macro RQ_BFQQ to get bfqq of request Date: Tue, 3 Jan 2023 17:52:59 +0800 Message-Id: <20230103095303.2223546-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S6 X-Coremail-Antispam: 1UD129KBjvdXoWrZF47Xry3Xry7Cr4UtFyrWFg_yoWfKFg_Ca yxKr93Jr1kC3y5Zr4SkFWYqFn7CFWfXFn8ur98trs8Wa43CanIy3sFqr43ZFZ8ua1DCa9x KFn0vw13ArnrujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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_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?1753964635899908664?= X-GMAIL-MSGID: =?utf-8?q?1753964635899908664?= 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 9441fc98961a..c3c4c83ee95f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -6683,14 +6683,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 Tue Jan 3 09:53:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4393753wrt; Mon, 2 Jan 2023 17:56:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWlvdwDOSECB53N+DmE7PSDlk3ES5dHzos2mRURHvItsdS/m/EchPuHHdm4wy11pQasUDM X-Received: by 2002:a17:906:9519:b0:836:3d32:2cf9 with SMTP id u25-20020a170906951900b008363d322cf9mr34974018ejx.55.1672710985924; Mon, 02 Jan 2023 17:56:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672710985; cv=none; d=google.com; s=arc-20160816; b=l1+Xg32w7pdUjdUuqMhxVkxAJtIVgAsDc5qEaQ7QoRbUr7ogCvlYzCgfwu+4gNcvJH kNKlY/RtlnydCKcpw1abNVv3jZzhNCqplBrprZTXuUyfiHHF22FvrIrIyEKwJrOSjxfk r5gJi0FnU8pLz3YKioPk2Kxln1pX81MQ3GQsdQAxJMTA5h5uIMyj6FIdUTItYjvK9omV P7vsYARnMBzEGUVUuCKH5ZO6xd9EJTQsA0rj1fLLBcQCcUtm2FFZrJRyoTJM9WFrzt19 jU0ty2E5hfQdJq0aLdkHjv6ENMwxdzq6t1QTFV9mCE7WamiH8YLR0aja7XeqJdtpAsw1 XhYg== 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=D513vcn9/GGAExB2U9LQk6xcOt25l/keofmYMptVmwE=; b=kOagVY5S3Lkg3guWzGVy2BwLPP9EentY8LJn9VOC10itOsXzKpkLVOirWE6VLaW0FJ jQ5vcOPkoE8t4AFV/IBxXLw9npjiL2D1y5Q+fFwFLP/V6muKARdkPRanJXoWXjNoU+y/ sfYD/vxqQMSgCuggIEPhDLQoNH2Msdgk06GWKZBxysKGj43MSqFfVy8WIPThQtD0+qJg AJiih+eV8yH4Ns2fKqjGGk4ruPMvfbeKDu3ZHT5SFooCVq3jAKBzXoOUi2E44HFdon+k cVJ/htpm1w5sJsFBXV3DrPuLMh9cGovneaNYXz4ZjJJQsM1Nxc8Cbm4zAvGecIcbNqX1 tp5g== 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 ho39-20020a1709070ea700b007d6105e0acfsi28627222ejc.501.2023.01.02.17.56.02; Mon, 02 Jan 2023 17:56:25 -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 S236490AbjACBzB (ORCPT + 99 others); Mon, 2 Jan 2023 20:55:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232576AbjACByY (ORCPT ); Mon, 2 Jan 2023 20:54:24 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C203F8FF1; Mon, 2 Jan 2023 17:54:23 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NmG4V5FMlz4f3v4w; Tue, 3 Jan 2023 09:54:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S7; Tue, 03 Jan 2023 09:54:21 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 5/8] block, bfq: remove unnecessary dereference to get async_bfqq Date: Tue, 3 Jan 2023 17:53:00 +0800 Message-Id: <20230103095303.2223546-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S7 X-Coremail-Antispam: 1UD129KBjvdXoWruFW7try3Ar1xGF4rCryDWrg_yoW3KFb_A3 W8KFs3AF48GFy3Cr4rAryjy3Z8KrWrX3WrGF90qr98WFnrJa1DAasFqrZ09a98uay7Ga4a qr97ury3AF1j9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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_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?1753964594715253298?= X-GMAIL-MSGID: =?utf-8?q?1753964594715253298?= 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 c3c4c83ee95f..ebcafe3c4c3b 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4835,7 +4835,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]; + bfqq = async_bfqq; else if (bfqq->waker_bfqq && bfq_bfqq_busy(bfqq->waker_bfqq) && bfqq->waker_bfqq->next_rq && From patchwork Tue Jan 3 09:53:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38241 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4393865wrt; Mon, 2 Jan 2023 17:56:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnpzeKm5DafGv4+VJUxKg/hZTcNiGUFSzCFCT//vMWOiVdoziZbeOWmmRrDI21ed2eF24s X-Received: by 2002:a17:906:40c4:b0:7c1:ad6:7333 with SMTP id a4-20020a17090640c400b007c10ad67333mr35327920ejk.10.1672711015564; Mon, 02 Jan 2023 17:56:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672711015; cv=none; d=google.com; s=arc-20160816; b=GDgvQsV7irRkdEFzPUdact0DicDERRQQcaxe3RR8JvjJhPZG7nI3C8o7a66UgocpqA Ld2qQBn2HX8LKUkxTDjCp6cz9xM0kJwHSd60xm1Z0MQNcXeFH6D6IxY/ieJ1FpWcVRHr qMar5vWFGe6fJpk84emyc5VL89pY0+nvl8sDHyllKpoFEoEJfl9gl0gjn4eEZYr9085U FA7qVXGwkqUbwLgrdBLKDMYH1hEB5jDaAM1RRz/bHhfNke9v/NjtlY7lW91qqVOsz2JI MXwLS6r7fQC/StKXm0B/GlTaCF7v04TfVDTTRMKMN4Mr1SCFgtH/gNsh+Q62j2EQmC1k N1rw== 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=YEFxs9uWWEG0vrVszRitvj/v3SB7tQhOStJezfoPqXg=; b=EKkuZEaNWTrqoeetEYX5lCA5GjI1bSPqAmysBwfPgN0u/K/YQiKcH9RvH3f5l+6IQv amnuTlykNFT+Ua8ONI5hGudk2fkrZH4wfrTGQyttbbs1sqfinEcwNhlUtlmkYb0nkLAh C3TClPEnK+hgVqtOy01A3SB/t7HAfTb+b466y4kVTfPbhkz7g1P27FU59Q9j7l6nByC8 Js4njjv4Z6/KZl03ETfS59UP/+tHUibAShmUqVyNIN7aPenC9Ok8qQqvFNRew+HS0nYs vFUWB5pB/+z8T2No6aOdV5iyhCc7fQnb4P3zwbF3P1swhzfdzDVqeDEAXbPOAde1rxbK gsZg== 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 qk34-20020a1709077fa200b008366ae33ecesi25808039ejc.171.2023.01.02.17.56.32; Mon, 02 Jan 2023 17:56:55 -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 S236630AbjACBzI (ORCPT + 99 others); Mon, 2 Jan 2023 20:55:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232723AbjACByY (ORCPT ); Mon, 2 Jan 2023 20:54:24 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CEF79593; Mon, 2 Jan 2023 17:54:24 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NmG4V75lBz4f3lXR; Tue, 3 Jan 2023 09:54:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S8; Tue, 03 Jan 2023 09:54:21 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 6/8] block, bfq: remove redundant check in bfq_put_cooperator Date: Tue, 3 Jan 2023 17:53:01 +0800 Message-Id: <20230103095303.2223546-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S8 X-Coremail-Antispam: 1UD129KBjvdXoWrKrWxAFWUXr1xWw48Gw1Utrb_yoW3GFc_t3 sYkrWrJrW8G345Ar1ftFy5Aw10yayxXF1DXF1Fqw4DXF1UGFn5Ca9FgFWayFW5Gay7Ga4a yFy0q3Zrtr4qkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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_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?1753964625736988839?= X-GMAIL-MSGID: =?utf-8?q?1753964625736988839?= 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 ebcafe3c4c3b..9ff424c78e9b 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5274,8 +5274,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 Tue Jan 3 09:53:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38240 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4393862wrt; Mon, 2 Jan 2023 17:56:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXtNdzbg77Tpm1e35agBgfs1nTDBjZssNYGNt/6vtZsO8zVPA5BKCCeNBrhe+gAfwTb5mGgx X-Received: by 2002:a17:906:a9b:b0:83d:2525:234b with SMTP id y27-20020a1709060a9b00b0083d2525234bmr1451017ejf.65.1672711014763; Mon, 02 Jan 2023 17:56:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672711014; cv=none; d=google.com; s=arc-20160816; b=mWUA341VoOfMam2hDWyR87m4mfc84boAzXHiBIMVQYuxatdt7InRZOLrJ+XZIVT7Am hZZxj+Ooz0qCrsv7zp1G9Wur0BPUTpODAZF68rPgvgASNTk0WIfDXGBL7W328zGsfcQ3 1KA3p1IfN1y1EI5VJr6eAib/3QJcn8x+c25vlZryMmmtLDJ+/HAhwZMAVLyhBQulaTJ7 knLRNglqM1BMoz2wWRxaEQ4COraSE/1+gscMC5GrNoyl4ZrW/LERC8MKMR0h3w93BT1e IuonGuTExkUIdwVFczcss3v8HADDSwPwaX4Mid6Hf5eaNNCSRNU6p8xOryHoV4aqz/0o YOww== 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=IrsfoVhGeJcthQ0zAuY6F2oPIuc7fblYYMp7L42TEmg=; b=l2NWZgYnwhdWF5ryYFRPZGnlBXSvGOqmkdeTX9BpQJkWxfjcrL/HhBHcg+EkxborE2 x1OwpCpshe+8zk6Q/B6YrdE6Mjfpp4Ayp+6DyQZn2ezucnoepTIKNhY0r+xuoDqxjGEt K4McCNhjlOtkxTHAF9a+xgjG6ho/uBDKDKu2QBopL4emU++t8/ru/myck0WooKAyR5Jj ZcPsljivGW2St4zzANEfB8jzVbQfFaj5kuRfSNBKoRQDl1mwmb8Zv+3pnHzhfqq90Qep 1sOYF+M3dx9gkCYBUL3L/pHwozK8N/QALqfmaBY/zhLGtmTVjkH3ATCuDPmkpZEeVi7y O9xA== 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 h7-20020a056402280700b0046b7410c015si31267304ede.18.2023.01.02.17.56.31; Mon, 02 Jan 2023 17:56:54 -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 S236650AbjACBzR (ORCPT + 99 others); Mon, 2 Jan 2023 20:55:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236497AbjACByZ (ORCPT ); Mon, 2 Jan 2023 20:54:25 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8416C7663; Mon, 2 Jan 2023 17:54:24 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NmG4W2ghMz4f3lXY; Tue, 3 Jan 2023 09:54:19 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S9; Tue, 03 Jan 2023 09:54:21 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 7/8] block, bfq: remove unnecessary goto tag in bfq_dispatch_rq_from_bfqq Date: Tue, 3 Jan 2023 17:53:02 +0800 Message-Id: <20230103095303.2223546-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S9 X-Coremail-Antispam: 1UD129KBjvdXoWruF4UWF4DWFyxKr47GF15urg_yoWkZFcEyF 4kKr9YyrWkCFZ8Wr4YkF4DJF4DAFW2va1DJF1Fg3y2gF17t3ZYy3sFqrsxCa95WFWIkFyY qFs0q343Jr1UXjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbSxYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq3wA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x 0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E 7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2Ij64vIr41lIxAIcV C0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUIL05UUUUU 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?1753964624785780378?= X-GMAIL-MSGID: =?utf-8?q?1753964624785780378?= We jump to tag only for returning current rq. Return directly to remove this tag. Signed-off-by: Kemeng Shi Reviewed-by: Damien Le Moal Reviewed-by: Jan Kara --- 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 9ff424c78e9b..a11be312ac77 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -4966,7 +4966,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 @@ -4986,12 +4986,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 Tue Jan 3 09:53:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 38245 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4394109wrt; Mon, 2 Jan 2023 17:57:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXvzyU7Q1T7bHCKFC7DaEzgiByH7Q9CbZWu5hXCNdaMRl5ZTxR2etP6fLAYwvVXVEinSmxeZ X-Received: by 2002:a50:eac6:0:b0:461:d042:80db with SMTP id u6-20020a50eac6000000b00461d04280dbmr36521833edp.0.1672711074176; Mon, 02 Jan 2023 17:57:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672711074; cv=none; d=google.com; s=arc-20160816; b=xBsGfBKv8aaSONjmVZYRBUpNQJhIcgbGNWTj0JxQNxG0A6L1L1eJeZjctERdQ+OS7c SVcEYktVtk75WXeBZ5Q83pwwSAK4cgg7ZAIUiYn99MVwxsNQ0MU4/4WCMyV2QsRmnyYL NGJeeTnZxynvgmgMspNwv8nlSyCR46530PZeaO1QREdBd/JLOybme8kQ92Zzi8W4O+WO crdJotqqE25QBrQlAJRVQdTuKjjZwTcggNThaJwIjeUrvhsy/95AElVx7wqITftRHQAF od2HXfbfG9zwPZyP4nc/qFCjfuy77k/sIQRdlkowx83saaszSeT2PnYgRm+Q0nkWeE2T fI9A== 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=o3nxsY3JEcqO/MjoCqE8v6VBZ5mcRuocp2jdJ1RxP00=; b=hJHjXtZ5gnFL7PjFraE+svGsKbsE8ksni+7KFwLAr6XnAp6/A2rHxZozhZjrhMMh/t 64xCH2rWcQK9rKkvWGOYqJxIxK6+XUhAD7WsrZ+2S63tBq2s5U3a3aiNWCLsaurVbijr a3tJe07DOiYtC2iy8S0SUEAwEXS8Dd23kwqbAH+5XbfITB8Zd/tHxnRY/fGE3RdQlreS V/92nSOu5RHo5wRhh/sL1i0AgyBCPFGcCv2J/zUd3IAVrdRxrZ7gRe+MDnR8f1x97hPY sS8Bx/OyJEcwj6H77LD3pR1GIrV8bD8ZIUDchFHzJKDi3+Je3Z0bEooxboQ3TuYoQoO7 JU9Q== 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 m13-20020a056402510d00b0044f2fb68fe6si28253250edd.495.2023.01.02.17.57.30; Mon, 02 Jan 2023 17:57:54 -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 S236635AbjACBzN (ORCPT + 99 others); Mon, 2 Jan 2023 20:55:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236524AbjACByZ (ORCPT ); Mon, 2 Jan 2023 20:54:25 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E30F2766C; Mon, 2 Jan 2023 17:54:24 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NmG4W650pz4f3v57; Tue, 3 Jan 2023 09:54:19 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBHr7LJirNj9wMDBA--.19481S10; Tue, 03 Jan 2023 09:54:22 +0800 (CST) From: Kemeng Shi To: jack@suse.com, paolo.valente@linaro.org, axboe@kernel.dk Cc: hch@lst.de, damien.lemoal@opensource.wdc.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 8/8] block, bfq: remove unused bfq_wr_max_time in struct bfq_data Date: Tue, 3 Jan 2023 17:53:03 +0800 Message-Id: <20230103095303.2223546-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230103095303.2223546-1-shikemeng@huaweicloud.com> References: <20230103095303.2223546-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBHr7LJirNj9wMDBA--.19481S10 X-Coremail-Antispam: 1UD129KBjvJXoW7KFyUJw1kCr15GFy8JrW8Zwb_yoW8WFWxpa 1DK347WF17Jr4FgF1DAa4rXF15ta1xuF9rKa1a9w4YyFWUXF1a93ZYyw1fX3WIvFZ3Cr4f Zw1Yqa4Dtw18KaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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_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?1753964686941454970?= X-GMAIL-MSGID: =?utf-8?q?1753964686941454970?= 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 a11be312ac77..206b41bc864e 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1068,9 +1068,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); @@ -7080,7 +7077,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 9fa89577322d..0b1a5438046a 100644 --- a/block/bfq-iosched.h +++ b/block/bfq-iosched.h @@ -719,8 +719,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;