tools: reuse codes from common package

Author: mozillazg

common/net.go

@@ -11,6 +11,9 @@ const (
 
 	SOCK_STREAM = 1
 	SOCK_DGRAM  = 2
+
+	IPPROTO_TCP = 6
+	IPPROTO_UDP = 17
 )
 
 type Uint128 [16]byte

tools/bashreadline/go.mod

@@ -5,6 +5,7 @@ go 1.18
 require (
 	github.com/aquasecurity/libbpfgo v0.4.4-libbpf-1.0.1
 	github.com/aquasecurity/libbpfgo/helpers v0.4.4
+	github.com/mozillazg/libbpfgo-tools/common v0.0.0
 	github.com/spf13/pflag v1.0.5
 )
 

tools/bashreadline/main.go

@@ -16,9 +16,17 @@ import (
 
 	bpf "github.com/aquasecurity/libbpfgo"
 	"github.com/aquasecurity/libbpfgo/helpers"
+	"github.com/mozillazg/libbpfgo-tools/common"
 	flag "github.com/spf13/pflag"
 )
 
+const MAX_LINE_SIZE = 80
+
+type StrT struct {
+	Pid uint32
+	Str [MAX_LINE_SIZE]byte
+}
+
 type Options struct {
 	bpfObjPath string
 	verbose    bool
@@ -68,20 +76,26 @@ func findReadlineSo() string {
 }
 
 func printEvent(data []byte) {
-	var pid uint32
-	if err := binary.Read(bytes.NewReader(data), binary.LittleEndian, &pid); err != nil {
+	var e StrT
+	if err := binary.Read(bytes.NewReader(data), binary.LittleEndian, &e); err != nil {
 		log.Fatalf("read data failed: %s\n%v", err, data)
 	}
-	str := data[4:]
-	str = str[:bytes.IndexByte(str, 0)]
-
 	ts := time.Now().Format("15:04:05")
-	fmt.Printf("%-9s %-7d %s\n", ts, pid, str)
+	fmt.Printf("%-9s %-7d %s\n", ts, e.Pid, common.GoPath(e.Str[:]))
 }
 
 func initGlobalVars(bpfModule *bpf.Module) {
 }
 
+func loadBPFObj(bpfModule *bpf.Module) {
+	if err := bpfModule.BPFLoadObject(); err != nil {
+		log.Fatalln(err)
+	}
+}
+
+func applyFilters(bpfModule *bpf.Module) {
+}
+
 func attachPrograms(bpfModule *bpf.Module) {
 	readlineSoPath := opts.shared
 	if readlineSoPath == "" {
@@ -111,9 +125,8 @@ func main() {
 	defer bpfModule.Close()
 
 	initGlobalVars(bpfModule)
-	if err := bpfModule.BPFLoadObject(); err != nil {
-		log.Fatalln(err)
-	}
+	loadBPFObj(bpfModule)
+	applyFilters(bpfModule)
 	attachPrograms(bpfModule)
 
 	eventsChannel := make(chan []byte)

tools/bindsnoop/go.mod

@@ -3,6 +3,9 @@ module github.com/mozillazg/libbpfgo-tools/tools/bindsnoop
 go 1.18
 
 require (
-	github.com/aquasecurity/libbpfgo v0.4.3-libbpf-1.0.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/aquasecurity/libbpfgo v0.4.4-libbpf-1.0.1
+	github.com/mozillazg/libbpfgo-tools/common v0.0.0
+	github.com/spf13/pflag v1.0.5
 )
+
+replace github.com/mozillazg/libbpfgo-tools/common v0.0.0 => ../../common

tools/bindsnoop/go.sum

@@ -1,4 +1,4 @@
-github.com/aquasecurity/libbpfgo v0.4.3-libbpf-1.0.1 h1:xDHt+EJM/EJt9BXS2YheZNuynT/QNdraL/LHSSpdOxg=
-github.com/aquasecurity/libbpfgo v0.4.3-libbpf-1.0.1/go.mod h1:v+Nk+v6BtHLfdT4kVdsp+fYt4AeUa3cIG2P0y+nBuuY=
+github.com/aquasecurity/libbpfgo v0.4.4-libbpf-1.0.1 h1:cjdRq/YhQ5ZVU0jm6H3VXVcHgMzAAslrlexPq8acgSk=
+github.com/aquasecurity/libbpfgo v0.4.4-libbpf-1.0.1/go.mod h1:v+Nk+v6BtHLfdT4kVdsp+fYt4AeUa3cIG2P0y+nBuuY=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=

tools/bindsnoop/main.go

@@ -6,26 +6,21 @@ import (
 	"encoding/binary"
 	"fmt"
 	"log"
-	"net/netip"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 	"unsafe"
 
 	bpf "github.com/aquasecurity/libbpfgo"
+	"github.com/mozillazg/libbpfgo-tools/common"
 	flag "github.com/spf13/pflag"
 )
 
-const (
-	IPProtoTCP uint16 = 6
-	IPProtoUDP uint16 = 17
-)
-
-type uint128 [16]byte
+const TASK_COMM_LEN = 16
 
 type BindEvent struct {
-	Addr       uint128
+	Addr       common.Uint128
 	TsUs       uint64
 	Pid        uint32
 	BoundDevIf uint32
@@ -34,11 +29,7 @@ type BindEvent struct {
 	Proto      uint16
 	Opts       uint8
 	Ver        uint8
-	Task       [16]byte
-}
-
-func (e BindEvent) TaskString() string {
-	return string(bytes.TrimRight(e.Task[:], "\x00"))
+	Task       [TASK_COMM_LEN]byte
 }
 
 type Options struct {
@@ -86,22 +77,10 @@ func initGlobalVariable(bpfModule *bpf.Module, name string, value interface{}) {
 	}
 }
 
-func getCgroupDirFD(cgroupV2DirPath string) (int, error) {
-	const (
-		O_DIRECTORY int = 0200000
-		O_RDONLY    int = 00
-	)
-	fd, err := syscall.Open(cgroupV2DirPath, O_DIRECTORY|O_RDONLY, 0)
-	if fd < 0 {
-		return 0, fmt.Errorf("failed to open cgroupv2 directory path %s: %w", cgroupV2DirPath, err)
-	}
-	return fd, nil
-}
-
 func initFilters(bpfModule *bpf.Module) {
 	if opts.cgroup != "" {
 		idx := 0
-		cgroupFd, err := getCgroupDirFD(opts.cgroup)
+		cgroupFd, err := common.GetCgroupDirFD(opts.cgroup)
 		if err != nil {
 			log.Fatalln(err)
 		}
@@ -135,10 +114,10 @@ func formatEvent(event BindEvent) {
 		fmt.Printf("%8s ", time.Now().Format("15:04:05"))
 	}
 	switch event.Proto {
-	case IPProtoTCP:
+	case common.IPPROTO_TCP:
 		proto = "TCP"
 		break
-	case IPProtoUDP:
+	case common.IPPROTO_UDP:
 		proto = "UDP"
 	default:
 		proto = "UNK"
@@ -150,16 +129,12 @@ func formatEvent(event BindEvent) {
 	}
 	switch event.Ver {
 	case 4:
-		v := [4]byte{}
-		for i := 0; i < 4; i++ {
-			v[i] = event.Addr[i]
-		}
-		addr = netip.AddrFrom4(v).String()
+		addr = common.AddrFrom16(common.AF_INET, event.Addr).String()
 	default:
-		addr = netip.AddrFrom16(event.Addr).String()
+		addr = common.AddrFrom16(common.AF_INET6, event.Addr).String()
 	}
 	fmt.Printf("%-7d %-16s %-3d %-5s %-5s %-4d %-5d %-48s\n",
-		event.Pid, event.TaskString(), event.Ret, proto, bindOpts, event.BoundDevIf, event.Port, addr)
+		event.Pid, common.GoString(event.Task[:]), event.Ret, proto, bindOpts, event.BoundDevIf, event.Port, addr)
 }
 
 func main() {

tools/biolatency/main.go

@@ -41,8 +41,6 @@ type Options struct {
 	times        uint64
 }
 
-const maxCpuNr = 128
-
 var opts = Options{
 	bpfObjPath:   "biolatency.bpf.o",
 	verbose:      false,

tools/biopattern/main.go

@@ -25,15 +25,6 @@ type Counter struct {
 	Random     uint32
 }
 
-type Hist struct {
-	Slots [27]uint32
-}
-
-type HistKey struct {
-	CmdFlags uint32
-	Dev      uint32
-}
-
 type Options struct {
 	bpfObjPath string
 	verbose    bool
@@ -43,8 +34,6 @@ type Options struct {
 	times      uint64
 }
 
-const maxCpuNr = 128
-
 var opts = Options{
 	bpfObjPath: "biopattern.bpf.o",
 	verbose:    false,

tools/biosnoop/main.go

@@ -30,11 +30,6 @@ type Event struct {
 	Dev      uint32
 }
 
-func (e Event) CommString() string {
-	flag.Usage()
-	return string(bytes.TrimRight(e.Comm[:], "\x00"))
-}
-
 type Options struct {
 	bpfObjPath string
 	verbose    bool
@@ -204,7 +199,7 @@ func printEvent(data []byte, partitions common.Partitions) {
 	}
 	fmt.Printf("%-11.6f %-14.14s %-7d %-7s %-4s %-10d %-7d ",
 		float64(e.Ts-startTs)/1000000000.0,
-		e.CommString(), e.Pid, name, rwbs, e.Sector, e.Len)
+		common.GoString(e.Comm[:]), e.Pid, name, rwbs, e.Sector, e.Len)
 	if opts.queued {
 		fmt.Printf("%7.3f ", float64(e.Qdelta)/1000000.0)
 	}

tools/bitesize/main.go

@@ -20,7 +20,6 @@ import (
 
 const (
 	TASK_COMM_LEN = 16
-	DISK_NAME_LEN = 32
 	MAX_SLOTS     = 20
 )
 
@@ -32,10 +31,6 @@ type HistKey struct {
 	Comm [TASK_COMM_LEN]byte
 }
 
-func (k HistKey) CommString() string {
-	return string(bytes.TrimRight(k.Comm[:], "\x00"))
-}
-
 type Options struct {
 	bpfObjPath string
 	verbose    bool
@@ -155,7 +150,7 @@ func printLog2Hists(hists *bpf.BPFMap) {
 		for _, v := range hist.Slots {
 			vals = append(vals, int(v))
 		}
-		fmt.Printf("\nProcess Name = %s\n", nextKey.CommString())
+		fmt.Printf("\nProcess Name = %s\n", common.GoString(nextKey.Comm[:]))
 		common.PrintLog2Hist(vals, "Kbytes")
 	}