Unverified Commit 6c11ffbf authored by Pekka Enberg's avatar Pekka Enberg Committed by Palmer Dabbelt
Browse files

riscv/mm/fault: Move fault error handling to mm_fault_error() 



This patch moves the fault error handling to mm_fault_error() function
and converts gotos to calls to the new function.

Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent bda281d5

arch/riscv/mm/fault.c

+31 −25
Original line number Diff line number Diff line
@@ -37,6 +37,36 @@ static inline void no_context(struct pt_regs *regs, unsigned long addr) 
	do_exit(SIGKILL);

}



static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_fault_t fault)

{

	if (fault & VM_FAULT_OOM)

		goto out_of_memory;

	else if (fault & VM_FAULT_SIGBUS)

		goto do_sigbus;

	BUG();



	/*

	 * We ran out of memory, call the OOM killer, and return the userspace

	 * (which will retry the fault, or kill us if we got oom-killed).

	 */

out_of_memory:

	if (!user_mode(regs)) {

		no_context(regs, addr);

		return;

	}

	pagefault_out_of_memory();

	return;



do_sigbus:

	/* Kernel mode? Handle exceptions or die */

	if (!user_mode(regs)) {

		no_context(regs, addr);

		return;

	}

	do_trap(regs, SIGBUS, BUS_ADRERR, addr);

	return;

}



static inline void bad_area(struct pt_regs *regs, struct mm_struct *mm, int code, unsigned long addr)

{

	/*
@@ -261,32 +291,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs) 
	mmap_read_unlock(mm);



	if (unlikely(fault & VM_FAULT_ERROR)) {

		if (fault & VM_FAULT_OOM)

			goto out_of_memory;

		else if (fault & VM_FAULT_SIGBUS)

			goto do_sigbus;

		BUG();

	}

	return;



	/*

	 * We ran out of memory, call the OOM killer, and return the userspace

	 * (which will retry the fault, or kill us if we got oom-killed).

	 */

out_of_memory:

	if (!user_mode(regs)) {

		no_context(regs, addr);

		mm_fault_error(regs, addr, fault);

		return;

	}

	pagefault_out_of_memory();

	return;



do_sigbus:

	/* Kernel mode? Handle exceptions or die */

	if (!user_mode(regs)) {

		no_context(regs, addr);

		return;

	}

	do_trap(regs, SIGBUS, BUS_ADRERR, addr);

	return;

}