[v2,06/10] block, bfq: remove redundant bfqd->rq_in_driver > 0 check in bfq_add_request
Message ID | 20221216111230.3638832-7-shikemeng@huaweicloud.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp743794wrn; Thu, 15 Dec 2022 19:15:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf4DhRaoedYOEcnhYmkxCDHe8ChZbOzp3NeBskR53116IDnYdWAZtVkmR1LWfnD88mKYlpwO X-Received: by 2002:a17:906:fb13:b0:7c1:ed:171c with SMTP id lz19-20020a170906fb1300b007c100ed171cmr25066156ejb.26.1671160530349; Thu, 15 Dec 2022 19:15:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671160530; cv=none; d=google.com; s=arc-20160816; b=JKkdNwMcRdVHp2OU5KPxCbLCZyCIFONVkSvy4eQk27oPqa5xmIoOmGsOUXb2ilVcf1 zs7x2qJyHyCzpAHnV5utfL2JYcCJKrZf2cBfcvKGqlchiJmBB9RGNULkTDD3jRaGMR/z 4vvy6sWCX6nWe9uL4cohED8A9ll3t9tMtSGQ/rm7rFo/yg+28ukbdoL4nVL444QsPxAf EwcR7YsJLWxVODsVEBITVZaCUvbfw5so7XiFddFC9eb9/BxEqtQzQnS8GmlrJFfOmzGz Jzuktg7s4/egcUz5WG+hE9099kWYlGHTmOJCAB0WkPcDRnRMx0D+ffQyx0Bk5WLyt8Ys w19w== 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=Ebw829iA6/tS/6Yk+JvfRUBC7Hmo54/hFdFY2s9cftY=; b=qNpmpYylVaEmqTPg3+I7jpYY12HSE6PgEx2hYz9cWC5vIbNMmW8D5j6fhyMcX8TEQK aVUupxDiBk8Pv8uqcwGeQwLO5sYPA6qVQ0PxIWSd5HnU6vrQLPvEvUQ2BNIzZUKy8uOu 8y+2i5gMQTGHzLWwUAS7POK8IrGlIliyOE/8wFmeGQIQfNagVzj8g3RBFX5xiLJvLarq 7k62WWAPhxpH/bG6J5/drf8M/IQJVVSn0q76gR2D5+ibzo974rTA1wSqsFsMxSL1jZ4j XccJz/j4Rx+3F5TcYS2TyCVrfrAlKzmwGDbSQOfp8u8pIuD2zketJDHxdaih1BMGQjSH R67g== 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 go31-20020a1709070d9f00b007c841b8fa31si1327262ejc.629.2022.12.15.19.15.07; Thu, 15 Dec 2022 19:15:30 -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 S229735AbiLPDOB (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Thu, 15 Dec 2022 22:14:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229782AbiLPDNe (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 15 Dec 2022 22:13:34 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D39B2AE3E; Thu, 15 Dec 2022 19:13:34 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NYDh84F29z4f4Dwx; Fri, 16 Dec 2022 11:13:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXiNVW4ptjHYxACQ--.50238S8; Fri, 16 Dec 2022 11:13:31 +0800 (CST) From: Kemeng Shi <shikemeng@huaweicloud.com> To: jack@suse.cz, paolo.valente@linaro.org, tj@kernel.org, josef@toxicpanda.com, axboe@kernel.dk Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linfeilong@huawei.com, liuzhiqiang@26.com, shikemeng@huaweicloud.com Subject: [PATCH v2 06/10] block, bfq: remove redundant bfqd->rq_in_driver > 0 check in bfq_add_request Date: Fri, 16 Dec 2022 19:12:26 +0800 Message-Id: <20221216111230.3638832-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20221216111230.3638832-1-shikemeng@huaweicloud.com> References: <20221216111230.3638832-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: gCh0CgAXiNVW4ptjHYxACQ--.50238S8 X-Coremail-Antispam: 1UD129KBjvdXoWrZw48Cw4xJw1xGw4UWryrXrb_yoWfArb_Ca 18Grn7Gr1kGr45Arn0y3W5Zw10yF4fXFn5AryY9r1aqF17Ga1vy39Fqry5KF4DCa9rJ3Wa yr4FvFyrJrWvvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbvkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwACI402YVCY1x02628vn2kIc2xKxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkE bVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67 AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI 42IY6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCw CI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnI WIevJa73UjIFyTuYvjTRKfOwUUUUU 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752338824345718022?= X-GMAIL-MSGID: =?utf-8?q?1752338824345718022?= |
Series |
A few bugfix and cleancode patch for bfq
|
|
Commit Message
Kemeng Shi
Dec. 16, 2022, 11:12 a.m. UTC
The bfqd->rq_in_driver > 0 check is along with previous
"bfqd->rq_in_driver == 0 ||" check, so no need to re-check
bfqd->rq_in_driver > 0.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
block/bfq-iosched.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index ebcafe3c4c3b..7c91d16dbf6f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2204,8 +2204,7 @@ static void bfq_add_request(struct request *rq) */ if (bfqq == bfqd->in_service_queue && (bfqd->rq_in_driver == 0 || - (bfqq->last_serv_time_ns > 0 && - bfqd->rqs_injected && bfqd->rq_in_driver > 0)) && + (bfqq->last_serv_time_ns > 0 && bfqd->rqs_injected)) && time_is_before_eq_jiffies(bfqq->decrease_time_jif + msecs_to_jiffies(10))) { bfqd->last_empty_occupied_ns = ktime_get_ns();