vey-daemon: simplify ebpf feature cfg guard

Author: zh-jq

lib/vey-daemon/src/listen/quic.rs

@@ -8,15 +8,15 @@ use std::net::{SocketAddr, UdpSocket};
 use std::sync::Arc;
 use std::time::Duration;
 
-#[cfg(all(target_os = "linux", feature = "ebpf"))]
+#[cfg(feature = "ebpf")]
 use anyhow::anyhow;
 use async_trait::async_trait;
 use log::{info, warn};
 use quinn::{Connection, Endpoint, Incoming};
 use tokio::runtime::Handle;
 use tokio::sync::broadcast;
 
-#[cfg(all(target_os = "linux", feature = "ebpf"))]
+#[cfg(feature = "ebpf")]
 use vey_reuseport::quic::{QuicSocketSelectGuard, QuicSocketSelector};
 use vey_socket::RawSocket;
 use vey_std_ext::net::SocketAddrExt;
@@ -43,7 +43,7 @@ pub struct ListenQuicRuntime<S> {
     server: S,
     listen_config: UdpListenConfig,
     listen_stats: Arc<ListenStats>,
-    #[cfg(all(target_os = "linux", feature = "ebpf"))]
+    #[cfg(feature = "ebpf")]
     socket_selector: Option<QuicSocketSelector>,
 }
 
@@ -56,7 +56,7 @@ where
             server,
             listen_config,
             listen_stats,
-            #[cfg(all(target_os = "linux", feature = "ebpf"))]
+            #[cfg(feature = "ebpf")]
             socket_selector: None,
         }
     }
@@ -77,7 +77,7 @@ where
             }
         }
 
-        #[cfg(all(target_os = "linux", feature = "ebpf"))]
+        #[cfg(feature = "ebpf")]
         if self
             .listen_config
             .use_ebpf(rustix::process::getuid().as_raw())
@@ -107,7 +107,7 @@ where
 
         for i in 0..instance_count {
             let socket = vey_socket::udp::new_std_bind_listen(&self.listen_config)?;
-            #[cfg(all(target_os = "linux", feature = "ebpf"))]
+            #[cfg(feature = "ebpf")]
             let guard = if let Some(selector) = &mut self.socket_selector {
                 let guard = selector.add_socket(RawSocket::from(&socket))?;
                 Some(guard)
@@ -128,7 +128,7 @@ where
                 instance_id: i,
                 ingress_net_filter: ingress_net_filter.cloned(),
                 accept_timeout,
-                #[cfg(all(target_os = "linux", feature = "ebpf"))]
+                #[cfg(feature = "ebpf")]
                 _bpf_guard: guard,
                 _alive_guard: None,
             };
@@ -139,7 +139,7 @@ where
             );
         }
 
