diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0034-x86-speculation-Create-spec-ctrl.h-to-avoid-include-.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0034-x86-speculation-Create-spec-ctrl.h-to-avoid-include-.patch | 141 |
1 files changed, 0 insertions, 141 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0034-x86-speculation-Create-spec-ctrl.h-to-avoid-include-.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0034-x86-speculation-Create-spec-ctrl.h-to-avoid-include-.patch deleted file mode 100644 index 36224a56..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0034-x86-speculation-Create-spec-ctrl.h-to-avoid-include-.patch +++ /dev/null @@ -1,141 +0,0 @@ -From b8380a76b18fa5522368b50c284530fc6e1b1992 Mon Sep 17 00:00:00 2001 -From: Thomas Gleixner <tglx@linutronix.de> -Date: Sun, 29 Apr 2018 15:01:37 +0200 -Subject: [PATCH 34/93] x86/speculation: Create spec-ctrl.h to avoid include - hell - -commit 28a2775217b17208811fa43a9e96bd1fdf417b86 upstream - -Having everything in nospec-branch.h creates a hell of dependencies when -adding the prctl based switching mechanism. Move everything which is not -required in nospec-branch.h to spec-ctrl.h and fix up the includes in the -relevant files. - -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> -Reviewed-by: Ingo Molnar <mingo@kernel.org> -Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/include/asm/nospec-branch.h | 14 -------------- - arch/x86/include/asm/spec-ctrl.h | 21 +++++++++++++++++++++ - arch/x86/kernel/cpu/amd.c | 2 +- - arch/x86/kernel/cpu/bugs.c | 2 +- - arch/x86/kvm/svm.c | 2 +- - arch/x86/kvm/vmx.c | 2 +- - 6 files changed, 25 insertions(+), 18 deletions(-) - create mode 100644 arch/x86/include/asm/spec-ctrl.h - -diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h -index 3a1541c..1119f14 100644 ---- a/arch/x86/include/asm/nospec-branch.h -+++ b/arch/x86/include/asm/nospec-branch.h -@@ -228,26 +228,12 @@ enum spectre_v2_mitigation { - extern void x86_spec_ctrl_set(u64); - extern u64 x86_spec_ctrl_get_default(void); - --/* -- * On VMENTER we must preserve whatever view of the SPEC_CTRL MSR -- * the guest has, while on VMEXIT we restore the host view. This -- * would be easier if SPEC_CTRL were architecturally maskable or -- * shadowable for guests but this is not (currently) the case. -- * Takes the guest view of SPEC_CTRL MSR as a parameter. -- */ --extern void x86_spec_ctrl_set_guest(u64); --extern void x86_spec_ctrl_restore_host(u64); -- - /* The Speculative Store Bypass disable variants */ - enum ssb_mitigation { - SPEC_STORE_BYPASS_NONE, - SPEC_STORE_BYPASS_DISABLE, - }; - --/* AMD specific Speculative Store Bypass MSR data */ --extern u64 x86_amd_ls_cfg_base; --extern u64 x86_amd_ls_cfg_rds_mask; -- - extern char __indirect_thunk_start[]; - extern char __indirect_thunk_end[]; - -diff --git a/arch/x86/include/asm/spec-ctrl.h b/arch/x86/include/asm/spec-ctrl.h -new file mode 100644 -index 0000000..3ad6442 ---- /dev/null -+++ b/arch/x86/include/asm/spec-ctrl.h -@@ -0,0 +1,21 @@ -+/* SPDX-License-Identifier: GPL-2.0 */ -+#ifndef _ASM_X86_SPECCTRL_H_ -+#define _ASM_X86_SPECCTRL_H_ -+ -+#include <asm/nospec-branch.h> -+ -+/* -+ * On VMENTER we must preserve whatever view of the SPEC_CTRL MSR -+ * the guest has, while on VMEXIT we restore the host view. This -+ * would be easier if SPEC_CTRL were architecturally maskable or -+ * shadowable for guests but this is not (currently) the case. -+ * Takes the guest view of SPEC_CTRL MSR as a parameter. -+ */ -+extern void x86_spec_ctrl_set_guest(u64); -+extern void x86_spec_ctrl_restore_host(u64); -+ -+/* AMD specific Speculative Store Bypass MSR data */ -+extern u64 x86_amd_ls_cfg_base; -+extern u64 x86_amd_ls_cfg_rds_mask; -+ -+#endif -diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c -index 7551d9ad..a176c81 100644 ---- a/arch/x86/kernel/cpu/amd.c -+++ b/arch/x86/kernel/cpu/amd.c -@@ -9,7 +9,7 @@ - #include <asm/processor.h> - #include <asm/apic.h> - #include <asm/cpu.h> --#include <asm/nospec-branch.h> -+#include <asm/spec-ctrl.h> - #include <asm/smp.h> - #include <asm/pci-direct.h> - #include <asm/delay.h> -diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c -index b3696cc..46d01fd 100644 ---- a/arch/x86/kernel/cpu/bugs.c -+++ b/arch/x86/kernel/cpu/bugs.c -@@ -12,7 +12,7 @@ - #include <linux/cpu.h> - #include <linux/module.h> - --#include <asm/nospec-branch.h> -+#include <asm/spec-ctrl.h> - #include <asm/cmdline.h> - #include <asm/bugs.h> - #include <asm/processor.h> -diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c -index 43736dd..47779f5 100644 ---- a/arch/x86/kvm/svm.c -+++ b/arch/x86/kvm/svm.c -@@ -45,7 +45,7 @@ - #include <asm/kvm_para.h> - #include <asm/irq_remapping.h> - #include <asm/microcode.h> --#include <asm/nospec-branch.h> -+#include <asm/spec-ctrl.h> - - #include <asm/virtext.h> - #include "trace.h" -diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index 3210add..17199dc 100644 ---- a/arch/x86/kvm/vmx.c -+++ b/arch/x86/kvm/vmx.c -@@ -50,7 +50,7 @@ - #include <asm/apic.h> - #include <asm/irq_remapping.h> - #include <asm/microcode.h> --#include <asm/nospec-branch.h> -+#include <asm/spec-ctrl.h> - - #include "trace.h" - #include "pmu.h" --- -2.7.4 - |