* [PATCH 16/26] mm/powerpc: Use general page fault accounting [not found] <20200619160538.8641-1-peterx@redhat.com> @ 2020-06-19 16:13 ` Peter Xu 0 siblings, 0 replies; 3+ messages in thread From: Peter Xu @ 2020-06-19 16:13 UTC (permalink / raw) To: linux-kernel, linux-mm Cc: Andrea Arcangeli, linuxppc-dev, Peter Xu, Linus Torvalds, Paul Mackerras, Andrew Morton, Will Deacon, Gerald Schaefer Use the general page fault accounting by passing regs into handle_mm_fault(). CC: Michael Ellerman <mpe@ellerman.id.au> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: Paul Mackerras <paulus@samba.org> CC: linuxppc-dev@lists.ozlabs.org Signed-off-by: Peter Xu <peterx@redhat.com> --- arch/powerpc/mm/fault.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 992b10c3761c..e325d13efaf5 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -563,7 +563,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, * 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); #ifdef CONFIG_PPC_MEM_KEYS /* @@ -604,14 +604,9 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, /* * Major/minor page fault accounting. */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address); + if (major) cmo_account_page_fault(); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address); - } + return 0; } NOKPROBE_SYMBOL(__do_page_fault); -- 2.26.2 ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <20200626223130.199227-1-peterx@redhat.com>]
* [PATCH 16/26] mm/powerpc: Use general page fault accounting [not found] <20200626223130.199227-1-peterx@redhat.com> @ 2020-06-26 22:36 ` Peter Xu 2020-07-03 11:08 ` Michael Ellerman 0 siblings, 1 reply; 3+ messages in thread From: Peter Xu @ 2020-06-26 22:36 UTC (permalink / raw) To: linux-mm, linux-kernel Cc: Andrea Arcangeli, Linus Torvalds, linuxppc-dev, Peter Xu, Paul Mackerras, Andrew Morton, Will Deacon, Gerald Schaefer Use the general page fault accounting by passing regs into handle_mm_fault(). CC: Michael Ellerman <mpe@ellerman.id.au> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> CC: Paul Mackerras <paulus@samba.org> CC: linuxppc-dev@lists.ozlabs.org Signed-off-by: Peter Xu <peterx@redhat.com> --- arch/powerpc/mm/fault.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 992b10c3761c..e325d13efaf5 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -563,7 +563,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, * 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); #ifdef CONFIG_PPC_MEM_KEYS /* @@ -604,14 +604,9 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, /* * Major/minor page fault accounting. */ - if (major) { - current->maj_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address); + if (major) cmo_account_page_fault(); - } else { - current->min_flt++; - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address); - } + return 0; } NOKPROBE_SYMBOL(__do_page_fault); -- 2.26.2 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 16/26] mm/powerpc: Use general page fault accounting 2020-06-26 22:36 ` Peter Xu @ 2020-07-03 11:08 ` Michael Ellerman 0 siblings, 0 replies; 3+ messages in thread From: Michael Ellerman @ 2020-07-03 11:08 UTC (permalink / raw) To: Peter Xu, linux-mm, linux-kernel Cc: Andrea Arcangeli, Linus Torvalds, linuxppc-dev, Peter Xu, Paul Mackerras, Andrew Morton, Will Deacon, Gerald Schaefer Peter Xu <peterx@redhat.com> writes: > Use the general page fault accounting by passing regs into handle_mm_fault(). > > CC: Michael Ellerman <mpe@ellerman.id.au> > CC: Benjamin Herrenschmidt <benh@kernel.crashing.org> > CC: Paul Mackerras <paulus@samba.org> > CC: linuxppc-dev@lists.ozlabs.org > Signed-off-by: Peter Xu <peterx@redhat.com> > --- > arch/powerpc/mm/fault.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 992b10c3761c..e325d13efaf5 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -563,7 +563,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, > * 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); > > #ifdef CONFIG_PPC_MEM_KEYS > /* > @@ -604,14 +604,9 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, > /* > * Major/minor page fault accounting. > */ > - if (major) { > - current->maj_flt++; > - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address); > + if (major) > cmo_account_page_fault(); > - } else { > - current->min_flt++; > - perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1, regs, address); > - } > + > return 0; > } > NOKPROBE_SYMBOL(__do_page_fault); You do change the logic a bit if regs is NULL (in mm_account_fault()), but regs can never be NULL in this path, so it looks OK to me. Acked-by: Michael Ellerman <mpe@ellerman.id.au> cheers ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-03 11:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20200619160538.8641-1-peterx@redhat.com>
2020-06-19 16:13 ` [PATCH 16/26] mm/powerpc: Use general page fault accounting Peter Xu
[not found] <20200626223130.199227-1-peterx@redhat.com>
2020-06-26 22:36 ` Peter Xu
2020-07-03 11:08 ` Michael Ellerman
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).