From nobody Thu Dec 18 07:53:47 2025 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 6FA16EDEC50 for ; Wed, 13 Sep 2023 13:11:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240861AbjIMNLn (ORCPT ); Wed, 13 Sep 2023 09:11:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240829AbjIMNLa (ORCPT ); Wed, 13 Sep 2023 09:11:30 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C7991BCC; Wed, 13 Sep 2023 06:11:25 -0700 (PDT) Date: Wed, 13 Sep 2023 13:11:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694610683; 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=s2/+Mvh5cqPllsRgnhsiP+Ezg6RX38VwCf9VMBpGEyw=; b=qyA45qs31qqRYZHv5iFhBccc1jTl2webYpOf9fPd1B599MjaQDLVQ8ZWT7fYcFbUg2ovHb rocshxCCix06uRkLLNH2p2Bf4xD0qEigBUaDpzD3IMyxsE7sbhiJvwhAxomRjQZqTzFIWr +dX4dU4yU8GrtUEGCfWYjZqikuCJaIymIJWZLD7eSPMl7quu7U334sxQ5h/hyXGLBKknPE tZ9/cg3mOuMA0i42PikVEPbTTg8x/G54kc9qN/5/E+TAcetH39m9EjqWH7BCjCukJ/09nY imsavOr9Y6EfVzkL78xoq7DTiyEj1duTEJy8sD37pRzMjv/z4bFtnUxCav7aHA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694610683; 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=s2/+Mvh5cqPllsRgnhsiP+Ezg6RX38VwCf9VMBpGEyw=; b=J0+B6wyw4TsJ5Pmt4My66OqQifMEeCoqxV4k4u32QYqCDrW1lkDaIXeeR6egnFIRhPIkrA iVmEOltdXkVzJEDA== From: "tip-bot2 for Ricardo Neri" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/urgent] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain Cc: Ricardo Neri , "Peter Zijlstra (Intel)" , Ingo Molnar , Chen Yu , Caleb Callaway , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230815035747.11529-1-ricardo.neri-calderon@linux.intel.com> References: <20230815035747.11529-1-ricardo.neri-calderon@linux.intel.com> MIME-Version: 1.0 Message-ID: <169461068306.27769.5699111625693906203.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/urgent branch of tip: Commit-ID: 108af4b4bd3813610701379a58538e3339b162e4 Gitweb: https://git.kernel.org/tip/108af4b4bd3813610701379a58538e333= 9b162e4 Author: Ricardo Neri AuthorDate: Mon, 14 Aug 2023 20:57:47 -07:00 Committer: Ingo Molnar CommitterDate: Wed, 13 Sep 2023 15:03:18 +02:00 x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain Commit 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup") dropped the SD_ASYM_PACKING flag in the DIE domain added in commit 044f0e27dec6 ("x86/sched: Add the SD_ASYM_PACKING flag to the die domain of hybrid processors"). Restore it on hybrid processors. The die-level domain does not depend on any build configuration and now x86_sched_itmt_flags() is always needed. Remove the build dependency on CONFIG_SCHED_[SMT|CLUSTER|MC]. Fixes: 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup") Signed-off-by: Ricardo Neri Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Reviewed-by: Chen Yu Tested-by: Caleb Callaway Link: https://lkml.kernel.org/r/20230815035747.11529-1-ricardo.neri-caldero= n@linux.intel.com --- arch/x86/kernel/smpboot.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index d40ed3a..266d05e 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -579,7 +579,6 @@ static bool match_llc(struct cpuinfo_x86 *c, struct cpu= info_x86 *o) } =20 =20 -#if defined(CONFIG_SCHED_SMT) || defined(CONFIG_SCHED_CLUSTER) || defined(= CONFIG_SCHED_MC) static inline int x86_sched_itmt_flags(void) { return sysctl_sched_itmt_enabled ? SD_ASYM_PACKING : 0; @@ -603,7 +602,14 @@ static int x86_cluster_flags(void) return cpu_cluster_flags() | x86_sched_itmt_flags(); } #endif -#endif + +static int x86_die_flags(void) +{ + if (cpu_feature_enabled(X86_FEATURE_HYBRID_CPU)) + return x86_sched_itmt_flags(); + + return 0; +} =20 /* * Set if a package/die has multiple NUMA nodes inside. @@ -640,7 +646,7 @@ static void __init build_sched_topology(void) */ if (!x86_has_numa_in_package) { x86_topology[i++] =3D (struct sched_domain_topology_level){ - cpu_cpu_mask, SD_INIT_NAME(DIE) + cpu_cpu_mask, x86_die_flags, SD_INIT_NAME(DIE) }; }