Commit 7065eefb authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

bpf: rename MAX_BPF_LINK_TYPE into __MAX_BPF_LINK_TYPE for consistency 



To stay consistent with the naming pattern used for similar cases in BPF
UAPI (__MAX_BPF_ATTACH_TYPE, etc), rename MAX_BPF_LINK_TYPE into
__MAX_BPF_LINK_TYPE.

Also similar to MAX_BPF_ATTACH_TYPE and MAX_BPF_REG, add:

  #define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE

Not all __MAX_xxx enums have such #define, so I'm not sure if we should
add it or not, but I figured I'll start with a completely backwards
compatible way, and we can drop that, if necessary.

Also adjust a selftest that used MAX_BPF_LINK_TYPE enum.

Suggested-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarYonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/r/20231206190920.1651226-1-andrii@kernel.org


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c35919dc

include/uapi/linux/bpf.h

+3 −1
Original line number Diff line number Diff line
@@ -1108,9 +1108,11 @@ enum bpf_link_type { 
	BPF_LINK_TYPE_TCX = 11,

	BPF_LINK_TYPE_UPROBE_MULTI = 12,

	BPF_LINK_TYPE_NETKIT = 13,

	MAX_BPF_LINK_TYPE,

	__MAX_BPF_LINK_TYPE,

};



#define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE



enum bpf_perf_event_type {

	BPF_PERF_EVENT_UNSPEC = 0,

	BPF_PERF_EVENT_UPROBE = 1,

tools/include/uapi/linux/bpf.h

+3 −1
Original line number Diff line number Diff line
@@ -1108,9 +1108,11 @@ enum bpf_link_type { 
	BPF_LINK_TYPE_TCX = 11,

	BPF_LINK_TYPE_UPROBE_MULTI = 12,

	BPF_LINK_TYPE_NETKIT = 13,

	MAX_BPF_LINK_TYPE,

	__MAX_BPF_LINK_TYPE,

};



#define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE



enum bpf_perf_event_type {

	BPF_PERF_EVENT_UNSPEC = 0,

	BPF_PERF_EVENT_UPROBE = 1,

tools/testing/selftests/bpf/prog_tests/libbpf_str.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void test_libbpf_bpf_link_type_str(void) 
		const char *link_type_str;

		char buf[256];



		if (link_type == MAX_BPF_LINK_TYPE)

		if (link_type == __MAX_BPF_LINK_TYPE)

			continue;



		link_type_name = btf__str_by_offset(btf, e->name_off);