iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/power turbostat: Provide better debug messages for failed capabilities accesses

Browse Source 
turbostat reports some capabilities access errors and not others.  Provide
the same debug message for all errors.

[lenb: remove extra quotes]

Cc: David Arcari <darcari@redhat.com>
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Prarit Bhargava 2022-10-18 15:23:37 -04:00 committed by Len Brown
parent 884a1f9561
commit 9c08581728
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/power/x86/turbostat/turbostat.8
View File

@ -340,7 +340,7 @@ starts a new interval.
must be run as root. must be run as root.
Alternatively, non-root users can be enabled to run turbostat this way: Alternatively, non-root users can be enabled to run turbostat this way:
# setcap cap_sys_admin,cap_sys_rawio,cap_sys_nice=+ep ./turbostat # setcap cap_sys_admin,cap_sys_rawio,cap_sys_nice=+ep path/to/turbostat
# chmod +r /dev/cpu/*/msr # chmod +r /dev/cpu/*/msr

12
tools/power/x86/turbostat/turbostat.c
View File

@ -670,7 +670,8 @@ static int perf_instr_count_open(int cpu_num)
/* counter for cpu_num, including user + kernel and all processes */ /* counter for cpu_num, including user + kernel and all processes */
fd = perf_event_open(&pea, -1, cpu_num, -1, 0); fd = perf_event_open(&pea, -1, cpu_num, -1, 0);
if (fd == -1) { if (fd == -1) {
warn("cpu%d: perf instruction counter", cpu_num); warnx("capget(CAP_PERFMON) failed, try \"# setcap cap_sys_admin=ep %s\"",
progname);
BIC_NOT_PRESENT(BIC_IPC); BIC_NOT_PRESENT(BIC_IPC);
} }
@ -3502,9 +3503,6 @@ release_msr:
/* /*
* set_my_sched_priority(pri) * set_my_sched_priority(pri)
* return previous * return previous
*
* if non-root, do this:
* # /sbin/setcap cap_sys_rawio,cap_sys_nice=+ep /usr/bin/turbostat
*/ */
int set_my_sched_priority(int priority) int set_my_sched_priority(int priority)
{ {
@ -3518,7 +3516,8 @@ int set_my_sched_priority(int priority)
retval = setpriority(PRIO_PROCESS, 0, priority); retval = setpriority(PRIO_PROCESS, 0, priority);
if (retval) if (retval)
err(retval, "setpriority(%d)", priority); errx(retval, "capget(CAP_SYS_NICE) failed,try \"# setcap cap_sys_nice=ep %s\"",
progname);
errno = 0; errno = 0;
retval = getpriority(PRIO_PROCESS, 0); retval = getpriority(PRIO_PROCESS, 0);
@ -5476,7 +5475,8 @@ void print_dev_latency(void)
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
if (fd < 0) { if (fd < 0) {
warn("fopen %s\n", path); warnx("capget(CAP_SYS_ADMIN) failed, try \"# setcap cap_sys_admin=ep %s\"",
progname);
return; return;
} }