tools/cpupower: Choose base_cpu to display default cpupower details

The default output of cpupower info utils shows unexpected output
when CPU 0 is disabled.

Considering a case where CPU 0 is disabled, output of cpupower idle-info:

Before change:
cpupower idle-info
CPUidle driver: pseries_idle
CPUidle governor: menu
analyzing CPU 0:
 *is offline

After change:
./cpupower idle-info
CPUidle driver: pseries_idle
CPUidle governor: menu
analyzing CPU 50:

Number of idle states: 2
Available idle states: snooze CEDE
snooze:
Flags/Description: snooze
Latency: 0
Usage: 101748
Duration: 2724058
CEDE:
Flags/Description: CEDE
Latency: 12
Usage: 270004
Duration: 283019526849

If -c option is not passed, CPU 0 was chosen as the default chosen CPU to
display details. However when CPU 0 is offline, it results in showing
unexpected output. This commit chooses the base_cpu
instead of CPU 0, hence keeping the output more relevant in all cases.
The base_cpu is the number of CPU on which the calling thread is
currently executing.

Signed-off-by: Saket Kumar Bhaskar <skb99@linux.vnet.ibm.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c
index 0646f615fe2d4b971261f35584b8000f23e70de4..c96b77365c637da774478edeab00b98e823c5abf 100644 (file)
--- a/tools/power/cpupower/utils/cpufreq-info.c
+++ b/tools/power/cpupower/utils/cpufreq-info.c
@@ -572,9 +572,9 @@ int cmd_freq_info(int argc, char **argv)
 
        ret = 0;
 
-       /* Default is: show output of CPU 0 only */
+       /* Default is: show output of base_cpu only */
        if (bitmask_isallclear(cpus_chosen))
-               bitmask_setbit(cpus_chosen, 0);
+               bitmask_setbit(cpus_chosen, base_cpu);
 
        switch (output_param) {
        case -1:

diff --git a/tools/power/cpupower/utils/cpuidle-info.c b/tools/power/cpupower/utils/cpuidle-info.c
index f2b202c5552a30343e559b670de8e68437f82449..44126a87fa7ae32d38cd8828be128195c204ba2b 100644 (file)
--- a/tools/power/cpupower/utils/cpuidle-info.c
+++ b/tools/power/cpupower/utils/cpuidle-info.c
@@ -176,9 +176,9 @@ int cmd_idle_info(int argc, char **argv)
                cpuidle_exit(EXIT_FAILURE);
        }
 
-       /* Default is: show output of CPU 0 only */
+       /* Default is: show output of base_cpu only */
        if (bitmask_isallclear(cpus_chosen))
-               bitmask_setbit(cpus_chosen, 0);
+               bitmask_setbit(cpus_chosen, base_cpu);
 
        if (output_param == 0)
                cpuidle_general_output();

diff --git a/tools/power/cpupower/utils/cpupower-info.c b/tools/power/cpupower/utils/cpupower-info.c
index 06345b5437869a72c3feffb7ed2e543d8d9cedec..18fd7751f509fd2247a4eb78fecf7d6dae5975f0 100644 (file)
--- a/tools/power/cpupower/utils/cpupower-info.c
+++ b/tools/power/cpupower/utils/cpupower-info.c
@@ -67,9 +67,9 @@ int cmd_info(int argc, char **argv)
        if (!params.params)
                params.params = 0x7;
 
-       /* Default is: show output of CPU 0 only */
+       /* Default is: show output of base_cpu only */
        if (bitmask_isallclear(cpus_chosen))
-               bitmask_setbit(cpus_chosen, 0);
+               bitmask_setbit(cpus_chosen, base_cpu);
 
        /* Add more per cpu options here */
        if (!params.perf_bias)