124 lines
5.4 KiB
Diff
124 lines
5.4 KiB
Diff
From 83852a8b0064f1360980a690792c3f438aec06b9 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Tue, 19 Feb 2019 11:10:49 +0100
|
|
Subject: [PATCH 16/30] Documentation: Move L1TF to separate directory
|
|
|
|
commit 65fd4cb65b2dad97feb8330b6690445910b56d6a upstream
|
|
|
|
Move L!TF to a separate directory so the MDS stuff can be added at the
|
|
side. Otherwise the all hardware vulnerabilites have their own top level
|
|
entry. Should have done that right away.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Reviewed-by: Jon Masters <jcm@redhat.com>
|
|
---
|
|
Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +-
|
|
Documentation/admin-guide/hw-vuln/index.rst | 12 ++++++++++++
|
|
Documentation/admin-guide/{ => hw-vuln}/l1tf.rst | 0
|
|
Documentation/admin-guide/index.rst | 6 ++----
|
|
Documentation/admin-guide/kernel-parameters.txt | 2 +-
|
|
arch/x86/kernel/cpu/bugs.c | 2 +-
|
|
arch/x86/kvm/vmx.c | 4 ++--
|
|
7 files changed, 19 insertions(+), 9 deletions(-)
|
|
create mode 100644 Documentation/admin-guide/hw-vuln/index.rst
|
|
rename Documentation/admin-guide/{ => hw-vuln}/l1tf.rst (100%)
|
|
|
|
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
|
|
index 02b7bb711214..f397c2382171 100644
|
|
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
|
|
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
|
|
@@ -491,7 +491,7 @@ Description: Information about CPU vulnerabilities
|
|
"Mitigation: $M" CPU is affected and mitigation $M is in effect
|
|
|
|
Details about the l1tf file can be found in
|
|
- Documentation/admin-guide/l1tf.rst
|
|
+ Documentation/admin-guide/hw-vuln/l1tf.rst
|
|
|
|
What: /sys/devices/system/cpu/smt
|
|
/sys/devices/system/cpu/smt/active
|
|
diff --git a/Documentation/admin-guide/hw-vuln/index.rst b/Documentation/admin-guide/hw-vuln/index.rst
|
|
new file mode 100644
|
|
index 000000000000..8ce2009f1981
|
|
--- /dev/null
|
|
+++ b/Documentation/admin-guide/hw-vuln/index.rst
|
|
@@ -0,0 +1,12 @@
|
|
+========================
|
|
+Hardware vulnerabilities
|
|
+========================
|
|
+
|
|
+This section describes CPU vulnerabilities and provides an overview of the
|
|
+possible mitigations along with guidance for selecting mitigations if they
|
|
+are configurable at compile, boot or run time.
|
|
+
|
|
+.. toctree::
|
|
+ :maxdepth: 1
|
|
+
|
|
+ l1tf
|
|
diff --git a/Documentation/admin-guide/l1tf.rst b/Documentation/admin-guide/hw-vuln/l1tf.rst
|
|
similarity index 100%
|
|
rename from Documentation/admin-guide/l1tf.rst
|
|
rename to Documentation/admin-guide/hw-vuln/l1tf.rst
|
|
diff --git a/Documentation/admin-guide/index.rst b/Documentation/admin-guide/index.rst
|
|
index 0873685bab0f..89abc5057349 100644
|
|
--- a/Documentation/admin-guide/index.rst
|
|
+++ b/Documentation/admin-guide/index.rst
|
|
@@ -17,14 +17,12 @@ etc.
|
|
kernel-parameters
|
|
devices
|
|
|
|
-This section describes CPU vulnerabilities and provides an overview of the
|
|
-possible mitigations along with guidance for selecting mitigations if they
|
|
-are configurable at compile, boot or run time.
|
|
+This section describes CPU vulnerabilities and their mitigations.
|
|
|
|
.. toctree::
|
|
:maxdepth: 1
|
|
|
|
- l1tf
|
|
+ hw-vuln/index
|
|
|
|
Here is a set of documents aimed at users who are trying to track down
|
|
problems and bugs in particular.
|
|
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
|
index a0ab4521d7c5..b2c9e47c4167 100644
|
|
--- a/Documentation/admin-guide/kernel-parameters.txt
|
|
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
|
@@ -2079,7 +2079,7 @@
|
|
|
|
Default is 'flush'.
|
|
|
|
- For details see: Documentation/admin-guide/l1tf.rst
|
|
+ For details see: Documentation/admin-guide/hw-vuln/l1tf.rst
|
|
|
|
l2cr= [PPC]
|
|
|
|
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
|
|
index 053d71a3b9cc..a7e54a91abc4 100644
|
|
--- a/arch/x86/kernel/cpu/bugs.c
|
|
+++ b/arch/x86/kernel/cpu/bugs.c
|
|
@@ -1089,7 +1089,7 @@ static void __init l1tf_select_mitigation(void)
|
|
pr_info("You may make it effective by booting the kernel with mem=%llu parameter.\n",
|
|
half_pa);
|
|
pr_info("However, doing so will make a part of your RAM unusable.\n");
|
|
- pr_info("Reading https://www.kernel.org/doc/html/latest/admin-guide/l1tf.html might help you decide.\n");
|
|
+ pr_info("Reading https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/l1tf.html might help you decide.\n");
|
|
return;
|
|
}
|
|
|
|
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
|
|
index e9bf477209dc..73d6d585dd66 100644
|
|
--- a/arch/x86/kvm/vmx.c
|
|
+++ b/arch/x86/kvm/vmx.c
|
|
@@ -11130,8 +11130,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
-#define L1TF_MSG_SMT "L1TF CPU bug present and SMT on, data leak possible. See CVE-2018-3646 and https://www.kernel.org/doc/html/latest/admin-guide/l1tf.html for details.\n"
|
|
-#define L1TF_MSG_L1D "L1TF CPU bug present and virtualization mitigation disabled, data leak possible. See CVE-2018-3646 and https://www.kernel.org/doc/html/latest/admin-guide/l1tf.html for details.\n"
|
|
+#define L1TF_MSG_SMT "L1TF CPU bug present and SMT on, data leak possible. See CVE-2018-3646 and https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/l1tf.html for details.\n"
|
|
+#define L1TF_MSG_L1D "L1TF CPU bug present and virtualization mitigation disabled, data leak possible. See CVE-2018-3646 and https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/l1tf.html for details.\n"
|
|
|
|
static int vmx_vm_init(struct kvm *kvm)
|
|
{
|