From patchwork Tue Nov 8 04:52:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 16863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2485092wru; Mon, 7 Nov 2022 20:55:04 -0800 (PST) X-Google-Smtp-Source: AMsMyM6qSZDfBRMHtmTROaSjnke//UAR1N00Dk7cGfyqw/WMYULQ5D4TzOviQExvSbj8ATFMLJLd X-Received: by 2002:a17:906:5d10:b0:7ad:e132:bb85 with SMTP id g16-20020a1709065d1000b007ade132bb85mr40331917ejt.367.1667883304124; Mon, 07 Nov 2022 20:55:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667883304; cv=none; d=google.com; s=arc-20160816; b=z8SvvMPBTS3/9enqCgr9nKdhcx2mSG3SEBJ61K6r30Vc9AEQfgIyfQ3D5+FJVsYjxC f7lxUd4xBE66GFXpgQJIyWOYKK+v25QvlajPCxkCgyjcO5BoRMuW+p70vS3ci3TMXEEF fz1bD2FoPTsrQLjQ56PoYYXisD58oiQgrjFpbOraBXETN9yLd4rZf2hog0Q6RQlZva+c LBc4iKJFvkrtNsMAml53JzD6rOy0zcIYOfCOeO46lK8psiSDnySfR82H+TRRfvuf3DS9 Q19T6qQ0AwhO2ebjJbHVAt+KtTHPpswTvTqN+ly5qnZxU2EfQY3KP/g/YSexRoI+5AR0 m4ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=Q+3TVrmx9Om1trGYVtqJYiR85Jw9MmR5N70cW3+xGE8=; b=HJh3eBJhZZey7JqqDfZL7bY9QrOBBqgKn6hzucZp4RIIu6rAOYiK4vjlBIDnk+WFT2 WWo7KNudCAOPjGfWI13NW6b4YTUK3ZhOuJZ7mHP/Vp0KADI48/oEDIyLSOs+H158gm5F 06mpQ9Al1wtvZtJjH5iGMjU1/YTchTe7k91rjlb1BUqCwZ7+G3u3tA6bdpjLtjKoSnoE RZJCw+XJi6Rn8jyBj93DMlxSRFr7HV43RILUQjU/4UlgLISdQ1KJ9eLI7NFugG8smGWc eSInsQ5C2MvUaEeuJ1EfE4KFm3lgQ0mM+ksLv56uiexBQ1BN+Ris5WA72AeQKHF3W5uU ncSw== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g20-20020a056402181400b0045829a1c0b3si10126391edy.251.2022.11.07.20.54.39; Mon, 07 Nov 2022 20:55: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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233338AbiKHExY (ORCPT + 99 others); Mon, 7 Nov 2022 23:53:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233135AbiKHEwn (ORCPT ); Mon, 7 Nov 2022 23:52:43 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76D8B326E2; Mon, 7 Nov 2022 20:52:34 -0800 (PST) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N5wgp0BfMz15MSb; Tue, 8 Nov 2022 12:52:22 +0800 (CST) Received: from huawei.com (10.174.178.129) by kwepemi500016.china.huawei.com (7.221.188.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 8 Nov 2022 12:52:32 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 08/10] block, bfq: remove unnecessary goto tag in bfq_dispatch_rq_from_bfqq Date: Tue, 8 Nov 2022 12:52:22 +0800 Message-ID: <20221108045224.19092-9-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221108045224.19092-1-shikemeng@huawei.com> References: <20221108045224.19092-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemi500016.china.huawei.com (7.221.188.220) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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?1748902403534399107?= X-GMAIL-MSGID: =?utf-8?q?1748902403534399107?= We jump to tag only for returning current rq. Return directly to remove this tag. 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 cffc5ff66ee6..64c1249d8eda 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5031,7 +5031,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 @@ -5051,12 +5051,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; }