Skip to contentSkip to conversation

x86/resctrl: Only check Intel systems for SNC

PATCH In review Tony Luck 2 participants 2 messages Apr 28 – May 18

Subsystems (2)
lore
Share & tools
lore

Tony Luck

author maintainer
#0 lore raw

PATCH 1/1 x86/resctrl: Only check Intel systems for SNC

topology_num_nodes_per_package() reports values greater than one on certain AMD systems resulting in snc_get_config() printing the confusing message "CoD enabled system? Resctrl not supported".

Add a check for Intel systems before looking at topology.

Fixes 59674fc9d0bf ("x86/resctrl: Fix SNC detection")
---
 arch/x86/kernel/cpu/resctrl/monitor.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/resctrl/monitor.c +6 -1
index 9bd87bae4983..59215fef3924 100644
@@ -377,7 +377,12 @@ static const struct x86_cpu_id snc_cpu_ids[] __initconst = {
 
 static __init int snc_get_config(void)
 {
-	int ret = topology_num_nodes_per_package();
+	int ret;
+
+	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
+		return 1;
+
+	ret = topology_num_nodes_per_package();
 
 	if (ret > 1 && !x86_match_cpu(snc_cpu_ids)) {
 		pr_warn("CoD enabled system? Resctrl not supported\n");
Signature · 1 line
2.53.0
reviewer Tested-by on v1 1/1
#1 lore raw

+ Reinette:

Quoted 8 lines · Tony Luck

topology_num_nodes_per_package() reports values greater than one on certain AMD systems resulting in snc_get_config() printing the confusing message "CoD enabled system? Resctrl not supported".

Add a check for Intel systems before looking at topology.

Fixes 59674fc9d0bf ("x86/resctrl: Fix SNC detection")

Should be:

Quoted 2 lines

Should be:

Quoted 22 lines
---
  arch/x86/kernel/cpu/resctrl/monitor.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/resctrl/monitor.c +6 -1
index 9bd87bae4983..59215fef3924 100644
@@ -377,7 +377,12 @@ static const struct x86_cpu_id snc_cpu_ids[] __initconst = {
 
  static __init int snc_get_config(void)
  {
-	int ret = topology_num_nodes_per_package();
+	int ret;
+
+	if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
+		return 1;
+
+	ret = topology_num_nodes_per_package();
 
  	if (ret > 1 && !x86_match_cpu(snc_cpu_ids)) {
  		pr_warn("CoD enabled system? Resctrl not supported\n");