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

riscv/mm/fault: Simplify fault error handling 



Move fault error handling after retry logic. This simplifies the code
flow and makes it easier to move fault error handling to its own
function.

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

arch/riscv/mm/fault.c

+8 −10
Original line number Diff line number Diff line
@@ -247,14 +247,6 @@ good_area: 
	if (fault_signal_pending(fault, regs))

		return;



	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();

	}



	if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) {

		flags |= FAULT_FLAG_TRIED;
@@ -267,6 +259,14 @@ good_area: 
	}



	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;



	/*
@@ -274,7 +274,6 @@ good_area: 
	 * (which will retry the fault, or kill us if we got oom-killed).

	 */

out_of_memory:

	mmap_read_unlock(mm);

	if (!user_mode(regs)) {

		no_context(regs, addr);

		return;
@@ -283,7 +282,6 @@ out_of_memory: 
	return;



do_sigbus:

	mmap_read_unlock(mm);

	/* Kernel mode? Handle exceptions or die */

	if (!user_mode(regs)) {

		no_context(regs, addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE