pldm: Add basic pldm-file support

Catch events from the mctp control core, and start a PLDM File Transfer
when we have an EID assigned.

We will add proper PDR support in an upcoming change.

Signed-off-by: Jeremy Kerr <[email protected]>

Author: jk-ozlabs

CHANGELOG.md

@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 1. Added support for NVMe-MI responder, gated on a new `nvme-mi` cargo feature
 
+2. Added support for a PLDM for File Transfer requester, triggered on MCTP
+   address assignment.
 
 ### Changed
 

Cargo.lock

@@ -9,6 +9,7 @@ categories = ["network-programming", "hardware-support"]
 
 [features]
 nvme-mi = ["dep:nvme-mi-dev"]
+pldm = ["dep:pldm", "dep:pldm-file"]
 
 [dependencies]
 anyhow = "1.0.86"
@@ -26,6 +27,8 @@ mctp = "0.2.0"
 mctp-estack = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "mctp-estack" }
 nvme-mi-dev = { git = "https://github.com/CodeConstruct/nvme-mi-dev", branch = "main", optional = true }
 polling = "3.7.4"
+pldm = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "pldm", optional = true }
+pldm-file = { git = "https://github.com/CodeConstruct/mctp-rs", rev = "851360ed19ef78f2e7672daa90900cb4f38ad0b6", package = "pldm-file", optional = true }
 simplelog = "0.12.2"
 smol = "2.0.0"
 usbredirparser = { git = "https://github.com/CodeConstruct/usbredir-rs", branch = "main", package = "usbredirparser" }

Cargo.toml

@@ -17,6 +17,8 @@ cargo test
 sets=(
     ""
     "nvme-mi"
+    "pldm"
+    "nvme-mi,pldm"
 )
 
 for features in "${sets[@]}"

ci/runtests.sh

@@ -5,15 +5,19 @@ use argh::FromArgs;
 use futures::{select, FutureExt};
 use log::{debug, info, warn, LevelFilter};
 use mctp::{AsyncListener, AsyncRespChannel, Eid};
-use mctp_estack::router::{
-    PortBottom, PortBuilder, PortId, PortLookup, PortStorage, Router,
+use mctp_estack::{
+    control::{ControlEvent, MctpControl},
+    router::{
+        PortBottom, PortBuilder, PortId, PortLookup, PortStorage, Router,
+    },
 };
+use std::time::Instant;
+
 #[cfg(feature = "nvme-mi")]
 use nvme_mi_dev::nvme::{
     ManagementEndpoint, PciePort, PortType, Subsystem, SubsystemInfo,
     TwoWirePort,
 };
-use std::time::Instant;
 
 mod serial;
 mod usbredir;
@@ -142,9 +146,12 @@ async fn echo<'a>(router: &'a Router<'a>) -> std::io::Result<()> {
     }
 }
 
-async fn control<'a>(router: &'a Router<'a>) -> std::io::Result<()> {
+async fn control<'a>(
+    router: &'a Router<'a>,
+    ctrl_ev_sender: async_channel::Sender<ControlEvent>,
+) -> std::io::Result<()> {
     let mut l = router.listener(mctp::MCTP_TYPE_CONTROL)?;
-    let mut c = mctp_estack::control::MctpControl::new(router);
+    let mut c = MctpControl::new(router);
     let u = uuid::Uuid::new_v4();
 
     let types = [
@@ -165,8 +172,12 @@ async fn control<'a>(router: &'a Router<'a>) -> std::io::Result<()> {
 
         let r = c.handle_async(msg, resp).await;
 
-        if let Err(e) = r {
-            info!("control handler failure: {e}");
+        match r {
+            Err(e) => info!("control handler failure: {e}"),
+            Ok(Some(ev)) => {
+                let _ = ctrl_ev_sender.force_send(ev);
+            }
+            Ok(None) => (),
         }
     }
 }
@@ -219,6 +230,18 @@ async fn nvme_mi<'a>(_router: &'a Router<'a>) -> std::io::Result<()> {
     futures::future::pending().await
 }
 
+#[cfg(feature = "pldm")]
+mod pldm;
+#[cfg(not(feature = "pldm"))]
+mod pldm {
+    pub async fn pldm<'a>(
+        _router: &'a super::Router<'a>,
+        _recv: async_channel::Receiver<super::ControlEvent>,
+    ) -> std::io::Result<()> {
+        futures::future::pending().await
+    }
+}
+
 fn main() -> Result<()> {
     let opts: Options = argh::from_env();
 
@@ -260,12 +283,15 @@ fn main() -> Result<()> {
         None => futures::future::Either::Right(futures::future::pending()),
     };
 
+    let (ctrl_ev_tx, ctrl_ev_rx) = async_channel::bounded(1);
+
     smol::block_on(async {
         select!(
             _ = fut.fuse() => (),
             _ = run(transport, port_bottom, &router, start_time).fuse() => (),
-            _ = control(&router).fuse() => (),
-            _ = nvme_mi(&router).fuse() => ()
+            _ = control(&router, ctrl_ev_tx).fuse() => (),
+            _ = nvme_mi(&router).fuse() => (),
+            _ = pldm::pldm(&router, ctrl_ev_rx).fuse() => (),
         )
     });