diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a31fed691..502a12026 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: env: TMPDIR: /tmp - CI_MAX_KERNEL_VERSION: '6.7' + CI_MAX_KERNEL_VERSION: '6.8' CI_MIN_CLANG_VERSION: '11' go_version: '~1.22' prev_go_version: '~1.21' @@ -173,7 +173,7 @@ jobs: timeout-minutes: 15 strategy: matrix: - version: ["6.7", "6.1", "5.15", "5.10", "5.4", "4.19", "4.14", "4.9"] + version: ["6.8", "6.6", "6.1", "5.15", "5.10", "5.4", "4.19", "4.14", "4.9"] env: KERNEL_VERSION: "${{ matrix.version }}" steps: diff --git a/Makefile b/Makefile index c55a93d9c..d355eea71 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ testdata/loader-%-eb.elf: testdata/loader.c $(STRIP) -g $@ .PHONY: update-kernel-deps -update-kernel-deps: export KERNEL_VERSION?=6.7 +update-kernel-deps: export KERNEL_VERSION?=6.8 update-kernel-deps: ./testdata/sh/update-kernel-deps.sh $(MAKE) container-all diff --git a/btf/testdata/btf_testmod.btf b/btf/testdata/btf_testmod.btf index 248488602..eabbc2998 100644 Binary files a/btf/testdata/btf_testmod.btf and b/btf/testdata/btf_testmod.btf differ diff --git a/btf/testdata/vmlinux.btf.gz b/btf/testdata/vmlinux.btf.gz index a5ce65038..055ad98b6 100644 Binary files a/btf/testdata/vmlinux.btf.gz and b/btf/testdata/vmlinux.btf.gz differ diff --git a/features/prog.go b/features/prog.go index a11363796..dc13b86d3 100644 --- a/features/prog.go +++ b/features/prog.go @@ -125,6 +125,9 @@ var haveProgramTypeMatrix = internal.FeatureMatrix[ebpf.ProgramType]{ Name: "a", Type: &btf.FuncProto{ Return: &btf.Int{}, + Params: []btf.FuncParam{ + {Name: "ctx", Type: &btf.Pointer{Target: &btf.Struct{Name: "xdp_md"}}}, + }, }, Linkage: btf.GlobalFunc, } diff --git a/internal/sys/types.go b/internal/sys/types.go index d2ae94266..70e754de7 100644 --- a/internal/sys/types.go +++ b/internal/sys/types.go @@ -359,7 +359,7 @@ const ( BPF_LINK_TYPE_TCX LinkType = 11 BPF_LINK_TYPE_UPROBE_MULTI LinkType = 12 BPF_LINK_TYPE_NETKIT LinkType = 13 - MAX_BPF_LINK_TYPE LinkType = 14 + __MAX_BPF_LINK_TYPE LinkType = 14 ) type MapType uint32 @@ -528,7 +528,7 @@ type LinkInfo struct { Id LinkID ProgId uint32 _ [4]byte - Extra [40]uint8 + Extra [48]uint8 } type MapInfo struct { @@ -1263,7 +1263,7 @@ type CgroupLinkInfo struct { _ [4]byte CgroupId uint64 AttachType AttachType - _ [28]byte + _ [36]byte } type IterLinkInfo struct { @@ -1287,6 +1287,7 @@ type KprobeLinkInfo struct { Offset uint32 Addr uint64 Missed uint64 + _ [8]byte } type KprobeMultiLinkInfo struct { @@ -1298,7 +1299,7 @@ type KprobeMultiLinkInfo struct { Count uint32 Flags uint32 Missed uint64 - _ [16]byte + _ [24]byte } type NetNsLinkInfo struct { @@ -1308,7 +1309,7 @@ type NetNsLinkInfo struct { _ [4]byte NetnsIno uint32 AttachType AttachType - _ [32]byte + _ [40]byte } type NetfilterLinkInfo struct { @@ -1320,7 +1321,7 @@ type NetfilterLinkInfo struct { Hooknum uint32 Priority int32 Flags uint32 - _ [24]byte + _ [32]byte } type NetkitLinkInfo struct { @@ -1330,7 +1331,7 @@ type NetkitLinkInfo struct { _ [4]byte Ifindex uint32 AttachType AttachType - _ [32]byte + _ [40]byte } type PerfEventLinkInfo struct { @@ -1348,7 +1349,7 @@ type RawTracepointLinkInfo struct { _ [4]byte TpName Pointer TpNameLen uint32 - _ [28]byte + _ [36]byte } type TcxLinkInfo struct { @@ -1358,7 +1359,7 @@ type TcxLinkInfo struct { _ [4]byte Ifindex uint32 AttachType AttachType - _ [32]byte + _ [40]byte } type TracingLinkInfo struct { @@ -1369,7 +1370,7 @@ type TracingLinkInfo struct { AttachType AttachType TargetObjId uint32 TargetBtfId TypeID - _ [28]byte + _ [36]byte } type XDPLinkInfo struct { @@ -1378,5 +1379,5 @@ type XDPLinkInfo struct { ProgId uint32 _ [4]byte Ifindex uint32 - _ [36]byte + _ [44]byte }