2024-06-13 17:32:13

by Maciej Żenczykowski

Subject: [PATCH bpf v2] 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")
Signed-off-by: Maciej Żenczykowski <[email protected]>
---
kernel/bpf/verifier.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 36ef8e96787e..7a354b1e6197 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -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()) {
--
2.45.2.627.g7a2c4fd464-goog

2024-06-13 18:30:48

by patchwork-bot+netdevbpf

Subject: Re: [PATCH bpf v2] bpf: fix UML x86_64 compile failure

Hello:

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

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")
> Signed-off-by: Maciej Żenczykowski <[email protected]>
>
> [...]

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!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html