samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: refactor bpf_helper_changes_pkt_data to use helper number

Browse Source 
commit b238e187b4a2d3b54d80aec05a9cab6466b79dde upstream.

Use BPF helper number instead of function pointer in
bpf_helper_changes_pkt_data(). This would simplify usage of this
function in verifier.c:check_cfg() (in a follow-up patch),
where only helper number is easily available and there is no real need
to lookup helper proto.

Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20241210041100.1898468-3-eddyz87@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eduard Zingerman
2025-04-30 16:19:44 +08:00
committed by Greg Kroah-Hartman
parent f0b56f1d2f
commit 3d496a1eaa
4 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/filter.h
View File

@@ -915,7 +915,7 @@ bool bpf_jit_needs_zext(void);
bool bpf_jit_supports_subprog_tailcalls(void); bool bpf_jit_supports_subprog_tailcalls(void);
bool bpf_jit_supports_kfunc_call(void); bool bpf_jit_supports_kfunc_call(void);
bool bpf_jit_supports_far_kfunc_call(void); bool bpf_jit_supports_far_kfunc_call(void);
bool bpf_helper_changes_pkt_data(void *func); bool bpf_helper_changes_pkt_data(enum bpf_func_id func_id);
static inline bool bpf_dump_raw_ok(const struct cred *cred) static inline bool bpf_dump_raw_ok(const struct cred *cred)
{ {

2
kernel/bpf/core.c
View File

@@ -2893,7 +2893,7 @@ void __weak bpf_jit_compile(struct bpf_prog *prog)
{ {
} }
bool __weak bpf_helper_changes_pkt_data(void *func) bool __weak bpf_helper_changes_pkt_data(enum bpf_func_id func_id)
{ {
return false; return false;
} }

2
kernel/bpf/verifier.c
View File

@@ -10007,7 +10007,7 @@ static int check_helper_call(struct bpf_verifier_env *env, struct bpf_insn *insn
} }
/* With LD_ABS/IND some JITs save/restore skb from r1. */ /* With LD_ABS/IND some JITs save/restore skb from r1. */
changes_data = bpf_helper_changes_pkt_data(fn->func); changes_data = bpf_helper_changes_pkt_data(func_id);
if (changes_data && fn->arg1_type != ARG_PTR_TO_CTX) { if (changes_data && fn->arg1_type != ARG_PTR_TO_CTX) {
verbose(env, "kernel subsystem misconfigured func %s#%d: r1 != ctx\n", verbose(env, "kernel subsystem misconfigured func %s#%d: r1 != ctx\n",
func_id_name(func_id), func_id); func_id_name(func_id), func_id);

61
net/core/filter.c
View File

@@ -7868,42 +7868,35 @@ static const struct bpf_func_proto bpf_tcp_raw_check_syncookie_ipv6_proto = {
#endif /* CONFIG_INET */ #endif /* CONFIG_INET */
bool bpf_helper_changes_pkt_data(void *func) bool bpf_helper_changes_pkt_data(enum bpf_func_id func_id)
{ {
if (func == bpf_skb_vlan_push || switch (func_id) {
func == bpf_skb_vlan_pop || case BPF_FUNC_clone_redirect:
func == bpf_skb_store_bytes || case BPF_FUNC_l3_csum_replace:
func == bpf_skb_change_proto || case BPF_FUNC_l4_csum_replace:
func == bpf_skb_change_head || case BPF_FUNC_lwt_push_encap:
func == sk_skb_change_head || case BPF_FUNC_lwt_seg6_action:
func == bpf_skb_change_tail || case BPF_FUNC_lwt_seg6_adjust_srh:
func == sk_skb_change_tail || case BPF_FUNC_lwt_seg6_store_bytes:
func == bpf_skb_adjust_room || case BPF_FUNC_msg_pop_data:
func == sk_skb_adjust_room || case BPF_FUNC_msg_pull_data:
func == bpf_skb_pull_data || case BPF_FUNC_msg_push_data:
func == sk_skb_pull_data || case BPF_FUNC_skb_adjust_room:
func == bpf_clone_redirect || case BPF_FUNC_skb_change_head:
func == bpf_l3_csum_replace || case BPF_FUNC_skb_change_proto:
func == bpf_l4_csum_replace || case BPF_FUNC_skb_change_tail:
func == bpf_xdp_adjust_head || case BPF_FUNC_skb_pull_data:
func == bpf_xdp_adjust_meta || case BPF_FUNC_skb_store_bytes:
func == bpf_msg_pull_data || case BPF_FUNC_skb_vlan_pop:
func == bpf_msg_push_data || case BPF_FUNC_skb_vlan_push:
func == bpf_msg_pop_data || case BPF_FUNC_store_hdr_opt:
func == bpf_xdp_adjust_tail || case BPF_FUNC_xdp_adjust_head:
#if IS_ENABLED(CONFIG_IPV6_SEG6_BPF) case BPF_FUNC_xdp_adjust_meta:
func == bpf_lwt_seg6_store_bytes || case BPF_FUNC_xdp_adjust_tail:
func == bpf_lwt_seg6_adjust_srh ||
func == bpf_lwt_seg6_action ||
#endif
#ifdef CONFIG_INET
func == bpf_sock_ops_store_hdr_opt ||
#endif
func == bpf_lwt_in_push_encap ||
func == bpf_lwt_xmit_push_encap)
return true; return true;
default:
return false; return false;
}
} }
const struct bpf_func_proto bpf_event_output_data_proto __weak; const struct bpf_func_proto bpf_event_output_data_proto __weak;