From: Peter Xu <peterx@redhat.com> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: 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>, peterx@redhat.com, Michael Ellerman <mpe@ellerman.id.au>, Catalin Marinas <catalin.marinas@arm.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/26] mm/arm64: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:09 -0400 [thread overview] Message-ID: <20200626223130.199227-6-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. To do this, we pass pt_regs pointer into __do_page_fault(). CC: Catalin Marinas <catalin.marinas@arm.com> CC: Will Deacon <will@kernel.org> CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu <peterx@redhat.com> --- arch/arm64/mm/fault.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 5f6607b951b8..09b206521559 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -398,7 +398,8 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re #define VM_FAULT_BADACCESS 0x020000 static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, - unsigned int mm_flags, unsigned long vm_flags) + unsigned int mm_flags, unsigned long vm_flags, + struct pt_regs *regs) { struct vm_area_struct *vma = find_vma(mm, addr); @@ -422,7 +423,7 @@ static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, */ if (!(vma->vm_flags & vm_flags)) return VM_FAULT_BADACCESS; - return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, NULL); + return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, regs); } static bool is_el0_instruction_abort(unsigned int esr) @@ -444,7 +445,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, { const struct fault_info *inf; struct mm_struct *mm = current->mm; - vm_fault_t fault, major = 0; + vm_fault_t fault; unsigned long vm_flags = VM_ACCESS_FLAGS; unsigned int mm_flags = FAULT_FLAG_DEFAULT; @@ -510,8 +511,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, #endif } - fault = __do_page_fault(mm, addr, mm_flags, vm_flags); - major |= fault & VM_FAULT_MAJOR; + fault = __do_page_fault(mm, addr, mm_flags, vm_flags, regs); /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -532,25 +532,8 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, * Handle the "normal" (no error) case first. */ if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | - VM_FAULT_BADACCESS)))) { - /* - * Major/minor page fault accounting is only done - * once. If we go through a retry, it is extremely - * likely that the page will be found in page cache at - * that point. - */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, - addr); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, - addr); - } - + VM_FAULT_BADACCESS)))) return 0; - } /* * If we are in kernel mode at this point, we have no context to -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Peter Xu <peterx@redhat.com> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrea Arcangeli <aarcange@redhat.com>, Catalin Marinas <catalin.marinas@arm.com>, Linus Torvalds <torvalds@linux-foundation.org>, peterx@redhat.com, linux-arm-kernel@lists.infradead.org, Michael Ellerman <mpe@ellerman.id.au>, Andrew Morton <akpm@linux-foundation.org>, Will Deacon <will@kernel.org>, Gerald Schaefer <gerald.schaefer@de.ibm.com> Subject: [PATCH 05/26] mm/arm64: Use general page fault accounting Date: Fri, 26 Jun 2020 18:31:09 -0400 [thread overview] Message-ID: <20200626223130.199227-6-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. To do this, we pass pt_regs pointer into __do_page_fault(). CC: Catalin Marinas <catalin.marinas@arm.com> CC: Will Deacon <will@kernel.org> CC: linux-arm-kernel@lists.infradead.org Signed-off-by: Peter Xu <peterx@redhat.com> --- arch/arm64/mm/fault.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 5f6607b951b8..09b206521559 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -398,7 +398,8 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re #define VM_FAULT_BADACCESS 0x020000 static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, - unsigned int mm_flags, unsigned long vm_flags) + unsigned int mm_flags, unsigned long vm_flags, + struct pt_regs *regs) { struct vm_area_struct *vma = find_vma(mm, addr); @@ -422,7 +423,7 @@ static vm_fault_t __do_page_fault(struct mm_struct *mm, unsigned long addr, */ if (!(vma->vm_flags & vm_flags)) return VM_FAULT_BADACCESS; - return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, NULL); + return handle_mm_fault(vma, addr & PAGE_MASK, mm_flags, regs); } static bool is_el0_instruction_abort(unsigned int esr) @@ -444,7 +445,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, { const struct fault_info *inf; struct mm_struct *mm = current->mm; - vm_fault_t fault, major = 0; + vm_fault_t fault; unsigned long vm_flags = VM_ACCESS_FLAGS; unsigned int mm_flags = FAULT_FLAG_DEFAULT; @@ -510,8 +511,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, #endif } - fault = __do_page_fault(mm, addr, mm_flags, vm_flags); - major |= fault & VM_FAULT_MAJOR; + fault = __do_page_fault(mm, addr, mm_flags, vm_flags, regs); /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { @@ -532,25 +532,8 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, * Handle the "normal" (no error) case first. */ if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | - VM_FAULT_BADACCESS)))) { - /* - * Major/minor page fault accounting is only done - * once. If we go through a retry, it is extremely - * likely that the page will be found in page cache at - * that point. - */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, - addr); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, - addr); - } - + VM_FAULT_BADACCESS)))) return 0; - } /* * If we are in kernel mode at this point, we have no context to -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-06-26 22:31 UTC|newest] Thread overview: 54+ 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 ` Peter Xu 2020-06-26 22:31 ` [PATCH 04/26] mm/arm: " Peter Xu 2020-06-26 22:31 ` Peter Xu 2020-06-26 22:31 ` Peter Xu [this message] 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-27 2:59 ` Greentime Hu 2020-06-26 22:36 ` [PATCH 13/26] mm/nios2: " Peter Xu 2020-06-26 22:36 ` [PATCH 14/26] mm/openrisc: " Peter Xu 2020-06-26 22:36 ` [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-06-26 22:36 ` Peter Xu 2020-07-03 11:08 ` Michael Ellerman 2020-07-03 11:08 ` Michael Ellerman 2020-06-26 22:36 ` [PATCH 17/26] mm/riscv: " Peter Xu 2020-06-26 22:36 ` Peter Xu 2020-07-01 11:46 ` Pekka Enberg 2020-07-01 11:46 ` Pekka Enberg 2020-07-01 11:46 ` Pekka Enberg 2020-07-02 15:51 ` Peter Xu 2020-07-02 15:51 ` Peter Xu 2020-07-11 19:43 ` Palmer Dabbelt 2020-07-11 19:43 ` Palmer Dabbelt 2020-07-14 15:12 ` Pekka Enberg 2020-07-14 15:12 ` Pekka Enberg 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 ` Peter Xu 2020-06-26 22:36 ` [PATCH 20/26] mm/sparc32: " Peter Xu 2020-06-26 22:36 ` Peter Xu 2020-06-26 22:36 ` [PATCH 21/26] mm/sparc64: " Peter Xu 2020-06-26 22:36 ` 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:05 ` [PATCH 05/26] mm/arm64: Use general page fault accounting Peter Xu 2020-06-19 16:05 ` 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=20200626223130.199227-6-peterx@redhat.com \ --to=peterx@redhat.com \ --cc=aarcange@redhat.com \ --cc=akpm@linux-foundation.org \ --cc=catalin.marinas@arm.com \ --cc=gerald.schaefer@de.ibm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --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: linkBe 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.