mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
x86/cpu: Actually turn off mitigations by default for SPECULATION_MITIGATIONS=n
commitf337a6a21e
upstream. Initialize cpu_mitigations to CPU_MITIGATIONS_OFF if the kernel is built with CONFIG_SPECULATION_MITIGATIONS=n, as the help text quite clearly states that disabling SPECULATION_MITIGATIONS is supposed to turn off all mitigations by default. │ If you say N, all mitigations will be disabled. You really │ should know what you are doing to say so. As is, the kernel still defaults to CPU_MITIGATIONS_AUTO, which results in some mitigations being enabled in spite of SPECULATION_MITIGATIONS=n. Fixes:f43b9876e8
("x86/retbleed: Add fine grained Kconfig knobs") Signed-off-by: Sean Christopherson <seanjc@google.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Reviewed-by: Daniel Sneddon <daniel.sneddon@linux.intel.com> Cc: stable@vger.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: https://lore.kernel.org/r/20240409175108.1512861-2-seanjc@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e8f4a290ab
commit
70688450dd
1 changed files with 2 additions and 1 deletions
|
@ -2722,7 +2722,8 @@ enum cpu_mitigations {
|
||||||
};
|
};
|
||||||
|
|
||||||
static enum cpu_mitigations cpu_mitigations __ro_after_init =
|
static enum cpu_mitigations cpu_mitigations __ro_after_init =
|
||||||
CPU_MITIGATIONS_AUTO;
|
IS_ENABLED(CONFIG_SPECULATION_MITIGATIONS) ? CPU_MITIGATIONS_AUTO :
|
||||||
|
CPU_MITIGATIONS_OFF;
|
||||||
|
|
||||||
static int __init mitigations_parse_cmdline(char *arg)
|
static int __init mitigations_parse_cmdline(char *arg)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue