From nobody Wed Feb 11 20:03:06 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 B1311CA0EC3 for ; Tue, 12 Sep 2023 10:34:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234044AbjILKdm (ORCPT ); Tue, 12 Sep 2023 06:33:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234380AbjILKag (ORCPT ); Tue, 12 Sep 2023 06:30:36 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4197B171F; Tue, 12 Sep 2023 03:28:59 -0700 (PDT) Date: Tue, 12 Sep 2023 10:28:57 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694514537; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VXRRfkFwSrMNvUqDICWKRhyF5qixjDDPRyBswJVjB5g=; b=VKa2aIhn3L2I725I6DMPv3XQvNl5zPYoUvPze6uTxVLOjWFHrNuOgRY4Wlcsdd+8zGUSlT JxyoqtoxKEyCBdYmLlizemCdIencynzjboAMw3EGlZN8IdwJneKtQNiRlVa0p/RcZwY8jz vtwecfDXLN4kYH5rPOkyHjDw4mOtM6+2HyBh8qb0EITOcAsJpOYHCnNAlf3/BLkNh+GUiT iFgkDWvrBYnmL84Ey//EvvqvDfsZAIIS+AvfXVNtnM1uQFU9Wy1lVvUP9HkYAJTtuubeva PPpQTM0frjbstz8ewUFWiOC9yr1+1fzEqqhFSc5MM+5k0JYuXRzwy/8p5utPlg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694514537; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VXRRfkFwSrMNvUqDICWKRhyF5qixjDDPRyBswJVjB5g=; b=LHvOw+5pfsfOSlHpburzjoj5PP8PUSyACvT2RBXmaxMnUyFBtzddKbxquTrfcWz0/38x6u l1H4O8i6sU0BOBBA== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched: Simplify tg_set_cfs_bandwidth() Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169451453718.27769.14337569530437107129.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: f838a17459e09ec1d573d71f1575aea8c85cccd5 Gitweb: https://git.kernel.org/tip/f838a17459e09ec1d573d71f1575aea8c= 85cccd5 Author: Peter Zijlstra AuthorDate: Fri, 09 Jun 2023 20:45:16 +02:00 Committer: root CommitterDate: Sat, 09 Sep 2023 15:10:17 +02:00 sched: Simplify tg_set_cfs_bandwidth() Use guards to reduce gotos and simplify control flow. Signed-off-by: Peter Zijlstra (Intel) --- include/linux/cpu.h | 2 ++ kernel/sched/core.c | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 6e6e57e..3520613 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -148,6 +148,8 @@ static inline int remove_cpu(unsigned int cpu) { return= -EPERM; } static inline void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) { } #endif /* !CONFIG_HOTPLUG_CPU */ =20 +DEFINE_LOCK_GUARD_0(cpus_read_lock, cpus_read_lock(), cpus_read_unlock()) + #ifdef CONFIG_PM_SLEEP_SMP extern int freeze_secondary_cpus(int primary); extern void thaw_secondary_cpus(void); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index bcae6e3..081a249 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -10803,11 +10803,12 @@ static int tg_set_cfs_bandwidth(struct task_group= *tg, u64 period, u64 quota, * Prevent race between setting of cfs_rq->runtime_enabled and * unthrottle_offline_cfs_rqs(). */ - cpus_read_lock(); - mutex_lock(&cfs_constraints_mutex); + guard(cpus_read_lock)(); + guard(mutex)(&cfs_constraints_mutex); + ret =3D __cfs_schedulable(tg, period, quota); if (ret) - goto out_unlock; + return ret; =20 runtime_enabled =3D quota !=3D RUNTIME_INF; runtime_was_enabled =3D cfs_b->quota !=3D RUNTIME_INF; @@ -10817,39 +10818,38 @@ static int tg_set_cfs_bandwidth(struct task_group= *tg, u64 period, u64 quota, */ if (runtime_enabled && !runtime_was_enabled) cfs_bandwidth_usage_inc(); - raw_spin_lock_irq(&cfs_b->lock); - cfs_b->period =3D ns_to_ktime(period); - cfs_b->quota =3D quota; - cfs_b->burst =3D burst; =20 - __refill_cfs_bandwidth_runtime(cfs_b); + scoped_guard (raw_spinlock_irq, &cfs_b->lock) { + cfs_b->period =3D ns_to_ktime(period); + cfs_b->quota =3D quota; + cfs_b->burst =3D burst; =20 - /* Restart the period timer (if active) to handle new period expiry: */ - if (runtime_enabled) - start_cfs_bandwidth(cfs_b); + __refill_cfs_bandwidth_runtime(cfs_b); =20 - raw_spin_unlock_irq(&cfs_b->lock); + /* + * Restart the period timer (if active) to handle new + * period expiry: + */ + if (runtime_enabled) + start_cfs_bandwidth(cfs_b); + } =20 for_each_online_cpu(i) { struct cfs_rq *cfs_rq =3D tg->cfs_rq[i]; struct rq *rq =3D cfs_rq->rq; - struct rq_flags rf; =20 - rq_lock_irq(rq, &rf); + guard(rq_lock_irq)(rq); cfs_rq->runtime_enabled =3D runtime_enabled; cfs_rq->runtime_remaining =3D 0; =20 if (cfs_rq->throttled) unthrottle_cfs_rq(cfs_rq); - rq_unlock_irq(rq, &rf); } + if (runtime_was_enabled && !runtime_enabled) cfs_bandwidth_usage_dec(); -out_unlock: - mutex_unlock(&cfs_constraints_mutex); - cpus_read_unlock(); =20 - return ret; + return 0; } =20 static int tg_set_cfs_quota(struct task_group *tg, long cfs_quota_us)