110 lines
4 KiB
Diff
110 lines
4 KiB
Diff
From 427fbe54a8df451acd3cd31a4d6dbb1753036dee Mon Sep 17 00:00:00 2001
|
|
From: Dave Hansen <dave.hansen@linux.intel.com>
|
|
Date: Mon, 4 Dec 2017 15:07:56 +0100
|
|
Subject: [PATCH 181/241] x86/mm: Put MMU to hardware ASID translation in one
|
|
place
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2017-5754
|
|
|
|
There are effectively two ASID types:
|
|
|
|
1. The one stored in the mmu_context that goes from 0..5
|
|
2. The one programmed into the hardware that goes from 1..6
|
|
|
|
This consolidates the locations where converting between the two (by doing
|
|
a +1) to a single place which gives us a nice place to comment.
|
|
PAGE_TABLE_ISOLATION will also need to, given an ASID, know which hardware
|
|
ASID to flush for the userspace mapping.
|
|
|
|
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Cc: Andy Lutomirski <luto@kernel.org>
|
|
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
|
|
Cc: Borislav Petkov <bp@alien8.de>
|
|
Cc: Brian Gerst <brgerst@gmail.com>
|
|
Cc: Dave Hansen <dave.hansen@intel.com>
|
|
Cc: David Laight <David.Laight@aculab.com>
|
|
Cc: Denys Vlasenko <dvlasenk@redhat.com>
|
|
Cc: Eduardo Valentin <eduval@amazon.com>
|
|
Cc: Greg KH <gregkh@linuxfoundation.org>
|
|
Cc: H. Peter Anvin <hpa@zytor.com>
|
|
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
|
|
Cc: Juergen Gross <jgross@suse.com>
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Will Deacon <will.deacon@arm.com>
|
|
Cc: aliguori@amazon.com
|
|
Cc: daniel.gruss@iaik.tugraz.at
|
|
Cc: hughd@google.com
|
|
Cc: keescook@google.com
|
|
Cc: linux-mm@kvack.org
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
(cherry picked from commit dd95f1a4b5ca904c78e6a097091eb21436478abb)
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
(cherry picked from commit 6f3e88a8f41123ac339d28cfdda5da0e85bec550)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
arch/x86/include/asm/tlbflush.h | 31 +++++++++++++++++++------------
|
|
1 file changed, 19 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
|
|
index c1c10db4156c..ecd634f87e4e 100644
|
|
--- a/arch/x86/include/asm/tlbflush.h
|
|
+++ b/arch/x86/include/asm/tlbflush.h
|
|
@@ -84,30 +84,37 @@ static inline u64 inc_mm_tlb_gen(struct mm_struct *mm)
|
|
*/
|
|
#define MAX_ASID_AVAILABLE ((1 << CR3_AVAIL_ASID_BITS) - 2)
|
|
|
|
-/*
|
|
- * If PCID is on, ASID-aware code paths put the ASID+1 into the PCID bits.
|
|
- * This serves two purposes. It prevents a nasty situation in which
|
|
- * PCID-unaware code saves CR3, loads some other value (with PCID == 0),
|
|
- * and then restores CR3, thus corrupting the TLB for ASID 0 if the saved
|
|
- * ASID was nonzero. It also means that any bugs involving loading a
|
|
- * PCID-enabled CR3 with CR4.PCIDE off will trigger deterministically.
|
|
- */
|
|
+static inline u16 kern_pcid(u16 asid)
|
|
+{
|
|
+ VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE);
|
|
+ /*
|
|
+ * If PCID is on, ASID-aware code paths put the ASID+1 into the
|
|
+ * PCID bits. This serves two purposes. It prevents a nasty
|
|
+ * situation in which PCID-unaware code saves CR3, loads some other
|
|
+ * value (with PCID == 0), and then restores CR3, thus corrupting
|
|
+ * the TLB for ASID 0 if the saved ASID was nonzero. It also means
|
|
+ * that any bugs involving loading a PCID-enabled CR3 with
|
|
+ * CR4.PCIDE off will trigger deterministically.
|
|
+ */
|
|
+ return asid + 1;
|
|
+}
|
|
+
|
|
struct pgd_t;
|
|
static inline unsigned long build_cr3(pgd_t *pgd, u16 asid)
|
|
{
|
|
if (static_cpu_has(X86_FEATURE_PCID)) {
|
|
- VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE);
|
|
- return __sme_pa(pgd) | (asid + 1);
|
|
+ return __pa(pgd) | kern_pcid(asid);
|
|
} else {
|
|
VM_WARN_ON_ONCE(asid != 0);
|
|
- return __sme_pa(pgd);
|
|
+ return __pa(pgd);
|
|
}
|
|
}
|
|
|
|
static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid)
|
|
{
|
|
VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE);
|
|
- return __sme_pa(pgd) | (asid + 1) | CR3_NOFLUSH;
|
|
+ VM_WARN_ON_ONCE(!this_cpu_has(X86_FEATURE_PCID));
|
|
+ return __pa(pgd) | kern_pcid(asid) | CR3_NOFLUSH;
|
|
}
|
|
|
|
#ifdef CONFIG_PARAVIRT
|
|
--
|
|
2.14.2
|
|
|