f447ef4a56
If a user calls 'cpupower set --perf-bias 15', the process will end with a SIGSEGV in libc because cpupower-set passes a NULL optarg to the atoi call. This is because the getopt_long structure currently has all of the options as having an optional_argument when they really have a required argument. We change the structure to use required_argument to match the short options and it resolves the issue. This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1000439 Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Thomas Renninger <trenn@suse.de> Cc: stable@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
135 lines
3.0 KiB
C
135 lines
3.0 KiB
C
/*
|
|
* (C) 2011 Thomas Renninger <trenn@suse.de>, Novell Inc.
|
|
*
|
|
* Licensed under the terms of the GNU GPL License version 2.
|
|
*/
|
|
|
|
|
|
#include <unistd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <getopt.h>
|
|
|
|
#include <cpufreq.h>
|
|
#include "helpers/helpers.h"
|
|
#include "helpers/sysfs.h"
|
|
#include "helpers/bitmask.h"
|
|
|
|
static struct option set_opts[] = {
|
|
{ .name = "perf-bias", .has_arg = required_argument, .flag = NULL, .val = 'b'},
|
|
{ .name = "sched-mc", .has_arg = required_argument, .flag = NULL, .val = 'm'},
|
|
{ .name = "sched-smt", .has_arg = required_argument, .flag = NULL, .val = 's'},
|
|
{ },
|
|
};
|
|
|
|
static void print_wrong_arg_exit(void)
|
|
{
|
|
printf(_("invalid or unknown argument\n"));
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
|
|
int cmd_set(int argc, char **argv)
|
|
{
|
|
extern char *optarg;
|
|
extern int optind, opterr, optopt;
|
|
unsigned int cpu;
|
|
|
|
union {
|
|
struct {
|
|
int sched_mc:1;
|
|
int sched_smt:1;
|
|
int perf_bias:1;
|
|
};
|
|
int params;
|
|
} params;
|
|
int sched_mc = 0, sched_smt = 0, perf_bias = 0;
|
|
int ret = 0;
|
|
|
|
setlocale(LC_ALL, "");
|
|
textdomain(PACKAGE);
|
|
|
|
params.params = 0;
|
|
/* parameter parsing */
|
|
while ((ret = getopt_long(argc, argv, "m:s:b:",
|
|
set_opts, NULL)) != -1) {
|
|
switch (ret) {
|
|
case 'b':
|
|
if (params.perf_bias)
|
|
print_wrong_arg_exit();
|
|
perf_bias = atoi(optarg);
|
|
if (perf_bias < 0 || perf_bias > 15) {
|
|
printf(_("--perf-bias param out "
|
|
"of range [0-%d]\n"), 15);
|
|
print_wrong_arg_exit();
|
|
}
|
|
params.perf_bias = 1;
|
|
break;
|
|
case 'm':
|
|
if (params.sched_mc)
|
|
print_wrong_arg_exit();
|
|
sched_mc = atoi(optarg);
|
|
if (sched_mc < 0 || sched_mc > 2) {
|
|
printf(_("--sched-mc param out "
|
|
"of range [0-%d]\n"), 2);
|
|
print_wrong_arg_exit();
|
|
}
|
|
params.sched_mc = 1;
|
|
break;
|
|
case 's':
|
|
if (params.sched_smt)
|
|
print_wrong_arg_exit();
|
|
sched_smt = atoi(optarg);
|
|
if (sched_smt < 0 || sched_smt > 2) {
|
|
printf(_("--sched-smt param out "
|
|
"of range [0-%d]\n"), 2);
|
|
print_wrong_arg_exit();
|
|
}
|
|
params.sched_smt = 1;
|
|
break;
|
|
default:
|
|
print_wrong_arg_exit();
|
|
}
|
|
};
|
|
|
|
if (!params.params)
|
|
print_wrong_arg_exit();
|
|
|
|
if (params.sched_mc) {
|
|
ret = sysfs_set_sched("mc", sched_mc);
|
|
if (ret)
|
|
fprintf(stderr, _("Error setting sched-mc %s\n"),
|
|
(ret == -ENODEV) ? "not supported" : "");
|
|
}
|
|
if (params.sched_smt) {
|
|
ret = sysfs_set_sched("smt", sched_smt);
|
|
if (ret)
|
|
fprintf(stderr, _("Error setting sched-smt %s\n"),
|
|
(ret == -ENODEV) ? "not supported" : "");
|
|
}
|
|
|
|
/* Default is: set all CPUs */
|
|
if (bitmask_isallclear(cpus_chosen))
|
|
bitmask_setall(cpus_chosen);
|
|
|
|
/* loop over CPUs */
|
|
for (cpu = bitmask_first(cpus_chosen);
|
|
cpu <= bitmask_last(cpus_chosen); cpu++) {
|
|
|
|
if (!bitmask_isbitset(cpus_chosen, cpu) ||
|
|
cpufreq_cpu_exists(cpu))
|
|
continue;
|
|
|
|
if (params.perf_bias) {
|
|
ret = msr_intel_set_perf_bias(cpu, perf_bias);
|
|
if (ret) {
|
|
fprintf(stderr, _("Error setting perf-bias "
|
|
"value on CPU %d\n"), cpu);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return ret;
|
|
}
|