transport: storage: add scsi support

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

Author: twilfredo

Cargo.toml

@@ -75,7 +75,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"], optional = true }
+nix = { version = "0.29.0", features = ["user", "fs"], optional = true }
 libmctp = { version = "0.2" }
 inquire = { version = "0.7.5", optional = true}
 

build.rs

@@ -41,6 +41,7 @@ fn main() {
     println!("cargo:rustc-link-arg=-lspdm_crypt_ext_lib");
     println!("cargo:rustc-link-arg=-lspdm_transport_pcidoe_lib");
     println!("cargo:rustc-link-arg=-lspdm_transport_mctp_lib");
+    println!("cargo:rustc-link-arg=-lspdm_transport_storage_lib");
 
     // Link SPDM Test Libraries
     let mut builder = if cfg!(feature = "libspdm_tests") {

scripts/scsi/create-disk-spdm.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+if [ $# != 5 ]; then
+        echo "Usage: $0 <disk name> <cap (GB)> HM|HA <zone size (MB)> <conv zones num>"
+        exit 1;
+fi
+
+dname="$1"
+cap="$2"
+model="$3"
+zs="$4"
+cnum="$5"
+
+naa="naa.50014059cfa9ba75"
+
+# Setup emulated disk
+cat << EOF | targetcli
+
+cd /backstores/user:zbc
+create name=${dname} size=${cap}G cfgstring=model-${model}/zsize-${zs}/conv-${cnum}/spdm-2323@/var/local/${dname}.raw
+cd /loopback
+create ${naa}
+cd ${naa}/luns
+create /backstores/user:zbc/${dname} 0
+cd /
+exit
+
+EOF
+
+sleep 1
+disk=`lsscsi | grep "TCMU ZBC device" | cut -d '/' -f3 | sed 's/ //g'`
+echo "mq-deadline" > /sys/block/"${disk}"/queue/scheduler

scripts/scsi/teardown-disk.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ $# != 1 ]; then
+	echo "Usage: $0 <disk name (e.g. zbc0)"
+	exit 1;
+fi
+
+dname="$1"
+
+naa="naa.50014059cfa9ba75"
+
+# Delete emulated disk
+cat << EOF | targetcli
+
+cd /loopback/${naa}/luns
+delete 0
+cd /loopback
+delete ${naa}
+cd /backstores/user:zbc
+delete ${dname}
+cd /
+exit
+
+EOF

src/libspdm/spdm.rs

@@ -277,6 +277,8 @@ pub enum TransportLayer {
     Doe,
     /// DMTF Management Component Transport Protocol
     Mctp,
+    /// SCSI Security Protocol In/Out commands
+    Storage,
 }
 
 #[cfg(feature = "no_std")]
@@ -506,6 +508,18 @@ pub unsafe fn setup_transport_layer(
                 )
             };
         }
+        TransportLayer::Storage => {
+            unsafe {
+                libspdm_register_transport_layer_func(
+                    context,
+                    libspdm_max_spdm_msg_size,
+                    LIBSPDM_STORAGE_TRANSPORT_HEADER_SIZE,
+                    LIBSPDM_STORAGE_TRANSPORT_TAIL_SIZE,
+                    Some(libspdm_transport_storage_encode_message),
+                    Some(libspdm_transport_storage_decode_message),
+                )
+            };
+        }
     }
 
     let libspdm_scratch_buffer_size =

src/main.rs

@@ -12,6 +12,7 @@ use async_std::task;
 use clap::{Parser, Subcommand};
 use futures::future::join_all;
 use libspdm::libspdm_rs::*;
+use nix::errno::Errno;
 use nix::unistd::geteuid;
 use sha2::{Digest, Sha256, Sha384, Sha512};
 use std::fs::File;
@@ -31,6 +32,7 @@ mod doe_pci_cfg;
 mod io_buffers;
 mod qemu_server;
 mod request;
+mod scsi;
 mod socket_client;
 mod socket_server;
 mod tcg_concise_evidence_binding;
@@ -43,6 +45,14 @@ struct Args {
     #[command(subcommand)]
     command: Commands,
 
+    /// Use SCSI commands for the target device
+    #[arg(short, long, requires_ifs([("true", "blk_dev_path")]))]
+    scsi: bool,
+
+    /// Path to the SCSI block device
+    #[arg(long)]
+    blk_dev_path: Option<String>,
+
     /// Use the Linux PCIe extended configuration backend
     /// This is generally run on the Linux host machine
     #[arg(short, long)]
@@ -642,6 +652,9 @@ async fn main() -> Result<(), ()> {
 
     let mut count = 0;
 
+    cli.scsi.then(|| {
+        count += 1;
+    });
     cli.doe_pci_cfg.then(|| {
         count += 1;
     });
@@ -704,8 +717,16 @@ async fn main() -> Result<(), ()> {
             error!("Only MCTP supported over USB I2C");
             return Err(());
         }
-
         usb_i2c::register_device(cntx_ptr, cli.usb_i2c_dev, cli.usb_i2c_baud)?;
+    } else if cli.scsi {
+        scsi::cmd_scsi_get_info(&cli.blk_dev_path.clone().unwrap()).unwrap();
+        if let Err(e) = scsi::cmd_scsi_get_sec_info(&cli.blk_dev_path.clone().unwrap()) {
+            if e == Errno::ENOTSUP {
+                error!("SPDM is not supported by this device");
+            }
+            return Err(());
+        }
+        scsi::register_device(cntx_ptr, &cli.blk_dev_path.clone().unwrap())?;
     } else if cli.qemu_server {
         if let Commands::Request { .. } = cli.command {
             error!("QEMU Server does not support running an SPDM requester");
@@ -730,6 +751,13 @@ async fn main() -> Result<(), ()> {
                 spdm::TransportLayer::Mctp,
                 spdm::LIBSPDM_MAX_SPDM_MSG_SIZE,
             )?;
+        } else if cli.scsi {
+            spdm::setup_transport_layer(
+                cntx_ptr,
+                spdm::TransportLayer::Storage,
+                spdm::LIBSPDM_MAX_SPDM_MSG_SIZE,
+            )
+            .unwrap();
         } else {
             spdm::setup_transport_layer(
                 cntx_ptr,

src/qemu_server.rs

@@ -407,6 +407,7 @@ pub fn register_device(
                     Some(qemu_receive_message_mctp),
                 );
             }
+            TransportLayer::Storage => todo!(),
         }
         io_buffers::libspdm_setup_io_buffers(
             context,