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

powerpc/syscall: switch user_exit_irqoff and trace_hardirqs_off order 



user_exit_irqoff() -> __context_tracking_exit -> vtime_user_exit
warns in __seqprop_assert due to lockdep thinking preemption is enabled
because trace_hardirqs_off() has not yet been called.

Switch the order of these two calls, which matches their ordering in
interrupt_enter_prepare.

Fixes: 5f0b6ac3 ("powerpc/64/syscall: Reconcile interrupts")
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/20210316104206.407354-2-npiggin@gmail.com
parent 2e2a441d

arch/powerpc/kernel/interrupt.c

+2 −2
Original line number Diff line number Diff line
@@ -43,11 +43,11 @@ notrace long system_call_exception(long r3, long r4, long r5, 
	if (IS_ENABLED(CONFIG_PPC_IRQ_SOFT_MASK_DEBUG))

		BUG_ON(irq_soft_mask_return() != IRQS_ALL_DISABLED);



	trace_hardirqs_off(); /* finish reconciling */



	CT_WARN_ON(ct_state() == CONTEXT_KERNEL);

	user_exit_irqoff();



	trace_hardirqs_off(); /* finish reconciling */



	if (!IS_ENABLED(CONFIG_BOOKE) && !IS_ENABLED(CONFIG_40x))

		BUG_ON(!(regs->msr & MSR_RI));

	BUG_ON(!(regs->msr & MSR_PR));