* [PATCH bpf v2] bpf: fix UML x86_64 compile failure
@ 2024-06-13 17:31 Maciej Żenczykowski
2024-06-13 18:30 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Maciej Żenczykowski @ 2024-06-13 17:31 UTC (permalink / raw)
To: Maciej Żenczykowski
Cc: Linux Network Development Mailing List, Linux Kernel Mailing List,
BPF Mailing List, Maciej Żenczykowski, Andrii Nakryiko,
John Fastabend, Alexei Starovoitov
pcpu_hot (defined in arch/x86) is not available on user mode linux (ARCH=um)
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH bpf v2] bpf: fix UML x86_64 compile failure
2024-06-13 17:31 [PATCH bpf v2] bpf: fix UML x86_64 compile failure Maciej Żenczykowski
@ 2024-06-13 18:30 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2024-06-13 18:30 UTC (permalink / raw)
To: =?utf-8?q?Maciej_=C5=BBenczykowski_=3Cmaze=40google=2Ecom=3E?=
Cc: zenczykowski, netdev, linux-kernel, bpf, andrii, john.fastabend,
ast
Hello:
This patch was applied to bpf/bpf.git (master)
by Alexei Starovoitov <ast@kernel.org>:
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 <andrii@kernel.org>
> Cc: John Fastabend <john.fastabend@gmail.com>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Fixes: 1ae6921009e5 ("bpf: inline bpf_get_smp_processor_id() helper")
> Signed-off-by: Maciej Żenczykowski <maze@google.com>
>
> [...]
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-13 18:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-13 17:31 [PATCH bpf v2] bpf: fix UML x86_64 compile failure Maciej Żenczykowski
2024-06-13 18:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox