mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
5975e2558e
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>
114 lines
2.3 KiB
C
114 lines
2.3 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* (C) 2011 Thomas Renninger <trenn@suse.de>, Novell Inc.
|
|
*/
|
|
|
|
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <getopt.h>
|
|
#include <sys/utsname.h>
|
|
|
|
#include "helpers/helpers.h"
|
|
#include "helpers/sysfs.h"
|
|
|
|
static struct option set_opts[] = {
|
|
{"perf-bias", optional_argument, NULL, 'b'},
|
|
{ },
|
|
};
|
|
|
|
static void print_wrong_arg_exit(void)
|
|
{
|
|
printf(_("invalid or unknown argument\n"));
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
int cmd_info(int argc, char **argv)
|
|
{
|
|
extern char *optarg;
|
|
extern int optind, opterr, optopt;
|
|
unsigned int cpu;
|
|
struct utsname uts;
|
|
|
|
union {
|
|
struct {
|
|
int perf_bias:1;
|
|
};
|
|
int params;
|
|
} params = {};
|
|
int ret = 0;
|
|
|
|
ret = uname(&uts);
|
|
if (!ret && (!strcmp(uts.machine, "ppc64le") ||
|
|
!strcmp(uts.machine, "ppc64"))) {
|
|
fprintf(stderr, _("Subcommand not supported on POWER.\n"));
|
|
return ret;
|
|
}
|
|
|
|
setlocale(LC_ALL, "");
|
|
textdomain(PACKAGE);
|
|
|
|
/* parameter parsing */
|
|
while ((ret = getopt_long(argc, argv, "b", set_opts, NULL)) != -1) {
|
|
switch (ret) {
|
|
case 'b':
|
|
if (params.perf_bias)
|
|
print_wrong_arg_exit();
|
|
params.perf_bias = 1;
|
|
break;
|
|
default:
|
|
print_wrong_arg_exit();
|
|
}
|
|
}
|
|
|
|
if (!params.params)
|
|
params.params = 0x7;
|
|
|
|
/* Default is: show output of base_cpu only */
|
|
if (bitmask_isallclear(cpus_chosen))
|
|
bitmask_setbit(cpus_chosen, base_cpu);
|
|
|
|
/* Add more per cpu options here */
|
|
if (!params.perf_bias)
|
|
return ret;
|
|
|
|
if (params.perf_bias) {
|
|
if (!run_as_root) {
|
|
params.perf_bias = 0;
|
|
printf(_("Intel's performance bias setting needs root privileges\n"));
|
|
} else if (!(cpupower_cpu_info.caps & CPUPOWER_CAP_PERF_BIAS)) {
|
|
printf(_("System does not support Intel's performance"
|
|
" bias setting\n"));
|
|
params.perf_bias = 0;
|
|
}
|
|
}
|
|
|
|
/* loop over CPUs */
|
|
for (cpu = bitmask_first(cpus_chosen);
|
|
cpu <= bitmask_last(cpus_chosen); cpu++) {
|
|
|
|
if (!bitmask_isbitset(cpus_chosen, cpu))
|
|
continue;
|
|
|
|
printf(_("analyzing CPU %d:\n"), cpu);
|
|
|
|
if (sysfs_is_cpu_online(cpu) != 1){
|
|
printf(_(" *is offline\n"));
|
|
continue;
|
|
}
|
|
|
|
if (params.perf_bias) {
|
|
ret = cpupower_intel_get_perf_bias(cpu);
|
|
if (ret < 0) {
|
|
fprintf(stderr,
|
|
_("Could not read perf-bias value[%d]\n"), ret);
|
|
exit(EXIT_FAILURE);
|
|
} else
|
|
printf(_("perf-bias: %d\n"), ret);
|
|
}
|
|
}
|
|
return 0;
|
|
}
|