Skip to contentSkip to conversation

bpf: fix UML x86_64 compile failure

PATCH Applied Maciej Żenczykowski 2 participants 2 messages Jun 13, 2024

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 bpf: fix UML x86_64 compile failure

pcpu_hot (defined in arch/x86) is not available on user mode linux (ARCH=um)

Cc Andrii Nakryiko <[email protected]>
Cc John Fastabend <[email protected]>
Cc Alexei Starovoitov <[email protected]>
Fixes 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
---
 kernel/bpf/verifier.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
index 36ef8e96787e..7a354b1e6197 100644
@@ -20313,7 +20313,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env)
 			goto next_insn;
 		}
 
-#ifdef CONFIG_X86_64
+#if defined(CONFIG_X86_64) && !defined(CONFIG_UML)
 		/* Implement bpf_get_smp_processor_id() inline. */
 		if (insn->imm == BPF_FUNC_get_smp_processor_id &&
 		    prog->jit_requested && bpf_jit_supports_percpu_insn()) {
Signature · 1 line
2.45.2.627.g7a2c4fd464-goog
#1 lore raw
This patch was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:

Hello:

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

Quoted 9 lines · On Thu, 13 Jun 2024 10:31:46 -0700 you wrote:

pcpu_hot (defined in arch/x86) is not available on user mode linux (ARCH=um)

Cc Andrii Nakryiko <[email protected]>
Cc John Fastabend <[email protected]>
Cc Alexei Starovoitov <[email protected]>
Fixes 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")

[...]

Here is the summary with links:
- [bpf,v2] bpf: fix UML x86_64 compile failure

    https://git.kernel.org/bpf/bpf/c/b99a95bc56c5

You are awesome, thank you!

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