CI: switch from 6.7 to 6.8

Kernel 6.8 is currently the latest stable kernel release, so test against it. Also add 6.6 to the test matrix since it is an LTS release. Signed-off-by: Dylan Reimerink <dylan.reimerink@isovalent.com>
cilium · Apr 26, 2024 · 8d709e6 · 8d709e6
1 parent 9f7e654
commit 8d709e6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git 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
@@ -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
diff --git a/btf/testdata/vmlinux.btf.gz b/btf/testdata/vmlinux.btf.gz
diff --git 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
 }