btf: export package

cilium · May 11, 2022 · 2e33f5e · 2e33f5e
1 parent bd1d163
commit 2e33f5e
Show file tree

Hide file tree

Showing 51 changed files with 27 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -35,9 +35,9 @@ TARGETS := \
 	testdata/map_spin_lock \
 	testdata/subprog_reloc \
 	testdata/fwd_decl \
-	internal/btf/testdata/relocs \
-	internal/btf/testdata/relocs_read \
-	internal/btf/testdata/relocs_read_tgt
+	btf/testdata/relocs \
+	btf/testdata/relocs_read \
+	btf/testdata/relocs_read_tgt
 
 .PHONY: all clean container-all container-shell generate
 
@@ -60,7 +60,7 @@ container-shell:
 
 clean:
 	-$(RM) testdata/*.elf
-	-$(RM) internal/btf/testdata/*.elf
+	-$(RM) btf/testdata/*.elf
 
 format:
 	find . -type f -name "*.c" | xargs clang-format -i
@@ -95,6 +95,6 @@ testdata/loader-%-eb.elf: testdata/loader.c
 
 # Usage: make VMLINUX=/path/to/vmlinux vmlinux-btf
 .PHONY: vmlinux-btf
-vmlinux-btf: internal/btf/testdata/vmlinux-btf.gz
-internal/btf/testdata/vmlinux-btf.gz: $(VMLINUX)
+vmlinux-btf: btf/testdata/vmlinux-btf.gz
+btf/testdata/vmlinux-btf.gz: $(VMLINUX)
 	objcopy --dump-section .BTF=/dev/stdout "$<" /dev/null | gzip > "$@"
diff --git a/internal/btf/btf.go → btf/btf.go b/internal/btf/btf.go → btf/btf.go
diff --git a/internal/btf/btf_test.go → btf/btf_test.go b/internal/btf/btf_test.go → btf/btf_test.go
@@ -225,7 +225,7 @@ func TestFindVMLinux(t *testing.T) {
 }
 
 func TestLoadSpecFromElf(t *testing.T) {
-	testutils.Files(t, testutils.Glob(t, "../../testdata/loader-e*.elf"), func(t *testing.T, file string) {
+	testutils.Files(t, testutils.Glob(t, "../testdata/loader-e*.elf"), func(t *testing.T, file string) {
 		spec := parseELFBTF(t, file)
 
 		vt, err := spec.TypeByID(0)
@@ -298,7 +298,7 @@ func TestGuessBTFByteOrder(t *testing.T) {
 }
 
 func TestSpecCopy(t *testing.T) {
-	spec := parseELFBTF(t, "../../testdata/loader-el.elf")
+	spec := parseELFBTF(t, "../testdata/loader-el.elf")
 
 	if len(spec.types) < 1 {
 		t.Fatal("Not enough types")

diff --git a/internal/btf/btf_types.go → btf/btf_types.go b/internal/btf/btf_types.go → btf/btf_types.go
diff --git a/internal/btf/btf_types_string.go → btf/btf_types_string.go b/internal/btf/btf_types_string.go → btf/btf_types_string.go
diff --git a/internal/btf/core.go → btf/core.go b/internal/btf/core.go → btf/core.go
diff --git a/internal/btf/core_reloc_test.go → btf/core_reloc_test.go b/internal/btf/core_reloc_test.go → btf/core_reloc_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/cilium/ebpf"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/testutils"
 )
 

diff --git a/internal/btf/core_test.go → btf/core_test.go b/internal/btf/core_test.go → btf/core_test.go
diff --git a/internal/btf/doc.go → btf/doc.go b/internal/btf/doc.go → btf/doc.go
@@ -2,7 +2,4 @@
 //
 // The canonical documentation lives in the Linux kernel repository and is
 // available at https://www.kernel.org/doc/html/latest/bpf/btf.html
-//
-// The API is very much unstable. You should only use this via the main
-// ebpf library.
 package btf
diff --git a/internal/btf/ext_info.go → btf/ext_info.go b/internal/btf/ext_info.go → btf/ext_info.go
diff --git a/internal/btf/ext_info_test.go → btf/ext_info_test.go b/internal/btf/ext_info_test.go → btf/ext_info_test.go
diff --git a/internal/btf/format.go → btf/format.go b/internal/btf/format.go → btf/format.go
diff --git a/internal/btf/format_test.go → btf/format_test.go b/internal/btf/format_test.go → btf/format_test.go
diff --git a/internal/btf/fuzz_test.go → btf/fuzz_test.go b/internal/btf/fuzz_test.go → btf/fuzz_test.go
diff --git a/internal/btf/info.go → btf/info.go b/internal/btf/info.go → btf/info.go
diff --git a/internal/btf/strings.go → btf/strings.go b/internal/btf/strings.go → btf/strings.go
diff --git a/internal/btf/strings_test.go → btf/strings_test.go b/internal/btf/strings_test.go → btf/strings_test.go
diff --git a/internal/btf/testdata/bpf_core_read.h → btf/testdata/bpf_core_read.h b/internal/btf/testdata/bpf_core_read.h → btf/testdata/bpf_core_read.h
diff --git a/...4c8a88e8247b05fbb25f50ed81e5393baf29bc5bc → ...4c8a88e8247b05fbb25f50ed81e5393baf29bc5bc b/...4c8a88e8247b05fbb25f50ed81e5393baf29bc5bc → ...4c8a88e8247b05fbb25f50ed81e5393baf29bc5bc
diff --git a/...499b11511535c1295bf0e22f856148c02454c323e → ...499b11511535c1295bf0e22f856148c02454c323e b/...499b11511535c1295bf0e22f856148c02454c323e → ...499b11511535c1295bf0e22f856148c02454c323e
diff --git a/...333301d57d5f234527730f042d68ccc736e90c9fa → ...333301d57d5f234527730f042d68ccc736e90c9fa b/...333301d57d5f234527730f042d68ccc736e90c9fa → ...333301d57d5f234527730f042d68ccc736e90c9fa
diff --git a/btf/testdata/relocs-eb.elf b/btf/testdata/relocs-eb.elf
diff --git a/btf/testdata/relocs-el.elf b/btf/testdata/relocs-el.elf
diff --git a/internal/btf/testdata/relocs.c → btf/testdata/relocs.c b/internal/btf/testdata/relocs.c → btf/testdata/relocs.c
@@ -1,4 +1,4 @@
-#include "../../../testdata/common.h"
+#include "../../testdata/common.h"
 #include "bpf_core_read.h"
 
 enum e {

diff --git a/internal/btf/testdata/relocs_read-eb.elf → btf/testdata/relocs_read-eb.elf b/internal/btf/testdata/relocs_read-eb.elf → btf/testdata/relocs_read-eb.elf
diff --git a/internal/btf/testdata/relocs_read-el.elf → btf/testdata/relocs_read-el.elf b/internal/btf/testdata/relocs_read-el.elf → btf/testdata/relocs_read-el.elf
diff --git a/internal/btf/testdata/relocs_read.c → btf/testdata/relocs_read.c b/internal/btf/testdata/relocs_read.c → btf/testdata/relocs_read.c
@@ -1,4 +1,4 @@
-#include "../../../testdata/common.h"
+#include "../../testdata/common.h"
 #include "bpf_core_read.h"
 
 #define core_access __builtin_preserve_access_index

diff --git a/internal/btf/testdata/relocs_read_tgt-eb.elf → btf/testdata/relocs_read_tgt-eb.elf b/internal/btf/testdata/relocs_read_tgt-eb.elf → btf/testdata/relocs_read_tgt-eb.elf
diff --git a/internal/btf/testdata/relocs_read_tgt-el.elf → btf/testdata/relocs_read_tgt-el.elf b/internal/btf/testdata/relocs_read_tgt-el.elf → btf/testdata/relocs_read_tgt-el.elf
diff --git a/internal/btf/testdata/relocs_read_tgt.c → btf/testdata/relocs_read_tgt.c b/internal/btf/testdata/relocs_read_tgt.c → btf/testdata/relocs_read_tgt.c
diff --git a/internal/btf/testdata/vmlinux-btf.gz → btf/testdata/vmlinux-btf.gz b/internal/btf/testdata/vmlinux-btf.gz → btf/testdata/vmlinux-btf.gz
diff --git a/internal/btf/types.go → btf/types.go b/internal/btf/types.go → btf/types.go
diff --git a/internal/btf/types_test.go → btf/types_test.go b/internal/btf/types_test.go → btf/types_test.go
diff --git a/cmd/bpf2go/output.go b/cmd/bpf2go/output.go
@@ -12,8 +12,8 @@ import (
 	"text/template"
 
 	"github.com/cilium/ebpf"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 )
 
 const ebpfModule = "github.com/cilium/ebpf"

diff --git a/cmd/bpf2go/output_test.go b/cmd/bpf2go/output_test.go
@@ -3,7 +3,7 @@ package main
 import (
 	"testing"
 
-	"github.com/cilium/ebpf/internal/btf"
+	"github.com/cilium/ebpf/btf"
 	qt "github.com/frankban/quicktest"
 )
 

diff --git a/collection.go b/collection.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/cilium/ebpf/asm"
-	"github.com/cilium/ebpf/internal/btf"
+	"github.com/cilium/ebpf/btf"
 )
 
 // CollectionOptions control loading a collection into the kernel.

diff --git a/collection_test.go b/collection_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/testutils"
 )
 

diff --git a/elf_reader.go b/elf_reader.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/unix"
 )
 

diff --git a/elf_reader_test.go b/elf_reader_test.go
@@ -12,8 +12,8 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/testutils"
 	"github.com/cilium/ebpf/internal/unix"
 

diff --git a/info.go b/info.go
@@ -14,8 +14,8 @@ import (
 	"unsafe"
 
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/sys"
 	"github.com/cilium/ebpf/internal/unix"
 )

diff --git a/internal/btf/testdata/relocs-eb.elf b/internal/btf/testdata/relocs-eb.elf
diff --git a/internal/btf/testdata/relocs-el.elf b/internal/btf/testdata/relocs-el.elf
diff --git a/internal/cmd/gentypes/main.go b/internal/cmd/gentypes/main.go
@@ -11,8 +11,8 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/sys"
 )
 

diff --git a/internal/sys/doc.go b/internal/sys/doc.go
@@ -3,4 +3,4 @@ package sys
 
 // Regenerate types.go by invoking go generate in the current directory.
 
-//go:generate go run github.com/cilium/ebpf/internal/cmd/gentypes ../btf/testdata/vmlinux-btf.gz
+//go:generate go run github.com/cilium/ebpf/internal/cmd/gentypes ../../btf/testdata/vmlinux-btf.gz
diff --git a/link/link.go b/link/link.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 
 	"github.com/cilium/ebpf"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/sys"
 )
 

diff --git a/link/tracing.go b/link/tracing.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/cilium/ebpf"
-	"github.com/cilium/ebpf/internal/btf"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal/sys"
 )
 

diff --git a/linker.go b/linker.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/cilium/ebpf/asm"
-	"github.com/cilium/ebpf/internal/btf"
+	"github.com/cilium/ebpf/btf"
 )
 
 // splitSymbols splits insns into subsections delimited by Symbol Instructions.

diff --git a/map.go b/map.go
@@ -12,8 +12,8 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/sys"
 	"github.com/cilium/ebpf/internal/unix"
 )

diff --git a/map_test.go b/map_test.go
@@ -12,8 +12,8 @@ import (
 	"unsafe"
 
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/sys"
 	"github.com/cilium/ebpf/internal/testutils"
 	"github.com/cilium/ebpf/internal/unix"

diff --git a/prog.go b/prog.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/sys"
 	"github.com/cilium/ebpf/internal/unix"
 )

diff --git a/prog_test.go b/prog_test.go
@@ -18,8 +18,8 @@ import (
 	"github.com/google/go-cmp/cmp"
 
 	"github.com/cilium/ebpf/asm"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/internal"
-	"github.com/cilium/ebpf/internal/btf"
 	"github.com/cilium/ebpf/internal/sys"
 	"github.com/cilium/ebpf/internal/testutils"
 	"github.com/cilium/ebpf/internal/unix"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ package sys

		// Regenerate types.go by invoking go generate in the current directory.

		//go:generate go run github.com/cilium/ebpf/internal/cmd/gentypes ../btf/testdata/vmlinux-btf.gz
		//go:generate go run github.com/cilium/ebpf/internal/cmd/gentypes ../../btf/testdata/vmlinux-btf.gz