btf: support raw BTF in loadKernelSpec

Some distributions with older kernels sometimes don't ship BTF out of the box. By allowing raw BTF in the fallback paths users can use pahole to work around this. libbpf has similar behaviour: libbpf/libbpf@0420f75 Signed-off-by: Wang Xingxing <[email protected]>
cilium · Nov 1, 2023 · 78e76c9 · 78e76c9
1 parent 6b0a090
commit 78e76c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/btf/btf.go b/btf/btf.go
@@ -322,12 +322,12 @@ func loadKernelSpec() (_ *Spec, fallback bool, _ error) {
 	}
 	defer file.Close()
 
-	spec, err := loadSpecFromELF(file)
+	spec, err := LoadSpecFromReader(file)
 	return spec, true, err
 }
 
 // findVMLinux scans multiple well-known paths for vmlinux kernel images.
-func findVMLinux() (*internal.SafeELFFile, error) {
+func findVMLinux() (*os.File, error) {
 	release, err := internal.KernelRelease()
 	if err != nil {
 		return nil, err
@@ -346,7 +346,7 @@ func findVMLinux() (*internal.SafeELFFile, error) {
 	}
 
 	for _, loc := range locations {
-		file, err := internal.OpenSafeELFFile(fmt.Sprintf(loc, release))
+		file, err := os.Open(fmt.Sprintf(loc, release))
 		if errors.Is(err, os.ErrNotExist) {
 			continue
 		}

diff --git a/btf/btf_test.go b/btf/btf_test.go
@@ -251,7 +251,7 @@ func TestFindVMLinux(t *testing.T) {
 	}
 	defer file.Close()
 
-	spec, err := loadSpecFromELF(file)
+	spec, err := LoadSpecFromReader(file)
 	if err != nil {
 		t.Fatal("Can't load BTF:", err)
 	}