Skip to content

Commit 52266f1

Browse files
chenhengqichenhuacai
authored andcommitted
LoongArch: BPF: Use move_addr() for BPF_PSEUDO_FUNC
Vincent reported that running XDP synproxy program on LoongArch results in the following error: JIT doesn't support bpf-to-bpf calls With dmesg: multi-func JIT bug 1391 != 1390 The root cause is that verifier will refill the imm with the correct addresses of bpf_calls for BPF_PSEUDO_FUNC instructions and then run the last pass of JIT. So we generate different JIT code for the same instruction in two passes (one for placeholder and the other for the real address). Let's use move_addr() instead. See commit 64f50f6 ("LoongArch, bpf: Use 4 instructions for function address in JIT") for a similar fix. Cc: stable@vger.kernel.org Fixes: 69c087b ("bpf: Add bpf_for_each_map_elem() helper") Fixes: bb035ef ("LoongArch: BPF: Support mixing bpf2bpf and tailcalls") Reported-by: Vincent Li <vincent.mc.li@gmail.com> Tested-by: Vincent Li <vincent.mc.li@gmail.com> Closes: https://lore.kernel.org/loongarch/CAK3+h2yfM9FTNiXvEQBkvtuoJrvzmN4c_NZsFXqEk4Cj1tsBNA@mail.gmail.com/T/#u Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
1 parent 7e25869 commit 52266f1

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/loongarch/net/bpf_jit.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,10 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
932932
{
933933
const u64 imm64 = (u64)(insn + 1)->imm << 32 | (u32)insn->imm;
934934

935-
move_imm(ctx, dst, imm64, is32);
935+
if (bpf_pseudo_func(insn))
936+
move_addr(ctx, dst, imm64);
937+
else
938+
move_imm(ctx, dst, imm64, is32);
936939
return 1;
937940
}
938941

0 commit comments

Comments
 (0)