[mgs] API for ingesting ereports from SPs

Cargo.toml

@@ -409,8 +409,8 @@ gateway-client = { path = "clients/gateway-client" }
 # is "fine", because SP/MGS communication maintains forwards and backwards
 # compatibility, but will mean that faux-mgs might be missing new
 # functionality.)
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "18215eeae855bd0a820ce00608a83d6ea9959596", default-features = false, features = ["std"] }
-gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "18215eeae855bd0a820ce00608a83d6ea9959596" }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "e4f8749ae3eff7657e1d211440fcea272a090172", default-features = false, features = ["std"] }
+gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "e4f8749ae3eff7657e1d211440fcea272a090172" }
 gateway-test-utils = { path = "gateway-test-utils" }
 gateway-types = { path = "gateway-types" }
 gethostname = "0.5.0"

sp-sim/src/ereport.rs

@@ -111,15 +111,6 @@ impl EreportState {
         let EreportRequest::V0(req) = request;
         slog::info!(self.log, "ereport request: {req:?}");
 
-        let mut pos = gateway_messages::serialize(
-            buf,
-            &EreportResponseHeader::V0(ResponseHeaderV0 {
-                request_id: req.request_id,
-                restart_id: self.restart_id,
-            }),
-        )
-        .expect("header must serialize");
-
         // If we "restarted", encode the current metadata map, and start at ENA
         // 0.
         let (meta_map, start_ena) = if req.restart_id != self.restart_id {
@@ -158,6 +149,30 @@ impl EreportState {
 
             (&Default::default(), req.start_ena)
         };
+
+        let mut respondant_ereports = self
+            .ereports
+            .iter()
+            .filter(|ereport| ereport.ena >= start_ena)
+            .take(req.limit as usize)
+            .peekable();
+        let start_ena = respondant_ereports
+            .peek()
+            .map(|ereport| ereport.ena)
+            .unwrap_or(Ena(start_ena.0 + 1));
+
+        // Serialize the header.
+        let mut pos = gateway_messages::serialize(
+            buf,
+            &EreportResponseHeader::V0(ResponseHeaderV0 {
+                request_id: req.request_id,
+                restart_id: self.restart_id,
+                start_ena,
+            }),
+        )
+        .expect("header must serialize");
+
+        // Serialize the metadata map.
         pos += {
             use serde::ser::SerializeMap;
 
@@ -179,59 +194,36 @@ impl EreportState {
             cursor.position() as usize
         };
 
-        // Is there enough remaining space for ereports? We need at least 10
-        // bytes (8 for the ENA, and at least two bytes to encode an empty CBOR
-        // list)
-        if buf[pos..].len() < 10 {
+        // Is there enough remaining space for ereports? We need at least two
+        // bytes to encode an empty CBOR list
+        if buf[pos..].len() <= 2 {
             return &buf[..pos];
         }
 
-        let mut respondant_ereports = self
-            .ereports
-            .iter()
-            .filter(|ereport| ereport.ena >= start_ena)
-            .take(req.limit as usize);
-        if let Some(EreportListEntry { ena, ereport, bytes }) =
-            respondant_ereports.next()
-        {
-            pos += gateway_messages::serialize(&mut buf[pos..], ena)
-                .expect("serialing ena shouldn't fail");
-            buf[pos] = 0x9f; // start list
-            pos += 1;
+        buf[pos] = 0x9f; // start list
+        pos += 1;
+
+        // try to fill the rest of the packet with ereports
+        for EreportListEntry { ena, ereport, bytes } in respondant_ereports {
+            // packet full!
+            if buf[pos..].len() < (bytes.len() + 1) {
+                break;
+            }
 
             buf[pos..pos + bytes.len()].copy_from_slice(&bytes[..]);
             pos += bytes.len();
             slog::debug!(
                 self.log,
-                "wrote initial ereport: {ereport:#?}";
+                "wrote ereport: {ereport:#?}";
                 "ena" => ?ena,
                 "packet_bytes" => pos,
                 "ereport_bytes" => bytes.len(),
             );
-
-            // try to fill the rest of the packet
-            for EreportListEntry { ena, ereport, bytes } in respondant_ereports
-            {
-                // packet full!
-                if buf[pos..].len() < (bytes.len() + 1) {
-                    break;
-                }
-
-                buf[pos..pos + bytes.len()].copy_from_slice(&bytes[..]);
-                pos += bytes.len();
-                slog::debug!(
-                    self.log,
-                    "wrote subsequent ereport: {ereport:#?}";
-                    "ena" => ?ena,
-                    "packet_bytes" => pos,
-                    "ereport_bytes" => bytes.len(),
-                );
-            }
-
-            buf[pos] = 0xff; // break list;
-            pos += 1;
         }
 
+        buf[pos] = 0xff; // break list;
+        pos += 1;
+
         &buf[..pos]
     }
 }

workspace-hack/Cargo.toml

@@ -57,7 +57,7 @@ futures-io = { version = "0.3.31" }
 futures-sink = { version = "0.3.31" }
 futures-task = { version = "0.3.31", default-features = false, features = ["std"] }
 futures-util = { version = "0.3.31", features = ["channel", "io", "sink"] }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "a6b180dbb4262a94d73165a0d072b33376d174f8", features = ["std"] }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "e4f8749ae3eff7657e1d211440fcea272a090172", features = ["std"] }
 generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths", "zeroize"] }
 getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2.15", default-features = false, features = ["js", "rdrand", "std"] }
 group = { version = "0.13.0", default-features = false, features = ["alloc"] }
@@ -178,7 +178,7 @@ futures-io = { version = "0.3.31" }
 futures-sink = { version = "0.3.31" }
 futures-task = { version = "0.3.31", default-features = false, features = ["std"] }
 futures-util = { version = "0.3.31", features = ["channel", "io", "sink"] }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "a6b180dbb4262a94d73165a0d072b33376d174f8", features = ["std"] }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "e4f8749ae3eff7657e1d211440fcea272a090172", features = ["std"] }
 generic-array = { version = "0.14.7", default-features = false, features = ["more_lengths", "zeroize"] }
 getrandom-6f8ce4dd05d13bba = { package = "getrandom", version = "0.2.15", default-features = false, features = ["js", "rdrand", "std"] }
 group = { version = "0.13.0", default-features = false, features = ["alloc"] }