Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp2307199ioo; Sat, 28 May 2022 09:43:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyli45JMFUot22s9yg3UftyZLt1EKcgfsI8hZ83XMMl85Ny3xBj18hsRvjaiIhWFoxILtif X-Received: by 2002:a17:90a:930b:b0:1bf:ac1f:6585 with SMTP id p11-20020a17090a930b00b001bfac1f6585mr14100032pjo.88.1653756199114; Sat, 28 May 2022 09:43:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653756199; cv=none; d=google.com; s=arc-20160816; b=UNaoVGQGzEBwv1pR8WjhNKSqOmBzhVtwKszRVZH/tmfkgP+j5ejMo3nXrKvd8H3gdL MbrovyuAnZmsOJlZ2Lk5SKJJV4jqxAx8c2sVDA1B4vq3FtjOgmSkMLoQeXzX3Xlh/2vE G32s+T1e/nkuKohUlCDTSMf7AxlkBSmljEV0MPXXAoifmH2GBI2tI/gge8fBApUV1gHh KqZISESVLecTK8K07Xk1puNvmoinT37nxjhoQ2PO2tqe1jf9Z5Y7QwYX5K7zQ68aC7Zk cekuIh3dKqQ7dbd+VXcV15o9wHwBonz5jpP7D/oWEejiMHOrXtcevXpmpbBPMk8PQMEN rl3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :mime-version:user-agent:date:message-id:from:references:cc:to :subject; bh=TMd/bqMDykzSU8xf42iDcMcMwX4rbUkGbqAxgGvnmmY=; b=ENhrstiU9qRdIlnLk9SDiby6g8rG5u9hzngBgeuRSm0FSspnLZ2OvkIIL5b6iF8e2i WhFNk82Gft6XBkKbetS5swRsl+rYhLWZsFfg6KMlSur6Rb+Kjl6LxVmNebA0GUPP9fwI DPySCcEGDjwVzrRqwTuYBQirYW84Z48jEmiHN8chUJCcOrm4qR1jY1bNFgB4kkypd5VV KshItmvaF/gOErU22o5sqACgSfItPLf1wf7/RSqRUI2CWoG48Zekl27VQUUmcSLCAQJD gkD2oX2BbOiMiqRLv9skkOn3C2w5i8+hdNAChZw6WxRfmyapHDmeZEI+24seeFlzSkeX x6Yg== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i1-20020a17090a4b8100b001df6b7a8a91si6171891pjh.109.2022.05.28.09.42.58; Sat, 28 May 2022 09:43:19 -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 S231883AbiE1IjX (ORCPT + 99 others); Sat, 28 May 2022 04:39:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229538AbiE1IjW (ORCPT ); Sat, 28 May 2022 04:39:22 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C48271FCE3; Sat, 28 May 2022 01:39:20 -0700 (PDT) Received: from kwepemi500017.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4L9FTC6PfNzDqTd; Sat, 28 May 2022 16:39:11 +0800 (CST) Received: from kwepemm600009.china.huawei.com (7.193.23.164) by kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 28 May 2022 16:39:18 +0800 Received: from [10.174.176.73] (10.174.176.73) by kwepemm600009.china.huawei.com (7.193.23.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 28 May 2022 16:39:18 +0800 Subject: Re: [PATCH -next v6 2/3] block, bfq: refactor the counting of 'num_groups_with_pending_reqs' To: Paolo Valente CC: Jan Kara , Tejun Heo , Jens Axboe , , , , References: <20220523131818.2798712-1-yukuai3@huawei.com> <20220523131818.2798712-3-yukuai3@huawei.com> From: Yu Kuai Message-ID: <159f8c28-db93-6289-3df2-f88e8fbb3d32@huawei.com> Date: Sat, 28 May 2022 16:39:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="gbk"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.176.73] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600009.china.huawei.com (7.193.23.164) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 ?? 2022/05/28 16:27, Paolo Valente ะด??: > > >> Il giorno 23 mag 2022, alle ore 15:18, Yu Kuai ha scritto: >> >> Currently, bfq can't handle sync io concurrently as long as they >> are not issued from root group. This is because >> 'bfqd->num_groups_with_pending_reqs > 0' is always true in >> bfq_asymmetric_scenario(). >> >> The way that bfqg is counted into 'num_groups_with_pending_reqs': >> >> Before this patch: >> 1) root group will never be counted. >> 2) Count if bfqg or it's child bfqgs have pending requests. >> 3) Don't count if bfqg and it's child bfqgs complete all the requests. >> >> After this patch: >> 1) root group is counted. >> 2) Count if bfqg have at least one bfqq that is marked busy. >> 3) Don't count if bfqg doesn't have any busy bfqqs. >> >> The main reason to use busy state of bfqq instead of 'pending requests' >> is that bfqq can stay busy after dispatching the last request if idling >> is needed for service guarantees. >> >> With this change, the occasion that only one group is activated can be >> detected, and next patch will support concurrent sync io in the >> occasion. >> >> This patch also rename 'num_groups_with_pending_reqs' to >> 'num_groups_with_busy_queues'. >> >> Signed-off-by: Yu Kuai >> Reviewed-by: Jan Kara >> --- >> block/bfq-iosched.c | 46 ++----------------------------------- >> block/bfq-iosched.h | 55 ++++++--------------------------------------- >> block/bfq-wf2q.c | 19 ++++------------ >> 3 files changed, 13 insertions(+), 107 deletions(-) >> >> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c >> index e47c75f1fa0f..609b4e894684 100644 >> --- a/block/bfq-iosched.c >> +++ b/block/bfq-iosched.c >> @@ -844,7 +844,7 @@ static bool bfq_asymmetric_scenario(struct bfq_data *bfqd, >> >> return varied_queue_weights || multiple_classes_busy >> #ifdef CONFIG_BFQ_GROUP_IOSCHED >> - || bfqd->num_groups_with_pending_reqs > 0 >> + || bfqd->num_groups_with_busy_queues > 0 >> #endif >> ; >> } >> @@ -962,48 +962,6 @@ void __bfq_weights_tree_remove(struct bfq_data *bfqd, >> void bfq_weights_tree_remove(struct bfq_data *bfqd, >> struct bfq_queue *bfqq) >> { >> - struct bfq_entity *entity = bfqq->entity.parent; >> - >> - for_each_entity(entity) { >> - struct bfq_sched_data *sd = entity->my_sched_data; >> - >> - if (sd->next_in_service || sd->in_service_entity) { >> - /* >> - * entity is still active, because either >> - * next_in_service or in_service_entity is not >> - * NULL (see the comments on the definition of >> - * next_in_service for details on why >> - * in_service_entity must be checked too). >> - * >> - * As a consequence, its parent entities are >> - * active as well, and thus this loop must >> - * stop here. >> - */ >> - break; >> - } >> - >> - /* >> - * The decrement of num_groups_with_pending_reqs is >> - * not performed immediately upon the deactivation of >> - * entity, but it is delayed to when it also happens >> - * that the first leaf descendant bfqq of entity gets >> - * all its pending requests completed. The following >> - * instructions perform this delayed decrement, if >> - * needed. See the comments on >> - * num_groups_with_pending_reqs for details. >> - */ >> - if (entity->in_groups_with_pending_reqs) { >> - entity->in_groups_with_pending_reqs = false; >> - bfqd->num_groups_with_pending_reqs--; >> - } >> - } >> - >> - /* >> - * Next function is invoked last, because it causes bfqq to be >> - * freed if the following holds: bfqq is not in service and >> - * has no dispatched request. DO NOT use bfqq after the next >> - * function invocation. >> - */ >> __bfq_weights_tree_remove(bfqd, bfqq, >> &bfqd->queue_weights_tree); >> } >> @@ -7107,7 +7065,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) >> bfqd->idle_slice_timer.function = bfq_idle_slice_timer; >> >> bfqd->queue_weights_tree = RB_ROOT_CACHED; >> - bfqd->num_groups_with_pending_reqs = 0; >> + bfqd->num_groups_with_busy_queues = 0; >> >> INIT_LIST_HEAD(&bfqd->active_list); >> INIT_LIST_HEAD(&bfqd->idle_list); >> diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h >> index 3847f4ab77ac..b71a088a7f1d 100644 >> --- a/block/bfq-iosched.h >> +++ b/block/bfq-iosched.h >> @@ -197,9 +197,6 @@ struct bfq_entity { >> /* flag, set to request a weight, ioprio or ioprio_class change */ >> int prio_changed; >> >> - /* flag, set if the entity is counted in groups_with_pending_reqs */ >> - bool in_groups_with_pending_reqs; >> - >> /* last child queue of entity created (for non-leaf entities) */ >> struct bfq_queue *last_bfqq_created; >> }; >> @@ -495,52 +492,14 @@ struct bfq_data { >> struct rb_root_cached queue_weights_tree; >> >> /* >> - * Number of groups with at least one descendant process that >> - * has at least one request waiting for completion. Note that >> - * this accounts for also requests already dispatched, but not >> - * yet completed. Therefore this number of groups may differ >> - * (be larger) than the number of active groups, as a group is >> - * considered active only if its corresponding entity has >> - * descendant queues with at least one request queued. This >> - * number is used to decide whether a scenario is symmetric. >> - * For a detailed explanation see comments on the computation >> - * of the variable asymmetric_scenario in the function >> - * bfq_better_to_idle(). >> - * >> - * However, it is hard to compute this number exactly, for >> - * groups with multiple descendant processes. Consider a group >> - * that is inactive, i.e., that has no descendant process with >> - * pending I/O inside BFQ queues. Then suppose that >> - * num_groups_with_pending_reqs is still accounting for this >> - * group, because the group has descendant processes with some >> - * I/O request still in flight. num_groups_with_pending_reqs >> - * should be decremented when the in-flight request of the >> - * last descendant process is finally completed (assuming that >> - * nothing else has changed for the group in the meantime, in >> - * terms of composition of the group and active/inactive state of child >> - * groups and processes). To accomplish this, an additional >> - * pending-request counter must be added to entities, and must >> - * be updated correctly. To avoid this additional field and operations, >> - * we resort to the following tradeoff between simplicity and >> - * accuracy: for an inactive group that is still counted in >> - * num_groups_with_pending_reqs, we decrement >> - * num_groups_with_pending_reqs when the first descendant >> - * process of the group remains with no request waiting for >> - * completion. >> - * >> - * Even this simpler decrement strategy requires a little >> - * carefulness: to avoid multiple decrements, we flag a group, >> - * more precisely an entity representing a group, as still >> - * counted in num_groups_with_pending_reqs when it becomes >> - * inactive. Then, when the first descendant queue of the >> - * entity remains with no request waiting for completion, >> - * num_groups_with_pending_reqs is decremented, and this flag >> - * is reset. After this flag is reset for the entity, >> - * num_groups_with_pending_reqs won't be decremented any >> - * longer in case a new descendant queue of the entity remains >> - * with no request waiting for completion. >> + * Number of groups with at least one bfqq that is marked busy, >> + * and this number is used to decide whether a scenario is symmetric. >> + * Note that bfqq is busy doesn't mean that the bfqq contains requests. >> + * If idling is needed for service guarantees, bfqq will stay busy >> + * after dispatching the last request, see details in >> + * __bfq_bfqq_expire(). >> */ >> - unsigned int num_groups_with_pending_reqs; >> + unsigned int num_groups_with_busy_queues; >> >> /* >> * Per-class (RT, BE, IDLE) number of bfq_queues containing >> diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c >> index d9ff33e0be38..42464e6ff40c 100644 >> --- a/block/bfq-wf2q.c >> +++ b/block/bfq-wf2q.c >> @@ -220,12 +220,14 @@ static bool bfq_no_longer_next_in_service(struct bfq_entity *entity) >> >> static void bfq_inc_busy_queues(struct bfq_queue *bfqq) >> { >> - bfqq_group(bfqq)->busy_queues++; >> + if (!(bfqq_group(bfqq)->busy_queues++)) >> + bfqq->bfqd->num_groups_with_busy_queues++; >> } >> >> static void bfq_dec_busy_queues(struct bfq_queue *bfqq) >> { >> - bfqq_group(bfqq)->busy_queues--; >> + if (!(--bfqq_group(bfqq)->busy_queues)) > > Are you sure this is correct? You want to decrement > num_groups_with_busy_queues if busy_queues switches from 1 to 0. But > if busy_queues == 1, then !(busy_queues) is false. Hi, Paolo I'm sure this is correct. if busy_queues == 1, then !(--busy_queues) is true; while !(busy_queues--) is false. Thanks, Kuai > > Paolo > >> + bfqq->bfqd->num_groups_with_busy_queues--; >> } >> >> #else /* CONFIG_BFQ_GROUP_IOSCHED */ >> @@ -1002,19 +1004,6 @@ static void __bfq_activate_entity(struct bfq_entity *entity, >> entity->on_st_or_in_serv = true; >> } >> >> -#ifdef CONFIG_BFQ_GROUP_IOSCHED >> - if (!bfq_entity_to_bfqq(entity)) { /* bfq_group */ >> - struct bfq_group *bfqg = >> - container_of(entity, struct bfq_group, entity); >> - struct bfq_data *bfqd = bfqg->bfqd; >> - >> - if (!entity->in_groups_with_pending_reqs) { >> - entity->in_groups_with_pending_reqs = true; >> - bfqd->num_groups_with_pending_reqs++; >> - } >> - } >> -#endif >> - >> bfq_update_fin_time_enqueue(entity, st, backshifted); >> } >> >> -- >> 2.31.1 >> > > . >