From fe527e8f23c74ef96f00bd91675600745cde0546 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Thu, 15 Feb 2024 14:39:06 +0000 Subject: [PATCH] tetragon: Remove MapDir from LoadProbeArgs Removing MapDir from LoadProbeArgs and from its related users. Signed-off-by: Jiri Olsa --- pkg/sensors/load.go | 1 - pkg/sensors/sensors.go | 2 +- pkg/sensors/tracing/generickprobe.go | 12 ++++++------ pkg/sensors/tracing/generictracepoint.go | 4 ++-- pkg/sensors/tracing/killer.go | 8 ++++---- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkg/sensors/load.go b/pkg/sensors/load.go index 3defae5c043..3fb35f8241d 100644 --- a/pkg/sensors/load.go +++ b/pkg/sensors/load.go @@ -346,7 +346,6 @@ func loadInstance(bpfDir, mapDir string, load *program.Program, version, verbose // Registered probes need extra setup return probe.LoadProbe(LoadProbeArgs{ BPFDir: bpfDir, - MapDir: mapDir, Load: load, Version: version, Verbose: verbose, diff --git a/pkg/sensors/sensors.go b/pkg/sensors/sensors.go index 3a797a63c8a..19d96443458 100644 --- a/pkg/sensors/sensors.go +++ b/pkg/sensors/sensors.go @@ -119,7 +119,7 @@ func RegisterProbeType(probeType string, s probeLoader) { // LoadProbeArgs are the args to the LoadProbe function. type LoadProbeArgs struct { - BPFDir, MapDir string + BPFDir string Load *program.Program Version, Verbose int } diff --git a/pkg/sensors/tracing/generickprobe.go b/pkg/sensors/tracing/generickprobe.go index 5d52a829a48..f9fea967d1e 100644 --- a/pkg/sensors/tracing/generickprobe.go +++ b/pkg/sensors/tracing/generickprobe.go @@ -933,7 +933,7 @@ func getMapLoad(load *program.Program, kprobeEntry *genericKprobe, index uint32) return selectorsMaploads(state, kprobeEntry.pinPathPrefix, index) } -func loadSingleKprobeSensor(id idtable.EntryID, bpfDir, mapDir string, load *program.Program, verbose int) error { +func loadSingleKprobeSensor(id idtable.EntryID, bpfDir string, load *program.Program, verbose int) error { gk, err := genericKprobeTableGet(id) if err != nil { return err @@ -961,7 +961,7 @@ func loadSingleKprobeSensor(id idtable.EntryID, bpfDir, mapDir string, load *pro return err } -func loadMultiKprobeSensor(ids []idtable.EntryID, bpfDir, mapDir string, load *program.Program, verbose int) error { +func loadMultiKprobeSensor(ids []idtable.EntryID, bpfDir string, load *program.Program, verbose int) error { bin_buf := make([]bytes.Buffer, len(ids)) data := &program.MultiKprobeAttachData{} @@ -1005,12 +1005,12 @@ func loadMultiKprobeSensor(ids []idtable.EntryID, bpfDir, mapDir string, load *p return nil } -func loadGenericKprobeSensor(bpfDir, mapDir string, load *program.Program, verbose int) error { +func loadGenericKprobeSensor(bpfDir string, load *program.Program, verbose int) error { if id, ok := load.LoaderData.(idtable.EntryID); ok { - return loadSingleKprobeSensor(id, bpfDir, mapDir, load, verbose) + return loadSingleKprobeSensor(id, bpfDir, load, verbose) } if ids, ok := load.LoaderData.([]idtable.EntryID); ok { - return loadMultiKprobeSensor(ids, bpfDir, mapDir, load, verbose) + return loadMultiKprobeSensor(ids, bpfDir, load, verbose) } return fmt.Errorf("invalid loadData type: expecting idtable.EntryID/[] and got: %T (%v)", load.LoaderData, load.LoaderData) @@ -1234,5 +1234,5 @@ func retprobeMerge(prev pendingEvent, curr pendingEvent) *tracing.MsgGenericKpro } func (k *observerKprobeSensor) LoadProbe(args sensors.LoadProbeArgs) error { - return loadGenericKprobeSensor(args.BPFDir, args.MapDir, args.Load, args.Verbose) + return loadGenericKprobeSensor(args.BPFDir, args.Load, args.Verbose) } diff --git a/pkg/sensors/tracing/generictracepoint.go b/pkg/sensors/tracing/generictracepoint.go index 232f6f34f4f..3a096b9776e 100644 --- a/pkg/sensors/tracing/generictracepoint.go +++ b/pkg/sensors/tracing/generictracepoint.go @@ -567,7 +567,7 @@ func (tp *genericTracepoint) EventConfig() (api.EventConfig, error) { return config, nil } -func LoadGenericTracepointSensor(bpfDir, mapDir string, load *program.Program, verbose int) error { +func LoadGenericTracepointSensor(bpfDir string, load *program.Program, verbose int) error { tracepointLog = logger.GetLogger() @@ -760,5 +760,5 @@ func handleMsgGenericTracepoint( } func (t *observerTracepointSensor) LoadProbe(args sensors.LoadProbeArgs) error { - return LoadGenericTracepointSensor(args.BPFDir, args.MapDir, args.Load, args.Verbose) + return LoadGenericTracepointSensor(args.BPFDir, args.Load, args.Verbose) } diff --git a/pkg/sensors/tracing/killer.go b/pkg/sensors/tracing/killer.go index 0b969cbd137..dd4ebcfcc0d 100644 --- a/pkg/sensors/tracing/killer.go +++ b/pkg/sensors/tracing/killer.go @@ -105,7 +105,7 @@ func (kp *killerPolicy) PolicyHandler( func (kp *killerPolicy) loadSingleKillerSensor( kh *killerHandler, - bpfDir, mapDir string, load *program.Program, verbose int, + bpfDir string, load *program.Program, verbose int, ) error { if err := program.LoadKprobeProgramAttachMany(bpfDir, load, kh.syscallsSyms, verbose); err == nil { logger.GetLogger().Infof("Loaded killer sensor: %s", load.Attach) @@ -117,7 +117,7 @@ func (kp *killerPolicy) loadSingleKillerSensor( func (kp *killerPolicy) loadMultiKillerSensor( kh *killerHandler, - bpfDir, mapDir string, load *program.Program, verbose int, + bpfDir string, load *program.Program, verbose int, ) error { data := &program.MultiKprobeAttachData{} @@ -144,10 +144,10 @@ func (kp *killerPolicy) LoadProbe(args sensors.LoadProbeArgs) error { return fmt.Errorf("failed to get killer handler for '%s'", name) } if args.Load.Label == "kprobe.multi/killer" { - return kp.loadMultiKillerSensor(kh, args.BPFDir, args.MapDir, args.Load, args.Verbose) + return kp.loadMultiKillerSensor(kh, args.BPFDir, args.Load, args.Verbose) } if args.Load.Label == "kprobe/killer" { - return kp.loadSingleKillerSensor(kh, args.BPFDir, args.MapDir, args.Load, args.Verbose) + return kp.loadSingleKillerSensor(kh, args.BPFDir, args.Load, args.Verbose) } if strings.HasPrefix(args.Load.Label, "fmod_ret/") {