Commit 462e5e2a authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Andrii Nakryiko
Browse files

bpf: Fix JIT of is_mov_percpu_addr instruction. 



The codegen for is_mov_percpu_addr instruction works for rax/r8 registers
only. Fix it to generate proper x86 byte code for other registers.

Fixes: 7bdbf744 ("bpf: add special internal-only MOV instruction to resolve per-CPU addrs")
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20240417214406.15788-1-alexei.starovoitov@gmail.com
parent e739e01d

arch/x86/net/bpf_jit_comp.c

+1 −1
Original line number Diff line number Diff line
@@ -1439,7 +1439,7 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, u8 *rw_image 
#ifdef CONFIG_SMP

				/* add <dst>, gs:[<off>] */

				EMIT2(0x65, add_1mod(0x48, dst_reg));

				EMIT3(0x03, add_1reg(0x04, dst_reg), 0x25);

				EMIT3(0x03, add_2reg(0x04, 0, dst_reg), 0x25);

				EMIT((u32)(unsigned long)&this_cpu_off, 4);

#endif

				break;