arc/mm: use helper fault_signal_pending()
Let ARC to use the new helper fault_signal_pending() by moving the signal check out of the retry logic as standalone. This should also helps to simplify the code a bit. Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Tested-by: Brian Geffon <bgeffon@google.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Bobby Powers <bobbypowers@gmail.com> Cc: David Hildenbrand <david@redhat.com> Cc: Denis Plotnikov <dplotnikov@virtuozzo.com> Cc: "Dr . David Alan Gilbert" <dgilbert@redhat.com> Cc: Hugh Dickins <hughd@google.com> Cc: Jerome Glisse <jglisse@redhat.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: "Kirill A . Shutemov" <kirill@shutemov.name> Cc: Martin Cracauer <cracauer@cons.org> Cc: Marty McFadden <mcfadden8@llnl.gov> Cc: Matthew Wilcox <willy@infradead.org> Cc: Maya Gokhale <gokhale2@llnl.gov> Cc: Mel Gorman <mgorman@suse.de> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Mike Rapoport <rppt@linux.vnet.ibm.com> Cc: Pavel Emelyanov <xemul@openvz.org> Link: http://lkml.kernel.org/r/20200220155843.9172-1-peterx@redhat.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
39678191cd
commit
24a62cf41f
@ -133,29 +133,21 @@ retry:
|
|||||||
|
|
||||||
fault = handle_mm_fault(vma, address, flags);
|
fault = handle_mm_fault(vma, address, flags);
|
||||||
|
|
||||||
/*
|
/* Quick path to respond to signals */
|
||||||
* Fault retry nuances
|
if (fault_signal_pending(fault, regs)) {
|
||||||
*/
|
if (!user_mode(regs))
|
||||||
if (unlikely(fault & VM_FAULT_RETRY)) {
|
goto no_context;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If fault needs to be retried, handle any pending signals
|
* Fault retry nuances, mmap_sem already relinquished by core mm
|
||||||
* first (by returning to user mode).
|
*/
|
||||||
* mmap_sem already relinquished by core mm for RETRY case
|
if (unlikely((fault & VM_FAULT_RETRY) &&
|
||||||
*/
|
(flags & FAULT_FLAG_ALLOW_RETRY))) {
|
||||||
if (fatal_signal_pending(current)) {
|
flags &= ~FAULT_FLAG_ALLOW_RETRY;
|
||||||
if (!user_mode(regs))
|
flags |= FAULT_FLAG_TRIED;
|
||||||
goto no_context;
|
goto retry;
|
||||||
return;
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* retry state machine
|
|
||||||
*/
|
|
||||||
if (flags & FAULT_FLAG_ALLOW_RETRY) {
|
|
||||||
flags &= ~FAULT_FLAG_ALLOW_RETRY;
|
|
||||||
flags |= FAULT_FLAG_TRIED;
|
|
||||||
goto retry;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bad_area:
|
bad_area:
|
||||||
|
Loading…
Reference in New Issue
Block a user