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

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

powerpc/mm: Simplify returns from __do_page_fault 



Now that we moved the exception state handling to a wrapper, we can
just directly return rather than "goto bail"

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

arch/powerpc/mm/fault.c

+16 −23
Original line number Diff line number Diff line
@@ -233,39 +233,36 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
	if (error_code & ICSWX_DSI_UCT) {

		rc = acop_handle_fault(regs, address, error_code);

		if (rc)

			goto bail;

			return rc;

	}

#endif /* CONFIG_PPC_ICSWX */



	if (notify_page_fault(regs))

		goto bail;

		return 0;



	if (unlikely(page_fault_is_bad(error_code))) {

		if (is_user)

		if (is_user) {

			_exception(SIGBUS, regs, BUS_OBJERR, address);

		else

			rc = SIGBUS;

		goto bail;

			return 0;

		}

		return SIGBUS;

	}



	/*

	 * The kernel should never take an execute fault nor should it

	 * take a page fault to a kernel address.

	 */

	if (!is_user && (is_exec || (address >= TASK_SIZE))) {

		rc = SIGSEGV;

		goto bail;

	}

	if (!is_user && (is_exec || (address >= TASK_SIZE)))

		return SIGSEGV;



	/* We restore the interrupt state now */

	if (!arch_irq_disabled_regs(regs))

		local_irq_enable();



	if (faulthandler_disabled() || mm == NULL) {

		if (!is_user) {

			rc = SIGSEGV;

			goto bail;

		}

		if (!is_user)

			return SIGSEGV;



		/* faulthandler_disabled() in user mode is really bad,

		   as is current->mm == NULL. */

		printk(KERN_EMERG "Page fault in user mode with "
@@ -454,8 +451,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
			goto bad_area_nosemaphore;

		rc = mm_fault_error(regs, address, fault);

		if (rc >= MM_FAULT_RETURN)

			goto bail;

		else

			return rc;

		rc = 0;

	}
@@ -483,7 +479,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
			      regs, address);

	}



	goto bail;

	return rc;



bad_area:

	up_read(&mm->mmap_sem);
@@ -492,7 +488,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
	/* User mode accesses cause a SIGSEGV */

	if (is_user) {

		_exception(SIGSEGV, regs, code, address);

		goto bail;

		return 0;

	}



	if (is_exec && (error_code & DSISR_PROTFAULT))
@@ -500,10 +496,7 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address, 
				   " page (%lx) - exploit attempt? (uid: %d)\n",

				   address, from_kuid(&init_user_ns, current_uid()));



	rc = SIGSEGV;



bail:

	return rc;

	return SIGSEGV;

}

NOKPROBE_SYMBOL(__do_page_fault);