tetragon: Remove mapDir from program.Load* functions

Removing mapDir from program.Load* functions and related callers. Signed-off-by: Jiri Olsa <jolsa@kernel.org>
cilium · Feb 21, 2024 · 74e820c · 74e820c
1 parent 1fdc0bf
commit 74e820c
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 25 deletions.
diff --git a/pkg/sensors/exec/exec.go b/pkg/sensors/exec/exec.go
@@ -227,7 +227,7 @@ func handleCgroupEvent(r *bytes.Reader) ([]observer.Event, error) {
 type execProbe struct{}
 
 func (e *execProbe) LoadProbe(args sensors.LoadProbeArgs) error {
-	err := program.LoadTracepointProgram(args.BPFDir, args.MapDir, args.Load, args.Verbose)
+	err := program.LoadTracepointProgram(args.BPFDir, args.Load, args.Verbose)
 	if err == nil {
 		err = procevents.GetRunningProcs()
 	}

diff --git a/pkg/sensors/load.go b/pkg/sensors/load.go
@@ -335,11 +335,11 @@ func loadInstance(bpfDir, mapDir string, load *program.Program, version, verbose
 
 	switch load.Type {
 	case "tracepoint":
-		return program.LoadTracepointProgram(bpfDir, mapDir, load, verbose)
+		return program.LoadTracepointProgram(bpfDir, load, verbose)
 	case "raw_tracepoint", "raw_tp":
-		return program.LoadRawTracepointProgram(bpfDir, mapDir, load, verbose)
+		return program.LoadRawTracepointProgram(bpfDir, load, verbose)
 	case "cgrp_socket":
-		return cgroup.LoadCgroupProgram(bpfDir, mapDir, load, verbose)
+		return cgroup.LoadCgroupProgram(bpfDir, load, verbose)
 	}
 
 	if probe != nil {
@@ -353,7 +353,7 @@ func loadInstance(bpfDir, mapDir string, load *program.Program, version, verbose
 		})
 	}
 
-	return program.LoadKprobeProgram(bpfDir, mapDir, load, verbose)
+	return program.LoadKprobeProgram(bpfDir, load, verbose)
 }
 
 func observerMinReqs() (bool, error) {

diff --git a/pkg/sensors/program/cgroup/cgroup.go b/pkg/sensors/program/cgroup/cgroup.go
@@ -19,14 +19,14 @@ var (
 )
 
 func LoadSockOpt(
-	bpfDir, mapDir string,
+	bpfDir string,
 	load *program.Program, verbose int,
 ) error {
-	return LoadCgroupProgram(bpfDir, mapDir, load, verbose)
+	return LoadCgroupProgram(bpfDir, load, verbose)
 }
 
 func LoadCgroupProgram(
-	bpfDir, mapDir string,
+	bpfDir string,
 	load *program.Program, verbose int) error {
 	if fgsCgroupFD < 0 {
 		fd, err := unix.Open(fgsCgroupPath, unix.O_RDONLY, 0)

diff --git a/pkg/sensors/program/loader.go b/pkg/sensors/program/loader.go
@@ -430,7 +430,7 @@ func MultiKprobeAttach(load *Program, bpfDir string) AttachFunc {
 	}
 }
 
-func LoadTracepointProgram(bpfDir, mapDir string, load *Program, verbose int) error {
+func LoadTracepointProgram(bpfDir string, load *Program, verbose int) error {
 	var ci *customInstall
 	for mName, mPath := range load.PinMap {
 		if mName == "tp_calls" || mName == "execve_calls" {
@@ -445,14 +445,14 @@ func LoadTracepointProgram(bpfDir, mapDir string, load *Program, verbose int) er
 	return loadProgram(bpfDir, load, opts, verbose)
 }
 
-func LoadRawTracepointProgram(bpfDir, mapDir string, load *Program, verbose int) error {
+func LoadRawTracepointProgram(bpfDir string, load *Program, verbose int) error {
 	opts := &loadOpts{
 		attach: RawTracepointAttach(load),
 	}
 	return loadProgram(bpfDir, load, opts, verbose)
 }
 
-func LoadKprobeProgram(bpfDir, mapDir string, load *Program, verbose int) error {
+func LoadKprobeProgram(bpfDir string, load *Program, verbose int) error {
 	var ci *customInstall
 	for mName, mPath := range load.PinMap {
 		if mName == "kprobe_calls" || mName == "retkprobe_calls" {
@@ -490,14 +490,14 @@ func KprobeAttachMany(load *Program, syms []string) AttachFunc {
 	}
 }
 
-func LoadKprobeProgramAttachMany(bpfDir, mapDir string, load *Program, syms []string, verbose int) error {
+func LoadKprobeProgramAttachMany(bpfDir string, load *Program, syms []string, verbose int) error {
 	opts := &loadOpts{
 		attach: KprobeAttachMany(load, syms),
 	}
 	return loadProgram(bpfDir, load, opts, verbose)
 }
 
-func LoadUprobeProgram(bpfDir, mapDir string, load *Program, verbose int) error {
+func LoadUprobeProgram(bpfDir string, load *Program, verbose int) error {
 	var ci *customInstall
 	for mName, mPath := range load.PinMap {
 		if mName == "uprobe_calls" {
@@ -512,7 +512,7 @@ func LoadUprobeProgram(bpfDir, mapDir string, load *Program, verbose int) error
 	return loadProgram(bpfDir, load, opts, verbose)
 }
 
-func LoadMultiKprobeProgram(bpfDir, mapDir string, load *Program, verbose int) error {
+func LoadMultiKprobeProgram(bpfDir string, load *Program, verbose int) error {
 	var ci *customInstall
 	for mName, mPath := range load.PinMap {
 		if mName == "kprobe_calls" || mName == "retkprobe_calls" {
@@ -528,7 +528,7 @@ func LoadMultiKprobeProgram(bpfDir, mapDir string, load *Program, verbose int) e
 	return loadProgram(bpfDir, load, opts, verbose)
 }
 
-func LoadFmodRetProgram(bpfDir, mapDir string, load *Program, progName string, verbose int) error {
+func LoadFmodRetProgram(bpfDir string, load *Program, progName string, verbose int) error {
 	opts := &loadOpts{
 		attach: func(
 			_ *ebpf.Collection,
@@ -564,14 +564,14 @@ func LoadFmodRetProgram(bpfDir, mapDir string, load *Program, progName string, v
 	return loadProgram(bpfDir, load, opts, verbose)
 }
 
-func LoadTracingProgram(bpfDir, mapDir string, load *Program, verbose int) error {
+func LoadTracingProgram(bpfDir string, load *Program, verbose int) error {
 	opts := &loadOpts{
 		attach: TracingAttach(),
 	}
 	return loadProgram(bpfDir, load, opts, verbose)
 }
 
-func LoadLSMProgram(bpfDir, mapDir string, load *Program, verbose int) error {
+func LoadLSMProgram(bpfDir string, load *Program, verbose int) error {
 	opts := &loadOpts{
 		attach: LSMAttach(),
 	}

diff --git a/pkg/sensors/tracing/generickprobe.go b/pkg/sensors/tracing/generickprobe.go
@@ -952,7 +952,7 @@ func loadSingleKprobeSensor(id idtable.EntryID, bpfDir, mapDir string, load *pro
 	}
 	load.MapLoad = append(load.MapLoad, config)
 
-	if err := program.LoadKprobeProgram(bpfDir, mapDir, load, verbose); err == nil {
+	if err := program.LoadKprobeProgram(bpfDir, load, verbose); err == nil {
 		logger.GetLogger().Infof("Loaded generic kprobe program: %s -> %s", load.Name, load.Attach)
 	} else {
 		return err
@@ -996,7 +996,7 @@ func loadMultiKprobeSensor(ids []idtable.EntryID, bpfDir, mapDir string, load *p
 	load.OverrideFmodRet = false
 	load.SetAttachData(data)
 
-	if err := program.LoadMultiKprobeProgram(bpfDir, mapDir, load, verbose); err == nil {
+	if err := program.LoadMultiKprobeProgram(bpfDir, load, verbose); err == nil {
 		logger.GetLogger().Infof("Loaded generic kprobe sensor: %s -> %s", load.Name, load.Attach)
 	} else {
 		return err

diff --git a/pkg/sensors/tracing/generictracepoint.go b/pkg/sensors/tracing/generictracepoint.go
@@ -598,7 +598,7 @@ func LoadGenericTracepointSensor(bpfDir, mapDir string, load *program.Program, v
 	}
 	load.MapLoad = append(load.MapLoad, cfg)
 
-	if err := program.LoadTracepointProgram(bpfDir, mapDir, load, verbose); err == nil {
+	if err := program.LoadTracepointProgram(bpfDir, load, verbose); err == nil {
 		logger.GetLogger().Infof("Loaded generic tracepoint program: %s -> %s", load.Name, load.Attach)
 	} else {
 		return err

diff --git a/pkg/sensors/tracing/genericuprobe.go b/pkg/sensors/tracing/genericuprobe.go
@@ -147,7 +147,7 @@ func (k *observerUprobeSensor) LoadProbe(args sensors.LoadProbeArgs) error {
 
 	sensors.AllPrograms = append(sensors.AllPrograms, load)
 
-	if err := program.LoadUprobeProgram(args.BPFDir, args.MapDir, args.Load, args.Verbose); err != nil {
+	if err := program.LoadUprobeProgram(args.BPFDir, args.Load, args.Verbose); err != nil {
 		return err
 	}
 

diff --git a/pkg/sensors/tracing/killer.go b/pkg/sensors/tracing/killer.go
@@ -107,7 +107,7 @@ func (kp *killerPolicy) loadSingleKillerSensor(
 	kh *killerHandler,
 	bpfDir, mapDir string, load *program.Program, verbose int,
 ) error {
-	if err := program.LoadKprobeProgramAttachMany(bpfDir, mapDir, load, kh.syscallsSyms, verbose); err == nil {
+	if err := program.LoadKprobeProgramAttachMany(bpfDir, load, kh.syscallsSyms, verbose); err == nil {
 		logger.GetLogger().Infof("Loaded killer sensor: %s", load.Attach)
 	} else {
 		return err
@@ -125,7 +125,7 @@ func (kp *killerPolicy) loadMultiKillerSensor(
 
 	load.SetAttachData(data)
 
-	if err := program.LoadMultiKprobeProgram(bpfDir, mapDir, load, verbose); err != nil {
+	if err := program.LoadMultiKprobeProgram(bpfDir, load, verbose); err != nil {
 		return err
 	}
 
@@ -151,7 +151,7 @@ func (kp *killerPolicy) LoadProbe(args sensors.LoadProbeArgs) error {
 	}
 
 	if strings.HasPrefix(args.Load.Label, "fmod_ret/") {
-		return program.LoadFmodRetProgram(args.BPFDir, args.MapDir, args.Load, "fmodret_killer", args.Verbose)
+		return program.LoadFmodRetProgram(args.BPFDir, args.Load, "fmodret_killer", args.Verbose)
 	}
 
 	return fmt.Errorf("killer loader: unknown label: %s", args.Load.Label)

diff --git a/pkg/sensors/tracing/loader.go b/pkg/sensors/tracing/loader.go
@@ -180,7 +180,7 @@ func (k *loaderSensor) LoadProbe(args sensors.LoadProbeArgs) error {
 		if err := createLoaderEvents(); err != nil {
 			return err
 		}
-		return program.LoadKprobeProgram(args.BPFDir, args.MapDir, args.Load, args.Verbose)
+		return program.LoadKprobeProgram(args.BPFDir, args.Load, args.Verbose)
 	}
 	return nil
 }