Skip to content

Commit 1445d28

Browse files
olsajiriti-mo
olsajiri
authored and
ti-mo
committed
btf,sys: update to 6.11
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
1 parent f3b4cde commit 1445d28

File tree

5 files changed

+39
-16
lines changed

5 files changed

+39
-16
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
TMPDIR: /tmp
10-
CI_MAX_KERNEL_VERSION: '6.8'
10+
CI_MAX_KERNEL_VERSION: '6.11'
1111
CI_MIN_CLANG_VERSION: '11'
1212
go_version: '~1.23'
1313
prev_go_version: '~1.22'

‎btf/testdata/btf_testmod.btf

3.5 KB
Binary file not shown.

‎btf/testdata/vmlinux.btf.gz

88.1 KB
Binary file not shown.

‎elf_sections.go

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

‎internal/sys/types.go

+36-15
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const (
2626
BPF_FIB_LKUP_RET_UNREACHABLE = 2
2727
BPF_FIB_LKUP_RET_UNSUPP_LWT = 6
2828
BPF_FIB_LOOKUP_DIRECT = 1
29+
BPF_FIB_LOOKUP_MARK = 32
2930
BPF_FIB_LOOKUP_OUTPUT = 2
3031
BPF_FIB_LOOKUP_SKIP_NEIGH = 4
3132
BPF_FIB_LOOKUP_SRC = 16
@@ -68,6 +69,7 @@ const (
6869
BPF_F_NO_COMMON_LRU = 2
6970
BPF_F_NO_PREALLOC = 1
7071
BPF_F_NO_TUNNEL_KEY = 16
72+
BPF_F_NO_USER_CONV = 262144
7173
BPF_F_NUMA_NODE = 4
7274
BPF_F_PATH_FD = 16384
7375
BPF_F_PEER = 4
@@ -77,17 +79,20 @@ const (
7779
BPF_F_RDONLY_PROG = 128
7880
BPF_F_RECOMPUTE_CSUM = 1
7981
BPF_F_REUSE_STACKID = 1024
82+
BPF_F_SEGV_ON_FAULT = 131072
8083
BPF_F_SEQ_NUMBER = 8
8184
BPF_F_SKIP_FIELD_MASK = 255
8285
BPF_F_STACK_BUILD_ID = 32
8386
BPF_F_SYSCTL_BASE_NAME = 1
8487
BPF_F_TIMER_ABS = 1
8588
BPF_F_TIMER_CPU_PIN = 2
89+
BPF_F_TOKEN_FD = 65536
8690
BPF_F_TUNINFO_FLAGS = 16
8791
BPF_F_TUNINFO_IPV6 = 1
8892
BPF_F_UPROBE_MULTI_RETURN = 1
8993
BPF_F_USER_BUILD_ID = 2048
9094
BPF_F_USER_STACK = 256
95+
BPF_F_VTYPE_BTF_OBJ_FD = 32768
9196
BPF_F_WRONLY = 16
9297
BPF_F_WRONLY_PROG = 256
9398
BPF_F_ZERO_CSUM_TX = 2
@@ -117,6 +122,9 @@ const (
117122
BPF_RINGBUF_BUSY_BIT = 2147483648
118123
BPF_RINGBUF_DISCARD_BIT = 1073741824
119124
BPF_RINGBUF_HDR_SZ = 8
125+
BPF_SKB_CLOCK_MONOTONIC = 1
126+
BPF_SKB_CLOCK_REALTIME = 0
127+
BPF_SKB_CLOCK_TAI = 2
120128
BPF_SKB_TSTAMP_DELIVERY_MONO = 1
121129
BPF_SKB_TSTAMP_UNSPEC = 0
122130
BPF_SK_LOOKUP_F_NO_REUSEPORT = 2
@@ -146,8 +154,6 @@ const (
146154
BPF_SOCK_OPS_VOID = 0
147155
BPF_SOCK_OPS_WRITE_HDR_OPT_CB = 15
148156
BPF_SOCK_OPS_WRITE_HDR_OPT_CB_FLAG = 64
149-
BPF_STRUCT_OPS_TYPE_bpf_dummy_ops = 0
150-
BPF_STRUCT_OPS_TYPE_tcp_congestion_ops = 1
151157
BPF_TASK_ITER_ALL_PROCS = 0
152158
BPF_TASK_ITER_ALL_THREADS = 1
153159
BPF_TASK_ITER_PROC_THREADS = 2
@@ -236,7 +242,8 @@ const (
236242
BPF_CGROUP_UNIX_GETSOCKNAME AttachType = 53
237243
BPF_NETKIT_PRIMARY AttachType = 54
238244
BPF_NETKIT_PEER AttachType = 55
239-
__MAX_BPF_ATTACH_TYPE AttachType = 56
245+
BPF_TRACE_KPROBE_SESSION AttachType = 56
246+
__MAX_BPF_ATTACH_TYPE AttachType = 57
240247
)
241248

242249
type Cmd uint32
@@ -279,6 +286,8 @@ const (
279286
BPF_ITER_CREATE Cmd = 33
280287
BPF_LINK_DETACH Cmd = 34
281288
BPF_PROG_BIND_MAP Cmd = 35
289+
BPF_TOKEN_CREATE Cmd = 36
290+
__MAX_BPF_CMD Cmd = 37
282291
)
283292

284293
type FunctionId uint32
@@ -523,7 +532,8 @@ const (
523532
BPF_LINK_TYPE_TCX LinkType = 11
524533
BPF_LINK_TYPE_UPROBE_MULTI LinkType = 12
525534
BPF_LINK_TYPE_NETKIT LinkType = 13
526-
__MAX_BPF_LINK_TYPE LinkType = 14
535+
BPF_LINK_TYPE_SOCKMAP LinkType = 14
536+
__MAX_BPF_LINK_TYPE LinkType = 15
527537
)
528538

529539
type MapType uint32
@@ -564,6 +574,8 @@ const (
564574
BPF_MAP_TYPE_BLOOM_FILTER MapType = 30
565575
BPF_MAP_TYPE_USER_RINGBUF MapType = 31
566576
BPF_MAP_TYPE_CGRP_STORAGE MapType = 32
577+
BPF_MAP_TYPE_ARENA MapType = 33
578+
__MAX_BPF_MAP_TYPE MapType = 34
567579
)
568580

569581
type ObjType uint32
@@ -623,6 +635,7 @@ const (
623635
BPF_PROG_TYPE_SK_LOOKUP ProgType = 30
624636
BPF_PROG_TYPE_SYSCALL ProgType = 31
625637
BPF_PROG_TYPE_NETFILTER ProgType = 32
638+
__MAX_BPF_PROG_TYPE ProgType = 33
626639
)
627640

628641
type RetCode uint32
@@ -719,7 +732,7 @@ type MapInfo struct {
719732
BtfId uint32
720733
BtfKeyTypeId TypeID
721734
BtfValueTypeId TypeID
722-
_ [4]byte
735+
BtfVmlinuxId uint32
723736
MapExtra uint64
724737
}
725738

@@ -816,6 +829,8 @@ type BtfLoadAttr struct {
816829
BtfLogSize uint32
817830
BtfLogLevel uint32
818831
BtfLogTrueSize uint32
832+
BtfFlags uint32
833+
BtfTokenFd int32
819834
}
820835

821836
func BtfLoad(attr *BtfLoadAttr) (*FD, error) {
@@ -1069,6 +1084,8 @@ type MapCreateAttr struct {
10691084
BtfValueTypeId TypeID
10701085
BtfVmlinuxValueTypeId TypeID
10711086
MapExtra uint64
1087+
ValueTypeBtfObjFd int32
1088+
MapTokenFd int32
10721089
}
10731090

10741091
func MapCreate(attr *MapCreateAttr) (*FD, error) {
@@ -1362,6 +1379,8 @@ type ProgLoadAttr struct {
13621379
CoreRelos Pointer
13631380
CoreReloRecSize uint32
13641381
LogTrueSize uint32
1382+
ProgTokenFd int32
1383+
_ [4]byte
13651384
}
13661385

13671386
func ProgLoad(attr *ProgLoadAttr) (*FD, error) {
@@ -1419,6 +1438,7 @@ type RawTracepointOpenAttr struct {
14191438
Name Pointer
14201439
ProgFd uint32
14211440
_ [4]byte
1441+
Cookie uint64
14221442
}
14231443

14241444
func RawTracepointOpen(attr *RawTracepointOpenAttr) (*FD, error) {
@@ -1460,19 +1480,20 @@ type KprobeLinkInfo struct {
14601480
Offset uint32
14611481
Addr uint64
14621482
Missed uint64
1463-
_ [8]byte
1483+
Cookie uint64
14641484
}
14651485

14661486
type KprobeMultiLinkInfo struct {
1467-
Type LinkType
1468-
Id LinkID
1469-
ProgId uint32
1470-
_ [4]byte
1471-
Addrs Pointer
1472-
Count uint32
1473-
Flags uint32
1474-
Missed uint64
1475-
_ [24]byte
1487+
Type LinkType
1488+
Id LinkID
1489+
ProgId uint32
1490+
_ [4]byte
1491+
Addrs Pointer
1492+
Count uint32
1493+
Flags uint32
1494+
Missed uint64
1495+
Cookies uint64
1496+
_ [16]byte
14761497
}
14771498

14781499
type NetNsLinkInfo struct {

0 commit comments

Comments
 (0)