mm/microblaze: use general page fault accounting (aeb6aefc) · Commits · 戴 / test

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. Add the missing PERF_COUNT_SW_PAGE_FAULTS perf events too. Note, the other two perf events (PERF_COUNT_SW_PAGE_FAULTS_[MAJ|MIN]) were done in handle_mm_fault(). Signed-off-by:

Peter Xu <peterx@redhat.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Cc: Michal Simek <monstr@monstr.eu> Link: http://lkml.kernel.org/r/20200707225021.200906-11-peterx@redhat.com Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/microblaze/mm/fault.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <linux/mman.h>
		#include <linux/mm.h>
		#include <linux/interrupt.h>
		#include <linux/perf_event.h>

		#include <asm/page.h>
		#include <asm/mmu.h>
		@@ -121,6 +122,8 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
		if (user_mode(regs))
		flags \|= FAULT_FLAG_USER;

		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);

		/* When running in the kernel we expect faults to occur only to
		* addresses in user space. All other faults represent errors in the
		* kernel and should generate an OOPS. Unfortunately, in the case of an
		@@ -214,7 +217,7 @@ good_area:
		* 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))
		return;
		@@ -230,10 +233,6 @@ good_area:
		}

		if (flags & FAULT_FLAG_ALLOW_RETRY) {
		if (unlikely(fault & VM_FAULT_MAJOR))
		current->maj_flt++;
		else
		current->min_flt++;
		if (fault & VM_FAULT_RETRY) {
		flags \|= FAULT_FLAG_TRIED;

Admin message