bpf: fix UML x86_64 compile failure
authorMaciej Żenczykowski <maze@google.com>
Thu, 13 Jun 2024 17:31:46 +0000 (10:31 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 13 Jun 2024 18:24:45 +0000 (11:24 -0700)
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>
Link: https://lore.kernel.org/r/20240613173146.2524647-1-maze@google.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/verifier.c

index e5a0ba3bc38d45011cf7d4ec5982e8e4b449ba74..010cfee7ffe938515f21cb3df962594ae778dc39 100644 (file)
@@ -20320,7 +20320,7 @@ patch_map_ops_generic:
                        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()) {