nvme: mi: dev: Implement Admin / Identify / Identify Namespace for Allocated Namespace ID

Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

Author: amboar

src/nvme.rs

@@ -108,6 +108,7 @@ enum AdminIoCqeGenericCommandStatus {
     SuccessfulCompletion = 0x00,
     InvalidFieldInCommand = 0x02,
     InternalError = 0x06,
+    InvalidNamespaceOrFormat = 0x0b,
 }
 unsafe impl Discriminant<u8> for AdminIoCqeGenericCommandStatus {}
 
@@ -384,6 +385,7 @@ enum AdminIdentifyCnsRequestType {
     IoActiveNamespaceIdList = 0x07,
     IdentifyNamespace = 0x08,
     AllocatedNamespaceIdList = 0x10,
+    IdentifyNamespaceForAllocatedNamespaceId = 0x11,
     NvmSubsystemControllerList = 0x13,
     SecondaryControllerList = 0x15,
 }
@@ -413,6 +415,26 @@ pub struct AdminIdentifyNvmIdentifyNamespaceResponse {
 }
 impl Encode<4096> for AdminIdentifyNvmIdentifyNamespaceResponse {}
 
+impl From<&crate::Namespace> for AdminIdentifyNvmIdentifyNamespaceResponse {
+    fn from(value: &crate::Namespace) -> Self {
+        Self {
+            nsze: value.size,
+            ncap: value.capacity,
+            nuse: value.used,
+            nsfeat: ((value.size == value.capacity) as u8),
+            nlbaf: 0,
+            flbas: 0,
+            mc: 0,
+            dpc: 0,
+            dps: 0,
+            nvmcap: 2_u128.pow(value.block_order as u32) * value.size as u128,
+            lbaf0: 0,
+            lbaf0_lbads: value.block_order,
+            lbaf0_rp: 0,
+        }
+    }
+}
+
 // Base v2.1, 5.1.13.1, Figure 311
 #[derive(Clone, Copy, Debug, DekuRead, DekuWrite)]
 #[deku(id_type = "u8", endian = "endian", ctx = "endian: Endian")]

src/nvme/mi/dev.rs

@@ -1261,23 +1261,7 @@ impl RequestHandler for AdminIdentifyRequest {
                         Ok(AdminIdentifyNvmIdentifyNamespaceResponse::default())
                     }
                     // 4.1.5.1 NVM Command Set Spec, v1.0c
-                    NamespaceIdDisposition::Active(ns) => {
-                        Ok(AdminIdentifyNvmIdentifyNamespaceResponse {
-                            nsze: ns.size,
-                            ncap: ns.capacity,
-                            nuse: ns.used,
-                            nsfeat: ((ns.size == ns.capacity) as u8),
-                            nlbaf: 0,
-                            flbas: 0,
-                            mc: 0,
-                            dpc: 0,
-                            dps: 0,
-                            nvmcap: 2_u128.pow(ns.block_order as u32) * ns.size as u128,
-                            lbaf0: 0,
-                            lbaf0_lbads: ns.block_order,
-                            lbaf0_rp: 0,
-                        })
-                    }
+                    NamespaceIdDisposition::Active(ns) => Ok(ns.into()),
                 }?
                 .encode()?;
 
@@ -1480,6 +1464,37 @@ impl RequestHandler for AdminIdentifyRequest {
                 )
                 .await
             }
+            AdminIdentifyCnsRequestType::IdentifyNamespaceForAllocatedNamespaceId => {
+                // Base v2.1, 5.1.13.2.10
+                match match NamespaceId(self.nsid).disposition(subsys) {
+                    NamespaceIdDisposition::Invalid | NamespaceIdDisposition::Broadcast => {
+                        Err(AdminIoCqeGenericCommandStatus::InvalidNamespaceOrFormat)
+                    }
+                    NamespaceIdDisposition::Unallocated => {
+                        AdminIdentifyNvmIdentifyNamespaceResponse::default()
+                            .encode()
+                            .map_err(AdminIoCqeGenericCommandStatus::from)
+                    }
+                    NamespaceIdDisposition::Inactive(ns) | NamespaceIdDisposition::Active(ns) => {
+                        let ainvminr: AdminIdentifyNvmIdentifyNamespaceResponse = ns.into();
+                        ainvminr
+                            .encode()
+                            .map_err(AdminIoCqeGenericCommandStatus::from)
+                    }
+                } {
+                    Ok(response) => {
+                        admin_send_response_body(
+                            resp,
+                            admin_constrain_body(self.dofst, self.dlen, &response.0)?,
+                        )
+                        .await
+                    }
+                    Err(err) => {
+                        admin_send_status(resp, AdminIoCqeStatusType::GenericCommandStatus(err))
+                            .await
+                    }
+                }
+            }
             AdminIdentifyCnsRequestType::NvmSubsystemControllerList => {
                 assert!(
                     subsys.ctlrs.len() <= 2047,