Commit 367e3f1d authored Sep 28, 2018 by Dave Hansen Committed by Peter Zijlstra Oct 09, 2018

x86/mm: Remove spurious fault pkey check



Spurious faults only ever occur in the kernel's address space.  They
are also constrained specifically to faults with one of these error codes:

	X86_PF_WRITE | X86_PF_PROT
	X86_PF_INSTR | X86_PF_PROT

So, it's never even possible to reach spurious_kernel_fault_check() with
X86_PF_PK set.

In addition, the kernel's address space never has pages with user-mode
protections.  Protection Keys are only enforced on pages with user-mode
protection.

This gives us lots of reasons to not check for protection keys in our
sprurious kernel fault handling.

But, let's also add some warnings to ensure that these assumptions about
protection keys hold true.

Cc: x86@kernel.org
Cc: Jann Horn <jannh@google.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180928160231.243A0D6A@viggo.jf.intel.com

parent 3ae0ad92

arch/x86/mm/fault.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -1037,12 +1037,6 @@ static int spurious_kernel_fault_check(unsigned long error_code, pte_t *pte)

		if ((error_code & X86_PF_INSTR) && !pte_exec(*pte))
		return 0;
		/*
		* Note: We do not do lazy flushing on protection key
		* changes, so no spurious fault will ever set X86_PF_PK.
		*/
		if ((error_code & X86_PF_PK))
		return 1;

		return 1;
		}
		@@ -1217,6 +1211,13 @@ static void
		do_kern_addr_fault(struct pt_regs *regs, unsigned long hw_error_code,
		unsigned long address)
		{
		/*
		* Protection keys exceptions only happen on user pages. We
		* have no user pages in the kernel portion of the address
		* space, so do not expect them here.
		*/
		WARN_ON_ONCE(hw_error_code & X86_PF_PK);

		/*
		* We can fault-in kernel-space virtual memory on-demand. The
		* 'reference' page table is init_mm.pgd.

Admin message