nvme: allow cmb and pmr emulation on same device
PATCH v3 1/1 nvme: allow cmb and pmr emulation on same device
Hi All,
Resending series recently posted on mailing list related to nvme device extension with couple of fixes after review.
This patch series does following:
- Fixes problem where CMBS bit was not set in controller capabilities register, so support for CMB was not correctly advertised to guest. This is resend of patch that has been submitted and reviewed by Klaus [1]
- Introduces BAR4 sharing between MSI-X vectors and CMB. This allows to have CMB and PMR emulated on the same device. This extension was indicated by Keith [2]
v3:
- Code style fixes including: removal of spurious line break, moving define into define section and code alignment (Klaus [4])
- Removed unintended code reintroduction (Klaus [4])
v2:
- rebase on Kevin's latest block branch (Klaus [3])
- improved comments section (Klaus [3])
- simplified calculation of BAR4 size (Klaus [3])
v1:
- initial push of the patch
[1]: https://lore.kernel.org/qemu-devel/[email protected]/
[2]: https://lore.kernel.org/qemu-devel/[email protected]/
[3]: https://lore.kernel.org/qemu-devel/[email protected]/
[4]: https://lore.kernel.org/qemu-devel/[email protected]/
PATCH v3 1/2 nvme: indicate CMB support through controller capabilities register
This patch sets CMBS bit in controller capabilities register when user configures NVMe driver with CMB support, so capabilites are correctly reported to guest OS.
--- hw/block/nvme.c | 2 +- include/block/nvme.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
hw/block/nvme.c +1 -1
@@ -1582,6 +1582,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)NVME_CAP_SET_TO (n->bar.cap,0xf );NVME_CAP_SET_CSS (n->bar.cap,1 );NVME_CAP_SET_MPSMAX (n->bar.cap,4 ); +NVME_CAP_SET_CMBS (n->bar.cap, n->params.cmb_size_mb ?1 :0 ); n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ;
@@ -1591,7 +1592,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) {NvmeCtrl *n =NVME (pci_dev);Error *local_err =NULL ; -int i;nvme_check_constraints (n, &local_err);
include/block/nvme.h +5 -1
@@ -35,6 +35,7 @@ enum NvmeCapShift {CAP_MPSMIN_SHIFT =48 ,CAP_MPSMAX_SHIFT =52 ,CAP_PMR_SHIFT =56 , + CAP_CMB_SHIFT = 57, }; enum NvmeCapMask {
@@ -48,6 +49,7 @@ enum NvmeCapMask {CAP_MPSMIN_MASK =0xf ,CAP_MPSMAX_MASK =0xf ,CAP_PMR_MASK =0x1 , + CAP_CMB_MASK = 0x1, };#define NVME_CAP_MQES (cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK)
@@ -78,8 +80,10 @@ enum NvmeCapMask { << CAP_MPSMIN_SHIFT)#define NVME_CAP_SET_MPSMAX (cap, val) (cap |= (uint64_t)(val & CAP_MPSMAX_MASK)\ << CAP_MPSMAX_SHIFT) -#define NVME_CAP_SET_PMRS (cap, val) (cap |= (uint64_t)(val & CAP_PMR_MASK)\ +#define NVME_CAP_SET_PMRS (cap, val) (cap |= (uint64_t)(val & CAP_PMR_MASK) \ << CAP_PMR_SHIFT) +#define NVME_CAP_SET_CMBS (cap, val) (cap |= (uint64_t)(val & CAP_CMB_MASK) \ + << CAP_CMB_SHIFT)enum NvmeCcShift {CC_EN_SHIFT =0 ,
Signature · 1 line
2.21.1
PATCH v3 2/2 nvme: allow cmb and pmr to be enabled on same device
In reply to Andrzej JakowskiSo far it was not possible to have CMB and PMR emulated on the same device, because BAR2 was used exclusively either of PMR or CMB. This patch places CMB at BAR4 offset so it not conflicts with MSI-X vectors.
--- hw/block/nvme.c | 119 +++++++++++++++++++++++++++---------------- hw/block/nvme.h | 3 +- include/block/nvme.h | 4 +- 3 files changed, 80 insertions(+), 46 deletions(-)
hw/block/nvme.c +75 -44
@@ -22,12 +22,12 @@* [pmrdev=<mem_backend_file_id>,] \ * max_ioqpairs=<N[optional]> * -* Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at -* offset 0 in BAR2 and supports only WDS, RDS and SQS for now. +* Note cmb_size_mb denotes size of CMB in MB. CMB when configured is assumed +* to be resident in BAR4 at certain offset - this is because BAR4 is also +* used for storing MSI-X table that is available at offset 0 in BAR4. * -* cmb_size_mb= and pmrdev= options are mutually exclusive due to limitation -* in available BAR's. cmb_size_mb= will take precedence over pmrdev= when -* both provided. +* pmrdev is assumed to be resident in BAR2/BAR3. When configured it consumes +* whole BAR2/BAR3 exclusively. * Enabling pmr emulation can be achieved by pointing to memory-backend-file. * For example: * -object memory-backend-file,id=<mem_id>,share=on,mem-path=<file_path>, \
@@ -57,8 +57,8 @@#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 +#define NVME_MSIX_BIR 4#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \
@@ -69,18 +69,19 @@static void nvme_process_sq (void *opaque); -static bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr) +static bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr,int size) { -hwaddr low = n->ctrl_mem.addr; -hwaddr hi = n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size); +hwaddr low = n->bar4.addr + n->cmb_offset; +hwaddr hi = low +NVME_CMBSZ_GETSIZE (n->bar.cmbsz); -return addr >= low && addr < hi; +return addr >= low && (addr + size) < hi; }static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) { -if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr)) { -memcpy (buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size); +hwaddr cmb_addr = n->bar4.addr + n->cmb_offset; +if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr, size)) { +memcpy (buf, (void *)&n->cmbuf[addr - cmb_addr], size);return ; }
@@ -167,17 +168,18 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, uint64_t prp2, uint32_t len, NvmeCtrl *n) { hwaddr trans_len = n->page_size - (prp1 % n->page_size); +hwaddr cmb_addr = n->bar4.addr + n->cmb_offset; trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;if (unlikely (!prp1)) {trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ; - }else if (n->bar.cmbsz && prp1 >= n->ctrl_mem.addr && - prp1 < n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size)) { + }else if (n->bar.cmbsz && prp1 >= cmb_addr && + prp1 < cmb_addr +int128_get64 (n->bar4.size)) { qsg->nsg =0 ;qemu_iovec_init (iov, num_prps); -qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - cmb_addr], trans_len); }else {pci_dma_sglist_init (qsg, &n->parent_obj, num_prps);qemu_sglist_add (qsg, prp1, trans_len);
@@ -222,7 +224,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (qsg->nsg){qemu_sglist_add (qsg, prp_ent, trans_len); }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp_ent - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp_ent - cmb_addr], + trans_len); } len -= trans_len; i++;
@@ -235,7 +238,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (qsg->nsg) {qemu_sglist_add (qsg, prp2, len); }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - cmb_addr], + trans_len); } } }
@@ -1395,7 +1399,7 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)return ; } -if (!n->params.cmb_size_mb && n->pmrdev) { +if (n->pmrdev) {if (host_memory_backend_is_mapped (n->pmrdev)) {char *path =object_get_canonical_path_component (OBJECT (n->pmrdev));error_setg (errp,"can't use already busy memdev: %s" , path);
@@ -1453,33 +1457,62 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) id_ns->nuse = id_ns->ncap; } -static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev) +static void nvme_bar4_init (PCIDevice *pci_dev,Error **errp) { -NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_CMB_BIR ); -NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 ); - -NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ -NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); - - n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); -memory_region_init_io (&n->ctrl_mem,OBJECT (n), &nvme_cmb_ops, n, -"nvme-cmb" ,NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); -pci_register_bar (pci_dev,NVME_CMBLOC_BIR (n->bar.cmbloc), +NvmeCtrl *n =NVME (pci_dev); +int status; +uint64_t bar_size; +uint32_t msix_vectors; +uint32_t nvme_pba_offset; +uint32_t cmb_size_units; + + msix_vectors = n->params.max_ioqpairs +1 ; + nvme_pba_offset =PCI_MSIX_ENTRY_SIZE * msix_vectors; + bar_size = nvme_pba_offset +QEMU_ALIGN_UP (msix_vectors,64 ) /8 ; + +if (n->params.cmb_size_mb) { +NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ +NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); + + cmb_size_units =NVME_CMBSZ_GETSIZEUNITS (n->bar.cmbsz); + n->cmb_offset =QEMU_ALIGN_UP (bar_size, cmb_size_units); + +NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_MSIX_BIR ); +NVME_CMBLOC_SET_OFST (n->bar.cmbloc, n->cmb_offset / cmb_size_units); + + n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); + + bar_size += n->cmb_offset; + bar_size +=NVME_CMBSZ_GETSIZE (n->bar.cmbsz); + } + + bar_size =pow2ceil (bar_size); + +memory_region_init_io (&n->bar4,OBJECT (n), &nvme_cmb_ops, n, +"nvme-bar4" , bar_size); + + status =msix_init (pci_dev, n->params.max_ioqpairs +1 , + &n->bar4,NVME_MSIX_BIR ,0 , + &n->bar4,NVME_MSIX_BIR , nvme_pba_offset, +0 , errp); + +if (status) { +return ; + } + +pci_register_bar (pci_dev,NVME_MSIX_BIR ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 | -PCI_BASE_ADDRESS_MEM_PREFETCH , &n->ctrl_mem); +PCI_BASE_ADDRESS_MEM_PREFETCH , &n->bar4); }static void nvme_init_pmr (NvmeCtrl *n,PCIDevice *pci_dev) { -/* Controller Capabilities register */ -NVME_CAP_SET_PMRS (n->bar.cap,1 ); -/* PMR Capabities register */ n->bar.pmrcap =0 ;NVME_PMRCAP_SET_RDS (n->bar.pmrcap,0 );
@@ -1537,13 +1570,10 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) n->reg_size);pci_register_bar (pci_dev,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , &n->iomem); -if (msix_init_exclusive_bar (pci_dev, n->params.msix_qsize,4 , errp)) { -return ; - } -if (n->params.cmb_size_mb) { -nvme_init_cmb (n, pci_dev); - }else if (n->pmrdev) { +nvme_bar4_init (pci_dev, errp); + +if (n->pmrdev) {nvme_init_pmr (n, pci_dev); } }
@@ -1583,6 +1613,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)NVME_CAP_SET_CSS (n->bar.cap,1 );NVME_CAP_SET_MPSMAX (n->bar.cap,4 );NVME_CAP_SET_CMBS (n->bar.cap, n->params.cmb_size_mb ?1 :0 ); +NVME_CAP_SET_PMRS (n->bar.cap, n->pmrdev ?1 :0 ); n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ;
hw/block/nvme.h +2 -1
@@ -80,7 +80,7 @@ static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns) typedef struct NvmeCtrl { PCIDevice parent_obj; MemoryRegion iomem; - MemoryRegion ctrl_mem; + MemoryRegion bar4; NvmeBar bar; BlockConf conf; NvmeParams params;
@@ -94,6 +94,7 @@ typedef struct NvmeCtrl {uint32_t num_namespaces;uint32_t max_q_ents;uint64_t ns_size; +uint32_t cmb_offset;uint8_t *cmbuf;uint32_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */
include/block/nvme.h +3 -1
@@ -216,9 +216,11 @@ enum NvmeCmbszMask { (cmbsz |= (uint64_t)(val & CMBSZ_SZU_MASK) << CMBSZ_SZU_SHIFT)#define NVME_CMBSZ_SET_SZ (cmbsz, val) \ (cmbsz |= (uint64_t)(val & CMBSZ_SZ_MASK) << CMBSZ_SZ_SHIFT) +#define NVME_CMBSZ_GETSIZEUNITS (cmbsz) \ + (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz)))#define NVME_CMBSZ_GETSIZE (cmbsz) \ - (NVME_CMBSZ_SZ(cmbsz) * (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz)))) + (NVME_CMBSZ_SZ(cmbsz) * NVME_CMBSZ_GETSIZEUNITS(cmbsz))enum NvmePmrcapShift {PMRCAP_RDS_SHIFT =3 ,
Signature · 1 line
2.21.1
Re: [PATCH v3 2/2] nvme: allow cmb and pmr to be enabled on same device
Quoted 47 lines · Andrzej Jakowski
So far it was not possible to have CMB and PMR emulated on the same device, because BAR2 was used exclusively either of PMR or CMB. This patch places CMB at BAR4 offset so it not conflicts with MSI-X vectors.
Signed-off-by Andrzej Jakowski <[email protected]>--- hw/block/nvme.c | 119 +++++++++++++++++++++++++++---------------- hw/block/nvme.h | 3 +- include/block/nvme.h | 4 +- 3 files changed, 80 insertions(+), 46 deletions(-)hw/block/nvme.c +6
-6@@ -22,12 +22,12 @@* [pmrdev=<mem_backend_file_id>,] \ * max_ioqpairs=<N[optional]> * -* Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at -* offset 0 in BAR2 and supports only WDS, RDS and SQS for now. +* Note cmb_size_mb denotes size of CMB in MB. CMB when configured is assumed +* to be resident in BAR4 at certain offset - this is because BAR4 is also +* used for storing MSI-X table that is available at offset 0 in BAR4. * -* cmb_size_mb= and pmrdev= options are mutually exclusive due to limitation -* in available BAR's. cmb_size_mb= will take precedence over pmrdev= when -* both provided. +* pmrdev is assumed to be resident in BAR2/BAR3. When configured it consumes +* whole BAR2/BAR3 exclusively. * Enabling pmr emulation can be achieved by pointing to memory-backend-file. * For example: * -object memory-backend-file,id=<mem_id>,share=on,mem-path=<file_path>, \ @@ -57,8 +57,8 @@#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 +#define NVME_MSIX_BIR 4#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \@@ -69,18 +69,19 @@static void nvme_process_sq (void *opaque);
hw/block/nvme.c line 77
Quoted 10 lines
hw/block/nvme.c +4
-4-static bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr) +static bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr,int size) { -hwaddr low = n->ctrl_mem.addr; -hwaddr hi = n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size); +hwaddr low = n->bar4.addr + n->cmb_offset; +hwaddr hi = low +NVME_CMBSZ_GETSIZE (n->bar.cmbsz); -return addr >= low && addr < hi; +return addr >= low && (addr + size) < hi;
I think the hi check is off by one? Should be (addr + size + 1) < hi or <=) right? Otherwise we reject a valid read against the last address in the CMB.
Also, a check for wrap-around is missing (hi < addr post-addition).
Anyway, I would really prefer that we do not change nvme_addr_is_cmb since it is a useful function on its own. I use it a lot in my PRP mapping refactor and SGL patches, so I would need to re-add another function that does what nvme_addr_is_cmb used to do.
But, see my next comment.
hw/block/nvme.c line 86
Quoted 11 lines
hw/block/nvme.c +3
-2}static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) { -if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr)) { -memcpy (buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size); +hwaddr cmb_addr = n->bar4.addr + n->cmb_offset; +if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr, size)) { +memcpy (buf, (void *)&n->cmbuf[addr - cmb_addr], size);return ; }
I would prefer that we do the range check here (nvme_addr_read already has the size parameter) and have nvme_addr_read return a success/fail value. E.g.
static int nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size) {
- if (n->bar.cmbsz && nvme_addr_is_cmb(n, addr)) {
+ hwaddr hi = addr + size - 1;
+ if (hi < addr) {
+ return 1;
+ }
+
+ if (n->bar.cmbsz && nvme_addr_is_cmb(n, addr) && nvme_addr_is_cmb(n, hi)) {
memcpy(buf, nvme_addr_to_cmb(n, addr), size);
return 0;
}
Actually, since the controller only support PRPs at this stage, it is not required to check the ending address (addr + len - 1) of the CMB access for validity since it is guaranteed to be in range of the CMB (nvme_addr_read is only used for reading PRPs and they never cross a page boundary so size is always <= page_size and the CMB is always at least 4k aligned).
This change is really only needed when the controller adds support for SGLs, which is why I have the above in my tree that supports SGLs.
Come to think of it, the above might not even be sufficient since if just one of the nvme_addr_is_cmb checks fails, we end up issuing an invalid pci_dma_read. But I think that it will error out gracefully on that. But this needs to be checked.
I suggest that you just drop the size check from this patch since it's not needed and might need more work to be safe in the context of SGLs anyway.
Quoted 105 lines
hw/block/nvme.c +41
-22@@ -167,17 +168,18 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, uint64_t prp2, uint32_t len, NvmeCtrl *n) { hwaddr trans_len = n->page_size - (prp1 % n->page_size); +hwaddr cmb_addr = n->bar4.addr + n->cmb_offset; trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;if (unlikely (!prp1)) {trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ; - }else if (n->bar.cmbsz && prp1 >= n->ctrl_mem.addr && - prp1 < n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size)) { + }else if (n->bar.cmbsz && prp1 >= cmb_addr && + prp1 < cmb_addr +int128_get64 (n->bar4.size)) { qsg->nsg =0 ;qemu_iovec_init (iov, num_prps); -qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - cmb_addr], trans_len); }else {pci_dma_sglist_init (qsg, &n->parent_obj, num_prps);qemu_sglist_add (qsg, prp1, trans_len);@@ -222,7 +224,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (qsg->nsg){qemu_sglist_add (qsg, prp_ent, trans_len); }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp_ent - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp_ent - cmb_addr], + trans_len); } len -= trans_len; i++;@@ -235,7 +238,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (qsg->nsg) {qemu_sglist_add (qsg, prp2, len); }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - cmb_addr], + trans_len); } } }@@ -1395,7 +1399,7 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)return ; } -if (!n->params.cmb_size_mb && n->pmrdev) { +if (n->pmrdev) {if (host_memory_backend_is_mapped (n->pmrdev)) {char *path =object_get_canonical_path_component (OBJECT (n->pmrdev));error_setg (errp,"can't use already busy memdev: %s" , path);@@ -1453,33 +1457,62 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) id_ns->nuse = id_ns->ncap; } -static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev) +static void nvme_bar4_init (PCIDevice *pci_dev,Error **errp) { -NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_CMB_BIR ); -NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 ); - -NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ -NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); - - n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); -memory_region_init_io (&n->ctrl_mem,OBJECT (n), &nvme_cmb_ops, n, -"nvme-cmb" ,NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); - pci_register_bar(pci_dev, NVME_CMBLOC_BIR(n->bar.cmbloc), +NvmeCtrl *n =NVME (pci_dev); +int status; +uint64_t bar_size; +uint32_t msix_vectors; +uint32_t nvme_pba_offset; +uint32_t cmb_size_units; + + msix_vectors = n->params.max_ioqpairs +1 ; + nvme_pba_offset =PCI_MSIX_ENTRY_SIZE * msix_vectors; + bar_size = nvme_pba_offset +QEMU_ALIGN_UP (msix_vectors,64 ) /8 ; + +if (n->params.cmb_size_mb) { +NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ +NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); + + cmb_size_units =NVME_CMBSZ_GETSIZEUNITS (n->bar.cmbsz); + n->cmb_offset =QEMU_ALIGN_UP (bar_size, cmb_size_units); + +NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_MSIX_BIR ); +NVME_CMBLOC_SET_OFST (n->bar.cmbloc, n->cmb_offset / cmb_size_units); + + n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); + + bar_size += n->cmb_offset; + bar_size +=NVME_CMBSZ_GETSIZE (n->bar.cmbsz); + }
hw/block/nvme.c static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) · line 1502
Quoted 10 lines
hw/block/nvme.c +10
-0+ + bar_size =pow2ceil (bar_size); + +memory_region_init_io (&n->bar4,OBJECT (n), &nvme_cmb_ops, n, +"nvme-bar4" , bar_size); + + status =msix_init (pci_dev, n->params.max_ioqpairs +1 , + &n->bar4,NVME_MSIX_BIR ,0 , + &n->bar4,NVME_MSIX_BIR , nvme_pba_offset, +0 , errp);
This needs to use n->params.msix_qsize instead ofn->params.max_ioqpairs.
Quoted 87 lines
hw/block/nvme.c +11
-10+ +if (status) { +return ; + } + +pci_register_bar (pci_dev,NVME_MSIX_BIR ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 | - PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem); +PCI_BASE_ADDRESS_MEM_PREFETCH , &n->bar4); }static void nvme_init_pmr (NvmeCtrl *n,PCIDevice *pci_dev) { -/* Controller Capabilities register */ -NVME_CAP_SET_PMRS (n->bar.cap,1 ); -/* PMR Capabities register */ n->bar.pmrcap =0 ;NVME_PMRCAP_SET_RDS (n->bar.pmrcap,0 );@@ -1537,13 +1570,10 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) n->reg_size);pci_register_bar (pci_dev,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , &n->iomem); -if (msix_init_exclusive_bar (pci_dev, n->params.msix_qsize,4 , errp)) { -return ; - } -if (n->params.cmb_size_mb) { -nvme_init_cmb (n, pci_dev); - }else if (n->pmrdev) { +nvme_bar4_init (pci_dev, errp); + +if (n->pmrdev) {nvme_init_pmr (n, pci_dev); } }@@ -1583,6 +1613,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)NVME_CAP_SET_CSS (n->bar.cap,1 );NVME_CAP_SET_MPSMAX (n->bar.cap,4 );NVME_CAP_SET_CMBS (n->bar.cap, n->params.cmb_size_mb ?1 :0 ); +NVME_CAP_SET_PMRS (n->bar.cap, n->pmrdev ?1 :0 ); n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ;hw/block/nvme.h +2
-1@@ -80,7 +80,7 @@ static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns) typedef struct NvmeCtrl { PCIDevice parent_obj; MemoryRegion iomem; - MemoryRegion ctrl_mem; + MemoryRegion bar4; NvmeBar bar; BlockConf conf; NvmeParams params;@@ -94,6 +94,7 @@ typedef struct NvmeCtrl {uint32_t num_namespaces;uint32_t max_q_ents;uint64_t ns_size; +uint32_t cmb_offset;uint8_t *cmbuf;uint32_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ include/block/nvme.h +3
-1@@ -216,9 +216,11 @@ enum NvmeCmbszMask { (cmbsz |= (uint64_t)(val & CMBSZ_SZU_MASK) << CMBSZ_SZU_SHIFT)#define NVME_CMBSZ_SET_SZ (cmbsz, val) \ (cmbsz |= (uint64_t)(val & CMBSZ_SZ_MASK) << CMBSZ_SZ_SHIFT) +#define NVME_CMBSZ_GETSIZEUNITS (cmbsz) \ + (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz)))#define NVME_CMBSZ_GETSIZE (cmbsz) \ - (NVME_CMBSZ_SZ(cmbsz) * (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz)))) + (NVME_CMBSZ_SZ(cmbsz) * NVME_CMBSZ_GETSIZEUNITS(cmbsz))enum NvmePmrcapShift {PMRCAP_RDS_SHIFT =3 ,Signature · 1 line
2.21.1
Re: [PATCH v3 2/2] nvme: allow cmb and pmr to be enabled on same device
Quoted 63 lines · Klaus Jensen
Quoted 47 lines · Andrzej Jakowski
So far it was not possible to have CMB and PMR emulated on the same device, because BAR2 was used exclusively either of PMR or CMB. This patch places CMB at BAR4 offset so it not conflicts with MSI-X vectors.
Signed-off-by Andrzej Jakowski <[email protected]>--- hw/block/nvme.c | 119 +++++++++++++++++++++++++++---------------- hw/block/nvme.h | 3 +- include/block/nvme.h | 4 +- 3 files changed, 80 insertions(+), 46 deletions(-)hw/block/nvme.c +6
-6@@ -22,12 +22,12 @@* [pmrdev=<mem_backend_file_id>,] \ * max_ioqpairs=<N[optional]> * -* Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at -* offset 0 in BAR2 and supports only WDS, RDS and SQS for now. +* Note cmb_size_mb denotes size of CMB in MB. CMB when configured is assumed +* to be resident in BAR4 at certain offset - this is because BAR4 is also +* used for storing MSI-X table that is available at offset 0 in BAR4. * -* cmb_size_mb= and pmrdev= options are mutually exclusive due to limitation -* in available BAR's. cmb_size_mb= will take precedence over pmrdev= when -* both provided. +* pmrdev is assumed to be resident in BAR2/BAR3. When configured it consumes +* whole BAR2/BAR3 exclusively. * Enabling pmr emulation can be achieved by pointing to memory-backend-file. * For example: * -object memory-backend-file,id=<mem_id>,share=on,mem-path=<file_path>, \ @@ -57,8 +57,8 @@#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 +#define NVME_MSIX_BIR 4#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \@@ -69,18 +69,19 @@static void nvme_process_sq (void *opaque);hw/block/nvme.c line 77
Quoted 10 lines
hw/block/nvme.c +4
-4-static bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr) +static bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr,int size) { -hwaddr low = n->ctrl_mem.addr; -hwaddr hi = n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size); +hwaddr low = n->bar4.addr + n->cmb_offset; +hwaddr hi = low +NVME_CMBSZ_GETSIZE (n->bar.cmbsz); -return addr >= low && addr < hi; +return addr >= low && (addr + size) < hi;I think the hi check is off by one? Should be
(addr + size + 1) < hior<=) right? Otherwise we reject a valid read against the last address in the CMB.
Quoted 8 lines
Also, a check for wrap-around is missing (
hi < addrpost-addition).Anyway, I would really prefer that we do not change
nvme_addr_is_cmbsince it is a useful function on its own. I use it a lot in my PRP mapping refactor and SGL patches, so I would need to re-add another function that does whatnvme_addr_is_cmbused to do.But, see my next comment.
Hi Klaus,
Thx for your review. Yep I confirm this problem.
Quoted 38 lines
hw/block/nvme.c line 86
Quoted 12 lines
hw/block/nvme.c +3
-2}static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) { -if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr)) { -memcpy (buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size); +hwaddr cmb_addr = n->bar4.addr + n->cmb_offset; +if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr, size)) { +memcpy (buf, (void *)&n->cmbuf[addr - cmb_addr], size);return ; }I would prefer that we do the range check here (
nvme_addr_readalready has the size parameter) and havenvme_addr_readreturn a success/fail value. E.g.static int
nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size){
- if (n->bar.cmbsz&&nvme_addr_is_cmb(n, addr)) {
+ hwaddr hi = addr + size - 1;
+ if (hi < addr) {
+ return 1;
+ }
+
+ if (n->bar.cmbsz&&nvme_addr_is_cmb(n, addr)&&nvme_addr_is_cmb(n, hi)) {
memcpy(buf, nvme_addr_to_cmb(n, addr), size);
return 0;
}Actually, since the controller only support PRPs at this stage, it is not required to check the ending address (addr + len - 1) of the CMB access for validity since it is guaranteed to be in range of the CMB (
nvme_addr_readis only used for reading PRPs and they never cross a page boundary so size is always <=page_sizeand the CMB is always at least 4k aligned).This change is really only needed when the controller adds support for SGLs, which is why I have the above in my tree that supports SGLs.
Quoted 8 lines
Come to think of it, the above might not even be sufficient since if just one of the
nvme_addr_is_cmbchecks fails, we end up issuing an invalidpci_dma_read. But I think that it will error out gracefully on that. But this needs to be checked.I suggest that you just drop the size check from this patch since it's not needed and might need more work to be safe in the context of SGLs anyway.
How about just MMIO access to CMB region? It can be done to any address. What guarantees that this will not go outside of CMB region?
Quoted 110 lines
Quoted 110 lines
hw/block/nvme.c +46
-22@@ -167,17 +168,18 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, uint64_t prp2, uint32_t len, NvmeCtrl *n) { hwaddr trans_len = n->page_size - (prp1 % n->page_size); +hwaddr cmb_addr = n->bar4.addr + n->cmb_offset; trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;if (unlikely (!prp1)) {trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ; - }else if (n->bar.cmbsz && prp1 >= n->ctrl_mem.addr && - prp1 < n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size)) { + }else if (n->bar.cmbsz && prp1 >= cmb_addr && + prp1 < cmb_addr +int128_get64 (n->bar4.size)) { qsg->nsg =0 ;qemu_iovec_init (iov, num_prps); -qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - cmb_addr], trans_len); }else {pci_dma_sglist_init (qsg, &n->parent_obj, num_prps);qemu_sglist_add (qsg, prp1, trans_len);@@ -222,7 +224,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (qsg->nsg){qemu_sglist_add (qsg, prp_ent, trans_len); }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp_ent - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp_ent - cmb_addr], + trans_len); } len -= trans_len; i++;@@ -235,7 +238,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (qsg->nsg) {qemu_sglist_add (qsg, prp2, len); }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - n->ctrl_mem.addr], trans_len); +qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - cmb_addr], + trans_len); } } }@@ -1395,7 +1399,7 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)return ; } -if (!n->params.cmb_size_mb && n->pmrdev) { +if (n->pmrdev) {if (host_memory_backend_is_mapped (n->pmrdev)) {char *path =object_get_canonical_path_component (OBJECT (n->pmrdev));error_setg (errp,"can't use already busy memdev: %s" , path);@@ -1453,33 +1457,62 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) id_ns->nuse = id_ns->ncap; } -static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev) +static void nvme_bar4_init (PCIDevice *pci_dev,Error **errp) { -NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_CMB_BIR ); -NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 ); - -NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ -NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); - - n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); -memory_region_init_io (&n->ctrl_mem,OBJECT (n), &nvme_cmb_ops, n, -"nvme-cmb" ,NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); - pci_register_bar(pci_dev, NVME_CMBLOC_BIR(n->bar.cmbloc), +NvmeCtrl *n =NVME (pci_dev); +int status; +uint64_t bar_size; +uint32_t msix_vectors; +uint32_t nvme_pba_offset; +uint32_t cmb_size_units; + + msix_vectors = n->params.max_ioqpairs +1 ; + nvme_pba_offset =PCI_MSIX_ENTRY_SIZE * msix_vectors; + bar_size = nvme_pba_offset +QEMU_ALIGN_UP (msix_vectors,64 ) /8 ; + +if (n->params.cmb_size_mb) { +NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ +NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); + + cmb_size_units =NVME_CMBSZ_GETSIZEUNITS (n->bar.cmbsz); + n->cmb_offset =QEMU_ALIGN_UP (bar_size, cmb_size_units); + +NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_MSIX_BIR ); +NVME_CMBLOC_SET_OFST (n->bar.cmbloc, n->cmb_offset / cmb_size_units); + + n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); + + bar_size += n->cmb_offset; + bar_size +=NVME_CMBSZ_GETSIZE (n->bar.cmbsz); + } + + bar_size =pow2ceil (bar_size); + +memory_region_init_io (&n->bar4,OBJECT (n), &nvme_cmb_ops, n, +"nvme-bar4" , bar_size);
Quoted 8 lines
hw/block/nvme.c static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) · line 1502
Quoted 5 lines
hw/block/nvme.c +5
-0+ + status =msix_init (pci_dev, n->params.max_ioqpairs +1 , + &n->bar4,NVME_MSIX_BIR ,0 , + &n->bar4,NVME_MSIX_BIR , nvme_pba_offset, +0 , errp);This needs to use
n->params.msix_qsizeinstead ofn->params.max_ioqpairs.
Makese sense.
Quoted 88 lines
Quoted 88 lines
hw/block/nvme.c +11
-10+ +if (status) { +return ; + } + +pci_register_bar (pci_dev,NVME_MSIX_BIR ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 | - PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem); +PCI_BASE_ADDRESS_MEM_PREFETCH , &n->bar4); }static void nvme_init_pmr (NvmeCtrl *n,PCIDevice *pci_dev) { -/* Controller Capabilities register */ -NVME_CAP_SET_PMRS (n->bar.cap,1 ); -/* PMR Capabities register */ n->bar.pmrcap =0 ;NVME_PMRCAP_SET_RDS (n->bar.pmrcap,0 );@@ -1537,13 +1570,10 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) n->reg_size);pci_register_bar (pci_dev,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , &n->iomem); -if (msix_init_exclusive_bar (pci_dev, n->params.msix_qsize,4 , errp)) { -return ; - } -if (n->params.cmb_size_mb) { -nvme_init_cmb (n, pci_dev); - }else if (n->pmrdev) { +nvme_bar4_init (pci_dev, errp); + +if (n->pmrdev) {nvme_init_pmr (n, pci_dev); } }@@ -1583,6 +1613,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)NVME_CAP_SET_CSS (n->bar.cap,1 );NVME_CAP_SET_MPSMAX (n->bar.cap,4 );NVME_CAP_SET_CMBS (n->bar.cap, n->params.cmb_size_mb ?1 :0 ); +NVME_CAP_SET_PMRS (n->bar.cap, n->pmrdev ?1 :0 ); n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ;hw/block/nvme.h +2
-1@@ -80,7 +80,7 @@ static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns) typedef struct NvmeCtrl { PCIDevice parent_obj; MemoryRegion iomem; - MemoryRegion ctrl_mem; + MemoryRegion bar4; NvmeBar bar; BlockConf conf; NvmeParams params;@@ -94,6 +94,7 @@ typedef struct NvmeCtrl {uint32_t num_namespaces;uint32_t max_q_ents;uint64_t ns_size; +uint32_t cmb_offset;uint8_t *cmbuf;uint32_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ include/block/nvme.h +3
-1@@ -216,9 +216,11 @@ enum NvmeCmbszMask { (cmbsz |= (uint64_t)(val & CMBSZ_SZU_MASK) << CMBSZ_SZU_SHIFT)#define NVME_CMBSZ_SET_SZ (cmbsz, val) \ (cmbsz |= (uint64_t)(val & CMBSZ_SZ_MASK) << CMBSZ_SZ_SHIFT) +#define NVME_CMBSZ_GETSIZEUNITS (cmbsz) \ + (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz)))#define NVME_CMBSZ_GETSIZE (cmbsz) \ - (NVME_CMBSZ_SZ(cmbsz) * (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz)))) + (NVME_CMBSZ_SZ(cmbsz) * NVME_CMBSZ_GETSIZEUNITS(cmbsz))enum NvmePmrcapShift {PMRCAP_RDS_SHIFT =3 ,Signature · 1 line
2.21.1
Re: [PATCH v3 2/2] nvme: allow cmb and pmr to be enabled on same device
Quoted 7 lines · Andrzej Jakowski
Quoted 6 lines · Klaus Jensen
Come to think of it, the above might not even be sufficient since if just one of the
nvme_addr_is_cmbchecks fails, we end up issuing an invalidpci_dma_read. But I think that it will error out gracefully on that. But this needs to be checked.
Quoted 7 lines
Quoted 3 lines
I suggest that you just drop the size check from this patch since it's not needed and might need more work to be safe in the context of SGLs anyway.
How about just MMIO access to CMB region? It can be done to any address. What guarantees that this will not go outside of CMB region?
This was addressed in commit 87ad860c622c ("nvme: fix out-of-bounds access to the CMB").
Quoted 67 lines
Quoted 58 lines
Quoted 58 lines
hw/block/nvme.c +37
-16@@ -1453,33 +1457,62 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) id_ns->nuse = id_ns->ncap; } -static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev) +static void nvme_bar4_init (PCIDevice *pci_dev,Error **errp) { -NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_CMB_BIR ); -NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 ); - -NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); -NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); -NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ -NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); - - n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); -memory_region_init_io (&n->ctrl_mem,OBJECT (n), &nvme_cmb_ops, n, -"nvme-cmb" ,NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); - pci_register_bar(pci_dev, NVME_CMBLOC_BIR(n->bar.cmbloc), +NvmeCtrl *n =NVME (pci_dev); +int status; +uint64_t bar_size; +uint32_t msix_vectors; +uint32_t nvme_pba_offset; +uint32_t cmb_size_units; + + msix_vectors = n->params.max_ioqpairs +1 ; + nvme_pba_offset =PCI_MSIX_ENTRY_SIZE * msix_vectors; + bar_size = nvme_pba_offset +QEMU_ALIGN_UP (msix_vectors,64 ) /8 ; + +if (n->params.cmb_size_mb) { +NVME_CMBSZ_SET_SQS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_CQS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_LISTS (n->bar.cmbsz,0 ); +NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 ); +NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ +NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); + + cmb_size_units =NVME_CMBSZ_GETSIZEUNITS (n->bar.cmbsz); + n->cmb_offset =QEMU_ALIGN_UP (bar_size, cmb_size_units); + +NVME_CMBLOC_SET_BIR (n->bar.cmbloc,NVME_MSIX_BIR ); +NVME_CMBLOC_SET_OFST (n->bar.cmbloc, n->cmb_offset / cmb_size_units); + + n->cmbuf =g_malloc0 (NVME_CMBSZ_GETSIZE (n->bar.cmbsz)); + + bar_size += n->cmb_offset; + bar_size +=NVME_CMBSZ_GETSIZE (n->bar.cmbsz); + } + + bar_size =pow2ceil (bar_size); + +memory_region_init_io (&n->bar4,OBJECT (n), &nvme_cmb_ops, n, +"nvme-bar4" , bar_size);Quoted 8 lines
hw/block/nvme.c static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) · line 1502
Quoted 5 lines
hw/block/nvme.c +5
-0+ + status =msix_init (pci_dev, n->params.max_ioqpairs +1 , + &n->bar4,NVME_MSIX_BIR ,0 , + &n->bar4,NVME_MSIX_BIR , nvme_pba_offset, +0 , errp);This needs to use
n->params.msix_qsizeinstead ofn->params.max_ioqpairs.
Quoted 1 line
Makese sense.
Another thing here. You are initializing a single memory region for bar4 and use nvme_cmb_ops as callbacks for that.
msix_init then overlays two memory regions ontop of this (for the table and the pba). I'm not sure this is... correct? Paolo, can you shed any light on this?
It looks to me like we need to do something more like what msix_init_exclusive_bar does:
1. do a memory_region_init for n->bar4
2. msix_init adds io regions for the msix table and pba.
3. we should then add an io region for the cmb like msix_init does (with a memory_region_init_io and a memory_region_add_subregion pair) and keep n->ctrl_mem around.
4. pci_register_bar on n->bar4
Thus, no "general" mmio_ops are registered for bar4, but only for the ctrl_mem and the msix_{table,pba}_mmio regions.