From bdc5fe9c0af84296d4970445c004af96615e9988 Mon Sep 17 00:00:00 2001 From: Oleksandr Deundiak Date: Fri, 8 Nov 2024 17:08:36 +0100 Subject: [PATCH] feat(rust): disable ebpf logs --- .../rust/ockam/ockam_ebpf/Cargo.toml | 6 ++- .../rust/ockam/ockam_ebpf/ockam_ebpf | Bin 69896 -> 3392 bytes .../rust/ockam/ockam_ebpf/src/common.rs | 14 +++--- .../rust/ockam/ockam_ebpf/src/entrypoint.rs | 6 +++ .../rust/ockam/ockam_ebpf/src/logger_aya.rs | 34 ++++++++++++++ .../rust/ockam/ockam_ebpf/src/logger_noop.rs | 44 ++++++++++++++++++ 6 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 implementations/rust/ockam/ockam_ebpf/src/logger_aya.rs create mode 100644 implementations/rust/ockam/ockam_ebpf/src/logger_noop.rs diff --git a/implementations/rust/ockam/ockam_ebpf/Cargo.toml b/implementations/rust/ockam/ockam_ebpf/Cargo.toml index 7d81b9a2ada..ecb3f493711 100644 --- a/implementations/rust/ockam/ockam_ebpf/Cargo.toml +++ b/implementations/rust/ockam/ockam_ebpf/Cargo.toml @@ -15,9 +15,13 @@ description = """ eBPF program used by Ockam TCP Portals """ +[features] +default = [] +logging = ["aya-log-ebpf"] + [dependencies] aya-ebpf = "0.1.1" -aya-log-ebpf = "0.1.1" +aya-log-ebpf = { version = "0.1.1", optional = true } network-types = "0.0.7" [[bin]] diff --git a/implementations/rust/ockam/ockam_ebpf/ockam_ebpf b/implementations/rust/ockam/ockam_ebpf/ockam_ebpf index 27239acff1a32e467524eb1a426ed279aa1cd9f6..82c508d31b420dbfebbc5083c344343b9402afbf 100644 GIT binary patch literal 3392 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 M;orz#i$rk!f4!F0+yDRo diff --git a/implementations/rust/ockam/ockam_ebpf/src/common.rs b/implementations/rust/ockam/ockam_ebpf/src/common.rs index 67f5ed80356..406be886b59 100644 --- a/implementations/rust/ockam/ockam_ebpf/src/common.rs +++ b/implementations/rust/ockam/ockam_ebpf/src/common.rs @@ -9,9 +9,9 @@ use aya_ebpf::bindings::TC_ACT_PIPE; use aya_ebpf::macros::map; use aya_ebpf::maps::HashMap; use aya_ebpf::programs::TcContext; -use aya_log_ebpf::{error, trace, warn}; use crate::conversion::{convert_ockam_to_tcp, convert_tcp_to_ockam}; +use crate::{error, trace, warn}; pub type Proto = u8; @@ -140,7 +140,7 @@ fn handle_ingress_tcp_protocol(ctx: &TcContext, ipv4hdr: *mut Ipv4Hdr) -> Result syn, ack, fin, - rst, + rst ); convert_tcp_to_ockam(ctx, ipv4hdr, proto); @@ -169,7 +169,7 @@ fn handle_ingress_tcp_protocol(ctx: &TcContext, ipv4hdr: *mut Ipv4Hdr) -> Result syn, ack, fin, - rst, + rst ); convert_tcp_to_ockam(ctx, ipv4hdr, proto); @@ -193,7 +193,7 @@ fn handle_ingress_tcp_protocol(ctx: &TcContext, ipv4hdr: *mut Ipv4Hdr) -> Result syn, ack, fin, - rst, + rst ); Ok(TC_ACT_PIPE) @@ -271,7 +271,7 @@ fn handle_egress_ockam_protocol(ctx: &TcContext, ipv4hdr: *mut Ipv4Hdr) -> Resul syn, ack, fin, - rst, + rst ); convert_ockam_to_tcp(ctx, ipv4hdr, tcphdr); @@ -300,7 +300,7 @@ fn handle_egress_ockam_protocol(ctx: &TcContext, ipv4hdr: *mut Ipv4Hdr) -> Resul syn, ack, fin, - rst, + rst ); convert_ockam_to_tcp(ctx, ipv4hdr, tcphdr); @@ -326,7 +326,7 @@ fn handle_egress_ockam_protocol(ctx: &TcContext, ipv4hdr: *mut Ipv4Hdr) -> Resul syn, ack, fin, - rst, + rst ); Ok(TC_ACT_PIPE) diff --git a/implementations/rust/ockam/ockam_ebpf/src/entrypoint.rs b/implementations/rust/ockam/ockam_ebpf/src/entrypoint.rs index 5bfea0fec66..76bb12d74cb 100644 --- a/implementations/rust/ockam/ockam_ebpf/src/entrypoint.rs +++ b/implementations/rust/ockam/ockam_ebpf/src/entrypoint.rs @@ -37,6 +37,12 @@ mod checksum_helpers; mod common; mod conversion; +#[cfg(feature = "logging")] +mod logger_aya; + +#[cfg(not(feature = "logging"))] +mod logger_noop; + use crate::common::Direction; #[classifier] diff --git a/implementations/rust/ockam/ockam_ebpf/src/logger_aya.rs b/implementations/rust/ockam/ockam_ebpf/src/logger_aya.rs new file mode 100644 index 00000000000..5cb22e02979 --- /dev/null +++ b/implementations/rust/ockam/ockam_ebpf/src/logger_aya.rs @@ -0,0 +1,34 @@ +#[macro_export] +macro_rules! error { + ($($x:expr),*) => { + aya_log_ebpf::error!{ $($x,)+ } + }; +} + +#[macro_export] +macro_rules! warn { + ($($x:expr),*) => { + aya_log_ebpf::warn!{ $($x,)+ } + } +} + +#[macro_export] +macro_rules! debug { + ($($x:expr),*) => { + aya_log_ebpf::debug!{ $($x,)+ } + } +} + +#[macro_export] +macro_rules! info { + ($($x:expr),*) => { + aya_log_ebpf::info!{ $($x,)+ } + } +} + +#[macro_export] +macro_rules! trace { + ($($x:expr),*) => { + aya_log_ebpf::trace!{ $($x,)+ } + } +} diff --git a/implementations/rust/ockam/ockam_ebpf/src/logger_noop.rs b/implementations/rust/ockam/ockam_ebpf/src/logger_noop.rs new file mode 100644 index 00000000000..cdb555ef113 --- /dev/null +++ b/implementations/rust/ockam/ockam_ebpf/src/logger_noop.rs @@ -0,0 +1,44 @@ +#[macro_export] +macro_rules! error { + ($($x:expr),*) => {{ + $( + _ = $x; + )* + }}; +} + +#[macro_export] +macro_rules! warn { + ($($x:expr),*) => {{ + $( + _ = $x; + )* + }}; +} + +#[macro_export] +macro_rules! debug { + ($($x:expr),*) => {{ + $( + _ = $x; + )* + }}; +} + +#[macro_export] +macro_rules! info { + ($($x:expr),*) => {{ + $( + _ = $x; + )* + }}; +} + +#[macro_export] +macro_rules! trace { + ($($x:expr),*) => {{ + $( + _ = $x; + )* + }}; +}