chore: release bpf object memory

rscampos · rscampos · commit 12c4a512a501 · 2024-07-29T08:40:52.000-05:00
These are the two references to the BPF object read from the file. Both
need to be set to nil for the Go garbage collector to reclaim the
memory.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.4
 require (
 	github.com/IBM/fluent-forward-go v0.2.2
 	github.com/Masterminds/sprig/v3 v3.2.3
-	github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4.0.20240715144951-c8f76d124d7d
+	github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4.0.20240729111821-61d531acf4ca
 	github.com/aquasecurity/tracee/api v0.0.0-20240613134034-89d2d4fc7689
 	github.com/aquasecurity/tracee/signatures/helpers v0.0.0-20240607205742-90c301111aee
 	github.com/aquasecurity/tracee/types v0.0.0-20240607205742-90c301111aee
diff --git a/go.sum b/go.sum
@@ -404,8 +404,8 @@ github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdII
 github.com/agnivade/levenshtein v1.1.1 h1:QY8M92nrzkmr798gCo3kmMyqXFzdQVpxLlGPRBij0P8=
 github.com/agnivade/levenshtein v1.1.1/go.mod h1:veldBMzWxcCG2ZvUTKD2kJNRdCk5hVbJomOvKkmgYbo=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4.0.20240715144951-c8f76d124d7d h1:+CNq6qH8KW9n9JQt4vnaKM03PilwkVEPAsrjQDKeXno=
-github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4.0.20240715144951-c8f76d124d7d/go.mod h1:UpO6kTehEgAGGKR2twztBxvzjTiLiV/cb2xmlYb+TfE=
+github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4.0.20240729111821-61d531acf4ca h1:OPbvwFFvR11c1bgOLhBq1R5Uk3hwUjHW2KfrdyJan9Y=
+github.com/aquasecurity/libbpfgo v0.7.0-libbpf-1.4.0.20240729111821-61d531acf4ca/go.mod h1:UpO6kTehEgAGGKR2twztBxvzjTiLiV/cb2xmlYb+TfE=
 github.com/aquasecurity/tracee/api v0.0.0-20240613134034-89d2d4fc7689 h1:mAOehSHrqAZ4lvn3AYgDxn+aDTKrv81ghNnGlteDB00=
 github.com/aquasecurity/tracee/api v0.0.0-20240613134034-89d2d4fc7689/go.mod h1:km0QNkaoOVxU/IYF/Pw/ju/2SO1mYn+HJOIyMDtnfkE=
 github.com/aquasecurity/tracee/signatures/helpers v0.0.0-20240607205742-90c301111aee h1:1KJy6Z2bSpmKQVPShU7hhbXgGVOgMwvzf9rjoWMTYEg=
diff --git a/pkg/cmd/tracee.go b/pkg/cmd/tracee.go
@@ -53,6 +53,10 @@ func (r Runner) Run(ctx context.Context) error {
 		},
 	)
 
+	// Need to force nil to allow the garbage
+	// collector to free the BPF object
+	r.TraceeConfig.BPFObjBytes = nil
+
 	// Initialize tracee
 
 	err = t.Init(ctx)
diff --git a/pkg/ebpf/tracee.go b/pkg/ebpf/tracee.go
@@ -1392,6 +1392,10 @@ func (t *Tracee) initBPF() error {
 		return errfmt.WrapError(err)
 	}
 
+	// Need to force nil to allow the garbage
+	// collector to free the BPF object
+	t.config.BPFObjBytes = nil
+
 	// Populate eBPF maps with initial data
 
 	err = t.populateBPFMaps()

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ func (r Runner) Run(ctx context.Context) error {`
`53`	`53`	`},`
`54`	`54`	`)`
`55`	`55`
	`56`	`+ // Need to force nil to allow the garbage`
	`57`	`+ // collector to free the BPF object`
	`58`	`+ r.TraceeConfig.BPFObjBytes = nil`
	`59`	`+`
`56`	`60`	`// Initialize tracee`
`57`	`61`
`58`	`62`	`err = t.Init(ctx)`
Original file line number	Diff line number	Diff line change
`@@ -1392,6 +1392,10 @@ func (t *Tracee) initBPF() error {`
`1392`	`1392`	`return errfmt.WrapError(err)`
`1393`	`1393`	`}`
`1394`	`1394`
	`1395`	`+ // Need to force nil to allow the garbage`
	`1396`	`+ // collector to free the BPF object`
	`1397`	`+ t.config.BPFObjBytes = nil`
	`1398`	`+`
`1395`	`1399`	`// Populate eBPF maps with initial data`
`1396`	`1400`
`1397`	`1401`	`err = t.populateBPFMaps()`