From: Pu Lehui Date: Sat, 22 Jun 2024 03:04:35 +0000 (+0000) Subject: bpf: Use precise image size for struct_ops trampoline X-Git-Tag: v6.11-rc1~163^2~68^2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1a426171d76b2cdf3dea5d52f6266090e4aa254;p=thirdparty%2Flinux.git bpf: Use precise image size for struct_ops trampoline For trampoline using bpf_prog_pack, we need to generate a rw_image buffer with size of (image_end - image). For regular trampoline, we use the precise image size generated by arch_bpf_trampoline_size to allocate rw_image. But for struct_ops trampoline, we allocate rw_image directly using close to PAGE_SIZE size. We do not need to allocate for that much, as the patch size is usually much smaller than PAGE_SIZE. Let's use precise image size for it too. Signed-off-by: Pu Lehui Signed-off-by: Daniel Borkmann Tested-by: Björn Töpel #riscv Acked-by: Song Liu Link: https://lore.kernel.org/bpf/20240622030437.3973492-2-pulehui@huaweicloud.com --- diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c index a2cf31b14be46..0d515ec57aa55 100644 --- a/kernel/bpf/bpf_struct_ops.c +++ b/kernel/bpf/bpf_struct_ops.c @@ -573,7 +573,7 @@ int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_links *tlinks, } size = arch_prepare_bpf_trampoline(NULL, image + image_off, - image + PAGE_SIZE, + image + image_off + size, model, flags, tlinks, stub_func); if (size <= 0) { if (image != *_image)