Plumbed a demo method.

Author: FelixMcFelix

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/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 {

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,16 @@ 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/src/engine/port/mod.rs

@@ -1024,7 +1024,6 @@ impl<N: NetworkImpl> Port<N> {
         Ok(DumpTcpFlowsResp { flows: data.tcp_flows.dump() })
     }
 
-    #[cfg(any(feature = "std", test))]
     /// XXX TEST METHOD
     pub fn dump_flow_stats(&self) -> Result<String> {
         let data = self.data.read();

lib/opte/src/engine/stat.rs

@@ -14,6 +14,7 @@ use crate::engine::flow_table::Ttl;
 use alloc::collections::BTreeMap;
 use alloc::collections::BTreeSet;
 use alloc::collections::btree_map::Entry;
+use alloc::string::String;
 use alloc::sync::Arc;
 use alloc::sync::Weak;
 use alloc::vec::Vec;
@@ -503,7 +504,7 @@ impl StatTree {
         });
     }
 
-    #[cfg(any(feature = "std", test))]
+    // TEMP
     pub fn dump(&self) -> String {
         let mut out = String::new();
         out.push_str("--Roots--\n");
@@ -525,9 +526,12 @@ impl StatTree {
         for (id, stat) in &self.flows {
             // let d: ApiFlowStat<InnerFlowId> = stat.as_ref().into();
             let d: ApiPktCounter = (&stat.as_ref().shared.stats).into();
+            let parents: Vec<_> =
+                stat.parents.iter().map(|v| v.stats.id()).collect();
             out.push_str(&format!("\t{id}/{} ->\n", stat.dir));
             out.push_str(&format!("\t\t{:?} {d:?}\n", stat.shared.stats.id));
-            out.push_str(&format!("\t\tparents {:?}\n\n", stat.bases));
+            out.push_str(&format!("\t\tparents {:?}\n", parents));
+            out.push_str(&format!("\t\tbases {:?}\n\n", stat.bases));
         }
         out.push_str("----\n");
         out

lib/oxide-vpc/src/api.rs

@@ -650,6 +650,14 @@ pub struct FirewallRule {
     pub priority: u16,
 }
 
+// TEMP
+#[derive(Debug, Deserialize, Serialize)]
+pub struct DumpFlowStatsResp {
+    pub data: String,
+}
+
+impl CmdOk for DumpFlowStatsResp {}
+
 impl FromStr for FirewallRule {
     type Err = String;
 

xde/src/xde.rs

@@ -690,6 +690,22 @@ unsafe extern "C" fn xde_ioc_opte_cmd(karg: *mut c_void, mode: c_int) -> c_int {
             let resp = remove_cidr_hdlr(&mut env);
             hdlr_resp(&mut env, resp)
         }
+
+        // TEMP
+        OpteCmd::DumpFlowStats => {
+            let resp = flow_stats_hdlr(&mut env);
+            hdlr_resp(&mut env, resp)
+        }
+    }
+}
+
+#[unsafe(no_mangle)]
+fn flow_stats_hdlr(env: &mut IoctlEnvelope) -> Result<oxide_vpc::api::DumpFlowStatsResp, OpteError> {
+    let req: oxide_vpc::api::DumpUftReq = env.copy_in_req()?;
+    let devs = xde_devs().read();
+    match devs.get_by_name(&req.port_name) {
+        Some(dev) => dev.port.dump_flow_stats().map(|data| oxide_vpc::api::DumpFlowStatsResp {data}),
+        None => Err(OpteError::PortNotFound(req.port_name)),
     }
 }