Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Update kernel from v6.7 to v6.8 #1452

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -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'
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -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
Binary file modified btf/testdata/btf_testmod.btf
Binary file not shown.
Binary file modified btf/testdata/vmlinux.btf.gz
Binary file not shown.
3 changes: 3 additions & 0 deletions features/prog.go
Expand Up @@ -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,
}
Expand Down
23 changes: 12 additions & 11 deletions internal/sys/types.go
Expand Up @@ -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
Expand Down Expand Up @@ -528,7 +528,7 @@ type LinkInfo struct {
Id LinkID
ProgId uint32
_ [4]byte
Extra [40]uint8
Extra [48]uint8
}

type MapInfo struct {
Expand Down Expand Up @@ -1263,7 +1263,7 @@ type CgroupLinkInfo struct {
_ [4]byte
CgroupId uint64
AttachType AttachType
_ [28]byte
_ [36]byte
}

type IterLinkInfo struct {
Expand All @@ -1287,6 +1287,7 @@ type KprobeLinkInfo struct {
Offset uint32
Addr uint64
Missed uint64
_ [8]byte
}

type KprobeMultiLinkInfo struct {
Expand All @@ -1298,7 +1299,7 @@ type KprobeMultiLinkInfo struct {
Count uint32
Flags uint32
Missed uint64
_ [16]byte
_ [24]byte
}

type NetNsLinkInfo struct {
Expand All @@ -1308,7 +1309,7 @@ type NetNsLinkInfo struct {
_ [4]byte
NetnsIno uint32
AttachType AttachType
_ [32]byte
_ [40]byte
}

type NetfilterLinkInfo struct {
Expand All @@ -1320,7 +1321,7 @@ type NetfilterLinkInfo struct {
Hooknum uint32
Priority int32
Flags uint32
_ [24]byte
_ [32]byte
}

type NetkitLinkInfo struct {
Expand All @@ -1330,7 +1331,7 @@ type NetkitLinkInfo struct {
_ [4]byte
Ifindex uint32
AttachType AttachType
_ [32]byte
_ [40]byte
}

type PerfEventLinkInfo struct {
Expand All @@ -1348,7 +1349,7 @@ type RawTracepointLinkInfo struct {
_ [4]byte
TpName Pointer
TpNameLen uint32
_ [28]byte
_ [36]byte
}

type TcxLinkInfo struct {
Expand All @@ -1358,7 +1359,7 @@ type TcxLinkInfo struct {
_ [4]byte
Ifindex uint32
AttachType AttachType
_ [32]byte
_ [40]byte
}

type TracingLinkInfo struct {
Expand All @@ -1369,7 +1370,7 @@ type TracingLinkInfo struct {
AttachType AttachType
TargetObjId uint32
TargetBtfId TypeID
_ [28]byte
_ [36]byte
}

type XDPLinkInfo struct {
Expand All @@ -1378,5 +1379,5 @@ type XDPLinkInfo struct {
ProgId uint32
_ [4]byte
Ifindex uint32
_ [36]byte
_ [44]byte
}