tools/power turbostat: Fix AMD package-energy reporting

commit 05a2f07db888 ("tools/power turbostat: read RAPL counters via
perf") that adds support to read RAPL counters via perf defines the
notion of a RAPL domain_id which is set to physical_core_id on
platforms which support per_core_rapl counters (Eg: AMD processors
Family 17h onwards) and is set to the physical_package_id on all the
other platforms.

However, the physical_core_id is only unique within a package and on
platforms with multiple packages more than one core can have the same
physical_core_id and thus the same domain_id. (For eg, the first cores
of each package have the physical_core_id = 0). This results in all
these cores with the same physical_core_id using the same entry in the
rapl_counter_info_perdomain[]. Since rapl_perf_init() skips the
perf-initialization for cores whose domain_ids have already been
visited, cores that have the same physical_core_id always read the
perf file corresponding to the physical_core_id of the first package
and thus the package-energy is incorrectly reported to be the same
value for different packages.

Note: This issue only arises when RAPL counters are read via perf and
not when they are read via MSRs since in the latter case the MSRs are
read separately on each core.

Fix this issue by associating each CPU with rapl_core_id which is
unique across all the packages in the system.

Fixes: 05a2f07db888 ("tools/power turbostat: read RAPL counters via perf")
Signed-off-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 018f0fe966915efa17e0668dee8096681bb14d8d..743db19a13c2490a0293f1f2dca8535cb68805e8 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -4773,6 +4773,38 @@ unsigned long pmt_read_counter(struct pmt_counter *ppmt, unsigned int domain_id)
        return (value & value_mask) >> value_shift;
 }
 
+
+/* Rapl domain enumeration helpers */
+static inline int get_rapl_num_domains(void)
+{
+       int num_packages = topo.max_package_id + 1;
+       int num_cores_per_package;
+       int num_cores;
+
+       if (!platform->has_per_core_rapl)
+               return num_packages;
+
+       num_cores_per_package = topo.max_core_id + 1;
+       num_cores = num_cores_per_package * num_packages;
+
+       return num_cores;
+}
+
+static inline int get_rapl_domain_id(int cpu)
+{
+       int nr_cores_per_package = topo.max_core_id + 1;
+       int rapl_core_id;
+
+       if (!platform->has_per_core_rapl)
+               return cpus[cpu].physical_package_id;
+
+       /* Compute the system-wide unique core-id for @cpu */
+       rapl_core_id = cpus[cpu].physical_core_id;
+       rapl_core_id += cpus[cpu].physical_package_id * nr_cores_per_package;
+
+       return rapl_core_id;
+}
+
 /*
  * get_counters(...)
  * migrate to cpu
@@ -4828,7 +4860,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
                goto done;
 
        if (platform->has_per_core_rapl) {
-               status = get_rapl_counters(cpu, c->core_id, c, p);
+               status = get_rapl_counters(cpu, get_rapl_domain_id(cpu), c, p);
                if (status != 0)
                        return status;
        }
@@ -4894,7 +4926,7 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p)
                p->sys_lpi = cpuidle_cur_sys_lpi_us;
 
        if (!platform->has_per_core_rapl) {
-               status = get_rapl_counters(cpu, p->package_id, c, p);
+               status = get_rapl_counters(cpu, get_rapl_domain_id(cpu), c, p);
                if (status != 0)
                        return status;
        }
@@ -7877,7 +7909,7 @@ void linux_perf_init(void)
 
 void rapl_perf_init(void)
 {
-       const unsigned int num_domains = (platform->has_per_core_rapl ? topo.max_core_id : topo.max_package_id) + 1;
+       const unsigned int num_domains = get_rapl_num_domains();
        bool *domain_visited = calloc(num_domains, sizeof(bool));
 
        rapl_counter_info_perdomain = calloc(num_domains, sizeof(*rapl_counter_info_perdomain));
@@ -7918,8 +7950,7 @@ void rapl_perf_init(void)
                                continue;
 
                        /* Skip already seen and handled RAPL domains */
-                       next_domain =
-                           platform->has_per_core_rapl ? cpus[cpu].physical_core_id : cpus[cpu].physical_package_id;
+                       next_domain = get_rapl_domain_id(cpu);
 
                        assert(next_domain < num_domains);