Skip to contentSkip to conversation

tools/power/turbostat: fix compatibility with older kernels

PATCH Applied Artem Bityutskiy 4 participants 6 messages Jan 27, 2021 – Feb 3, 2021 Turbostat utility

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/power/turbostat: fix compatibility with older kernels

From: Artem Bityutskiy <[email protected]>

Commit

6d6501d912a9 tools/power/turbostat: Read energy_perf_bias from sysfs

added a useful EPB print by reading EPB from sysfs's 'energy_perf_bias' file. However, older kernels, which do not necessarily have that sysfs file (e.g., Centos 7's stock kernel does not have it). As a result, turbostat fails with older kernels.

This patch fixes the problem by ignoring the sysfs file read errors.

---
 tools/power/x86/turbostat/turbostat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.c +3 -1
index 389ea5209a83..12e014f2c24b 100644
@@ -1839,7 +1839,9 @@ int get_epb(int cpu)
 
 	sprintf(path, "/sys/devices/system/cpu/cpu%d/power/energy_perf_bias", cpu);
 
-	fp = fopen_or_die(path, "r");
+	fp = fopen(path, "r");
+	if (!fp)
+		return -1;
 
 	ret = fscanf(fp, "%d", &epb);
 	if (ret != 1)
Signature · 1 line
2.26.2
#1 lore raw
Quoted 23 lines · Artem Bityutskiy

From: Artem Bityutskiy <[email protected]>

Commit

6d6501d912a9 tools/power/turbostat: Read energy_perf_bias from sysfs

added a useful EPB print by reading EPB from sysfs's 'energy_perf_bias' file. However, older kernels, which do not necessarily have that sysfs file (e.g., Centos 7's stock kernel does not have it). As a result, turbostat fails with older kernels.

This patch fixes the problem by ignoring the sysfs file read errors.

---
 tools/power/x86/turbostat/turbostat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.c +0 -0
index 389ea5209a83..12e014f2c24b 100644

tools/power/x86/turbostat/turbostat.c int get_epb(int cpu) · line 1847

Quoted 10 lines
tools/power/x86/turbostat/turbostat.c +3 -1
@@ -1839,7 +1839,9 @@ int get_epb(int cpu)
 
 	sprintf(path, "/sys/devices/system/cpu/cpu%d/power/energy_perf_bias", cpu);
 
-	fp = fopen_or_die(path, "r");
+	fp = fopen(path, "r");
+	if (!fp)
+		return -1;
 
 	ret = fscanf(fp, "%d", &epb);
 	if (ret != 1)

So I was under the impression that things in tools/ are tied to the kernel version they're shipped with. Which means, you should probably get the one from the centos kernel.

However, if this is supposed to work on older kernels too, then

6d6501d912a9 ("tools/power/turbostat: Read energy_perf_bias from sysfs")

would need to be extended to first test the sysfs file's existence and if not there, fall back to the MSR reading...

Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
#2 lore raw
Quoted 32 lines · On 2021.01.27 Borislav Petkov wrote:
Quoted 31 lines · Artem Bityutskiy

From: Artem Bityutskiy <[email protected]>

Commit

6d6501d912a9 tools/power/turbostat: Read energy_perf_bias from sysfs

added a useful EPB print by reading EPB from sysfs's 'energy_perf_bias' file. However, older kernels, which do not necessarily have that sysfs file (e.g., Centos 7's stock kernel does not have it). As a result, turbostat fails with older kernels.

This patch fixes the problem by ignoring the sysfs file read errors.

---
 tools/power/x86/turbostat/turbostat.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.c +3 -1
index 389ea5209a83..12e014f2c24b 100644
@@ -1839,7 +1839,9 @@ int get_epb(int cpu)
 
 	sprintf(path, "/sys/devices/system/cpu/cpu%d/power/energy_perf_bias", cpu);
 
-	fp = fopen_or_die(path, "r");
+	fp = fopen(path, "r");
+	if (!fp)
+		return -1;
 
Quoted 8 lines

tools/power/x86/turbostat/turbostat.c int get_epb(int cpu) · line 1847

Quoted 2 lines
tools/power/x86/turbostat/turbostat.c +0 -0
 	ret = fscanf(fp, "%d", &epb);
 	if (ret != 1)

So I was under the impression that things in tools/ are tied to the kernel version they're shipped with. Which means, you should probably get the one from the centos kernel.

However, if this is supposed to work on older kernels too, then

It is supposed to work with old kernels. Here is a quote from Len from [1] (2019.09.05) :

Quoted 9 lines

The latest turbostat and x86_energy_perf_policy utilities in the upstream kernel tree should always be backward compatible with all old kernels. If that is EVER not the case, I want to know about it.

