Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/mm: Remove hard-coded ASID limit checks

First, it's nice to remove the magic numbers.

Second, PAGE_TABLE_ISOLATION is going to consume half of the available ASID
space. The space is currently unused, but add a comment to spell out this
new restriction.

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>

authored by

Dave Hansen and committed by
Ingo Molnar
cb0a9144 50fb83a6

+18 -2
+18 -2
arch/x86/include/asm/tlbflush.h
··· 69 69 return atomic64_inc_return(&mm->context.tlb_gen); 70 70 } 71 71 72 + /* There are 12 bits of space for ASIDS in CR3 */ 73 + #define CR3_HW_ASID_BITS 12 74 + /* 75 + * When enabled, PAGE_TABLE_ISOLATION consumes a single bit for 76 + * user/kernel switches 77 + */ 78 + #define PTI_CONSUMED_ASID_BITS 0 79 + 80 + #define CR3_AVAIL_ASID_BITS (CR3_HW_ASID_BITS - PTI_CONSUMED_ASID_BITS) 81 + /* 82 + * ASIDs are zero-based: 0->MAX_AVAIL_ASID are valid. -1 below to account 83 + * for them being zero-based. Another -1 is because ASID 0 is reserved for 84 + * use by non-PCID-aware users. 85 + */ 86 + #define MAX_ASID_AVAILABLE ((1 << CR3_AVAIL_ASID_BITS) - 2) 87 + 72 88 /* 73 89 * If PCID is on, ASID-aware code paths put the ASID+1 into the PCID bits. 74 90 * This serves two purposes. It prevents a nasty situation in which ··· 97 81 static inline unsigned long build_cr3(pgd_t *pgd, u16 asid) 98 82 { 99 83 if (static_cpu_has(X86_FEATURE_PCID)) { 100 - VM_WARN_ON_ONCE(asid > 4094); 84 + VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE); 101 85 return __sme_pa(pgd) | (asid + 1); 102 86 } else { 103 87 VM_WARN_ON_ONCE(asid != 0); ··· 107 91 108 92 static inline unsigned long build_cr3_noflush(pgd_t *pgd, u16 asid) 109 93 { 110 - VM_WARN_ON_ONCE(asid > 4094); 94 + VM_WARN_ON_ONCE(asid > MAX_ASID_AVAILABLE); 111 95 return __sme_pa(pgd) | (asid + 1) | CR3_NOFLUSH; 112 96 } 113 97