[PATCH] x86/fpu: Parse comma separated list passed in clearcpuid

[Prarit Bhargava]

Users cannot disable multiple CPU features with the kernel parameter
clearcpuid=.  For example, "clearcpuid=154 clearcpuid=227" only disables
CPUID bit 154.

Previous to commit 0c2a3913d6f5 ("x86/fpu: Parse clearcpuid= as early XSAVE
argument") it was possible to pass multiple clearcpuid options as kernel
parameters using individual entries.  With the new code it isn't easy to
replicate exactly that behaviour but a comma separated list can be easily
implemented, eg) "clearcpuid=154,227"

Make the clearcpuid parse a comma-separated list of values instead of only
a single value.

Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: x86@xxxxxxxxxx
Cc: linux-doc@xxxxxxxxxxxxxxx
---
 .../admin-guide/kernel-parameters.txt         | 10 ++++----
 arch/x86/kernel/fpu/init.c                    | 25 ++++++++++++++-----
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 858b6c0b9a15..0084fb0a0781 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -559,11 +559,11 @@
 			systems.
 
 	clearcpuid=BITNUM [X86]
-			Disable CPUID feature X for the kernel. See
-			arch/x86/include/asm/cpufeatures.h for the valid bit
-			numbers. Note the Linux specific bits are not necessarily
-			stable over kernel options, but the vendor specific
-			ones should be.
+			Disable the comma-separated list of CPUID features for
+			the kernel. See arch/x86/include/asm/cpufeatures.h for
+			the valid bit numbers. Note the Linux specific bits
+			are not necessarily stable over kernel options, but
+			the vendor specific ones should be.
 			Also note that user programs calling CPUID directly
 			or using the feature without checking anything
 			will still see it. This just prevents it from
diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
index 6abd83572b01..14bb3ab769d2 100644
--- a/arch/x86/kernel/fpu/init.c
+++ b/arch/x86/kernel/fpu/init.c
@@ -251,7 +251,8 @@ static void __init fpu__init_parse_early_param(void)
 {
 	char arg[32];
 	char *argptr = arg;
-	int bit;
+	char *argptrend;
+	int bit, i, ret;
 
 	if (cmdline_find_option_bool(boot_command_line, "no387"))
 		setup_clear_cpu_cap(X86_FEATURE_FPU);
@@ -272,11 +273,23 @@ static void __init fpu__init_parse_early_param(void)
 		setup_clear_cpu_cap(X86_FEATURE_XSAVES);
 
 	if (cmdline_find_option(boot_command_line, "clearcpuid", arg,
-				sizeof(arg)) &&
-	    get_option(&argptr, &bit) &&
-	    bit >= 0 &&
-	    bit < NCAPINTS * 32)
-		setup_clear_cpu_cap(bit);
+				sizeof(arg))) {
+		argptrend = argptr + strlen(argptr) - 1;
+		for (i = 0; i < (argptrend - argptr); i++)
+			if (arg[i] == ',')
+				arg[i] = '\0';
+		while (argptr < argptrend) {
+			ret = kstrtoint(argptr, 10, &bit);
+			if (!ret && (bit >= 0 && bit < NCAPINTS * 32))
+				setup_clear_cpu_cap(bit);
+			else {
+				pr_warn("x86/fpu: clearcpuid invalid entry %s\n",
+					arg);
+				return;
+			}
+			argptr += strlen(argptr) + 1;
+		}
+	}
 }
 
 /*
-- 
2.17.2