* [PATCH v4 18/26] mm/s390: Use general page fault accounting
@ 2020-06-30 20:45 Peter Xu
2020-07-01 14:52 ` Gerald Schaefer
0 siblings, 1 reply; 2+ messages in thread
From: Peter Xu @ 2020-06-30 20:45 UTC (permalink / raw)
To: linux-mm, linux-kernel
Cc: Andrew Morton, peterx, John Hubbard, Michael Ellerman,
Gerald Schaefer, Andrea Arcangeli, Linus Torvalds, Will Deacon,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-s390
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.
CC: Heiko Carstens <heiko.carstens@de.ibm.com>
CC: Vasily Gorbik <gor@linux.ibm.com>
CC: Christian Borntraeger <borntraeger@de.ibm.com>
CC: linux-s390@vger.kernel.org
Signed-off-by: Peter Xu <peterx@redhat.com>
---
arch/s390/mm/fault.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index fc14df0b4d6e..9aa201df2e94 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -478,7 +478,7 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access)
* 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)) {
fault = VM_FAULT_SIGNAL;
if (flags & FAULT_FLAG_RETRY_NOWAIT)
@@ -488,21 +488,7 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access)
if (unlikely(fault & VM_FAULT_ERROR))
goto out_up;
- /*
- * 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) {
- tsk->maj_flt++;
- perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1,
- regs, address);
- } else {
- tsk->min_flt++;
- perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MIN, 1,
- regs, address);
- }
if (fault & VM_FAULT_RETRY) {
if (IS_ENABLED(CONFIG_PGSTE) && gmap &&
(flags & FAULT_FLAG_RETRY_NOWAIT)) {
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v4 18/26] mm/s390: Use general page fault accounting
2020-06-30 20:45 [PATCH v4 18/26] mm/s390: Use general page fault accounting Peter Xu
@ 2020-07-01 14:52 ` Gerald Schaefer
0 siblings, 0 replies; 2+ messages in thread
From: Gerald Schaefer @ 2020-07-01 14:52 UTC (permalink / raw)
To: Peter Xu
Cc: linux-mm, linux-kernel, Andrew Morton, John Hubbard,
Michael Ellerman, Andrea Arcangeli, Linus Torvalds, Will Deacon,
Heiko Carstens, Vasily Gorbik, Christian Borntraeger, linux-s390
On Tue, 30 Jun 2020 16:45:48 -0400
Peter Xu <peterx@redhat.com> 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.
>
> CC: Heiko Carstens <heiko.carstens@de.ibm.com>
> CC: Vasily Gorbik <gor@linux.ibm.com>
> CC: Christian Borntraeger <borntraeger@de.ibm.com>
> CC: linux-s390@vger.kernel.org
> Signed-off-by: Peter Xu <peterx@redhat.com>
> ---
> arch/s390/mm/fault.c | 16 +---------------
> 1 file changed, 1 insertion(+), 15 deletions(-)
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Acked-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-01 14:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-30 20:45 [PATCH v4 18/26] mm/s390: Use general page fault accounting Peter Xu
2020-07-01 14:52 ` Gerald Schaefer
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).