bpf: fix enum names for bpf_this_cpu_ptr() and bpf_per_cpu_ptr() helpers
Subsystems (6)
Andrii Nakryiko
maintainerPATCH 1/1 bpf: fix enum names for bpf_this_cpu_ptr() and bpf_per_cpu_ptr() helpers
Remove bpf_ prefix, which causes these helpers to be reported in verifier dump as bpf_bpf_this_cpu_ptr() and bpf_bpf_per_cpu_ptr(), respectively.
Fixes eaa6bcb71ef6 ("bpf: Introduce bpf_per_cpu_ptr()")
Signed-off-by Andrii Nakryiko <[email protected]>
--- include/uapi/linux/bpf.h | 4 ++-- kernel/bpf/helpers.c | 4 ++-- kernel/trace/bpf_trace.c | 4 ++-- tools/include/uapi/linux/bpf.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
include/uapi/linux/bpf.h +2 -2
@@ -3897,8 +3897,8 @@ union bpf_attr {FN (seq_printf_btf), \FN (skb_cgroup_classid), \FN (redirect_neigh), \ -FN (bpf_per_cpu_ptr), \ -FN (bpf_this_cpu_ptr), \ +FN (per_cpu_ptr), \ +FN (this_cpu_ptr), \ FN(redirect_peer), \/* */
kernel/bpf/helpers.c +2 -2
@@ -717,9 +717,9 @@ bpf_base_func_proto(enum bpf_func_id func_id)return &bpf_snprintf_btf_proto;case BPF_FUNC_jiffies64:return &bpf_jiffies64_proto; -case BPF_FUNC_bpf_per_cpu_ptr: +case BPF_FUNC_per_cpu_ptr:return &bpf_per_cpu_ptr_proto; -case BPF_FUNC_bpf_this_cpu_ptr: +case BPF_FUNC_this_cpu_ptr:return &bpf_this_cpu_ptr_proto;default :break ;
kernel/trace/bpf_trace.c +2 -2
@@ -1337,9 +1337,9 @@ bpf_tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)return prog->aux->sleepable ? &bpf_copy_from_user_proto :NULL ;case BPF_FUNC_snprintf_btf:return &bpf_snprintf_btf_proto; -case BPF_FUNC_bpf_per_cpu_ptr: +case BPF_FUNC_per_cpu_ptr:return &bpf_per_cpu_ptr_proto; -case BPF_FUNC_bpf_this_cpu_ptr: +case BPF_FUNC_this_cpu_ptr:return &bpf_this_cpu_ptr_proto;default :return NULL ;
tools/include/uapi/linux/bpf.h +2 -2
@@ -3897,8 +3897,8 @@ union bpf_attr {FN (seq_printf_btf), \FN (skb_cgroup_classid), \FN (redirect_neigh), \ -FN (bpf_per_cpu_ptr), \ -FN (bpf_this_cpu_ptr), \ +FN (per_cpu_ptr), \ +FN (this_cpu_ptr), \ FN(redirect_peer), \/* */
Signature · 1 line
2.24.1