From patchwork Tue Nov 1 09:34:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13587 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2847093wru; Tue, 1 Nov 2022 02:39:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM43DaklywIcwtdnVmqc5lLHAZf9Q8RPwnVxt4lTjuAO4QQS24G4Kg5NmT3rEbtAe6QfBJla X-Received: by 2002:a17:90b:3851:b0:213:7a2e:898a with SMTP id nl17-20020a17090b385100b002137a2e898amr28713531pjb.130.1667295563254; Tue, 01 Nov 2022 02:39:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667295563; cv=none; d=google.com; s=arc-20160816; b=B+g5Yk+0sL1ZdH/a493IAQKEQFQilo/QkaH+KNatbIPEvfU/n+XuqknvIZ+VKvAIJP Frq59i6f57W05LWfPFQNacEtWHyoP1wcZz86nviA0Fk7LFfybV5NVWEVbglJX9cgzTgt /D7gB+uo86fLXacCXVe/g80UgAiK6SgE+fALYK/XQyqwJK0tlmY58h6zuHnmGGyn2nHD XWe1w4B1K+9jQ9Az9MHRKKtGUg+HUaj8qwthum8xXCf8gVSrCJWRk/zkilY7CI50aQQv S1i6QmgLD5E/fKsVXanq073KntQ9xbr/IbIctJhDZBv88eFm+/vHm1XoM+Kv0UU8F3CO VWlA== 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=JL9PLbMEZTN1EJSejvtngnCHZeE8NWsJZrzJQTiHCos=; b=wcgIkIx+yf2wnaKg9CGOm7SeF03mhe7uZ9X2RtGGRHRiglw9DDIbutrOiiM8rig95u RSVS7WtMyCiNCPSMSTnoSTBUrptw8FnLbDfcqH2AeCmDnZK71UUtLzR9+JSRJDsAzPk8 6G5b8yE9wxYnV/2AtQu5qD8mkUp0C0ApXfC+xecZCi4Qy82Zsxowh+eU3imDgVOazB8K ouyxcqJ2yBO6wSwmcamKUH1KOozIaWLAF9JJl98ar5CE0PFnI5Yrce+l6fe0dKOD5qrX wX1kH1avVCRloTAyFagqyk4SxZXGTu86w9MT+Rm6QB4UY0a8WVE3HG+SkRO02+tSu30p Ptqw== 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 ge13-20020a17090b0e0d00b0021330e6afdfsi10854166pjb.146.2022.11.01.02.39.09; Tue, 01 Nov 2022 02:39:23 -0700 (PDT) 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 S230244AbiKAJfq (ORCPT + 99 others); Tue, 1 Nov 2022 05:35:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbiKAJew (ORCPT ); Tue, 1 Nov 2022 05:34:52 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8434419283; Tue, 1 Nov 2022 02:34:33 -0700 (PDT) Received: from kwepemi500016.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N1lBX0NsGzpW59; Tue, 1 Nov 2022 17:31:00 +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, 1 Nov 2022 17:34:31 +0800 From: Kemeng Shi To: , CC: , , Subject: [PATCH 20/20] block, bfq: remove unncessary process_ref check for merged queue in bfq_setup_merge Date: Tue, 1 Nov 2022 17:34:17 +0800 Message-ID: <20221101093417.10540-21-shikemeng@huawei.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20221101093417.10540-1-shikemeng@huawei.com> References: <20221101093417.10540-1-shikemeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.178.129] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) 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?1748286112166692059?= X-GMAIL-MSGID: =?utf-8?q?1748286112166692059?= As we already check process_refs of original new_bfqq is not zero. The later new_bfqq maybe the merged queue of original new_bfqq which inherit the process_refs of original new_bfqq which is not zero, so process_refs of merged queue will not be zero. Remove unncessary check for merged queue and remove new_process_refs which will not be used. Signed-off-by: Kemeng Shi --- 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 589ab59abcf5..0736577bfbfe 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -2740,7 +2740,7 @@ static struct bfq_queue *bfq_find_close_cooperator(struct bfq_data *bfqd, static struct bfq_queue * bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) { - int process_refs, new_process_refs; + int process_refs; /* * If there are no process references on the new_bfqq, then it is @@ -2758,12 +2758,11 @@ bfq_setup_merge(struct bfq_queue *bfqq, struct bfq_queue *new_bfqq) } process_refs = bfqq_process_refs(bfqq); - new_process_refs = bfqq_process_refs(new_bfqq); /* * If the process for the bfqq has gone away, there is no * sense in merging the queues. */ - if (process_refs == 0 || new_process_refs == 0) + if (process_refs == 0) return NULL; /*