Commit b7906b70 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Linus Torvalds
Browse files

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. Lets
fix it as long as it is still possible before UAPI freezes on these helpers.

Fixes: eaa6bcb7 ("bpf: Introduce bpf_per_cpu_ptr()")
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a06caa4a

include/uapi/linux/bpf.h

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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),		\

	/* */

CRA Git | Maintained and supported by SUSTech CRA and CCSE