Skip to contentSkip to conversation

bpf, x86: Fix objtool warning for timed may_goto

PATCH Applied Kumar Kartikeya Dwivedi 2 participants 2 messages Mar 15, 2025

Subsystems (3)
lore
Share & tools
lore

Kumar Kartikeya Dwivedi

author maintainer
#0 lore raw

PATCH 1/1 bpf, x86: Fix objtool warning for timed may_goto

Kernel test robot reported "call without frame pointer save/setup" warning in objtool. This will make stack traces unreliable on CONFIG_UNWINDER_FRAME_POINTER=y, however it works on CONFIG_UNWINDER_ORC=y. Fix this by creating a stack frame for the function.

Fixes 2cb0a5215274 ("bpf, x86: Add x86 JIT support for timed may_goto")
---
 arch/x86/net/bpf_timed_may_goto.S | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
arch/x86/net/bpf_timed_may_goto.S +14 -3
index 20de4a14dc4c..54c690cae190 100644
@@ -11,6 +11,16 @@
 SYM_FUNC_START(arch_bpf_timed_may_goto)
 	ANNOTATE_NOENDBR
 
+	/*
+	 * r10 passes us stack depth, load the pointer to count and timestamp
+	 * into r10 by adding it to BPF frame pointer.
+	 */
+	leaq (%rbp, %r10, 1), %r10
+
+	/* Setup frame. */
+	pushq %rbp
+	movq %rsp, %rbp
+
 	/* Save r0-r5. */
 	pushq %rax
 	pushq %rdi
@@ -20,10 +30,10 @@ SYM_FUNC_START(arch_bpf_timed_may_goto)
 	pushq %r8
 
 	/*
-	 * r10 passes us stack depth, load the pointer to count and timestamp as
-	 * first argument to the call below.
+	 * r10 has the pointer to count and timestamp, pass it as first
+	 * argument.
 	 */
-	leaq (%rbp, %r10, 1), %rdi
+	movq %r10, %rdi
 
 	/* Emit call depth accounting for call below. */
 	CALL_DEPTH_ACCOUNT
@@ -40,5 +50,6 @@ SYM_FUNC_START(arch_bpf_timed_may_goto)
 	popq %rdi
 	popq %rax
 
+	leave
 	RET
 SYM_FUNC_END(arch_bpf_timed_may_goto)

--
2.47.1

#1 lore raw
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:

Quoted 6 lines · On Fri, 14 Mar 2025 18:30:39 -0700 you wrote:

Kernel test robot reported "call without frame pointer save/setup" warning in objtool. This will make stack traces unreliable on CONFIG_UNWINDER_FRAME_POINTER=y, however it works on CONFIG_UNWINDER_ORC=y. Fix this by creating a stack frame for the function.

Quoted 6 lines
Fixes 2cb0a5215274 ("bpf, x86: Add x86 JIT support for timed may_goto")

[...]

Here is the summary with links:
- [bpf-next,v1] bpf, x86: Fix objtool warning for timed may_goto

    https://git.kernel.org/bpf/bpf-next/c/812f7702d83d

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html