> * Some CPU features depend on higher CPUID levels, which may not always > * be available due to CPUID level capping or broken virtualization > @@ -1261,6 +1269,9 @@ static void __init cpu_parse_early_param(void) > if (cmdline_find_option_bool(boot_command_line, "noxsaves")) > setup_clear_cpu_cap(X86_FEATURE_XSAVES); > > + if (cmdline_find_option_bool(boot_command_line, "no_user_shstk")) > + setup_clear_cpu_cap(X86_FEATURE_SHSTK); Given this: https://lore.kernel.org/all/20220127115626.14179-2-bp@xxxxxxxxx/ I'd probably yank the command-line option out of this series, or stick it in a separate patch that you tack on to the end.
