nvme: small fixes, refactoring and cleanups
v6 cover nvme: small fixes, refactoring and cleanups
From: Klaus Jensen <[email protected]>
Changes since v5
~~~~~~~~~~~~~~~~
* Prefixed all patches with "hw/block/nvme" to avoid confusion with the nvme block driver.
* Added patch two patches:
hw/block/nvme: fix pin-based interrupt behavior hw/block/nvme: allow use of any valid msix vector
These were previously posted separately, but I'm including them in this series since I didnt get any response on the separate series anyway.
* Fixed Maxim's email in the R-b on "hw/block/nvme: refactor nvme_addr_read"
Klaus Jensen (20):
hw/block/nvme: fix pci doorbell size calculation hw/block/nvme: rename trace events to pci_nvme hw/block/nvme: remove superfluous breaks hw/block/nvme: move device parameters to separate struct hw/block/nvme: use constants in identify hw/block/nvme: refactor nvme_addr_read hw/block/nvme: fix pin-based interrupt behavior hw/block/nvme: allow use of any valid msix vector hw/block/nvme: add max_ioqpairs device parameter hw/block/nvme: remove redundant cmbloc/cmbsz members hw/block/nvme: factor out property/constraint checks hw/block/nvme: factor out device state setup hw/block/nvme: factor out block backend setup hw/block/nvme: add namespace helpers hw/block/nvme: factor out namespace setup hw/block/nvme: factor out pci setup hw/block/nvme: factor out cmb setup hw/block/nvme: factor out pmr setup hw/block/nvme: do cmb/pmr init as part of pci init hw/block/nvme: factor out controller identify setup
hw/block/nvme.c | 555 ++++++++++++++++++++++++------------------ hw/block/nvme.h | 33 ++- hw/block/trace-events | 180 +++++++------- include/block/nvme.h | 8 + 4 files changed, 438 insertions(+), 338 deletions(-)
Signature · 1 line
2.26.2
PATCH v6 1/20 hw/block/nvme: fix pci doorbell size calculation
From: Klaus Jensen <[email protected]>
The size of the BAR is 0x1000 (main registers) + 8 bytes for each queue. Currently, the size of the BAR is calculated like so:
n->reg_size = pow2ceil(0x1004 + 2 * (n->num_queues + 1) * 4);
Since the 'num_queues' parameter already accounts for the admin queue, this should in any case not need to be incremented by one. Also, the size should be initialized to (0x1000).
n->reg_size = pow2ceil(0x1000 + 2 * n->num_queues * 4);
This, with the default value of num_queues (64), we will set aside room for 1 admin queue and 63 I/O queues (4 bytes per doorbell, 2 doorbells per queue).
--- hw/block/nvme.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
hw/block/nvme.c +6 -1
@@ -54,6 +54,9 @@#include "trace.h" #include "nvme.h" +#define NVME_REG_SIZE 0x1000 +#define NVME_DB_SIZE 4 +#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \ (trace_##trace)(__VA_ARGS__); \
@@ -1403,7 +1406,9 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)pcie_endpoint_cap_init (pci_dev,0x80 ); n->num_namespaces =1 ; - n->reg_size =pow2ceil (0x1004 +2 * (n->num_queues +1 ) *4 ); + +/* num_queues is really number of pairs, so each has two doorbells */ + n->reg_size =pow2ceil (NVME_REG_SIZE +2 * n->num_queues *NVME_DB_SIZE ); n->ns_size = bs_size / (uint64_t )n->num_namespaces; n->namespaces =g_new0 (NvmeNamespace, n->num_namespaces);
Signature · 1 line
2.26.2
PATCH v6 2/20 hw/block/nvme: rename trace events to pci_nvme
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Change the prefix of all nvme device related trace events to 'pci_nvme' to not clash with trace events from the nvme block driver.
--- hw/block/nvme.c | 198 +++++++++++++++++++++--------------------- hw/block/trace-events | 180 +++++++++++++++++++------------------- 2 files changed, 188 insertions(+), 190 deletions(-)
hw/block/nvme.c +98 -100
@@ -126,16 +126,16 @@ static void nvme_irq_assert(NvmeCtrl *n, NvmeCQueue *cq) {if (cq->irq_enabled) {if (msix_enabled (&(n->parent_obj))) { -trace_nvme_irq_msix (cq->vector); +trace_pci_nvme_irq_msix (cq->vector);msix_notify (&(n->parent_obj), cq->vector); }else { -trace_nvme_irq_pin (); +trace_pci_nvme_irq_pin ();assert (cq->cqid <64 ); n->irq_status |=1 << cq->cqid;nvme_irq_check (n); } }else { -trace_nvme_irq_masked (); +trace_pci_nvme_irq_masked (); } }
@@ -160,7 +160,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,int num_prps = (len >> n->page_bits) +1 ;if (unlikely (!prp1)) { -trace_nvme_err_invalid_prp (); +trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ; }else if (n->cmbsz && prp1 >= n->ctrl_mem.addr && prp1 < n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size)) {
@@ -174,7 +174,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, len -= trans_len;if (len) {if (unlikely (!prp2)) { -trace_nvme_err_invalid_prp2_missing (); +trace_pci_nvme_err_invalid_prp2_missing (); goto unmap; }if (len > n->page_size) {
@@ -190,7 +190,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (i == n->max_prp_ents -1 && len > n->page_size) {if (unlikely (!prp_ent || prp_ent & (n->page_size -1 ))) { -trace_nvme_err_invalid_prplist_ent (prp_ent); +trace_pci_nvme_err_invalid_prplist_ent (prp_ent); goto unmap; }
@@ -203,7 +203,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, }if (unlikely (!prp_ent || prp_ent & (n->page_size -1 ))) { -trace_nvme_err_invalid_prplist_ent (prp_ent); +trace_pci_nvme_err_invalid_prplist_ent (prp_ent); goto unmap; }
@@ -218,7 +218,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, } }else {if (unlikely (prp2 & (n->page_size -1 ))) { -trace_nvme_err_invalid_prp2_align (prp2); +trace_pci_nvme_err_invalid_prp2_align (prp2); goto unmap; }if (qsg->nsg) {
@@ -266,20 +266,20 @@ static uint16_t nvme_dma_read_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,QEMUIOVector iov;uint16_t status =NVME_SUCCESS ; -trace_nvme_dma_read (prp1, prp2); +trace_pci_nvme_dma_read (prp1, prp2);if (nvme_map_prp (&qsg, &iov, prp1, prp2, len, n)) {return NVME_INVALID_FIELD |NVME_DNR ; }if (qsg.nsg >0 ) {if (unlikely (dma_buf_read (ptr, len, &qsg))) { -trace_nvme_err_invalid_dma (); +trace_pci_nvme_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; }qemu_sglist_destroy (&qsg); }else {if (unlikely (qemu_iovec_from_buf (&iov,0 , ptr, len) != len)) { -trace_nvme_err_invalid_dma (); +trace_pci_nvme_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; }qemu_iovec_destroy (&iov);
@@ -368,7 +368,7 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint32_t count = nlb << data_shift;if (unlikely (slba + nlb > ns->id_ns.nsze)) { -trace_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); +trace_pci_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);return NVME_LBA_RANGE |NVME_DNR ; }
@@ -396,11 +396,11 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ;enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; -trace_nvme_rw (is_write ?"write" :"read" , nlb, data_size, slba); +trace_pci_nvme_rw (is_write ?"write" :"read" , nlb, data_size, slba);if (unlikely ((slba + nlb) > ns->id_ns.nsze)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct); -trace_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); +trace_pci_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);return NVME_LBA_RANGE |NVME_DNR ; }
@@ -435,7 +435,7 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t nsid =le32_to_cpu (cmd->nsid);if (unlikely (nsid ==0 || nsid > n->num_namespaces)) { -trace_nvme_err_invalid_ns (nsid, n->num_namespaces); +trace_pci_nvme_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; }
@@ -449,7 +449,7 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_CMD_READ :return nvme_rw (n, ns, cmd, req);default : -trace_nvme_err_invalid_opc (cmd->opcode); +trace_pci_nvme_err_invalid_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }
@@ -474,11 +474,11 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeCmd *cmd)uint16_t qid =le16_to_cpu (c->qid);if (unlikely (!qid ||nvme_check_sqid (n, qid))) { -trace_nvme_err_invalid_del_sq (qid); +trace_pci_nvme_err_invalid_del_sq (qid);return NVME_INVALID_QID |NVME_DNR ; } -trace_nvme_del_sq (qid); +trace_pci_nvme_del_sq (qid); sq = n->sq[qid];while (!QTAILQ_EMPTY (&sq->out_req_list)) {
@@ -542,26 +542,26 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)uint16_t qflags =le16_to_cpu (c->sq_flags);uint64_t prp1 =le64_to_cpu (c->prp1); -trace_nvme_create_sq (prp1, sqid, cqid, qsize, qflags); +trace_pci_nvme_create_sq (prp1, sqid, cqid, qsize, qflags);if (unlikely (!cqid ||nvme_check_cqid (n, cqid))) { -trace_nvme_err_invalid_create_sq_cqid (cqid); +trace_pci_nvme_err_invalid_create_sq_cqid (cqid);return NVME_INVALID_CQID |NVME_DNR ; }if (unlikely (!sqid || !nvme_check_sqid (n, sqid))) { -trace_nvme_err_invalid_create_sq_sqid (sqid); +trace_pci_nvme_err_invalid_create_sq_sqid (sqid);return NVME_INVALID_QID |NVME_DNR ; }if (unlikely (!qsize || qsize >NVME_CAP_MQES (n->bar.cap))) { -trace_nvme_err_invalid_create_sq_size (qsize); +trace_pci_nvme_err_invalid_create_sq_size (qsize);return NVME_MAX_QSIZE_EXCEEDED |NVME_DNR ; }if (unlikely (!prp1 || prp1 & (n->page_size -1 ))) { -trace_nvme_err_invalid_create_sq_addr (prp1); +trace_pci_nvme_err_invalid_create_sq_addr (prp1);return NVME_INVALID_FIELD |NVME_DNR ; }if (unlikely (!(NVME_SQ_FLAGS_PC (qflags)))) { -trace_nvme_err_invalid_create_sq_qflags (NVME_SQ_FLAGS_PC (qflags)); +trace_pci_nvme_err_invalid_create_sq_qflags (NVME_SQ_FLAGS_PC (qflags));return NVME_INVALID_FIELD |NVME_DNR ; } sq =g_malloc0 (sizeof (*sq));
@@ -587,17 +587,17 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeCmd *cmd)uint16_t qid =le16_to_cpu (c->qid);if (unlikely (!qid ||nvme_check_cqid (n, qid))) { -trace_nvme_err_invalid_del_cq_cqid (qid); +trace_pci_nvme_err_invalid_del_cq_cqid (qid);return NVME_INVALID_CQID |NVME_DNR ; } cq = n->cq[qid];if (unlikely (!QTAILQ_EMPTY (&cq->sq_list))) { -trace_nvme_err_invalid_del_cq_notempty (qid); +trace_pci_nvme_err_invalid_del_cq_notempty (qid);return NVME_INVALID_QUEUE_DEL ; }nvme_irq_deassert (n, cq); -trace_nvme_del_cq (qid); +trace_pci_nvme_del_cq (qid);nvme_free_cq (cq, n);return NVME_SUCCESS ; }
@@ -630,27 +630,27 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)uint16_t qflags =le16_to_cpu (c->cq_flags);uint64_t prp1 =le64_to_cpu (c->prp1); -trace_nvme_create_cq (prp1, cqid, vector, qsize, qflags, -NVME_CQ_FLAGS_IEN (qflags) !=0 ); +trace_pci_nvme_create_cq (prp1, cqid, vector, qsize, qflags, +NVME_CQ_FLAGS_IEN (qflags) !=0 );if (unlikely (!cqid || !nvme_check_cqid (n, cqid))) { -trace_nvme_err_invalid_create_cq_cqid (cqid); +trace_pci_nvme_err_invalid_create_cq_cqid (cqid);return NVME_INVALID_CQID |NVME_DNR ; }if (unlikely (!qsize || qsize >NVME_CAP_MQES (n->bar.cap))) { -trace_nvme_err_invalid_create_cq_size (qsize); +trace_pci_nvme_err_invalid_create_cq_size (qsize);return NVME_MAX_QSIZE_EXCEEDED |NVME_DNR ; }if (unlikely (!prp1)) { -trace_nvme_err_invalid_create_cq_addr (prp1); +trace_pci_nvme_err_invalid_create_cq_addr (prp1);return NVME_INVALID_FIELD |NVME_DNR ; }if (unlikely (vector > n->num_queues)) { -trace_nvme_err_invalid_create_cq_vector (vector); +trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }if (unlikely (!(NVME_CQ_FLAGS_PC (qflags)))) { -trace_nvme_err_invalid_create_cq_qflags (NVME_CQ_FLAGS_PC (qflags)); +trace_pci_nvme_err_invalid_create_cq_qflags (NVME_CQ_FLAGS_PC (qflags));return NVME_INVALID_FIELD |NVME_DNR ; }
@@ -665,7 +665,7 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c)uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2); -trace_nvme_identify_ctrl (); +trace_pci_nvme_identify_ctrl ();return nvme_dma_read_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), prp1, prp2);
@@ -678,10 +678,10 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c)uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2); -trace_nvme_identify_ns (nsid); +trace_pci_nvme_identify_ns (nsid);if (unlikely (nsid ==0 || nsid > n->num_namespaces)) { -trace_nvme_err_invalid_ns (nsid, n->num_namespaces); +trace_pci_nvme_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; }
@@ -701,7 +701,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)uint16_t ret;int i, j =0 ; -trace_nvme_identify_nslist (min_nsid); +trace_pci_nvme_identify_nslist (min_nsid); list =g_malloc0 (data_len);for (i =0 ; i < n->num_namespaces; i++) {
@@ -730,14 +730,14 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd)case 0x02 :return nvme_identify_nslist (n, c);default : -trace_nvme_err_invalid_identify_cns (le32_to_cpu (c->cns)); +trace_pci_nvme_err_invalid_identify_cns (le32_to_cpu (c->cns));return NVME_INVALID_FIELD |NVME_DNR ; } }static inline void nvme_set_timestamp (NvmeCtrl *n,uint64_t ts) { -trace_nvme_setfeat_timestamp (ts); +trace_pci_nvme_setfeat_timestamp (ts); n->host_timestamp =le64_to_cpu (ts); n->timestamp_set_qemu_clock_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL );
@@ -770,7 +770,7 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)/* If the host timestamp is non-zero, set the timestamp origin */ ts.origin = n->host_timestamp ?0x01 :0x00 ; -trace_nvme_getfeat_timestamp (ts.all); +trace_pci_nvme_getfeat_timestamp (ts.all);return cpu_to_le64 (ts.all); }
@@ -794,17 +794,17 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)switch (dw10) {case NVME_VOLATILE_WRITE_CACHE : result =blk_enable_write_cache (n->conf.blk); -trace_nvme_getfeat_vwcache (result ?"enabled" :"disabled" ); +trace_pci_nvme_getfeat_vwcache (result ?"enabled" :"disabled" );break ;case NVME_NUMBER_OF_QUEUES : result =cpu_to_le32 ((n->num_queues -2 ) | ((n->num_queues -2 ) <<16 )); -trace_nvme_getfeat_numq (result); +trace_pci_nvme_getfeat_numq (result);break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd);break ;default : -trace_nvme_err_invalid_getfeat (dw10); +trace_pci_nvme_err_invalid_getfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ; }
@@ -840,9 +840,9 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)blk_set_enable_write_cache (n->conf.blk, dw11 &1 );break ;case NVME_NUMBER_OF_QUEUES : -trace_nvme_setfeat_numq ((dw11 &0xFFFF ) +1 , - ((dw11 >>16 ) &0xFFFF ) +1 , - n->num_queues -1 , n->num_queues -1 ); +trace_pci_nvme_setfeat_numq ((dw11 &0xFFFF ) +1 , + ((dw11 >>16 ) &0xFFFF ) +1 , + n->num_queues -1 , n->num_queues -1 ); req->cqe.result =cpu_to_le32 ((n->num_queues -2 ) | ((n->num_queues -2 ) <<16 ));break ;
@@ -852,7 +852,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;default : -trace_nvme_err_invalid_setfeat (dw10); +trace_pci_nvme_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ; }return NVME_SUCCESS ;
@@ -876,7 +876,7 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_ADM_CMD_GET_FEATURES :return nvme_get_feature (n, cmd, req);default : -trace_nvme_err_invalid_admin_opc (cmd->opcode); +trace_pci_nvme_err_invalid_admin_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }
@@ -939,77 +939,77 @@ static int nvme_start_ctrl(NvmeCtrl *n)uint32_t page_size =1 << page_bits;if (unlikely (n->cq[0 ])) { -trace_nvme_err_startfail_cq (); +trace_pci_nvme_err_startfail_cq ();return -1 ; }if (unlikely (n->sq[0 ])) { -trace_nvme_err_startfail_sq (); +trace_pci_nvme_err_startfail_sq ();return -1 ; }if (unlikely (!n->bar.asq)) { -trace_nvme_err_startfail_nbarasq (); +trace_pci_nvme_err_startfail_nbarasq ();return -1 ; }if (unlikely (!n->bar.acq)) { -trace_nvme_err_startfail_nbaracq (); +trace_pci_nvme_err_startfail_nbaracq ();return -1 ; }if (unlikely (n->bar.asq & (page_size -1 ))) { -trace_nvme_err_startfail_asq_misaligned (n->bar.asq); +trace_pci_nvme_err_startfail_asq_misaligned (n->bar.asq);return -1 ; }if (unlikely (n->bar.acq & (page_size -1 ))) { -trace_nvme_err_startfail_acq_misaligned (n->bar.acq); +trace_pci_nvme_err_startfail_acq_misaligned (n->bar.acq);return -1 ; }if (unlikely (NVME_CC_MPS (n->bar.cc) <NVME_CAP_MPSMIN (n->bar.cap))) { -trace_nvme_err_startfail_page_too_small ( +trace_pci_nvme_err_startfail_page_too_small (NVME_CC_MPS (n->bar.cc),NVME_CAP_MPSMIN (n->bar.cap));return -1 ; }if (unlikely (NVME_CC_MPS (n->bar.cc) >NVME_CAP_MPSMAX (n->bar.cap))) { -trace_nvme_err_startfail_page_too_large ( +trace_pci_nvme_err_startfail_page_too_large (NVME_CC_MPS (n->bar.cc),NVME_CAP_MPSMAX (n->bar.cap));return -1 ; }if (unlikely (NVME_CC_IOCQES (n->bar.cc) <NVME_CTRL_CQES_MIN (n->id_ctrl.cqes))) { -trace_nvme_err_startfail_cqent_too_small ( +trace_pci_nvme_err_startfail_cqent_too_small (NVME_CC_IOCQES (n->bar.cc),NVME_CTRL_CQES_MIN (n->bar.cap));return -1 ; }if (unlikely (NVME_CC_IOCQES (n->bar.cc) >NVME_CTRL_CQES_MAX (n->id_ctrl.cqes))) { -trace_nvme_err_startfail_cqent_too_large ( +trace_pci_nvme_err_startfail_cqent_too_large (NVME_CC_IOCQES (n->bar.cc),NVME_CTRL_CQES_MAX (n->bar.cap));return -1 ; }if (unlikely (NVME_CC_IOSQES (n->bar.cc) <NVME_CTRL_SQES_MIN (n->id_ctrl.sqes))) { -trace_nvme_err_startfail_sqent_too_small ( +trace_pci_nvme_err_startfail_sqent_too_small (NVME_CC_IOSQES (n->bar.cc),NVME_CTRL_SQES_MIN (n->bar.cap));return -1 ; }if (unlikely (NVME_CC_IOSQES (n->bar.cc) >NVME_CTRL_SQES_MAX (n->id_ctrl.sqes))) { -trace_nvme_err_startfail_sqent_too_large ( +trace_pci_nvme_err_startfail_sqent_too_large (NVME_CC_IOSQES (n->bar.cc),NVME_CTRL_SQES_MAX (n->bar.cap));return -1 ; }if (unlikely (!NVME_AQA_ASQS (n->bar.aqa))) { -trace_nvme_err_startfail_asqent_sz_zero (); +trace_pci_nvme_err_startfail_asqent_sz_zero ();return -1 ; }if (unlikely (!NVME_AQA_ACQS (n->bar.aqa))) { -trace_nvme_err_startfail_acqent_sz_zero (); +trace_pci_nvme_err_startfail_acqent_sz_zero ();return -1 ; }
@@ -1032,14 +1032,14 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, unsigned size) {if (unlikely (offset & (sizeof (uint32_t ) -1 ))) { -NVME_GUEST_ERR (nvme_ub_mmiowr_misaligned32, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_misaligned32,"MMIO write not 32-bit aligned," " offset=0x%" PRIx64"" , offset);/* should be ignored, fall through for now */ }if (unlikely (size <sizeof (uint32_t ))) { -NVME_GUEST_ERR (nvme_ub_mmiowr_toosmall, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_toosmall,"MMIO write smaller than 32-bits," " offset=0x%" PRIx64", size=%u" , offset, size);
@@ -1049,32 +1049,30 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,switch (offset) {case 0xc :/* INTMS */ if (unlikely (msix_enabled (&(n->parent_obj)))) { -NVME_GUEST_ERR (nvme_ub_mmiowr_intmask_with_msix, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_intmask_with_msix,"undefined access to interrupt mask set" " when MSI-X is enabled" );/* should be ignored, fall through for now */ } n->bar.intms |= data &0xffffffff ; n->bar.intmc = n->bar.intms; -trace_nvme_mmio_intm_set (data &0xffffffff , - n->bar.intmc); +trace_pci_nvme_mmio_intm_set (data &0xffffffff , n->bar.intmc);nvme_irq_check (n);break ;case 0x10 :/* INTMC */ if (unlikely (msix_enabled (&(n->parent_obj)))) { -NVME_GUEST_ERR (nvme_ub_mmiowr_intmask_with_msix, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_intmask_with_msix,"undefined access to interrupt mask clr" " when MSI-X is enabled" );/* should be ignored, fall through for now */ } n->bar.intms &= ~(data &0xffffffff ); n->bar.intmc = n->bar.intms; -trace_nvme_mmio_intm_clr (data &0xffffffff , - n->bar.intmc); +trace_pci_nvme_mmio_intm_clr (data &0xffffffff , n->bar.intmc);nvme_irq_check (n);break ;case 0x14 :/* CC */ -trace_nvme_mmio_cfg (data &0xffffffff ); +trace_pci_nvme_mmio_cfg (data &0xffffffff );/* Windows first sends data, then sends enable bit */ if (!NVME_CC_EN (data) && !NVME_CC_EN (n->bar.cc) && !NVME_CC_SHN (data) && !NVME_CC_SHN (n->bar.cc))
@@ -1085,42 +1083,42 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,if (NVME_CC_EN (data) && !NVME_CC_EN (n->bar.cc)) { n->bar.cc = data;if (unlikely (nvme_start_ctrl (n))) { -trace_nvme_err_startfail (); +trace_pci_nvme_err_startfail (); n->bar.csts =NVME_CSTS_FAILED ; }else { -trace_nvme_mmio_start_success (); +trace_pci_nvme_mmio_start_success (); n->bar.csts =NVME_CSTS_READY ; } }else if (!NVME_CC_EN (data) &&NVME_CC_EN (n->bar.cc)) { -trace_nvme_mmio_stopped (); +trace_pci_nvme_mmio_stopped ();nvme_clear_ctrl (n); n->bar.csts &= ~NVME_CSTS_READY ; }if (NVME_CC_SHN (data) && !(NVME_CC_SHN (n->bar.cc))) { -trace_nvme_mmio_shutdown_set (); +trace_pci_nvme_mmio_shutdown_set ();nvme_clear_ctrl (n); n->bar.cc = data; n->bar.csts |=NVME_CSTS_SHST_COMPLETE ; }else if (!NVME_CC_SHN (data) &&NVME_CC_SHN (n->bar.cc)) { -trace_nvme_mmio_shutdown_cleared (); +trace_pci_nvme_mmio_shutdown_cleared (); n->bar.csts &= ~NVME_CSTS_SHST_COMPLETE ; n->bar.cc = data; }break ;case 0x1C :/* CSTS */ if (data & (1 <<4 )) { -NVME_GUEST_ERR (nvme_ub_mmiowr_ssreset_w1c_unsupported, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_ssreset_w1c_unsupported,"attempted to W1C CSTS.NSSRO" " but CAP.NSSRS is zero (not supported)" ); }else if (data !=0 ) { -NVME_GUEST_ERR (nvme_ub_mmiowr_ro_csts, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_ro_csts,"attempted to set a read only bit" " of controller status" ); }break ;case 0x20 :/* NSSR */ if (data ==0x4E564D65 ) { -trace_nvme_ub_mmiowr_ssreset_unsupported (); +trace_pci_nvme_ub_mmiowr_ssreset_unsupported (); }else {/* The spec says that writes of other values have no effect */ return ;
@@ -1128,55 +1126,55 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,break ;case 0x24 :/* AQA */ n->bar.aqa = data &0xffffffff ; -trace_nvme_mmio_aqattr (data &0xffffffff ); +trace_pci_nvme_mmio_aqattr (data &0xffffffff );break ;case 0x28 :/* ASQ */ n->bar.asq = data; -trace_nvme_mmio_asqaddr (data); +trace_pci_nvme_mmio_asqaddr (data);break ;case 0x2c :/* ASQ hi */ n->bar.asq |= data <<32 ; -trace_nvme_mmio_asqaddr_hi (data, n->bar.asq); +trace_pci_nvme_mmio_asqaddr_hi (data, n->bar.asq);break ;case 0x30 :/* ACQ */ -trace_nvme_mmio_acqaddr (data); +trace_pci_nvme_mmio_acqaddr (data); n->bar.acq = data;break ;case 0x34 :/* ACQ hi */ n->bar.acq |= data <<32 ; -trace_nvme_mmio_acqaddr_hi (data, n->bar.acq); +trace_pci_nvme_mmio_acqaddr_hi (data, n->bar.acq);break ;case 0x38 :/* CMBLOC */ -NVME_GUEST_ERR (nvme_ub_mmiowr_cmbloc_reserved, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_cmbloc_reserved,"invalid write to reserved CMBLOC" " when CMBSZ is zero, ignored" );return ;case 0x3C :/* CMBSZ */ -NVME_GUEST_ERR (nvme_ub_mmiowr_cmbsz_readonly, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_cmbsz_readonly,"invalid write to read only CMBSZ, ignored" );return ;case 0xE00 :/* PMRCAP */ -NVME_GUEST_ERR (nvme_ub_mmiowr_pmrcap_readonly, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_pmrcap_readonly,"invalid write to PMRCAP register, ignored" );return ;case 0xE04 :/* TODO PMRCTL */ break ;case 0xE08 :/* PMRSTS */ -NVME_GUEST_ERR (nvme_ub_mmiowr_pmrsts_readonly, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_pmrsts_readonly,"invalid write to PMRSTS register, ignored" );return ;case 0xE0C :/* PMREBS */ -NVME_GUEST_ERR (nvme_ub_mmiowr_pmrebs_readonly, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_pmrebs_readonly,"invalid write to PMREBS register, ignored" );return ;case 0xE10 :/* PMRSWTP */ -NVME_GUEST_ERR (nvme_ub_mmiowr_pmrswtp_readonly, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_pmrswtp_readonly,"invalid write to PMRSWTP register, ignored" );return ;case 0xE14 :/* TODO PMRMSC */ break ;default : -NVME_GUEST_ERR (nvme_ub_mmiowr_invalid, +NVME_GUEST_ERR (pci_nvme_ub_mmiowr_invalid,"invalid MMIO write," " offset=0x%" PRIx64", data=%" PRIx64"" , offset, data);
@@ -1191,12 +1189,12 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)uint64_t val =0 ;if (unlikely (addr & (sizeof (uint32_t ) -1 ))) { -NVME_GUEST_ERR (nvme_ub_mmiord_misaligned32, +NVME_GUEST_ERR (pci_nvme_ub_mmiord_misaligned32,"MMIO read not 32-bit aligned," " offset=0x%" PRIx64"" , addr);/* should RAZ, fall through for now */ }else if (unlikely (size <sizeof (uint32_t ))) { -NVME_GUEST_ERR (nvme_ub_mmiord_toosmall, +NVME_GUEST_ERR (pci_nvme_ub_mmiord_toosmall,"MMIO read smaller than 32-bits," " offset=0x%" PRIx64"" , addr);/* should RAZ, fall through for now */
@@ -1215,7 +1213,7 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size) }memcpy (&val, ptr + addr, size); }else { -NVME_GUEST_ERR (nvme_ub_mmiord_invalid_ofs, +NVME_GUEST_ERR (pci_nvme_ub_mmiord_invalid_ofs,"MMIO read beyond last register," " offset=0x%" PRIx64", returning 0" , addr); }
@@ -1228,7 +1226,7 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)uint32_t qid;if (unlikely (addr & ((1 <<2 ) -1 ))) { -NVME_GUEST_ERR (nvme_ub_db_wr_misaligned, +NVME_GUEST_ERR (pci_nvme_ub_db_wr_misaligned,"doorbell write not 32-bit aligned," " offset=0x%" PRIx64", ignoring" , addr);return ;
@@ -1243,7 +1241,7 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val) qid = (addr - (0x1000 + (1 <<2 ))) >>3 ;if (unlikely (nvme_check_cqid (n, qid))) { -NVME_GUEST_ERR (nvme_ub_db_wr_invalid_cq, +NVME_GUEST_ERR (pci_nvme_ub_db_wr_invalid_cq,"completion queue doorbell write" " for nonexistent queue," " sqid=%" PRIu32", ignoring" , qid);
@@ -1252,7 +1250,7 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val) cq = n->cq[qid];if (unlikely (new_head >= cq->size)) { - NVME_GUEST_ERR(nvme_ub_db_wr_invalid_cqhead, + NVME_GUEST_ERR(pci_nvme_ub_db_wr_invalid_cqhead, "completion queue doorbell write value" " beyond queue size, sqid=%"PRIu32"," " new_head=%"PRIu16", ignoring",
@@ -1281,7 +1279,7 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val) qid = (addr -0x1000 ) >>3 ;if (unlikely (nvme_check_sqid (n, qid))) { -NVME_GUEST_ERR (nvme_ub_db_wr_invalid_sq, +NVME_GUEST_ERR (pci_nvme_ub_db_wr_invalid_sq,"submission queue doorbell write" " for nonexistent queue," " sqid=%" PRIu32", ignoring" , qid);
@@ -1290,7 +1288,7 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val) sq = n->sq[qid];if (unlikely (new_tail >= sq->size)) { - NVME_GUEST_ERR(nvme_ub_db_wr_invalid_sqtail, + NVME_GUEST_ERR(pci_nvme_ub_db_wr_invalid_sqtail, "submission queue doorbell write value" " beyond queue size, sqid=%"PRIu32"," " new_tail=%"PRIu16", ignoring",
hw/block/trace-events +90 -90
190 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v6 3/20 hw/block/nvme: remove superfluous breaks
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
These break statements was left over when commit 3036a626e9ef ("nvme:
add Get/Set Feature Timestamp support") was merged.
--- hw/block/nvme.c | 4 ---- 1 file changed, 4 deletions(-)
hw/block/nvme.c +0 -4
@@ -802,7 +802,6 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd); -break ;default :trace_pci_nvme_err_invalid_getfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;
@@ -846,11 +845,8 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) req->cqe.result =cpu_to_le32 ((n->num_queues -2 ) | ((n->num_queues -2 ) <<16 ));break ; -case NVME_TIMESTAMP :return nvme_set_feature_timestamp (n, cmd); -break ; -default :trace_pci_nvme_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;
Signature · 1 line
2.26.2
PATCH v6 4/20 hw/block/nvme: move device parameters to separate struct
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Move device configuration parameters to separate struct to make it explicit what is configurable and what is set internally.
--- hw/block/nvme.c | 49 ++++++++++++++++++++++++++----------------------- hw/block/nvme.h | 11 ++++++++--- 2 files changed, 34 insertions(+), 26 deletions(-)
hw/block/nvme.c +26 -23
@@ -78,12 +78,12 @@ static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)static int nvme_check_sqid (NvmeCtrl *n,uint16_t sqid) { -return sqid < n->num_queues && n->sq[sqid] !=NULL ?0 :-1 ; +return sqid < n->params.num_queues && n->sq[sqid] !=NULL ?0 :-1 ; }static int nvme_check_cqid (NvmeCtrl *n,uint16_t cqid) { -return cqid < n->num_queues && n->cq[cqid] !=NULL ?0 :-1 ; +return cqid < n->params.num_queues && n->cq[cqid] !=NULL ?0 :-1 ; }static void nvme_inc_cq_tail (NvmeCQueue *cq)
@@ -645,7 +645,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_pci_nvme_err_invalid_create_cq_addr (prp1);return NVME_INVALID_FIELD |NVME_DNR ; } -if (unlikely (vector > n->num_queues)) { +if (unlikely (vector > n->params.num_queues)) {trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }
@@ -797,7 +797,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_pci_nvme_getfeat_vwcache (result ?"enabled" :"disabled" );break ;case NVME_NUMBER_OF_QUEUES : - result =cpu_to_le32 ((n->num_queues -2 ) | ((n->num_queues -2 ) <<16 )); + result =cpu_to_le32 ((n->params.num_queues -2 ) | + ((n->params.num_queues -2 ) <<16 ));trace_pci_nvme_getfeat_numq (result);break ;case NVME_TIMESTAMP :
@@ -841,9 +842,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_NUMBER_OF_QUEUES :trace_pci_nvme_setfeat_numq ((dw11 &0xFFFF ) +1 , ((dw11 >>16 ) &0xFFFF ) +1 , - n->num_queues -1 , n->num_queues -1 ); - req->cqe.result = -cpu_to_le32 ((n->num_queues -2 ) | ((n->num_queues -2 ) <<16 )); + n->params.num_queues -1 , + n->params.num_queues -1 ); + req->cqe.result =cpu_to_le32 ((n->params.num_queues -2 ) | + ((n->params.num_queues -2 ) <<16 ));break ;case NVME_TIMESTAMP :return nvme_set_feature_timestamp (n, cmd);
@@ -914,12 +916,12 @@ static void nvme_clear_ctrl(NvmeCtrl *n)blk_drain (n->conf.blk); -for (i =0 ; i < n->num_queues; i++) { +for (i =0 ; i < n->params.num_queues; i++) {if (n->sq[i] !=NULL ) {nvme_free_sq (n->sq[i], n); } } -for (i =0 ; i < n->num_queues; i++) { +for (i =0 ; i < n->params.num_queues; i++) {if (n->cq[i] !=NULL ) {nvme_free_cq (n->cq[i], n); }
@@ -1350,7 +1352,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)int64_t bs_size;uint8_t *pci_conf; -if (!n->num_queues) { +if (!n->params.num_queues) {error_setg (errp,"num_queues can't be zero" );return ; }
@@ -1366,12 +1368,12 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)return ; } -if (!n->serial) { +if (!n->params.serial) {error_setg (errp,"serial property not set" );return ; } -if (!n->cmb_size_mb && n->pmrdev) { +if (!n->params.cmb_size_mb && 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);
@@ -1402,25 +1404,26 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->num_namespaces =1 ;/* num_queues is really number of pairs, so each has two doorbells */ - n->reg_size =pow2ceil (NVME_REG_SIZE +2 * n->num_queues *NVME_DB_SIZE ); + n->reg_size =pow2ceil (NVME_REG_SIZE + +2 * n->params.num_queues *NVME_DB_SIZE ); n->ns_size = bs_size / (uint64_t )n->num_namespaces; n->namespaces =g_new0 (NvmeNamespace, n->num_namespaces); - n->sq = g_new0(NvmeSQueue *, n->num_queues); - n->cq = g_new0(NvmeCQueue *, n->num_queues); + n->sq = g_new0(NvmeSQueue *, n->params.num_queues); + n->cq = g_new0(NvmeCQueue *, n->params.num_queues);memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n,"nvme" , 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->num_queues,4 ,NULL ); +msix_init_exclusive_bar (pci_dev, n->params.num_queues,4 ,NULL ); id->vid =cpu_to_le16 (pci_get_word (pci_conf +PCI_VENDOR_ID )); id->ssvid =cpu_to_le16 (pci_get_word (pci_conf +PCI_SUBSYSTEM_VENDOR_ID ));strpadcpy ((char *)id->mn,sizeof (id->mn),"QEMU NVMe Ctrl" ,' ' );strpadcpy ((char *)id->fr,sizeof (id->fr),"1.0" ,' ' ); -strpadcpy ((char *)id->sn,sizeof (id->sn), n->serial,' ' ); +strpadcpy ((char *)id->sn,sizeof (id->sn), n->params.serial,' ' ); id->rab =6 ; id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ;
@@ -1449,7 +1452,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ; -if (n->cmb_size_mb) { +if (n->params.cmb_size_mb) {NVME_CMBLOC_SET_BIR (n->bar.cmbloc,2 );NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 );
@@ -1460,7 +1463,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)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->cmb_size_mb); +NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); n->cmbloc = n->bar.cmbloc; n->cmbsz = n->bar.cmbsz;
@@ -1544,7 +1547,7 @@ static void nvme_exit(PCIDevice *pci_dev)g_free (n->cq);g_free (n->sq); -if (n->cmb_size_mb) { +if (n->params.cmb_size_mb) {g_free (n->cmbuf); }
@@ -1558,9 +1561,9 @@ static Property nvme_props[] = {DEFINE_BLOCK_PROPERTIES (NvmeCtrl, conf),DEFINE_PROP_LINK ("pmrdev" , NvmeCtrl, pmrdev,TYPE_MEMORY_BACKEND , HostMemoryBackend *), -DEFINE_PROP_STRING ("serial" , NvmeCtrl, serial), -DEFINE_PROP_UINT32 ("cmb_size_mb" , NvmeCtrl, cmb_size_mb,0 ), -DEFINE_PROP_UINT32 ("num_queues" , NvmeCtrl, num_queues,64 ), +DEFINE_PROP_STRING ("serial" , NvmeCtrl, params.serial), +DEFINE_PROP_UINT32 ("cmb_size_mb" , NvmeCtrl, params.cmb_size_mb,0 ), +DEFINE_PROP_UINT32 ("num_queues" , NvmeCtrl, params.num_queues,64 ), DEFINE_PROP_END_OF_LIST(), };
hw/block/nvme.h +8 -3
@@ -1,7 +1,14 @@ #ifndef HW_NVME_H #define HW_NVME_H + #include "block/nvme.h" +typedef struct NvmeParams { + char *serial; + uint32_t num_queues; + uint32_t cmb_size_mb; +} NvmeParams; + typedef struct NvmeAsyncEvent { QSIMPLEQ_ENTRY(NvmeAsyncEvent) entry; NvmeAerResult result;
@@ -63,6 +70,7 @@ typedef struct NvmeCtrl {MemoryRegion ctrl_mem;NvmeBar bar;BlockConf conf; +NvmeParams params;uint32_t page_size;uint16_t page_bits;
@@ -71,10 +79,8 @@ typedef struct NvmeCtrl {uint16_t sqe_size;uint32_t reg_size;uint32_t num_namespaces; -uint32_t num_queues;uint32_t max_q_ents;uint64_t ns_size; -uint32_t cmb_size_mb;uint32_t cmbsz;uint32_t cmbloc;uint8_t *cmbuf;
@@ -82,7 +88,6 @@ typedef struct NvmeCtrl {uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */ -char *serial;HostMemoryBackend *pmrdev;NvmeNamespace *namespaces;
Signature · 1 line
2.26.2
PATCH v6 5/20 hw/block/nvme: use constants in identify
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 8 ++++---- include/block/nvme.h | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-)
hw/block/nvme.c +4 -4
@@ -693,7 +693,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c)static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c) { -static const int data_len =4 * KiB; +static const int data_len =NVME_IDENTIFY_DATA_SIZE ;uint32_t min_nsid =le32_to_cpu (c->nsid);uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2);
@@ -723,11 +723,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd)NvmeIdentify *c = (NvmeIdentify *)cmd;switch (le32_to_cpu (c->cns)) { -case 0x00 : +case NVME_ID_CNS_NS :return nvme_identify_ns (n, c); -case 0x01 : +case NVME_ID_CNS_CTRL :return nvme_identify_ctrl (n, c); -case 0x02 : +case NVME_ID_CNS_NS_ACTIVE_LIST :return nvme_identify_nslist (n, c);default :trace_pci_nvme_err_invalid_identify_cns (le32_to_cpu (c->cns));
include/block/nvme.h +8 -0
@@ -705,6 +705,14 @@ typedef struct NvmePSD {uint8_t resv[16 ]; } NvmePSD; +#define NVME_IDENTIFY_DATA_SIZE 4096 + +enum { +NVME_ID_CNS_NS =0x0 , +NVME_ID_CNS_CTRL =0x1 , +NVME_ID_CNS_NS_ACTIVE_LIST =0x2 , +}; + typedef struct NvmeIdCtrl { uint16_t vid; uint16_t ssvid;
Signature · 1 line
2.26.2
PATCH v6 6/20 hw/block/nvme: refactor nvme_addr_read
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Pull the controller memory buffer check to its own function. The check will be used on its own in later patches.
--- hw/block/nvme.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
hw/block/nvme.c +12 -4
@@ -66,14 +66,22 @@static void nvme_process_sq (void *opaque); +static bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr) +{ +hwaddr low = n->ctrl_mem.addr; +hwaddr hi = n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size); + +return addr >= low && addr < hi; +} +static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) { -if (n->cmbsz && addr >= n->ctrl_mem.addr && - addr < (n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size))) { +if (n->cmbsz &&nvme_addr_is_cmb (n, addr)) {memcpy (buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size); - }else { -pci_dma_read (&n->parent_obj, addr, buf, size); +return ; } + +pci_dma_read (&n->parent_obj, addr, buf, size); }static int nvme_check_sqid (NvmeCtrl *n,uint16_t sqid)
Signature · 1 line
2.26.2
PATCH v6 7/20 hw/block/nvme: fix pin-based interrupt behavior
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
First, since the device only supports MSI-X or pin-based interrupt, if MSI-X is not enabled, it should not accept interrupt vectors different from 0 when creating completion queues.
Secondly, the irq_status NvmeCtrl member is meant to be compared to the INTMS register, so it should only be 32 bits wide. And it is really only useful when used with multi-message MSI.
Third, since we do not force a 1-to-1 correspondence between cqid and interrupt vector, the irq_status register should not have bits set according to cqid, but according to the associated interrupt vector.
Fix these issues, but keep irq_status available so we can easily support multi-message MSI down the line.
--- hw/block/nvme.c | 12 ++++++++---- hw/block/nvme.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-)
hw/block/nvme.c +8 -4
@@ -138,8 +138,8 @@ static void nvme_irq_assert(NvmeCtrl *n, NvmeCQueue *cq)msix_notify (&(n->parent_obj), cq->vector); }else {trace_pci_nvme_irq_pin (); -assert (cq->cqid <64 ); - n->irq_status |=1 << cq->cqid; +assert (cq->vector <32 ); + n->irq_status |=1 << cq->vector;nvme_irq_check (n); } }else {
@@ -153,8 +153,8 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq)if (msix_enabled (&(n->parent_obj))) {return ; }else { -assert (cq->cqid <64 ); - n->irq_status &= ~(1 << cq->cqid); +assert (cq->vector <32 ); + n->irq_status &= ~(1 << cq->vector);nvme_irq_check (n); } }
@@ -653,6 +653,10 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_pci_nvme_err_invalid_create_cq_addr (prp1);return NVME_INVALID_FIELD |NVME_DNR ; } +if (unlikely (!msix_enabled (&n->parent_obj) && vector)) { +trace_pci_nvme_err_invalid_create_cq_vector (vector); +return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; + }if (unlikely (vector > n->params.num_queues)) {trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ;
hw/block/nvme.h +1 -1
@@ -84,7 +84,7 @@ typedef struct NvmeCtrl {uint32_t cmbsz;uint32_t cmbloc;uint8_t *cmbuf; -uint64_t irq_status; +uint32_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */
Signature · 1 line
2.26.2
Re: [PATCH v6 07/20] hw/block/nvme: fix pin-based interrupt behavior
Quoted 17 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
First, since the device only supports MSI-X or pin-based interrupt, if MSI-X is not enabled, it should not accept interrupt vectors different from 0 when creating completion queues.
Secondly, the
irq_statusNvmeCtrl member is meant to be compared to the INTMS register, so it should only be 32 bits wide. And it is really only useful when used with multi-message MSI.Third, since we do not force a 1-to-1 correspondence between cqid and interrupt vector, the
irq_statusregister should not have bits set according to cqid, but according to the associated interrupt vector.Fix these issues, but keep
irq_statusavailable so we can easily support multi-message MSI down the line.
Quoted 9 lines
Fixes 5e9aa92eb1a5 ("hw/block: Fix pin-based interrupt behaviour of NVMe")Cc "Michael S. Tsirkin" <[email protected]>Cc Marcel Apfelbaum <[email protected]>Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 12 ++++++++---- hw/block/nvme.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-)
Gentle ping on this and [PATCH v6 08/20].
Thanks,
Klaus
Re: [PATCH v6 07/20] hw/block/nvme: fix pin-based interrupt behavior
Quoted 28 lines · Klaus Jensen
Quoted 17 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
First, since the device only supports MSI-X or pin-based interrupt, if MSI-X is not enabled, it should not accept interrupt vectors different from 0 when creating completion queues.
Secondly, the
irq_statusNvmeCtrl member is meant to be compared to the INTMS register, so it should only be 32 bits wide. And it is really only useful when used with multi-message MSI.Third, since we do not force a 1-to-1 correspondence between cqid and interrupt vector, the
irq_statusregister should not have bits set according to cqid, but according to the associated interrupt vector.Fix these issues, but keep
irq_statusavailable so we can easily support multi-message MSI down the line.Quoted 9 lines
Fixes 5e9aa92eb1a5 ("hw/block: Fix pin-based interrupt behaviour of NVMe")Cc "Michael S. Tsirkin" <[email protected]>Cc Marcel Apfelbaum <[email protected]>Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 12 ++++++++---- hw/block/nvme.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-)
Quoted 2 lines
Gentle ping on this and [PATCH v6 08/20].
And another ping :)
Re: [PATCH v6 07/20] hw/block/nvme: fix pin-based interrupt behavior
In reply to Klaus JensenQuoted 10 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
First, since the device only supports MSI-X or pin-based interrupt, if MSI-X is not enabled, it should not accept interrupt vectors different from 0 when creating completion queues.
Secondly, the
irq_statusNvmeCtrl member is meant to be compared to the INTMS register, so it should only be 32 bits wide. And it is really only useful when used with multi-message MSI.
Quoted 6 lines
Third, since we do not force a 1-to-1 correspondence between cqid and interrupt vector, the
irq_statusregister should not have bits set according to cqid, but according to the associated interrupt vector.Fix these issues, but keep
irq_statusavailable so we can easily support multi-message MSI down the line.
Looks good.
PATCH v6 8/20 hw/block/nvme: allow use of any valid msix vector
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
If the device uses MSI-X, any of the 2048 MSI-X interrupt vectors are valid. If the device is not using MSI-X, vector will and can only be zero at this point.
--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/block/nvme.c +1 -1
@@ -657,7 +657,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; } -if (unlikely (vector > n->params.num_queues)) { +if (unlikely (vector >PCI_MSIX_FLAGS_QSIZE )) {trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }
Signature · 1 line
2.26.2
Re: [PATCH v6 08/20] hw/block/nvme: allow use of any valid msix vector
Quoted 19 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
If the device uses MSI-X, any of the 2048 MSI-X interrupt vectors are valid. If the device is not using MSI-X, vector will and can only be zero at this point.
Cc "Michael S. Tsirkin" <[email protected]>Cc Marcel Apfelbaum <[email protected]>Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/block/nvme.c +0
-0
hw/block/nvme.c static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) · line 663
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -657,7 +657,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; } -if (unlikely (vector > n->params.num_queues)) { +if (unlikely (vector >PCI_MSIX_FLAGS_QSIZE )) {trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }
Is it worth adding this?
hw/block/nvme.c +2 -0
@@ -613,6 +613,8 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeCmd *cmd)static void nvme_init_cq (NvmeCQueue *cq,NvmeCtrl *n,uint64_t dma_addr,uint16_t cqid,uint16_t vector,uint16_t size,uint16_t irq_enabled) { +int ret; + cq->ctrl = n; cq->cqid = cqid; cq->size = size;
@@ -623,7 +625,8 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl
*n, uint64_t dma_addr,
cq->head = cq->tail = 0;
QTAILQ_INIT(&cq->req_list);
QTAILQ_INIT(&cq->sq_list);
- msix_vector_use(&n->parent_obj, cq->vector);
+ ret = msix_vector_use(&n->parent_obj, cq->vector);
+ assert(ret == 0);
n->cq[cqid] = cq;
cq->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, nvme_post_cqes, cq);}
Otherwise:
Re: [PATCH v6 08/20] hw/block/nvme: allow use of any valid msix vector
Quoted 52 lines · Philippe Mathieu-Daudé
Quoted 19 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
If the device uses MSI-X, any of the 2048 MSI-X interrupt vectors are valid. If the device is not using MSI-X, vector will and can only be zero at this point.
Cc "Michael S. Tsirkin" <[email protected]>Cc Marcel Apfelbaum <[email protected]>Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/block/nvme.c +0
-0hw/block/nvme.c static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) · line 663
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -657,7 +657,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; } -if (unlikely (vector > n->params.num_queues)) { +if (unlikely (vector >PCI_MSIX_FLAGS_QSIZE )) {trace_pci_nvme_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }Is it worth adding this?
hw/block/nvme.c +4
-1@@ -613,6 +613,8 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeCmd *cmd)static void nvme_init_cq (NvmeCQueue *cq,NvmeCtrl *n,uint64_t dma_addr,uint16_t cqid,uint16_t vector,uint16_t size,uint16_t irq_enabled) { +int ret; + cq->ctrl = n; cq->cqid = cqid; cq->size = size;@@ -623,7 +625,8 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, cq->head = cq->tail =0 ;QTAILQ_INIT (&cq->req_list);QTAILQ_INIT (&cq->sq_list); -msix_vector_use (&n->parent_obj, cq->vector); + ret =msix_vector_use (&n->parent_obj, cq->vector); +assert (ret ==0 ); n->cq[cqid] = cq; cq->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , nvme_post_cqes, cq);
Quoted 1 line
}
FYI snippet sent as new patch:
https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg00404.html
PATCH v6 9/20 hw/block/nvme: add max_ioqpairs device parameter
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
The num_queues device paramater has a slightly confusing meaning because it accounts for the admin queue pair which is not really optional. Secondly, it is really a maximum value of queues allowed.
Add a new max_ioqpairs parameter that only accounts for I/O queue pairs, but keep num_queues for compatibility.
--- hw/block/nvme.c | 49 ++++++++++++++++++++++++++++++------------------- hw/block/nvme.h | 3 ++- 2 files changed, 32 insertions(+), 20 deletions(-)
hw/block/nvme.c +30 -19
@@ -20,7 +20,7 @@* -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \ * cmb_size_mb=<cmb_size_mb[optional]>, \ * [pmrdev=<mem_backend_file_id>,] \ -* num_queues=<N[optional]> +* 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.
@@ -36,6 +36,7 @@#include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/error-report.h" #include "hw/block/block.h" #include "hw/pci/msix.h" #include "hw/pci/pci.h"
@@ -86,12 +87,12 @@ static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)static int nvme_check_sqid (NvmeCtrl *n,uint16_t sqid) { -return sqid < n->params.num_queues && n->sq[sqid] !=NULL ?0 :-1 ; +return sqid < n->params.max_ioqpairs +1 && n->sq[sqid] !=NULL ?0 :-1 ; }static int nvme_check_cqid (NvmeCtrl *n,uint16_t cqid) { -return cqid < n->params.num_queues && n->cq[cqid] !=NULL ?0 :-1 ; +return cqid < n->params.max_ioqpairs +1 && n->cq[cqid] !=NULL ?0 :-1 ; }static void nvme_inc_cq_tail (NvmeCQueue *cq)
@@ -809,8 +810,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_pci_nvme_getfeat_vwcache (result ?"enabled" :"disabled" );break ;case NVME_NUMBER_OF_QUEUES : - result =cpu_to_le32 ((n->params.num_queues -2 ) | - ((n->params.num_queues -2 ) <<16 )); + result =cpu_to_le32 ((n->params.max_ioqpairs -1 ) | + ((n->params.max_ioqpairs -1 ) <<16 ));trace_pci_nvme_getfeat_numq (result);break ;case NVME_TIMESTAMP :
@@ -854,10 +855,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_NUMBER_OF_QUEUES :trace_pci_nvme_setfeat_numq ((dw11 &0xFFFF ) +1 , ((dw11 >>16 ) &0xFFFF ) +1 , - n->params.num_queues -1 , - n->params.num_queues -1 ); - req->cqe.result =cpu_to_le32 ((n->params.num_queues -2 ) | - ((n->params.num_queues -2 ) <<16 )); + n->params.max_ioqpairs, + n->params.max_ioqpairs); + req->cqe.result =cpu_to_le32 ((n->params.max_ioqpairs -1 ) | + ((n->params.max_ioqpairs -1 ) <<16 ));break ;case NVME_TIMESTAMP :return nvme_set_feature_timestamp (n, cmd);
@@ -928,12 +929,12 @@ static void nvme_clear_ctrl(NvmeCtrl *n)blk_drain (n->conf.blk); -for (i =0 ; i < n->params.num_queues; i++) { +for (i =0 ; i < n->params.max_ioqpairs +1 ; i++) {if (n->sq[i] !=NULL ) {nvme_free_sq (n->sq[i], n); } } -for (i =0 ; i < n->params.num_queues; i++) { +for (i =0 ; i < n->params.max_ioqpairs +1 ; i++) {if (n->cq[i] !=NULL ) {nvme_free_cq (n->cq[i], n); }
@@ -1364,8 +1365,17 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)int64_t bs_size;uint8_t *pci_conf; -if (!n->params.num_queues) { -error_setg (errp,"num_queues can't be zero" ); +if (n->params.num_queues) { +warn_report ("num_queues is deprecated; please use max_ioqpairs " +"instead" ); + + n->params.max_ioqpairs = n->params.num_queues -1 ; + } + +if (n->params.max_ioqpairs <1 || + n->params.max_ioqpairs >PCI_MSIX_FLAGS_QSIZE ) { +error_setg (errp,"max_ioqpairs must be between 1 and %d" , +PCI_MSIX_FLAGS_QSIZE );return ; }
@@ -1415,21 +1425,21 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->num_namespaces =1 ; -/* num_queues is really number of pairs, so each has two doorbells */ +/* add one to max_ioqpairs to account for the admin queue pair */ n->reg_size =pow2ceil (NVME_REG_SIZE + -2 * n->params.num_queues *NVME_DB_SIZE ); +2 * (n->params.max_ioqpairs +1 ) *NVME_DB_SIZE ); n->ns_size = bs_size / (uint64_t )n->num_namespaces; n->namespaces =g_new0 (NvmeNamespace, n->num_namespaces); - n->sq = g_new0(NvmeSQueue *, n->params.num_queues); - n->cq = g_new0(NvmeCQueue *, n->params.num_queues); + n->sq = g_new0(NvmeSQueue *, n->params.max_ioqpairs + 1); + n->cq = g_new0(NvmeCQueue *, n->params.max_ioqpairs + 1);memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n,"nvme" , 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.num_queues,4 ,NULL ); +msix_init_exclusive_bar (pci_dev, n->params.max_ioqpairs +1 ,4 ,NULL ); id->vid =cpu_to_le16 (pci_get_word (pci_conf +PCI_VENDOR_ID )); id->ssvid =cpu_to_le16 (pci_get_word (pci_conf +PCI_SUBSYSTEM_VENDOR_ID ));
@@ -1575,7 +1585,8 @@ static Property nvme_props[] = { HostMemoryBackend *),DEFINE_PROP_STRING ("serial" , NvmeCtrl, params.serial),DEFINE_PROP_UINT32 ("cmb_size_mb" , NvmeCtrl, params.cmb_size_mb,0 ), -DEFINE_PROP_UINT32 ("num_queues" , NvmeCtrl, params.num_queues,64 ), +DEFINE_PROP_UINT32 ("num_queues" , NvmeCtrl, params.num_queues,0 ), +DEFINE_PROP_UINT32 ("max_ioqpairs" , NvmeCtrl, params.max_ioqpairs,64 ), DEFINE_PROP_END_OF_LIST(), };
hw/block/nvme.h +2 -1
@@ -5,7 +5,8 @@typedef struct NvmeParams {char *serial; -uint32_t num_queues; +uint32_t num_queues;/* deprecated since 5.1 */ +uint32_t max_ioqpairs;uint32_t cmb_size_mb; }NvmeParams ;
Signature · 1 line
2.26.2
PATCH v6 10/20 hw/block/nvme: remove redundant cmbloc/cmbsz members
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 7 ++----- hw/block/nvme.h | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-)
hw/block/nvme.c +2 -5
@@ -77,7 +77,7 @@ static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr)static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) { -if (n->cmbsz &&nvme_addr_is_cmb (n, addr)) { +if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr)) {memcpy (buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);return ; }
@@ -171,7 +171,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (unlikely (!prp1)) {trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ; - }else if (n->cmbsz && prp1 >= n->ctrl_mem.addr && + }else if (n->bar.cmbsz && prp1 >= n->ctrl_mem.addr && prp1 < n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size)) { qsg->nsg =0 ;qemu_iovec_init (iov, num_prps);
@@ -1487,9 +1487,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );/* MBs */ NVME_CMBSZ_SET_SZ (n->bar.cmbsz, n->params.cmb_size_mb); - n->cmbloc = n->bar.cmbloc; - n->cmbsz = n->bar.cmbsz; - 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));
hw/block/nvme.h +0 -2
@@ -82,8 +82,6 @@ typedef struct NvmeCtrl {uint32_t num_namespaces;uint32_t max_q_ents;uint64_t ns_size; -uint32_t cmbsz; -uint32_t cmbloc;uint8_t *cmbuf;uint32_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */
Signature · 1 line
2.26.2
PATCH v6 11/20 hw/block/nvme: factor out property/constraint checks
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-)
hw/block/nvme.c +30 -18
@@ -1356,24 +1356,19 @@ static const MemoryRegionOps nvme_cmb_ops = { }, }; -static void nvme_realize (PCIDevice *pci_dev,Error **errp) +static void nvme_check_constraints (NvmeCtrl *n,Error **errp) { -NvmeCtrl *n =NVME (pci_dev); -NvmeIdCtrl *id = &n->id_ctrl; +NvmeParams *params = &n->params; -int i; -int64_t bs_size; -uint8_t *pci_conf; - -if (n->params.num_queues) { +if (params->num_queues) {warn_report ("num_queues is deprecated; please use max_ioqpairs " "instead" ); - n->params.max_ioqpairs = n->params.num_queues -1 ; + params->max_ioqpairs = params->num_queues -1 ; } -if (n->params.max_ioqpairs <1 || - n->params.max_ioqpairs >PCI_MSIX_FLAGS_QSIZE ) { +if (params->max_ioqpairs <1 || + params->max_ioqpairs >PCI_MSIX_FLAGS_QSIZE ) {error_setg (errp,"max_ioqpairs must be between 1 and %d" ,PCI_MSIX_FLAGS_QSIZE );return ;
@@ -1384,13 +1379,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)return ; } - bs_size =blk_getlength (n->conf.blk); -if (bs_size <0 ) { -error_setg (errp,"could not get backing file size" ); -return ; - } - -if (!n->params.serial) { +if (!params->serial) {error_setg (errp,"serial property not set" );return ; }
@@ -1410,6 +1399,29 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)host_memory_backend_set_mapped (n->pmrdev, true); } +} + +static void nvme_realize(PCIDevice *pci_dev, Error **errp) +{ + NvmeCtrl *n = NVME(pci_dev); + NvmeIdCtrl *id = &n->id_ctrl; + Error *local_err = NULL; + + int i; + int64_t bs_size; + uint8_t *pci_conf; + + nvme_check_constraints(n, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + bs_size = blk_getlength(n->conf.blk); + if (bs_size < 0) { + error_setg(errp, "could not get backing file size"); + return; + } blkconf_blocksizes(&n->conf); if (!blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk),
Signature · 1 line
2.26.2
PATCH v6 12/20 hw/block/nvme: factor out device state setup
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
hw/block/nvme.c +13 -9
@@ -1401,6 +1401,17 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp) } } +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 + +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); + n->cq = g_new0(NvmeCQueue *, n->params.max_ioqpairs + 1); +} +static void nvme_realize (PCIDevice *pci_dev,Error **errp) {NvmeCtrl *n =NVME (pci_dev);
@@ -1417,6 +1428,8 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)return ; } +nvme_init_state (n); + bs_size =blk_getlength (n->conf.blk);if (bs_size <0 ) {error_setg (errp,"could not get backing file size" );
@@ -1435,17 +1448,8 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)pci_config_set_class (pci_dev->config,PCI_CLASS_STORAGE_EXPRESS );pcie_endpoint_cap_init (pci_dev,0x80 ); - n->num_namespaces =1 ; - -/* add one to max_ioqpairs to account for the admin queue pair */ - n->reg_size =pow2ceil (NVME_REG_SIZE + -2 * (n->params.max_ioqpairs +1 ) *NVME_DB_SIZE ); n->ns_size = bs_size / (uint64_t )n->num_namespaces; - n->namespaces =g_new0 (NvmeNamespace, n->num_namespaces); - n->sq = g_new0(NvmeSQueue *, n->params.max_ioqpairs + 1); - n->cq = g_new0(NvmeCQueue *, n->params.max_ioqpairs + 1); -memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n,"nvme" , n->reg_size); pci_register_bar(pci_dev, 0,
Signature · 1 line
2.26.2
PATCH v6 13/20 hw/block/nvme: factor out block backend setup
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
hw/block/nvme.c +10 -3
@@ -1412,6 +1412,13 @@ static void nvme_init_state(NvmeCtrl *n) n->cq = g_new0(NvmeCQueue *, n->params.max_ioqpairs + 1); } +static void nvme_init_blk (NvmeCtrl *n,Error **errp) +{ +blkconf_blocksizes (&n->conf); +blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), + false, errp); +} +static void nvme_realize (PCIDevice *pci_dev,Error **errp) {NvmeCtrl *n =NVME (pci_dev);
@@ -1436,9 +1443,9 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)return ; } -blkconf_blocksizes (&n->conf); -if (!blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), - false, errp)) { +nvme_init_blk (n, &local_err); +if (local_err) { +error_propagate (errp, local_err);return ; }
Signature · 1 line
2.26.2
PATCH v6 14/20 hw/block/nvme: add namespace helpers
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Introduce some small helpers to make the next patches easier on the eye.
--- hw/block/nvme.c | 3 +-- hw/block/nvme.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-)
hw/block/nvme.c +1 -2
@@ -1575,8 +1575,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) id_ns->dps =0 ; id_ns->lbaf[0 ].ds =BDRV_SECTOR_BITS ; id_ns->ncap = id_ns->nuse = id_ns->nsze = -cpu_to_le64 (n->ns_size >> - id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas)].ds); +cpu_to_le64 (nvme_ns_nlbas (n, ns)); } }
hw/block/nvme.h +17 -0
@@ -61,6 +61,17 @@ typedef struct NvmeNamespace {NvmeIdNs id_ns; } NvmeNamespace; +static inline NvmeLBAF *nvme_ns_lbaf (NvmeNamespace *ns) +{ +NvmeIdNs *id_ns = &ns->id_ns; +return &id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX (id_ns->flbas)]; +} + +static inline uint8_t nvme_ns_lbads (NvmeNamespace *ns) +{ +return nvme_ns_lbaf (ns)->ds; +} +#define TYPE_NVME "nvme"#define NVME (obj) \ OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)
@@ -97,4 +108,10 @@ typedef struct NvmeCtrl { NvmeIdCtrl id_ctrl; } NvmeCtrl; +/* calculate the number of LBAs that the namespace can accomodate */ +static inline uint64_t nvme_ns_nlbas (NvmeCtrl *n,NvmeNamespace *ns) +{ +return n->ns_size >>nvme_ns_lbads (ns); +} +#endif /* HW_NVME_H */
Signature · 1 line
2.26.2
PATCH v6 15/20 hw/block/nvme: factor out namespace setup
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-)
hw/block/nvme.c +26 -20
@@ -1419,6 +1419,27 @@ static void nvme_init_blk(NvmeCtrl *n, Error **errp) false, errp); } +static void nvme_init_namespace (NvmeCtrl *n,NvmeNamespace *ns,Error **errp) +{ +int64_t bs_size; +NvmeIdNs *id_ns = &ns->id_ns; + + bs_size =blk_getlength (n->conf.blk); +if (bs_size <0 ) { +error_setg_errno (errp, -bs_size,"could not get backing file size" ); +return ; + } + + n->ns_size = bs_size; + + id_ns->lbaf[0 ].ds =BDRV_SECTOR_BITS ; + id_ns->nsze =cpu_to_le64 (nvme_ns_nlbas (n, ns)); + +/* no thin provisioning */ + id_ns->ncap = id_ns->nsze; + id_ns->nuse = id_ns->ncap; +} +static void nvme_realize (PCIDevice *pci_dev,Error **errp) {NvmeCtrl *n =NVME (pci_dev);
@@ -1426,7 +1447,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)Error *local_err =NULL ;int i; -int64_t bs_size;uint8_t *pci_conf;nvme_check_constraints (n, &local_err);
@@ -1437,12 +1457,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)nvme_init_state (n); - bs_size =blk_getlength (n->conf.blk); -if (bs_size <0 ) { -error_setg (errp,"could not get backing file size" ); -return ; - } -nvme_init_blk (n, &local_err);if (local_err) {error_propagate (errp, local_err);
@@ -1455,8 +1469,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)pci_config_set_class (pci_dev->config,PCI_CLASS_STORAGE_EXPRESS );pcie_endpoint_cap_init (pci_dev,0x80 ); - n->ns_size = bs_size / (uint64_t )n->num_namespaces; -memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n,"nvme" , n->reg_size); pci_register_bar(pci_dev, 0,
@@ -1565,17 +1577,11 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) }for (i =0 ; i < n->num_namespaces; i++) { -NvmeNamespace *ns = &n->namespaces[i]; -NvmeIdNs *id_ns = &ns->id_ns; - id_ns->nsfeat =0 ; - id_ns->nlbaf =0 ; - id_ns->flbas =0 ; - id_ns->mc =0 ; - id_ns->dpc =0 ; - id_ns->dps =0 ; - id_ns->lbaf[0 ].ds =BDRV_SECTOR_BITS ; - id_ns->ncap = id_ns->nuse = id_ns->nsze = -cpu_to_le64 (nvme_ns_nlbas (n, ns)); +nvme_init_namespace (n, &n->namespaces[i], &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } } }
Signature · 1 line
2.26.2
PATCH v6 16/20 hw/block/nvme: factor out pci setup
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)
hw/block/nvme.c +18 -12
@@ -1440,6 +1440,22 @@ static void nvme_init_namespace(NvmeCtrl *n, NvmeNamespace *ns, Error **errp) id_ns->nuse = id_ns->ncap; } +static void nvme_init_pci (NvmeCtrl *n,PCIDevice *pci_dev) +{ +uint8_t *pci_conf = pci_dev->config; + + pci_conf[PCI_INTERRUPT_PIN ] =1 ; +pci_config_set_prog_interface (pci_conf,0x2 ); +pci_config_set_class (pci_conf,PCI_CLASS_STORAGE_EXPRESS ); +pcie_endpoint_cap_init (pci_dev,0x80 ); + +memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n,"nvme" , + 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 ); +} +static void nvme_realize (PCIDevice *pci_dev,Error **errp) {NvmeCtrl *n =NVME (pci_dev);
@@ -1463,19 +1479,9 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)return ; } +nvme_init_pci (n, pci_dev); + pci_conf = pci_dev->config; - pci_conf[PCI_INTERRUPT_PIN ] =1 ; -pci_config_set_prog_interface (pci_dev->config,0x2 ); -pci_config_set_class (pci_dev->config,PCI_CLASS_STORAGE_EXPRESS ); -pcie_endpoint_cap_init (pci_dev,0x80 ); - -memory_region_init_io (&n->iomem,OBJECT (n), &nvme_mmio_ops, n, -"nvme" , 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 ); - id->vid =cpu_to_le16 (pci_get_word (pci_conf +PCI_VENDOR_ID )); id->ssvid =cpu_to_le16 (pci_get_word (pci_conf +PCI_SUBSYSTEM_VENDOR_ID ));strpadcpy ((char *)id->mn,sizeof (id->mn),"QEMU NVMe Ctrl" ,' ' );
Signature · 1 line
2.26.2
PATCH v6 17/20 hw/block/nvme: factor out cmb setup
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-)
hw/block/nvme.c +24 -19
@@ -57,6 +57,7 @@#define NVME_REG_SIZE 0x1000#define NVME_DB_SIZE 4 +#define NVME_CMB_BIR 2#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \
@@ -1440,6 +1441,28 @@ 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) +{ +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), +PCI_BASE_ADDRESS_SPACE_MEMORY | +PCI_BASE_ADDRESS_MEM_TYPE_64 | +PCI_BASE_ADDRESS_MEM_PREFETCH , &n->ctrl_mem); +} +static void nvme_init_pci (NvmeCtrl *n,PCIDevice *pci_dev) {uint8_t *pci_conf = pci_dev->config;
@@ -1516,25 +1539,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.intmc = n->bar.intms =0 ;if (n->params.cmb_size_mb) { - -NVME_CMBLOC_SET_BIR (n->bar.cmbloc,2 ); -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), -PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 | -PCI_BASE_ADDRESS_MEM_PREFETCH , &n->ctrl_mem); - +nvme_init_cmb (n, pci_dev); }else if (n->pmrdev) {/* Controller Capabilities register */ NVME_CAP_SET_PMRS (n->bar.cap,1 );
Signature · 1 line
2.26.2
PATCH v6 18/20 hw/block/nvme: factor out pmr setup
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 95 ++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 44 deletions(-)
hw/block/nvme.c +51 -44
@@ -58,6 +58,7 @@#define NVME_REG_SIZE 0x1000#define NVME_DB_SIZE 4#define NVME_CMB_BIR 2 +#define NVME_PMR_BIR 2#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \
@@ -1463,6 +1464,55 @@ static void nvme_init_cmb(NvmeCtrl *n, PCIDevice *pci_dev) PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem); } +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 ); +NVME_PMRCAP_SET_WDS (n->bar.pmrcap,0 ); +NVME_PMRCAP_SET_BIR (n->bar.pmrcap,NVME_PMR_BIR ); +NVME_PMRCAP_SET_PMRTU (n->bar.pmrcap,0 ); +/* Turn on bit 1 support */ +NVME_PMRCAP_SET_PMRWBM (n->bar.pmrcap,0x02 ); +NVME_PMRCAP_SET_PMRTO (n->bar.pmrcap,0 ); +NVME_PMRCAP_SET_CMSS (n->bar.pmrcap,0 ); + +/* PMR Control register */ + n->bar.pmrctl =0 ; +NVME_PMRCTL_SET_EN (n->bar.pmrctl,0 ); + +/* PMR Status register */ + n->bar.pmrsts =0 ; +NVME_PMRSTS_SET_ERR (n->bar.pmrsts,0 ); +NVME_PMRSTS_SET_NRDY (n->bar.pmrsts,0 ); +NVME_PMRSTS_SET_HSTS (n->bar.pmrsts,0 ); +NVME_PMRSTS_SET_CBAI (n->bar.pmrsts,0 ); + +/* PMR Elasticity Buffer Size register */ + n->bar.pmrebs =0 ; +NVME_PMREBS_SET_PMRSZU (n->bar.pmrebs,0 ); +NVME_PMREBS_SET_RBB (n->bar.pmrebs,0 ); +NVME_PMREBS_SET_PMRWBZ (n->bar.pmrebs,0 ); + +/* PMR Sustained Write Throughput register */ + n->bar.pmrswtp =0 ; +NVME_PMRSWTP_SET_PMRSWTU (n->bar.pmrswtp,0 ); +NVME_PMRSWTP_SET_PMRSWTV (n->bar.pmrswtp,0 ); + +/* PMR Memory Space Control register */ + n->bar.pmrmsc =0 ; +NVME_PMRMSC_SET_CMSE (n->bar.pmrmsc,0 ); +NVME_PMRMSC_SET_CBA (n->bar.pmrmsc,0 ); + +pci_register_bar (pci_dev,NVME_PMRCAP_BIR (n->bar.pmrcap), +PCI_BASE_ADDRESS_SPACE_MEMORY | +PCI_BASE_ADDRESS_MEM_TYPE_64 | +PCI_BASE_ADDRESS_MEM_PREFETCH , &n->pmrdev->mr); +} +static void nvme_init_pci (NvmeCtrl *n,PCIDevice *pci_dev) {uint8_t *pci_conf = pci_dev->config;
@@ -1541,50 +1591,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)if (n->params.cmb_size_mb) {nvme_init_cmb (n, pci_dev); }else if (n->pmrdev) { -/* 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 ); -NVME_PMRCAP_SET_WDS (n->bar.pmrcap,0 ); -NVME_PMRCAP_SET_BIR (n->bar.pmrcap,2 ); -NVME_PMRCAP_SET_PMRTU (n->bar.pmrcap,0 ); -/* Turn on bit 1 support */ -NVME_PMRCAP_SET_PMRWBM (n->bar.pmrcap,0x02 ); -NVME_PMRCAP_SET_PMRTO (n->bar.pmrcap,0 ); -NVME_PMRCAP_SET_CMSS (n->bar.pmrcap,0 ); - -/* PMR Control register */ - n->bar.pmrctl =0 ; -NVME_PMRCTL_SET_EN (n->bar.pmrctl,0 ); - -/* PMR Status register */ - n->bar.pmrsts =0 ; -NVME_PMRSTS_SET_ERR (n->bar.pmrsts,0 ); -NVME_PMRSTS_SET_NRDY (n->bar.pmrsts,0 ); -NVME_PMRSTS_SET_HSTS (n->bar.pmrsts,0 ); -NVME_PMRSTS_SET_CBAI (n->bar.pmrsts,0 ); - -/* PMR Elasticity Buffer Size register */ - n->bar.pmrebs =0 ; -NVME_PMREBS_SET_PMRSZU (n->bar.pmrebs,0 ); -NVME_PMREBS_SET_RBB (n->bar.pmrebs,0 ); -NVME_PMREBS_SET_PMRWBZ (n->bar.pmrebs,0 ); - -/* PMR Sustained Write Throughput register */ - n->bar.pmrswtp =0 ; -NVME_PMRSWTP_SET_PMRSWTU (n->bar.pmrswtp,0 ); -NVME_PMRSWTP_SET_PMRSWTV (n->bar.pmrswtp,0 ); - -/* PMR Memory Space Control register */ - n->bar.pmrmsc =0 ; -NVME_PMRMSC_SET_CMSE (n->bar.pmrmsc,0 ); -NVME_PMRMSC_SET_CBA (n->bar.pmrmsc,0 ); - -pci_register_bar (pci_dev,NVME_PMRCAP_BIR (n->bar.pmrcap), -PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 | -PCI_BASE_ADDRESS_MEM_PREFETCH , &n->pmrdev->mr); +nvme_init_pmr (n, pci_dev); }for (i =0 ; i < n->num_namespaces; i++) {
Signature · 1 line
2.26.2
Re: [PATCH v6 18/20] hw/block/nvme: factor out pmr setup
Quoted 119 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 95 ++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 44 deletions(-)hw/block/nvme.c +50
-38@@ -58,6 +58,7 @@#define NVME_REG_SIZE 0x1000#define NVME_DB_SIZE 4#define NVME_CMB_BIR 2 +#define NVME_PMR_BIR 2#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \@@ -1463,6 +1464,55 @@ static void nvme_init_cmb(NvmeCtrl *n, PCIDevice *pci_dev) PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem); } +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 ); +NVME_PMRCAP_SET_WDS (n->bar.pmrcap,0 ); +NVME_PMRCAP_SET_BIR (n->bar.pmrcap,NVME_PMR_BIR ); +NVME_PMRCAP_SET_PMRTU (n->bar.pmrcap,0 ); +/* Turn on bit 1 support */ +NVME_PMRCAP_SET_PMRWBM (n->bar.pmrcap,0x02 ); +NVME_PMRCAP_SET_PMRTO (n->bar.pmrcap,0 ); +NVME_PMRCAP_SET_CMSS (n->bar.pmrcap,0 ); + +/* PMR Control register */ + n->bar.pmrctl =0 ; +NVME_PMRCTL_SET_EN (n->bar.pmrctl,0 ); + +/* PMR Status register */ + n->bar.pmrsts =0 ; +NVME_PMRSTS_SET_ERR (n->bar.pmrsts,0 ); +NVME_PMRSTS_SET_NRDY (n->bar.pmrsts,0 ); +NVME_PMRSTS_SET_HSTS (n->bar.pmrsts,0 ); +NVME_PMRSTS_SET_CBAI (n->bar.pmrsts,0 ); + +/* PMR Elasticity Buffer Size register */ + n->bar.pmrebs =0 ; +NVME_PMREBS_SET_PMRSZU (n->bar.pmrebs,0 ); +NVME_PMREBS_SET_RBB (n->bar.pmrebs,0 ); +NVME_PMREBS_SET_PMRWBZ (n->bar.pmrebs,0 ); + +/* PMR Sustained Write Throughput register */ + n->bar.pmrswtp =0 ; +NVME_PMRSWTP_SET_PMRSWTU (n->bar.pmrswtp,0 ); +NVME_PMRSWTP_SET_PMRSWTV (n->bar.pmrswtp,0 ); + +/* PMR Memory Space Control register */ + n->bar.pmrmsc =0 ; +NVME_PMRMSC_SET_CMSE (n->bar.pmrmsc,0 ); +NVME_PMRMSC_SET_CBA (n->bar.pmrmsc,0 ); + +pci_register_bar (pci_dev,NVME_PMRCAP_BIR (n->bar.pmrcap), +PCI_BASE_ADDRESS_SPACE_MEMORY | +PCI_BASE_ADDRESS_MEM_TYPE_64 | +PCI_BASE_ADDRESS_MEM_PREFETCH , &n->pmrdev->mr); +} +static void nvme_init_pci (NvmeCtrl *n,PCIDevice *pci_dev) {uint8_t *pci_conf = pci_dev->config;@@ -1541,50 +1591,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)if (n->params.cmb_size_mb) {nvme_init_cmb (n, pci_dev); }else if (n->pmrdev) { -/* 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 ); -NVME_PMRCAP_SET_WDS (n->bar.pmrcap,0 ); -NVME_PMRCAP_SET_BIR (n->bar.pmrcap,2 ); -NVME_PMRCAP_SET_PMRTU (n->bar.pmrcap,0 ); -/* Turn on bit 1 support */ -NVME_PMRCAP_SET_PMRWBM (n->bar.pmrcap,0x02 ); -NVME_PMRCAP_SET_PMRTO (n->bar.pmrcap,0 ); -NVME_PMRCAP_SET_CMSS (n->bar.pmrcap,0 ); - -/* PMR Control register */ - n->bar.pmrctl =0 ; -NVME_PMRCTL_SET_EN (n->bar.pmrctl,0 ); - -/* PMR Status register */ - n->bar.pmrsts =0 ; -NVME_PMRSTS_SET_ERR (n->bar.pmrsts,0 ); -NVME_PMRSTS_SET_NRDY (n->bar.pmrsts,0 ); -NVME_PMRSTS_SET_HSTS (n->bar.pmrsts,0 ); -NVME_PMRSTS_SET_CBAI (n->bar.pmrsts,0 ); - -/* PMR Elasticity Buffer Size register */ - n->bar.pmrebs =0 ; -NVME_PMREBS_SET_PMRSZU (n->bar.pmrebs,0 ); -NVME_PMREBS_SET_RBB (n->bar.pmrebs,0 ); -NVME_PMREBS_SET_PMRWBZ (n->bar.pmrebs,0 ); - -/* PMR Sustained Write Throughput register */ - n->bar.pmrswtp =0 ; -NVME_PMRSWTP_SET_PMRSWTU (n->bar.pmrswtp,0 ); -NVME_PMRSWTP_SET_PMRSWTV (n->bar.pmrswtp,0 ); - -/* PMR Memory Space Control register */ - n->bar.pmrmsc =0 ;
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1597
Quoted 10 lines
hw/block/nvme.c +1
-6-NVME_PMRMSC_SET_CMSE (n->bar.pmrmsc,0 ); -NVME_PMRMSC_SET_CBA (n->bar.pmrmsc,0 ); - -pci_register_bar (pci_dev,NVME_PMRCAP_BIR (n->bar.pmrcap), -PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 | -PCI_BASE_ADDRESS_MEM_PREFETCH , &n->pmrdev->mr); +nvme_init_pmr (n, pci_dev); }for (i =0 ; i < n->num_namespaces; i++) {
PATCH v6 19/20 hw/block/nvme: do cmb/pmr init as part of pci init
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/block/nvme.c +6 -6
@@ -1527,6 +1527,12 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev)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_init_pmr (n, pci_dev); + } }static void nvme_realize (PCIDevice *pci_dev,Error **errp)
@@ -1588,12 +1594,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ; -if (n->params.cmb_size_mb) { -nvme_init_cmb (n, pci_dev); - }else if (n->pmrdev) { -nvme_init_pmr (n, pci_dev); - } -for (i =0 ; i < n->num_namespaces; i++) {nvme_init_namespace (n, &n->namespaces[i], &local_err);if (local_err) {
Signature · 1 line
2.26.2
Re: [PATCH v6 19/20] hw/block/nvme: do cmb/pmr init as part of pci init
Quoted 1 line · Klaus Jensen
From: Klaus Jensen <[email protected]>
Having the patch subject duplicated ease review (not all email client display email subject close to email content):
"Do cmb/pmr init as part of pci init."
Quoted 38 lines
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)hw/block/nvme.c +6
-6@@ -1527,6 +1527,12 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev)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_init_pmr (n, pci_dev); + } }static void nvme_realize (PCIDevice *pci_dev,Error **errp)@@ -1588,12 +1594,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ; -if (n->params.cmb_size_mb) { -nvme_init_cmb (n, pci_dev); - }else if (n->pmrdev) { -nvme_init_pmr (n, pci_dev); - } -for (i =0 ; i < n->num_namespaces; i++) {nvme_init_namespace (n, &n->namespaces[i], &local_err);if (local_err) {
PATCH v6 20/20 hw/block/nvme: factor out controller identify setup
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-)
hw/block/nvme.c +26 -23
@@ -1535,32 +1535,11 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev) } } -static void nvme_realize (PCIDevice *pci_dev,Error **errp) +static void nvme_init_ctrl (NvmeCtrl *n,PCIDevice *pci_dev) { -NvmeCtrl *n =NVME (pci_dev);NvmeIdCtrl *id = &n->id_ctrl; -Error *local_err =NULL ; +uint8_t *pci_conf = pci_dev->config; -int i; -uint8_t *pci_conf; - -nvme_check_constraints (n, &local_err); -if (local_err) { -error_propagate (errp, local_err); -return ; - } - -nvme_init_state (n); - -nvme_init_blk (n, &local_err); -if (local_err) { -error_propagate (errp, local_err); -return ; - } - -nvme_init_pci (n, pci_dev); - - pci_conf = pci_dev->config; id->vid =cpu_to_le16 (pci_get_word (pci_conf +PCI_VENDOR_ID )); id->ssvid =cpu_to_le16 (pci_get_word (pci_conf +PCI_SUBSYSTEM_VENDOR_ID ));strpadcpy ((char *)id->mn,sizeof (id->mn),"QEMU NVMe Ctrl" ,' ' );
@@ -1593,6 +1572,30 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.vs =0x00010200 ; n->bar.intmc = n->bar.intms =0 ; +} + +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); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +nvme_init_state (n); +nvme_init_blk (n, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +nvme_init_pci (n, pci_dev); +nvme_init_ctrl (n, pci_dev);for (i =0 ; i < n->num_namespaces; i++) {nvme_init_namespace (n, &n->namespaces[i], &local_err);
Signature · 1 line
2.26.2
Kevin Wolf
AppliedAm 14.05.2020 um 06:45 hat Klaus Jensen geschrieben:
Quoted 9 lines
From: Klaus Jensen <[email protected]>
Changes since v5
~~~~~~~~~~~~~~~~
* Prefixed all patches with "hw/block/nvme" to avoid confusion with the nvme block driver.* Added patch two patches:
Quoted 8 lines
hw/block/nvme: fix pin-based interrupt behavior hw/block/nvme: allow use of any valid msix vector
These were previously posted separately, but I'm including them in this series since I didnt get any response on the separate series anyway.
* Fixed Maxim's email in the R-b on "hw/block/nvme: refactor
nvme_addr_read"
Thanks, applied to the block branch.
Kevin
Quoted 13 lines · Kevin Wolf
Am 14.05.2020 um 06:45 hat Klaus Jensen geschrieben:
Quoted 12 lines
From: Klaus Jensen <[email protected]>
Changes since v5
~~~~~~~~~~~~~~~~
* Prefixed all patches with "hw/block/nvme" to avoid confusion with the nvme block driver.* Added patch two patches:
hw/block/nvme: fix pin-based interrupt behavior hw/block/nvme: allow use of any valid msix vector
Quoted 7 lines
Quoted 5 lines
These were previously posted separately, but I'm including them in this series since I didnt get any response on the separate series anyway.
* Fixed Maxim's email in the R-b on "hw/block/nvme: refactor
nvme_addr_read"Thanks, applied to the block branch.
Great to see that code merged!
Note that while I kind of didn't review some of
the latest patches mostly becasue I was doing other things, I do plan to keep on reviewing following patches in this activety.
Best regards,
Maxim Levitsky
Quoted 4 lines
Kevin
Quoted 20 lines · Maxim Levitsky
Quoted 19 lines · Kevin Wolf
Am 14.05.2020 um 06:45 hat Klaus Jensen geschrieben:
Quoted 17 lines
From: Klaus Jensen <[email protected]>
Changes since v5
~~~~~~~~~~~~~~~~
* Prefixed all patches with "hw/block/nvme" to avoid confusion with the nvme block driver.* Added patch two patches:
hw/block/nvme: fix pin-based interrupt behavior hw/block/nvme: allow use of any valid msix vector
These were previously posted separately, but I'm including them in this series since I didnt get any response on the separate series anyway.
* Fixed Maxim's email in the R-b on "hw/block/nvme: refactor
nvme_addr_read"
Quoted 7 lines
Quoted 1 line
Thanks, applied to the block branch.
Great to see that code merged!
Note that while I kind of didn't review some of
the latest patches mostly becasue I was doing other things, I do plan to keep on reviewing following patches in this activety.
And I am really tired today, when I look at all of the spelling mistakes I make today :-)
Best regards,
Maxim Levitsky
Quoted 7 lines
Best regards,
Maxim LevitskyQuoted 3 lines
Kevin