table counter support

Author: rcgoodfellow

Cargo.lock

@@ -13,7 +13,7 @@ dlpi = { git = "https://github.com/oxidecomputer/dlpi-sys", branch = "main" }
 indicatif = "0.17.2"
 libc = "0.2.137"
 libloading = "0.7.3"
-p4rs = { git = "https://github.com/oxidecomputer/p4", branch = "main" }
+p4rs = { git = "https://github.com/oxidecomputer/p4", branch = "counter" }
 p9ds = { git = "https://github.com/oxidecomputer/p9fs", branch = "main" }
 p9kp = { git = "https://github.com/oxidecomputer/p9fs", branch = "main" }
 serde = { version = "1.0.147", features = ["derive"] }

Cargo.toml

@@ -3,7 +3,7 @@
 use p4rs::{Pipeline, TableEntry};
 use serde::{Deserialize, Serialize};
 use slog::Logger;
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::fs::OpenOptions;
 use std::io::{Read, Write};
 use std::os::unix::io::AsRawFd;
@@ -19,13 +19,15 @@ pub enum ManagementRequest {
     RadixRequest,
     TableAdd(TableAdd),
     TableRemove(TableRemove),
+    TableCounters(TableCounters),
     DumpRequest,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub enum ManagementResponse {
     RadixResponse(u16),
     DumpResponse(BTreeMap<String, Vec<TableEntry>>),
+    TableCountersResponse(Option<HashMap<Vec<u8>, u128>>),
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]
@@ -42,6 +44,11 @@ pub struct TableRemove {
     pub keyset_data: Vec<u8>,
 }
 
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct TableCounters {
+    pub table: String,
+}
+
 pub async fn handle_management_message(
     msg: ManagementRequest,
     pipeline: Arc<Mutex<Box<dyn Pipeline>>>,
@@ -65,6 +72,17 @@ pub async fn handle_management_message(
         ManagementRequest::TableRemove(tm) => {
             pl.remove_table_entry(&tm.table, &tm.keyset_data);
         }
+        ManagementRequest::TableCounters(tc) => {
+            let response = match pl.get_table_counters(&tc.table) {
+                None => ManagementResponse::TableCountersResponse(None),
+                Some(counters) => {
+                    let entries = counters.entries.lock().unwrap().clone();
+                    ManagementResponse::TableCountersResponse(Some(entries))
+                }
+            };
+            let buf = serde_json::to_vec(&response).unwrap();
+            uds.send_to(&buf, uds_dst).await.unwrap();
+        }
         ManagementRequest::RadixRequest => {
             let response = ManagementResponse::RadixResponse(radix as u16);
             let buf = serde_json::to_vec(&response).unwrap();