From: Peter Müller <peter.mueller@ipfire.org>
Date: Sat, 11 Jun 2022 18:42:08 +0000 (+0000)
Subject: Kernel: Mitigate Straight-Line-Speculation on x86_64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1fad035a1f20771740faf0dd5e0802d779370b94;p=people%2Fms%2Fipfire-2.x.git

Kernel: Mitigate Straight-Line-Speculation on x86_64

See https://lwn.net/Articles/877845/ for the rationale behind this. The
feature is currently only available on the x86_64 platform.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index e8b48de577..68c6e7b341 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -322,6 +322,8 @@ CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
 CONFIG_RETPOLINE=y
+CONFIG_CC_HAS_SLS=y
+CONFIG_SLS=y
 # CONFIG_X86_CPU_RESCTRL is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_VSMP is not set