From nobody Mon Apr 6 15:29:13 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE0FC38F65D; Fri, 3 Apr 2026 12:30:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775219415; cv=none; b=msPq2VlOHS5rGuYB009nbcc7203XQKx8sd2YVBF6zhGiu57/HEZAc26iFqDAApu1SHBU0mh5zcSvIczK2zVae/ez49wFiDC4MIpdCPvTeivJkp27HM931TFuwPTqd8+1U7D4ymA/WOCN4q85nqX3bbkgAIiBLnz0ilAjpvqkWRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775219415; c=relaxed/simple; bh=CDvEAHYV7Fg4xn2qFp8aMbe/jhCaPTpHuSXgGbeQBMc=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=peknN8FdjJKhbZN9uYlSi/t4CS0eX/96JqSi7YbPASNxphQFHsSxTYYt9egEMdio2+6jWvDW3GA0JskyUM/5fk4bwEwhiyN1/K9j5Non03yyHDcjQlwKkqRipXX+gxyO95YWvbyvs1lFa6yP6RuRq670W1KtBJVywV8AvP5W5kI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=TEMVW3VS; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=J3vc24I9; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="TEMVW3VS"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="J3vc24I9" Date: Fri, 03 Apr 2026 12:30:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1775219407; 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: in-reply-to:in-reply-to:references:references; bh=L8jJds3yUHq5TKNlA0f0YIbJQYS4cZGgOPaSAvvSDJI=; b=TEMVW3VSumUPXlSXsCvfZo/6O/uhuLw7UI9y6GjkPnoFYQbmPGr9sDv1uBrnrQ7BzUxyW+ Y8NuC1ovHnARggBIWcfcQgFfh8i2jl2F4YhYgdH39tNR6/4hFH8eFzIYrJ0RpMGSmDm+aF XzjaCVGroEoTB/eSwRlMBV541ArjqTwOkafA/Z6RSz8nZlKrs43e7oSjOqAgeHHbDy1mcU 3mQttubaGfstTXywR7tXN/beWXN4tYpRmUa3H9CQyuRliugIILgjSA+sQRPRLivCVlQYcF TrK7Ocsst3H76SpQMzSq6rOC9XrxDvCDNh1RThkCIHn2fkRMqjfWXsNQG/vE5g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1775219407; 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: in-reply-to:in-reply-to:references:references; bh=L8jJds3yUHq5TKNlA0f0YIbJQYS4cZGgOPaSAvvSDJI=; b=J3vc24I9WKOoYbMx2ZXhHW4CWw3k1g0NwzZv4KbGo+6opwJlLGaIk50OjoKJjpkcK3CsLv odvSvuVhEx5ciICg== From: "tip-bot2 for Vincent Guittot" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/fair: Use sched_energy_enabled() Cc: Vincent Guittot , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260327132013.2800517-1-vincent.guittot@linaro.org> References: <20260327132013.2800517-1-vincent.guittot@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177521940574.1647592.11039659588035143249.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the sched/core branch of tip: Commit-ID: 2d4cc371baa5881da45120a65d264a59b486f486 Gitweb: https://git.kernel.org/tip/2d4cc371baa5881da45120a65d264a59b= 486f486 Author: Vincent Guittot AuthorDate: Fri, 27 Mar 2026 14:20:13 +01:00 Committer: Peter Zijlstra CommitterDate: Fri, 03 Apr 2026 14:23:41 +02:00 sched/fair: Use sched_energy_enabled() Use helper sched_energy_enabled() everywhere we want to test if EAS is enabled instead of mixing sched_energy_enabled() and direct call to static_branch_unlikely(). No functional change Signed-off-by: Vincent Guittot Signed-off-by: Peter Zijlstra (Intel) Link: https://patch.msgid.link/20260327132013.2800517-1-vincent.guittot@lin= aro.org --- kernel/sched/topology.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 4315059..5847b83 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -273,7 +273,7 @@ void rebuild_sched_domains_energy(void) static int sched_energy_aware_handler(const struct ctl_table *table, int w= rite, void *buffer, size_t *lenp, loff_t *ppos) { - int ret, state; + int ret; =20 if (write && !capable(CAP_SYS_ADMIN)) return -EPERM; @@ -289,8 +289,7 @@ static int sched_energy_aware_handler(const struct ctl_= table *table, int write, =20 ret =3D proc_dointvec_minmax(table, write, buffer, lenp, ppos); if (!ret && write) { - state =3D static_branch_unlikely(&sched_energy_present); - if (state !=3D sysctl_sched_energy_aware) + if (sysctl_sched_energy_aware !=3D sched_energy_enabled()) rebuild_sched_domains_energy(); } =20 @@ -388,11 +387,11 @@ static void destroy_perf_domain_rcu(struct rcu_head *= rp) =20 static void sched_energy_set(bool has_eas) { - if (!has_eas && static_branch_unlikely(&sched_energy_present)) { + if (!has_eas && sched_energy_enabled()) { if (sched_debug()) pr_info("%s: stopping EAS\n", __func__); static_branch_disable_cpuslocked(&sched_energy_present); - } else if (has_eas && !static_branch_unlikely(&sched_energy_present)) { + } else if (has_eas && !sched_energy_enabled()) { if (sched_debug()) pr_info("%s: starting EAS\n", __func__); static_branch_enable_cpuslocked(&sched_energy_present);