Fix bbssd I/O processing

realcedriccheng · Oct 12, 2021 · 1715760 · 1715760
1 parent 2748796
commit 1715760
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/hw/block/femu/bbssd/ftl.c b/hw/block/femu/bbssd/ftl.c
@@ -884,15 +884,18 @@ static void *ftl_thread(void *arg)
             }
 
             ftl_assert(req);
-            switch (req->is_write) {
-            case 1:
+            switch (req->cmd.opcode) {
+            case NVME_CMD_WRITE:
                 lat = ssd_write(ssd, req);
                 break;
-            case 0:
+            case NVME_CMD_READ:
                 lat = ssd_read(ssd, req);
                 break;
+            case NVME_CMD_DSM:
+                break;
             default:
-                ftl_err("FTL received unkown request type, ERROR\n");
+                //ftl_err("FTL received unkown request type, ERROR\n");
+                ;
             }
 
             req->reqlat = lat;

diff --git a/hw/block/femu/nvme-io.c b/hw/block/femu/nvme-io.c
@@ -36,23 +36,6 @@ static inline void nvme_copy_cmd(NvmeCmd *dst, NvmeCmd *src)
 #endif
 }
 
-/*
- * For now, only the I/Os which needs delay emulation will be handled by the
- * FEMU thread
- */
-static bool should_emulate_delay(NvmeCmd *cmd)
-{
-    int opc = cmd->opcode;
-
-    if (opc == NVME_CMD_READ || opc == NVME_CMD_WRITE ||
-        opc == NVME_CMD_OC_ERASE || opc == NVME_CMD_OC_WRITE ||
-        opc == NVME_CMD_OC_READ) {
-        return true;
-    }
-
-    return false;
-}
-
 static void nvme_process_sq_io(void *opaque, int index_poller)
 {
     NvmeSQueue *sq = opaque;
@@ -90,7 +73,7 @@ static void nvme_process_sq_io(void *opaque, int index_poller)
         }
 
         status = nvme_io_cmd(n, &cmd, req);
-        if (should_emulate_delay(&cmd) && status == NVME_SUCCESS) {
+        if (1 && status == NVME_SUCCESS) {
             req->status = status;
 
             int rc = femu_ring_enqueue(n->to_ftl[index_poller], (void *)&req, 1);