Skip to content

Commit 2f365a7

Browse files
LiuHailong0day robot
LiuHailong
authored and
0day robot
committed
Powerpc64: Fixup oops when debug programs with CONFIG_RELOCATABLE=y
Debug interrupts can be taken during regular program or a standard interrupt, the EA of the instruction causing the interrupt will be kept in DSRR0. Kernel will check if this value is between [interrupt_base_book3e, __end_interrupts]. However, when the kernel build with CONFIG_RELOCATABLE, it can't get EA of those lables by LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e) and LOAD_REG_IMMEDIATE(r15,__end_interrupts),then it cases problems later. At the same time, r2(toc) are not usable here, so LOAD_REG_ADDR() dosen't work neither. So we use the *name@got* to get the EV of two lables directly. This patch can fix the problem and remove the oops when we gdb a program with single-step. Test programs test.c shows as follows: #include <fcntl.h> #include <stdio.h> int main(int argc, char *argv[]) { if (access("/proc/sys/kernel/perf_event_paranoid", F_OK) == -1) printf("Kernel doesn't have perf_event support\n"); } Steps to reproduce the bug, for example: 1) ./gdb ./test 2) (gdb) b access 3) (gdb) r 4) (gdb) s Then will trigger the oops, it looks like: (gdb) s Single stepping Oops: Exception in kernel mode, sig: 5 [#2] PREEMPT CoreNet Generic Modules linked in: CPU: 0 PID: 1135 Comm: test Tainted: G D Linux (none) 4.9.5 torvalds#79 task: c000000079199580 ti: c00000007ffc4000 task.ti: c000000074064000 NIP: c00000000001a1e4 LR: 000000001000103c CTR: 000000001000100c REGS: c00000007ffc7cf0 TRAP: 0d08 Tainted: G D (Linux (none) 4.9.5) MSR: 0000000080021000 <CE,ME> CR: 24000442 XER: 00000000 SOFTE: 1 GPR00: 0000000010001274 00000000ffffeba0 00000000100ab4b0 00000000100764a4 GPR04: 0000000000000000 00000000ffffee2c 00000000ffffee54 00000000100a44c8 GPR08: 0000000000000001 0000000010070000 00000000100a0000 0000000000000001 GPR12: 000000004347432f 00000000100aa648 0000000000000000 0000000000000000 GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR20: 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR24: 0000000000000000 0000000010001950 0000000010001850 0000000000000000 GPR28: 0000000000000000 00000000100000f4 0000000000000000 00000000ffffeba0 NIP [c00000000001a1e4] interrupt_base_book3e+0x1e4/0x348 LR [000000001000103c] 0x1000103c Call Trace: Instruction dump: 00000000 00000000 00000000 60000000 4800e600 00000000 00000000 00000000 00000000 00000000 00000000 60000000 <4800e588> 00000000 00000000 00000000 Signed-off-by: Liu Hailong <liu.hailong6@zte.com.cn> Signed-off-by: Jiang Xuexin <jiang.xuexin@zte.com.cn> Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn> Reviewed-by: Liu Song <liu.song11@zte.com.cn> Reviewed-by: Huang Jian <huang.jian@zte.com.cn>
1 parent 98a5f36 commit 2f365a7

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

arch/powerpc/kernel/exceptions-64e.S

100644100755
+12
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,14 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
735735
andis. r15,r14,(DBSR_IC|DBSR_BT)@h
736736
beq+ 1f
737737

738+
#ifdef CONFIG_RELOCATABLE
739+
ld r15,PACATOC(r13)
740+
ld r14,interrupt_base_book3e@got(r15)
741+
ld r15,__end_interrupts@got(r15)
742+
#else
738743
LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e)
739744
LOAD_REG_IMMEDIATE(r15,__end_interrupts)
745+
#endif
740746
cmpld cr0,r10,r14
741747
cmpld cr1,r10,r15
742748
blt+ cr0,1f
@@ -799,8 +805,14 @@ kernel_dbg_exc:
799805
andis. r15,r14,(DBSR_IC|DBSR_BT)@h
800806
beq+ 1f
801807

808+
#ifdef CONFIG_RELOCATABLE
809+
ld r15,PACATOC(r13)
810+
ld r14,interrupt_base_book3e@got(r15)
811+
ld r15,__end_interrupts@got(r15)
812+
#else
802813
LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e)
803814
LOAD_REG_IMMEDIATE(r15,__end_interrupts)
815+
#endif
804816
cmpld cr0,r10,r14
805817
cmpld cr1,r10,r15
806818
blt+ cr0,1f

0 commit comments

Comments
 (0)