diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-19 13:01:50 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-09-19 13:01:50 -0400 |
| commit | c328c99bd7a5f739051d40d1c89a072d0a433bc2 (patch) | |
| tree | b3a1a1fa885a46baabb1e724422bfd54b28aa299 | |
| parent | e12cdbf2aa4ff28ec58b4710b0e741fdf811c0f5 (diff) | |
| download | longterm-queue-4.18-c328c99bd7a5f739051d40d1c89a072d0a433bc2.tar.gz | |
x86: drop HYGON chunk - doesnt exist in 4.18.x kernels
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/x86-speculation-swapgs-Exclude-ATOMs-from-speculatio.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/queue/x86-speculation-swapgs-Exclude-ATOMs-from-speculatio.patch b/queue/x86-speculation-swapgs-Exclude-ATOMs-from-speculatio.patch index 1869a59..24b60f9 100644 --- a/queue/x86-speculation-swapgs-Exclude-ATOMs-from-speculatio.patch +++ b/queue/x86-speculation-swapgs-Exclude-ATOMs-from-speculatio.patch @@ -1,4 +1,4 @@ -From f36cf386e3fec258a341d446915862eded3e13d8 Mon Sep 17 00:00:00 2001 +From 4e9407f6e572f70d149aaa70b5140f4fa66ea7e9 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Wed, 17 Jul 2019 21:18:59 +0200 Subject: [PATCH] x86/speculation/swapgs: Exclude ATOMs from speculation @@ -24,12 +24,13 @@ Reported-by: Andrew Cooper <andrew.cooper3@citrix.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Tyler Hicks <tyhicks@canonical.com> Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com> +[PG: drop HYGON chunk - doesn't exist in 4.18.x kernels.] diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h -index 4393278666d9..e880f2408e29 100644 +index efb46a3b9e5d..b1c3de83934e 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h -@@ -396,5 +396,6 @@ +@@ -386,5 +386,6 @@ #define X86_BUG_L1TF X86_BUG(18) /* CPU is affected by L1 Terminal Fault */ #define X86_BUG_MDS X86_BUG(19) /* CPU is affected by Microarchitectural data sampling */ #define X86_BUG_MSBDS_ONLY X86_BUG(20) /* CPU is only affected by the MSDBS variant of BUG_MDS */ @@ -37,10 +38,10 @@ index 4393278666d9..e880f2408e29 100644 #endif /* _ASM_X86_CPUFEATURES_H */ diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c -index 992f832c447b..6383f0db098c 100644 +index 4c0e9151717f..b58d4062a034 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c -@@ -284,18 +284,6 @@ static const char * const spectre_v1_strings[] = { +@@ -282,18 +282,6 @@ static const char * const spectre_v1_strings[] = { [SPECTRE_V1_MITIGATION_AUTO] = "Mitigation: usercopy/swapgs barriers and __user pointer sanitization", }; @@ -59,7 +60,7 @@ index 992f832c447b..6383f0db098c 100644 /* * Does SMAP provide full mitigation against speculative kernel access to * userspace? -@@ -346,9 +334,11 @@ static void __init spectre_v1_select_mitigation(void) +@@ -344,9 +332,11 @@ static void __init spectre_v1_select_mitigation(void) * PTI as the CR3 write in the Meltdown mitigation * is serializing. * @@ -74,10 +75,10 @@ index 992f832c447b..6383f0db098c 100644 /* diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 309b6b9b49d4..300dcf00d287 100644 +index 9451c478344c..2003bb38b6de 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -970,6 +970,7 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c) +@@ -952,6 +952,7 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c) #define NO_L1TF BIT(3) #define NO_MDS BIT(4) #define MSBDS_ONLY BIT(5) @@ -85,7 +86,7 @@ index 309b6b9b49d4..300dcf00d287 100644 #define VULNWL(_vendor, _family, _model, _whitelist) \ { X86_VENDOR_##_vendor, _family, _model, X86_FEATURE_ANY, _whitelist } -@@ -996,30 +997,38 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = { +@@ -975,29 +976,37 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = { VULNWL_INTEL(ATOM_BONNELL, NO_SPECULATION), VULNWL_INTEL(ATOM_BONNELL_MID, NO_SPECULATION), @@ -134,13 +135,11 @@ index 309b6b9b49d4..300dcf00d287 100644 /* FAMILY_ANY must be last, otherwise 0x0f - 0x12 matches won't work */ - VULNWL_AMD(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS), -- VULNWL_HYGON(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS), + VULNWL_AMD(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS | NO_SWAPGS), -+ VULNWL_HYGON(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS | NO_SWAPGS), {} }; -@@ -1056,6 +1065,9 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c) +@@ -1034,6 +1043,9 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c) setup_force_cpu_bug(X86_BUG_MSBDS_ONLY); } |