From patchwork Thu Nov 30 16:12:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 171975 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp501883vqy; Thu, 30 Nov 2023 08:13:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGFNGJY9xSw3TpzGqbg0GdFgzdRqGaAAZlRseHcsusIA8AqR9qi84JDttFi4NBJLvrMp4Fu X-Received: by 2002:a05:6a00:1a8c:b0:6be:4e6e:2a85 with SMTP id e12-20020a056a001a8c00b006be4e6e2a85mr25188321pfv.30.1701360804962; Thu, 30 Nov 2023 08:13:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701360804; cv=none; d=google.com; s=arc-20160816; b=w2jsL0kmXtMk23zX4yRIsx5jS+D8XkS9FWuwS6IxO5Q0EqH3j1xCKtGoregqtR9ZJZ Vj45rdKslO5YPjMWMq9zdV8B1cGQgxhCe8Vu0F0KX8MzK7vfXv43EGbXbmeQVHhVtyej SAM0CSCgM8O7fPp4QwrzjHzkgLZj+6oVrt2Fr0ocXsdUqq/XJRd3zcnumqw9JnZ9+7Gd EIxMs0NfKZKovmRj2xTjXccro+VzonG/wL5l1ELUR6gzaOt5yuw4vATTySEC2AMPhhV5 DOFdCfVKbP5Z5f9HEosImUJSRRjhuIGSv5LjzOJsEPbKlQgsPAjT+yQmTPlvjzJ8OZYb cLCA== 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 :dkim-signature; bh=c5v5HF9JM8HvOIjXsHVTbSVoKzguZO3nxGABkNDWM40=; fh=rccdXjDr7taJt1Xx8LyTJhkceurMd91O1K8pulqufws=; b=D3USUWoSSNrgYvaeoW5XMRvAJMorTP5iponyPwHqr1ALAW4kUgcIFxBA3LcqLHbTtz skumwapsOMRfEZlRIXuGoHEFkJTi5TujEJ1GY1lBvxV0jRjL/qmrijGMrT1qocXQGN3d dwF9id7KfqfDGGo+Fe02TDyoIXu1c9rRBZReuRsXXMbRjwKa1dGWCJU9nZUmEzfGDrWs PXEzQJg5HKjClbg4/Y4109mfiqCzIH5mJ/E5svvILHKSVdHe+Tv7wTgWF/UU99Jp1TdZ 69kG0BgL5s5ILpLVDQ6Bv6bfabyqz9R3YXoAgyYJYWCJVgAecNq60mcOKvI+GyzenM33 1b1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E3eN80Yd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id bw5-20020a056a00408500b006cb4f312136si1570559pfb.200.2023.11.30.08.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 08:13:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E3eN80Yd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id BC45E8048696; Thu, 30 Nov 2023 08:13:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232098AbjK3QNO (ORCPT + 99 others); Thu, 30 Nov 2023 11:13:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231796AbjK3QNK (ORCPT ); Thu, 30 Nov 2023 11:13:10 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A6D3E0 for ; Thu, 30 Nov 2023 08:13:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701360795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c5v5HF9JM8HvOIjXsHVTbSVoKzguZO3nxGABkNDWM40=; b=E3eN80Yd5Nqyf2WeCGr7M3jQGMg36Hg0zz7Xq5K/bID7CwTXHT6aFQnggbr1RMS/ogAhKI kx4fIQN+Fp+GXLkAvrlJNajg2jkmeArB188g2wYSyPRzl3bHuyoDH/bmESPIPTFwmvDQk6 wUQEWHGnn80oc/RTMXvelKSg6UCEdDg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-79-AP2U17PkP3mX6PHHWNr1uQ-1; Thu, 30 Nov 2023 11:13:13 -0500 X-MC-Unique: AP2U17PkP3mX6PHHWNr1uQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2057B1C0634D; Thu, 30 Nov 2023 16:13:11 +0000 (UTC) Received: from vschneid-thinkpadt14sgen2i.remote.csb (unknown [10.39.195.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6DB0AC15881; Thu, 30 Nov 2023 16:13:08 +0000 (UTC) From: Valentin Schneider To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Phil Auld , Clark Williams , Tomas Glozar Subject: [RFC PATCH 2/2] sched/fair: Repurpose cfs_rq_throttled() Date: Thu, 30 Nov 2023 17:12:44 +0100 Message-ID: <20231130161245.3894682-3-vschneid@redhat.com> In-Reply-To: <20231130161245.3894682-1-vschneid@redhat.com> References: <20231130161245.3894682-1-vschneid@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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 X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 30 Nov 2023 08:13:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784006107343075301 X-GMAIL-MSGID: 1784006107343075301 cfs_rq->throttled is now never set, as cfs_rq's are never fully throttled but rather stay in limbo as tasks are slowly plucked out of them. Get rid of cfs_rq->throttled, and repurpose cfs_rq_throttled() to use the limbo meaning. Signed-off-by: Valentin Schneider --- kernel/sched/fair.c | 57 ++++++-------------------------------------- kernel/sched/sched.h | 3 +-- 2 files changed, 8 insertions(+), 52 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 27aee13e7ccd9..fd3a0c388fabd 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5497,7 +5497,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec) if (likely(cfs_rq->runtime_remaining > 0)) return; - if (cfs_rq->throttled || cfs_rq->in_throttle_limbo) + if (cfs_rq->in_throttle_limbo) return; /* * if we're unable to extend our runtime we resched so that the active @@ -5518,7 +5518,7 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec) static inline int cfs_rq_throttled(struct cfs_rq *cfs_rq) { - return cfs_bandwidth_used() && cfs_rq->throttled; + return cfs_bandwidth_used() && cfs_rq->in_throttle_limbo; } /* check whether cfs_rq, or any parent, is throttled */ @@ -5848,10 +5848,6 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) qcfs_rq->h_nr_running += task_delta; qcfs_rq->idle_h_nr_running += idle_task_delta; - - /* end evaluation on encountering a throttled cfs_rq */ - if (cfs_rq_throttled(qcfs_rq)) - goto unthrottle_throttle; } for_each_sched_entity(se) { @@ -5862,10 +5858,6 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq) qcfs_rq->h_nr_running += task_delta; qcfs_rq->idle_h_nr_running += idle_task_delta; - - /* end evaluation on encountering a throttled cfs_rq */ - if (cfs_rq_throttled(qcfs_rq)) - goto unthrottle_throttle; } /* At this point se is NULL and we are at root level*/ @@ -5909,7 +5901,7 @@ static void __cfsb_csd_unthrottle(void *arg) throttled_csd_list) { list_del_init(&cursor->throttled_csd_list); - if (cfs_rq_throttled(cursor) || cursor->in_throttle_limbo) + if (cfs_rq_throttled(cursor)) unthrottle_cfs_rq(cursor); } @@ -5949,7 +5941,7 @@ static void unthrottle_cfs_rq_async(struct cfs_rq *cfs_rq) { lockdep_assert_rq_held(rq_of(cfs_rq)); - if (SCHED_WARN_ON(!(cfs_rq_throttled(cfs_rq) || cfs_rq->in_throttle_limbo) || + if (SCHED_WARN_ON(!cfs_rq_throttled(cfs_rq) || cfs_rq->runtime_remaining <= 0)) return; @@ -5982,7 +5974,7 @@ static bool distribute_cfs_runtime(struct cfs_bandwidth *cfs_b) * waiting for tasks to exit the kernel. In this case we still * want to replenish. */ - if (!cfs_rq_throttled(cfs_rq) && !cfs_rq->in_throttle_limbo) + if (!cfs_rq_throttled(cfs_rq)) goto next; /* Already queued for async unthrottle */ @@ -6031,7 +6023,7 @@ static bool distribute_cfs_runtime(struct cfs_bandwidth *cfs_b) list_del_init(&cfs_rq->throttled_csd_list); - if (cfs_rq_throttled(cfs_rq) || cfs_rq->in_throttle_limbo) + if (cfs_rq_throttled(cfs_rq)) unthrottle_cfs_rq(cfs_rq); rq_unlock_irqrestore(rq, &rf); @@ -6230,10 +6222,6 @@ static void check_enqueue_throttle(struct cfs_rq *cfs_rq) if (!cfs_rq->runtime_enabled || cfs_rq->curr) return; - /* ensure the group is not already throttled */ - if (cfs_rq_throttled(cfs_rq)) - return; - /* update runtime allocation */ account_cfs_rq_runtime(cfs_rq, 0); if (cfs_rq->runtime_remaining <= 0) @@ -6266,13 +6254,6 @@ static bool check_cfs_rq_runtime(struct cfs_rq *cfs_rq) if (likely(!cfs_rq->runtime_enabled || cfs_rq->runtime_remaining > 0)) return false; - /* - * it's possible for a throttled entity to be forced into a running - * state (e.g. set_curr_task), in this case we're finished. - */ - if (cfs_rq_throttled(cfs_rq)) - return true; - return throttle_cfs_rq(cfs_rq); } @@ -6705,10 +6686,6 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running = 1; - /* end evaluation on encountering a throttled cfs_rq */ - if (cfs_rq_throttled(cfs_rq)) - goto enqueue_throttle; - flags = ENQUEUE_WAKEUP; } @@ -6724,10 +6701,6 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running = 1; - - /* end evaluation on encountering a throttled cfs_rq */ - if (cfs_rq_throttled(cfs_rq)) - goto enqueue_throttle; } /* At this point se is NULL and we are at root level*/ @@ -6750,7 +6723,6 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (!task_new) update_overutilized_status(rq); -enqueue_throttle: assert_list_leaf_cfs_rq(rq); hrtick_update(rq); @@ -6783,10 +6755,6 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running = 1; - /* end evaluation on encountering a throttled cfs_rq */ - if (cfs_rq_throttled(cfs_rq)) - goto dequeue_throttle; - /* Don't dequeue parent if it has other entities besides us */ if (cfs_rq->load.weight) { /* Avoid re-evaluating load for this entity: */ @@ -6815,10 +6783,6 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (cfs_rq_is_idle(cfs_rq)) idle_h_nr_running = 1; - /* end evaluation on encountering a throttled cfs_rq */ - if (cfs_rq_throttled(cfs_rq)) - goto dequeue_throttle; - } /* At this point se is NULL and we are at root level*/ @@ -6828,7 +6792,6 @@ static void dequeue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (unlikely(!was_sched_idle && sched_idle_rq(rq))) rq->next_balance = jiffies; -dequeue_throttle: util_est_update(&rq->cfs, p, task_sleep); hrtick_update(rq); } @@ -9582,7 +9545,7 @@ static inline int check_misfit_status(struct rq *rq, struct sched_domain *sd) * Something like: * * { 0 1 2 3 } { 4 5 6 7 } - * * * * * + * * * * * * * If we were to balance group-wise we'd place two tasks in the first group and * two tasks in the second group. Clearly this is undesired as it will overload @@ -12642,9 +12605,6 @@ static void propagate_entity_cfs_rq(struct sched_entity *se) { struct cfs_rq *cfs_rq = cfs_rq_of(se); - if (cfs_rq_throttled(cfs_rq)) - return; - if (!throttled_hierarchy(cfs_rq)) list_add_leaf_cfs_rq(cfs_rq); @@ -12656,9 +12616,6 @@ static void propagate_entity_cfs_rq(struct sched_entity *se) update_load_avg(cfs_rq, se, UPDATE_TG); - if (cfs_rq_throttled(cfs_rq)) - break; - if (!throttled_hierarchy(cfs_rq)) list_add_leaf_cfs_rq(cfs_rq); } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index be29154d93898..7f1afee52a776 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -631,9 +631,8 @@ struct cfs_rq { u64 throttled_clock_pelt_time; u64 throttled_clock_self; u64 throttled_clock_self_time; - int throttled; - int throttle_count; int in_throttle_limbo; + int throttle_count; /* Temp storage for updating the counts during unthrottling */ unsigned int unthrottled_h_nr_running; unsigned int unthrottled_idle_h_nr_running;