mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-17 02:15:57 +00:00
99481d2195
For both the d and e options in 'cpupower idle_set' command, an atoi() conversion is done without checking if the input argument is all numeric. So, an atoi conversion is done on any character provided as input and the CPU idle_set operation continues with that integer value, which may not be what is intended or entirely correct. The output of cpuidle-set before patch is as follows: [root@xxx cpupower]# cpupower idle-set -e 1$ Idlestate 1 enabled on CPU 0 [snip] Idlestate 1 enabled on CPU 47 [root@xxx cpupower]# cpupower idle-set -e 11 Idlestate 11 not available on CPU 0 [snip] Idlestate 11 not available on CPU 47 [root@xxx cpupower]# cpupower idle-set -d 12 Idlestate 12 not available on CPU 0 [snip] Idlestate 12 not available on CPU 47 [root@xxx cpupower]# cpupower idle-set -d qw Idlestate 0 disabled on CPU 0 [snip] Idlestate 0 disabled on CPU 47 This patch adds a check for both d and e options in cpuidle-set.c to see that the idle_set value is all numeric before doing a string-to-int conversion using strtol(). The output of cpuidle-set after the patch is as below: [root@xxx cpupower]# ./cpupower idle-set -e 1$ Bad idle_set value: 1$. Integer expected [root@xxx cpupower]# ./cpupower idle-set -e 11 Idlestate 11 not available on CPU 0 [snip] Idlestate 11 not available on CPU 47 [root@xxx cpupower]# ./cpupower idle-set -d 12 Idlestate 12 not available on CPU 0 [snip] Idlestate 12 not available on CPU 47 [root@xxx cpupower]# ./cpupower idle-set -d qw Bad idle_set value: qw. Integer expected Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com> Signed-off-by: Likhitha Korrapati <likhitha@linux.ibm.com> Tested-by: Pavithra Prakash <pavrampu@linux.vnet.ibm.com> Reviewed-by: Rick Lindsley <ricklind@linux.vnet.ibm.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
188 lines
4.2 KiB
C
188 lines
4.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <limits.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
#include <getopt.h>
|
|
|
|
#include <cpufreq.h>
|
|
#include <cpuidle.h>
|
|
|
|
#include "helpers/helpers.h"
|
|
|
|
static struct option info_opts[] = {
|
|
{"disable", required_argument, NULL, 'd'},
|
|
{"enable", required_argument, NULL, 'e'},
|
|
{"disable-by-latency", required_argument, NULL, 'D'},
|
|
{"enable-all", no_argument, NULL, 'E'},
|
|
{ },
|
|
};
|
|
|
|
|
|
int cmd_idle_set(int argc, char **argv)
|
|
{
|
|
extern char *optarg;
|
|
extern int optind, opterr, optopt;
|
|
int ret = 0, cont = 1, param = 0, disabled;
|
|
unsigned long long latency = 0, state_latency;
|
|
unsigned int cpu = 0, idlestate = 0, idlestates = 0;
|
|
char *endptr;
|
|
|
|
do {
|
|
ret = getopt_long(argc, argv, "d:e:ED:", info_opts, NULL);
|
|
if (ret == -1)
|
|
break;
|
|
switch (ret) {
|
|
case '?':
|
|
param = '?';
|
|
cont = 0;
|
|
break;
|
|
case 'd':
|
|
case 'e':
|
|
if (param) {
|
|
param = -1;
|
|
cont = 0;
|
|
break;
|
|
}
|
|
param = ret;
|
|
strtol(optarg, &endptr, 10);
|
|
if (*endptr != '\0') {
|
|
printf(_("Bad value: %s, Integer expected\n"), optarg);
|
|
exit(EXIT_FAILURE);
|
|
} else {
|
|
idlestate = atoi(optarg);
|
|
}
|
|
break;
|
|
case 'D':
|
|
if (param) {
|
|
param = -1;
|
|
cont = 0;
|
|
break;
|
|
}
|
|
param = ret;
|
|
latency = strtoull(optarg, &endptr, 10);
|
|
if (*endptr != '\0') {
|
|
printf(_("Bad latency value: %s\n"), optarg);
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
break;
|
|
case 'E':
|
|
if (param) {
|
|
param = -1;
|
|
cont = 0;
|
|
break;
|
|
}
|
|
param = ret;
|
|
break;
|
|
case -1:
|
|
cont = 0;
|
|
break;
|
|
}
|
|
} while (cont);
|
|
|
|
switch (param) {
|
|
case -1:
|
|
printf(_("You can't specify more than one "
|
|
"output-specific argument\n"));
|
|
exit(EXIT_FAILURE);
|
|
case '?':
|
|
printf(_("invalid or unknown argument\n"));
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
get_cpustate();
|
|
|
|
/* Default is: set all CPUs */
|
|
if (bitmask_isallclear(cpus_chosen))
|
|
bitmask_setall(cpus_chosen);
|
|
|
|
for (cpu = bitmask_first(cpus_chosen);
|
|
cpu <= bitmask_last(cpus_chosen); cpu++) {
|
|
|
|
if (!bitmask_isbitset(cpus_chosen, cpu))
|
|
continue;
|
|
|
|
if (cpupower_is_cpu_online(cpu) != 1)
|
|
continue;
|
|
|
|
idlestates = cpuidle_state_count(cpu);
|
|
if (idlestates <= 0)
|
|
continue;
|
|
|
|
switch (param) {
|
|
case 'd':
|
|
ret = cpuidle_state_disable(cpu, idlestate, 1);
|
|
if (ret == 0)
|
|
printf(_("Idlestate %u disabled on CPU %u\n"), idlestate, cpu);
|
|
else if (ret == -1)
|
|
printf(_("Idlestate %u not available on CPU %u\n"),
|
|
idlestate, cpu);
|
|
else if (ret == -2)
|
|
printf(_("Idlestate disabling not supported by kernel\n"));
|
|
else
|
|
printf(_("Idlestate %u not disabled on CPU %u\n"),
|
|
idlestate, cpu);
|
|
break;
|
|
case 'e':
|
|
ret = cpuidle_state_disable(cpu, idlestate, 0);
|
|
if (ret == 0)
|
|
printf(_("Idlestate %u enabled on CPU %u\n"), idlestate, cpu);
|
|
else if (ret == -1)
|
|
printf(_("Idlestate %u not available on CPU %u\n"),
|
|
idlestate, cpu);
|
|
else if (ret == -2)
|
|
printf(_("Idlestate enabling not supported by kernel\n"));
|
|
else
|
|
printf(_("Idlestate %u not enabled on CPU %u\n"),
|
|
idlestate, cpu);
|
|
break;
|
|
case 'D':
|
|
for (idlestate = 0; idlestate < idlestates; idlestate++) {
|
|
disabled = cpuidle_is_state_disabled
|
|
(cpu, idlestate);
|
|
state_latency = cpuidle_state_latency
|
|
(cpu, idlestate);
|
|
if (disabled == 1) {
|
|
if (latency > state_latency){
|
|
ret = cpuidle_state_disable
|
|
(cpu, idlestate, 0);
|
|
if (ret == 0)
|
|
printf(_("Idlestate %u enabled on CPU %u\n"), idlestate, cpu);
|
|
}
|
|
continue;
|
|
}
|
|
if (latency <= state_latency){
|
|
ret = cpuidle_state_disable
|
|
(cpu, idlestate, 1);
|
|
if (ret == 0)
|
|
printf(_("Idlestate %u disabled on CPU %u\n"), idlestate, cpu);
|
|
}
|
|
}
|
|
break;
|
|
case 'E':
|
|
for (idlestate = 0; idlestate < idlestates; idlestate++) {
|
|
disabled = cpuidle_is_state_disabled
|
|
(cpu, idlestate);
|
|
if (disabled == 1) {
|
|
ret = cpuidle_state_disable
|
|
(cpu, idlestate, 0);
|
|
if (ret == 0)
|
|
printf(_("Idlestate %u enabled on CPU %u\n"), idlestate, cpu);
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
/* Not reachable with proper args checking */
|
|
printf(_("Invalid or unknown argument\n"));
|
|
exit(EXIT_FAILURE);
|
|
break;
|
|
}
|
|
}
|
|
|
|
print_offline_cpus();
|
|
return EXIT_SUCCESS;
|
|
}
|