diff --git a/bpf/bpf.go b/bpf/bpf.go index c76e2a7f..0cd5ac45 100644 --- a/bpf/bpf.go +++ b/bpf/bpf.go @@ -140,6 +140,7 @@ load: }, IgnoreUnknownProgram: true, IgnoreNotSupportedProgram: true, + IgnoreUnknownVariable: true, }) if err != nil { log.Infof("load and assign failed: %+v", err) diff --git a/go.mod b/go.mod index 89703f8a..89745e94 100644 --- a/go.mod +++ b/go.mod @@ -105,7 +105,7 @@ require ( ) replace ( - github.com/cilium/ebpf => github.com/mozillazg/ebpf v0.17.2-0.20250118124627-3c4232e06348 + github.com/cilium/ebpf => github.com/mozillazg/ebpf v0.17.2-0.20250118135027-62b13edacbea // github.com/cilium/ebpf => ../../cilium/ebpf github.com/gopacket/gopacket => github.com/mozillazg/gopacket v0.0.0-20241026043817-048341de5231 // github.com/gopacket/gopacket => ../../gopacket/gopacket diff --git a/go.sum b/go.sum index d3314034..20a33be7 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ github.com/mozillazg/cri-api v0.32.0-alpha.1.0.20241019013855-3dc36f8743df h1:90 github.com/mozillazg/cri-api v0.32.0-alpha.1.0.20241019013855-3dc36f8743df/go.mod h1:ca9lKDUa9PmUGVDSSetDQqgf0dyk/NW8u+MpJo7JaYA= github.com/mozillazg/cri-client v0.31.0-alpha.0.0.20241019023238-87687176fd67 h1:M4+V89TNUGmRgSJZcH2nvotyqnFkmDl+MGApFoZbJY0= github.com/mozillazg/cri-client v0.31.0-alpha.0.0.20241019023238-87687176fd67/go.mod h1:pFm23AAi/gIlW9FGrWPTPnGe1xsyGHPFFO/zezc4w90= -github.com/mozillazg/ebpf v0.17.2-0.20250118124627-3c4232e06348 h1:Eszm6n/lnMT/Zzo6Rr5lETU1zMiS0zctFT4+RsPjyQk= -github.com/mozillazg/ebpf v0.17.2-0.20250118124627-3c4232e06348/go.mod h1:vay2FaYSmIlv3r8dNACd4mW/OCaZLJKJOo+IHBvCIO8= +github.com/mozillazg/ebpf v0.17.2-0.20250118135027-62b13edacbea h1:s8OLenj15Oz0UbrFwwJrTUuQD+U0j4glAsybRufNN8s= +github.com/mozillazg/ebpf v0.17.2-0.20250118135027-62b13edacbea/go.mod h1:vay2FaYSmIlv3r8dNACd4mW/OCaZLJKJOo+IHBvCIO8= github.com/mozillazg/gopacket v0.0.0-20241026043817-048341de5231 h1:uvhf0oGPfJ24Lc5/N2ysh9sQc71Pog67zxKiLVS4/Qg= github.com/mozillazg/gopacket v0.0.0-20241026043817-048341de5231/go.mod h1:WnFrU1Xkf5lWKV38uKNR9+yYtppn+ZYzOyNqMeH4oNE= github.com/mozillazg/pktdump v0.0.9-0.20241102131745-63c34f34f0d1 h1:kVgiW9P9tfqPXrIU/ZKC8XwkhHkri3s439D+RqSpF6g= diff --git a/vendor/github.com/cilium/ebpf/collection.go b/vendor/github.com/cilium/ebpf/collection.go index 587fc6bf..e0cb9186 100644 --- a/vendor/github.com/cilium/ebpf/collection.go +++ b/vendor/github.com/cilium/ebpf/collection.go @@ -25,6 +25,7 @@ type CollectionOptions struct { IgnoreUnknownProgram bool IgnoreNotSupportedProgram bool + IgnoreUnknownVariable bool // MapReplacements takes a set of Maps that will be used instead of // creating new ones when loading the CollectionSpec. @@ -288,7 +289,13 @@ func (cs *CollectionSpec) LoadAndAssign(to interface{}, opts *CollectionOptions) case reflect.TypeOf((*Variable)(nil)): assignedVars[name] = true - return loader.loadVariable(name) + v, err := loader.loadVariable(name) + if err != nil { + if strings.Contains(err.Error(), "unknown variable") && opts.IgnoreUnknownVariable { + return nil, nil + } + } + return v, err default: return nil, fmt.Errorf("unsupported type %s", typ) diff --git a/vendor/modules.txt b/vendor/modules.txt index a05779ff..f0d4f1b6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -42,7 +42,7 @@ github.com/Microsoft/hcsshim/internal/wclayer github.com/Microsoft/hcsshim/internal/winapi github.com/Microsoft/hcsshim/osversion github.com/Microsoft/hcsshim/pkg/ociwclayer -# github.com/cilium/ebpf v0.16.0 => github.com/mozillazg/ebpf v0.17.2-0.20250118124627-3c4232e06348 +# github.com/cilium/ebpf v0.16.0 => github.com/mozillazg/ebpf v0.17.2-0.20250118135027-62b13edacbea ## explicit; go 1.22 github.com/cilium/ebpf github.com/cilium/ebpf/asm @@ -601,7 +601,7 @@ k8s.io/utils/exec ## explicit; go 1.12 rsc.io/binaryregexp rsc.io/binaryregexp/syntax -# github.com/cilium/ebpf => github.com/mozillazg/ebpf v0.17.2-0.20250118124627-3c4232e06348 +# github.com/cilium/ebpf => github.com/mozillazg/ebpf v0.17.2-0.20250118135027-62b13edacbea # github.com/gopacket/gopacket => github.com/mozillazg/gopacket v0.0.0-20241026043817-048341de5231 # github.com/x-way/pktdump => github.com/mozillazg/pktdump v0.0.9-0.20241102131745-63c34f34f0d1 # k8s.io/cri-api => github.com/mozillazg/cri-api v0.32.0-alpha.1.0.20241019013855-3dc36f8743df