Skip to content

Commit dc3e30b

Browse files
Merge patch series "riscv: Rework the arch_kgdb_breakpoint() implementation"
WangYuli <wangyuli@uniontech.com> says: 1. The arch_kgdb_breakpoint() function defines the kgdb_compiled_break symbol using inline assembly. There's a potential issue where the compiler might inline arch_kgdb_breakpoint(), which would then define the kgdb_compiled_break symbol multiple times, leading to fail to link vmlinux.o. This isn't merely a potential compilation problem. The intent here is to determine the global symbol address of kgdb_compiled_break, and if this function is inlined multiple times, it would logically be a grave error. 2. Remove ".option norvc/.option rvc" to fix a bug that the C extension would unconditionally enable even if the kernel is being built with CONFIG_RISCV_ISA_C=n. * b4-shazam-merge: riscv: KGDB: Remove ".option norvc/.option rvc" for kgdb_compiled_break riscv: KGDB: Do not inline arch_kgdb_breakpoint() Link: https://lore.kernel.org/r/D5A83DF3A06E1DF9+20250411072905.55134-1-wangyuli@uniontech.com Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
2 parents adf5377 + 550c2aa commit dc3e30b

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

arch/riscv/include/asm/kgdb.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,9 @@
1919

2020
#ifndef __ASSEMBLY__
2121

22+
void arch_kgdb_breakpoint(void);
2223
extern unsigned long kgdb_compiled_break;
2324

24-
static inline void arch_kgdb_breakpoint(void)
25-
{
26-
asm(".global kgdb_compiled_break\n"
27-
".option norvc\n"
28-
"kgdb_compiled_break: ebreak\n"
29-
".option rvc\n");
30-
}
31-
3225
#endif /* !__ASSEMBLY__ */
3326

3427
#define DBG_REG_ZERO "zero"

arch/riscv/kernel/kgdb.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,12 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)
254254
regs->epc = pc;
255255
}
256256

257+
noinline void arch_kgdb_breakpoint(void)
258+
{
259+
asm(".global kgdb_compiled_break\n"
260+
"kgdb_compiled_break: ebreak\n");
261+
}
262+
257263
void kgdb_arch_handle_qxfer_pkt(char *remcom_in_buffer,
258264
char *remcom_out_buffer)
259265
{

0 commit comments

Comments
 (0)