Ingest ereports from SPs

Cargo.toml

@@ -1,13 +1,15 @@
 [workspace]
 members = [
     "faux-mgs",
+    "gateway-ereport-messages",
     "gateway-messages",
     "gateway-sp-comms",
     "xtask",
 ]
 
 default-members = [
     "faux-mgs",
+    "gateway-ereport-messages",
     "gateway-messages",
     "gateway-sp-comms",
 ]
@@ -21,6 +23,7 @@ slog-error-chain = { git = "https://github.com/oxidecomputer/slog-error-chain.gi
 anyhow = "1.0"
 async-trait = "0.1"
 backoff = { version = "0.4.0", features = ["tokio"] }
+base64 = "0.22.1"
 bitflags = "2.9.0"
 camino = "1.1.9"
 clap = { version = "4.5", features = ["derive", "env"] }
@@ -39,6 +42,8 @@ paste = "1.0.15"
 rand = "0.8.5"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde-big-array = "0.5.1"
+serde_bytes = "0.11.17"
+serde_cbor = "0.11.2"
 serde_json = "1.0.140"
 serde_repr = { version = "0.1" }
 sha2 = "0.10"
@@ -65,3 +70,4 @@ zip = { version = "0.6.6", default-features = false, features = ["deflate", "bzi
 
 gateway-messages.path = "gateway-messages"
 gateway-sp-comms.path = "gateway-sp-comms"
+gateway-ereport-messages.path = "gateway-ereport-messages"

faux-mgs/src/main.rs

@@ -30,6 +30,8 @@ use gateway_messages::UnlockResponse;
 use gateway_messages::UpdateId;
 use gateway_messages::UpdateStatus;
 use gateway_messages::ROT_PAGE_SIZE;
+use gateway_sp_comms::ereport;
+use gateway_sp_comms::shared_socket;
 use gateway_sp_comms::InMemoryHostPhase2Provider;
 use gateway_sp_comms::SharedSocket;
 use gateway_sp_comms::SingleSp;
@@ -91,6 +93,13 @@ struct Args {
     #[clap(long)]
     listen_port: Option<u16>,
 
+    /// Ereport port to bind to locally
+    // Note that, unlike `listen_port`, this always defaults to 0, because we
+    // don't need to act as a server with a known port for the ereport
+    // protocol.
+    #[clap(long, default_value_t = 0)]
+    ereport_port: u16,
+
     /// Address to use to discover the SP. May be a specific SP's address to
     /// bypass multicast discovery.
     #[clap(long, default_value_t = gateway_sp_comms::default_discovery_addr())]
@@ -711,11 +720,20 @@ async fn main() -> Result<()> {
 
     let shared_socket = SharedSocket::bind(
         listen_port,
-        Arc::clone(&host_phase2_provider),
-        log.clone(),
+        shared_socket::ControlPlaneAgentHandler::new(&host_phase2_provider),
+        log.new(slog::o!("socket" => "control-plane-agent")),
     )
     .await
     .context("SharedSocket:bind() failed")?;
+    let ereport_socket = {
+        SharedSocket::bind(
+            args.ereport_port,
+            ereport::EreportHandler::default(),
+            log.new(slog::o!("socket" => "ereport")),
+        )
+        .await
+        .context("SharedSocket::bind() for ereport socket failed")?
+    };
 
     let mut sps = Vec::new();
 
@@ -730,21 +748,39 @@ async fn main() -> Result<()> {
         let socket = UdpSocket::bind(bind_addr)
             .await
             .with_context(|| format!("failed to bind to {bind_addr}"))?;
+        let ereport_bind_addr: SocketAddrV6 =
+            SocketAddrV6::new(Ipv6Addr::UNSPECIFIED, 0, 0, 0);
+        let ereport_socket =
+            UdpSocket::bind(ereport_bind_addr).await.with_context(|| {
+                format!("failed to bind to {ereport_bind_addr}")
+            })?;
         sps.push(SingleSp::new_direct_socket_for_testing(
             socket,
             sp_sim_addr,
+            ereport_socket,
+            SocketAddrV6::new(
+                *sp_sim_addr.ip(),
+                gateway_sp_comms::ereport::SP_PORT,
+                0,
+                0,
+            ),
             retry_config,
             log.clone(),
         ));
     } else {
         let interfaces = build_requested_interfaces(args.interface)?;
+
+        let mut ereport_addr = args.discovery_addr;
+        ereport_addr.set_port(gateway_sp_comms::ereport::SP_PORT);
         for interface in interfaces {
             info!(log, "creating SP handle on interface {interface}");
             sps.push(
                 SingleSp::new(
                     &shared_socket,
+                    &ereport_socket,
                     SwitchPortConfig {
                         discovery_addr: args.discovery_addr,
+                        ereport_addr,
                         interface,
                     },
                     retry_config,

gateway-ereport-messages/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "gateway-ereport-messages"
+version = "0.1.0"
+edition = "2021"
+license = "MPL-2.0"
+
+[dependencies]
+bitflags.workspace = true
+zerocopy = { workspace = true, features = ["derive"] }
+
+[features]
+debug-impls = []