Commit 46a2b02d authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64: entry: consolidate entry/exit helpers 



To make the various entry/exit helpers easier to understand and easier
to compare, this patch moves all the entry/exit helpers to be adjacent
at the top of entry-common.c, rather than being spread out throughout
the file.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Joey Gouly <joey.gouly@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
Reviewed-by: default avatarJoey Gouly <joey.gouly@arm.com>
Link: https://lore.kernel.org/r/20210802140733.52716-2-mark.rutland@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent ff117646

arch/arm64/kernel/entry-common.c

+42 −42
Original line number Diff line number Diff line
@@ -75,6 +75,24 @@ static void noinstr exit_to_kernel_mode(struct pt_regs *regs) 
	}

}



asmlinkage void noinstr enter_from_user_mode(void)

{

	lockdep_hardirqs_off(CALLER_ADDR0);

	CT_WARN_ON(ct_state() != CONTEXT_USER);

	user_exit_irqoff();

	trace_hardirqs_off_finish();

}



asmlinkage void noinstr exit_to_user_mode(void)

{

	mte_check_tfsr_exit();



	trace_hardirqs_on_prepare();

	lockdep_hardirqs_on_prepare(CALLER_ADDR0);

	user_enter_irqoff();

	lockdep_hardirqs_on(CALLER_ADDR0);

}



static void noinstr arm64_enter_nmi(struct pt_regs *regs)

{

	regs->lockdep_hardirqs = lockdep_hardirqs_enabled();
@@ -105,6 +123,30 @@ static void noinstr arm64_exit_nmi(struct pt_regs *regs) 
	__nmi_exit();

}



static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs)

{

	regs->lockdep_hardirqs = lockdep_hardirqs_enabled();



	lockdep_hardirqs_off(CALLER_ADDR0);

	rcu_nmi_enter();



	trace_hardirqs_off_finish();

}



static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs)

{

	bool restore = regs->lockdep_hardirqs;



	if (restore) {

		trace_hardirqs_on_prepare();

		lockdep_hardirqs_on_prepare(CALLER_ADDR0);

	}



	rcu_nmi_exit();

	if (restore)

		lockdep_hardirqs_on(CALLER_ADDR0);

}



static void noinstr enter_el1_irq_or_nmi(struct pt_regs *regs)

{

	if (IS_ENABLED(CONFIG_ARM64_PSEUDO_NMI) && !interrupts_enabled(regs))
@@ -265,30 +307,6 @@ static void noinstr el1_undef(struct pt_regs *regs) 
	exit_to_kernel_mode(regs);

}



static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs)

{

	regs->lockdep_hardirqs = lockdep_hardirqs_enabled();



	lockdep_hardirqs_off(CALLER_ADDR0);

	rcu_nmi_enter();



	trace_hardirqs_off_finish();

}



static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs)

{

	bool restore = regs->lockdep_hardirqs;



	if (restore) {

		trace_hardirqs_on_prepare();

		lockdep_hardirqs_on_prepare(CALLER_ADDR0);

	}



	rcu_nmi_exit();

	if (restore)

		lockdep_hardirqs_on(CALLER_ADDR0);

}



static void noinstr el1_dbg(struct pt_regs *regs, unsigned long esr)

{

	unsigned long far = read_sysreg(far_el1);
@@ -382,24 +400,6 @@ asmlinkage void noinstr el1h_64_error_handler(struct pt_regs *regs) 
	arm64_exit_nmi(regs);

}



asmlinkage void noinstr enter_from_user_mode(void)

{

	lockdep_hardirqs_off(CALLER_ADDR0);

	CT_WARN_ON(ct_state() != CONTEXT_USER);

	user_exit_irqoff();

	trace_hardirqs_off_finish();

}



asmlinkage void noinstr exit_to_user_mode(void)

{

	mte_check_tfsr_exit();



	trace_hardirqs_on_prepare();

	lockdep_hardirqs_on_prepare(CALLER_ADDR0);

	user_enter_irqoff();

	lockdep_hardirqs_on(CALLER_ADDR0);

}



static void noinstr el0_da(struct pt_regs *regs, unsigned long esr)

{

	unsigned long far = read_sysreg(far_el1);