Content-Type: multipart/mixed; boundary="===============5712398310696687851==" MIME-Version: 1.0 From: Masami Hiramatsu To: kbuild-all@lists.01.org Subject: Re: [PATCH] ARM: kprobes: Make __kretprobe_trampoline as a pure asm function Date: Thu, 24 Mar 2022 15:21:08 +0900 Message-ID: <20220324152108.b6016621dd6b8297eddd6bb5@kernel.org> In-Reply-To: <164733793626.1008610.12121025094280924953.stgit@devnote2> List-Id: --===============5712398310696687851== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Hi, I found a better solution for this issue from Ard :-) https://lore.kernel.org/all/20220203082204.1176734-6-ardb(a)kernel.org/T/#u I should use mov_l instead of ldr for loading the symbol address. Thank you, On Tue, 15 Mar 2022 18:52:16 +0900 Masami Hiramatsu wrote: > Make __kretprobe_trampoline() as a pure asm function same as the x86 > code does. Anyway, it is safe to define the symbol in the asm code > instead of accessing a C symbol from the inline asm. > = > Without this fix, building arm kernel with GCC-11 may cause below > error. > = > /tmp/ccIWiggX.s: Assembler messages: > >> /tmp/ccIWiggX.s:22: Error: invalid literal constant: pool needs to be = closer > = > This fixes the error reported by 0day build bot. > = > Reported-by: kernel test robot > Fixes: 7e9bf33b8124 ("ARM: kprobes: Make a frame pointer on __kretprobe_t= rampoline") > Signed-off-by: Masami Hiramatsu > --- > arch/arm/probes/kprobes/core.c | 57 +++++++++++++++++++++-------------= ------ > 1 file changed, 30 insertions(+), 27 deletions(-) > = > diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/cor= e.c > index 4848404ba51b..51f1438456ae 100644 > --- a/arch/arm/probes/kprobes/core.c > +++ b/arch/arm/probes/kprobes/core.c > @@ -373,43 +373,46 @@ int __kprobes kprobe_exceptions_notify(struct notif= ier_block *self, > * should be enough for stacktrace from the return handler with or > * without pt_regs. > */ > -void __naked __kprobes __kretprobe_trampoline(void) > -{ > - __asm__ __volatile__ ( > +asm( > + ".text\n" > + ".global __kretprobe_trampoline\n" > + ".type __kretprobe_trampoline, %function\n" > + "__kretprobe_trampoline:\n" > #ifdef CONFIG_FRAME_POINTER > - "ldr lr, =3D__kretprobe_trampoline \n\t" > + "ldr lr, =3D__kretprobe_trampoline \n\t" > /* __kretprobe_trampoline makes a framepointer on pt_regs. */ > #ifdef CONFIG_CC_IS_CLANG > - "stmdb sp, {sp, lr, pc} \n\t" > - "sub sp, sp, #12 \n\t" > - /* In clang case, pt_regs->ip =3D lr. */ > - "stmdb sp!, {r0 - r11, lr} \n\t" > - /* fp points regs->r11 (fp) */ > - "add fp, sp, #44 \n\t" > + "stmdb sp, {sp, lr, pc} \n\t" > + "sub sp, sp, #12 \n\t" > + /* In clang case, pt_regs->ip =3D lr. */ > + "stmdb sp!, {r0 - r11, lr} \n\t" > + /* fp points regs->r11 (fp) */ > + "add fp, sp, #44 \n\t" > #else /* !CONFIG_CC_IS_CLANG */ > - /* In gcc case, pt_regs->ip =3D fp. */ > - "stmdb sp, {fp, sp, lr, pc} \n\t" > - "sub sp, sp, #16 \n\t" > - "stmdb sp!, {r0 - r11} \n\t" > - /* fp points regs->r15 (pc) */ > - "add fp, sp, #60 \n\t" > + /* In gcc case, pt_regs->ip =3D fp. */ > + "stmdb sp, {fp, sp, lr, pc} \n\t" > + "sub sp, sp, #16 \n\t" > + "stmdb sp!, {r0 - r11} \n\t" > + /* fp points regs->r15 (pc) */ > + "add fp, sp, #60 \n\t" > #endif /* CONFIG_CC_IS_CLANG */ > #else /* !CONFIG_FRAME_POINTER */ > - "sub sp, sp, #16 \n\t" > - "stmdb sp!, {r0 - r11} \n\t" > + "sub sp, sp, #16 \n\t" > + "stmdb sp!, {r0 - r11} \n\t" > #endif /* CONFIG_FRAME_POINTER */ > - "mov r0, sp \n\t" > - "bl trampoline_handler \n\t" > - "mov lr, r0 \n\t" > - "ldmia sp!, {r0 - r11} \n\t" > - "add sp, sp, #16 \n\t" > + "mov r0, sp \n\t" > + "bl trampoline_handler \n\t" > + "mov lr, r0 \n\t" > + "ldmia sp!, {r0 - r11} \n\t" > + "add sp, sp, #16 \n\t" > #ifdef CONFIG_THUMB2_KERNEL > - "bx lr \n\t" > + "bx lr \n\t" > #else > - "mov pc, lr \n\t" > + "mov pc, lr \n\t" > #endif > - : : : "memory"); > -} > + ".size __kretprobe_trampoline, .-__kretprobe_trampoline\n" > +); > +NOKPROBE_SYMBOL(__kretprobe_trampoline); > = > /* Called from __kretprobe_trampoline */ > static __used __kprobes void *trampoline_handler(struct pt_regs *regs) > = -- = Masami Hiramatsu --===============5712398310696687851==--