mm/s390: use general page fault accounting (35e45f3e) · 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. Signed-off-by:

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

Andrew Morton <akpm@linux-foundation.org> Reviewed-by:

Gerald Schaefer <gerald.schaefer@de.ibm.com> Acked-by:

Gerald Schaefer <gerald.schaefer@de.ibm.com> Cc: Alexander Gordeev <agordeev@linux.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Christian Borntraeger <borntraeger@de.ibm.com> Link: http://lkml.kernel.org/r/20200707225021.200906-19-peterx@redhat.com Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/s390/mm/fault.c

+1 −15

Original line number	Diff line number	Diff line
		@@ -476,7 +476,7 @@ retry:
		* 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)
		@@ -486,21 +486,7 @@ retry:
		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)) {

Admin message