Commit fb027ada authored Apr 01, 2020 by Peter Xu Committed by Linus Torvalds Apr 02, 2020

sh/mm: use helper fault_signal_pending()



Let SH to use the new fault_signal_pending() helper.  Here we'll need to
move the up_read() out because that's actually needed as long as !RETRY
cases.  At the meantime we can drop all the rest of up_read()s now (which
seems to be cleaner).

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/20200220160226.9550-1-peterx@redhat.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent c9a0dad1

arch/sh/mm/fault.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -302,25 +302,25 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
		* Pagefault was interrupted by SIGKILL. We have no reason to
		* continue pagefault.
		*/
		if (fatal_signal_pending(current)) {
		if (!(fault & VM_FAULT_RETRY))
		up_read(&current->mm->mmap_sem);
		if (fault_signal_pending(fault, regs)) {
		if (!user_mode(regs))
		no_context(regs, error_code, address);
		return 1;
		}

		/* Release mmap_sem first if necessary */
		if (!(fault & VM_FAULT_RETRY))
		up_read(&current->mm->mmap_sem);

		if (!(fault & VM_FAULT_ERROR))
		return 0;

		if (fault & VM_FAULT_OOM) {
		/* Kernel mode? Handle exceptions or die: */
		if (!user_mode(regs)) {
		up_read(&current->mm->mmap_sem);
		no_context(regs, error_code, address);
		return 1;
		}
		up_read(&current->mm->mmap_sem);

		/*
		* We ran out of memory, call the OOM killer, and return the

Admin message