pkg: fix cilium/ebpf pin.WalkDIr uses

The API for walking BPF fs from cilium/ebpf slightly changed.

Signed-off-by: Mahe Tardy <[email protected]>

Author: mtardy

Diff for: cmd/tetra/debug/progs.go

@@ -11,7 +11,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/fs"
 	"log"
 	"os"
 	"path"
@@ -407,45 +406,40 @@ func getTetragonProgs(base string) ([]*prog, error) {
 	var progs []*prog
 
 	// Walk bpffs/tetragon and look for programs
-	err := pin.WalkDir(base,
-		func(path string, finfo fs.DirEntry, obj pin.Pinner, err error) error {
-			if err != nil {
-				return err
-			}
-			if finfo.IsDir() {
-				return nil
-			}
+	iter := pin.WalkDir(base, nil)
+	for pin, err := range iter {
+		if err != nil {
+			return nil, err
+		}
 
-			p, ok := obj.(*ebpf.Program)
-			if !ok {
-				return nil
-			}
-			defer p.Close()
+		p, ok := pin.Object.(*ebpf.Program)
+		if !ok {
+			continue
+		}
 
-			info, err := p.Info()
-			if err != nil {
-				return err
-			}
+		info, err := p.Info()
+		if err != nil {
+			return nil, err
+		}
 
-			id, ok := info.ID()
-			if !ok {
-				return err
-			}
+		id, ok := info.ID()
+		if !ok {
+			return nil, err
+		}
 
-			runTime, _ := info.Runtime()
-			runCnt, _ := info.RunCount()
-
-			progs = append(progs, &prog{
-				id:    uint32(id),
-				name:  getName(p, info),
-				pin:   filepath.Join(base, path),
-				cnt:   runCnt,
-				time:  runTime,
-				alive: true,
-			})
-			return nil
+		runTime, _ := info.Runtime()
+		runCnt, _ := info.RunCount()
+
+		progs = append(progs, &prog{
+			id:    uint32(id),
+			name:  getName(p, info),
+			pin:   filepath.Join(base, pin.Path),
+			cnt:   runCnt,
+			time:  runTime,
+			alive: true,
 		})
-	return progs, err
+	}
+	return progs, nil
 }
 
 func getName(p *ebpf.Program, info *ebpf.ProgramInfo) string {

Diff for: pkg/bugtool/maps.go

@@ -6,7 +6,6 @@ package bugtool
 import (
 	"errors"
 	"fmt"
-	"io/fs"
 	"iter"
 	"maps"
 	"os"
@@ -89,31 +88,24 @@ func FindAllMaps() ([]bpf.ExtendedMapInfo, error) {
 // specified as argument.
 func FindPinnedMaps(path string) ([]bpf.ExtendedMapInfo, error) {
 	var infos []bpf.ExtendedMapInfo
-
-	err := pin.WalkDir(path, func(_ string, d fs.DirEntry, obj pin.Pinner, err error) error {
+	iter := pin.WalkDir(path, nil)
+	for pin, err := range iter {
 		if err != nil {
-			return err
-		}
-		if d.IsDir() {
-			return nil // skip directories
+			return nil, fmt.Errorf("failed walking the bpf fs %q: %w", path, err)
 		}
 
-		m, ok := obj.(*ebpf.Map)
+		m, ok := pin.Object.(*ebpf.Map)
 		if !ok {
-			return nil // skip non map
+			continue
 		}
-		defer m.Close()
 
 		xInfo, err := bpf.ExtendedInfoFromMap(m)
 		if err != nil {
-			return fmt.Errorf("failed to retrieve extended info from map %v: %w", m, err)
+			return nil, fmt.Errorf("failed to retrieve extended info from map %v: %w", m, err)
 		}
 		infos = append(infos, xInfo)
-		return nil
-	})
-	if err != nil {
-		return nil, err
 	}
+
 	return infos, nil
 }
 
@@ -145,37 +137,29 @@ func mapIDsFromProgs(prog *ebpf.Program) (iter.Seq[int], error) {
 func mapIDsFromPinnedProgs(path string) (iter.Seq[int], error) {
 	mapSet := map[int]bool{}
 	progArrays := []*ebpf.Map{}
-	err := pin.WalkDir(path, func(_ string, d fs.DirEntry, obj pin.Pinner, err error) error {
+
+	iter := pin.WalkDir(path, nil)
+	for pin, err := range iter {
 		if err != nil {
-			return err
-		}
-		if d.IsDir() {
-			return nil // skip directories
+			return nil, fmt.Errorf("failed walking the bpf fs %q: %w", path, err)
 		}
 
-		switch typedObj := obj.(type) {
+		switch typedObj := pin.Object.(type) {
 		case *ebpf.Program:
 			newIDs, err := mapIDsFromProgs(typedObj)
 			if err != nil {
-				return fmt.Errorf("failed to retrieve map IDs from prog: %w", err)
+				return nil, fmt.Errorf("failed to retrieve map IDs from prog: %w", err)
 			}
-			typedObj.Close()
 			for id := range newIDs {
 				mapSet[id] = true
 			}
 		case *ebpf.Map:
 			if typedObj.Type() == ebpf.ProgramArray {
 				progArrays = append(progArrays, typedObj)
 				// don't forget to close those files when used later on
-			} else {
-				typedObj.Close()
+				pin.Take()
 			}
 		}
-
-		return nil
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed walking the path %q: %w", path, err)
 	}
 
 	// retrieve all the program IDs from prog array maps