Patch "[PATCH 22/27] powerpc/speculation: Support 'mitigations=' cmdline" has been added to the 5.1-stable tree
Subsystems (2)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
[PATCH 22/27] powerpc/speculation: Support 'mitigations=' cmdline
to the 5.1-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:
0022-powerpc-speculation-Support-mitigations-cmdline-opti.patch
and it can be found in the queue-5.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From b7344dd66dc6a99ecabeb0ab059334eba128da83 Mon Sep 17 00:00:00 2001
From: Josh Poimboeuf <[email protected]>
Date: Fri, 12 Apr 2019 15:39:30 -0500
Subject: [PATCH 22/27] powerpc/speculation: Support 'mitigations=' cmdline
option
commit 782e69efb3dfed6e8360bc612e8c7827a901a8f9 upstream
Configure powerpc CPU runtime speculation bug mitigations in accordance with the 'mitigations=' cmdline option. This affects Meltdown, Spectre v1, Spectre v2, and Speculative Store Bypass.
The default behavior is unchanged.
Signed-off-by Josh Poimboeuf <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Tested-by Jiri Kosina <[email protected]> (on x86)
Reviewed-by Jiri Kosina <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc "H . Peter Anvin" <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc Waiman Long <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc Jon Masters <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Tyler Hicks <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Steven Price <[email protected]>
Cc Phil Auld <[email protected]>
Link https://lkml.kernel.org/r/245a606e1a42a558a310220312d9b6adb9159df6.1555085500.git.jpoimboe@redhat.com open here
Signed-off-by Greg Kroah-Hartman <[email protected]>
--- Documentation/admin-guide/kernel-parameters.txt | 9 +++++---- arch/powerpc/kernel/security.c | 6 +++--- arch/powerpc/kernel/setup_64.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +5 -4
@@ -2571,7 +2571,7 @@ http://repo.or.cz/w/linux-2.6/mini2440.git mitigations= - [X86] Control optional mitigations for CPU + [X86,PPC] Control optional mitigations for CPU vulnerabilities. This is a set of curated, arch-independent options, each of which is an aggregation of existing arch-specific options.
@@ -2580,10 +2580,11 @@ Disable all optional CPU mitigations. This improves system performance, but it may also expose users to several CPU vulnerabilities. - Equivalent to: nopti [X86] - nospectre_v2 [X86] + Equivalent to: nopti [X86,PPC] + nospectre_v1 [PPC] + nospectre_v2 [X86,PPC] spectre_v2_user=off [X86] - spec_store_bypass_disable=off [X86] + spec_store_bypass_disable=off [X86,PPC] l1tf=off [X86] auto (default)
arch/powerpc/kernel/security.c +3 -3
@@ -57,7 +57,7 @@ void setup_barrier_nospec(void) enable =security_ftr_enabled (SEC_FTR_FAVOUR_SECURITY ) &&security_ftr_enabled (SEC_FTR_BNDS_CHK_SPEC_BAR ); -if (!no_nospec) +if (!no_nospec && !cpu_mitigations_off ())enable_barrier_nospec (enable); }
@@ -116,7 +116,7 @@ static int __init handle_nospectre_v2(char *p)early_param ("nospectre_v2" , handle_nospectre_v2);void setup_spectre_v2 (void ) { -if (no_spectrev2) +if (no_spectrev2 ||cpu_mitigations_off ())do_btb_flush_fixups ();else btb_flush_enabled = true;
@@ -300,7 +300,7 @@ void setup_stf_barrier(void) stf_enabled_flush_types = type; -if (!no_stf_barrier) +if (!no_stf_barrier && !cpu_mitigations_off ())stf_barrier_enable (enable); }
arch/powerpc/kernel/setup_64.c +1 -1
@@ -932,7 +932,7 @@ void setup_rfi_flush(enum l1d_flush_type types, bool enable) enabled_flush_types = types; -if (!no_rfi_flush) +if (!no_rfi_flush && !cpu_mitigations_off ())rfi_flush_enable (enable); }
Signature · 22 lines
2.21.0 Patches currently in stable-queue which might be from [email protected] are queue-5.1/0019-x86-speculation-mds-Print-SMT-vulnerable-on-MSBDS-wi.patch queue-5.1/0016-x86-speculation-Move-arch_smt_update-call-to-after-m.patch queue-5.1/0024-x86-speculation-mds-Add-mitigations-support-for-MDS.patch queue-5.1/0021-x86-speculation-Support-mitigations-cmdline-option.patch queue-5.1/0022-powerpc-speculation-Support-mitigations-cmdline-opti.patch queue-5.1/0020-cpu-speculation-Add-mitigations-cmdline-option.patch queue-5.1/0023-s390-speculation-Support-mitigations-cmdline-option.patch queue-5.1/0015-x86-speculation-mds-Add-mds-full-nosmt-cmdline-optio.patch queue-5.1/0027-x86-speculation-mds-Fix-documentation-typo.patch queue-5.1/0017-x86-speculation-mds-Add-SMT-warning-message.patch queue-5.1/0018-x86-speculation-mds-Fix-comment.patch _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel