fix

Author: pythops

oryx-ebpf/src/main.rs

@@ -48,6 +48,9 @@ static BLOCKLIST_IPV4: HashMap<u32, [u16; MAX_RULES_PORT]> =
 #[no_mangle]
 static TRAFFIC_DIRECTION: i32 = 0;
 
+#[no_mangle]
+static PID_HELPER_AVAILABILITY: u8 = 0;
+
 #[classifier]
 pub fn oryx(ctx: TcContext) -> i32 {
     match process(ctx) {
@@ -157,7 +160,13 @@ fn process(ctx: TcContext) -> Result<i32, ()> {
     let pid = if is_ingress() {
         None
     } else {
-        Some((bpf_get_current_pid_tgid() >> 32) as u32)
+        let pid_helper_available = unsafe { core::ptr::read_volatile(&PID_HELPER_AVAILABILITY) };
+
+        if pid_helper_available == 1 {
+            Some((bpf_get_current_pid_tgid() >> 32) as u32)
+        } else {
+            None
+        }
     };
 
     match unsafe { (*eth_header).ether_type } {

oryx-tui/src/ebpf/egress.rs

@@ -10,6 +10,7 @@ use aya::{
     include_bytes_aligned,
     maps::{Array, HashMap},
     programs::{tc, SchedClassifier, TcAttachType},
+    util::KernelVersion,
     EbpfLoader,
 };
 use log::error;
@@ -29,6 +30,14 @@ use super::{
     EbpfTrafficDirection, RingBuffer,
 };
 
+fn is_pid_helper_available() -> bool {
+    if let Ok(current_version) = KernelVersion::current() {
+        current_version >= KernelVersion::new(6, 10, 0)
+    } else {
+        false
+    }
+}
+
 pub fn load_egress(
     iface: String,
     notification_sender: kanal::Sender<Event>,
@@ -51,9 +60,12 @@ pub fn load_egress(
 
             let traffic_direction = EbpfTrafficDirection::Egress as i32;
 
+            let pid_helper_available = is_pid_helper_available() as u8;
+
             #[cfg(debug_assertions)]
             let mut bpf = match EbpfLoader::new()
                 .set_global("TRAFFIC_DIRECTION", &traffic_direction, true)
+                .set_global("PID_HELPER_AVAILABILITY", &pid_helper_available, false)
                 .load(include_bytes_aligned!(env!("ORYX_BIN_PATH")))
             {
                 Ok(v) => v,