transport: storage: add nvme support

Signed-off-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>

Author: twilfredo

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update; \
-          sudo apt-get install -y cmake libclang-dev libpci-dev libssl-dev python3-dev gem; \
+          sudo apt-get install -y cmake libclang-dev libpci-dev libssl-dev python3-dev gem libnvme-dev; \
           sudo gem install cbor-diag;
 
       - name: Build libspdm

Cargo.toml

@@ -35,7 +35,6 @@ std = [
     "inquire",
     "page_size",
 ]
-page_size = ["dep:page_size"]
 
 [lib]
 name = "libspdm"
@@ -75,7 +74,7 @@ minicbor-derive = { version = "0.15", features = [
 ], optional = true }
 async-std = { version = "1.12", features = ["attributes"], optional = true }
 futures = { version = "0.3", optional = true }
-nix = { version = "0.29.0", features = ["user", "fs"], optional = true }
+nix = {version = "0.29.0", features = ["user", "fs", "ioctl"], optional = true }
 libmctp = { version = "0.2" }
 inquire = { version = "0.7.5", optional = true}
 

build.rs

@@ -22,6 +22,7 @@ fn main() {
     println!("cargo:rustc-link-arg=-Wl,--start-group");
 
     println!("cargo:rustc-link-arg=-lpci");
+    println!("cargo:rustc-link-arg=-lnvme");
 
     println!("cargo:rustc-link-arg=-lmemlib");
     println!("cargo:rustc-link-arg=-lmalloclib");

src/main.rs

@@ -30,11 +30,13 @@ pub static SOCKET_PATH: &str = "SPDM-Utils-loopback-socket";
 mod cli_helpers;
 mod doe_pci_cfg;
 mod io_buffers;
+mod nvme;
 mod qemu_server;
 mod request;
 mod scsi;
 mod socket_client;
 mod socket_server;
+mod storage_standards;
 mod tcg_concise_evidence_binding;
 mod test_suite;
 mod usb_i2c;
@@ -49,7 +51,15 @@ struct Args {
     #[arg(short, long, requires_ifs([("true", "blk_dev_path")]))]
     scsi: bool,
 
-    /// Path to the SCSI block device
+    /// Use NVMe commands for the target device
+    #[arg(short, long, requires_ifs([("true", "blk_dev_path")]))]
+    nvme: bool,
+
+    /// NVME NameSpace Identifier
+    #[arg(long, default_value_t = 1)]
+    nsid: u32,
+
+    /// Path to the block device
     #[arg(long)]
     blk_dev_path: Option<String>,
 
@@ -655,6 +665,9 @@ async fn main() -> Result<(), ()> {
     cli.scsi.then(|| {
         count += 1;
     });
+    cli.nvme.then(|| {
+        count += 1;
+    });
     cli.doe_pci_cfg.then(|| {
         count += 1;
     });
@@ -727,12 +740,21 @@ async fn main() -> Result<(), ()> {
             return Err(());
         }
         scsi::register_device(cntx_ptr, &cli.blk_dev_path.clone().unwrap())?;
+    } else if cli.nvme {
+        if let Err(e) = nvme::nvme_get_sec_info(&cli.blk_dev_path.clone().unwrap(), cli.nsid) {
+            if e == Errno::ENOTSUP {
+                error!("SPDM is not supported by this NVMe device");
+            }
+            return Err(());
+        }
+        nvme::register_device(cntx_ptr, &cli.blk_dev_path.clone().unwrap(), cli.nsid).unwrap();
     } else if cli.qemu_server {
         if let Commands::Request { .. } = cli.command {
             error!("QEMU Server does not support running an SPDM requester");
             return Err(());
         }
         if let Some(proto) = cli.spdm_transport_protocol {
+            info!("Using {:?} transport for QEMU", proto);
             qemu_server::register_device(cntx_ptr, cli.qemu_port, proto)?;
         } else {
             qemu_server::register_device(cntx_ptr, cli.qemu_port, spdm::TransportLayer::Doe)?;
@@ -744,14 +766,15 @@ async fn main() -> Result<(), ()> {
 
     unsafe {
         if let Some(proto) = cli.spdm_transport_protocol {
+            info!("Using {:?} transport", proto);
             spdm::setup_transport_layer(cntx_ptr, proto, spdm::LIBSPDM_MAX_SPDM_MSG_SIZE)?;
         } else if cli.usb_i2c {
             spdm::setup_transport_layer(
                 cntx_ptr,
                 spdm::TransportLayer::Mctp,
                 spdm::LIBSPDM_MAX_SPDM_MSG_SIZE,
             )?;
-        } else if cli.scsi {
+        } else if cli.scsi || cli.nvme {
             spdm::setup_transport_layer(
                 cntx_ptr,
                 spdm::TransportLayer::Storage,