Skip to content

Commit bb8a6d8

Browse files
committed
bpf2go: refactor object file linking into gen and add tests
- replace the direct command execution for linking multiple BPF object files with a new `Link` function in the `gen` package. - add unit tests for linking
1 parent 1d835dc commit bb8a6d8

File tree

3 files changed

+111
-4
lines changed

3 files changed

+111
-4
lines changed

cmd/bpf2go/gen/link.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//go:build !windows
2+
3+
package gen
4+
5+
import (
6+
"fmt"
7+
"os"
8+
"os/exec"
9+
)
10+
11+
// LinkArgs specifies the arguments for linking multiple BPF object files together.
12+
type LinkArgs struct {
13+
// Destination object file name
14+
Dest string
15+
// Source object files to link together
16+
Sources []string
17+
}
18+
19+
// Link combines multiple BPF object files into a single object file.
20+
func Link(args LinkArgs) error {
21+
if len(args.Sources) == 0 {
22+
return fmt.Errorf("no source files to link")
23+
}
24+
25+
cmd := exec.Command("bpftool", "gen", "object", args.Dest)
26+
cmd.Args = append(cmd.Args, args.Sources...)
27+
cmd.Stderr = os.Stderr
28+
29+
if err := cmd.Run(); err != nil {
30+
return fmt.Errorf("bpftool gen object returned error: %w", err)
31+
}
32+
33+
return nil
34+
}

cmd/bpf2go/gen/link_test.go

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
//go:build !windows
2+
3+
package gen
4+
5+
import (
6+
"os"
7+
"path/filepath"
8+
"testing"
9+
10+
"github.com/cilium/ebpf/internal/testutils"
11+
)
12+
13+
const (
14+
func1 = `__attribute__((section("socket"), used)) int func1() { return 1; }`
15+
func2 = `__attribute__((section("socket"), used)) int func2() { return 2; }`
16+
)
17+
18+
func TestLink(t *testing.T) {
19+
if testing.Short() {
20+
t.SkipNow()
21+
}
22+
23+
dir := t.TempDir()
24+
mustWriteFile(t, dir, "func1.c", func1)
25+
mustWriteFile(t, dir, "func2.c", func2)
26+
27+
// Compile first object
28+
obj1 := filepath.Join(dir, "func1.o")
29+
err := Compile(CompileArgs{
30+
CC: testutils.ClangBin(t),
31+
DisableStripping: true,
32+
Workdir: dir,
33+
Source: filepath.Join(dir, "func1.c"),
34+
Dest: obj1,
35+
})
36+
if err != nil {
37+
t.Fatal("Can't compile func1:", err)
38+
}
39+
40+
// Compile second object
41+
obj2 := filepath.Join(dir, "func2.o")
42+
err = Compile(CompileArgs{
43+
CC: testutils.ClangBin(t),
44+
DisableStripping: true,
45+
Workdir: dir,
46+
Source: filepath.Join(dir, "func2.c"),
47+
Dest: obj2,
48+
})
49+
if err != nil {
50+
t.Fatal("Can't compile func2:", err)
51+
}
52+
53+
// Link both objects
54+
linked := filepath.Join(dir, "linked.o")
55+
err = Link(LinkArgs{
56+
Dest: linked,
57+
Sources: []string{obj1, obj2},
58+
})
59+
if err != nil {
60+
t.Fatal("Can't link objects:", err)
61+
}
62+
63+
// Verify the linked file exists and has content
64+
stat, err := os.Stat(linked)
65+
if err != nil {
66+
t.Fatal("Can't stat linked file:", err)
67+
}
68+
69+
if stat.Size() == 0 {
70+
t.Error("Linked file is empty")
71+
}
72+
}

cmd/bpf2go/main.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,11 @@ func (b2g *bpf2go) convert(tgt gen.Target, goarches gen.GoArches) (err error) {
442442

443443
// If we have multiple object files, link them together
444444
if len(tmpObjFileNames) > 1 {
445-
cmd := exec.Command("bpftool", "gen", "object", objFileName)
446-
cmd.Args = append(cmd.Args, tmpObjFileNames...)
447-
cmd.Stderr = os.Stderr
448-
if err := cmd.Run(); err != nil {
445+
err = gen.Link(gen.LinkArgs{
446+
Dest: objFileName,
447+
Sources: tmpObjFileNames,
448+
})
449+
if err != nil {
449450
return fmt.Errorf("link object files: %w", err)
450451
}
451452
} else {

0 commit comments

Comments
 (0)