Use poll model with NVMe devices

propolis/Cargo.toml

@@ -23,4 +23,6 @@ tokio = { version = "1", features = ["full"] }
 futures = "0.3"
 
 [dev-dependencies]
-tempfile = "3.2"
+crossbeam-channel = "0.5"
+rand = "0.8"
+tempfile = "3.2"

propolis/src/block/mod.rs

@@ -33,7 +33,8 @@ pub enum Result {
     Unsupported,
 }
 
-pub type CompleteFn = dyn FnOnce(Result, &DispCtx) + Send + Sync + 'static;
+pub type CompleteFn =
+    dyn FnOnce(Operation, Result, &DispCtx) + Send + Sync + 'static;
 
 /// Block device operation request
 pub struct Request {
@@ -100,7 +101,7 @@ impl Request {
     /// Indiciate disposition of completed request
     pub fn complete(mut self, res: Result, ctx: &DispCtx) {
         let func = self.donef.take().unwrap();
-        func(res, ctx);
+        func(self.op, res, ctx);
     }
 }
 impl Drop for Request {

propolis/src/hw/mod.rs

@@ -1,7 +1,6 @@
 pub mod chipset;
 pub mod ibmpc;
-// XXX: skip nvme for now
-//pub mod nvme;
+pub mod nvme;
 pub mod pci;
 pub mod ps2ctrl;
 pub mod qemu;

propolis/src/hw/nvme/admin.rs

@@ -33,7 +33,7 @@ impl NvmeCtrl {
             cmd.qid,
             cmd.intr_vector,
             GuestAddr(cmd.prp),
-            cmd.qsize as u32,
+            cmd.qsize,
             ctx,
         ) {
             Ok(_) => cmds::Completion::success(),
@@ -67,7 +67,7 @@ impl NvmeCtrl {
             cmd.qid,
             cmd.cqid,
             GuestAddr(cmd.prp),
-            cmd.qsize as u32,
+            cmd.qsize,
             ctx,
         ) {
             Ok(_) => cmds::Completion::success(),
@@ -117,18 +117,14 @@ impl NvmeCtrl {
     ) -> cmds::Completion {
         match cmd.cns {
             IDENT_CNS_NAMESPACE => match cmd.nsid {
-                n if n > 0 && n <= super::ns::MAX_NUM_NAMESPACES as u32 => {
+                1 => {
                     assert!(size_of::<bits::IdentifyNamespace>() <= PAGE_SIZE);
                     let buf = cmd
                         .data(ctx.mctx.memctx())
                         .next()
                         .expect("missing prp entry for ident response");
-                    if let Ok(ns) = self.get_ns(n) {
-                        assert!(ctx.mctx.memctx().write(buf.0, &ns.ident));
-                        cmds::Completion::success()
-                    } else {
-                        cmds::Completion::generic_err(STS_INVALID_NS)
-                    }
+                    assert!(ctx.mctx.memctx().write(buf.0, &self.ns_ident));
+                    cmds::Completion::success()
                 }
                 // 0 is not a valid NSID (See NVMe 1.0e, Section 6.1 Namespaces)
                 // We also don't currently support namespace management
@@ -143,7 +139,7 @@ impl NvmeCtrl {
                     .data(ctx.mctx.memctx())
                     .next()
                     .expect("missing prp entry for ident response");
-                assert!(ctx.mctx.memctx().write(buf.0, &self.ident));
+                assert!(ctx.mctx.memctx().write(buf.0, &self.ctrl_ident));
                 cmds::Completion::success()
             }
             // We currently present NVMe version 1.0 in which CNS is a 1-bit field

propolis/src/hw/nvme/cmds.rs

@@ -61,7 +61,7 @@ impl AdminCmd {
                 };
                 AdminCmd::CreateIOSubQ(CreateIOSQCmd {
                     prp: raw.prp1,
-                    qsize: (raw.cdw10 >> 16) as u16 + 1, // Convert from 0's based
+                    qsize: (raw.cdw10 >> 16) + 1, // Convert from 0's based
                     qid: raw.cdw10 as u16,
                     cqid: (raw.cdw11 >> 16) as u16,
                     queue_prio,
@@ -84,7 +84,7 @@ impl AdminCmd {
             bits::ADMIN_OPC_CREATE_IO_CQ => {
                 AdminCmd::CreateIOCompQ(CreateIOCQCmd {
                     prp: raw.prp1,
-                    qsize: (raw.cdw10 >> 16) as u16 + 1, // Convert from 0's based
+                    qsize: (raw.cdw10 >> 16) + 1, // Convert from 0's based
                     qid: raw.cdw10 as u16,
                     intr_vector: (raw.cdw11 >> 16) as u16,
                     intr_enable: (raw.cdw11 & 0b10) != 0,
@@ -132,7 +132,8 @@ pub struct CreateIOCQCmd {
     ///
     /// The size of the Completion Queue to be created.
     /// See NVMe 1.0e Section 4.1.3 Queue Size
-    pub qsize: u16,
+    /// NOTE: This has already been converted from a 0's based value.
+    pub qsize: u32,
 
     /// Queue Identifier (QID)
     ///
@@ -171,7 +172,8 @@ pub struct CreateIOSQCmd {
     ///
     /// The size of the Completion Queue to be created.
     /// See NVMe 1.0e Section 4.1.3 Queue Size
-    pub qsize: u16,
+    /// NOTE: This has already been converted from a 0's based value.
+    pub qsize: u32,
 
     /// Queue Identifier (QID)
     ///