Patch "x86/spectre: Simplify spectre_v2 command line parsing" has been added to the 4.14-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86/spectre: Simplify spectre_v2 command line parsing
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86spectre_Simplify_spectre_v2_command_line_parsing.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Subject: x86/spectre: Simplify spectre_v2 command line parsing
From: KarimAllah Ahmed [email protected]
Date: Thu Feb 1 11:27:21 2018 +0000
From: KarimAllah Ahmed [email protected]
commit 9005c6834c0ffdfe46afa76656bd9276cca864f6
[dwmw2: Use ARRAY_SIZE]
--- arch/x86/kernel/cpu/bugs.c | 84 +++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 29 deletions(-)
arch/x86/kernel/cpu/bugs.c +55 -29
@@ -119,13 +119,13 @@ static inline const char *spectre_v2_modstatic void __init spec2_print_if_insecure (const char *reason) {if (boot_cpu_has_bug (X86_BUG_SPECTRE_V2 )) -pr_info ("%s\n" , reason); +pr_info ("%s selected on command line.\n" , reason); }static void __init spec2_print_if_secure (const char *reason) {if (!boot_cpu_has_bug (X86_BUG_SPECTRE_V2 )) -pr_info ("%s\n" , reason); +pr_info ("%s selected on command line.\n" , reason); }static inline bool retp_compiler (void )
@@ -140,42 +140,68 @@ static inline bool match_option(const chreturn len == arglen && !strncmp (arg, opt, len); } +static const struct { +const char *option; +enum spectre_v2_mitigation_cmd cmd; +bool secure; +} mitigation_options[] = { + {"off" ,SPECTRE_V2_CMD_NONE , false }, + {"on" ,SPECTRE_V2_CMD_FORCE , true }, + {"retpoline" ,SPECTRE_V2_CMD_RETPOLINE , false }, + {"retpoline,amd" ,SPECTRE_V2_CMD_RETPOLINE_AMD , false }, + {"retpoline,generic" ,SPECTRE_V2_CMD_RETPOLINE_GENERIC , false }, + {"auto" ,SPECTRE_V2_CMD_AUTO , false }, +}; +static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline (void ) {char arg[20 ]; -int ret; +int ret, i; +enum spectre_v2_mitigation_cmd cmd =SPECTRE_V2_CMD_AUTO ; + +if (cmdline_find_option_bool (boot_command_line,"nospectre_v2" )) +return SPECTRE_V2_CMD_NONE ; +else { + ret =cmdline_find_option (boot_command_line,"spectre_v2" , arg, +sizeof (arg)); +if (ret <0 ) +return SPECTRE_V2_CMD_AUTO ; - ret =cmdline_find_option (boot_command_line,"spectre_v2" , arg, -sizeof (arg)); -if (ret >0 ) { -if (match_option (arg, ret,"off" )) { - goto disable; - }else if (match_option (arg, ret,"on" )) { -spec2_print_if_secure ("force enabled on command line." ); -return SPECTRE_V2_CMD_FORCE ; - }else if (match_option (arg, ret,"retpoline" )) { -spec2_print_if_insecure ("retpoline selected on command line." ); -return SPECTRE_V2_CMD_RETPOLINE ; - }else if (match_option (arg, ret,"retpoline,amd" )) { -if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) { -pr_err ("retpoline,amd selected but CPU is not AMD. Switching to AUTO select\n" ); -return SPECTRE_V2_CMD_AUTO ; - } -spec2_print_if_insecure ("AMD retpoline selected on command line." ); -return SPECTRE_V2_CMD_RETPOLINE_AMD ; - }else if (match_option (arg, ret,"retpoline,generic" )) { -spec2_print_if_insecure ("generic retpoline selected on command line." ); -return SPECTRE_V2_CMD_RETPOLINE_GENERIC ; - }else if (match_option (arg, ret,"auto" )) { +for (i =0 ; i <ARRAY_SIZE (mitigation_options); i++) { +if (!match_option (arg, ret, mitigation_options[i].option)) +continue ; + cmd = mitigation_options[i].cmd; +break ; + } + +if (i >=ARRAY_SIZE (mitigation_options)) { +pr_err ("unknown option (%s). Switching to AUTO select\n" , + mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ; } } -if (!cmdline_find_option_bool (boot_command_line,"nospectre_v2" )) +if ((cmd ==SPECTRE_V2_CMD_RETPOLINE || + cmd ==SPECTRE_V2_CMD_RETPOLINE_AMD || + cmd ==SPECTRE_V2_CMD_RETPOLINE_GENERIC ) && + !IS_ENABLED (CONFIG_RETPOLINE )) { +pr_err ("%s selected but not compiled in. Switching to AUTO select\n" , + mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ; -disable: -spec2_print_if_insecure ("disabled on command line." ); -return SPECTRE_V2_CMD_NONE ; + } + +if (cmd ==SPECTRE_V2_CMD_RETPOLINE_AMD && + boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) { +pr_err ("retpoline,amd selected but CPU is not AMD. Switching to AUTO select\n" ); +return SPECTRE_V2_CMD_AUTO ; + } + +if (mitigation_options[i].secure) +spec2_print_if_secure (mitigation_options[i].option); +else +spec2_print_if_insecure (mitigation_options[i].option); + +return cmd; }/* Check for Skylake-like CPUs (for RSB handling) */
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/x86spectre_Simplify_spectre_v2_command_line_parsing.patch queue-4.14/x86pti_Do_not_enable_PTI_on_CPUs_which_are_not_vulnerable_to_Meltdown.patch queue-4.14/x86speculation_Use_Indirect_Branch_Prediction_Barrier_in_context_switch.patch queue-4.14/x86cpuid_Fix_up_virtual_IBRSIBPBSTIBP_feature_bits_on_Intel.patch queue-4.14/x86cpufeature_Blacklist_SPEC_CTRLPRED_CMD_on_early_Spectre_v2_microcodes.patch queue-4.14/x86cpufeatures_Add_Intel_feature_bits_for_Speculation_Control.patch queue-4.14/x86msr_Add_definitions_for_new_speculation_control_MSRs.patch queue-4.14/KVMVMX_Allow_direct_access_to_MSR_IA32_SPEC_CTRL.patch queue-4.14/x86cpufeatures_Add_CPUID_7_EDX_CPUID_leaf.patch queue-4.14/x86cpufeatures_Add_AMD_feature_bits_for_Speculation_Control.patch queue-4.14/KVMSVM_Allow_direct_access_to_MSR_IA32_SPEC_CTRL.patch queue-4.14/KVMx86_Add_IBPB_support.patch queue-4.14/KVMVMX_Emulate_MSR_IA32_ARCH_CAPABILITIES.patch queue-4.14/x86speculation_Add_basic_IBPB_(Indirect_Branch_Prediction_Barrier)_support.patch queue-4.14/x86speculation_Simplify_indirect_branch_prediction_barrier().patch queue-4.14/x86retpoline_Simplify_vmexit_fill_RSB().patch queue-4.14/x86cpufeatures_Clean_up_Spectre_v2_related_CPUID_flags.patch queue-4.14/KVMx86_Update_the_reverse_cpuid_list_to_include_CPUID_7_EDX.patch queue-4.14/x86retpoline_Avoid_retpolines_for_built-in___init_functions.patch