Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f43bb27e authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc/mm: Don't lose "major" fault indication on retry 



If the first iteration returns VM_FAULT_MAJOR but the second
one doesn't, we fail to account the fault as a major fault.

This fixes it and brings the code in line with x86.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent bd0d63f8

arch/powerpc/mm/fault.c

+3 −2
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
 	int is_exec = TRAP(regs) == 0x400;

	int is_user = user_mode(regs);

	int is_write = page_fault_is_write(error_code);

	int fault;

	int fault, major = 0;

	int store_update_sp = 0;



#ifdef CONFIG_PPC_ICSWX
@@ -501,6 +501,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
	 * the fault.

	 */

	fault = handle_mm_fault(vma, address, flags);

	major |= fault & VM_FAULT_MAJOR;



	/*

	 * Handle the retry right now, the mmap_sem has been released in that
@@ -534,7 +535,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
	/*

	 * Major/minor page fault accounting.

	 */

	if (fault & VM_FAULT_MAJOR) {

	if (major) {

		current->maj_flt++;

		perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address);

		cmo_account_page_fault();