From: Peter Xu <peterx@redhat.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: Peter Xu <peterx@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Will Deacon <will@kernel.org>,
Michael Ellerman <mpe@ellerman.id.au>,
Ley Foon Tan <ley.foon.tan@intel.com>
Subject: [PATCH 13/26] mm/nios2: Use general page fault accounting
Date: Fri, 26 Jun 2020 18:36:14 -0400 [thread overview]
Message-ID: <20200626223614.199620-1-peterx@redhat.com> (raw)
In-Reply-To: <20200626223130.199227-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: Ley Foon Tan <ley.foon.tan@intel.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
arch/nios2/mm/fault.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/arch/nios2/mm/fault.c b/arch/nios2/mm/fault.c
index 88abf297c759..823e7d0a9e97 100644
--- a/arch/nios2/mm/fault.c
+++ b/arch/nios2/mm/fault.c
@@ -24,6 +24,7 @@
#include <linux/mm.h>
#include <linux/extable.h>
#include <linux/uaccess.h>
+#include <linux/perf_event.h>
#include <asm/mmu_context.h>
#include <asm/traps.h>
@@ -83,6 +84,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause,
if (user_mode(regs))
flags |= FAULT_FLAG_USER;
+ perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
+
if (!down_read_trylock(&mm->mmap_sem)) {
if (!user_mode(regs) && !search_exception_tables(regs->ea))
goto bad_area_nosemaphore;
@@ -131,7 +134,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause,
* make sure we exit gracefully rather than endlessly redo
* 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;
@@ -146,16 +149,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause,
BUG();
}
- /*
- * Major/minor page fault accounting is only done on the
- * initial attempt. If we go through a retry, it is extremely
- * likely that the page will be found in page cache at that point.
- */
if (flags & FAULT_FLAG_ALLOW_RETRY) {
- if (fault & VM_FAULT_MAJOR)
- current->maj_flt++;
- else
- current->min_flt++;
if (fault & VM_FAULT_RETRY) {
flags |= FAULT_FLAG_TRIED;
--
2.26.2
next prev parent reply other threads:[~2020-06-26 22:36 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-26 22:31 [PATCH 00/26] mm: Page fault accounting cleanups Peter Xu
2020-06-26 22:31 ` [PATCH 01/26] mm: Do page fault accounting in handle_mm_fault Peter Xu
2020-06-29 1:52 ` John Hubbard
2020-06-29 14:56 ` Peter Xu
2020-06-26 22:31 ` [PATCH 02/26] mm/alpha: Use general page fault accounting Peter Xu
2020-06-26 22:31 ` [PATCH 03/26] mm/arc: " Peter Xu
2020-06-26 22:31 ` [PATCH 04/26] mm/arm: " Peter Xu
2020-06-26 22:31 ` [PATCH 05/26] mm/arm64: " Peter Xu
2020-06-26 22:31 ` [PATCH 06/26] mm/csky: " Peter Xu
2020-06-26 22:31 ` [PATCH 07/26] mm/hexagon: " Peter Xu
2020-06-26 22:31 ` [PATCH 08/26] mm/ia64: " Peter Xu
2020-06-26 22:31 ` [PATCH 09/26] mm/m68k: " Peter Xu
2020-06-26 22:31 ` [PATCH 10/26] mm/microblaze: " Peter Xu
2020-06-26 22:31 ` [PATCH 11/26] mm/mips: " Peter Xu
2020-06-26 22:31 ` [PATCH 12/26] mm/nds32: " Peter Xu
2020-06-27 2:59 ` Greentime Hu
2020-06-26 22:36 ` Peter Xu [this message]
2020-06-26 22:36 ` [PATCH 14/26] mm/openrisc: " Peter Xu
2020-06-26 22:36 ` [PATCH 15/26] mm/parisc: " Peter Xu
2020-06-26 22:36 ` [PATCH 16/26] mm/powerpc: " Peter Xu
2020-07-03 11:08 ` Michael Ellerman
2020-06-26 22:36 ` [PATCH 17/26] mm/riscv: " Peter Xu
2020-07-01 11:46 ` Pekka Enberg
2020-07-02 15:51 ` Peter Xu
2020-07-11 19:43 ` Palmer Dabbelt
2020-07-14 15:12 ` Pekka Enberg
2020-06-26 22:36 ` [PATCH 18/26] mm/s390: " Peter Xu
2020-06-26 22:36 ` [PATCH 19/26] mm/sh: " Peter Xu
2020-06-26 22:36 ` [PATCH 20/26] mm/sparc32: " Peter Xu
2020-06-26 22:36 ` [PATCH 21/26] mm/sparc64: " Peter Xu
2020-06-26 22:36 ` [PATCH 22/26] mm/unicore32: " Peter Xu
2020-06-26 22:36 ` [PATCH 23/26] mm/x86: " Peter Xu
2020-06-26 22:36 ` [PATCH 24/26] mm/xtensa: " Peter Xu
2020-06-26 22:36 ` [PATCH 25/26] mm: Clean up the last pieces of page fault accountings Peter Xu
2020-06-26 22:36 ` [PATCH 26/26] mm/gup: Remove task_struct pointer for all gup code Peter Xu
-- strict thread matches above, loose matches on Subject: below --
2020-06-19 16:05 [PATCH 00/26] mm: Page fault accounting cleanups Peter Xu
2020-06-19 16:12 ` [PATCH 13/26] mm/nios2: Use general page fault accounting 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=20200626223614.199620-1-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=gerald.schaefer@de.ibm.com \
--cc=ley.foon.tan@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mpe@ellerman.id.au \
--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 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).