Patch "perf/x86/amd/uncore: Fix DF and UMC domain identification" has been added to the 6.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

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

to the 6.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-x86-amd-uncore-fix-df-and-umc-domain-identifica.patch
and it can be found in the queue-6.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit f58bd15fb9ccfd84fee96c986097847bf46bb912
Author: Sandipan Das <sandipan.das@xxxxxxx>
Date:   Wed Jun 26 13:19:42 2024 +0530

    perf/x86/amd/uncore: Fix DF and UMC domain identification
    
    [ Upstream commit 57e11990f45f89bc29d0f84dd7b13a4e4263eeb2 ]
    
    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 63edbaa48a57 ("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: 63edbaa48a57 ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf")
    Signed-off-by: Sandipan Das <sandipan.das@xxxxxxx>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
    Link: https://lkml.kernel.org/r/20240626074942.1044818-1-sandipan.das@xxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index b78e05ab4a737..5a4bfe9aea237 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -639,7 +639,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);
@@ -899,8 +899,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;
 }