Skip to contentSkip to conversation

hw/block/nvme: Align I/O BAR to 4 KiB

PATCH In review Philippe Mathieu-Daudé 2 participants 5 messages Jun 25, 2020 – Jun 30, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/block/nvme: Align I/O BAR to 4 KiB

Simplify the NVMe emulated device by aligning the I/O BAR to 4 KiB.

---
 include/block/nvme.h | 3 +++
 hw/block/nvme.c      | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
include/block/nvme.h +3 -0
index 1720ee1d51..6d87c9c146 100644
@@ -22,6 +22,8 @@ typedef struct NvmeBar {
     uint32_t    pmrebs;
     uint32_t    pmrswtp;
     uint32_t    pmrmsc;
+    uint32_t    reserved[58];
+    uint8_t     cmd_set_specfic[0x100];
 } NvmeBar;
 
 enum NvmeCapShift {
@@ -879,6 +881,7 @@ enum NvmeIdNsDps {
 
 static inline void _nvme_check_size(void)
 {
+    QEMU_BUILD_BUG_ON(sizeof(NvmeBar) != 4096);
     QEMU_BUILD_BUG_ON(sizeof(NvmeAerResult) != 4);
     QEMU_BUILD_BUG_ON(sizeof(NvmeCqe) != 16);
     QEMU_BUILD_BUG_ON(sizeof(NvmeDsmRange) != 16);
hw/block/nvme.c +2 -3
index 1aee042d4c..1938891e50 100644
@@ -55,7 +55,6 @@
 #include "nvme.h"
 
 #define NVME_MAX_IOQPAIRS 0xffff
-#define NVME_REG_SIZE 0x1000
 #define NVME_DB_SIZE  4
 #define NVME_CMB_BIR 2
 #define NVME_PMR_BIR 2
@@ -1322,7 +1321,7 @@ static void nvme_mmio_write(void *opaque, hwaddr addr, uint64_t data,
     NvmeCtrl *n = (NvmeCtrl *)opaque;
     if (addr < sizeof(n->bar)) {
         nvme_write_bar(n, addr, data, size);
-    } else if (addr >= 0x1000) {
+    } else {
         nvme_process_db(n, addr, data);
     }
 }
@@ -1416,7 +1415,7 @@ static void nvme_init_state(NvmeCtrl *n)
 {
     n->num_namespaces = 1;
     /* add one to max_ioqpairs to account for the admin queue pair */
-    n->reg_size = pow2ceil(NVME_REG_SIZE +
+    n->reg_size = pow2ceil(sizeof(NvmeBar) +
                            2 * (n->params.max_ioqpairs + 1) * NVME_DB_SIZE);
     n->namespaces = g_new0(NvmeNamespace, n->num_namespaces);
     n->sq = g_new0(NvmeSQueue *, n->params.max_ioqpairs + 1);
Signature · 1 line
2.21.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Philippe Mathieu-Daudé

Simplify the NVMe emulated device by aligning the I/O BAR to 4 KiB.

---
 include/block/nvme.h | 3 +++
 hw/block/nvme.c      | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
include/block/nvme.h +0 -0
index 1720ee1d51..6d87c9c146 100644

include/block/nvme.h typedef struct NvmeBar { · line 27

Quoted 6 lines
include/block/nvme.h +2 -0
@@ -22,6 +22,8 @@ typedef struct NvmeBar {
     uint32_t    pmrebs;
     uint32_t    pmrswtp;
     uint32_t    pmrmsc;
+    uint32_t    reserved[58];
+    uint8_t     cmd_set_specfic[0x100];
 } NvmeBar;

This ends up as a freak mix of v1.3 and v1.4 specs. Since we already have the PMR stuff in there, I think it makes more sense to align with v1.4 and remove the reserved bytes.

Otherwise, LGTM.

#2 lore raw

Hi Klaus,

Quoted 9 lines · Klaus Jensen
Quoted 8 lines · Philippe Mathieu-Daudé

Simplify the NVMe emulated device by aligning the I/O BAR to 4 KiB.

---
 include/block/nvme.h | 3 +++
 hw/block/nvme.c      | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
Quoted 15 lines

include/block/nvme.h typedef struct NvmeBar { · line 27

Quoted 11 lines
include/block/nvme.h +2 -0
index 1720ee1d51..6d87c9c146 100644
@@ -22,6 +22,8 @@ typedef struct NvmeBar {
     uint32_t    pmrebs;
     uint32_t    pmrswtp;
     uint32_t    pmrmsc;
+    uint32_t    reserved[58];
+    uint8_t     cmd_set_specfic[0x100];
 } NvmeBar;

This ends up as a freak mix of v1.3 and v1.4 specs. Since we already have the PMR stuff in there, I think it makes more sense to align with v1.4 and remove the reserved bytes.

I'm sorry but I don't understand what you'd prefer, removing the cmd_set_specfic[] for v1.3 and instead use this?

      uint32_t    pmrmsc;

+ uint32_t reserved[122];
} NvmeBar;

Or this?

      uint32_t    pmrmsc;

+ uint8_t reserved[488];
} NvmeBar;

Quoted 5 lines

Otherwise, LGTM.

#3 lore raw
Quoted 32 lines · Philippe Mathieu-Daudé

Hi Klaus,

Quoted 9 lines · Klaus Jensen
Quoted 8 lines · Philippe Mathieu-Daudé

Simplify the NVMe emulated device by aligning the I/O BAR to 4 KiB.

---
 include/block/nvme.h | 3 +++
 hw/block/nvme.c      | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
Quoted 15 lines

include/block/nvme.h typedef struct NvmeBar { · line 27

Quoted 11 lines
include/block/nvme.h +2 -0
index 1720ee1d51..6d87c9c146 100644
@@ -22,6 +22,8 @@ typedef struct NvmeBar {
     uint32_t    pmrebs;
     uint32_t    pmrswtp;
     uint32_t    pmrmsc;
+    uint32_t    reserved[58];
+    uint8_t     cmd_set_specfic[0x100];
 } NvmeBar;

This ends up as a freak mix of v1.3 and v1.4 specs. Since we already have the PMR stuff in there, I think it makes more sense to align with v1.4 and remove the reserved bytes.

I'm sorry but I don't understand what you'd prefer, removing the cmd_set_specfic[] for v1.3 and instead use this?

      uint32_t    pmrmsc;
Quoted 9 lines

+ uint32_t reserved[122];
} NvmeBar;

Or this?

      uint32_t    pmrmsc;

+ uint8_t reserved[488];
} NvmeBar;

Yes, the second one.

But it should be 484 bytes reserved and the bug is in the pmrmsc field that should be uint64_t. Can you fix that as well? :)

#4 lore raw
Quoted 43 lines · Klaus Jensen
Quoted 32 lines · Philippe Mathieu-Daudé

Hi Klaus,

Quoted 9 lines · Klaus Jensen
Quoted 8 lines · Philippe Mathieu-Daudé

Simplify the NVMe emulated device by aligning the I/O BAR to 4 KiB.

---
 include/block/nvme.h | 3 +++
 hw/block/nvme.c      | 5 ++---
 2 files changed, 5 insertions(+), 3 deletions(-)
Quoted 15 lines

include/block/nvme.h typedef struct NvmeBar { · line 27

Quoted 11 lines
include/block/nvme.h +2 -0
index 1720ee1d51..6d87c9c146 100644
@@ -22,6 +22,8 @@ typedef struct NvmeBar {
     uint32_t    pmrebs;
     uint32_t    pmrswtp;
     uint32_t    pmrmsc;
+    uint32_t    reserved[58];
+    uint8_t     cmd_set_specfic[0x100];
 } NvmeBar;

This ends up as a freak mix of v1.3 and v1.4 specs. Since we already have the PMR stuff in there, I think it makes more sense to align with v1.4 and remove the reserved bytes.

I'm sorry but I don't understand what you'd prefer, removing the cmd_set_specfic[] for v1.3 and instead use this?

      uint32_t    pmrmsc;
Quoted 9 lines

+ uint32_t reserved[122];
} NvmeBar;

Or this?

      uint32_t    pmrmsc;

+ uint8_t reserved[488];
} NvmeBar;

Quoted 5 lines

Yes, the second one.

But it should be 484 bytes reserved and the bug is in the pmrmsc field that should be uint64_t. Can you fix that as well? :)

Ah this is what you did in "hw/block/nvme: add NVMe 1.4 specific fields"
https://www.mail-archive.com/[email protected]/msg717891.html