Merge pull request #78 from coroot/tracefs

def · web-flow · commit 58f0336ded41 · 2024-04-30T11:27:20.000+03:00
require either `debugfs` or `tracefs` to be mounted
diff --git a/ebpftracer/tracer.go b/ebpftracer/tracer.go
@@ -170,9 +170,11 @@ func (t *Tracer) ebpf(ch chan<- Event) error {
 	if len(prg) == 0 {
 		return fmt.Errorf("unsupported kernel version: %s", t.kernelVersion)
 	}
+	_, debugFsErr := os.Stat("/sys/kernel/debug/tracing")
+	_, traceFsErr := os.Stat("/sys/kernel/tracing")
 
-	if _, err := os.Stat("/sys/kernel/debug/tracing"); err != nil {
-		return fmt.Errorf("kernel tracing is not available: %w", err)
+	if debugFsErr != nil && traceFsErr != nil {
+		return fmt.Errorf("kernel tracing is not available: debugfs or tracefs must be mounted")
 	}
 
 	collectionSpec, err := ebpf.LoadCollectionSpecFromReader(bytes.NewReader(prg))

Original file line number	Diff line number	Diff line change
`@@ -170,9 +170,11 @@ func (t *Tracer) ebpf(ch chan<- Event) error {`
`170`	`170`	`if len(prg) == 0 {`
`171`	`171`	`return fmt.Errorf("unsupported kernel version: %s", t.kernelVersion)`
`172`	`172`	`}`
	`173`	`+ _, debugFsErr := os.Stat("/sys/kernel/debug/tracing")`
	`174`	`+ _, traceFsErr := os.Stat("/sys/kernel/tracing")`
`173`	`175`
`174`		`- if _, err := os.Stat("/sys/kernel/debug/tracing"); err != nil {`
`175`		`- return fmt.Errorf("kernel tracing is not available: %w", err)`
	`176`	`+ if debugFsErr != nil && traceFsErr != nil {`
	`177`	`+ return fmt.Errorf("kernel tracing is not available: debugfs or tracefs must be mounted")`
`176`	`178`	`}`
`177`	`179`
`178`	`180`	`collectionSpec, err := ebpf.LoadCollectionSpecFromReader(bytes.NewReader(prg))`