From nobody Thu Apr 9 04:45:23 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4C90C4332F for ; Wed, 2 Nov 2022 02:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229761AbiKBCES (ORCPT ); Tue, 1 Nov 2022 22:04:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230043AbiKBCEE (ORCPT ); Tue, 1 Nov 2022 22:04:04 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A1B665C5; Tue, 1 Nov 2022 19:04:01 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4N299M5C3jz6R5KZ; Wed, 2 Nov 2022 10:01:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP2 (Coremail) with SMTP id Syh0CgCnP9QN0GFjGqzfBA--.48110S6; Wed, 02 Nov 2022 10:04:00 +0800 (CST) From: Yu Kuai To: jack@suse.cz, axboe@kernel.dk, paolo.valente@linaro.org Cc: cgroups@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, yukuai3@huawei.com, yukuai1@huaweicloud.com, yi.zhang@huawei.com Subject: [PATCH -next v4 2/5] block, bfq: factor out code to update 'active_entities' Date: Wed, 2 Nov 2022 10:25:39 +0800 Message-Id: <20221102022542.3621219-3-yukuai1@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221102022542.3621219-1-yukuai1@huaweicloud.com> References: <20221102022542.3621219-1-yukuai1@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgCnP9QN0GFjGqzfBA--.48110S6 X-Coremail-Antispam: 1UD129KBjvJXoWxAw1UWw17tr4DWF4xZF1xAFb_yoW5tF4fp3 Zxtw1UXr48JrnxWrWYy3W8Zr95Krn3C34ktF92v34rJF12krnFq3ZIy3WFvFy09rZ8XF13 AFyqqry8uF47JrDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9m14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCF04k20xvY0x0EwIxGrwCFx2 IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v2 6r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67 AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IY s7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr 0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUc6pPUUUUU= X-CM-SenderInfo: 51xn3trlr6x35dzhxuhorxvhhfrp/ X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Yu Kuai Current code is a bit ugly and hard to read. Signed-off-by: Yu Kuai Reviewed-by: Jan Kara Acked-by: Paolo Valente --- block/bfq-wf2q.c | 61 +++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 2faa29fcb1e9..a908aa3eb0ab 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -218,6 +218,26 @@ static bool bfq_no_longer_next_in_service(struct bfq_e= ntity *entity) return false; } =20 +static void bfq_inc_active_entities(struct bfq_entity *entity) +{ + struct bfq_sched_data *sd =3D entity->sched_data; + struct bfq_group *bfqg =3D container_of(sd, struct bfq_group, sched_data); + struct bfq_data *bfqd =3D (struct bfq_data *)bfqg->bfqd; + + if (bfqg !=3D bfqd->root_group) + bfqg->active_entities++; +} + +static void bfq_dec_active_entities(struct bfq_entity *entity) +{ + struct bfq_sched_data *sd =3D entity->sched_data; + struct bfq_group *bfqg =3D container_of(sd, struct bfq_group, sched_data); + struct bfq_data *bfqd =3D (struct bfq_data *)bfqg->bfqd; + + if (bfqg !=3D bfqd->root_group) + bfqg->active_entities--; +} + #else /* CONFIG_BFQ_GROUP_IOSCHED */ =20 static bool bfq_update_parent_budget(struct bfq_entity *next_in_service) @@ -230,6 +250,14 @@ static bool bfq_no_longer_next_in_service(struct bfq_e= ntity *entity) return true; } =20 +static void bfq_inc_active_entities(struct bfq_entity *entity) +{ +} + +static void bfq_dec_active_entities(struct bfq_entity *entity) +{ +} + #endif /* CONFIG_BFQ_GROUP_IOSCHED */ =20 /* @@ -456,11 +484,6 @@ static void bfq_active_insert(struct bfq_service_tree = *st, { struct bfq_queue *bfqq =3D bfq_entity_to_bfqq(entity); struct rb_node *node =3D &entity->rb_node; -#ifdef CONFIG_BFQ_GROUP_IOSCHED - struct bfq_sched_data *sd =3D NULL; - struct bfq_group *bfqg =3D NULL; - struct bfq_data *bfqd =3D NULL; -#endif =20 bfq_insert(&st->active, entity); =20 @@ -471,17 +494,10 @@ static void bfq_active_insert(struct bfq_service_tree= *st, =20 bfq_update_active_tree(node); =20 -#ifdef CONFIG_BFQ_GROUP_IOSCHED - sd =3D entity->sched_data; - bfqg =3D container_of(sd, struct bfq_group, sched_data); - bfqd =3D (struct bfq_data *)bfqg->bfqd; -#endif if (bfqq) list_add(&bfqq->bfqq_list, &bfqq->bfqd->active_list); -#ifdef CONFIG_BFQ_GROUP_IOSCHED - if (bfqg !=3D bfqd->root_group) - bfqg->active_entities++; -#endif + + bfq_inc_active_entities(entity); } =20 /** @@ -558,29 +574,16 @@ static void bfq_active_extract(struct bfq_service_tre= e *st, { struct bfq_queue *bfqq =3D bfq_entity_to_bfqq(entity); struct rb_node *node; -#ifdef CONFIG_BFQ_GROUP_IOSCHED - struct bfq_sched_data *sd =3D NULL; - struct bfq_group *bfqg =3D NULL; - struct bfq_data *bfqd =3D NULL; -#endif =20 node =3D bfq_find_deepest(&entity->rb_node); bfq_extract(&st->active, entity); =20 if (node) bfq_update_active_tree(node); - -#ifdef CONFIG_BFQ_GROUP_IOSCHED - sd =3D entity->sched_data; - bfqg =3D container_of(sd, struct bfq_group, sched_data); - bfqd =3D (struct bfq_data *)bfqg->bfqd; -#endif if (bfqq) list_del(&bfqq->bfqq_list); -#ifdef CONFIG_BFQ_GROUP_IOSCHED - if (bfqg !=3D bfqd->root_group) - bfqg->active_entities--; -#endif + + bfq_dec_active_entities(entity); } =20 /** --=20 2.31.1