Merge tag 'perf-urgent-2024-05-18' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / arch / x86 / events / rapl.c

diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index ca5f687fa4200ff2855895fac0192b59614b5f14..46e673585560312fbc8f54b910ccc247da6adb38 100644 (file)
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -114,8 +114,8 @@ struct rapl_pmu {
 
 struct rapl_pmus {
        struct pmu              pmu;
-       unsigned int            maxdie;
-       struct rapl_pmu         *pmus[] __counted_by(maxdie);
+       unsigned int            nr_rapl_pmu;
+       struct rapl_pmu         *pmus[] __counted_by(nr_rapl_pmu);
 };
 
 enum rapl_unit_quirk {
@@ -141,13 +141,13 @@ static struct perf_msr *rapl_msrs;
 
 static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu)
 {
-       unsigned int dieid = topology_logical_die_id(cpu);
+       unsigned int rapl_pmu_idx = topology_logical_die_id(cpu);
 
        /*
         * The unsigned check also catches the '-1' return value for non
         * existent mappings in the topology map.
         */
-       return dieid < rapl_pmus->maxdie ? rapl_pmus->pmus[dieid] : NULL;
+       return rapl_pmu_idx < rapl_pmus->nr_rapl_pmu ? rapl_pmus->pmus[rapl_pmu_idx] : NULL;
 }
 
 static inline u64 rapl_read_counter(struct perf_event *event)
@@ -658,7 +658,7 @@ static void cleanup_rapl_pmus(void)
 {
        int i;
 
-       for (i = 0; i < rapl_pmus->maxdie; i++)
+       for (i = 0; i < rapl_pmus->nr_rapl_pmu; i++)
                kfree(rapl_pmus->pmus[i]);
        kfree(rapl_pmus);
 }
@@ -674,13 +674,13 @@ static const struct attribute_group *rapl_attr_update[] = {
 
 static int __init init_rapl_pmus(void)
 {
-       int maxdie = topology_max_packages() * 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, maxdie), GFP_KERNEL);
+       rapl_pmus = kzalloc(struct_size(rapl_pmus, pmus, nr_rapl_pmu), GFP_KERNEL);
        if (!rapl_pmus)
                return -ENOMEM;
 
-       rapl_pmus->maxdie               = maxdie;
+       rapl_pmus->nr_rapl_pmu          = nr_rapl_pmu;
        rapl_pmus->pmu.attr_groups      = rapl_attr_groups;
        rapl_pmus->pmu.attr_update      = rapl_attr_update;
        rapl_pmus->pmu.task_ctx_nr      = perf_invalid_context;