NETOBSERV-1507: some arch still missing fentry hook types this PR fal…

…lback to kprobe (#265) Signed-off-by: Mohamed Mahmoud <[email protected]>
netobserv · Feb 15, 2024 · e9d99fc · e9d99fc
1 parent 767265d
commit e9d99fc
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 2 deletions.
diff --git a/bpf/rtt_tracker.h b/bpf/rtt_tracker.h
@@ -157,4 +157,12 @@ int BPF_PROG(tcp_rcv_fentry, struct sock *sk, struct sk_buff *skb) {
 	return calculate_flow_rtt_tcp(sk, skb);
 }
 
+SEC("kprobe/tcp_rcv_established")
+int BPF_KPROBE(tcp_rcv_kprobe, struct sock *sk, struct sk_buff *skb) {
+    if (sk == NULL || skb == NULL) {
+        return 0;
+    }
+	return calculate_flow_rtt_tcp(sk, skb);
+}
+
 #endif /* __RTT_TRACKER_H__ */
diff --git a/pkg/ebpf/bpf_arm64_bpfel.go b/pkg/ebpf/bpf_arm64_bpfel.go
diff --git a/pkg/ebpf/bpf_arm64_bpfel.o b/pkg/ebpf/bpf_arm64_bpfel.o
diff --git a/pkg/ebpf/bpf_powerpc_bpfel.go b/pkg/ebpf/bpf_powerpc_bpfel.go
diff --git a/pkg/ebpf/bpf_powerpc_bpfel.o b/pkg/ebpf/bpf_powerpc_bpfel.o
diff --git a/pkg/ebpf/bpf_s390_bpfeb.go b/pkg/ebpf/bpf_s390_bpfeb.go
diff --git a/pkg/ebpf/bpf_s390_bpfeb.o b/pkg/ebpf/bpf_s390_bpfeb.o
diff --git a/pkg/ebpf/bpf_x86_bpfel.go b/pkg/ebpf/bpf_x86_bpfel.go
diff --git a/pkg/ebpf/bpf_x86_bpfel.o b/pkg/ebpf/bpf_x86_bpfel.o
diff --git a/pkg/ebpf/tracer.go b/pkg/ebpf/tracer.go
@@ -62,6 +62,7 @@ type FlowFetcher struct {
 	enableEgress       bool
 	pktDropsTracePoint link.Link
 	rttFentryLink      link.Link
+	rttKprobeLink      link.Link
 }
 
 type FlowFetcherConfig struct {
@@ -141,13 +142,18 @@ func NewFlowFetcher(cfg *FlowFetcherConfig) (*FlowFetcher, error) {
 		}
 	}
 
-	var rttFentryLink link.Link
+	var rttFentryLink, rttKprobeLink link.Link
 	if cfg.EnableRTT {
 		rttFentryLink, err = link.AttachTracing(link.TracingOptions{
 			Program: objects.BpfPrograms.TcpRcvFentry,
 		})
 		if err != nil {
-			return nil, fmt.Errorf("failed to attach the BPF program to tcpReceiveFentry: %w", err)
+			log.Warningf("failed to attach the BPF program to tcpReceiveFentry: %v fallback to use kprobe", err)
+			// try to use kprobe for older kernels
+			rttKprobeLink, err = link.Kprobe("tcp_rcv_established", objects.TcpRcvKprobe, nil)
+			if err != nil {
+				return nil, fmt.Errorf("failed to attach the BPF program to tcpReceiveKprobe: %w", err)
+			}
 		}
 	}
 
@@ -167,6 +173,7 @@ func NewFlowFetcher(cfg *FlowFetcherConfig) (*FlowFetcher, error) {
 		enableEgress:       cfg.EnableEgress,
 		pktDropsTracePoint: pktDropsLink,
 		rttFentryLink:      rttFentryLink,
+		rttKprobeLink:      rttKprobeLink,
 	}, nil
 }
 
@@ -300,6 +307,11 @@ func (m *FlowFetcher) Close() error {
 			errs = append(errs, err)
 		}
 	}
+	if m.rttKprobeLink != nil {
+		if err := m.rttKprobeLink.Close(); err != nil {
+			errs = append(errs, err)
+		}
+	}
 	// m.ringbufReader.Read is a blocking operation, so we need to close the ring buffer
 	// from another goroutine to avoid the system not being able to exit if there
 	// isn't traffic in a given interface
@@ -460,6 +472,7 @@ func kernelSpecificLoadAndAssign(oldKernel bool, spec *ebpf.CollectionSpec) (Bpf
 			EgressFlowParse  *ebpf.Program `ebpf:"egress_flow_parse"`
 			IngressFlowParse *ebpf.Program `ebpf:"ingress_flow_parse"`
 			TCPRcvFentry     *ebpf.Program `ebpf:"tcp_rcv_fentry"`
+			TCPRcvKprobe     *ebpf.Program `ebpf:"tcp_rcv_kprobe"`
 		}
 		type NewBpfObjects struct {
 			NewBpfPrograms
@@ -485,6 +498,7 @@ func kernelSpecificLoadAndAssign(oldKernel bool, spec *ebpf.CollectionSpec) (Bpf
 		objects.EgressFlowParse = newObjects.EgressFlowParse
 		objects.IngressFlowParse = newObjects.IngressFlowParse
 		objects.TcpRcvFentry = newObjects.TCPRcvFentry
+		objects.TcpRcvKprobe = newObjects.TCPRcvKprobe
 		objects.KfreeSkb = nil
 	} else {
 		if err := spec.LoadAndAssign(&objects, nil); err != nil {