WIP: Flowstats

bin/opteadm/src/bin/opteadm.rs

@@ -31,6 +31,7 @@ use oxide_vpc::api::ClearVirt2PhysReq;
 use oxide_vpc::api::DelRouterEntryReq;
 use oxide_vpc::api::DelRouterEntryResp;
 use oxide_vpc::api::DhcpCfg;
+use oxide_vpc::api::DumpFlowStatsResp;
 use oxide_vpc::api::ExternalIpCfg;
 use oxide_vpc::api::Filters as FirewallFilters;
 use oxide_vpc::api::FirewallAction;
@@ -276,6 +277,13 @@ enum Command {
         #[arg(long = "dir")]
         direction: Option<Direction>,
     },
+
+    /// XXX TEMP
+    DumpFlowStats {
+        /// The OPTE port to read...
+        #[arg(short)]
+        port: String,
+    },
 }
 
 #[derive(Debug, Parser)]
@@ -859,6 +867,12 @@ fn main() -> anyhow::Result<()> {
                 })?;
             }
         }
+
+        // XXX TEMP
+        Command::DumpFlowStats { port } => {
+            let DumpFlowStatsResp { data } = hdl.dump_flowstats(&port)?;
+            println!("{data}");
+        }
     }
 
     Ok(())

crates/opte-api/Cargo.toml

@@ -17,6 +17,7 @@ ingot.workspace = true
 ipnetwork = { workspace = true, optional = true }
 postcard.workspace = true
 serde.workspace = true
+uuid.workspace = true
 
 [dependencies.smoltcp]
 workspace = true

crates/opte-api/src/cmd.rs

@@ -50,6 +50,9 @@ pub enum OpteCmd {
     SetExternalIps = 80,     // set xde external IPs for a port
     AllowCidr = 90,          // allow ip block through gateway tx/rx
     RemoveCidr = 91,         // deny ip block through gateway tx/rx
+
+    // TEMP
+    DumpFlowStats = 34,
 }
 
 impl TryFrom<c_int> for OpteCmd {

crates/opte-api/src/lib.rs

@@ -28,6 +28,7 @@ pub mod encap;
 pub mod ip;
 pub mod mac;
 pub mod ndp;
+pub mod stat;
 pub mod tcp;
 pub mod ulp;
 
@@ -38,6 +39,7 @@ pub use encap::*;
 pub use ip::*;
 pub use mac::*;
 pub use ndp::*;
+pub use stat::*;
 pub use tcp::*;
 pub use ulp::*;
 
@@ -51,7 +53,7 @@ pub use ulp::*;
 ///
 /// We rely on CI and the check-api-version.sh script to verify that
 /// this number is incremented anytime the oxide-api code changes.
-pub const API_VERSION: u64 = 36;
+pub const API_VERSION: u64 = 37;
 
 /// Major version of the OPTE package.
 pub const MAJOR_VERSION: u64 = 0;

crates/opte-api/src/stat.rs

@@ -0,0 +1,38 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// Copyright 2025 Oxide Computer Company
+
+//! Types for handling flow stats from the ioctl API.
+
+use crate::Direction;
+use alloc::vec::Vec;
+use serde::Deserialize;
+use serde::Serialize;
+use uuid::Uuid;
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct FlowStat<FlowId> {
+    pub partner: FlowId,
+    pub dir: Direction,
+    pub bases: Vec<Uuid>,
+    pub stats: PacketCounter,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone, Copy)]
+pub struct PacketCounter {
+    pub created_at: u64,
+    pub pkts_in: u64,
+    pub bytes_in: u64,
+    pub pkts_out: u64,
+    pub bytes_out: u64,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone, Copy)]
+pub struct FullCounter {
+    pub allow: u64,
+    pub deny: u64,
+    pub hairpin: u64,
+    pub packets: PacketCounter,
+}

lib/opte-ioctl/src/lib.rs

@@ -35,6 +35,7 @@ use oxide_vpc::api::DelRouterEntryReq;
 use oxide_vpc::api::DelRouterEntryResp;
 use oxide_vpc::api::DeleteXdeReq;
 use oxide_vpc::api::DhcpCfg;
+use oxide_vpc::api::DumpFlowStatsResp;
 use oxide_vpc::api::DumpVirt2BoundaryReq;
 use oxide_vpc::api::DumpVirt2BoundaryResp;
 use oxide_vpc::api::DumpVirt2PhysReq;
@@ -383,6 +384,19 @@ impl OpteHdl {
             Some(&DumpUftReq { port_name: port_name.to_string() }),
         )
     }
+
+    /// TEMP METHOD
+    pub fn dump_flowstats(
+        &self,
+        port_name: &str,
+    ) -> Result<DumpFlowStatsResp, Error> {
+        let cmd = OpteCmd::DumpFlowStats;
+        run_cmd_ioctl(
+            self.device.as_raw_fd(),
+            cmd,
+            Some(&DumpUftReq { port_name: port_name.to_string() }),
+        )
+    }
 }
 
 pub fn run_cmd_ioctl<T, R>(

lib/opte-test-utils/src/lib.rs

@@ -269,11 +269,11 @@ fn oxide_net_builder(
     let dhcp = base_dhcp_config();
 
     firewall::setup(&mut pb, fw_limit).expect("failed to add firewall layer");
-    gateway::setup(&pb, cfg, vpc_map, fw_limit, &dhcp)
+    gateway::setup(&mut pb, cfg, vpc_map, fw_limit, &dhcp)
         .expect("failed to setup gateway layer");
-    router::setup(&pb, cfg, one_limit).expect("failed to add router layer");
+    router::setup(&mut pb, cfg, one_limit).expect("failed to add router layer");
     nat::setup(&mut pb, cfg, snat_limit).expect("failed to add nat layer");
-    overlay::setup(&pb, cfg, v2p, v2b, one_limit)
+    overlay::setup(&mut pb, cfg, v2p, v2b, one_limit)
         .expect("failed to add overlay layer");
     pb
 }

lib/opte-test-utils/src/port_state.rs

@@ -86,6 +86,11 @@ pub fn print_port(
     write_hr(&mut out)?;
     writeln!(&mut out, "{:#?}", port.stats_snap())?;
 
+    // ================================================================
+    // Print the Better Stats
+    // ================================================================
+    writeln!(&mut out, "{}", port.dump_flow_stats().unwrap())?;
+
     write_hrb(&mut out)?;
     writeln!(&mut out)?;
 

lib/opte/Cargo.toml

@@ -38,6 +38,7 @@ itertools = { workspace = true, optional = true }
 postcard.workspace = true
 serde.workspace = true
 tabwriter = { workspace = true, optional = true }
+uuid.workspace = true
 usdt = { workspace = true, optional = true }
 zerocopy = { workspace = true, optional = true }