From: Peter Xu <peterx@redhat.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: David Hildenbrand <david@redhat.com>,
Hugh Dickins <hughd@google.com>, Maya Gokhale <gokhale2@llnl.gov>,
Jerome Glisse <jglisse@redhat.com>,
Pavel Emelyanov <xemul@virtuozzo.com>,
Johannes Weiner <hannes@cmpxchg.org>,
peterx@redhat.com, Martin Cracauer <cracauer@cons.org>,
Matthew Wilcox <willy@infradead.org>, Shaohua Li <shli@fb.com>,
Marty McFadden <mcfadden8@llnl.gov>,
Andrea Arcangeli <aarcange@redhat.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Denis Plotnikov <dplotnikov@virtuozzo.com>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Mel Gorman <mgorman@suse.de>,
"Kirill A . Shutemov" <kirill@shutemov.name>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Subject: [PATCH v5 06/16] arm64/mm: Use helper fault_signal_pending()
Date: Thu, 26 Sep 2019 17:38:54 +0800 [thread overview]
Message-ID: <20190926093904.5090-7-peterx@redhat.com> (raw)
In-Reply-To: <20190926093904.5090-1-peterx@redhat.com>
Let the arm64 fault handling to use the new fault_signal_pending()
helper, by moving the signal handling out of the retry logic.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
arch/arm64/mm/fault.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index cfd65b63f36f..4a695a44fb05 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -477,19 +477,14 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
fault = __do_page_fault(mm, addr, mm_flags, vm_flags);
major |= fault & VM_FAULT_MAJOR;
- if (fault & VM_FAULT_RETRY) {
- /*
- * If we need to retry but a fatal signal is pending,
- * handle the signal first. We do not need to release
- * the mmap_sem because it would already be released
- * in __lock_page_or_retry in mm/filemap.c.
- */
- if (fatal_signal_pending(current)) {
- if (!user_mode(regs))
- goto no_context;
- return 0;
- }
+ /* Quick path to respond to signals */
+ if (fault_signal_pending(fault, regs)) {
+ if (!user_mode(regs))
+ goto no_context;
+ return 0;
+ }
+ if (fault & VM_FAULT_RETRY) {
/*
* Clear FAULT_FLAG_ALLOW_RETRY to avoid any risk of
* starvation.
--
2.21.0
next prev parent reply other threads:[~2019-09-26 9:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-26 9:38 [PATCH v5 00/16] mm: Page fault enhancements Peter Xu
2019-09-26 9:38 ` [PATCH v5 01/16] mm/gup: Rename "nonblocking" to "locked" where proper Peter Xu
2019-09-26 9:38 ` [PATCH v5 02/16] mm/gup: Fix __get_user_pages() on fault retry of hugetlb Peter Xu
2019-09-26 9:38 ` [PATCH v5 03/16] mm: Introduce fault_signal_pending() Peter Xu
2019-09-26 9:38 ` [PATCH v5 04/16] x86/mm: Use helper fault_signal_pending() Peter Xu
2019-09-26 9:38 ` [PATCH v5 05/16] arc/mm: " Peter Xu
2019-09-26 9:38 ` Peter Xu [this message]
2019-09-26 9:38 ` [PATCH v5 07/16] powerpc/mm: " Peter Xu
2019-09-26 9:38 ` [PATCH v5 08/16] sh/mm: " Peter Xu
2019-09-26 9:38 ` [PATCH v5 09/16] mm: Return faster for non-fatal signals in user mode faults Peter Xu
2019-09-26 9:38 ` [PATCH v5 10/16] userfaultfd: Don't retake mmap_sem to emulate NOPAGE Peter Xu
2019-09-26 9:38 ` [PATCH v5 11/16] mm: Introduce FAULT_FLAG_DEFAULT Peter Xu
2019-09-26 9:39 ` [PATCH v5 12/16] mm: Introduce FAULT_FLAG_INTERRUPTIBLE Peter Xu
2019-09-26 9:39 ` [PATCH v5 13/16] mm: Allow VM_FAULT_RETRY for multiple times Peter Xu
2019-09-26 9:39 ` [PATCH v5 14/16] mm/gup: " Peter Xu
2019-09-26 9:39 ` [PATCH v5 15/16] mm/gup: Allow to react to fatal signals Peter Xu
2019-09-26 9:39 ` [PATCH v5 16/16] mm/userfaultfd: Honor FAULT_FLAG_KILLABLE in fault path Peter Xu
2019-09-29 9:16 ` Peter Xu
2019-10-14 8:40 ` [PATCH v5 00/16] mm: Page fault enhancements Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190926093904.5090-7-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=cracauer@cons.org \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dplotnikov@virtuozzo.com \
--cc=gokhale2@llnl.gov \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=jglisse@redhat.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mcfadden8@llnl.gov \
--cc=mgorman@suse.de \
--cc=mike.kravetz@oracle.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=shli@fb.com \
--cc=torvalds@linux-foundation.org \
--cc=willy@infradead.org \
--cc=xemul@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).