@@ -142,7 +142,7 @@ require (

 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect

 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect

 	github.com/cespare/xxhash/v2 v2.3.0 // indirect

-	github.com/cilium/ebpf v0.16.0 // indirect

+	github.com/cilium/ebpf v0.17.3 // indirect

 	github.com/container-storage-interface/spec v1.5.0 // indirect

 	github.com/containerd/console v1.0.4 // indirect

 	github.com/containerd/errdefs/pkg v0.3.0 // indirect

@@ -230,7 +230,6 @@ require (

 	go.uber.org/multierr v1.8.0 // indirect

 	go.uber.org/zap v1.21.0 // indirect

 	golang.org/x/crypto v0.35.0 // indirect

-	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect

 	golang.org/x/oauth2 v0.27.0 // indirect

 	golang.org/x/tools v0.27.0 // indirect

 	google.golang.org/api v0.155.0 // indirect

@@ -105,8 +105,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA

 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

-github.com/cilium/ebpf v0.16.0 h1:+BiEnHL6Z7lXnlGUsXQPPAE7+kenAd4ES8MQ5min0Ok=

-github.com/cilium/ebpf v0.16.0/go.mod h1:L7u2Blt2jMM/vLAVgjxluxtBKlz3/GWjB0dMOEngfwE=

+github.com/cilium/ebpf v0.17.3 h1:FnP4r16PWYSE4ux6zN+//jMcW4nMVRvuTLVTvCjyyjg=

+github.com/cilium/ebpf v0.17.3/go.mod h1:G5EDHij8yiLzaqn0WjyfJHvRa+3aDlReIaLVRMvOyJk=

 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=

 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=

 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

@@ -11,3 +11,21 @@ linters:

     - typecheck

     - unused

     - gofmt

+    - depguard

+linters-settings:

+  goimports:

+    # A comma-separated list of prefixes, which, if set, checks import paths

+    # with the given prefixes are grouped after 3rd-party packages.

+    # Default: ""

+    local-prefixes: github.com/cilium/ebpf

+  depguard:

+    rules:

+      no-x-sys-unix:

+        files:

+          # Filenames are matched against absolute paths, include **/ at the start.

+          - '!**/internal/unix/*.go'

+          - '!**/examples/**/*.go'

+          - '!**/docs/**/*.go'

+        deny:

+          - pkg: golang.org/x/sys/unix

+            desc: use internal/unix instead

@@ -9,3 +9,5 @@ ringbuf/ @florianl

 btf/ @dylandreimerink

 cmd/bpf2go/ @mejedi

+

+docs/ @ti-mo

@@ -39,16 +39,18 @@ TARGETS := \

 	testdata/subprog_reloc \

 	testdata/fwd_decl \

 	testdata/kconfig \

-	testdata/kconfig_config \

+	testdata/ksym \

 	testdata/kfunc \

 	testdata/invalid-kfunc \

 	testdata/kfunc-kmod \

 	testdata/constants \

 	testdata/errors \

+	testdata/variables \

 	btf/testdata/relocs \

 	btf/testdata/relocs_read \

 	btf/testdata/relocs_read_tgt \

 	btf/testdata/relocs_enum \

+	btf/testdata/tags \

 	cmd/bpf2go/testdata/minimal

 .PHONY: all clean container-all container-shell generate

@@ -57,7 +59,7 @@ TARGETS := \

 # Build all ELF binaries using a containerized LLVM toolchain.

 container-all:

-	+${CONTAINER_ENGINE} run --rm -t ${CONTAINER_RUN_ARGS} \

+	+${CONTAINER_ENGINE} run --rm -ti ${CONTAINER_RUN_ARGS} \

 		-v "${REPODIR}":/ebpf -w /ebpf --env MAKEFLAGS \

 		--env HOME="/tmp" \

 		--env BPF2GO_CC="$(CLANG)" \

@@ -53,6 +53,7 @@ This library includes the following packages:

 * [rlimit](https://pkg.go.dev/github.com/cilium/ebpf/rlimit) provides a convenient API to lift

   the `RLIMIT_MEMLOCK` constraint on kernels before 5.11.

 * [btf](https://pkg.go.dev/github.com/cilium/ebpf/btf) allows reading the BPF Type Format.

+* [pin](https://pkg.go.dev/github.com/cilium/ebpf/pin) provides APIs for working with pinned objects on bpffs.

 ## Requirements

@@ -5,10 +5,6 @@ package asm

 // BuiltinFunc is a built-in eBPF function.

 type BuiltinFunc int32

-func (_ BuiltinFunc) Max() BuiltinFunc {

-	return maxBuiltinFunc - 1

-}

-

 // eBPF built-in functions

 //

 // You can regenerate this list using the following gawk script:

@@ -237,8 +233,6 @@ const (

 	FnUserRingbufDrain

 	FnCgrpStorageGet

 	FnCgrpStorageDelete

-

-	maxBuiltinFunc

 )

 // Call emits a function call.

@@ -220,12 +220,11 @@ func _() {

 	_ = x[FnUserRingbufDrain-209]

 	_ = x[FnCgrpStorageGet-210]

 	_ = x[FnCgrpStorageDelete-211]

-	_ = x[maxBuiltinFunc-212]

 }

-const _BuiltinFunc_name = "FnUnspecFnMapLookupElemFnMapUpdateElemFnMapDeleteElemFnProbeReadFnKtimeGetNsFnTracePrintkFnGetPrandomU32FnGetSmpProcessorIdFnSkbStoreBytesFnL3CsumReplaceFnL4CsumReplaceFnTailCallFnCloneRedirectFnGetCurrentPidTgidFnGetCurrentUidGidFnGetCurrentCommFnGetCgroupClassidFnSkbVlanPushFnSkbVlanPopFnSkbGetTunnelKeyFnSkbSetTunnelKeyFnPerfEventReadFnRedirectFnGetRouteRealmFnPerfEventOutputFnSkbLoadBytesFnGetStackidFnCsumDiffFnSkbGetTunnelOptFnSkbSetTunnelOptFnSkbChangeProtoFnSkbChangeTypeFnSkbUnderCgroupFnGetHashRecalcFnGetCurrentTaskFnProbeWriteUserFnCurrentTaskUnderCgroupFnSkbChangeTailFnSkbPullDataFnCsumUpdateFnSetHashInvalidFnGetNumaNodeIdFnSkbChangeHeadFnXdpAdjustHeadFnProbeReadStrFnGetSocketCookieFnGetSocketUidFnSetHashFnSetsockoptFnSkbAdjustRoomFnRedirectMapFnSkRedirectMapFnSockMapUpdateFnXdpAdjustMetaFnPerfEventReadValueFnPerfProgReadValueFnGetsockoptFnOverrideReturnFnSockOpsCbFlagsSetFnMsgRedirectMapFnMsgApplyBytesFnMsgCorkBytesFnMsgPullDataFnBindFnXdpAdjustTailFnSkbGetXfrmStateFnGetStackFnSkbLoadBytesRelativeFnFibLookupFnSockHashUpdateFnMsgRedirectHashFnSkRedirectHashFnLwtPushEncapFnLwtSeg6StoreBytesFnLwtSeg6AdjustSrhFnLwtSeg6ActionFnRcRepeatFnRcKeydownFnSkbCgroupIdFnGetCurrentCgroupIdFnGetLocalStorageFnSkSelectReuseportFnSkbAncestorCgroupIdFnSkLookupTcpFnSkLookupUdpFnSkReleaseFnMapPushElemFnMapPopElemFnMapPeekElemFnMsgPushDataFnMsgPopDataFnRcPointerRelFnSpinLockFnSpinUnlockFnSkFullsockFnTcpSockFnSkbEcnSetCeFnGetListenerSockFnSkcLookupTcpFnTcpCheckSyncookieFnSysctlGetNameFnSysctlGetCurrentValueFnSysctlGetNewValueFnSysctlSetNewValueFnStrtolFnStrtoulFnSkStorageGetFnSkStorageDeleteFnSendSignalFnTcpGenSyncookieFnSkbOutputFnProbeReadUserFnProbeReadKernelFnProbeReadUserStrFnProbeReadKernelStrFnTcpSendAckFnSendSignalThreadFnJiffies64FnReadBranchRecordsFnGetNsCurrentPidTgidFnXdpOutputFnGetNetnsCookieFnGetCurrentAncestorCgroupIdFnSkAssignFnKtimeGetBootNsFnSeqPrintfFnSeqWriteFnSkCgroupIdFnSkAncestorCgroupIdFnRingbufOutputFnRingbufReserveFnRingbufSubmitFnRingbufDiscardFnRingbufQueryFnCsumLevelFnSkcToTcp6SockFnSkcToTcpSockFnSkcToTcpTimewaitSockFnSkcToTcpRequestSockFnSkcToUdp6SockFnGetTaskStackFnLoadHdrOptFnStoreHdrOptFnReserveHdrOptFnInodeStorageGetFnInodeStorageDeleteFnDPathFnCopyFromUserFnSnprintfBtfFnSeqPrintfBtfFnSkbCgroupClassidFnRedirectNeighFnPerCpuPtrFnThisCpuPtrFnRedirectPeerFnTaskStorageGetFnTaskStorageDeleteFnGetCurrentTaskBtfFnBprmOptsSetFnKtimeGetCoarseNsFnImaInodeHashFnSockFromFileFnCheckMtuFnForEachMapElemFnSnprintfFnSysBpfFnBtfFindByNameKindFnSysCloseFnTimerInitFnTimerSetCallbackFnTimerStartFnTimerCancelFnGetFuncIpFnGetAttachCookieFnTaskPtRegsFnGetBranchSnapshotFnTraceVprintkFnSkcToUnixSockFnKallsymsLookupNameFnFindVmaFnLoopFnStrncmpFnGetFuncArgFnGetFuncRetFnGetFuncArgCntFnGetRetvalFnSetRetvalFnXdpGetBuffLenFnXdpLoadBytesFnXdpStoreBytesFnCopyFromUserTaskFnSkbSetTstampFnImaFileHashFnKptrXchgFnMapLookupPercpuElemFnSkcToMptcpSockFnDynptrFromMemFnRingbufReserveDynptrFnRingbufSubmitDynptrFnRingbufDiscardDynptrFnDynptrReadFnDynptrWriteFnDynptrDataFnTcpRawGenSyncookieIpv4FnTcpRawGenSyncookieIpv6FnTcpRawCheckSyncookieIpv4FnTcpRawCheckSyncookieIpv6FnKtimeGetTaiNsFnUserRingbufDrainFnCgrpStorageGetFnCgrpStorageDeletemaxBuiltinFunc"

+const _BuiltinFunc_name = "FnUnspecFnMapLookupElemFnMapUpdateElemFnMapDeleteElemFnProbeReadFnKtimeGetNsFnTracePrintkFnGetPrandomU32FnGetSmpProcessorIdFnSkbStoreBytesFnL3CsumReplaceFnL4CsumReplaceFnTailCallFnCloneRedirectFnGetCurrentPidTgidFnGetCurrentUidGidFnGetCurrentCommFnGetCgroupClassidFnSkbVlanPushFnSkbVlanPopFnSkbGetTunnelKeyFnSkbSetTunnelKeyFnPerfEventReadFnRedirectFnGetRouteRealmFnPerfEventOutputFnSkbLoadBytesFnGetStackidFnCsumDiffFnSkbGetTunnelOptFnSkbSetTunnelOptFnSkbChangeProtoFnSkbChangeTypeFnSkbUnderCgroupFnGetHashRecalcFnGetCurrentTaskFnProbeWriteUserFnCurrentTaskUnderCgroupFnSkbChangeTailFnSkbPullDataFnCsumUpdateFnSetHashInvalidFnGetNumaNodeIdFnSkbChangeHeadFnXdpAdjustHeadFnProbeReadStrFnGetSocketCookieFnGetSocketUidFnSetHashFnSetsockoptFnSkbAdjustRoomFnRedirectMapFnSkRedirectMapFnSockMapUpdateFnXdpAdjustMetaFnPerfEventReadValueFnPerfProgReadValueFnGetsockoptFnOverrideReturnFnSockOpsCbFlagsSetFnMsgRedirectMapFnMsgApplyBytesFnMsgCorkBytesFnMsgPullDataFnBindFnXdpAdjustTailFnSkbGetXfrmStateFnGetStackFnSkbLoadBytesRelativeFnFibLookupFnSockHashUpdateFnMsgRedirectHashFnSkRedirectHashFnLwtPushEncapFnLwtSeg6StoreBytesFnLwtSeg6AdjustSrhFnLwtSeg6ActionFnRcRepeatFnRcKeydownFnSkbCgroupIdFnGetCurrentCgroupIdFnGetLocalStorageFnSkSelectReuseportFnSkbAncestorCgroupIdFnSkLookupTcpFnSkLookupUdpFnSkReleaseFnMapPushElemFnMapPopElemFnMapPeekElemFnMsgPushDataFnMsgPopDataFnRcPointerRelFnSpinLockFnSpinUnlockFnSkFullsockFnTcpSockFnSkbEcnSetCeFnGetListenerSockFnSkcLookupTcpFnTcpCheckSyncookieFnSysctlGetNameFnSysctlGetCurrentValueFnSysctlGetNewValueFnSysctlSetNewValueFnStrtolFnStrtoulFnSkStorageGetFnSkStorageDeleteFnSendSignalFnTcpGenSyncookieFnSkbOutputFnProbeReadUserFnProbeReadKernelFnProbeReadUserStrFnProbeReadKernelStrFnTcpSendAckFnSendSignalThreadFnJiffies64FnReadBranchRecordsFnGetNsCurrentPidTgidFnXdpOutputFnGetNetnsCookieFnGetCurrentAncestorCgroupIdFnSkAssignFnKtimeGetBootNsFnSeqPrintfFnSeqWriteFnSkCgroupIdFnSkAncestorCgroupIdFnRingbufOutputFnRingbufReserveFnRingbufSubmitFnRingbufDiscardFnRingbufQueryFnCsumLevelFnSkcToTcp6SockFnSkcToTcpSockFnSkcToTcpTimewaitSockFnSkcToTcpRequestSockFnSkcToUdp6SockFnGetTaskStackFnLoadHdrOptFnStoreHdrOptFnReserveHdrOptFnInodeStorageGetFnInodeStorageDeleteFnDPathFnCopyFromUserFnSnprintfBtfFnSeqPrintfBtfFnSkbCgroupClassidFnRedirectNeighFnPerCpuPtrFnThisCpuPtrFnRedirectPeerFnTaskStorageGetFnTaskStorageDeleteFnGetCurrentTaskBtfFnBprmOptsSetFnKtimeGetCoarseNsFnImaInodeHashFnSockFromFileFnCheckMtuFnForEachMapElemFnSnprintfFnSysBpfFnBtfFindByNameKindFnSysCloseFnTimerInitFnTimerSetCallbackFnTimerStartFnTimerCancelFnGetFuncIpFnGetAttachCookieFnTaskPtRegsFnGetBranchSnapshotFnTraceVprintkFnSkcToUnixSockFnKallsymsLookupNameFnFindVmaFnLoopFnStrncmpFnGetFuncArgFnGetFuncRetFnGetFuncArgCntFnGetRetvalFnSetRetvalFnXdpGetBuffLenFnXdpLoadBytesFnXdpStoreBytesFnCopyFromUserTaskFnSkbSetTstampFnImaFileHashFnKptrXchgFnMapLookupPercpuElemFnSkcToMptcpSockFnDynptrFromMemFnRingbufReserveDynptrFnRingbufSubmitDynptrFnRingbufDiscardDynptrFnDynptrReadFnDynptrWriteFnDynptrDataFnTcpRawGenSyncookieIpv4FnTcpRawGenSyncookieIpv6FnTcpRawCheckSyncookieIpv4FnTcpRawCheckSyncookieIpv6FnKtimeGetTaiNsFnUserRingbufDrainFnCgrpStorageGetFnCgrpStorageDelete"

-var _BuiltinFunc_index = [...]uint16{0, 8, 23, 38, 53, 64, 76, 89, 104, 123, 138, 153, 168, 178, 193, 212, 230, 246, 264, 277, 289, 306, 323, 338, 348, 363, 380, 394, 406, 416, 433, 450, 466, 481, 497, 512, 528, 544, 568, 583, 596, 608, 624, 639, 654, 669, 683, 700, 714, 723, 735, 750, 763, 778, 793, 808, 828, 847, 859, 875, 894, 910, 925, 939, 952, 958, 973, 990, 1000, 1022, 1033, 1049, 1066, 1082, 1096, 1115, 1133, 1148, 1158, 1169, 1182, 1202, 1219, 1238, 1259, 1272, 1285, 1296, 1309, 1321, 1334, 1347, 1359, 1373, 1383, 1395, 1407, 1416, 1429, 1446, 1460, 1479, 1494, 1517, 1536, 1555, 1563, 1572, 1586, 1603, 1615, 1632, 1643, 1658, 1675, 1693, 1713, 1725, 1743, 1754, 1773, 1794, 1805, 1821, 1849, 1859, 1875, 1886, 1896, 1908, 1928, 1943, 1959, 1974, 1990, 2004, 2015, 2030, 2044, 2066, 2087, 2102, 2116, 2128, 2141, 2156, 2173, 2193, 2200, 2214, 2227, 2241, 2259, 2274, 2285, 2297, 2311, 2327, 2346, 2365, 2378, 2396, 2410, 2424, 2434, 2450, 2460, 2468, 2487, 2497, 2508, 2526, 2538, 2551, 2562, 2579, 2591, 2610, 2624, 2639, 2659, 2668, 2674, 2683, 2695, 2707, 2722, 2733, 2744, 2759, 2773, 2788, 2806, 2820, 2833, 2843, 2864, 2880, 2895, 2917, 2938, 2960, 2972, 2985, 2997, 3021, 3045, 3071, 3097, 3112, 3130, 3146, 3165, 3179}

+var _BuiltinFunc_index = [...]uint16{0, 8, 23, 38, 53, 64, 76, 89, 104, 123, 138, 153, 168, 178, 193, 212, 230, 246, 264, 277, 289, 306, 323, 338, 348, 363, 380, 394, 406, 416, 433, 450, 466, 481, 497, 512, 528, 544, 568, 583, 596, 608, 624, 639, 654, 669, 683, 700, 714, 723, 735, 750, 763, 778, 793, 808, 828, 847, 859, 875, 894, 910, 925, 939, 952, 958, 973, 990, 1000, 1022, 1033, 1049, 1066, 1082, 1096, 1115, 1133, 1148, 1158, 1169, 1182, 1202, 1219, 1238, 1259, 1272, 1285, 1296, 1309, 1321, 1334, 1347, 1359, 1373, 1383, 1395, 1407, 1416, 1429, 1446, 1460, 1479, 1494, 1517, 1536, 1555, 1563, 1572, 1586, 1603, 1615, 1632, 1643, 1658, 1675, 1693, 1713, 1725, 1743, 1754, 1773, 1794, 1805, 1821, 1849, 1859, 1875, 1886, 1896, 1908, 1928, 1943, 1959, 1974, 1990, 2004, 2015, 2030, 2044, 2066, 2087, 2102, 2116, 2128, 2141, 2156, 2173, 2193, 2200, 2214, 2227, 2241, 2259, 2274, 2285, 2297, 2311, 2327, 2346, 2365, 2378, 2396, 2410, 2424, 2434, 2450, 2460, 2468, 2487, 2497, 2508, 2526, 2538, 2551, 2562, 2579, 2591, 2610, 2624, 2639, 2659, 2668, 2674, 2683, 2695, 2707, 2722, 2733, 2744, 2759, 2773, 2788, 2806, 2820, 2833, 2843, 2864, 2880, 2895, 2917, 2938, 2960, 2972, 2985, 2997, 3021, 3045, 3071, 3097, 3112, 3130, 3146, 3165}

 func (i BuiltinFunc) String() string {

 	if i < 0 || i >= BuiltinFunc(len(_BuiltinFunc_index)-1) {

@@ -12,7 +12,6 @@ import (

 	"strings"

 	"github.com/cilium/ebpf/internal/sys"

-	"github.com/cilium/ebpf/internal/unix"

 )

 // InstructionSize is the size of a BPF instruction in bytes

@@ -804,7 +803,7 @@ func (insns Instructions) Tag(bo binary.ByteOrder) (string, error) {

 			return "", fmt.Errorf("instruction %d: %w", i, err)

 		}

 	}

-	return hex.EncodeToString(h.Sum(nil)[:unix.BPF_TAG_SIZE]), nil

+	return hex.EncodeToString(h.Sum(nil)[:sys.BPF_TAG_SIZE]), nil

 }

 // encodeFunctionReferences populates the Offset (or Constant, depending on

@@ -52,6 +52,7 @@ func _() {

 	_ = x[AttachSkReuseportSelectOrMigrate-40]

 	_ = x[AttachPerfEvent-41]

 	_ = x[AttachTraceKprobeMulti-42]

+	_ = x[AttachTraceKprobeSession-56]

 	_ = x[AttachLSMCgroup-43]

 	_ = x[AttachStructOps-44]

 	_ = x[AttachNetfilter-45]

@@ -67,9 +68,9 @@ func _() {

 	_ = x[AttachNetkitPeer-55]

 }

-const _AttachType_name = "NoneCGroupInetEgressCGroupInetSockCreateCGroupSockOpsSkSKBStreamParserSkSKBStreamVerdictCGroupDeviceSkMsgVerdictCGroupInet4BindCGroupInet6BindCGroupInet4ConnectCGroupInet6ConnectCGroupInet4PostBindCGroupInet6PostBindCGroupUDP4SendmsgCGroupUDP6SendmsgLircMode2FlowDissectorCGroupSysctlCGroupUDP4RecvmsgCGroupUDP6RecvmsgCGroupGetsockoptCGroupSetsockoptTraceRawTpTraceFEntryTraceFExitModifyReturnLSMMacTraceIterCgroupInet4GetPeernameCgroupInet6GetPeernameCgroupInet4GetSocknameCgroupInet6GetSocknameXDPDevMapCgroupInetSockReleaseXDPCPUMapSkLookupXDPSkSKBVerdictSkReuseportSelectSkReuseportSelectOrMigratePerfEventTraceKprobeMultiLSMCgroupStructOpsNetfilterTCXIngressTCXEgressTraceUprobeMultiCgroupUnixConnectCgroupUnixSendmsgCgroupUnixRecvmsgCgroupUnixGetpeernameCgroupUnixGetsocknameNetkitPrimaryNetkitPeer"

+const _AttachType_name = "NoneCGroupInetEgressCGroupInetSockCreateCGroupSockOpsSkSKBStreamParserSkSKBStreamVerdictCGroupDeviceSkMsgVerdictCGroupInet4BindCGroupInet6BindCGroupInet4ConnectCGroupInet6ConnectCGroupInet4PostBindCGroupInet6PostBindCGroupUDP4SendmsgCGroupUDP6SendmsgLircMode2FlowDissectorCGroupSysctlCGroupUDP4RecvmsgCGroupUDP6RecvmsgCGroupGetsockoptCGroupSetsockoptTraceRawTpTraceFEntryTraceFExitModifyReturnLSMMacTraceIterCgroupInet4GetPeernameCgroupInet6GetPeernameCgroupInet4GetSocknameCgroupInet6GetSocknameXDPDevMapCgroupInetSockReleaseXDPCPUMapSkLookupXDPSkSKBVerdictSkReuseportSelectSkReuseportSelectOrMigratePerfEventTraceKprobeMultiLSMCgroupStructOpsNetfilterTCXIngressTCXEgressTraceUprobeMultiCgroupUnixConnectCgroupUnixSendmsgCgroupUnixRecvmsgCgroupUnixGetpeernameCgroupUnixGetsocknameNetkitPrimaryNetkitPeerTraceKprobeSession"

-var _AttachType_index = [...]uint16{0, 4, 20, 40, 53, 70, 88, 100, 112, 127, 142, 160, 178, 197, 216, 233, 250, 259, 272, 284, 301, 318, 334, 350, 360, 371, 381, 393, 399, 408, 430, 452, 474, 496, 505, 526, 535, 543, 546, 558, 575, 601, 610, 626, 635, 644, 653, 663, 672, 688, 705, 722, 739, 760, 781, 794, 804}

+var _AttachType_index = [...]uint16{0, 4, 20, 40, 53, 70, 88, 100, 112, 127, 142, 160, 178, 197, 216, 233, 250, 259, 272, 284, 301, 318, 334, 350, 360, 371, 381, 393, 399, 408, 430, 452, 474, 496, 505, 526, 535, 543, 546, 558, 575, 601, 610, 626, 635, 644, 653, 663, 672, 688, 705, 722, 739, 760, 781, 794, 804, 822}

 func (i AttachType) String() string {

 	if i >= AttachType(len(_AttachType_index)-1) {

@@ -99,6 +99,10 @@ func (mt *mutableTypes) copy() *mutableTypes {

 		return nil

 	}

+	// Prevent concurrent modification of mt.copiedTypeIDs.

+	mt.mu.RLock()

+	defer mt.mu.RUnlock()

+

 	mtCopy := &mutableTypes{

 		mt.imm,

 		sync.RWMutex{},

@@ -106,10 +110,6 @@ func (mt *mutableTypes) copy() *mutableTypes {

 		make(map[Type]TypeID, len(mt.copiedTypeIDs)),

 	}

-	// Prevent concurrent modification of mt.copiedTypeIDs.

-	mt.mu.RLock()

-	defer mt.mu.RUnlock()

-

 	copiesOfCopies := make(map[Type]Type, len(mt.copies))

 	for orig, copy := range mt.copies {

 		// NB: We make a copy of copy, not orig, so that changes to mutable types

@@ -443,13 +443,19 @@ func fixupDatasec(types []Type, sectionSizes map[string]uint32, offsets map[symb

 		// Some Datasecs are virtual and don't have corresponding ELF sections.

 		switch name {

 		case ".ksyms":

-			// .ksyms describes forward declarations of kfunc signatures.

+			// .ksyms describes forward declarations of kfunc signatures, as well as

+			// references to kernel symbols.

 			// Nothing to fix up, all sizes and offsets are 0.

 			for _, vsi := range ds.Vars {

-				_, ok := vsi.Type.(*Func)

-				if !ok {

-					// Only Funcs are supported in the .ksyms Datasec.

-					return fmt.Errorf("data section %s: expected *btf.Func, not %T: %w", name, vsi.Type, ErrNotSupported)

+				switch t := vsi.Type.(type) {

+				case *Func:

+					continue

+				case *Var:

+					if _, ok := t.Type.(*Void); !ok {

+						return fmt.Errorf("data section %s: expected %s to be *Void, not %T: %w", name, vsi.Type.TypeName(), vsi.Type, ErrNotSupported)

+					}

+				default:

+					return fmt.Errorf("data section %s: expected to be either *btf.Func or *btf.Var, not %T: %w", name, vsi.Type, ErrNotSupported)

 				}

 			}

@@ -695,5 +701,13 @@ func (iter *TypesIterator) Next() bool {

 	iter.Type, ok = iter.spec.typeByID(iter.id)

 	iter.id++

 	iter.done = !ok

+	if !iter.done {

+		// Skip declTags, during unmarshaling declTags become `Tags` fields of other types.

+		// We keep them in the spec to avoid holes in the ID space, but for the purposes of

+		// iteration, they are not useful to the user.

+		if _, ok := iter.Type.(*declTag); ok {

+			return iter.Next()

+		}

+	}

 	return !iter.done

 }

@@ -39,6 +39,7 @@ const (

 	kindFloat // Float

 	// Added 5.16

 	kindDeclTag // DeclTag

+	// Added 5.17

 	kindTypeTag // TypeTag

 	// Added 6.0

 	kindEnum64 // Enum64

@@ -16,8 +16,8 @@ import (

 // ExtInfos contains ELF section metadata.

 type ExtInfos struct {

 	// The slices are sorted by offset in ascending order.

-	funcInfos       map[string]FuncInfos

-	lineInfos       map[string]LineInfos

+	funcInfos       map[string]FuncOffsets

+	lineInfos       map[string]LineOffsets

 	relocationInfos map[string]CORERelocationInfos

 }

@@ -58,9 +58,9 @@ func loadExtInfos(r io.ReaderAt, bo binary.ByteOrder, spec *Spec) (*ExtInfos, er

 		return nil, fmt.Errorf("parsing BTF function info: %w", err)

 	}

-	funcInfos := make(map[string]FuncInfos, len(btfFuncInfos))

+	funcInfos := make(map[string]FuncOffsets, len(btfFuncInfos))

 	for section, bfis := range btfFuncInfos {

-		funcInfos[section], err = newFuncInfos(bfis, spec)

+		funcInfos[section], err = newFuncOffsets(bfis, spec)

 		if err != nil {

 			return nil, fmt.Errorf("section %s: func infos: %w", section, err)

 		}

@@ -72,7 +72,7 @@ func loadExtInfos(r io.ReaderAt, bo binary.ByteOrder, spec *Spec) (*ExtInfos, er

 		return nil, fmt.Errorf("parsing BTF line info: %w", err)

 	}

-	lineInfos := make(map[string]LineInfos, len(btfLineInfos))

+	lineInfos := make(map[string]LineOffsets, len(btfLineInfos))

 	for section, blis := range btfLineInfos {

 		lineInfos[section], err = newLineInfos(blis, spec.strings)

 		if err != nil {

@@ -102,8 +102,10 @@ func loadExtInfos(r io.ReaderAt, bo binary.ByteOrder, spec *Spec) (*ExtInfos, er

 	return &ExtInfos{funcInfos, lineInfos, coreRelos}, nil

 }

-type funcInfoMeta struct{}

-type coreRelocationMeta struct{}

+type (

+	funcInfoMeta       struct{}

+	coreRelocationMeta struct{}

+)

 // Assign per-section metadata from BTF to a section's instructions.

 func (ei *ExtInfos) Assign(insns asm.Instructions, section string) {

@@ -117,20 +119,20 @@ func (ei *ExtInfos) Assign(insns asm.Instructions, section string) {

 // Assign per-instruction metadata to the instructions in insns.

 func AssignMetadataToInstructions(

 	insns asm.Instructions,

-	funcInfos FuncInfos,

-	lineInfos LineInfos,

+	funcInfos FuncOffsets,

+	lineInfos LineOffsets,

 	reloInfos CORERelocationInfos,

 ) {

 	iter := insns.Iterate()

 	for iter.Next() {

-		if len(funcInfos.infos) > 0 && funcInfos.infos[0].offset == iter.Offset {

-			*iter.Ins = WithFuncMetadata(*iter.Ins, funcInfos.infos[0].fn)

-			funcInfos.infos = funcInfos.infos[1:]

+		if len(funcInfos) > 0 && funcInfos[0].Offset == iter.Offset {

+			*iter.Ins = WithFuncMetadata(*iter.Ins, funcInfos[0].Func)

+			funcInfos = funcInfos[1:]

 		}

-		if len(lineInfos.infos) > 0 && lineInfos.infos[0].offset == iter.Offset {

-			*iter.Ins = iter.Ins.WithSource(lineInfos.infos[0].line)

-			lineInfos.infos = lineInfos.infos[1:]

+		if len(lineInfos) > 0 && lineInfos[0].Offset == iter.Offset {

+			*iter.Ins = iter.Ins.WithSource(lineInfos[0].Line)

+			lineInfos = lineInfos[1:]

 		}

 		if len(reloInfos.infos) > 0 && reloInfos.infos[0].offset == iter.Offset {

@@ -159,9 +161,9 @@ marshal:

 	var fiBuf, liBuf bytes.Buffer

 	for {

 		if fn := FuncMetadata(iter.Ins); fn != nil {

-			fi := &funcInfo{

-				fn:     fn,

-				offset: iter.Offset,

+			fi := &FuncOffset{

+				Func:   fn,

+				Offset: iter.Offset,

 			}

 			if err := fi.marshal(&fiBuf, b); err != nil {

 				return nil, nil, fmt.Errorf("write func info: %w", err)

@@ -178,9 +180,9 @@ marshal:

 				}

 			}

-			li := &lineInfo{

-				line:   line,

-				offset: iter.Offset,

+			li := &LineOffset{

+				Offset: iter.Offset,

+				Line:   line,

 			}

 			if err := li.marshal(&liBuf, b); err != nil {

 				return nil, nil, fmt.Errorf("write line info: %w", err)

@@ -333,17 +335,17 @@ func parseExtInfoRecordSize(r io.Reader, bo binary.ByteOrder) (uint32, error) {

 	return recordSize, nil

 }

-// FuncInfos contains a sorted list of func infos.

-type FuncInfos struct {

-	infos []funcInfo

-}

+// FuncOffsets is a sorted slice of FuncOffset.

+type FuncOffsets []FuncOffset

 // The size of a FuncInfo in BTF wire format.

 var FuncInfoSize = uint32(binary.Size(bpfFuncInfo{}))

-type funcInfo struct {

-	fn     *Func

-	offset asm.RawInstructionOffset

+// FuncOffset represents a [btf.Func] and its raw instruction offset within a

+// BPF program.

+type FuncOffset struct {

+	Offset asm.RawInstructionOffset

+	Func   *Func

 }

 type bpfFuncInfo struct {

@@ -352,7 +354,7 @@ type bpfFuncInfo struct {

 	TypeID  TypeID

 }

-func newFuncInfo(fi bpfFuncInfo, spec *Spec) (*funcInfo, error) {

+func newFuncOffset(fi bpfFuncInfo, spec *Spec) (*FuncOffset, error) {

 	typ, err := spec.TypeByID(fi.TypeID)

 	if err != nil {

 		return nil, err

@@ -368,31 +370,32 @@ func newFuncInfo(fi bpfFuncInfo, spec *Spec) (*funcInfo, error) {

 		return nil, fmt.Errorf("func with type ID %d doesn't have a name", fi.TypeID)

 	}

-	return &funcInfo{

-		fn,

+	return &FuncOffset{

 		asm.RawInstructionOffset(fi.InsnOff),

+		fn,

 	}, nil

 }

-func newFuncInfos(bfis []bpfFuncInfo, spec *Spec) (FuncInfos, error) {

-	fis := FuncInfos{

-		infos: make([]funcInfo, 0, len(bfis)),

-	}

+func newFuncOffsets(bfis []bpfFuncInfo, spec *Spec) (FuncOffsets, error) {

+	fos := make(FuncOffsets, 0, len(bfis))

+

 	for _, bfi := range bfis {

-		fi, err := newFuncInfo(bfi, spec)

+		fi, err := newFuncOffset(bfi, spec)

 		if err != nil {

-			return FuncInfos{}, fmt.Errorf("offset %d: %w", bfi.InsnOff, err)

+			return FuncOffsets{}, fmt.Errorf("offset %d: %w", bfi.InsnOff, err)

 		}

-		fis.infos = append(fis.infos, *fi)

+		fos = append(fos, *fi)

 	}

-	sort.Slice(fis.infos, func(i, j int) bool {

-		return fis.infos[i].offset <= fis.infos[j].offset

+	sort.Slice(fos, func(i, j int) bool {

+		return fos[i].Offset <= fos[j].Offset

 	})

-	return fis, nil

+	return fos, nil

 }

-// LoadFuncInfos parses BTF func info in kernel wire format.

-func LoadFuncInfos(reader io.Reader, bo binary.ByteOrder, recordNum uint32, spec *Spec) (FuncInfos, error) {

+// LoadFuncInfos parses BTF func info from kernel wire format into a

+// [FuncOffsets], a sorted slice of [btf.Func]s of (sub)programs within a BPF

+// program with their corresponding raw instruction offsets.

+func LoadFuncInfos(reader io.Reader, bo binary.ByteOrder, recordNum uint32, spec *Spec) (FuncOffsets, error) {

 	fis, err := parseFuncInfoRecords(

 		reader,

 		bo,

@@ -401,20 +404,20 @@ func LoadFuncInfos(reader io.Reader, bo binary.ByteOrder, recordNum uint32, spec

 		false,

 	)

 	if err != nil {

-		return FuncInfos{}, fmt.Errorf("parsing BTF func info: %w", err)

+		return FuncOffsets{}, fmt.Errorf("parsing BTF func info: %w", err)

 	}

-	return newFuncInfos(fis, spec)

+	return newFuncOffsets(fis, spec)

 }

 // marshal into the BTF wire format.

-func (fi *funcInfo) marshal(w *bytes.Buffer, b *Builder) error {

-	id, err := b.Add(fi.fn)

+func (fi *FuncOffset) marshal(w *bytes.Buffer, b *Builder) error {

+	id, err := b.Add(fi.Func)

 	if err != nil {

 		return err

 	}

 	bfi := bpfFuncInfo{

-		InsnOff: uint32(fi.offset),

+		InsnOff: uint32(fi.Offset),

 		TypeID:  id,

 	}

 	buf := make([]byte, FuncInfoSize)

@@ -515,14 +518,13 @@ func (li *Line) String() string {

 	return li.line

 }

-// LineInfos contains a sorted list of line infos.

-type LineInfos struct {

-	infos []lineInfo

-}

+// LineOffsets contains a sorted list of line infos.

+type LineOffsets []LineOffset

-type lineInfo struct {

-	line   *Line

-	offset asm.RawInstructionOffset

+// LineOffset represents a line info and its raw instruction offset.

+type LineOffset struct {

+	Offset asm.RawInstructionOffset

+	Line   *Line

 }

 // Constants for the format of bpfLineInfo.LineCol.

@@ -541,7 +543,7 @@ type bpfLineInfo struct {

 }

 // LoadLineInfos parses BTF line info in kernel wire format.

-func LoadLineInfos(reader io.Reader, bo binary.ByteOrder, recordNum uint32, spec *Spec) (LineInfos, error) {

+func LoadLineInfos(reader io.Reader, bo binary.ByteOrder, recordNum uint32, spec *Spec) (LineOffsets, error) {

 	lis, err := parseLineInfoRecords(

 		reader,

 		bo,

@@ -550,57 +552,55 @@ func LoadLineInfos(reader io.Reader, bo binary.ByteOrder, recordNum uint32, spec

 		false,

 	)

 	if err != nil {

-		return LineInfos{}, fmt.Errorf("parsing BTF line info: %w", err)

+		return LineOffsets{}, fmt.Errorf("parsing BTF line info: %w", err)

 	}

 	return newLineInfos(lis, spec.strings)

 }

-func newLineInfo(li bpfLineInfo, strings *stringTable) (lineInfo, error) {

+func newLineInfo(li bpfLineInfo, strings *stringTable) (LineOffset, error) {

 	line, err := strings.Lookup(li.LineOff)

 	if err != nil {

-		return lineInfo{}, fmt.Errorf("lookup of line: %w", err)

+		return LineOffset{}, fmt.Errorf("lookup of line: %w", err)

 	}

 	fileName, err := strings.Lookup(li.FileNameOff)

 	if err != nil {

-		return lineInfo{}, fmt.Errorf("lookup of filename: %w", err)

+		return LineOffset{}, fmt.Errorf("lookup of filename: %w", err)

 	}

 	lineNumber := li.LineCol >> bpfLineShift

 	lineColumn := li.LineCol & bpfColumnMax

-	return lineInfo{

+	return LineOffset{

+		asm.RawInstructionOffset(li.InsnOff),

 		&Line{

 			fileName,

 			line,

 			lineNumber,

 			lineColumn,

 		},

-		asm.RawInstructionOffset(li.InsnOff),

 	}, nil

 }

-func newLineInfos(blis []bpfLineInfo, strings *stringTable) (LineInfos, error) {

-	lis := LineInfos{

-		infos: make([]lineInfo, 0, len(blis)),

-	}

+func newLineInfos(blis []bpfLineInfo, strings *stringTable) (LineOffsets, error) {

+	lis := make([]LineOffset, 0, len(blis))

 	for _, bli := range blis {

 		li, err := newLineInfo(bli, strings)

 		if err != nil {

-			return LineInfos{}, fmt.Errorf("offset %d: %w", bli.InsnOff, err)

+			return LineOffsets{}, fmt.Errorf("offset %d: %w", bli.InsnOff, err)

 		}

-		lis.infos = append(lis.infos, li)

+		lis = append(lis, li)

 	}

-	sort.Slice(lis.infos, func(i, j int) bool {

-		return lis.infos[i].offset <= lis.infos[j].offset

+	sort.Slice(lis, func(i, j int) bool {

+		return lis[i].Offset <= lis[j].Offset

 	})

 	return lis, nil

 }

 // marshal writes the binary representation of the LineInfo to w.

-func (li *lineInfo) marshal(w *bytes.Buffer, b *Builder) error {

-	line := li.line

+func (li *LineOffset) marshal(w *bytes.Buffer, b *Builder) error {

+	line := li.Line

 	if line.lineNumber > bpfLineMax {

 		return fmt.Errorf("line %d exceeds %d", line.lineNumber, bpfLineMax)

 	}

@@ -620,7 +620,7 @@ func (li *lineInfo) marshal(w *bytes.Buffer, b *Builder) error {

 	}

 	bli := bpfLineInfo{

-		uint32(li.offset),

+		uint32(li.Offset),

 		fileNameOff,

 		lineOff,

 		(line.lineNumber << bpfLineShift) | line.lineColumn,

@@ -666,20 +666,19 @@ func parseLineInfos(r io.Reader, bo binary.ByteOrder, strings *stringTable) (map

 // These records appear after a btf_ext_info_sec header in the line_info

 // sub-section of .BTF.ext.

 func parseLineInfoRecords(r io.Reader, bo binary.ByteOrder, recordSize uint32, recordNum uint32, offsetInBytes bool) ([]bpfLineInfo, error) {

-	var li bpfLineInfo

-

-	if exp, got := uint32(binary.Size(li)), recordSize; exp != got {

+	if exp, got := uint32(binary.Size(bpfLineInfo{})), recordSize; exp != got {

 		// BTF blob's record size is longer than we know how to parse.

 		return nil, fmt.Errorf("expected LineInfo record size %d, but BTF blob contains %d", exp, got)

 	}

-	out := make([]bpfLineInfo, 0, recordNum)

-	for i := uint32(0); i < recordNum; i++ {

-		if err := binary.Read(r, bo, &li); err != nil {

-			return nil, fmt.Errorf("can't read line info: %v", err)

-		}

+	out := make([]bpfLineInfo, recordNum)

+	if err := binary.Read(r, bo, out); err != nil {

+		return nil, fmt.Errorf("can't read line info: %v", err)

+	}

-		if offsetInBytes {

+	if offsetInBytes {

+		for i := range out {

+			li := &out[i]

 			if li.InsnOff%asm.InstructionSize != 0 {

 				return nil, fmt.Errorf("offset %v is not aligned with instruction size", li.InsnOff)

 			}

@@ -688,8 +687,6 @@ func parseLineInfoRecords(r io.Reader, bo binary.ByteOrder, recordSize uint32, r

 			// Convert as early as possible.

 			li.InsnOff /= asm.InstructionSize

 		}

-

-		out = append(out, li)

 	}

 	return out, nil

@@ -799,7 +796,7 @@ func parseCORERelos(r io.Reader, bo binary.ByteOrder, strings *stringTable) (map

 			return nil, err

 		}

-		records, err := parseCOREReloRecords(r, bo, recordSize, infoHeader.NumInfo)

+		records, err := parseCOREReloRecords(r, bo, infoHeader.NumInfo)

 		if err != nil {

 			return nil, fmt.Errorf("section %v: %w", secName, err)

 		}

@@ -811,7 +808,7 @@ func parseCORERelos(r io.Reader, bo binary.ByteOrder, strings *stringTable) (map

 // parseCOREReloRecords parses a stream of CO-RE relocation entries into a

 // coreRelos. These records appear after a btf_ext_info_sec header in the

 // core_relos sub-section of .BTF.ext.

-func parseCOREReloRecords(r io.Reader, bo binary.ByteOrder, recordSize uint32, recordNum uint32) ([]bpfCORERelo, error) {

+func parseCOREReloRecords(r io.Reader, bo binary.ByteOrder, recordNum uint32) ([]bpfCORERelo, error) {

 	var out []bpfCORERelo

 	var relo bpfCORERelo

@@ -11,19 +11,19 @@ import (

 // haveBTF attempts to load a BTF blob containing an Int. It should pass on any

 // kernel that supports BPF_BTF_LOAD.

-var haveBTF = internal.NewFeatureTest("BTF", "4.18", func() error {

+var haveBTF = internal.NewFeatureTest("BTF", func() error {

 	// 0-length anonymous integer

 	err := probeBTF(&Int{})

 	if errors.Is(err, unix.EINVAL) || errors.Is(err, unix.EPERM) {

 		return internal.ErrNotSupported

 	}

 	return err

-})

+}, "4.18")

 // haveMapBTF attempts to load a minimal BTF blob containing a Var. It is

 // used as a proxy for .bss, .data and .rodata map support, which generally

 // come with a Var and Datasec. These were introduced in Linux 5.2.

-var haveMapBTF = internal.NewFeatureTest("Map BTF (Var/Datasec)", "5.2", func() error {

+var haveMapBTF = internal.NewFeatureTest("Map BTF (Var/Datasec)", func() error {

 	if err := haveBTF(); err != nil {

 		return err

 	}

@@ -40,12 +40,12 @@ var haveMapBTF = internal.NewFeatureTest("Map BTF (Var/Datasec)", "5.2", func()

 		return internal.ErrNotSupported

 	}

 	return err

-})

+}, "5.2")

 // haveProgBTF attempts to load a BTF blob containing a Func and FuncProto. It

 // is used as a proxy for ext_info (func_info) support, which depends on

 // Func(Proto) by definition.

-var haveProgBTF = internal.NewFeatureTest("Program BTF (func/line_info)", "5.0", func() error {

+var haveProgBTF = internal.NewFeatureTest("Program BTF (func/line_info)", func() error {

 	if err := haveBTF(); err != nil {

 		return err

 	}

@@ -60,9 +60,9 @@ var haveProgBTF = internal.NewFeatureTest("Program BTF (func/line_info)", "5.0",

 		return internal.ErrNotSupported

 	}

 	return err

-})

+}, "5.0")

-var haveFuncLinkage = internal.NewFeatureTest("BTF func linkage", "5.6", func() error {

+var haveFuncLinkage = internal.NewFeatureTest("BTF func linkage", func() error {

 	if err := haveProgBTF(); err != nil {

 		return err

 	}

@@ -78,9 +78,44 @@ var haveFuncLinkage = internal.NewFeatureTest("BTF func linkage", "5.6", func()

 		return internal.ErrNotSupported

 	}

 	return err

-})

+}, "5.6")

-var haveEnum64 = internal.NewFeatureTest("ENUM64", "6.0", func() error {

+var haveDeclTags = internal.NewFeatureTest("BTF decl tags", func() error {

+	if err := haveBTF(); err != nil {

+		return err

+	}

+

+	t := &Typedef{

+		Name: "a",

+		Type: &Int{},

+		Tags: []string{"a"},

+	}

+

+	err := probeBTF(t)

+	if errors.Is(err, unix.EINVAL) {

+		return internal.ErrNotSupported

+	}

+	return err

+}, "5.16")

+

+var haveTypeTags = internal.NewFeatureTest("BTF type tags", func() error {

+	if err := haveBTF(); err != nil {

+		return err

+	}

+

+	t := &TypeTag{

+		Type:  &Int{},

+		Value: "a",

+	}

+

+	err := probeBTF(t)

+	if errors.Is(err, unix.EINVAL) {

+		return internal.ErrNotSupported

+	}

+	return err

+}, "5.17")

+

+var haveEnum64 = internal.NewFeatureTest("ENUM64", func() error {

 	if err := haveBTF(); err != nil {

 		return err

 	}

@@ -97,7 +132,7 @@ var haveEnum64 = internal.NewFeatureTest("ENUM64", "6.0", func() error {

 		return internal.ErrNotSupported

 	}

 	return err

-})

+}, "6.0")

 func probeBTF(typ Type) error {

 	b, err := NewBuilder([]Type{typ})

@@ -161,6 +161,9 @@ func (gf *GoFormatter) writeTypeLit(typ Type, depth int) error {

 	case *Datasec:

 		err = gf.writeDatasecLit(v, depth)

+	case *Var:

+		err = gf.writeTypeLit(v.Type, depth)

+

 	default:

 		return fmt.Errorf("type %T: %w", v, ErrNotSupported)

 	}

@@ -8,7 +8,7 @@ import (

 	"sync"

 	"github.com/cilium/ebpf/internal"

-	"github.com/cilium/ebpf/internal/kallsyms"

+	"github.com/cilium/ebpf/internal/linux"

 )

 var kernelBTF = struct {

@@ -21,8 +21,6 @@ var kernelBTF = struct {

 // FlushKernelSpec removes any cached kernel type information.

 func FlushKernelSpec() {

-	kallsyms.FlushKernelModuleCache()

-

 	kernelBTF.Lock()

 	defer kernelBTF.Unlock()

@@ -130,7 +128,7 @@ func loadKernelModuleSpec(module string, base *Spec) (*Spec, error) {

 // findVMLinux scans multiple well-known paths for vmlinux kernel images.

 func findVMLinux() (*os.File, error) {

-	release, err := internal.KernelRelease()

+	release, err := linux.KernelRelease()

 	if err != nil {

 		return nil, err

 	}

@@ -18,6 +18,10 @@ type MarshalOptions struct {

 	Order binary.ByteOrder

 	// Remove function linkage information for compatibility with <5.6 kernels.

 	StripFuncLinkage bool

+	// Replace decl tags with a placeholder for compatibility with <5.16 kernels.

+	ReplaceDeclTags bool

+	// Replace TypeTags with a placeholder for compatibility with <5.17 kernels.

+	ReplaceTypeTags bool

 	// Replace Enum64 with a placeholder for compatibility with <6.0 kernels.

 	ReplaceEnum64 bool

 	// Prevent the "No type found" error when loading BTF without any types.

@@ -29,6 +33,8 @@ func KernelMarshalOptions() *MarshalOptions {

 	return &MarshalOptions{

 		Order:              internal.NativeEndian,

 		StripFuncLinkage:   haveFuncLinkage() != nil,

+		ReplaceDeclTags:    haveDeclTags() != nil,

+		ReplaceTypeTags:    haveTypeTags() != nil,

 		ReplaceEnum64:      haveEnum64() != nil,

 		PreventNoTypeFound: true, // All current kernels require this.

 	}

@@ -318,15 +324,7 @@ func (e *encoder) deflateType(typ Type) (err error) {

 		return errors.New("Void is implicit in BTF wire format")

 	case *Int:

-		raw.SetKind(kindInt)

-		raw.SetSize(v.Size)

-

-		var bi btfInt

-		bi.SetEncoding(v.Encoding)

-		// We need to set bits in addition to size, since btf_type_int_is_regular

-		// otherwise flags this as a bitfield.

-		bi.SetBits(byte(v.Size) * 8)

-		raw.data = bi

+		e.deflateInt(&raw, v)

 	case *Pointer:

 		raw.SetKind(kindPointer)

@@ -368,8 +366,7 @@ func (e *encoder) deflateType(typ Type) (err error) {

 		raw.SetType(e.id(v.Type))

 	case *Const:

-		raw.SetKind(kindConst)

-		raw.SetType(e.id(v.Type))

+		e.deflateConst(&raw, v)

 	case *Restrict:

 		raw.SetKind(kindRestrict)

@@ -404,15 +401,10 @@ func (e *encoder) deflateType(typ Type) (err error) {

 		raw.SetSize(v.Size)

 	case *declTag:

-		raw.SetKind(kindDeclTag)

-		raw.SetType(e.id(v.Type))

-		raw.data = &btfDeclTag{uint32(v.Index)}

-		raw.NameOff, err = e.strings.Add(v.Value)

+		err = e.deflateDeclTag(&raw, v)

-	case *typeTag:

-		raw.SetKind(kindTypeTag)

-		raw.SetType(e.id(v.Type))

-		raw.NameOff, err = e.strings.Add(v.Value)

+	case *TypeTag:

+		err = e.deflateTypeTag(&raw, v)

 	default:

 		return fmt.Errorf("don't know how to deflate %T", v)

@@ -425,6 +417,57 @@ func (e *encoder) deflateType(typ Type) (err error) {

 	return raw.Marshal(e.buf, e.Order)

 }

+func (e *encoder) deflateInt(raw *rawType, i *Int) {

+	raw.SetKind(kindInt)

+	raw.SetSize(i.Size)

+

+	var bi btfInt

+	bi.SetEncoding(i.Encoding)

+	// We need to set bits in addition to size, since btf_type_int_is_regular

+	// otherwise flags this as a bitfield.

+	bi.SetBits(byte(i.Size) * 8)

+	raw.data = bi

+}

+

+func (e *encoder) deflateDeclTag(raw *rawType, tag *declTag) (err error) {

+	// Replace a decl tag with an integer for compatibility with <5.16 kernels,

+	// following libbpf behaviour.

+	if e.ReplaceDeclTags {

+		typ := &Int{"decl_tag_placeholder", 1, Unsigned}

+		e.deflateInt(raw, typ)

+

+		// Add the placeholder type name to the string table. The encoder added the

+		// original type name before this call.

+		raw.NameOff, err = e.strings.Add(typ.TypeName())

+		return