bpf: fix UML x86_64 compile failure

zenczykowski · Alexei Starovoitov · commit b99a95bc56c5 · 2024-06-13T11:24:45.000-07:00
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: 1ae6921 ("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>
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
@@ -20320,7 +20320,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()) {

Original file line number	Diff line number	Diff line change
`@@ -20320,7 +20320,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env)`
`20320`	`20320`	`goto next_insn;`
`20321`	`20321`	`}`
`20322`	`20322`
`20323`		`-#ifdef CONFIG_X86_64`
	`20323`	`+#if defined(CONFIG_X86_64) && !defined(CONFIG_UML)`
`20324`	`20324`	`/* Implement bpf_get_smp_processor_id() inline. */`
`20325`	`20325`	`if (insn->imm == BPF_FUNC_get_smp_processor_id &&`
`20326`	`20326`	`prog->jit_requested && bpf_jit_supports_percpu_insn()) {`