GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-06 14:34:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: cpupower: fix return checks for sysfs_get_idlestate_count()

Browse source 
Red Hat and Fedora use a bug reporting tool that gathers data about
"broken" systems called sosreport.  Among other things, it includes the
output of 'cpupower idle-info'.  Executing 'cpupower idle-info' on a
system that has cpuidle disabled via 'cpuidle.off=1' results in a 300
second hang in the cpupower application.

ie)
[root@intel-brickland-05]# cpupower idle-info
Could not determine cpuidle driver

Analyzing CPU 0:
Number of idle states: -19
[hang]

The problem is that the cpupower code only checks for a zero return from
sysfs_get_idlestate_count().  The function can return -ENODEV (-19) as
above.  This patch fixes callers to sysfs_get_idlestate_count() to check
the right return values.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Prarit Bhargava 2014-12-01 09:39:22 -05:00 • committed by Rafael J. Wysocki
parent 009d0431c3
commit 16b7c275c0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tools/power/cpupower/utils/cpuidle-info.c
View file

@ -22,13 +22,13 @@
static void cpuidle_cpu_output(unsigned int cpu, int verbose) static void cpuidle_cpu_output(unsigned int cpu, int verbose)
{ {
unsigned int idlestates, idlestate; int idlestates, idlestate;
char *tmp; char *tmp;
printf(_ ("Analyzing CPU %d:\n"), cpu); printf(_ ("Analyzing CPU %d:\n"), cpu);
idlestates = sysfs_get_idlestate_count(cpu); idlestates = sysfs_get_idlestate_count(cpu);
if (idlestates == 0) { if (idlestates < 1) {
printf(_("CPU %u: No idle states\n"), cpu); printf(_("CPU %u: No idle states\n"), cpu);
return; return;
} }
@ -100,10 +100,10 @@ static void cpuidle_general_output(void)
static void proc_cpuidle_cpu_output(unsigned int cpu) static void proc_cpuidle_cpu_output(unsigned int cpu)
{ {
long max_allowed_cstate = 2000000000; long max_allowed_cstate = 2000000000;
unsigned int cstate, cstates; int cstate, cstates;
cstates = sysfs_get_idlestate_count(cpu); cstates = sysfs_get_idlestate_count(cpu);
if (cstates == 0) { if (cstates < 1) {
printf(_("CPU %u: No C-states info\n"), cpu); printf(_("CPU %u: No C-states info\n"), cpu);
return; return;
} }