nvme_driver: Added the qid field to the pending commands (#1688) (#1694)

Adding the qid field to the assert output during failures (Mismatched
completion ids). Fixes: #1685. Cherry-picked changes from
c765316

Author: gurasinghMS

vm/devices/storage/disk_nvme/nvme_driver/src/queue_pair.rs

@@ -76,10 +76,11 @@ impl PendingCommands {
     const MAX_CIDS: usize = 1 << Self::CID_KEY_BITS;
     const CID_SEQ_OFFSET: Wrapping<u16> = Wrapping(1 << Self::CID_KEY_BITS);
 
-    fn new() -> Self {
+    fn new(qid: u16) -> Self {
         Self {
             commands: Slab::new(),
             next_cid_high_bits: Wrapping(0),
+            qid,
         }
     }
 
@@ -109,11 +110,13 @@ impl PendingCommands {
         let command = self
             .commands
             .try_remove((cid & Self::CID_KEY_MASK) as usize)
-            .expect("completion for unknown cid");
+            .unwrap_or_else(|| panic!("completion for unknown cid: qid={}, cid={}", self.qid, cid));
         assert_eq!(
             command.command.cdw0.cid(),
             cid,
-            "cid sequence number mismatch"
+            "cid sequence number mismatch: qid={}, command_opcode={:#x}",
+            self.qid,
+            command.command.cdw0.opcode(),
         );
         command.respond
     }
@@ -136,7 +139,7 @@ impl PendingCommands {
     }
 
     /// Restore pending commands from the saved state.
-    pub fn restore(saved_state: &PendingCommandsSavedState) -> anyhow::Result<Self> {
+    pub fn restore(saved_state: &PendingCommandsSavedState, qid: u16) -> anyhow::Result<Self> {
         let PendingCommandsSavedState {
             commands,
             next_cid_high_bits,
@@ -161,6 +164,7 @@ impl PendingCommands {
                 })
                 .collect::<Slab<PendingCommand>>(),
             next_cid_high_bits: Wrapping(*next_cid_high_bits),
+            qid,
         })
     }
 }
@@ -241,7 +245,7 @@ impl QueuePair {
                 QueueHandler {
                     sq: SubmissionQueue::new(qid, sq_entries, sq_mem_block),
                     cq: CompletionQueue::new(qid, cq_entries, cq_mem_block),
-                    commands: PendingCommands::new(),
+                    commands: PendingCommands::new(qid),
                     stats: Default::default(),
                     drain_after_restore: false,
                 }
@@ -609,6 +613,7 @@ struct PendingCommands {
     commands: Slab<PendingCommand>,
     #[inspect(hex)]
     next_cid_high_bits: Wrapping<u16>,
+    qid: u16,
 }
 
 #[derive(Inspect)]
@@ -749,7 +754,7 @@ impl QueueHandler {
         Ok(Self {
             sq: SubmissionQueue::restore(sq_mem_block, sq_state)?,
             cq: CompletionQueue::restore(cq_mem_block, cq_state)?,
-            commands: PendingCommands::restore(pending_cmds)?,
+            commands: PendingCommands::restore(pending_cmds, sq_state.sqid)?,
             stats: Default::default(),
             // Only drain pending commands for I/O queues.
             // Admin queue is expected to have pending Async Event requests.