aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2018-08-07 15:09:36 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-15 17:37:33 +0200
commit330e5973bb501a6ac1a4e52aa14423876e145bfc (patch)
tree4d53c573148b0b99bf2e4e6167fc6f92b3acecdf
parent4d3579f7f904cddf55264c427b746e1ac1a83d7c (diff)
downloadlinux-yocto-330e5973bb501a6ac1a4e52aa14423876e145bfc.tar.gz
linux-yocto-330e5973bb501a6ac1a4e52aa14423876e145bfc.tar.bz2
linux-yocto-330e5973bb501a6ac1a4e52aa14423876e145bfc.zip
x86/speculation/l1tf: Invert all not present mappings
commit f22cc87f6c1f771b57c407555cfefd811cdd9507 upstream. For kernel mappings PAGE_PROTNONE is not necessarily set for a non present mapping, but the inversion logic explicitely checks for !PRESENT and PROT_NONE. Remove the PROT_NONE check and make the inversion unconditional for all not present mappings. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/include/asm/pgtable-invert.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pgtable-invert.h b/arch/x86/include/asm/pgtable-invert.h
index 177564187fc0..44b1203ece12 100644
--- a/arch/x86/include/asm/pgtable-invert.h
+++ b/arch/x86/include/asm/pgtable-invert.h
@@ -6,7 +6,7 @@
static inline bool __pte_needs_invert(u64 val)
{
- return (val & (_PAGE_PRESENT|_PAGE_PROTNONE)) == _PAGE_PROTNONE;
+ return !(val & _PAGE_PRESENT);
}
/* Get a mask to xor with the page table entry to get the correct pfn. */