[Improvement] Add btf option to specify btf file path

Makefile

@@ -105,7 +105,7 @@ bpf/kheaders.h: FORCE
 
 FORCE:
 
-kyanos: $(LIBBPF_OBJ) $(GO_FILES) $(wildcard bpf/*.[ch]) bpf/kheaders.h | $(OUTPUT)
+kyanos: $(LIBBPF_OBJ) $(GO_FILES) $(wildcard bpf/*.[ch]) | $(OUTPUT)
 	$(call msg,BINARY,$@)
 	./build.sh "$(CFLAGS)" "$(VMLINUX)"
 	rm -f bpf/kheaders.h

agent/agent.go

@@ -21,6 +21,7 @@ import (
 	"unsafe"
 
 	"github.com/cilium/ebpf"
+	"github.com/cilium/ebpf/btf"
 	"github.com/cilium/ebpf/link"
 	"github.com/cilium/ebpf/perf"
 	"github.com/cilium/ebpf/ringbuf"
@@ -54,6 +55,7 @@ type AgentOptions struct {
 	LatencyFilter          protocol.LatencyFilter
 	TraceSide              common.SideEnum
 	IfName                 string
+	BTFFilePath            string
 	protocol.SizeFilter
 	AnalysisEnable bool
 	analysis.AnalysisOptions
@@ -116,20 +118,34 @@ func SetupAgent(options AgentOptions) {
 	var objs any
 	var spec *ebpf.CollectionSpec
 	var err error
+	var collectionOptions *ebpf.CollectionOptions
+	if options.BTFFilePath != "" {
+		btfPath, err := btf.LoadSpec(options.BTFFilePath)
+		if err != nil {
+			log.Fatalf("can't load btf spec: %v", err)
+		}
+		collectionOptions = &ebpf.CollectionOptions{
+			Programs: ebpf.ProgramOptions{
+				KernelTypes: btfPath,
+			},
+		}
+	} else {
+		collectionOptions = nil
+	}
 	if common.NeedsRunningInCompatibleMode() {
 		objs = &bpf.AgentOldObjects{}
 		spec, err = bpf.LoadAgentOld()
 		if err != nil {
 			log.Fatal("load Agent error:", err)
 		}
-		err = spec.LoadAndAssign(objs, nil)
+		err = spec.LoadAndAssign(objs, collectionOptions)
 	} else {
 		objs = &bpf.AgentObjects{}
 		spec, err = bpf.LoadAgent()
 		if err != nil {
 			log.Fatal("load Agent error:", err)
 		}
-		err = spec.LoadAndAssign(objs, nil)
+		err = spec.LoadAndAssign(objs, collectionOptions)
 	}
 	bpf.Objs = objs
 

bpf/pktlatency.bpf.c

@@ -2,7 +2,7 @@
 
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /* Copyright (c) 2021 Sartura */
-#include "kheaders.h"
+#include "../vmlinux/vmlinux.h"
 #include <bpf/bpf_helpers.h>
 #include <bpf/bpf_tracing.h>
 #ifndef COMPAT_MODE 

cmd/common.go

@@ -57,6 +57,7 @@ func startAgent(options agent.AgentOptions) {
 		return
 	}
 	options.IfName = IfName
+	options.BTFFilePath = BTFFilePath
 
 	initLog()
 	logger.Infoln("Kyanos starting...")

cmd/root.go

@@ -37,6 +37,7 @@ var LocalPorts []string
 var RemoteIps []string
 var LocalIps []string
 var IfName string
+var BTFFilePath string
 
 func init() {
 	// rootCmd.PersistentFlags().StringVar(&LogDir, "log-dir", "", "log file dir")
@@ -50,6 +51,7 @@ func init() {
 	rootCmd.PersistentFlags().BoolVarP(&Verbose, "verbose", "v", false, "print verbose message")
 	rootCmd.PersistentFlags().StringVar(&IfName, "ifname", "eth0", "--ifname eth0")
 	rootCmd.PersistentFlags().MarkHidden("compatible")
+	rootCmd.PersistentFlags().StringVar(&BTFFilePath, "btf", "", "btf file path")
 	rootCmd.Flags().SortFlags = false
 	rootCmd.PersistentFlags().SortFlags = false
 	viper.BindPFlags(rootCmd.Flags())