From nobody Thu Dec 18 07:58:32 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 56DD5C001DB for ; Tue, 15 Aug 2023 04:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234697AbjHOEAj (ORCPT ); Tue, 15 Aug 2023 00:00:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234559AbjHOD5j (ORCPT ); Mon, 14 Aug 2023 23:57:39 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F360F30C8 for ; Mon, 14 Aug 2023 20:55:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692071759; x=1723607759; h=from:to:cc:subject:date:message-id; bh=jt9YzsZ2I4wM2fxk8/y9oZSOxe/K7GqCQ2Ekca7eW5g=; b=C9+zq4IsLwV+77Hd6iL820M3tOh+UOmivB95QrogEY+QSwZgrnSD1Y93 7124bXJQe51RdWcAIyXQj7Gk6GZn709Tvm6LffjrnS1X66Yk1gULHIyQ+ S0grtqfjlgNtlLtYZBopiepcog1KJZw0memHoUnzvlWBtF0jWUUzHFO6h mQk3CCAhoBl6QCcpkDtT4V1nP/uzF/IdxN+BTXpPrVFLGDQ60wjFb810z 5FkS5cQ5M6j6PdwqFVh1kd0JG+BfedLWucoxVhRgyPkNFPnpLrD5Zt8FH PwP/z++ecl4JwxDl1/WQWrBSi9aAIAAefzpDwo/ktI/YMklawHx84pgm4 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10802"; a="372192256" X-IronPort-AV: E=Sophos;i="6.01,173,1684825200"; d="scan'208";a="372192256" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Aug 2023 20:55:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10802"; a="683522705" X-IronPort-AV: E=Sophos;i="6.01,173,1684825200"; d="scan'208";a="683522705" Received: from ranerica-svr.sc.intel.com ([172.25.110.23]) by orsmga003.jf.intel.com with ESMTP; 14 Aug 2023 20:55:56 -0700 From: Ricardo Neri To: "Peter Zijlstra (Intel)" Cc: "Ravi V. Shankar" , Ricardo Neri , Ricardo Neri , Ben Segall , Caleb Callaway , Chen Yu , Daniel Bristot de Oliveira , Dietmar Eggemann , Len Brown , Mel Gorman , Steven Rostedt , "Tim C . Chen" , Valentin Schneider , Vincent Guittot , x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86/sched: Restore the SD_ASYM_PACKING flag in the DIE domain Date: Mon, 14 Aug 2023 20:57:47 -0700 Message-Id: <20230815035747.11529-1-ricardo.neri-calderon@linux.intel.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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]. Cc: Ben Segall Cc: Caleb Callaway Cc: Chen Yu Cc: Daniel Bristot de Oliveira Cc: Dietmar Eggemann Cc: Len Brown Cc: Mel Gorman Cc: Steven Rostedt Cc: Tim C. Chen Cc: Valentin Schneider Cc: Vincent Guittot Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org Fixes: 8f2d6c41e5a6 ("x86/sched: Rewrite topology setup") Reviewed-by: Chen Yu Tested-by: Caleb Callaway Signed-off-by: Ricardo Neri --- arch/x86/kernel/smpboot.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index d7667a29acf3..944008c72754 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,12 @@ static int x86_cluster_flags(void) return cpu_cluster_flags() | x86_sched_itmt_flags(); } #endif -#endif + +static int x86_die_flags(void) +{ + return cpu_feature_enabled(X86_FEATURE_HYBRID_CPU) ? + x86_sched_itmt_flags() : 0; +} =20 /* * Set if a package/die has multiple NUMA nodes inside. @@ -640,7 +644,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) }; } =20 --=20 2.25.1