summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPeter Xu <peterx@redhat.com>2020-08-11 18:38:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-12 10:58:03 -0700
commita2a9e439baf8aca2af1e614fab7956c09091a6d1 (patch)
treea0faa0dcd1a5e534c7037b60ed9176c96d0e78c7 /arch
parent6a1bb025d28e1026fead73b7b33e2dfccba3f4d2 (diff)
downloadlinux-a2a9e439baf8aca2af1e614fab7956c09091a6d1.tar.bz2
mm/csky: use general page fault accounting
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. Signed-off-by: Peter Xu <peterx@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Guo Ren <guoren@kernel.org> Link: http://lkml.kernel.org/r/20200707225021.200906-7-peterx@redhat.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/csky/mm/fault.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/csky/mm/fault.c b/arch/csky/mm/fault.c
index b252e6e4d32f..081b178b41b1 100644
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
@@ -151,7 +151,7 @@ good_area:
* the fault.
*/
fault = handle_mm_fault(vma, address, write ? FAULT_FLAG_WRITE : 0,
- NULL);
+ regs);
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM)
goto out_of_memory;
@@ -161,16 +161,6 @@ good_area:
goto bad_area;
BUG();
}
- 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);
- }
-
mmap_read_unlock(mm);
return;