From: Will Deacon <will@kernel.org>
To: Peter Xu <peterx@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Michael Ellerman <mpe@ellerman.id.au>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-arm-kernel@lists.infradead.org,
John Hubbard <jhubbard@nvidia.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>
Subject: Re: [PATCH v4 05/26] mm/arm64: Use general page fault accounting
Date: Wed, 1 Jul 2020 08:34:04 +0100 [thread overview]
Message-ID: <20200701073403.GA14692@willie-the-truck> (raw)
In-Reply-To: <20200630204514.38711-1-peterx@redhat.com>
On Tue, Jun 30, 2020 at 04:45:14PM -0400, Peter Xu wrote:
> 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 be29f4076fe3..f07333e86c2f 100644
> --- a/arch/arm64/mm/fault.c
> +++ b/arch/arm64/mm/fault.c
> @@ -404,7 +404,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);
>
> @@ -428,7 +429,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)
> @@ -450,7 +451,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;
>
> @@ -516,8 +517,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)) {
> @@ -538,25 +538,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;
> - }
Thanks, looks good to me:
Acked-by: Will Deacon <will@kernel.org>
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2020-07-01 7:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 20:45 [PATCH v4 05/26] mm/arm64: Use general page fault accounting Peter Xu
2020-07-01 7:34 ` Will Deacon [this message]
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=20200701073403.GA14692@willie-the-truck \
--to=will@kernel.org \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=catalin.marinas@arm.com \
--cc=gerald.schaefer@de.ibm.com \
--cc=jhubbard@nvidia.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=peterx@redhat.com \
--cc=torvalds@linux-foundation.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).