LoongArch: BPF: Don't align trampoline size

chenhengqi · chenhuacai · commit a04731cbee6e · 2025-10-02T22:39:52.000+08:00
Currently, arch_alloc_bpf_trampoline() use bpf_prog_pack_alloc() which
will pack multiple trampolines into a huge page. So, no need to assume
the trampoline size is page aligned.

Cc: stable@vger.kernel.org
Tested-by: Vincent Li &lt;vincent.mc.li@gmail.com&gt;
Signed-off-by: Hengqi Chen &lt;hengqi.chen@gmail.com&gt;
Signed-off-by: Huacai Chen &lt;chenhuacai@loongson.cn&gt;
diff --git a/arch/loongarch/net/bpf_jit.c b/arch/loongarch/net/bpf_jit.c
@@ -1743,8 +1743,7 @@ int arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags,
 
 	ret = __arch_prepare_bpf_trampoline(&ctx, &im, m, tlinks, func_addr, flags);
 
-	/* Page align */
-	return ret < 0 ? ret : round_up(ret * LOONGARCH_INSN_SIZE, PAGE_SIZE);
+	return ret < 0 ? ret : ret * LOONGARCH_INSN_SIZE;
 }
 
 struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog)

Original file line number	Diff line number	Diff line change
`@@ -1743,8 +1743,7 @@ int arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags,`
`1743`	`1743`
`1744`	`1744`	`ret = __arch_prepare_bpf_trampoline(&ctx, &im, m, tlinks, func_addr, flags);`
`1745`	`1745`
`1746`		`- /* Page align */`
`1747`		`- return ret < 0 ? ret : round_up(ret * LOONGARCH_INSN_SIZE, PAGE_SIZE);`
	`1746`	`+ return ret < 0 ? ret : ret * LOONGARCH_INSN_SIZE;`
`1748`	`1747`	`}`
`1749`	`1748`
`1750`	`1749`	`struct bpf_prog bpf_int_jit_compile(struct bpf_prog prog)`