-        #[cfg(all(target_os = "linux", feature = "ebpf"))]
+        #[cfg(feature = "ebpf")]
         if let Some(mut selector) = self.socket_selector.take() {
             if let Err(e) = selector.load_and_attach() {
                 if self.listen_config.fail_on_ebpf_error() {
@@ -180,7 +180,7 @@ pub struct ListenQuicRuntimeInstance<S> {
     instance_id: usize,
     ingress_net_filter: Option<Arc<AclNetworkRule>>,
     accept_timeout: Duration,
-    #[cfg(all(target_os = "linux", feature = "ebpf"))]
+    #[cfg(feature = "ebpf")]
     _bpf_guard: Option<QuicSocketSelectGuard>,
     _alive_guard: Option<ListenAliveGuard>,
 }

lib/vey-daemon/src/listen/tcp.rs

@@ -7,7 +7,7 @@
 use std::net::SocketAddr;
 use std::sync::Arc;
 
-#[cfg(all(target_os = "linux", feature = "ebpf"))]
+#[cfg(feature = "ebpf")]
 use anyhow::anyhow;
 use async_trait::async_trait;
 use log::{info, warn};
@@ -17,7 +17,7 @@ use tokio::sync::broadcast;
 
 use vey_compat::CpuAffinity;
 use vey_io_ext::LimitedTcpListener;
-#[cfg(all(target_os = "linux", feature = "ebpf"))]
+#[cfg(feature = "ebpf")]
 use vey_reuseport::tcp::TcpSocketSelector;
 use vey_socket::RawSocket;
 use vey_std_ext::net::SocketAddrExt;
@@ -34,7 +34,7 @@ pub trait AcceptTcpServer: BaseServer {
 pub struct ListenTcpRuntime<S> {
     server: S,
     listen_stats: Arc<ListenStats>,
-    #[cfg(all(target_os = "linux", feature = "ebpf"))]
+    #[cfg(feature = "ebpf")]
     socket_selector: Option<TcpSocketSelector>,
 }
 
@@ -46,7 +46,7 @@ where
         ListenTcpRuntime {
             server,
             listen_stats,
-            #[cfg(all(target_os = "linux", feature = "ebpf"))]
+            #[cfg(feature = "ebpf")]
             socket_selector: None,
         }
     }
@@ -82,7 +82,7 @@ where
             }
         }
 
-        #[cfg(all(target_os = "linux", feature = "ebpf"))]
+        #[cfg(feature = "ebpf")]
         if listen_config.use_ebpf(rustix::process::getuid().as_raw()) {
             match TcpSocketSelector::new(
                 rustix::process::getpid().as_raw_pid(),
@@ -109,7 +109,7 @@ where
 
         for i in 0..instance_count {
             let listener = vey_socket::tcp::new_std_listener(listen_config)?;
-            #[cfg(all(target_os = "linux", feature = "ebpf"))]
+            #[cfg(feature = "ebpf")]
             if let Some(selector) = &mut self.socket_selector {
                 selector.add_socket(RawSocket::from(&listener));
             }
@@ -122,7 +122,7 @@ where
             );
         }
 
-        #[cfg(all(target_os = "linux", feature = "ebpf"))]
+        #[cfg(feature = "ebpf")]
         if let Some(mut selector) = self.socket_selector.take() {
             if let Err(e) = selector.load_and_attach() {
                 if listen_config.fail_on_ebpf_error() {

lib/vey-daemon/src/listen/udp/listen.rs

@@ -21,7 +21,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::task::{Context, Poll};
 
-#[cfg(all(target_os = "linux", feature = "ebpf"))]
+#[cfg(feature = "ebpf")]
 use anyhow::anyhow;
 use async_trait::async_trait;
 use bytes::Bytes;
@@ -32,11 +32,12 @@ use smallvec::SmallVec;
 use tokio::net::UdpSocket;
 use tokio::runtime::Handle;
 use tokio::sync::{broadcast, mpsc};
+#[cfg(feature = "ebpf")]
 use tokio::time::Instant;
 
 use vey_io_ext::{UdpMoveRecv, UdpMoveSend, UdpSocketExt};
 use vey_io_sys::udp::{RecvMsgHdr, SendMsgHdr};
-#[cfg(all(target_os = "linux", feature = "ebpf"))]
+#[cfg(feature = "ebpf")]
 use vey_reuseport::udp::{UdpSocketSelectGuard, UdpSocketSelector};
 use vey_socket::RawSocket;
 use vey_types::acl::{AclAction, AclNetworkRule};
@@ -434,7 +435,7 @@ pub struct ListenUdpRuntime<S> {
     conn_track: UdpConnectionTrackConfig,
     packet_max_size: u16,
     listen_stats: Arc<ListenStats>,
-    #[cfg(all(target_os = "linux", feature = "ebpf"))]
+    #[cfg(feature = "ebpf")]
     socket_selector: Option<UdpSocketSelector>,
 }
 
@@ -455,7 +456,7 @@ where
             conn_track,
             packet_max_size,
             listen_stats,
-            #[cfg(all(target_os = "linux", feature = "ebpf"))]
+            #[cfg(feature = "ebpf")]
             socket_selector: None,
         }
     }
@@ -532,7 +533,7 @@ where
             listen_in_worker,
             instance_id: id,
             ingress_net_filter: None,
-            #[cfg(all(target_os = "linux", feature = "ebpf"))]
+            #[cfg(feature = "ebpf")]
             _bpf_guard: None,
             _alive_guard: None,
 
@@ -554,7 +555,7 @@ where
             }
         }
 
-        #[cfg(all(target_os = "linux", feature = "ebpf"))]
+        #[cfg(feature = "ebpf")]
         if self
             .listen_config
             .use_ebpf(rustix::process::getuid().as_raw())
@@ -589,15 +590,15 @@ where
 
             let mut runtime = self.create_instance(i, listen_addr, listen_in_worker);
             runtime.ingress_net_filter = ingress_net_filter.cloned();
-            #[cfg(all(target_os = "linux", feature = "ebpf"))]
+            #[cfg(feature = "ebpf")]
             if let Some(selector) = &mut self.socket_selector {
                 let guard = selector.add_socket(RawSocket::from(&socket));
                 runtime._bpf_guard = Some(guard);
             }
             runtime.into_running(socket, server_reload_sender.subscribe());
         }
 
-        #[cfg(all(target_os = "linux", feature = "ebpf"))]
+        #[cfg(feature = "ebpf")]
         if let Some(mut selector) = self.socket_selector.take() {
             if let Err(e) = selector.load_and_attach() {
                 if self.listen_config.fail_on_ebpf_error() {
@@ -639,7 +640,7 @@ struct ListenUdpRuntimeInstance<S> {
     listen_in_worker: bool,
     instance_id: usize,
     ingress_net_filter: Option<Arc<AclNetworkRule>>,
-    #[cfg(all(target_os = "linux", feature = "ebpf"))]
+    #[cfg(feature = "ebpf")]
     _bpf_guard: Option<UdpSocketSelectGuard>,
     _alive_guard: Option<ListenAliveGuard>,