[PATCH bpf-next v2 04/21] bpf, x86: Factor out bpf_arch_text_poke_check_ip() helper on x86_64
flat view
COOLING6d
From: Leon Hwang <hidden>
Date: 2026-10-12 15:42:07
Also in:
bpf, linux-kselftest, lkml
Subsystem:
bpf jit for x86 64-bit, bpf [general] (safe dynamic programs and tools), the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
Revision v2 of 2 in this series.
Revisions (2)
- v1 [diff vs current]
- v2 current
In the following commit, it also needs to check the target IP and adds ENDBR_INSN_SIZE when add text-poke batch support. So, factor out bpf_arch_text_poke_check_ip() helper for text-poke batch support. No functional changes intended. Signed-off-by: Leon Hwang <redacted> --- arch/x86/net/bpf_jit_comp.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 74033373dc06..c80d3161d458 100644
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c@@ -702,10 +702,10 @@ static int __bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t, return 1; } -int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t, - enum bpf_text_poke_type new_t, void *old_addr, - void *new_addr) +static int bpf_arch_text_poke_check_ip(void **ipp) { + void *ip = *ipp; + if (!is_kernel_text((long)ip) && !is_bpf_text_address((long)ip)) /* BPF poking in modules is not supported */
@@ -716,7 +716,20 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t, * with an ENDBR instruction. */ if (is_endbr(ip)) - ip += ENDBR_INSN_SIZE; + *ipp += ENDBR_INSN_SIZE; + + return 0; +} + +int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t, + enum bpf_text_poke_type new_t, void *old_addr, + void *new_addr) +{ + int ret; + + ret = bpf_arch_text_poke_check_ip(&ip); + if (ret) + return ret; return __bpf_arch_text_poke(ip, old_t, new_t, old_addr, new_addr); }
--
2.55.0