Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.com>2018-08-13 20:49:53 +0200
committerMichal Hocko <mhocko@suse.com>2018-08-13 20:53:23 +0200
commitef94234c673ca1c95da947962a93e9105a011534 (patch)
treeec0f99187bf2c5394a5fc9bfb3a37c647afc746d
parent5af6cf5eb2f11d69f51c2c9661bae1e0e9832747 (diff)
patches.arch/disable-prot_none_mitigation.patch: disable prot_none
native mitigation (bnc#1104684)
-rw-r--r--patches.arch/disable-prot_none_mitigation.patch33
-rw-r--r--series.conf1
2 files changed, 34 insertions, 0 deletions
diff --git a/patches.arch/disable-prot_none_mitigation.patch b/patches.arch/disable-prot_none_mitigation.patch
new file mode 100644
index 0000000000..15c25595bd
--- /dev/null
+++ b/patches.arch/disable-prot_none_mitigation.patch
@@ -0,0 +1,33 @@
+From: Michal Hocko <mhocko@suse.com>
+Subject: disable prot_none native mitigation
+Patch-mainline: never (suse specific)
+References: bnc#1104684
+
+This is a temporary workaround for code that doesn't expect mangled prot_none
+entries. One known example is THP split path but there might be more and we
+are not able to review all of them before CRD. This should be rechecked later
+and patch dropped.
+
+Signed-off-by: Michal Hocko <mhocko@suse.com>
+
+---
+ arch/x86/include/asm/pgtable-invert.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/arch/x86/include/asm/pgtable-invert.h
++++ b/arch/x86/include/asm/pgtable-invert.h
+@@ -6,7 +6,14 @@
+
+ static inline bool __pte_needs_invert(u64 val)
+ {
++ /*
++ * temporary workaround until we catch all unexpected usage of prot_none
++ * entries
++ */
++#if 0
+ return (val & (_PAGE_PRESENT|_PAGE_PROTNONE)) == _PAGE_PROTNONE;
++#endif
++ return false;
+ }
+
+ /* Get a mask to xor with the page table entry to get the correct pfn. */
diff --git a/series.conf b/series.conf
index a7600ea76f..86f0a8a1cc 100644
--- a/series.conf
+++ b/series.conf
@@ -25415,6 +25415,7 @@
patches.arch/x86-l1tf-08-disallow-non-privileged-high-MMIO-PROT_NONE.patch
patches.arch/x86-l1tf-09-protect-PAE-swap-entries.patch
patches.arch/x86-speculation-l1tf-fix-up-pte-pfn-conversion-for-P.patch
+ patches.arch/disable-prot_none_mitigation.patch
# SMT=off
patches.arch/02-11-x86-smp-provide-topology_is_primary_thread.patch
patches.arch/03-11-x86-topology-provide-topology_smt_supported.patch