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

powerpc/64s/interrupt: clean up interrupt return labels 



Normal kernel-interrupt exits can get interrupt_return_srr_user_restart
in their backtrace, which is an unusual and notable function, and it is
part of the user-interrupt exit path, which is doubly confusing.

Add non-local labels for both user and kernel interrupt exit cases to
address this and make the user and kernel cases more symmetric. Also get
rid of an unused label.

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/20210630074621.2109197-9-npiggin@gmail.com
parent 98798f33

arch/powerpc/kernel/interrupt_64.S

+5 −3
Original line number Original line Diff line number Diff line
@@ -509,7 +509,9 @@ interrupt_return_\srr\(): 
_ASM_NOKPROBE_SYMBOL(interrupt_return_\srr\())

_ASM_NOKPROBE_SYMBOL(interrupt_return_\srr\())

	ld	r4,_MSR(r1)

	ld	r4,_MSR(r1)

	andi.	r0,r4,MSR_PR

	andi.	r0,r4,MSR_PR

	beq	.Lkernel_interrupt_return_\srr

	beq	interrupt_return_\srr\()_kernel

interrupt_return_\srr\()_user: /* make backtraces match the _kernel variant */

_ASM_NOKPROBE_SYMBOL(interrupt_return_\srr\()_user)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	interrupt_exit_user_prepare

	bl	interrupt_exit_user_prepare

	cmpdi	r3,0

	cmpdi	r3,0
@@ -623,8 +625,8 @@ RESTART_TABLE(.Linterrupt_return_\srr\()_user_rst_start, .Linterrupt_return_\srr 
#endif

#endif





	.balign IFETCH_ALIGN_BYTES

	.balign IFETCH_ALIGN_BYTES

.Lkernel_interrupt_return_\srr\():

interrupt_return_\srr\()_kernel:

.Linterrupt_return_\srr\()_kernel:

_ASM_NOKPROBE_SYMBOL(interrupt_return_\srr\()_kernel)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	interrupt_exit_kernel_prepare

	bl	interrupt_exit_kernel_prepare