bpf: rename MAX_BPF_LINK_TYPE into __MAX_BPF_LINK_TYPE for consistency
Subsystems (3)
Andrii Nakryiko
maintainerPATCH 1/1 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.
--- include/uapi/linux/bpf.h | 4 +++- tools/include/uapi/linux/bpf.h | 4 +++- tools/testing/selftests/bpf/prog_tests/libbpf_str.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)
include/uapi/linux/bpf.h +3 -1
@@ -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
@@ -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
@@ -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);
Signature · 1 line
2.34.1
Quoted 8 lines · Andrii Nakryiko
To stay consistent with the naming pattern used for similar cases in BPF UAPI (
__MAX_BPF_ATTACH_TYPE, etc), renameMAX_BPF_LINK_TYPEinto__MAX_BPF_LINK_TYPE.Also similar to
MAX_BPF_ATTACH_TYPEandMAX_BPF_REG, add:#define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE
Quoted 8 lines
Not all
__MAX_xxxenums 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_TYPEenum.Suggested-by Alexei Starovoitov <[email protected]>Signed-off-by Andrii Nakryiko <[email protected]>
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 9 lines · On Wed, 6 Dec 2023 11:09:20 -0800 you wrote:
To stay consistent with the naming pattern used for similar cases in BPF UAPI (
__MAX_BPF_ATTACH_TYPE, etc), renameMAX_BPF_LINK_TYPEinto__MAX_BPF_LINK_TYPE.Also similar to
MAX_BPF_ATTACH_TYPEandMAX_BPF_REG, add:#define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE[...]
Here is the summary with links:
- [bpf-next] bpf: rename MAX_BPF_LINK_TYPE into __MAX_BPF_LINK_TYPE for consistency
https://git.kernel.org/bpf/bpf-next/c/7065eefb38f1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html