tools/power turbostat: Handle non-root legacy-uncore sysfs permissions

[ Upstream commit e60a13bcef206795d3ddf82f130fe8f570176d06 ]

/sys/devices/system/cpu/intel_uncore_frequency/package_X_die_Y/
may be readable by all, but
/sys/devices/system/cpu/intel_uncore_frequency/package_X_die_Y/current_freq_khz
may be readable only by root.

Non-root turbostat users see complaints in this scenario.

Fail probe of the interface if we can't read current_freq_khz.

Reported-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Original-patch-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 426eabc10d765f75fe20819ec097c8adb6c5a446..291c98b5d209795c73ea5101c7b8de0030e28e71 100644 (file)
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -6740,7 +6740,8 @@ static void probe_intel_uncore_frequency_legacy(void)
                        sprintf(path_base, "/sys/devices/system/cpu/intel_uncore_frequency/package_%02d_die_%02d", i,
                                j);
 
-                       if (access(path_base, R_OK))
+                       sprintf(path, "%s/current_freq_khz", path_base);
+                       if (access(path, R_OK))
                                continue;
 
                        BIC_PRESENT(BIC_UNCORE_MHZ);