Skip to content

Commit 9888904

Browse files
tklausergopherbot
authored andcommitted
unix: update BPF constants for Linux kernel 6.6
This re-adds BPF_F_KPROBE_MULTI_RETURN which was removed by CL 538378 because it was changed from a #define to an enum in the upstream bpf.h header, see https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c5487f8d9186 Fixes golang/go#63969 Change-Id: Icbf180d8fb8d51fd2fa4a29a615f7071abda9a8b Reviewed-on: https://go-review.googlesource.com/c/sys/+/540395 Reviewed-by: Heschi Kreinick <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Reviewed-by: Bryan Mills <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Mauri de Souza Meneguzzo <[email protected]>
1 parent 2d0c736 commit 9888904

File tree

4 files changed

+53
-2
lines changed

4 files changed

+53
-2
lines changed

unix/linux/types.go

+26
Original file line numberDiff line numberDiff line change
@@ -2707,6 +2707,7 @@ const (
27072707
BPF_PROG_TYPE_LSM = C.BPF_PROG_TYPE_LSM
27082708
BPF_PROG_TYPE_SK_LOOKUP = C.BPF_PROG_TYPE_SK_LOOKUP
27092709
BPF_PROG_TYPE_SYSCALL = C.BPF_PROG_TYPE_SYSCALL
2710+
BPF_PROG_TYPE_NETFILTER = C.BPF_PROG_TYPE_NETFILTER
27102711
BPF_CGROUP_INET_INGRESS = C.BPF_CGROUP_INET_INGRESS
27112712
BPF_CGROUP_INET_EGRESS = C.BPF_CGROUP_INET_EGRESS
27122713
BPF_CGROUP_INET_SOCK_CREATE = C.BPF_CGROUP_INET_SOCK_CREATE
@@ -2751,6 +2752,11 @@ const (
27512752
BPF_PERF_EVENT = C.BPF_PERF_EVENT
27522753
BPF_TRACE_KPROBE_MULTI = C.BPF_TRACE_KPROBE_MULTI
27532754
BPF_LSM_CGROUP = C.BPF_LSM_CGROUP
2755+
BPF_STRUCT_OPS = C.BPF_STRUCT_OPS
2756+
BPF_NETFILTER = C.BPF_NETFILTER
2757+
BPF_TCX_INGRESS = C.BPF_TCX_INGRESS
2758+
BPF_TCX_EGRESS = C.BPF_TCX_EGRESS
2759+
BPF_TRACE_UPROBE_MULTI = C.BPF_TRACE_UPROBE_MULTI
27542760
BPF_LINK_TYPE_UNSPEC = C.BPF_LINK_TYPE_UNSPEC
27552761
BPF_LINK_TYPE_RAW_TRACEPOINT = C.BPF_LINK_TYPE_RAW_TRACEPOINT
27562762
BPF_LINK_TYPE_TRACING = C.BPF_LINK_TYPE_TRACING
@@ -2761,6 +2767,18 @@ const (
27612767
BPF_LINK_TYPE_PERF_EVENT = C.BPF_LINK_TYPE_PERF_EVENT
27622768
BPF_LINK_TYPE_KPROBE_MULTI = C.BPF_LINK_TYPE_KPROBE_MULTI
27632769
BPF_LINK_TYPE_STRUCT_OPS = C.BPF_LINK_TYPE_STRUCT_OPS
2770+
BPF_LINK_TYPE_NETFILTER = C.BPF_LINK_TYPE_NETFILTER
2771+
BPF_LINK_TYPE_TCX = C.BPF_LINK_TYPE_TCX
2772+
BPF_LINK_TYPE_UPROBE_MULTI = C.BPF_LINK_TYPE_UPROBE_MULTI
2773+
BPF_PERF_EVENT_UNSPEC = C.BPF_PERF_EVENT_UNSPEC
2774+
BPF_PERF_EVENT_UPROBE = C.BPF_PERF_EVENT_UPROBE
2775+
BPF_PERF_EVENT_URETPROBE = C.BPF_PERF_EVENT_URETPROBE
2776+
BPF_PERF_EVENT_KPROBE = C.BPF_PERF_EVENT_KPROBE
2777+
BPF_PERF_EVENT_KRETPROBE = C.BPF_PERF_EVENT_KRETPROBE
2778+
BPF_PERF_EVENT_TRACEPOINT = C.BPF_PERF_EVENT_TRACEPOINT
2779+
BPF_PERF_EVENT_EVENT = C.BPF_PERF_EVENT_EVENT
2780+
BPF_F_KPROBE_MULTI_RETURN = C.BPF_F_KPROBE_MULTI_RETURN
2781+
BPF_F_UPROBE_MULTI_RETURN = C.BPF_F_UPROBE_MULTI_RETURN
27642782
BPF_ANY = C.BPF_ANY
27652783
BPF_NOEXIST = C.BPF_NOEXIST
27662784
BPF_EXIST = C.BPF_EXIST
@@ -2778,6 +2796,8 @@ const (
27782796
BPF_F_MMAPABLE = C.BPF_F_MMAPABLE
27792797
BPF_F_PRESERVE_ELEMS = C.BPF_F_PRESERVE_ELEMS
27802798
BPF_F_INNER_MAP = C.BPF_F_INNER_MAP
2799+
BPF_F_LINK = C.BPF_F_LINK
2800+
BPF_F_PATH_FD = C.BPF_F_PATH_FD
27812801
BPF_STATS_RUN_TIME = C.BPF_STATS_RUN_TIME
27822802
BPF_STACK_BUILD_ID_EMPTY = C.BPF_STACK_BUILD_ID_EMPTY
27832803
BPF_STACK_BUILD_ID_VALID = C.BPF_STACK_BUILD_ID_VALID
@@ -2798,6 +2818,7 @@ const (
27982818
BPF_F_ZERO_CSUM_TX = C.BPF_F_ZERO_CSUM_TX
27992819
BPF_F_DONT_FRAGMENT = C.BPF_F_DONT_FRAGMENT
28002820
BPF_F_SEQ_NUMBER = C.BPF_F_SEQ_NUMBER
2821+
BPF_F_NO_TUNNEL_KEY = C.BPF_F_NO_TUNNEL_KEY
28012822
BPF_F_TUNINFO_FLAGS = C.BPF_F_TUNINFO_FLAGS
28022823
BPF_F_INDEX_MASK = C.BPF_F_INDEX_MASK
28032824
BPF_F_CURRENT_CPU = C.BPF_F_CURRENT_CPU
@@ -2814,6 +2835,8 @@ const (
28142835
BPF_F_ADJ_ROOM_ENCAP_L4_UDP = C.BPF_F_ADJ_ROOM_ENCAP_L4_UDP
28152836
BPF_F_ADJ_ROOM_NO_CSUM_RESET = C.BPF_F_ADJ_ROOM_NO_CSUM_RESET
28162837
BPF_F_ADJ_ROOM_ENCAP_L2_ETH = C.BPF_F_ADJ_ROOM_ENCAP_L2_ETH
2838+
BPF_F_ADJ_ROOM_DECAP_L3_IPV4 = C.BPF_F_ADJ_ROOM_DECAP_L3_IPV4
2839+
BPF_F_ADJ_ROOM_DECAP_L3_IPV6 = C.BPF_F_ADJ_ROOM_DECAP_L3_IPV6
28172840
BPF_ADJ_ROOM_ENCAP_L2_MASK = C.BPF_ADJ_ROOM_ENCAP_L2_MASK
28182841
BPF_ADJ_ROOM_ENCAP_L2_SHIFT = C.BPF_ADJ_ROOM_ENCAP_L2_SHIFT
28192842
BPF_F_SYSCTL_BASE_NAME = C.BPF_F_SYSCTL_BASE_NAME
@@ -2902,6 +2925,8 @@ const (
29022925
BPF_DEVCG_DEV_CHAR = C.BPF_DEVCG_DEV_CHAR
29032926
BPF_FIB_LOOKUP_DIRECT = C.BPF_FIB_LOOKUP_DIRECT
29042927
BPF_FIB_LOOKUP_OUTPUT = C.BPF_FIB_LOOKUP_OUTPUT
2928+
BPF_FIB_LOOKUP_SKIP_NEIGH = C.BPF_FIB_LOOKUP_SKIP_NEIGH
2929+
BPF_FIB_LOOKUP_TBID = C.BPF_FIB_LOOKUP_TBID
29052930
BPF_FIB_LKUP_RET_SUCCESS = C.BPF_FIB_LKUP_RET_SUCCESS
29062931
BPF_FIB_LKUP_RET_BLACKHOLE = C.BPF_FIB_LKUP_RET_BLACKHOLE
29072932
BPF_FIB_LKUP_RET_UNREACHABLE = C.BPF_FIB_LKUP_RET_UNREACHABLE
@@ -2937,6 +2962,7 @@ const (
29372962
BPF_CORE_ENUMVAL_EXISTS = C.BPF_CORE_ENUMVAL_EXISTS
29382963
BPF_CORE_ENUMVAL_VALUE = C.BPF_CORE_ENUMVAL_VALUE
29392964
BPF_CORE_TYPE_MATCHES = C.BPF_CORE_TYPE_MATCHES
2965+
BPF_F_TIMER_ABS = C.BPF_F_TIMER_ABS
29402966
)
29412967

29422968
// generated by:

unix/mkerrors.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ ccflags="$@"
560560
$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|LOCKS|MEMLOCK|MSGQUEUE|NICE|NOFILE|NPROC|RSS|RTPRIO|RTTIME|SIGPENDING|STACK)|RLIM_INFINITY/ ||
561561
$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
562562
$2 ~ /^CLONE_[A-Z_]+/ ||
563-
$2 !~ /^(BPF_TIMEVAL|BPF_FIB_LOOKUP_[A-Z]+)$/ &&
563+
$2 !~ /^(BPF_TIMEVAL|BPF_FIB_LOOKUP_[A-Z]+|BPF_F_LINK)$/ &&
564564
$2 ~ /^(BPF|DLT)_/ ||
565565
$2 ~ /^AUDIT_/ ||
566566
$2 ~ /^(CLOCK|TIMER)_/ ||

unix/zerrors_linux.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix/ztypes_linux.go

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)