Skip to contentSkip to conversation

powerpc/64s/interrupt: stack backtrace fix

PATCH Applied Nicholas Piggin 2 participants 2 messages Oct 4, 2022 – Oct 9, 2022 PowerPC

lore
Share & tools
lore

Nicholas Piggin

author reviewer
#0 lore raw

PATCH 1/1 powerpc/64s/interrupt: stack backtrace fix

The value of the stack frame regs marker that gets saved on the stack in interrupt entry code does not match the regs marker value, which breaks stack frame marker matching.

This stray instruction looks to have been introduced in a mismerge.

Fixes bf75a3258a403 ("powerpc/64s/interrupt: move early boot ILE fixup into a macro")
---
 arch/powerpc/kernel/exceptions-64s.S | 1 -
 1 file changed, 1 deletion(-)
arch/powerpc/kernel/exceptions-64s.S +0 -1
index fed983cc7ee0..ec5dfc7b5517 100644
@@ -590,7 +590,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
 	std	r9,_TRAP(r1)		/* set trap number		*/
 	li	r10,0
 	LOAD_REG_IMMEDIATE(r11, STACK_FRAME_REGS_MARKER)
-	rldimi	r11, r11, 32, 0
 	std	r10,RESULT(r1)		/* clear regs->result		*/
 	std	r11,STACK_FRAME_OVERHEAD-16(r1) /* mark the frame	*/
 .endm
Signature · 1 line
2.37.2
#1 lore raw
Quoted 8 lines · Nicholas Piggin

The value of the stack frame regs marker that gets saved on the stack in interrupt entry code does not match the regs marker value, which breaks stack frame marker matching.

This stray instruction looks to have been introduced in a mismerge.

[...]

Applied to powerpc/next.

[1/1] powerpc/64s/interrupt: stack backtrace fix

      https://git.kernel.org/powerpc/c/b2e82e495a528eed77c15f3923c2b049a21d7280

cheers