Commit ecb1057c authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64/interrupt: reduce expensive debug tests 



Move the assertions requiring restart table searches under
CONFIG_PPC_IRQ_SOFT_MASK_DEBUG.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210922145452.352571-6-npiggin@gmail.com
parent 0faf20a1

arch/powerpc/include/asm/interrupt.h

+10 −4
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ static inline void srr_regs_clobbered(void) 
	local_paca->hsrr_valid = 0;

}

#else

static inline unsigned long search_kernel_restart_table(unsigned long addr)

{

	return 0;

}



static inline bool is_implicit_soft_masked(struct pt_regs *regs)

{

	return false;
@@ -193,13 +198,14 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup 
		 */

		if (TRAP(regs) != INTERRUPT_PROGRAM) {

			CT_WARN_ON(ct_state() != CONTEXT_KERNEL);

			if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))

				BUG_ON(is_implicit_soft_masked(regs));

		}

#ifdef CONFIG_PPC_BOOK3S



		/* Move this under a debugging check */

		if (arch_irq_disabled_regs(regs))

		if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG) &&

				arch_irq_disabled_regs(regs))

			BUG_ON(search_kernel_restart_table(regs->nip));

#endif

	}

	if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))

		BUG_ON(!arch_irq_disabled_regs(regs) && !(regs->msr & MSR_EE));