Commit 57e11990 authored by Sandipan Das's avatar Sandipan Das Committed by Peter Zijlstra
Browse files

perf/x86/amd/uncore: Fix DF and UMC domain identification 



For uncore PMUs, a single context is shared across all CPUs in a domain.
The domain can be a CCX, like in the case of the L3 PMU, or a socket,
like in the case of DF and UMC PMUs. This information is available via
the PMU's cpumask.

For contexts shared across a socket, the domain is currently determined
from topology_die_id() which is incorrect after the introduction of
commit 63edbaa4 ("x86/cpu/topology: Add support for the AMD
0x80000026 leaf") as it now returns a CCX identifier on Zen 4 and later
systems which support CPUID leaf 0x80000026.

Use topology_logical_package_id() instead as it always returns a socket
identifier irrespective of the availability of CPUID leaf 0x80000026.

Fixes: 63edbaa4 ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf")
Signed-off-by: default avatarSandipan Das <sandipan.das@amd.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20240626074942.1044818-1-sandipan.das@amd.com
parent f997e208

arch/x86/events/amd/uncore.c

+3 −3
Original line number Diff line number Diff line
@@ -643,7 +643,7 @@ void amd_uncore_df_ctx_scan(struct amd_uncore *uncore, unsigned int cpu) 
	info.split.aux_data = 0;

	info.split.num_pmcs = NUM_COUNTERS_NB;

	info.split.gid = 0;

	info.split.cid = topology_die_id(cpu);

	info.split.cid = topology_logical_package_id(cpu);



	if (pmu_version >= 2) {

		ebx.full = cpuid_ebx(EXT_PERFMON_DEBUG_FEATURES);
@@ -903,8 +903,8 @@ void amd_uncore_umc_ctx_scan(struct amd_uncore *uncore, unsigned int cpu) 
	cpuid(EXT_PERFMON_DEBUG_FEATURES, &eax, &ebx.full, &ecx, &edx);

	info.split.aux_data = ecx;	/* stash active mask */

	info.split.num_pmcs = ebx.split.num_umc_pmc;

	info.split.gid = topology_die_id(cpu);

	info.split.cid = topology_die_id(cpu);

	info.split.gid = topology_logical_package_id(cpu);

	info.split.cid = topology_logical_package_id(cpu);

	*per_cpu_ptr(uncore->info, cpu) = info;

}