nvme: allow cmb and pmr emulation on same device
PATCH v2 1/1 nvme: allow cmb and pmr emulation on same device
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]
v2:
- rebase on Kevin's latest block branch (Klaus [3])
- improved comments section (Klaus [3])
- simplified calculation of BAR4 size (Klaus [4])
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]/a
PATCH v2 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
@@ -1570,6 +1570,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 ;
@@ -1579,7 +1580,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 v2 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 | 120 ++++++++++++++++++++++++++++--------------- hw/block/nvme.h | 5 +- include/block/nvme.h | 4 +- 3 files changed, 86 insertions(+), 43 deletions(-)
hw/block/nvme.c +79 -41
@@ -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>, \
@@ -68,18 +68,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->cmbsz &&nvme_addr_is_cmb (n, addr, size)) { +memcpy (buf, (void *)&n->cmbuf[addr - cmb_addr], size);return ; }
@@ -166,17 +167,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->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);
@@ -221,7 +223,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++;
@@ -234,7 +237,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); } } }
@@ -1359,6 +1363,7 @@ static const MemoryRegionOps nvme_cmb_ops = { }, }; +static void nvme_check_constraints (NvmeCtrl *n,Error **errp) {NvmeParams *params = &n->params;
@@ -1387,7 +1392,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);
@@ -1443,33 +1448,66 @@ 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) +#define NVME_MSIX_BIR (4) +static void nvme_bar4_init (PCIDevice *pci_dev) { -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->cmbloc = n->bar.cmbloc; + n->cmbsz = n->bar.cmbsz; + + 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 ,NULL ); + +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 );
@@ -1527,11 +1565,10 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev) n->reg_size);pci_register_bar (pci_dev,0 ,PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , &n->iomem); -msix_init_exclusive_bar (pci_dev, n->params.max_ioqpairs +1 ,4 ,NULL ); -if (n->params.cmb_size_mb) { -nvme_init_cmb (n, pci_dev); - }else if (n->pmrdev) { +nvme_bar4_init (pci_dev); + +if (n->pmrdev) {nvme_init_pmr (n, pci_dev); } }
@@ -1571,6 +1608,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 +4 -1
@@ -79,7 +79,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;
@@ -93,6 +93,9 @@ typedef struct NvmeCtrl {uint32_t num_namespaces;uint32_t max_q_ents;uint64_t ns_size; +uint32_t cmbsz; +uint32_t cmbloc; +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