Skip to content

Commit

Permalink
x86, mm: fault.c, give another attempt at prefetch handing before SIGBUS
Browse files Browse the repository at this point in the history
Impact: extend prefetch handling on 64-bit

Currently there's an extra is_prefetch() check done in do_sigbus(),
which we only do on 32 bits.

This is a last-ditch check before we terminate a task, so it's worth
giving prefetch instructions another chance - should none of our
existing quirks have caught a prefetch instruction related spurious
fault.

The only risk is if a prefetch causes a real sigbus, in that case
we'll not OOM but try another fault. But this code has been on
32-bit for a long time, so it should be fine in practice.

So do this on 64-bit too - and thus remove one more #ifdef.

Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Feb 20, 2009
1 parent 7c178a2 commit cd1b68f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions arch/x86/mm/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -836,11 +836,9 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address)
if (!(error_code & PF_USER))
no_context(regs, error_code, address);

#ifdef CONFIG_X86_32
/* User space => ok to do another page fault: */
/* User-space => ok to do another page fault: */
if (is_prefetch(regs, error_code, address))
return;
#endif

tsk->thread.cr2 = address;
tsk->thread.error_code = error_code;
Expand Down

0 comments on commit cd1b68f

Please sign in to comment.