release 6.11.6
This commit is contained in:
144
debian/patches/krd/1001-Revert-perf-x86-rapl-Fix-the-energy-pkg-event-for-AMD-CPUs.patch
vendored
Normal file
144
debian/patches/krd/1001-Revert-perf-x86-rapl-Fix-the-energy-pkg-event-for-AMD-CPUs.patch
vendored
Normal file
@@ -0,0 +1,144 @@
|
||||
this reverts following commit:
|
||||
|
||||
From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||||
Date: Tue, 30 Jul 2024 04:49:18 +0000
|
||||
Subject: perf/x86/rapl: Fix the energy-pkg event for AMD CPUs
|
||||
|
||||
commit 8d72eba1cf8cecd76a2b4c1dd7673c2dc775f514 upstream.
|
||||
|
||||
After commit:
|
||||
|
||||
63edbaa48a57 ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf")
|
||||
|
||||
... on AMD processors that support extended CPUID leaf 0x80000026, the
|
||||
topology_die_cpumask() and topology_logical_die_id() macros no longer
|
||||
return the package cpumask and package ID, instead they return the CCD
|
||||
(Core Complex Die) mask and ID respectively.
|
||||
|
||||
This leads to the energy-pkg event scope to be modified to CCD instead of package.
|
||||
|
||||
So, change the PMU scope for AMD and Hygon back to package.
|
||||
|
||||
On a 12 CCD 1 Package AMD Zen4 Genoa machine:
|
||||
|
||||
Before:
|
||||
|
||||
$ cat /sys/devices/power/cpumask
|
||||
0,8,16,24,32,40,48,56,64,72,80,88.
|
||||
|
||||
The expected cpumask here is supposed to be just "0", as it is a package
|
||||
scope event, only one CPU will be collecting the event for all the CPUs in
|
||||
the package.
|
||||
|
||||
After:
|
||||
|
||||
$ cat /sys/devices/power/cpumask
|
||||
0
|
||||
|
||||
[ mingo: Cleaned up the changelog ]
|
||||
|
||||
Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||||
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||||
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
|
||||
Link: https://lore.kernel.org/r/20240904100934.3260-1-Dhananjay.Ugwekar@amd.com
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
|
||||
--- a/arch/x86/events/rapl.c
|
||||
+++ b/arch/x86/events/rapl.c
|
||||
@@ -103,19 +103,6 @@ static struct perf_pmu_events_attr event
|
||||
.event_str = str, \
|
||||
};
|
||||
|
||||
-/*
|
||||
- * RAPL Package energy counter scope:
|
||||
- * 1. AMD/HYGON platforms have a per-PKG package energy counter
|
||||
- * 2. For Intel platforms
|
||||
- * 2.1. CLX-AP is multi-die and its RAPL MSRs are die-scope
|
||||
- * 2.2. Other Intel platforms are single die systems so the scope can be
|
||||
- * considered as either pkg-scope or die-scope, and we are considering
|
||||
- * them as die-scope.
|
||||
- */
|
||||
-#define rapl_pmu_is_pkg_scope() \
|
||||
- (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || \
|
||||
- boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)
|
||||
-
|
||||
struct rapl_pmu {
|
||||
raw_spinlock_t lock;
|
||||
int n_active;
|
||||
@@ -153,25 +140,9 @@ static unsigned int rapl_cntr_mask;
|
||||
static u64 rapl_timer_ms;
|
||||
static struct perf_msr *rapl_msrs;
|
||||
|
||||
-/*
|
||||
- * Helper functions to get the correct topology macros according to the
|
||||
- * RAPL PMU scope.
|
||||
- */
|
||||
-static inline unsigned int get_rapl_pmu_idx(int cpu)
|
||||
-{
|
||||
- return rapl_pmu_is_pkg_scope() ? topology_logical_package_id(cpu) :
|
||||
- topology_logical_die_id(cpu);
|
||||
-}
|
||||
-
|
||||
-static inline const struct cpumask *get_rapl_pmu_cpumask(int cpu)
|
||||
-{
|
||||
- return rapl_pmu_is_pkg_scope() ? topology_core_cpumask(cpu) :
|
||||
- topology_die_cpumask(cpu);
|
||||
-}
|
||||
-
|
||||
static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu)
|
||||
{
|
||||
- unsigned int rapl_pmu_idx = get_rapl_pmu_idx(cpu);
|
||||
+ unsigned int rapl_pmu_idx = topology_logical_die_id(cpu);
|
||||
|
||||
/*
|
||||
* The unsigned check also catches the '-1' return value for non
|
||||
@@ -581,7 +552,7 @@ static int rapl_cpu_offline(unsigned int
|
||||
|
||||
pmu->cpu = -1;
|
||||
/* Find a new cpu to collect rapl events */
|
||||
- target = cpumask_any_but(get_rapl_pmu_cpumask(cpu), cpu);
|
||||
+ target = cpumask_any_but(topology_die_cpumask(cpu), cpu);
|
||||
|
||||
/* Migrate rapl events to the new target */
|
||||
if (target < nr_cpu_ids) {
|
||||
@@ -594,11 +565,6 @@ static int rapl_cpu_offline(unsigned int
|
||||
|
||||
static int rapl_cpu_online(unsigned int cpu)
|
||||
{
|
||||
- s32 rapl_pmu_idx = get_rapl_pmu_idx(cpu);
|
||||
- if (rapl_pmu_idx < 0) {
|
||||
- pr_err("topology_logical_(package/die)_id() returned a negative value");
|
||||
- return -EINVAL;
|
||||
- }
|
||||
struct rapl_pmu *pmu = cpu_to_rapl_pmu(cpu);
|
||||
int target;
|
||||
|
||||
@@ -613,14 +579,14 @@ static int rapl_cpu_online(unsigned int
|
||||
pmu->timer_interval = ms_to_ktime(rapl_timer_ms);
|
||||
rapl_hrtimer_init(pmu);
|
||||
|
||||
- rapl_pmus->pmus[rapl_pmu_idx] = pmu;
|
||||
+ rapl_pmus->pmus[topology_logical_die_id(cpu)] = pmu;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there is an online cpu in the package which collects rapl
|
||||
* events already.
|
||||
*/
|
||||
- target = cpumask_any_and(&rapl_cpu_mask, get_rapl_pmu_cpumask(cpu));
|
||||
+ target = cpumask_any_and(&rapl_cpu_mask, topology_die_cpumask(cpu));
|
||||
if (target < nr_cpu_ids)
|
||||
return 0;
|
||||
|
||||
@@ -709,10 +675,7 @@ static const struct attribute_group *rap
|
||||
|
||||
static int __init init_rapl_pmus(void)
|
||||
{
|
||||
- int nr_rapl_pmu = topology_max_packages();
|
||||
-
|
||||
- if (!rapl_pmu_is_pkg_scope())
|
||||
- nr_rapl_pmu *= topology_max_dies_per_package();
|
||||
+ int nr_rapl_pmu = topology_max_packages() * topology_max_dies_per_package();
|
||||
|
||||
rapl_pmus = kzalloc(struct_size(rapl_pmus, pmus, nr_rapl_pmu), GFP_KERNEL);
|
||||
if (!rapl_pmus)
|
||||
Reference in New Issue
Block a user