iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/mm: Break out user address space handling

Browse Source 
The last patch broke out kernel address space handing into its own
helper.  Now, do the same for user address space handling.

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/20180928160223.9C4F6440@viggo.jf.intel.com
This commit is contained in:
Dave Hansen 2018-09-28 09:02:23 -07:00 committed by Peter Zijlstra
parent 8fed620000
commit aa37c51b94
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
arch/x86/mm/fault.c
View File

@ -966,6 +966,7 @@ bad_area_access_error(struct pt_regs *regs, unsigned long error_code,
__bad_area(regs, error_code, address, vma, SEGV_ACCERR); __bad_area(regs, error_code, address, vma, SEGV_ACCERR);
} }
/* Handle faults in the kernel portion of the address space */
static void static void
do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address, do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
u32 *pkey, unsigned int fault) u32 *pkey, unsigned int fault)
@ -1254,13 +1255,10 @@ do_kern_addr_fault(struct pt_regs *regs, unsigned long hw_error_code,
} }
NOKPROBE_SYMBOL(do_kern_addr_fault); NOKPROBE_SYMBOL(do_kern_addr_fault);
/* /* Handle faults in the user portion of the address space */
* This routine handles page faults. It determines the address, static inline
* and the problem, and then passes it off to one of the appropriate void do_user_addr_fault(struct pt_regs *regs,
* routines. unsigned long hw_error_code,
*/
static noinline void
__do_page_fault(struct pt_regs *regs, unsigned long hw_error_code,
unsigned long address) unsigned long address)
{ {
unsigned long sw_error_code; unsigned long sw_error_code;
@ -1274,17 +1272,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long hw_error_code,
tsk = current; tsk = current;
mm = tsk->mm; mm = tsk->mm;
prefetchw(&mm->mmap_sem);
if (unlikely(kmmio_fault(regs, address)))
return;
/* Was the fault on kernel-controlled part of the address space? */
if (unlikely(fault_in_kernel_space(address))) {
do_kern_addr_fault(regs, hw_error_code, address);
return;
}
/* kprobes don't want to hook the spurious faults: */ /* kprobes don't want to hook the spurious faults: */
if (unlikely(kprobes_fault(regs))) if (unlikely(kprobes_fault(regs)))
return; return;
@ -1488,6 +1475,28 @@ good_area:
check_v8086_mode(regs, address, tsk); check_v8086_mode(regs, address, tsk);
} }
NOKPROBE_SYMBOL(do_user_addr_fault);
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
* routines.
*/
static noinline void
__do_page_fault(struct pt_regs *regs, unsigned long hw_error_code,
unsigned long address)
{
prefetchw(&current->mm->mmap_sem);
if (unlikely(kmmio_fault(regs, address)))
return;
/* Was the fault on kernel-controlled part of the address space? */
if (unlikely(fault_in_kernel_space(address)))
do_kern_addr_fault(regs, hw_error_code, address);
else
do_user_addr_fault(regs, hw_error_code, address);
}
NOKPROBE_SYMBOL(__do_page_fault); NOKPROBE_SYMBOL(__do_page_fault);
static nokprobe_inline void static nokprobe_inline void