Yes, I know that some distros ship old versions of these utilities built out of their matching kernel tree snapshots. Yes, applying upstream fixes to .stable for such distros is a good thing.

Quoted 6 lines

However, the better solution for these particular utilities, is that they simply always use upstream utilities -- even with old kernels.

When somebody reports a problem and I need them to run these tools, 100% of the time, I start by sending them the latest upstream version to replace the old version shipped by the distro.

Which is also what I do. I was also trying, so far without success, to get a distro to relax its stringent, unnecessary, turbostat dependency checking [2].

Quoted 5 lines

6d6501d912a9 ("tools/power/turbostat: Read energy_perf_bias from sysfs")

would need to be extended to first test the sysfs file's existence and if not there, fall back to the MSR reading...

Yes agree, the information is still required.

[1] https://marc.info/?l=linux-pm&m=156770359620861&w=2
[2] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1844201

#3 lore raw
Quoted 2 lines · Doug Smythies

It is supposed to work with old kernels. Here is a quote from Len from
[1] (2019.09.05) :

Yeah, reportedly, this is the general strategy with tools in tools/.

Quoted 3 lines

Which is also what I do. I was also trying, so far without success, to get a distro to relax its stringent, unnecessary, turbostat dependency checking [2].

I see.

Quoted 1 line

Yes agree, the information is still required.

Yeah, lemme do a proper patch tomorrow.

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
#4 lore raw
Quoted 1 line · Borislav Petkov

Yeah, lemme do a proper patch tomorrow.

Artem, how's that?

---

tools/power/x86/turbostat/turbostat.c +9 -1
index 389ea5209a83..a7c4f0772e53 100644
@@ -1834,12 +1834,15 @@ int get_mp(int cpu, struct msr_counter *mp, unsigned long long *counterp)
 int get_epb(int cpu)
 {
 	char path[128 + PATH_BYTES];
+	unsigned long long msr;
 	int ret, epb = -1;
 	FILE *fp;
 
 	sprintf(path, "/sys/devices/system/cpu/cpu%d/power/energy_perf_bias", cpu);
 
-	fp = fopen_or_die(path, "r");
+	fp = fopen(path, "r");
+	if (!fp)
+		goto msr_fallback;
 
 	ret = fscanf(fp, "%d", &epb);
 	if (ret != 1)
@@ -1848,6 +1851,11 @@ int get_epb(int cpu)
 	fclose(fp);
 
 	return epb;
+
+msr_fallback:
+	get_msr(cpu, MSR_IA32_ENERGY_PERF_BIAS, &msr);
+
+	return msr & 0xf;
 }
 
 void get_apic_id(struct thread_data *t)

---

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg
#5 lore raw

[tip: x86/urgent] tools/power/turbostat: Fallback to an MSR read for EPB

In reply to Artem Bityutskiy
The following commit has been merged into the x86/urgent branch of tip:

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     7f1b11ba3564a391169420d98162987a12d0795d
Gitweb:        https://git.kernel.org/tip/7f1b11ba3564a391169420d98162987a12d0795d
Author:        Borislav Petkov <[email protected]>
AuthorDate:    Thu, 28 Jan 2021 20:28:56 +01:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 03 Feb 2021 11:58:19 +01:00

tools/power/turbostat: Fallback to an MSR read for EPB

Commit

6d6501d912a9 ("tools/power/turbostat: Read energy_perf_bias from sysfs")

converted turbostat to read the energy_perf_bias value from sysfs. However, older kernels which do not have that file yet, would fail. For those, fall back to the MSR reading.

Fixes 6d6501d912a9 ("tools/power/turbostat: Read energy_perf_bias from sysfs")
---
 tools/power/x86/turbostat/turbostat.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
tools/power/x86/turbostat/turbostat.c +9 -1
index 389ea52..a7c4f07 100644
@@ -1834,12 +1834,15 @@ int get_mp(int cpu, struct msr_counter *mp, unsigned long long *counterp)
 int get_epb(int cpu)
 {
 	char path[128 + PATH_BYTES];
+	unsigned long long msr;
 	int ret, epb = -1;
 	FILE *fp;
 
 	sprintf(path, "/sys/devices/system/cpu/cpu%d/power/energy_perf_bias", cpu);
 
-	fp = fopen_or_die(path, "r");
+	fp = fopen(path, "r");
+	if (!fp)
+		goto msr_fallback;
 
 	ret = fscanf(fp, "%d", &epb);
 	if (ret != 1)
@@ -1848,6 +1851,11 @@ int get_epb(int cpu)
 	fclose(fp);
 
 	return epb;
+
+msr_fallback:
+	get_msr(cpu, MSR_IA32_ENERGY_PERF_BIAS, &msr);
+
+	return msr & 0xf;
 }
 
 void get_apic_id(struct thread_data *t)