max_entries of flow_directions map sets from configuration (#959)

grafana · Jun 22, 2024 · 3a59841 · 3a59841
1 parent d7d75a1
commit 3a59841
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 3 deletions.
diff --git a/bpf/flows_common.h b/bpf/flows_common.h
@@ -48,7 +48,6 @@ struct {
 // Key: the flow identifier. Value: the flow direction.
 struct {
 	__uint(type, BPF_MAP_TYPE_LRU_HASH);
-	__uint(max_entries, 1 << 24);
 	__type(key, flow_id);
 	__type(value, u8);
 } flow_directions SEC(".maps");

diff --git a/pkg/internal/netolly/ebpf/net_bpfel_arm64.o b/pkg/internal/netolly/ebpf/net_bpfel_arm64.o
diff --git a/pkg/internal/netolly/ebpf/net_bpfel_x86.o b/pkg/internal/netolly/ebpf/net_bpfel_x86.o
diff --git a/pkg/internal/netolly/ebpf/netsk_bpfel_arm64.o b/pkg/internal/netolly/ebpf/netsk_bpfel_arm64.o
diff --git a/pkg/internal/netolly/ebpf/netsk_bpfel_x86.o b/pkg/internal/netolly/ebpf/netsk_bpfel_x86.o
diff --git a/pkg/internal/netolly/ebpf/sock_tracer.go b/pkg/internal/netolly/ebpf/sock_tracer.go
@@ -63,8 +63,9 @@ func NewSockFlowFetcher(
 		return nil, fmt.Errorf("loading BPF data: %w", err)
 	}
 
-	// Resize aggregated flows map according to user-provided configuration
+	// Resize aggregated flows and flow directions maps according to user-provided configuration
 	spec.Maps[aggregatedFlowsMap].MaxEntries = uint32(cacheMaxSize)
+	spec.Maps[flowDirectionsMap].MaxEntries = uint32(cacheMaxSize)
 
 	traceMsgs := 0
 	if tlog.Enabled(context.TODO(), slog.LevelDebug) {

diff --git a/pkg/internal/netolly/ebpf/tracer.go b/pkg/internal/netolly/ebpf/tracer.go
@@ -45,6 +45,7 @@ const (
 	constSampling      = "sampling"
 	constTraceMessages = "trace_messages"
 	aggregatedFlowsMap = "aggregated_flows"
+	flowDirectionsMap  = "flow_directions"
 )
 
 func tlog() *slog.Logger {
@@ -82,8 +83,9 @@ func NewFlowFetcher(
 		return nil, fmt.Errorf("loading BPF data: %w", err)
 	}
 
-	// Resize aggregated flows map according to user-provided configuration
+	// Resize aggregated flows and flow directions maps according to user-provided configuration
 	spec.Maps[aggregatedFlowsMap].MaxEntries = uint32(cacheMaxSize)
+	spec.Maps[flowDirectionsMap].MaxEntries = uint32(cacheMaxSize)
 
 	traceMsgs := 0
 	if tlog.Enabled(context.TODO(), slog.LevelDebug) {