mm/x86: use general page fault accounting (968614fc) · Commits · 戴 / test

Use the general page fault accounting by passing regs into handle_mm_fault(). Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: H. Peter Anvin <hpa@zytor.com> Link: http://lkml.kernel.org/r/20200707225021.200906-23-peterx@redhat.com Signed-off-by:

arch/x86/mm/fault.c

+2 −15

Original line number	Diff line number	Diff line
		@@ -1139,7 +1139,7 @@ void do_user_addr_fault(struct pt_regs *regs,
		struct vm_area_struct *vma;
		struct task_struct *tsk;
		struct mm_struct *mm;
		vm_fault_t fault, major = 0;
		vm_fault_t fault;
		unsigned int flags = FAULT_FLAG_DEFAULT;

		tsk = current;
		@@ -1291,8 +1291,7 @@ good_area:
		* userland). The return to userland is identified whenever
		* FAULT_FLAG_USER\|FAULT_FLAG_KILLABLE are both set in flags.
		*/
		fault = handle_mm_fault(vma, address, flags, NULL);
		major \|= fault & VM_FAULT_MAJOR;
		fault = handle_mm_fault(vma, address, flags, regs);

		/* Quick path to respond to signals */
		if (fault_signal_pending(fault, regs)) {
		@@ -1319,18 +1318,6 @@ good_area:
		return;
		}

		/*
		* Major/minor page fault accounting. If any of the events
		* returned VM_FAULT_MAJOR, we account it as a major fault.
		*/
		if (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);
		}

		check_v8086_mode(regs, address, tsk);
		}
		NOKPROBE_SYMBOL(do_user_addr_fault);