From: Peter Xu <peterx@redhat.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
peterx@redhat.com, Andrew Morton <akpm@linux-foundation.org>,
Will Deacon <will@kernel.org>,
Andrea Arcangeli <aarcange@redhat.com>,
David Rientjes <rientjes@google.com>,
John Hubbard <jhubbard@nvidia.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Jonas Bonn <jonas@southpole.se>,
Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>,
Stafford Horne <shorne@gmail.com>,
openrisc@lists.librecores.org
Subject: [PATCH v5 14/25] mm/openrisc: Use general page fault accounting
Date: Tue, 7 Jul 2020 18:50:10 -0400 [thread overview]
Message-ID: <20200707225021.200906-15-peterx@redhat.com> (raw)
In-Reply-To: <20200707225021.200906-1-peterx@redhat.com>
Use the general page fault accounting by passing regs into handle_mm_fault().
It naturally solve the issue of multiple page fault accounting when page fault
retry happened.
Add the missing PERF_COUNT_SW_PAGE_FAULTS perf events too. Note, the other two
perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_fault().
CC: Jonas Bonn <jonas@southpole.se>
CC: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
CC: Stafford Horne <shorne@gmail.com>
CC: openrisc@lists.librecores.org
Acked-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
arch/openrisc/mm/fault.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c
index 3daa491d1edb..ca97d9baab51 100644
--- a/arch/openrisc/mm/fault.c
+++ b/arch/openrisc/mm/fault.c
@@ -15,6 +15,7 @@
#include <linux/interrupt.h>
#include <linux/extable.h>
#include <linux/sched/signal.h>
+#include <linux/perf_event.h>
#include <linux/uaccess.h>
#include <asm/siginfo.h>
@@ -103,6 +104,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
if (in_interrupt() || !mm)
goto no_context;
+ perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
+
retry:
mmap_read_lock(mm);
vma = find_vma(mm, address);
@@ -159,7 +162,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
* the fault.
*/
- fault = handle_mm_fault(vma, address, flags, NULL);
+ fault = handle_mm_fault(vma, address, flags, regs);
if (fault_signal_pending(fault, regs))
return;
@@ -176,10 +179,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
if (flags & FAULT_FLAG_ALLOW_RETRY) {
/*RGD modeled on Cris */
- if (fault & VM_FAULT_MAJOR)
- tsk->maj_flt++;
- else
- tsk->min_flt++;
if (fault & VM_FAULT_RETRY) {
flags |= FAULT_FLAG_TRIED;
--
2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Peter Xu <peterx@redhat.com>
To: openrisc@lists.librecores.org
Subject: [OpenRISC] [PATCH v5 14/25] mm/openrisc: Use general page fault accounting
Date: Tue, 07 Jul 2020 22:50:55 -0000 [thread overview]
Message-ID: <20200707225021.200906-15-peterx@redhat.com> (raw)
In-Reply-To: <20200707225021.200906-1-peterx@redhat.com>
Use the general page fault accounting by passing regs into handle_mm_fault().
It naturally solve the issue of multiple page fault accounting when page fault
retry happened.
Add the missing PERF_COUNT_SW_PAGE_FAULTS perf events too. Note, the other two
perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_fault().
CC: Jonas Bonn <jonas@southpole.se>
CC: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
CC: Stafford Horne <shorne@gmail.com>
CC: openrisc at lists.librecores.org
Acked-by: Stafford Horne <shorne@gmail.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
arch/openrisc/mm/fault.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c
index 3daa491d1edb..ca97d9baab51 100644
--- a/arch/openrisc/mm/fault.c
+++ b/arch/openrisc/mm/fault.c
@@ -15,6 +15,7 @@
#include <linux/interrupt.h>
#include <linux/extable.h>
#include <linux/sched/signal.h>
+#include <linux/perf_event.h>
#include <linux/uaccess.h>
#include <asm/siginfo.h>
@@ -103,6 +104,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
if (in_interrupt() || !mm)
goto no_context;
+ perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
+
retry:
mmap_read_lock(mm);
vma = find_vma(mm, address);
@@ -159,7 +162,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
* the fault.
*/
- fault = handle_mm_fault(vma, address, flags, NULL);
+ fault = handle_mm_fault(vma, address, flags, regs);
if (fault_signal_pending(fault, regs))
return;
@@ -176,10 +179,6 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
if (flags & FAULT_FLAG_ALLOW_RETRY) {
/*RGD modeled on Cris */
- if (fault & VM_FAULT_MAJOR)
- tsk->maj_flt++;
- else
- tsk->min_flt++;
if (fault & VM_FAULT_RETRY) {
flags |= FAULT_FLAG_TRIED;
--
2.26.2
next prev parent reply other threads:[~2020-07-07 22:51 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 22:49 [PATCH v5 00/25] mm: Page fault accounting cleanups Peter Xu
2020-07-07 22:49 ` [PATCH v5 01/25] mm: Do page fault accounting in handle_mm_fault Peter Xu
2020-07-07 22:49 ` [PATCH v5 02/25] mm/alpha: Use general page fault accounting Peter Xu
2020-07-07 22:49 ` [PATCH v5 03/25] mm/arc: " Peter Xu
2020-07-07 22:49 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 04/25] mm/arm: " Peter Xu
2020-07-07 22:50 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 05/25] mm/arm64: " Peter Xu
2020-07-07 22:50 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 06/25] mm/csky: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 07/25] mm/hexagon: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 08/25] mm/ia64: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 09/25] mm/m68k: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 10/25] mm/microblaze: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 11/25] mm/mips: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 12/25] mm/nds32: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 13/25] mm/nios2: " Peter Xu
2020-07-07 22:50 ` Peter Xu [this message]
2020-07-07 22:50 ` [OpenRISC] [PATCH v5 14/25] mm/openrisc: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 15/25] mm/parisc: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 16/25] mm/powerpc: " Peter Xu
2020-07-07 22:50 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 17/25] mm/riscv: " Peter Xu
2020-07-07 22:50 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 18/25] mm/s390: " Peter Xu
2020-07-08 5:49 ` Alexander Gordeev
2020-07-08 14:30 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 19/25] mm/sh: " Peter Xu
2020-07-07 22:50 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 20/25] mm/sparc32: " Peter Xu
2020-07-07 22:50 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 21/25] mm/sparc64: " Peter Xu
2020-07-07 22:50 ` Peter Xu
2020-07-07 22:50 ` [PATCH v5 22/25] mm/x86: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 23/25] mm/xtensa: " Peter Xu
2020-07-07 22:50 ` [PATCH v5 24/25] mm: Clean up the last pieces of page fault accountings Peter Xu
2020-07-07 22:50 ` [PATCH v5 25/25] mm/gup: Remove task_struct pointer for all gup code 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=20200707225021.200906-15-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=gerald.schaefer@de.ibm.com \
--cc=jhubbard@nvidia.com \
--cc=jonas@southpole.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mpe@ellerman.id.au \
--cc=openrisc@lists.librecores.org \
--cc=rientjes@google.com \
--cc=shorne@gmail.com \
--cc=stefan.kristiansson@saunalahti.fi \
--cc=torvalds@linux-foundation.org \
--cc=will@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.