nvme: support NVMe v1.3d, SGLs and multiple namespaces
v6 cover nvme: support NVMe v1.3d, SGLs and multiple namespaces
From: Klaus Jensen <[email protected]>
Hi,
So this patchset kinda blew up in size (wrt. number of patches) after Maxim's comments (26 -> 42), but Maxim's comments about splitting up a bunch of the patches made a lot of sense.
v6 primarily splits up the big nasty patches into more digestible parts. Specifically the 'nvme: refactor prp mapping' and 'nvme: allow multiple aios per command' patches has been split up according to Maxim's comments. Most additions to the shared include/block/nvme.h has also been consolidated into a single patch (also according to Maxim's comments). A lot of the patches still carries a 'Reviewed-By', but git-backport-diff reports some changes due to changes/additions in some of the early patches.
The only real "addition" is a new "max_ioqpairs" parameter for the device. This is to fix some confusion about the current "num_queues" parameter. See "nvme: add max_ioqpairs device parameter".
Maxim, I responded to your comments in the original thread and I believe that all your comments has been adressed.
Also, I *did* change the line indentation style - I hope I caught 'em all :)
Klaus Jensen (42):
nvme: rename trace events to nvme_dev
nvme: remove superfluous breaks
nvme: move device parameters to separate struct
nvme: bump spec data structures to v1.3
nvme: use constant for identify data size
nvme: add identify cns values in header
nvme: refactor nvme_addr_read
nvme: add support for the abort command
nvme: add max_ioqpairs device parameter
nvme: refactor device realization
nvme: add temperature threshold feature
nvme: add support for the get log page command
nvme: add support for the asynchronous event request command
nvme: add missing mandatory features
nvme: additional tracing
nvme: make sure ncqr and nsqr is valid
nvme: add log specific field to trace events
nvme: support identify namespace descriptor list
nvme: enforce valid queue creation sequence
nvme: provide the mandatory subnqn field
nvme: bump supported version to v1.3
nvme: memset preallocated requests structures
nvme: add mapping helpers
nvme: remove redundant has_sg member
nvme: refactor dma read/write
nvme: pass request along for tracing
nvme: add request mapping helper
nvme: verify validity of prp lists in the cmb
nvme: refactor request bounds checking
nvme: add check for mdts
nvme: add check for prinfo
nvme: allow multiple aios per command
nvme: use preallocated qsg/iov in nvme_dma_prp
pci: pass along the return value of dma_memory_rw
nvme: handle dma errors
nvme: add support for scatter gather lists
nvme: refactor identify active namespace id list
nvme: support multiple namespaces
pci: allocate pci id for nvme
nvme: change controller pci id
nvme: remove redundant NvmeCmd pointer parameter
nvme: make lba data size configurable
MAINTAINERS | 1 + block/nvme.c | 18 +- docs/specs/nvme.txt | 25 + docs/specs/pci-ids.txt | 1 + hw/block/Makefile.objs | 2 +- hw/block/nvme-ns.c | 162 ++++ hw/block/nvme-ns.h | 62 ++ hw/block/nvme.c | 2041 ++++++++++++++++++++++++++++++++-------- hw/block/nvme.h | 205 +++- hw/block/trace-events | 206 ++-- hw/core/machine.c | 1 + include/block/nvme.h | 178 +++- include/hw/pci/pci.h | 4 +- 13 files changed, 2347 insertions(+), 559 deletions(-) create mode 100644 docs/specs/nvme.txt create mode 100644 hw/block/nvme-ns.c create mode 100644 hw/block/nvme-ns.h
Signature · 1 line
2.25.1
PATCH v6 1/42 nvme: rename trace events to nvme_dev
From: Klaus Jensen <[email protected]>
Change the prefix of all nvme device related trace events to 'nvme_dev' to not clash with trace events from the nvme block driver.
--- hw/block/nvme.c | 188 +++++++++++++++++++++--------------------- hw/block/trace-events | 172 +++++++++++++++++++------------------- 2 files changed, 180 insertions(+), 180 deletions(-)
hw/block/nvme.c +94 -94
@@ -112,16 +112,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_nvme_dev_irq_msix (cq->vector);msix_notify (&(n->parent_obj), cq->vector); }else { -trace_nvme_irq_pin (); +trace_nvme_dev_irq_pin ();assert (cq->cqid <64 ); n->irq_status |=1 << cq->cqid;nvme_irq_check (n); } }else { -trace_nvme_irq_masked (); +trace_nvme_dev_irq_masked (); } }
@@ -146,7 +146,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_nvme_dev_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)) {
@@ -160,7 +160,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_nvme_dev_err_invalid_prp2_missing (); goto unmap; }if (len > n->page_size) {
@@ -176,7 +176,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_nvme_dev_err_invalid_prplist_ent (prp_ent); goto unmap; }
@@ -189,7 +189,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_nvme_dev_err_invalid_prplist_ent (prp_ent); goto unmap; }
@@ -204,7 +204,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_nvme_dev_err_invalid_prp2_align (prp2); goto unmap; }if (qsg->nsg) {
@@ -252,20 +252,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_nvme_dev_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_nvme_dev_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_nvme_dev_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; }qemu_iovec_destroy (&iov);
@@ -354,7 +354,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_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);return NVME_LBA_RANGE |NVME_DNR ; }
@@ -382,11 +382,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_nvme_dev_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_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);return NVME_LBA_RANGE |NVME_DNR ; }
@@ -421,7 +421,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_nvme_dev_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; }
@@ -435,7 +435,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_nvme_dev_err_invalid_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }
@@ -460,11 +460,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_nvme_dev_err_invalid_del_sq (qid);return NVME_INVALID_QID |NVME_DNR ; } -trace_nvme_del_sq (qid); +trace_nvme_dev_del_sq (qid); sq = n->sq[qid];while (!QTAILQ_EMPTY (&sq->out_req_list)) {
@@ -528,26 +528,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_nvme_dev_create_sq (prp1, sqid, cqid, qsize, qflags);if (unlikely (!cqid ||nvme_check_cqid (n, cqid))) { -trace_nvme_err_invalid_create_sq_cqid (cqid); +trace_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_err_invalid_create_sq_qflags (NVME_SQ_FLAGS_PC (qflags));return NVME_INVALID_FIELD |NVME_DNR ; } sq =g_malloc0 (sizeof (*sq));
@@ -573,17 +573,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_nvme_dev_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_nvme_dev_err_invalid_del_cq_notempty (qid);return NVME_INVALID_QUEUE_DEL ; }nvme_irq_deassert (n, cq); -trace_nvme_del_cq (qid); +trace_nvme_dev_del_cq (qid);nvme_free_cq (cq, n);return NVME_SUCCESS ; }
@@ -616,27 +616,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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_err_invalid_create_cq_qflags (NVME_CQ_FLAGS_PC (qflags));return NVME_INVALID_FIELD |NVME_DNR ; }
@@ -651,7 +651,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_nvme_dev_identify_ctrl ();return nvme_dma_read_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), prp1, prp2);
@@ -664,10 +664,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_nvme_dev_identify_ns (nsid);if (unlikely (nsid ==0 || nsid > n->num_namespaces)) { -trace_nvme_err_invalid_ns (nsid, n->num_namespaces); +trace_nvme_dev_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; }
@@ -687,7 +687,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_nvme_dev_identify_nslist (min_nsid); list =g_malloc0 (data_len);for (i =0 ; i < n->num_namespaces; i++) {
@@ -716,14 +716,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_nvme_dev_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_nvme_dev_setfeat_timestamp (ts); n->host_timestamp =le64_to_cpu (ts); n->timestamp_set_qemu_clock_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL );
@@ -756,7 +756,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_nvme_dev_getfeat_timestamp (ts.all);return cpu_to_le64 (ts.all); }
@@ -780,17 +780,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_nvme_dev_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_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd);break ;default : -trace_nvme_err_invalid_getfeat (dw10); +trace_nvme_dev_err_invalid_getfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ; }
@@ -826,9 +826,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_nvme_dev_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 ;
@@ -838,7 +838,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;default : -trace_nvme_err_invalid_setfeat (dw10); +trace_nvme_dev_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ; }return NVME_SUCCESS ;
@@ -862,7 +862,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_nvme_dev_err_invalid_admin_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }
@@ -925,77 +925,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_nvme_dev_err_startfail_cq ();return -1 ; }if (unlikely (n->sq[0 ])) { -trace_nvme_err_startfail_sq (); +trace_nvme_dev_err_startfail_sq ();return -1 ; }if (unlikely (!n->bar.asq)) { -trace_nvme_err_startfail_nbarasq (); +trace_nvme_dev_err_startfail_nbarasq ();return -1 ; }if (unlikely (!n->bar.acq)) { -trace_nvme_err_startfail_nbaracq (); +trace_nvme_dev_err_startfail_nbaracq ();return -1 ; }if (unlikely (n->bar.asq & (page_size -1 ))) { -trace_nvme_err_startfail_asq_misaligned (n->bar.asq); +trace_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_err_startfail_asqent_sz_zero ();return -1 ; }if (unlikely (!NVME_AQA_ACQS (n->bar.aqa))) { -trace_nvme_err_startfail_acqent_sz_zero (); +trace_nvme_dev_err_startfail_acqent_sz_zero ();return -1 ; }
@@ -1018,14 +1018,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 (nvme_dev_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 (nvme_dev_ub_mmiowr_toosmall,"MMIO write smaller than 32-bits," " offset=0x%" PRIx64", size=%u" , offset, size);
@@ -1035,32 +1035,32 @@ 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 (nvme_dev_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 , +trace_nvme_dev_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 (nvme_dev_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 , +trace_nvme_dev_mmio_intm_clr (data &0xffffffff , n->bar.intmc);nvme_irq_check (n);break ;case 0x14 :/* CC */ -trace_nvme_mmio_cfg (data &0xffffffff ); +trace_nvme_dev_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))
@@ -1071,42 +1071,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_nvme_dev_err_startfail (); n->bar.csts =NVME_CSTS_FAILED ; }else { -trace_nvme_mmio_start_success (); +trace_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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 (nvme_dev_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 (nvme_dev_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_nvme_dev_ub_mmiowr_ssreset_unsupported (); }else {/* The spec says that writes of other values have no effect */ return ;
@@ -1114,35 +1114,35 @@ 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_nvme_dev_mmio_aqattr (data &0xffffffff );break ;case 0x28 :/* ASQ */ n->bar.asq = data; -trace_nvme_mmio_asqaddr (data); +trace_nvme_dev_mmio_asqaddr (data);break ;case 0x2c :/* ASQ hi */ n->bar.asq |= data <<32 ; -trace_nvme_mmio_asqaddr_hi (data, n->bar.asq); +trace_nvme_dev_mmio_asqaddr_hi (data, n->bar.asq);break ;case 0x30 :/* ACQ */ -trace_nvme_mmio_acqaddr (data); +trace_nvme_dev_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_nvme_dev_mmio_acqaddr_hi (data, n->bar.acq);break ;case 0x38 :/* CMBLOC */ -NVME_GUEST_ERR (nvme_ub_mmiowr_cmbloc_reserved, +NVME_GUEST_ERR (nvme_dev_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 (nvme_dev_ub_mmiowr_cmbsz_readonly,"invalid write to read only CMBSZ, ignored" );return ;default : -NVME_GUEST_ERR (nvme_ub_mmiowr_invalid, +NVME_GUEST_ERR (nvme_dev_ub_mmiowr_invalid,"invalid MMIO write," " offset=0x%" PRIx64", data=%" PRIx64"" , offset, data);
@@ -1157,12 +1157,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 (nvme_dev_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 (nvme_dev_ub_mmiord_toosmall,"MMIO read smaller than 32-bits," " offset=0x%" PRIx64"" , addr);/* should RAZ, fall through for now */
@@ -1171,7 +1171,7 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)if (addr <sizeof (n->bar)) {memcpy (&val, ptr + addr, size); }else { -NVME_GUEST_ERR (nvme_ub_mmiord_invalid_ofs, +NVME_GUEST_ERR (nvme_dev_ub_mmiord_invalid_ofs,"MMIO read beyond last register," " offset=0x%" PRIx64", returning 0" , addr); }
@@ -1184,7 +1184,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 (nvme_dev_ub_db_wr_misaligned,"doorbell write not 32-bit aligned," " offset=0x%" PRIx64", ignoring" , addr);return ;
@@ -1199,7 +1199,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 (nvme_dev_ub_db_wr_invalid_cq,"completion queue doorbell write" " for nonexistent queue," " sqid=%" PRIu32", ignoring" , qid);
@@ -1208,7 +1208,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(nvme_dev_ub_db_wr_invalid_cqhead, "completion queue doorbell write value" " beyond queue size, sqid=%"PRIu32"," " new_head=%"PRIu16", ignoring",
@@ -1237,7 +1237,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 (nvme_dev_ub_db_wr_invalid_sq,"submission queue doorbell write" " for nonexistent queue," " sqid=%" PRIu32", ignoring" , qid);
@@ -1246,7 +1246,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(nvme_dev_ub_db_wr_invalid_sqtail, "submission queue doorbell write value" " beyond queue size, sqid=%"PRIu32"," " new_tail=%"PRIu16", ignoring",
hw/block/trace-events +86 -86
182 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v6 01/42] nvme: rename trace events to nvme_dev
Quoted 473 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Change the prefix of all nvme device related trace events to '
nvme_dev' to not clash with trace events from the nvme block driver.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 188 +++++++++++++++++++++--------------------- hw/block/trace-events | 172 +++++++++++++++++++------------------- 2 files changed, 180 insertions(+), 180 deletions(-)hw/block/nvme.c +65
-66@@ -112,16 +112,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_nvme_dev_irq_msix (cq->vector);msix_notify (&(n->parent_obj), cq->vector); }else { -trace_nvme_irq_pin (); +trace_nvme_dev_irq_pin ();assert (cq->cqid <64 ); n->irq_status |=1 << cq->cqid;nvme_irq_check (n); } }else { -trace_nvme_irq_masked (); +trace_nvme_dev_irq_masked (); } }@@ -146,7 +146,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_nvme_dev_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)) {@@ -160,7 +160,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_nvme_dev_err_invalid_prp2_missing (); goto unmap; }if (len > n->page_size) {@@ -176,7 +176,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_nvme_dev_err_invalid_prplist_ent (prp_ent); goto unmap; }@@ -189,7 +189,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_nvme_dev_err_invalid_prplist_ent (prp_ent); goto unmap; }@@ -204,7 +204,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_nvme_dev_err_invalid_prp2_align (prp2); goto unmap; }if (qsg->nsg) {@@ -252,20 +252,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_nvme_dev_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_nvme_dev_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_nvme_dev_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; }qemu_iovec_destroy (&iov);@@ -354,7 +354,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_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);return NVME_LBA_RANGE |NVME_DNR ; }@@ -382,11 +382,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_nvme_dev_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_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);return NVME_LBA_RANGE |NVME_DNR ; }@@ -421,7 +421,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_nvme_dev_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; }@@ -435,7 +435,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_nvme_dev_err_invalid_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }@@ -460,11 +460,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_nvme_dev_err_invalid_del_sq (qid);return NVME_INVALID_QID |NVME_DNR ; } -trace_nvme_del_sq (qid); +trace_nvme_dev_del_sq (qid); sq = n->sq[qid];while (!QTAILQ_EMPTY (&sq->out_req_list)) {@@ -528,26 +528,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_nvme_dev_create_sq (prp1, sqid, cqid, qsize, qflags);if (unlikely (!cqid ||nvme_check_cqid (n, cqid))) { -trace_nvme_err_invalid_create_sq_cqid (cqid); +trace_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_err_invalid_create_sq_qflags (NVME_SQ_FLAGS_PC (qflags));return NVME_INVALID_FIELD |NVME_DNR ; } sq =g_malloc0 (sizeof (*sq));@@ -573,17 +573,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_nvme_dev_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_nvme_dev_err_invalid_del_cq_notempty (qid);return NVME_INVALID_QUEUE_DEL ; }nvme_irq_deassert (n, cq); -trace_nvme_del_cq (qid); +trace_nvme_dev_del_cq (qid);nvme_free_cq (cq, n);return NVME_SUCCESS ; }@@ -616,27 +616,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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_err_invalid_create_cq_qflags (NVME_CQ_FLAGS_PC (qflags));return NVME_INVALID_FIELD |NVME_DNR ; }@@ -651,7 +651,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_nvme_dev_identify_ctrl ();return nvme_dma_read_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), prp1, prp2);@@ -664,10 +664,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_nvme_dev_identify_ns (nsid);if (unlikely (nsid ==0 || nsid > n->num_namespaces)) { -trace_nvme_err_invalid_ns (nsid, n->num_namespaces); +trace_nvme_dev_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; }@@ -687,7 +687,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_nvme_dev_identify_nslist (min_nsid); list =g_malloc0 (data_len);for (i =0 ; i < n->num_namespaces; i++) {@@ -716,14 +716,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_nvme_dev_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_nvme_dev_setfeat_timestamp (ts); n->host_timestamp =le64_to_cpu (ts); n->timestamp_set_qemu_clock_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL );@@ -756,7 +756,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_nvme_dev_getfeat_timestamp (ts.all);return cpu_to_le64 (ts.all); }@@ -780,17 +780,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_nvme_dev_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_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd);break ;default : -trace_nvme_err_invalid_getfeat (dw10); +trace_nvme_dev_err_invalid_getfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ; }@@ -826,9 +826,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_nvme_dev_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 ;@@ -838,7 +838,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;default : -trace_nvme_err_invalid_setfeat (dw10); +trace_nvme_dev_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ; }return NVME_SUCCESS ;@@ -862,7 +862,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_nvme_dev_err_invalid_admin_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }@@ -925,77 +925,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_nvme_dev_err_startfail_cq ();return -1 ; }if (unlikely (n->sq[0 ])) { -trace_nvme_err_startfail_sq (); +trace_nvme_dev_err_startfail_sq ();return -1 ; }if (unlikely (!n->bar.asq)) { -trace_nvme_err_startfail_nbarasq (); +trace_nvme_dev_err_startfail_nbarasq ();return -1 ; }if (unlikely (!n->bar.acq)) { -trace_nvme_err_startfail_nbaracq (); +trace_nvme_dev_err_startfail_nbaracq ();return -1 ; }if (unlikely (n->bar.asq & (page_size -1 ))) { -trace_nvme_err_startfail_asq_misaligned (n->bar.asq); +trace_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_err_startfail_asqent_sz_zero ();return -1 ; }if (unlikely (!NVME_AQA_ACQS (n->bar.aqa))) { -trace_nvme_err_startfail_acqent_sz_zero (); +trace_nvme_dev_err_startfail_acqent_sz_zero ();return -1 ; }@@ -1018,14 +1018,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 (nvme_dev_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 (nvme_dev_ub_mmiowr_toosmall,"MMIO write smaller than 32-bits," " offset=0x%" PRIx64", size=%u" , offset, size);@@ -1035,32 +1035,32 @@ 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,
hw/block/nvme.c static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, · line 1046
Quoted 10 lines
hw/block/nvme.c +2
-1+NVME_GUEST_ERR (nvme_dev_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 , +trace_nvme_dev_mmio_intm_set (data &0xffffffff , n->bar.intmc);
Indention.
Quoted 5 lines
hw/block/nvme.c +0
-1nvme_irq_check (n);break ;case 0x10 :/* INTMC */ if (unlikely (msix_enabled (&(n->parent_obj)))) { - NVME_GUEST_ERR(nvme_ub_mmiowr_intmask_with_msix,
hw/block/nvme.c static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, · line 1059
Quoted 10 lines
hw/block/nvme.c +2
-1+NVME_GUEST_ERR (nvme_dev_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 , +trace_nvme_dev_mmio_intm_clr (data &0xffffffff , n->bar.intmc);
Indention.
Quoted 353 lines
hw/block/nvme.c +25
-25nvme_irq_check (n);break ;case 0x14 :/* CC */ -trace_nvme_mmio_cfg (data &0xffffffff ); +trace_nvme_dev_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))@@ -1071,42 +1071,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_nvme_dev_err_startfail (); n->bar.csts =NVME_CSTS_FAILED ; }else { -trace_nvme_mmio_start_success (); +trace_nvme_dev_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_nvme_dev_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_nvme_dev_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_nvme_dev_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 (nvme_dev_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 (nvme_dev_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_nvme_dev_ub_mmiowr_ssreset_unsupported (); }else {/* The spec says that writes of other values have no effect */ return ;@@ -1114,35 +1114,35 @@ 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_nvme_dev_mmio_aqattr (data &0xffffffff );break ;case 0x28 :/* ASQ */ n->bar.asq = data; -trace_nvme_mmio_asqaddr (data); +trace_nvme_dev_mmio_asqaddr (data);break ;case 0x2c :/* ASQ hi */ n->bar.asq |= data <<32 ; -trace_nvme_mmio_asqaddr_hi (data, n->bar.asq); +trace_nvme_dev_mmio_asqaddr_hi (data, n->bar.asq);break ;case 0x30 :/* ACQ */ -trace_nvme_mmio_acqaddr (data); +trace_nvme_dev_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_nvme_dev_mmio_acqaddr_hi (data, n->bar.acq);break ;case 0x38 :/* CMBLOC */ -NVME_GUEST_ERR (nvme_ub_mmiowr_cmbloc_reserved, +NVME_GUEST_ERR (nvme_dev_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 (nvme_dev_ub_mmiowr_cmbsz_readonly,"invalid write to read only CMBSZ, ignored" );return ;default : -NVME_GUEST_ERR (nvme_ub_mmiowr_invalid, +NVME_GUEST_ERR (nvme_dev_ub_mmiowr_invalid,"invalid MMIO write," " offset=0x%" PRIx64", data=%" PRIx64"" , offset, data);@@ -1157,12 +1157,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 (nvme_dev_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 (nvme_dev_ub_mmiord_toosmall,"MMIO read smaller than 32-bits," " offset=0x%" PRIx64"" , addr);/* should RAZ, fall through for now */ @@ -1171,7 +1171,7 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)if (addr <sizeof (n->bar)) {memcpy (&val, ptr + addr, size); }else { -NVME_GUEST_ERR (nvme_ub_mmiord_invalid_ofs, +NVME_GUEST_ERR (nvme_dev_ub_mmiord_invalid_ofs,"MMIO read beyond last register," " offset=0x%" PRIx64", returning 0" , addr); }@@ -1184,7 +1184,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 (nvme_dev_ub_db_wr_misaligned,"doorbell write not 32-bit aligned," " offset=0x%" PRIx64", ignoring" , addr);return ;@@ -1199,7 +1199,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 (nvme_dev_ub_db_wr_invalid_cq,"completion queue doorbell write" " for nonexistent queue," " sqid=%" PRIu32", ignoring" , qid);@@ -1208,7 +1208,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(nvme_dev_ub_db_wr_invalid_cqhead, "completion queue doorbell write value" " beyond queue size, sqid=%"PRIu32"," " new_head=%"PRIu16", ignoring",@@ -1237,7 +1237,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 (nvme_dev_ub_db_wr_invalid_sq,"submission queue doorbell write" " for nonexistent queue," " sqid=%" PRIu32", ignoring" , qid);@@ -1246,7 +1246,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(nvme_dev_ub_db_wr_invalid_sqtail, "submission queue doorbell write value" " beyond queue size, sqid=%"PRIu32"," " new_tail=%"PRIu16", ignoring",hw/block/trace-events +0
-6@@ -29,96 +29,96 @@ hd_geometry_guess(void *blk, uint32_t cyls, uint32_t heads, uint32_t secs, int t # nvme.c # nvme traces for successful events -nvme_irq_msix(uint32_t vector) "raising MSI-X IRQ vector %u" -nvme_irq_pin(void) "pulsing IRQ pin" -nvme_irq_masked(void) "IRQ is masked" -nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" -nvme_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64"" -nvme_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16",qflags=%"PRIu16""
-nvme_create_cq(uint64_t addr,uint16_tcqid,uint16_tvector,uint16_tsize,uint16_tqflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"hw/block/trace-events +6
-22-nvme_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" -nvme_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" -nvme_identify_ctrl(void) "identify controller" -nvme_identify_ns(uint16_t ns) "identify namespace, nsid=%"PRIu16"" -nvme_identify_nslist(uint16_t ns) "identify namespace list, nsid=%"PRIu16"" -nvme_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s" -nvme_getfeat_numq(int result) "get feature number of queues, result=%d" -nvme_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d" -nvme_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" -nvme_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" -nvme_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" -nvme_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" -nvme_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64"" -nvme_mmio_aqattr(uint64_t data) "wrote MMIO, admin queue attributes=0x%"PRIx64"" -nvme_mmio_asqaddr(uint64_t data) "wrote MMIO, admin submission queue address=0x%"PRIx64"" -nvme_mmio_acqaddr(uint64_t data) "wrote MMIO, admin completion queue address=0x%"PRIx64"" -nvme_mmio_asqaddr_hi(uint64_t data, uint64_t new_addr) "wrote MMIO, admin submission queue high half=0x%"PRIx64", new_address=0x%"PRIx64"" -nvme_mmio_acqaddr_hi(uint64_t data, uint64_t new_addr) "wrote MMIO, admin completion queue high half=0x%"PRIx64", new_address=0x%"PRIx64"" -nvme_mmio_start_success(void) "setting controller enable bit succeeded" -nvme_mmio_stopped(void) "cleared controller enable bit" -nvme_mmio_shutdown_set(void) "shutdown bit set" -nvme_mmio_shutdown_cleared(void) "shutdown bit cleared" +nvme_dev_irq_msix(uint32_t vector) "raising MSI-X IRQ vector %u" +nvme_dev_irq_pin(void) "pulsing IRQ pin" +nvme_dev_irq_masked(void) "IRQ is masked" +nvme_dev_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" +nvme_dev_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64"" +nvme_dev_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16",qflags=%"PRIu16""
+nvme_dev_create_cq(uint64_t addr,uint16_tcqid,uint16_tvector,uint16_tsize,uint16_tqflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"hw/block/trace-events +72
-57+nvme_dev_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" +nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" +nvme_dev_identify_ctrl(void) "identify controller" +nvme_dev_identify_ns(uint16_t ns) "identify namespace, nsid=%"PRIu16"" +nvme_dev_identify_nslist(uint16_t ns) "identify namespace list, nsid=%"PRIu16"" +nvme_dev_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s" +nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" +nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d" +nvme_dev_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" +nvme_dev_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" +nvme_dev_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" +nvme_dev_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" +nvme_dev_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64"" +nvme_dev_mmio_aqattr(uint64_t data) "wrote MMIO, admin queue attributes=0x%"PRIx64"" +nvme_dev_mmio_asqaddr(uint64_t data) "wrote MMIO, admin submission queue address=0x%"PRIx64"" +nvme_dev_mmio_acqaddr(uint64_t data) "wrote MMIO, admin completion queue address=0x%"PRIx64"" +nvme_dev_mmio_asqaddr_hi(uint64_t data, uint64_t new_addr) "wrote MMIO, admin submission queue high half=0x%"PRIx64", new_address=0x%"PRIx64"" +nvme_dev_mmio_acqaddr_hi(uint64_t data, uint64_t new_addr) "wrote MMIO, admin completion queue high half=0x%"PRIx64", new_address=0x%"PRIx64"" +nvme_dev_mmio_start_success(void) "setting controller enable bit succeeded" +nvme_dev_mmio_stopped(void) "cleared controller enable bit" +nvme_dev_mmio_shutdown_set(void) "shutdown bit set" +nvme_dev_mmio_shutdown_cleared(void) "shutdown bit cleared" # nvme traces for error conditions -nvme_err_invalid_dma(void) "PRP/SGL is too small for transfer size" -nvme_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" -nvme_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64"" -nvme_err_invalid_prp2_missing(void) "PRP2 is null and more data to be transferred" -nvme_err_invalid_prp(void) "invalid PRP" -nvme_err_invalid_ns(uint32_t ns, uint32_t limit) "invalid namespace %u not within 1-%u" -nvme_err_invalid_opc(uint8_t opc) "invalid opcode 0x%"PRIx8"" -nvme_err_invalid_admin_opc(uint8_t opc) "invalid admin opcode 0x%"PRIx8"" -nvme_err_invalid_lba_range(uint64_t start, uint64_t len, uint64_t limit) "Invalid LBA start=%"PRIu64" len=%"PRIu64" limit=%"PRIu64"" -nvme_err_invalid_del_sq(uint16_t qid) "invalid submission queue deletion, sid=%"PRIu16"" -nvme_err_invalid_create_sq_cqid(uint16_t cqid) "failed creating submission queue, invalid cqid=%"PRIu16"" -nvme_err_invalid_create_sq_sqid(uint16_t sqid) "failed creating submission queue, invalid sqid=%"PRIu16"" -nvme_err_invalid_create_sq_size(uint16_t qsize) "failed creating submission queue, invalid qsize=%"PRIu16"" -nvme_err_invalid_create_sq_addr(uint64_t addr) "failed creating submission queue, addr=0x%"PRIx64"" -nvme_err_invalid_create_sq_qflags(uint16_t qflags) "failed creating submission queue, qflags=%"PRIu16"" -nvme_err_invalid_del_cq_cqid(uint16_t cqid) "failed deleting completion queue, cqid=%"PRIu16"" -nvme_err_invalid_del_cq_notempty(uint16_t cqid) "failed deleting completion queue, it is not empty, cqid=%"PRIu16"" -nvme_err_invalid_create_cq_cqid(uint16_t cqid) "failed creating completion queue, cqid=%"PRIu16"" -nvme_err_invalid_create_cq_size(uint16_t size) "failed creating completion queue, size=%"PRIu16"" -nvme_err_invalid_create_cq_addr(uint64_t addr) "failed creating completion queue, addr=0x%"PRIx64"" -nvme_err_invalid_create_cq_vector(uint16_t vector) "failed creating completion queue, vector=%"PRIu16"" -nvme_err_invalid_create_cq_qflags(uint16_t qflags) "failed creating completion queue, qflags=%"PRIu16"" -nvme_err_invalid_identify_cns(uint16_t cns) "identify, invalid cns=0x%"PRIx16"" -nvme_err_invalid_getfeat(int dw10) "invalid get features, dw10=0x%"PRIx32"" -nvme_err_invalid_setfeat(uint32_t dw10) "invalid set features, dw10=0x%"PRIx32"" -nvme_err_startfail_cq(void) "nvme_start_ctrl failed because there are non-admin completion queues" -nvme_err_startfail_sq(void) "nvme_start_ctrl failed because there are non-admin submission queues" -nvme_err_startfail_nbarasq(void) "nvme_start_ctrl failed because the admin submission queue address is null" -nvme_err_startfail_nbaracq(void) "nvme_start_ctrl failed because the admin completion queue address is null" -nvme_err_startfail_asq_misaligned(uint64_t addr) "nvme_start_ctrl failed because the admin submission queue address is misaligned: 0x%"PRIx64"" -nvme_err_startfail_acq_misaligned(uint64_t addr) "nvme_start_ctrl failed because the admin completion queue address is misaligned: 0x%"PRIx64"" -nvme_err_startfail_page_too_small(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the page size is too small: log2size=%u, min=%u" -nvme_err_startfail_page_too_large(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the page size is too large: log2size=%u, max=%u" -nvme_err_startfail_cqent_too_small(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the completion queue entry size is too small: log2size=%u, min=%u" -nvme_err_startfail_cqent_too_large(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the completion queue entry size is too large: log2size=%u, max=%u" -nvme_err_startfail_sqent_too_small(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the submission queue entry size is too small: log2size=%u, min=%u" -nvme_err_startfail_sqent_too_large(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the submission queue entry size is too large: log2size=%u, max=%u" -nvme_err_startfail_asqent_sz_zero(void) "nvme_start_ctrl failed because the admin submission queue size is zero" -nvme_err_startfail_acqent_sz_zero(void) "nvme_start_ctrl failed because the admin completion queue size is zero" -nvme_err_startfail(void) "setting controller enable bit failed" +nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size" +nvme_dev_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" +nvme_dev_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64"" +nvme_dev_err_invalid_prp2_missing(void) "PRP2 is null and more data to be transferred" +nvme_dev_err_invalid_prp(void) "invalid PRP" +nvme_dev_err_invalid_ns(uint32_t ns, uint32_t limit) "invalid namespace %u not within 1-%u" +nvme_dev_err_invalid_opc(uint8_t opc) "invalid opcode 0x%"PRIx8"" +nvme_dev_err_invalid_admin_opc(uint8_t opc) "invalid admin opcode 0x%"PRIx8"" +nvme_dev_err_invalid_lba_range(uint64_t start, uint64_t len, uint64_t limit) "Invalid LBA start=%"PRIu64" len=%"PRIu64" limit=%"PRIu64"" +nvme_dev_err_invalid_del_sq(uint16_t qid) "invalid submission queue deletion, sid=%"PRIu16"" +nvme_dev_err_invalid_create_sq_cqid(uint16_t cqid) "failed creating submission queue, invalid cqid=%"PRIu16"" +nvme_dev_err_invalid_create_sq_sqid(uint16_t sqid) "failed creating submission queue, invalid sqid=%"PRIu16"" +nvme_dev_err_invalid_create_sq_size(uint16_t qsize) "failed creating submission queue, invalid qsize=%"PRIu16"" +nvme_dev_err_invalid_create_sq_addr(uint64_t addr) "failed creating submission queue, addr=0x%"PRIx64"" +nvme_dev_err_invalid_create_sq_qflags(uint16_t qflags) "failed creating submission queue, qflags=%"PRIu16"" +nvme_dev_err_invalid_del_cq_cqid(uint16_t cqid) "failed deleting completion queue, cqid=%"PRIu16"" +nvme_dev_err_invalid_del_cq_notempty(uint16_t cqid) "failed deleting completion queue, it is not empty, cqid=%"PRIu16"" +nvme_dev_err_invalid_create_cq_cqid(uint16_t cqid) "failed creating completion queue, cqid=%"PRIu16"" +nvme_dev_err_invalid_create_cq_size(uint16_t size) "failed creating completion queue, size=%"PRIu16"" +nvme_dev_err_invalid_create_cq_addr(uint64_t addr) "failed creating completion queue, addr=0x%"PRIx64"" +nvme_dev_err_invalid_create_cq_vector(uint16_t vector) "failed creating completion queue, vector=%"PRIu16"" +nvme_dev_err_invalid_create_cq_qflags(uint16_t qflags) "failed creating completion queue, qflags=%"PRIu16"" +nvme_dev_err_invalid_identify_cns(uint16_t cns) "identify, invalid cns=0x%"PRIx16"" +nvme_dev_err_invalid_getfeat(int dw10) "invalid get features, dw10=0x%"PRIx32"" +nvme_dev_err_invalid_setfeat(uint32_t dw10) "invalid set features, dw10=0x%"PRIx32"" +nvme_dev_err_startfail_cq(void) "nvme_start_ctrl failed because there are non-admin completion queues" +nvme_dev_err_startfail_sq(void) "nvme_start_ctrl failed because there are non-admin submission queues" +nvme_dev_err_startfail_nbarasq(void) "nvme_start_ctrl failed because the admin submission queue address is null" +nvme_dev_err_startfail_nbaracq(void) "nvme_start_ctrl failed because the admin completion queue address is null" +nvme_dev_err_startfail_asq_misaligned(uint64_t addr) "nvme_start_ctrl failed because the admin submission queue address is misaligned: 0x%"PRIx64"" +nvme_dev_err_startfail_acq_misaligned(uint64_t addr) "nvme_start_ctrl failed because the admin completion queue address is misaligned: 0x%"PRIx64"" +nvme_dev_err_startfail_page_too_small(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the page size is too small: log2size=%u, min=%u" +nvme_dev_err_startfail_page_too_large(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the page size is too large: log2size=%u, max=%u" +nvme_dev_err_startfail_cqent_too_small(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the completion queue entry size is too small: log2size=%u, min=%u" +nvme_dev_err_startfail_cqent_too_large(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the completion queue entry size is too large: log2size=%u, max=%u" +nvme_dev_err_startfail_sqent_too_small(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the submission queue entry size is too small: log2size=%u, min=%u" +nvme_dev_err_startfail_sqent_too_large(uint8_t log2ps, uint8_t maxlog2ps) "nvme_start_ctrl failed because the submission queue entry size is too large: log2size=%u, max=%u" +nvme_dev_err_startfail_asqent_sz_zero(void) "nvme_start_ctrl failed because the admin submission queue size is zero" +nvme_dev_err_startfail_acqent_sz_zero(void) "nvme_start_ctrl failed because the admin completion queue size is zero" +nvme_dev_err_startfail(void) "setting controller enable bit failed" # Traces for undefined behavior -nvme_ub_mmiowr_misaligned32(uint64_t offset) "MMIO write not 32-bit aligned, offset=0x%"PRIx64"" -nvme_ub_mmiowr_toosmall(uint64_t offset, unsigned size) "MMIO write smaller than 32 bits, offset=0x%"PRIx64", size=%u" -nvme_ub_mmiowr_intmask_with_msix(void) "undefined access to interrupt mask set when MSI-X is enabled" -nvme_ub_mmiowr_ro_csts(void) "attempted to set a read only bit of controller status" -nvme_ub_mmiowr_ssreset_w1c_unsupported(void) "attempted to W1C CSTS.NSSRO but CAP.NSSRS is zero (not supported)" -nvme_ub_mmiowr_ssreset_unsupported(void) "attempted NVM subsystem reset but CAP.NSSRS is zero (not supported)" -nvme_ub_mmiowr_cmbloc_reserved(void) "invalid write to reserved CMBLOC when CMBSZ is zero, ignored" -nvme_ub_mmiowr_cmbsz_readonly(void) "invalid write to read only CMBSZ, ignored" -nvme_ub_mmiowr_invalid(uint64_t offset, uint64_t data) "invalid MMIO write, offset=0x%"PRIx64", data=0x%"PRIx64"" -nvme_ub_mmiord_misaligned32(uint64_t offset) "MMIO read not 32-bit aligned, offset=0x%"PRIx64"" -nvme_ub_mmiord_toosmall(uint64_t offset) "MMIO read smaller than 32-bits, offset=0x%"PRIx64"" -nvme_ub_mmiord_invalid_ofs(uint64_t offset) "MMIO read beyond last register, offset=0x%"PRIx64", returning 0" -nvme_ub_db_wr_misaligned(uint64_t offset) "doorbell write not 32-bit aligned, offset=0x%"PRIx64", ignoring" -nvme_ub_db_wr_invalid_cq(uint32_t qid) "completion queue doorbell write for nonexistent queue, cqid=%"PRIu32", ignoring" -nvme_ub_db_wr_invalid_cqhead(uint32_t qid, uint16_t new_head) "completion queue doorbell write value beyond queue size, cqid=%"PRIu32", new_head=%"PRIu16", ignoring" -nvme_ub_db_wr_invalid_sq(uint32_t qid) "submission queue doorbell write for nonexistent queue, sqid=%"PRIu32", ignoring" -nvme_ub_db_wr_invalid_sqtail(uint32_t qid, uint16_t new_tail) "submission queue doorbell write value beyond queue size, sqid=%"PRIu32", new_head=%"PRIu16", ignoring" +nvme_dev_ub_mmiowr_misaligned32(uint64_t offset) "MMIO write not 32-bit aligned, offset=0x%"PRIx64"" +nvme_dev_ub_mmiowr_toosmall(uint64_t offset, unsigned size) "MMIO write smaller than 32 bits, offset=0x%"PRIx64", size=%u" +nvme_dev_ub_mmiowr_intmask_with_msix(void) "undefined access to interrupt mask set when MSI-X is enabled" +nvme_dev_ub_mmiowr_ro_csts(void) "attempted to set a read only bit of controller status" +nvme_dev_ub_mmiowr_ssreset_w1c_unsupported(void) "attempted to W1C CSTS.NSSRO but CAP.NSSRS is zero (not supported)" +nvme_dev_ub_mmiowr_ssreset_unsupported(void) "attempted NVM subsystem reset but CAP.NSSRS is zero (not supported)" +nvme_dev_ub_mmiowr_cmbloc_reserved(void) "invalid write to reserved CMBLOC when CMBSZ is zero, ignored" +nvme_dev_ub_mmiowr_cmbsz_readonly(void) "invalid write to read only CMBSZ, ignored" +nvme_dev_ub_mmiowr_invalid(uint64_t offset, uint64_t data) "invalid MMIO write, offset=0x%"PRIx64", data=0x%"PRIx64"" +nvme_dev_ub_mmiord_misaligned32(uint64_t offset) "MMIO read not 32-bit aligned, offset=0x%"PRIx64""
hw/block/trace-events hd_geometry_guess(void *blk, uint32_t cyls, uint32_t heads, uint32_t secs, int t · line 124
Quoted 10 lines
hw/block/trace-events +7
-0+nvme_dev_ub_mmiord_toosmall(uint64_t offset) "MMIO read smaller than 32-bits, offset=0x%"PRIx64"" +nvme_dev_ub_mmiord_invalid_ofs(uint64_t offset) "MMIO read beyond last register, offset=0x%"PRIx64", returning 0" +nvme_dev_ub_db_wr_misaligned(uint64_t offset) "doorbell write not 32-bit aligned, offset=0x%"PRIx64", ignoring" +nvme_dev_ub_db_wr_invalid_cq(uint32_t qid) "completion queue doorbell write for nonexistent queue, cqid=%"PRIu32", ignoring" +nvme_dev_ub_db_wr_invalid_cqhead(uint32_t qid, uint16_t new_head) "completion queue doorbell write value beyond queue size, cqid=%"PRIu32", new_head=%"PRIu16", ignoring" +nvme_dev_ub_db_wr_invalid_sq(uint32_t qid) "submission queue doorbell write for nonexistent queue, sqid=%"PRIu32", ignoring" +nvme_dev_ub_db_wr_invalid_sqtail(uint32_t qid, uint16_t new_tail) "submission queue doorbell write value beyond queue size, sqid=%"PRIu32", new_head=%"PRIu16", ignoring" # xen-block.c xen_block_realize(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u"
Other that indention nitpicks, no changes vs V5,
so my reviewed-by kept correctly.
Best regards,
Maxim Levitsky
Re: [PATCH v6 01/42] nvme: rename trace events to nvme_dev
Quoted 26 lines · Maxim Levitsky
Quoted 25 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Change the prefix of all nvme device related trace events to '
nvme_dev' to not clash with trace events from the nvme block driver.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 188 +++++++++++++++++++++--------------------- hw/block/trace-events | 172 +++++++++++++++++++------------------- 2 files changed, 180 insertions(+), 180 deletions(-)hw/block/nvme.c +1
-1@@ -1035,32 +1035,32 @@ 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 (nvme_dev_ub_mmiowr_intmask_with_msix,"undefined access to interrupt mask set" " when MSI-X is enabled" );
Quoted 9 lines
hw/block/nvme.c static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, · line 1046
Quoted 7 lines
hw/block/nvme.c +1
-1/* 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 , +trace_nvme_dev_mmio_intm_set (data &0xffffffff , n->bar.intmc);Indention.
Fixed.
Quoted 15 lines
Quoted 5 lines
hw/block/nvme.c +0
-1nvme_irq_check (n);break ;case 0x10 :/* INTMC */ if (unlikely (msix_enabled (&(n->parent_obj)))) { - NVME_GUEST_ERR(nvme_ub_mmiowr_intmask_with_msix,hw/block/nvme.c static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, · line 1059
Quoted 10 lines
hw/block/nvme.c +2
-1+NVME_GUEST_ERR (nvme_dev_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 , +trace_nvme_dev_mmio_intm_clr (data &0xffffffff , n->bar.intmc);
Quoted 2 lines
Indention.
Fixed.
Quoted 8 lines
Other that indention nitpicks, no changes vs V5,
so my reviewed-by kept correctly.Best regards,
Maxim Levitsky
PATCH v6 2/42 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
@@ -788,7 +788,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_nvme_dev_err_invalid_getfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;
@@ -832,11 +831,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_nvme_dev_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;
Signature · 1 line
2.25.1
PATCH v6 3/42 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 | 44 ++++++++++++++++++++++---------------------- hw/block/nvme.h | 16 +++++++++++++--- 2 files changed, 35 insertions(+), 25 deletions(-)
hw/block/nvme.c +22 -22
@@ -64,12 +64,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)
@@ -631,7 +631,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_nvme_dev_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_nvme_dev_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }
@@ -783,7 +783,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_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_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP :
@@ -827,9 +828,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_NUMBER_OF_QUEUES :trace_nvme_dev_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);
@@ -900,12 +902,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); }
@@ -1308,7 +1310,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 ; }
@@ -1324,7 +1326,7 @@ 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 ; }
@@ -1341,25 +1343,25 @@ 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 ); + n->reg_size =pow2ceil (0x1004 +2 * (n->params.num_queues +1 ) *4 ); 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 ;
@@ -1388,7 +1390,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 );
@@ -1399,7 +1401,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;
@@ -1438,7 +1440,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); }msix_uninit_exclusive_bar (pci_dev);
@@ -1446,9 +1448,7 @@ static void nvme_exit(PCIDevice *pci_dev)static Property nvme_props[] = {DEFINE_BLOCK_PROPERTIES (NvmeCtrl, conf), -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_NVME_PROPERTIES (NvmeCtrl, params),DEFINE_PROP_END_OF_LIST (), };
hw/block/nvme.h +13 -3
@@ -1,7 +1,19 @@ #ifndef HW_NVME_H #define HW_NVME_H + #include "block/nvme.h" +#define DEFINE_NVME_PROPERTIES(_state, _props) \ + DEFINE_PROP_STRING("serial", _state, _props.serial), \ + DEFINE_PROP_UINT32("cmb_size_mb", _state, _props.cmb_size_mb, 0), \ + DEFINE_PROP_UINT32("num_queues", _state, _props.num_queues, 64) + +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 +75,7 @@ typedef struct NvmeCtrl {MemoryRegion ctrl_mem;NvmeBar bar;BlockConf conf; +NvmeParams params;uint32_t page_size;uint16_t page_bits;
@@ -71,10 +84,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 +93,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;NvmeNamespace *namespaces;NvmeSQueue **sq;NvmeCQueue **cq;
Signature · 1 line
2.25.1
Re: [PATCH v6 03/42] nvme: move device parameters to separate struct
Quoted 211 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Move device configuration parameters to separate struct to make it explicit what is configurable and what is set internally.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 44 ++++++++++++++++++++++---------------------- hw/block/nvme.h | 16 +++++++++++++--- 2 files changed, 35 insertions(+), 25 deletions(-)hw/block/nvme.c +22
-22@@ -64,12 +64,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)@@ -631,7 +631,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_nvme_dev_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_nvme_dev_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }@@ -783,7 +783,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_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_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP :@@ -827,9 +828,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_NUMBER_OF_QUEUES :trace_nvme_dev_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);@@ -900,12 +902,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); }@@ -1308,7 +1310,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 ; }@@ -1324,7 +1326,7 @@ 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 ; }@@ -1341,25 +1343,25 @@ 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 ); + n->reg_size =pow2ceil (0x1004 +2 * (n->params.num_queues +1 ) *4 ); 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 ;@@ -1388,7 +1390,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 );@@ -1399,7 +1401,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;@@ -1438,7 +1440,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); }msix_uninit_exclusive_bar (pci_dev);@@ -1446,9 +1448,7 @@ static void nvme_exit(PCIDevice *pci_dev)static Property nvme_props[] = {DEFINE_BLOCK_PROPERTIES (NvmeCtrl, conf), -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_NVME_PROPERTIES (NvmeCtrl, params),DEFINE_PROP_END_OF_LIST (), };hw/block/nvme.h +13
-2@@ -1,7 +1,19 @@ #ifndef HW_NVME_H #define HW_NVME_H + #include "block/nvme.h" +#define DEFINE_NVME_PROPERTIES(_state, _props) \ + DEFINE_PROP_STRING("serial", _state, _props.serial), \ + DEFINE_PROP_UINT32("cmb_size_mb", _state, _props.cmb_size_mb, 0), \ + DEFINE_PROP_UINT32("num_queues", _state, _props.num_queues, 64) + +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 +75,7 @@ typedef struct NvmeCtrl {MemoryRegion ctrl_mem;NvmeBar bar;BlockConf conf; +NvmeParams params;uint32_t page_size;uint16_t page_bits;@@ -71,10 +84,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;
hw/block/nvme.h typedef struct NvmeCtrl { · line 98
Quoted 7 lines
hw/block/nvme.h +0
-1@@ -82,7 +93,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;NvmeNamespace *namespaces;NvmeSQueue **sq;NvmeCQueue **cq;
Looks the same, the indention fixed indeed.
So this keeps my reviewed-by as well.
Best regards,
Maxim Levitsky
PATCH v6 4/42 nvme: bump spec data structures to v1.3
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add missing fields in the Identify Controller and Identify Namespace data structures to bring them in line with NVMe v1.3.
This also adds data structures and defines for SGL support which requires a couple of trivial changes to the nvme block driver as well.
--- block/nvme.c | 18 ++--- hw/block/nvme.c | 12 ++-- include/block/nvme.h | 153 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 151 insertions(+), 32 deletions(-)
block/nvme.c +9 -9
@@ -446,7 +446,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp)error_setg (errp,"Cannot map buffer for DMA" ); goto out; } - cmd.prp1 =cpu_to_le64 (iova); + cmd.dptr.prp1 =cpu_to_le64 (iova);if (nvme_cmd_sync (bs, s->queues[0 ], &cmd)) {error_setg (errp,"Failed to identify controller" );
@@ -545,7 +545,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) } cmd = (NvmeCmd ) { .opcode =NVME_ADM_CMD_CREATE_CQ , - .prp1 =cpu_to_le64 (q->cq.iova), + .dptr.prp1 =cpu_to_le64 (q->cq.iova), .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | (n &0xFFFF )), .cdw11 =cpu_to_le32 (0x3 ), };
@@ -556,7 +556,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) } cmd = (NvmeCmd ) { .opcode =NVME_ADM_CMD_CREATE_SQ , - .prp1 =cpu_to_le64 (q->sq.iova), + .dptr.prp1 =cpu_to_le64 (q->sq.iova), .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | (n &0xFFFF )), .cdw11 =cpu_to_le32 (0x1 | (n <<16 )), };
@@ -906,16 +906,16 @@ try_map:case 0 :abort ();case 1 : - cmd->prp1 = pagelist[0 ]; - cmd->prp2 =0 ; + cmd->dptr.prp1 = pagelist[0 ]; + cmd->dptr.prp2 =0 ;break ;case 2 : - cmd->prp1 = pagelist[0 ]; - cmd->prp2 = pagelist[1 ]; + cmd->dptr.prp1 = pagelist[0 ]; + cmd->dptr.prp2 = pagelist[1 ];break ;default : - cmd->prp1 = pagelist[0 ]; - cmd->prp2 =cpu_to_le64 (req->prp_list_iova +sizeof (uint64_t )); + cmd->dptr.prp1 = pagelist[0 ]; + cmd->dptr.prp2 =cpu_to_le64 (req->prp_list_iova +sizeof (uint64_t ));break ; }trace_nvme_cmd_map_qiov (s, cmd, req, qiov, entries);
hw/block/nvme.c +6 -6
@@ -372,8 +372,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,NvmeRwCmd *rw = (NvmeRwCmd *)cmd;uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba); -uint64_t prp1 =le64_to_cpu (rw->prp1); -uint64_t prp2 =le64_to_cpu (rw->prp2); +uint64_t prp1 =le64_to_cpu (rw->dptr.prp1); +uint64_t prp2 =le64_to_cpu (rw->dptr.prp2);uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas);uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;
@@ -763,8 +763,8 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)static uint16_t nvme_get_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd) { -uint64_t prp1 =le64_to_cpu (cmd->prp1); -uint64_t prp2 =le64_to_cpu (cmd->prp2); +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);uint64_t timestamp =nvme_get_timestamp (n);
@@ -802,8 +802,8 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) {uint16_t ret;uint64_t timestamp; -uint64_t prp1 =le64_to_cpu (cmd->prp1); -uint64_t prp2 =le64_to_cpu (cmd->prp2); +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); ret =nvme_dma_write_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, prp2);
include/block/nvme.h +136 -17
247 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v6 04/42] nvme: bump spec data structures to v1.3
Quoted 114 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add missing fields in the Identify Controller and Identify Namespace data structures to bring them in line with NVMe v1.3.
This also adds data structures and defines for SGL support which requires a couple of trivial changes to the nvme block driver as well.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Fam Zheng <[email protected]>--- block/nvme.c | 18 ++--- hw/block/nvme.c | 12 ++-- include/block/nvme.h | 153 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 151 insertions(+), 32 deletions(-)block/nvme.c +9
-9@@ -446,7 +446,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp)error_setg (errp,"Cannot map buffer for DMA" ); goto out; } - cmd.prp1 =cpu_to_le64 (iova); + cmd.dptr.prp1 =cpu_to_le64 (iova);if (nvme_cmd_sync (bs, s->queues[0 ], &cmd)) {error_setg (errp,"Failed to identify controller" );@@ -545,7 +545,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) } cmd = (NvmeCmd ) { .opcode =NVME_ADM_CMD_CREATE_CQ , - .prp1 =cpu_to_le64 (q->cq.iova), + .dptr.prp1 =cpu_to_le64 (q->cq.iova), .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | (n &0xFFFF )), .cdw11 =cpu_to_le32 (0x3 ), };@@ -556,7 +556,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) } cmd = (NvmeCmd ) { .opcode =NVME_ADM_CMD_CREATE_SQ , - .prp1 =cpu_to_le64 (q->sq.iova), + .dptr.prp1 =cpu_to_le64 (q->sq.iova), .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | (n &0xFFFF )), .cdw11 =cpu_to_le32 (0x1 | (n <<16 )), };@@ -906,16 +906,16 @@ try_map:case 0 :abort ();case 1 : - cmd->prp1 = pagelist[0 ]; - cmd->prp2 =0 ; + cmd->dptr.prp1 = pagelist[0 ]; + cmd->dptr.prp2 =0 ;break ;case 2 : - cmd->prp1 = pagelist[0 ]; - cmd->prp2 = pagelist[1 ]; + cmd->dptr.prp1 = pagelist[0 ]; + cmd->dptr.prp2 = pagelist[1 ];break ;default : - cmd->prp1 = pagelist[0 ]; - cmd->prp2 =cpu_to_le64 (req->prp_list_iova +sizeof (uint64_t )); + cmd->dptr.prp1 = pagelist[0 ]; + cmd->dptr.prp2 =cpu_to_le64 (req->prp_list_iova +sizeof (uint64_t ));break ; }trace_nvme_cmd_map_qiov (s, cmd, req, qiov, entries);hw/block/nvme.c +6
-6@@ -372,8 +372,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,NvmeRwCmd *rw = (NvmeRwCmd *)cmd;uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba); -uint64_t prp1 =le64_to_cpu (rw->prp1); -uint64_t prp2 =le64_to_cpu (rw->prp2); +uint64_t prp1 =le64_to_cpu (rw->dptr.prp1); +uint64_t prp2 =le64_to_cpu (rw->dptr.prp2);uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas);uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;@@ -763,8 +763,8 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)static uint16_t nvme_get_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd) { -uint64_t prp1 =le64_to_cpu (cmd->prp1); -uint64_t prp2 =le64_to_cpu (cmd->prp2); +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);uint64_t timestamp =nvme_get_timestamp (n);@@ -802,8 +802,8 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) {uint16_t ret;uint64_t timestamp; -uint64_t prp1 =le64_to_cpu (cmd->prp1); -uint64_t prp2 =le64_to_cpu (cmd->prp2); +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); ret =nvme_dma_write_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, prp2);include/block/nvme.h +0
-0@@ -205,15 +205,53 @@ enum NvmeCmbszMask {#define NVME_CMBSZ_GETSIZE (cmbsz) \ (NVME_CMBSZ_SZ(cmbsz) * (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz))))
include/block/nvme.h enum NvmeCmbszMask { · line 216
Quoted 10 lines
include/block/nvme.h +9
-0+enum NvmeSglDescriptorType { +NVME_SGL_DESCR_TYPE_DATA_BLOCK =0x0 , +NVME_SGL_DESCR_TYPE_BIT_BUCKET =0x1 , +NVME_SGL_DESCR_TYPE_SEGMENT =0x2 , +NVME_SGL_DESCR_TYPE_LAST_SEGMENT =0x3 , +NVME_SGL_DESCR_TYPE_KEYED_DATA_BLOCK =0x4 , + +NVME_SGL_DESCR_TYPE_VENDOR_SPECIFIC =0xf , +};
OK
include/block/nvme.h enum NvmeCmbszMask { · line 220
Quoted 4 lines
include/block/nvme.h +4
-0+ +enum NvmeSglDescriptorSubtype { +NVME_SGL_DESCR_SUBTYPE_ADDRESS =0x0 , +};
OK
include/block/nvme.h enum NvmeCmbszMask { · line 230
Quoted 10 lines
include/block/nvme.h +10
-0+ +typedef struct NvmeSglDescriptor { +uint64_t addr; +uint32_t len; +uint8_t rsvd[3 ]; +uint8_t type; +}NvmeSglDescriptor ; + +#define NVME_SGL_TYPE (type) ((type >> 4) & 0xf) +#define NVME_SGL_SUBTYPE (type) (type & 0xf)
OK
Quoted 6 lines
include/block/nvme.h +6
-0+ +typedef union NvmeCmdDptr { + struct { + uint64_t prp1; + uint64_t prp2; + };
include/block/nvme.h enum NvmeCmbszMask { · line 245
Quoted 10 lines
include/block/nvme.h +9
-0+ +NvmeSglDescriptor sgl; +} NvmeCmdDptr; + +enum NvmePsdt { +PSDT_PRP =0x0 , +PSDT_SGL_MPTR_CONTIGUOUS =0x1 , +PSDT_SGL_MPTR_SGL =0x2 , +};
OK
include/block/nvme.h enum NvmeCmbszMask { · line 249
Quoted 5 lines
include/block/nvme.h +2
-1+ typedef struct NvmeCmd { uint8_t opcode; - uint8_t fuse; + uint8_t flags;
Yep, that makes sense, since this contains
more that fused operation control bits.
Quoted 11 lines
include/block/nvme.h +1
-2uint16_t cid;uint32_t nsid;uint64_t res1;uint64_t mptr; -uint64_t prp1; -uint64_t prp2; +NvmeCmdDptr dptr;uint32_t cdw10;uint32_t cdw11;uint32_t cdw12;
include/block/nvme.h typedef struct NvmeCmd { · line 264
Quoted 5 lines
include/block/nvme.h +2
-0@@ -222,6 +260,9 @@ typedef struct NvmeCmd {uint32_t cdw15; } NvmeCmd; +#define NVME_CMD_FLAGS_FUSE (flags) (flags & 0x3) +#define NVME_CMD_FLAGS_PSDT (flags) ((flags >> 6) & 0x3)
OK
Quoted 26 lines
include/block/nvme.h +3
-4+enum NvmeAdminCommands {NVME_ADM_CMD_DELETE_SQ =0x00 ,NVME_ADM_CMD_CREATE_SQ =0x01 ,@@ -321,8 +362,7 @@ typedef struct NvmeRwCmd {uint32_t nsid;uint64_t rsvd2;uint64_t mptr; -uint64_t prp1; -uint64_t prp2; +NvmeCmdDptr dptr;uint64_t slba;uint16_t nlb;uint16_t control;@@ -362,8 +402,7 @@ typedef struct NvmeDsmCmd {uint16_t cid;uint32_t nsid;uint64_t rsvd2[2 ]; -uint64_t prp1; -uint64_t prp2; +NvmeCmdDptr dptr;uint32_t nr;uint32_t attributes;uint32_t rsvd12[4 ];@@ -427,6 +466,12 @@ enum NvmeStatusCodes { NVME_CMD_ABORT_MISSING_FUSE = 0x000a,
include/block/nvme.h enum NvmeStatusCodes { · line 476
Quoted 10 lines
include/block/nvme.h +6
-0NVME_INVALID_NSID =0x000b ,NVME_CMD_SEQ_ERROR =0x000c , +NVME_INVALID_SGL_SEG_DESCR =0x000d , +NVME_INVALID_NUM_SGL_DESCRS =0x000e , +NVME_DATA_SGL_LEN_INVALID =0x000f , +NVME_MD_SGL_LEN_INVALID =0x0010 , +NVME_SGL_DESCR_TYPE_INVALID =0x0011 , + NVME_INVALID_USE_OF_CMB = 0x0012,
OK
Quoted 14 lines
include/block/nvme.h +0
-0NVME_LBA_RANGE = 0x0080,NVME_CAP_EXCEEDED = 0x0081, NVME_NS_NOT_READY = 0x0082,include/block/nvme.h +1
-1@@ -515,7 +560,7 @@ enum NvmeSmartWarn { NVME_SMART_FAILED_VOLATILE_MEDIA = 1 << 4, }; -enum LogIdentifier { +enum NvmeLogIdentifier {NVME_LOG_ERROR_INFO =0x01 ,NVME_LOG_SMART_INFO =0x02 ,NVME_LOG_FW_SLOT_INFO =0x03 ,@@ -533,6 +578,15 @@ typedef struct NvmePSD {uint8_t resv[16 ];
include/block/nvme.h typedef struct NvmePSD { · line 588
Quoted 10 lines
include/block/nvme.h +8
-0} 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 , +NVME_ID_CNS_NS_DESCR_LIST =0x3 , +};
OK
Quoted 59 lines
include/block/nvme.h +31
-5+ typedef struct NvmeIdCtrl { uint16_t vid; uint16_t ssvid;@@ -543,7 +597,15 @@ typedef struct NvmeIdCtrl {uint8_t ieee[3 ];uint8_t cmic;uint8_t mdts; -uint8_t rsvd255[178 ]; +uint16_t cntlid; +uint32_t ver; +uint32_t rtd3r; +uint32_t rtd3e; +uint32_t oaes; +uint32_t ctratt; +uint8_t rsvd100[12 ]; +uint8_t fguid[16 ]; +uint8_t rsvd128[128 ];uint16_t oacs;uint8_t acl;uint8_t aerl;@@ -551,10 +613,28 @@ typedef struct NvmeIdCtrl {uint8_t lpa;uint8_t elpe;uint8_t npss; -uint8_t rsvd511[248 ]; +uint8_t avscc; +uint8_t apsta; +uint16_t wctemp; +uint16_t cctemp; +uint16_t mtfa; +uint32_t hmpre; +uint32_t hmmin; +uint8_t tnvmcap[16 ]; +uint8_t unvmcap[16 ]; +uint32_t rpmbs; +uint16_t edstt; +uint8_t dsto; +uint8_t fwug; +uint16_t kas; +uint16_t hctma; +uint16_t mntmt; +uint16_t mxtmt; +uint32_t sanicap; +uint8_t rsvd332[180 ];uint8_t sqes;uint8_t cqes; -uint16_t rsvd515; +uint16_t maxcmd;uint32_t nn;uint16_t oncs;uint16_t fuses;@@ -562,8 +642,14 @@ typedef struct NvmeIdCtrl {uint8_t vwc;uint16_t awun;uint16_t awupf; -uint8_t rsvd703[174 ]; -uint8_t rsvd2047[1344 ]; +uint8_t nvscc;
include/block/nvme.h typedef struct NvmeIdCtrl { · line 655
Quoted 10 lines
include/block/nvme.h +7
-0+uint8_t rsvd531; +uint16_t acwu; +uint8_t rsvd534[2 ]; +uint32_t sgls; +uint8_t rsvd540[228 ]; +uint8_t subnqn[256 ]; +uint8_t rsvd1024[1024 ];NvmePSD psd[32 ];uint8_t vs[1024 ]; } NvmeIdCtrl;
I checked the diff versus V5, cross referenced the spec and it looks correct now, plus you documented even more fields which is welcome.
include/block/nvme.h enum NvmeIdCtrlOncs { · line 686
Quoted 13 lines
include/block/nvme.h +9
-0@@ -589,6 +675,16 @@ enum NvmeIdCtrlOncs {#define NVME_CTRL_CQES_MIN (cqes) ((cqes) & 0xf)#define NVME_CTRL_CQES_MAX (cqes) (((cqes) >> 4) & 0xf) +#define NVME_CTRL_SGLS_SUPPORTED_MASK (0x3 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_NO_ALIGNMENT (0x1 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_DWORD_ALIGNMENT (0x1 << 1) +#define NVME_CTRL_SGLS_KEYED (0x1 << 2) +#define NVME_CTRL_SGLS_BITBUCKET (0x1 << 16) +#define NVME_CTRL_SGLS_MPTR_CONTIGUOUS (0x1 << 17) +#define NVME_CTRL_SGLS_EXCESS_LENGTH (0x1 << 18) +#define NVME_CTRL_SGLS_MPTR_SGL (0x1 << 19) +#define NVME_CTRL_SGLS_ADDR_OFFSET (0x1 << 20)
OK
include/block/nvme.h typedef struct NvmeFeatureVal { · line 710
Quoted 9 lines
include/block/nvme.h +2
-0+ typedef struct NvmeFeatureVal { uint32_t arbitration; uint32_t power_mgmt;@@ -611,6 +707,10 @@ typedef struct NvmeFeatureVal {#define NVME_INTC_THR (intc) (intc & 0xff)#define NVME_INTC_TIME (intc) ((intc >> 8) & 0xff) +#define NVME_TEMP_THSEL (temp) ((temp >> 20) & 0x3)
Nitpick: If we are adding this, I'll add a #define for the values as well
Quoted 23 lines
include/block/nvme.h +9
-3+#define NVME_TEMP_TMPSEL (temp) ((temp >> 16) & 0xf) +#define NVME_TEMP_TMPTH (temp) ((temp >> 0) & 0xffff) +enum NvmeFeatureIds {NVME_ARBITRATION =0x1 ,NVME_POWER_MANAGEMENT =0x2 ,@@ -653,18 +753,37 @@ typedef struct NvmeIdNs {uint8_t mc;uint8_t dpc;uint8_t dps; -uint8_t nmic;uint8_t rescap;uint8_t fpi;uint8_t dlfeat; - -uint8_t res34[94 ]; +uint16_t nawun; +uint16_t nawupf; +uint16_t nacwu; +uint16_t nabsn; +uint16_t nabo; +uint16_t nabspf;
include/block/nvme.h typedef struct NvmeIdNs { · line 774
Quoted 10 lines
include/block/nvme.h +6
-1+uint16_t noiob; +uint8_t nvmcap[16 ]; +uint8_t rsvd64[40 ]; +uint8_t nguid[16 ]; +uint64_t eui64;NvmeLBAF lbaf[16 ]; -uint8_t res192[192 ]; +uint8_t rsvd192[192 ];uint8_t vs[3712 ]; } NvmeIdNs;
Also checked this against V5, looks OK now
include/block/nvme.h typedef struct NvmeIdNs { · line 780
Quoted 6 lines
include/block/nvme.h +5
-0+typedef struct NvmeIdNsDescr { +uint8_t nidt; +uint8_t nidl; +uint8_t rsvd2[2 ]; +}NvmeIdNsDescr ;
OK
include/block/nvme.h typedef struct NvmeIdNs { · line 785
Quoted 5 lines
include/block/nvme.h +5
-0+ +#define NVME_NIDT_UUID_LEN 16 + +enum { +NVME_NIDT_UUID =0x3 ,
Very minor nitpick: I'll would add others as well just for the sake of better understanding what this is
include/block/nvme.h typedef struct NvmeIdNs { · line 789
Quoted 4 lines
include/block/nvme.h +1
-0+};/*Deallocate Logical Block Features*/ #define NVME_ID_NS_DLFEAT_GUARD_CRC (dlfeat) ((dlfeat) & 0x10)
Looks very good.
Best regards,
Maxim Levitsky
Re: [PATCH v6 04/42] nvme: bump spec data structures to v1.3
Quoted 43 lines · Maxim Levitsky
Quoted 23 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add missing fields in the Identify Controller and Identify Namespace data structures to bring them in line with NVMe v1.3.
This also adds data structures and defines for SGL support which requires a couple of trivial changes to the nvme block driver as well.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Fam Zheng <[email protected]>--- block/nvme.c | 18 ++--- hw/block/nvme.c | 12 ++-- include/block/nvme.h | 153 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 151 insertions(+), 32 deletions(-)block/nvme.c +0
-0@@ -589,6 +675,16 @@ enum NvmeIdCtrlOncs {#define NVME_CTRL_CQES_MIN (cqes) ((cqes) & 0xf)#define NVME_CTRL_CQES_MAX (cqes) (((cqes) >> 4) & 0xf)block/nvme.c enum NvmeIdCtrlOncs { · line 686
Quoted 10 lines
block/nvme.c +9
-0+#define NVME_CTRL_SGLS_SUPPORTED_MASK (0x3 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_NO_ALIGNMENT (0x1 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_DWORD_ALIGNMENT (0x1 << 1) +#define NVME_CTRL_SGLS_KEYED (0x1 << 2) +#define NVME_CTRL_SGLS_BITBUCKET (0x1 << 16) +#define NVME_CTRL_SGLS_MPTR_CONTIGUOUS (0x1 << 17) +#define NVME_CTRL_SGLS_EXCESS_LENGTH (0x1 << 18) +#define NVME_CTRL_SGLS_MPTR_SGL (0x1 << 19) +#define NVME_CTRL_SGLS_ADDR_OFFSET (0x1 << 20)OK
Quoted 8 lines
block/nvme.c +1
-0+ typedef struct NvmeFeatureVal { uint32_t arbitration; uint32_t power_mgmt;@@ -611,6 +707,10 @@ typedef struct NvmeFeatureVal {#define NVME_INTC_THR (intc) (intc & 0xff)#define NVME_INTC_TIME (intc) ((intc >> 8) & 0xff)
Quoted 3 lines
block/nvme.c typedef struct NvmeFeatureVal { · line 710
Quoted 1 line
block/nvme.c +1
-0+#define NVME_TEMP_THSEL (temp) ((temp >> 20) & 0x3)Nitpick: If we are adding this, I'll add a #define for the values as well
Done. And used in the subsequent "nvme: add temperature threshold feature" patch.
Quoted 45 lines
Quoted 23 lines
block/nvme.c +9
-3+#define NVME_TEMP_TMPSEL (temp) ((temp >> 16) & 0xf) +#define NVME_TEMP_TMPTH (temp) ((temp >> 0) & 0xffff) +enum NvmeFeatureIds {NVME_ARBITRATION =0x1 ,NVME_POWER_MANAGEMENT =0x2 ,@@ -653,18 +753,37 @@ typedef struct NvmeIdNs {uint8_t mc;uint8_t dpc;uint8_t dps; -uint8_t nmic;uint8_t rescap;uint8_t fpi;uint8_t dlfeat; - -uint8_t res34[94 ]; +uint16_t nawun; +uint16_t nawupf; +uint16_t nacwu; +uint16_t nabsn; +uint16_t nabo; +uint16_t nabspf;block/nvme.c typedef struct NvmeIdNs { · line 774
Quoted 10 lines
block/nvme.c +6
-1+uint16_t noiob; +uint8_t nvmcap[16 ]; +uint8_t rsvd64[40 ]; +uint8_t nguid[16 ]; +uint64_t eui64;NvmeLBAF lbaf[16 ]; -uint8_t res192[192 ]; +uint8_t rsvd192[192 ];uint8_t vs[3712 ]; } NvmeIdNs;Also checked this against V5, looks OK now
block/nvme.c typedef struct NvmeIdNs { · line 779
Quoted 6 lines
block/nvme.c +5
-0+typedef struct NvmeIdNsDescr { +uint8_t nidt; +uint8_t nidl; +uint8_t rsvd2[2 ]; +}NvmeIdNsDescr ;OK
Quoted 8 lines
block/nvme.c typedef struct NvmeIdNs { · line 784
Quoted 5 lines
block/nvme.c +5
-0+ +#define NVME_NIDT_UUID_LEN 16 + +enum { +NVME_NIDT_UUID =0x3 ,Very minor nitpick: I'll would add others as well just for the sake of better understanding what this is
Done.
Quoted 12 lines
block/nvme.c typedef struct NvmeIdNs { · line 788
Quoted 4 lines
block/nvme.c +1
-0+};/*Deallocate Logical Block Features*/ #define NVME_ID_NS_DLFEAT_GUARD_CRC (dlfeat) ((dlfeat) & 0x10)Looks very good.
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
Re: [PATCH v6 04/42] nvme: bump spec data structures to v1.3
Quoted 45 lines · Klaus Birkelund Jensen
Quoted 44 lines · Maxim Levitsky
Quoted 23 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add missing fields in the Identify Controller and Identify Namespace data structures to bring them in line with NVMe v1.3.
This also adds data structures and defines for SGL support which requires a couple of trivial changes to the nvme block driver as well.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Fam Zheng <[email protected]>--- block/nvme.c | 18 ++--- hw/block/nvme.c | 12 ++-- include/block/nvme.h | 153 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 151 insertions(+), 32 deletions(-)block/nvme.c +0
-0@@ -589,6 +675,16 @@ enum NvmeIdCtrlOncs {#define NVME_CTRL_CQES_MIN (cqes) ((cqes) & 0xf)#define NVME_CTRL_CQES_MAX (cqes) (((cqes) >> 4) & 0xf)block/nvme.c enum NvmeIdCtrlOncs { · line 686
Quoted 10 lines
block/nvme.c +9
-0+#define NVME_CTRL_SGLS_SUPPORTED_MASK (0x3 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_NO_ALIGNMENT (0x1 << 0) +#define NVME_CTRL_SGLS_SUPPORTED_DWORD_ALIGNMENT (0x1 << 1) +#define NVME_CTRL_SGLS_KEYED (0x1 << 2) +#define NVME_CTRL_SGLS_BITBUCKET (0x1 << 16) +#define NVME_CTRL_SGLS_MPTR_CONTIGUOUS (0x1 << 17) +#define NVME_CTRL_SGLS_EXCESS_LENGTH (0x1 << 18) +#define NVME_CTRL_SGLS_MPTR_SGL (0x1 << 19) +#define NVME_CTRL_SGLS_ADDR_OFFSET (0x1 << 20)OK
Quoted 8 lines
block/nvme.c +1
-0+ typedef struct NvmeFeatureVal { uint32_t arbitration; uint32_t power_mgmt;@@ -611,6 +707,10 @@ typedef struct NvmeFeatureVal {#define NVME_INTC_THR (intc) (intc & 0xff)#define NVME_INTC_TIME (intc) ((intc >> 8) & 0xff)
Quoted 7 lines
Quoted 4 lines
block/nvme.c typedef struct NvmeFeatureVal { · line 710
Quoted 1 line
block/nvme.c +1
-0+#define NVME_TEMP_THSEL (temp) ((temp >> 20) & 0x3)Nitpick: If we are adding this, I'll add a #define for the values as well
Done. And used in the subsequent "nvme: add temperature threshold feature" patch.
Thank you!
Quoted 58 lines
Quoted 48 lines
Quoted 24 lines
block/nvme.c +9
-3+#define NVME_TEMP_TMPSEL (temp) ((temp >> 16) & 0xf) +#define NVME_TEMP_TMPTH (temp) ((temp >> 0) & 0xffff) +enum NvmeFeatureIds {NVME_ARBITRATION =0x1 ,NVME_POWER_MANAGEMENT =0x2 ,@@ -653,18 +753,37 @@ typedef struct NvmeIdNs {uint8_t mc;uint8_t dpc;uint8_t dps; -uint8_t nmic;uint8_t rescap;uint8_t fpi;uint8_t dlfeat; - -uint8_t res34[94 ]; +uint16_t nawun; +uint16_t nawupf; +uint16_t nacwu; +uint16_t nabsn; +uint16_t nabo; +uint16_t nabspf;block/nvme.c typedef struct NvmeIdNs { · line 774
Quoted 10 lines
block/nvme.c +6
-1+uint16_t noiob; +uint8_t nvmcap[16 ]; +uint8_t rsvd64[40 ]; +uint8_t nguid[16 ]; +uint64_t eui64;NvmeLBAF lbaf[16 ]; -uint8_t res192[192 ]; +uint8_t rsvd192[192 ];uint8_t vs[3712 ]; } NvmeIdNs;Also checked this against V5, looks OK now
block/nvme.c typedef struct NvmeIdNs { · line 779
Quoted 6 lines
block/nvme.c +5
-0+typedef struct NvmeIdNsDescr { +uint8_t nidt; +uint8_t nidl; +uint8_t rsvd2[2 ]; +}NvmeIdNsDescr ;OK
Quoted 9 lines
block/nvme.c typedef struct NvmeIdNs { · line 784
Quoted 5 lines
block/nvme.c +5
-0+ +#define NVME_NIDT_UUID_LEN 16 + +enum { +NVME_NIDT_UUID =0x3 ,Very minor nitpick: I'll would add others as well just for the sake of better understanding what this is
Quoted 1 line
Done.
Thanks!
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
block/nvme.c +1
-0+};/*Deallocate Logical Block Features*/ #define NVME_ID_NS_DLFEAT_GUARD_CRC (dlfeat) ((dlfeat) & 0x10)
Quoted 9 lines
Quoted 7 lines
Looks very good.
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
Best regards,
Maxim Levitsky
PATCH v6 5/42 nvme: use constant for identify data size
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/block/nvme.c +1 -1
@@ -679,7 +679,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);
Signature · 1 line
2.25.1
Re: [PATCH v6 05/42] nvme: use constant for identify data size
Quoted 12 lines · Klaus Jensen
From: Klaus Jensen <[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_identify_ns(NvmeCtrl *n, NvmeIdentify *c) · line 685
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -679,7 +679,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);
I'll probably squash this with some other refactoring patch, but I absolutely don't mind leaving this as is. Fine grained patches never cause any harm.
Best regards,
Maxim Levitsky
Re: [PATCH v6 05/42] nvme: use constant for identify data size
Quoted 14 lines · Maxim Levitsky
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[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@@ -679,7 +679,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c)
Quoted 12 lines
hw/block/nvme.c static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) · line 685
Quoted 7 lines
hw/block/nvme.c +1
-1static 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);I'll probably squash this with some other refactoring patch, but I absolutely don't mind leaving this as is. Fine grained patches never cause any harm.
Squashed into 06/42.
Quoted 8 lines
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
PATCH v6 6/42 nvme: add identify cns values in header
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/block/nvme.c +3 -3
@@ -709,11 +709,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_nvme_dev_err_invalid_identify_cns (le32_to_cpu (c->cns));
Signature · 1 line
2.25.1
Re: [PATCH v6 06/42] nvme: add identify cns values in header
Quoted 16 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/block/nvme.c +0
-1@@ -709,11 +709,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd)NvmeIdentify *c = (NvmeIdentify *)cmd;switch (le32_to_cpu (c->cns)) { -case 0x00 :
hw/block/nvme.c static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) · line 719
Quoted 10 lines
hw/block/nvme.c +3
-2+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_nvme_dev_err_invalid_identify_cns (le32_to_cpu (c->cns));
This is a very good candidate to be squished with the patch 5 IMHO, but you can leave this as is as well. I don't mind.
Best regards,
Maxim Levitsky
Re: [PATCH v6 06/42] nvme: add identify cns values in header
Quoted 15 lines · Maxim Levitsky
Quoted 14 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)hw/block/nvme.c +0
-0@@ -709,11 +709,11 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd)NvmeIdentify *c = (NvmeIdentify *)cmd;
Quoted 16 lines
hw/block/nvme.c static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) · line 719
Quoted 12 lines
hw/block/nvme.c +3
-3switch (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_nvme_dev_err_invalid_identify_cns (le32_to_cpu (c->cns));This is a very good candidate to be squished with the patch 5 IMHO, but you can leave this as is as well. I don't mind.
Squashed!
Quoted 10 lines
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
PATCH v6 7/42 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
@@ -52,14 +52,22 @@static void nvme_process_sq (void *opaque); +static inline 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.25.1
Re: [PATCH v6 07/42] nvme: refactor nvme_addr_read
Quoted 32 lines · Klaus Jensen
From: 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.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/block/nvme.c +9
-2@@ -52,14 +52,22 @@static void nvme_process_sq (void *opaque); +static inline 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)) {
hw/block/nvme.c line 73
Quoted 10 lines
hw/block/nvme.c +3
-2memcpy (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)
Note that this patch still contains a bug that it removes the check against the accessed size, which you fix in later patch.
I prefer to not add a bug in first place
However if you have a reason for this, I won't mind.
Best regards,
Maxim Levitsky
Re: [PATCH v6 07/42] nvme: refactor nvme_addr_read
Quoted 42 lines · Maxim Levitsky
Quoted 41 lines · Klaus Jensen
From: 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.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/block/nvme.c +12
-4@@ -52,14 +52,22 @@static void nvme_process_sq (void *opaque); +static inline 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); }
Quoted 7 lines
hw/block/nvme.c line 73
Quoted 1 line
hw/block/nvme.c +0
-0static int nvme_check_sqid (NvmeCtrl *n,uint16_t sqid)Note that this patch still contains a bug that it removes the check against the accessed size, which you fix in later patch.
I prefer to not add a bug in first place
However if you have a reason for this, I won't mind.
So yeah. The resons is that there is actually no bug at this point because the controller only supports PRPs. I actually thought there was a bug as well and reported it to qemu-security some months ago as a potential out of bounds access. I was then schooled by Keith on how PRPs work ;) Below is a paraphrased version of Keiths analysis.
The PRPs does not cross page boundaries:
trans_len = n->page_size - (prp1 % n->page_size);
The PRPs are always verified to be page aligned:
if (unlikely(!prp_ent || prp_ent & (n->page_size - 1))) {and the transfer length wont go above page size. So, since the beginning of the address is within the CMB and considering that the CMB is of an MB aligned and sized granularity, then we can never cross outside it with PRPs.
I could add the check at this point (because it *is* needed for when SGLs are introduced), but I think it would just be noise and I would need to explain why the check is there, but not really needed at this point. Instead I'm adding a new patch before the SGL patch that explains this.
Re: [PATCH v6 07/42] nvme: refactor nvme_addr_read
Quoted 51 lines · Klaus Birkelund Jensen
Quoted 42 lines · Maxim Levitsky
Quoted 41 lines · Klaus Jensen
From: 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.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)hw/block/nvme.c +12
-4@@ -52,14 +52,22 @@static void nvme_process_sq (void *opaque); +static inline 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); }Quoted 7 lines
hw/block/nvme.c line 73
Quoted 1 line
hw/block/nvme.c +0
-0static int nvme_check_sqid (NvmeCtrl *n,uint16_t sqid)Note that this patch still contains a bug that it removes the check against the accessed size, which you fix in later patch.
I prefer to not add a bug in first place
However if you have a reason for this, I won't mind.
Quoted 7 lines
So yeah. The resons is that there is actually no bug at this point because the controller only supports PRPs. I actually thought there was a bug as well and reported it to qemu-security some months ago as a potential out of bounds access. I was then schooled by Keith on how PRPs work ;) Below is a paraphrased version of Keiths analysis.
The PRPs does not cross page boundaries:
True
Quoted 4 lines
trans_len = n->page_size - (prp1 % n->page_size);The PRPs are always verified to be page aligned:
True
Quoted 7 lines
if (unlikely(!prp_ent || prp_ent & (n->page_size - 1))) {and the transfer length wont go above page size. So, since the beginning of the address is within the CMB and considering that the CMB is of an MB aligned and sized granularity, then we can never cross outside it with PRPs.
I understand now, however the reason I am arguing about this is that this patch actually _removes_ the size bound check
It was before the patch:
n->cmbsz && addr >= n->ctrl_mem.addr &&
addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size)
Quoted 6 lines
I could add the check at this point (because it *is* needed for when SGLs are introduced), but I think it would just be noise and I would need to explain why the check is there, but not really needed at this point. Instead I'm adding a new patch before the SGL patch that explains this.
Best regards,
Maxim Levitsky
Re: [PATCH v6 07/42] nvme: refactor nvme_addr_read
Quoted 29 lines · Maxim Levitsky
Quoted 7 lines · Klaus Birkelund Jensen
Quoted 5 lines · Maxim Levitsky
Note that this patch still contains a bug that it removes the check against the accessed size, which you fix in later patch.
I prefer to not add a bug in first place
However if you have a reason for this, I won't mind.Quoted 7 lines
So yeah. The resons is that there is actually no bug at this point because the controller only supports PRPs. I actually thought there was a bug as well and reported it to qemu-security some months ago as a potential out of bounds access. I was then schooled by Keith on how PRPs work ;) Below is a paraphrased version of Keiths analysis.
The PRPs does not cross page boundaries:
True
Quoted 4 lines
trans_len = n->page_size - (prp1 % n->page_size);The PRPs are always verified to be page aligned:
True
Quoted 7 lines
if (unlikely(!prp_ent || prp_ent & (n->page_size - 1))) {and the transfer length wont go above page size. So, since the beginning of the address is within the CMB and considering that the CMB is of an MB aligned and sized granularity, then we can never cross outside it with PRPs.
Quoted 8 lines
I understand now, however the reason I am arguing about this is that this patch actually _removes_ the size bound check
It was before the patch:
n->cmbsz&& addr >=n->ctrl_mem.addr&&addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size)
I don't think it does - the check is just moved to nvme_addr_is_cmb:
static inline 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;
}We check that addr is less than hi. Maybe the name is unfortunate...
Re: [PATCH v6 07/42] nvme: refactor nvme_addr_read
Quoted 52 lines · Klaus Birkelund Jensen
Quoted 32 lines · Maxim Levitsky
Quoted 7 lines · Klaus Birkelund Jensen
Quoted 5 lines · Maxim Levitsky
Note that this patch still contains a bug that it removes the check against the accessed size, which you fix in later patch.
I prefer to not add a bug in first place
However if you have a reason for this, I won't mind.Quoted 7 lines
So yeah. The resons is that there is actually no bug at this point because the controller only supports PRPs. I actually thought there was a bug as well and reported it to qemu-security some months ago as a potential out of bounds access. I was then schooled by Keith on how PRPs work ;) Below is a paraphrased version of Keiths analysis.
The PRPs does not cross page boundaries:
True
Quoted 4 lines
trans_len = n->page_size - (prp1 % n->page_size);The PRPs are always verified to be page aligned:
True
Quoted 7 lines
if (unlikely(!prp_ent || prp_ent & (n->page_size - 1))) {and the transfer length wont go above page size. So, since the beginning of the address is within the CMB and considering that the CMB is of an MB aligned and sized granularity, then we can never cross outside it with PRPs.
Quoted 8 lines
I understand now, however the reason I am arguing about this is that this patch actually _removes_ the size bound check
It was before the patch:
n->cmbsz&& addr >=n->ctrl_mem.addr&&addr < (n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size)I don't think it does - the check is just moved to
nvme_addr_is_cmb:static inline 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; }
Quoted 3 lines
We check that
addris less thanhi. Maybe the name is unfortunate...
Oh, I am just blind! sorry about that.
You are 100% right.
Best regards,
Maxim Levitsky
PATCH v6 8/42 nvme: add support for the abort command
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.1 ("Abort command").
The Abort command is a best effort command; for now, the device always fails to abort the given command.
--- hw/block/nvme.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
hw/block/nvme.c +27 -0
@@ -729,6 +729,18 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) } } +static uint16_t nvme_abort (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +uint16_t sqid =le32_to_cpu (cmd->cdw10) &0xffff ; + + req->cqe.result =1 ; +if (nvme_check_sqid (n, sqid)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +return NVME_SUCCESS ; +} +static inline void nvme_set_timestamp (NvmeCtrl *n,uint64_t ts) {trace_nvme_dev_setfeat_timestamp (ts);
@@ -863,6 +875,8 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return nvme_create_cq (n, cmd);case NVME_ADM_CMD_IDENTIFY :return nvme_identify (n, cmd); +case NVME_ADM_CMD_ABORT : +return nvme_abort (n, cmd, req);case NVME_ADM_CMD_SET_FEATURES :return nvme_set_feature (n, cmd, req);case NVME_ADM_CMD_GET_FEATURES :
@@ -1375,6 +1389,19 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) id->ieee[1 ] =0x02 ; id->ieee[2 ] =0xb3 ; id->oacs =cpu_to_le16 (0 ); + +/* +* Because the controller always completes the Abort command immediately, +* there can never be more than one concurrently executing Abort command, +* so this value is never used for anything. Note that there can easily be +* many Abort commands in the queues, but they are not considered +* "executing" until processed by nvme_abort. +* +* The specification recommends a value of 3 for Abort Command Limit (four +* concurrently outstanding Abort commands), so lets use that though it is +* inconsequential. +*/ + id->acl =3 ; id->frmw =7 <<1 ; id->lpa =1 <<0 ; id->sqes = (0x6 <<4 ) |0x6 ;
Signature · 1 line
2.25.1
Re: [PATCH v6 08/42] nvme: add support for the abort command
Quoted 56 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.1 ("Abort command").
The Abort command is a best effort command; for now, the device always fails to abort the given command.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)hw/block/nvme.c +20
-0@@ -729,6 +729,18 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd) } } +static uint16_t nvme_abort (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +uint16_t sqid =le32_to_cpu (cmd->cdw10) &0xffff ; + + req->cqe.result =1 ; +if (nvme_check_sqid (n, sqid)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +return NVME_SUCCESS ; +} +static inline void nvme_set_timestamp (NvmeCtrl *n,uint64_t ts) {trace_nvme_dev_setfeat_timestamp (ts);@@ -863,6 +875,8 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return nvme_create_cq (n, cmd);case NVME_ADM_CMD_IDENTIFY :return nvme_identify (n, cmd); +case NVME_ADM_CMD_ABORT : +return nvme_abort (n, cmd, req);case NVME_ADM_CMD_SET_FEATURES :return nvme_set_feature (n, cmd, req);case NVME_ADM_CMD_GET_FEATURES :@@ -1375,6 +1389,19 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) id->ieee[1 ] =0x02 ; id->ieee[2 ] =0xb3 ; id->oacs =cpu_to_le16 (0 ); + +/* +* Because the controller always completes the Abort command immediately, +* there can never be more than one concurrently executing Abort command, +* so this value is never used for anything. Note that there can easily be +* many Abort commands in the queues, but they are not considered
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1407
Quoted 10 lines
hw/block/nvme.c +7
-0+* "executing" until processed by nvme_abort. +* +* The specification recommends a value of 3 for Abort Command Limit (four +* concurrently outstanding Abort commands), so lets use that though it is +* inconsequential. +*/ + id->acl =3 ; id->frmw =7 <<1 ; id->lpa =1 <<0 ; id->sqes = (0x6 <<4 ) |0x6 ;
You forgot to move my reviewed-by from the previous version I see that you also fixed the white space problem, thanks! So,
Best regards,
Maxim Levitsky
PATCH v6 9/42 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 | 45 ++++++++++++++++++++++++++------------------- hw/block/nvme.h | 4 +++- 2 files changed, 29 insertions(+), 20 deletions(-)
hw/block/nvme.c +26 -19
@@ -19,7 +19,7 @@* -drive file=<file>,if=none,id=<drive_id> * -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \ * cmb_size_mb=<cmb_size_mb[optional]>, \ -* 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.
@@ -27,6 +27,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"
@@ -72,12 +73,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)
@@ -639,7 +640,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_nvme_dev_err_invalid_create_cq_addr (prp1);return NVME_INVALID_FIELD |NVME_DNR ; } -if (unlikely (vector > n->params.num_queues)) { +if (unlikely (vector > n->params.max_ioqpairs +1 )) {trace_nvme_dev_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }
@@ -803,8 +804,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_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_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP :
@@ -848,10 +849,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_NUMBER_OF_QUEUES :trace_nvme_dev_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);
@@ -924,12 +925,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); }
@@ -1332,9 +1333,15 @@ 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" ); -return ; +if (n->params.num_queues) { +warn_report ("nvme: num_queues is deprecated; please use max_ioqpairs " +"instead" ); + + n->params.max_ioqpairs = n->params.num_queues -1 ; + } + +if (!n->params.max_ioqpairs) { +error_setg (errp,"max_ioqpairs can't be less than 1" ); }if (!n->conf.blk) {
@@ -1365,19 +1372,19 @@ 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->params.num_queues +1 ) *4 ); + n->reg_size =pow2ceil (0x1008 +2 * (n->params.max_ioqpairs) *4 ); 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 ));
hw/block/nvme.h +3 -1
@@ -6,11 +6,13 @@#define DEFINE_NVME_PROPERTIES (_state, _props) \ DEFINE_PROP_STRING("serial", _state, _props.serial), \ DEFINE_PROP_UINT32("cmb_size_mb", _state, _props.cmb_size_mb, 0), \ - DEFINE_PROP_UINT32("num_queues", _state, _props.num_queues, 64) + DEFINE_PROP_UINT32("num_queues", _state, _props.num_queues, 0), \ + DEFINE_PROP_UINT32("max_ioqpairs", _state, _props.max_ioqpairs, 64)typedef struct NvmeParams {char *serial;uint32_t num_queues; +uint32_t max_ioqpairs;uint32_t cmb_size_mb; }NvmeParams ;
Signature · 1 line
2.25.1
Re: [PATCH v6 09/42] nvme: add max_ioqpairs device parameter
Quoted 108 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
The
num_queuesdevice 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_ioqpairsparameter that only accounts for I/O queue pairs, but keepnum_queuesfor compatibility.Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 45 ++++++++++++++++++++++++++------------------- hw/block/nvme.h | 4 +++- 2 files changed, 29 insertions(+), 20 deletions(-)hw/block/nvme.c +13
-15@@ -19,7 +19,7 @@* -drive file=<file>,if=none,id=<drive_id> * -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \ * cmb_size_mb=<cmb_size_mb[optional]>, \ -* 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. @@ -27,6 +27,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" @@ -72,12 +73,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)@@ -639,7 +640,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)trace_nvme_dev_err_invalid_create_cq_addr (prp1);return NVME_INVALID_FIELD |NVME_DNR ; } -if (unlikely (vector > n->params.num_queues)) { +if (unlikely (vector > n->params.max_ioqpairs +1 )) {trace_nvme_dev_err_invalid_create_cq_vector (vector);return NVME_INVALID_IRQ_VECTOR |NVME_DNR ; }@@ -803,8 +804,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_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_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP :@@ -848,10 +849,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_NUMBER_OF_QUEUES :trace_nvme_dev_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);@@ -924,12 +925,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); }@@ -1332,9 +1333,15 @@ 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" ); -return ;
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1345
Quoted 10 lines
hw/block/nvme.c +9
-0+if (n->params.num_queues) { +warn_report ("nvme: num_queues is deprecated; please use max_ioqpairs " +"instead" ); + + n->params.max_ioqpairs = n->params.num_queues -1 ; + } + +if (!n->params.max_ioqpairs) { +error_setg (errp,"max_ioqpairs can't be less than 1" ); }
This is not even a nitpick, but just and idea.
It might be worth it to allow max_ioqpairs=0 to simulate a 'broken'
nvme controller. I know that kernel has special handling for such controllers, which include only creation of the control character device (/dev/nvme*) through which the user can submit commands to try and 'fix' the controller (by re-uploading firmware maybe or something like that).
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1375
Quoted 8 lines
hw/block/nvme.c +1
-1if (!n->conf.blk) {@@ -1365,19 +1372,19 @@ 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->params.num_queues +1 ) *4 ); + n->reg_size =pow2ceil (0x1008 +2 * (n->params.max_ioqpairs) *4 );
I hate to say it, but it looks like this thing (which I mentioned to you in V5) was pre-existing bug, which is indeed fixed now.
In theory such fixes should go to separate patches, but in this case, I guess it would be too much to ask for it.
Maybe mention this in the commit message instead, so that this fix doesn't stay hidden like that?
Quoted 27 lines
hw/block/nvme.c +3
-3n->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 ));hw/block/nvme.h +0
-1@@ -6,11 +6,13 @@#define DEFINE_NVME_PROPERTIES (_state, _props) \ DEFINE_PROP_STRING("serial", _state, _props.serial), \ DEFINE_PROP_UINT32("cmb_size_mb", _state, _props.cmb_size_mb, 0), \ - DEFINE_PROP_UINT32("num_queues", _state, _props.num_queues, 64)
hw/block/nvme.h line 18
Quoted 10 lines
hw/block/nvme.h +3
-0+DEFINE_PROP_UINT32 ("num_queues" , _state, _props.num_queues,0 ), \ + DEFINE_PROP_UINT32("max_ioqpairs", _state, _props.max_ioqpairs, 64)typedef struct NvmeParams {char *serial;uint32_t num_queues; +uint32_t max_ioqpairs;uint32_t cmb_size_mb; }NvmeParams ;
Best regards,
Maxim Levitsky
Re: [PATCH v6 09/42] nvme: add max_ioqpairs device parameter
Quoted 39 lines · Maxim Levitsky
Quoted 26 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
The
num_queuesdevice 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_ioqpairsparameter that only accounts for I/O queue pairs, but keepnum_queuesfor compatibility.Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 45 ++++++++++++++++++++++++++------------------- hw/block/nvme.h | 4 +++- 2 files changed, 29 insertions(+), 20 deletions(-)hw/block/nvme.c +0
-3@@ -1332,9 +1333,15 @@ 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" ); -return ;hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1345
Quoted 10 lines
hw/block/nvme.c +9
-0+if (n->params.num_queues) { +warn_report ("nvme: num_queues is deprecated; please use max_ioqpairs " +"instead" ); + + n->params.max_ioqpairs = n->params.num_queues -1 ; + } + +if (!n->params.max_ioqpairs) { +error_setg (errp,"max_ioqpairs can't be less than 1" ); }This is not even a nitpick, but just and idea.
Quoted 7 lines
It might be worth it to allow max_ioqpairs=0 to simulate a 'broken'
nvme controller. I know that kernel has special handling for such controllers, which include only creation of the control character device (/dev/nvme*) through which the user can submit commands to try and 'fix' the controller (by re-uploading firmware maybe or something like that).
Not sure about the implications of this, so I'll leave that on the TODO :) But a controller with no I/O queues is an "Administrative Controller" and perfectly legal in NVMe v1.4 AFAIK.
Quoted 5 lines
Quoted 5 lines
hw/block/nvme.c +0
-0if (!n->conf.blk) {@@ -1365,19 +1372,19 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)pcie_endpoint_cap_init (pci_dev,0x80 );
Quoted 11 lines
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1375
Quoted 3 lines
hw/block/nvme.c +1
-1n->num_namespaces =1 ; - n->reg_size =pow2ceil (0x1004 +2 * (n->params.num_queues +1 ) *4 ); + n->reg_size =pow2ceil (0x1008 +2 * (n->params.max_ioqpairs) *4 );I hate to say it, but it looks like this thing (which I mentioned to you in V5) was pre-existing bug, which is indeed fixed now.
In theory such fixes should go to separate patches, but in this case, I guess it would be too much to ask for it.
Maybe mention this in the commit message instead, so that this fix doesn't stay hidden like that?
I'm convinced now. I have added a preparatory bugfix patch before this patch.
Quoted 6 lines
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
Re: [PATCH v6 09/42] nvme: add max_ioqpairs device parameter
Quoted 49 lines · Klaus Birkelund Jensen
Quoted 40 lines · Maxim Levitsky
Quoted 26 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
The
num_queuesdevice 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_ioqpairsparameter that only accounts for I/O queue pairs, but keepnum_queuesfor compatibility.Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 45 ++++++++++++++++++++++++++------------------- hw/block/nvme.h | 4 +++- 2 files changed, 29 insertions(+), 20 deletions(-)hw/block/nvme.c +0
-3@@ -1332,9 +1333,15 @@ 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" ); -return ;hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1345
Quoted 10 lines
hw/block/nvme.c +9
-0+if (n->params.num_queues) { +warn_report ("nvme: num_queues is deprecated; please use max_ioqpairs " +"instead" ); + + n->params.max_ioqpairs = n->params.num_queues -1 ; + } + +if (!n->params.max_ioqpairs) { +error_setg (errp,"max_ioqpairs can't be less than 1" ); }This is not even a nitpick, but just and idea.
Quoted 7 lines
It might be worth it to allow max_ioqpairs=0 to simulate a 'broken'
nvme controller. I know that kernel has special handling for such controllers, which include only creation of the control character device (/dev/nvme*) through which the user can submit commands to try and 'fix' the controller (by re-uploading firmware maybe or something like that).
Quoted 3 lines
Not sure about the implications of this, so I'll leave that on the TODO :) But a controller with no I/O queues is an "Administrative Controller" and perfectly legal in NVMe v1.4 AFAIK.
That what I was thinking as well. Keeping this on a TODO list is perfectly fine.
Quoted 18 lines
Quoted 6 lines
Quoted 6 lines
hw/block/nvme.c +0
-0if (!n->conf.blk) {@@ -1365,19 +1372,19 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)pcie_endpoint_cap_init (pci_dev,0x80 );Quoted 11 lines
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1375
Quoted 3 lines
hw/block/nvme.c +1
-1n->num_namespaces =1 ; - n->reg_size =pow2ceil (0x1004 +2 * (n->params.num_queues +1 ) *4 ); + n->reg_size =pow2ceil (0x1008 +2 * (n->params.max_ioqpairs) *4 );I hate to say it, but it looks like this thing (which I mentioned to you in V5) was pre-existing bug, which is indeed fixed now.
In theory such fixes should go to separate patches, but in this case, I guess it would be too much to ask for it.
Maybe mention this in the commit message instead, so that this fix doesn't stay hidden like that?
Quoted 2 lines
I'm convinced now. I have added a preparatory bugfix patch before this patch.
Thanks a lot!.
Sorry for not noticing it before.
Quoted 7 lines
Quoted 7 lines
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
Best regards,
Maxim Levitsky
Quoted 2 lines
PATCH v6 10/42 nvme: refactor device realization
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
This patch splits up nvme_realize into multiple individual functions, each initializing a different subset of the device.
--- hw/block/nvme.c | 178 ++++++++++++++++++++++++++++++------------------ hw/block/nvme.h | 23 ++++++- 2 files changed, 134 insertions(+), 67 deletions(-)
hw/block/nvme.c +113 -65
@@ -44,6 +44,8 @@#include "trace.h" #include "nvme.h" +#define NVME_CMB_BIR 2 +#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \ (trace_##trace)(__VA_ARGS__); \
@@ -63,7 +65,7 @@ static inline 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 ; }
@@ -157,7 +159,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (unlikely (!prp1)) {trace_nvme_dev_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);
@@ -1324,14 +1326,9 @@ static const MemoryRegionOps nvme_cmb_ops = { }, }; -static void nvme_realize (PCIDevice *pci_dev,Error **errp) +static int nvme_check_constraints (NvmeCtrl *n,Error **errp) { -NvmeCtrl *n =NVME (pci_dev); -NvmeIdCtrl *id = &n->id_ctrl; - -int i; -int64_t bs_size; -uint8_t *pci_conf; +NvmeParams *params = &n->params;if (n->params.num_queues) { warn_report("nvme: num_queues is deprecated; please use max_ioqpairs "
@@ -1340,57 +1337,100 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->params.max_ioqpairs = n->params.num_queues -1 ; } -if (!n->params.max_ioqpairs) { -error_setg (errp,"max_ioqpairs can't be less than 1" ); +if (params->max_ioqpairs <1 || + params->max_ioqpairs >PCI_MSIX_FLAGS_QSIZE ) { +error_setg (errp,"nvme: max_ioqpairs must be " ); +return -1 ; }if (!n->conf.blk) { -error_setg (errp,"drive property not set" ); -return ; +error_setg (errp,"nvme: block backend not configured" ); +return -1 ; } - bs_size =blk_getlength (n->conf.blk); -if (bs_size <0 ) { -error_setg (errp,"could not get backing file size" ); -return ; +if (!params->serial) { +error_setg (errp,"nvme: serial not configured" ); +return -1 ; } -if (!n->params.serial) { -error_setg (errp,"serial property not set" ); -return ; - } +return 0 ; +} + +static int nvme_init_blk (NvmeCtrl *n,Error **errp) +{blkconf_blocksizes (&n->conf);if (!blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), false, errp)) { -return ; +return -1 ; } - 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 ); +return 0 ; +} +static void nvme_init_state (NvmeCtrl *n) +{ n->num_namespaces =1 ; n->reg_size =pow2ceil (0x1008 +2 * (n->params.max_ioqpairs) *4 ); - 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 , -PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , - &n->iomem); +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 ); +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; + + pci_conf[PCI_INTERRUPT_PIN ] =1 ; +pci_config_set_prog_interface (pci_conf,0x2 ); +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5845 ); +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 ); +if (n->params.cmb_size_mb) { +nvme_init_cmb (n, pci_dev); + } +} + +static void nvme_init_ctrl (NvmeCtrl *n) +{ +NvmeIdCtrl *id = &n->id_ctrl; +NvmeParams *params = &n->params; +uint8_t *pci_conf = n->parent_obj.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" ,' ' );strpadcpy ((char *)id->fr,sizeof (id->fr),"1.0" ,' ' ); -strpadcpy ((char *)id->sn,sizeof (id->sn), n->params.serial,' ' ); +strpadcpy ((char *)id->sn,sizeof (id->sn), params->serial,' ' ); id->rab =6 ; id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ;
@@ -1431,46 +1471,54 @@ 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) { +static int nvme_init_namespace (NvmeCtrl *n,NvmeNamespace *ns,Error **errp) +{ +int64_t bs_size; +NvmeIdNs *id_ns = &ns->id_ns; -NVME_CMBLOC_SET_BIR (n->bar.cmbloc,2 ); -NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 ); + bs_size =blk_getlength (n->conf.blk); +if (bs_size <0 ) { +error_setg_errno (errp, -bs_size,"blk_getlength" ); +return -1 ; + } -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); + id_ns->lbaf[0 ].ds =BDRV_SECTOR_BITS ; + n->ns_size = bs_size; - n->cmbloc = n->bar.cmbloc; - n->cmbsz = n->bar.cmbsz; + id_ns->nsze =cpu_to_le64 (nvme_ns_nlbas (n, ns)); - 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); +/* no thin provisioning */ + id_ns->ncap = id_ns->nsze; + id_ns->nuse = id_ns->ncap; +return 0 ; +} + +static void nvme_realize (PCIDevice *pci_dev,Error **errp) +{ +NvmeCtrl *n =NVME (pci_dev); +int i; + +if (nvme_check_constraints (n, errp)) { +return ; + } + +nvme_init_state (n); + +if (nvme_init_blk (n, errp)) { +return ; }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 (n->ns_size >> - id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas)].ds); +if (nvme_init_namespace (n, &n->namespaces[i], errp)) { +return ; + } } + +nvme_init_pci (n, pci_dev); +nvme_init_ctrl (n); }static void nvme_exit (PCIDevice *pci_dev)
hw/block/nvme.h +21 -2
@@ -67,6 +67,22 @@ 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; +} + +static inline size_t nvme_ns_lbads_bytes (NvmeNamespace *ns) +{ +return 1 <<nvme_ns_lbads (ns); +} +#define TYPE_NVME "nvme"#define NVME (obj) \ OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)
@@ -88,8 +104,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;uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */
@@ -103,4 +117,9 @@ typedef struct NvmeCtrl { NvmeIdCtrl id_ctrl; } NvmeCtrl; +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.25.1
Re: [PATCH v6 10/42] nvme: refactor device realization
Quoted 61 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This patch splits up
nvme_realizeinto multiple individual functions, each initializing a different subset of the device.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 178 ++++++++++++++++++++++++++++++------------------ hw/block/nvme.h | 23 ++++++- 2 files changed, 134 insertions(+), 67 deletions(-)hw/block/nvme.c +6
-9@@ -44,6 +44,8 @@#include "trace.h" #include "nvme.h" +#define NVME_CMB_BIR 2 +#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \ (trace_##trace)(__VA_ARGS__); \@@ -63,7 +65,7 @@ static inline 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 ; }@@ -157,7 +159,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (unlikely (!prp1)) {trace_nvme_dev_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);@@ -1324,14 +1326,9 @@ static const MemoryRegionOps nvme_cmb_ops = { }, }; -static void nvme_realize (PCIDevice *pci_dev,Error **errp) +static int nvme_check_constraints (NvmeCtrl *n,Error **errp) { -NvmeCtrl *n =NVME (pci_dev); -NvmeIdCtrl *id = &n->id_ctrl; - -int i; -int64_t bs_size; -uint8_t *pci_conf; +NvmeParams *params = &n->params;if (n->params.num_queues) { warn_report("nvme: num_queues is deprecated; please use max_ioqpairs "
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1342
Quoted 8 lines
hw/block/nvme.c +3
-2@@ -1340,57 +1337,100 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->params.max_ioqpairs = n->params.num_queues -1 ; } -if (!n->params.max_ioqpairs) { -error_setg (errp,"max_ioqpairs can't be less than 1" ); +if (params->max_ioqpairs <1 || + params->max_ioqpairs >PCI_MSIX_FLAGS_QSIZE ) { +error_setg (errp,"nvme: max_ioqpairs must be " );
Looks like the error message is not complete now.
Quoted 240 lines
hw/block/nvme.c +104
-54+return -1 ; }if (!n->conf.blk) { -error_setg (errp,"drive property not set" ); -return ; +error_setg (errp,"nvme: block backend not configured" ); +return -1 ; } - bs_size =blk_getlength (n->conf.blk); -if (bs_size <0 ) { -error_setg (errp,"could not get backing file size" ); -return ; +if (!params->serial) { +error_setg (errp,"nvme: serial not configured" ); +return -1 ; } -if (!n->params.serial) { -error_setg (errp,"serial property not set" ); -return ; - } +return 0 ; +} + +static int nvme_init_blk (NvmeCtrl *n,Error **errp) +{blkconf_blocksizes (&n->conf);if (!blkconf_apply_backend_options (&n->conf,blk_is_read_only (n->conf.blk), false, errp)) { -return ; +return -1 ; } - 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 ); +return 0 ; +} +static void nvme_init_state (NvmeCtrl *n) +{ n->num_namespaces =1 ; n->reg_size =pow2ceil (0x1008 +2 * (n->params.max_ioqpairs) *4 ); - 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 , -PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , - &n->iomem); +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 ); +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; + + pci_conf[PCI_INTERRUPT_PIN ] =1 ; +pci_config_set_prog_interface (pci_conf,0x2 ); +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5845 ); +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 ); +if (n->params.cmb_size_mb) { +nvme_init_cmb (n, pci_dev); + } +} + +static void nvme_init_ctrl (NvmeCtrl *n) +{ +NvmeIdCtrl *id = &n->id_ctrl; +NvmeParams *params = &n->params; +uint8_t *pci_conf = n->parent_obj.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" ,' ' );strpadcpy ((char *)id->fr,sizeof (id->fr),"1.0" ,' ' ); -strpadcpy ((char *)id->sn,sizeof (id->sn), n->params.serial,' ' ); +strpadcpy ((char *)id->sn,sizeof (id->sn), params->serial,' ' ); id->rab =6 ; id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ;@@ -1431,46 +1471,54 @@ 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) { +static int nvme_init_namespace (NvmeCtrl *n,NvmeNamespace *ns,Error **errp) +{ +int64_t bs_size; +NvmeIdNs *id_ns = &ns->id_ns; -NVME_CMBLOC_SET_BIR (n->bar.cmbloc,2 ); -NVME_CMBLOC_SET_OFST (n->bar.cmbloc,0 ); + bs_size =blk_getlength (n->conf.blk); +if (bs_size <0 ) { +error_setg_errno (errp, -bs_size,"blk_getlength" ); +return -1 ; + } -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); + id_ns->lbaf[0 ].ds =BDRV_SECTOR_BITS ; + n->ns_size = bs_size; - n->cmbloc = n->bar.cmbloc; - n->cmbsz = n->bar.cmbsz; + id_ns->nsze =cpu_to_le64 (nvme_ns_nlbas (n, ns)); - 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); +/* no thin provisioning */ + id_ns->ncap = id_ns->nsze; + id_ns->nuse = id_ns->ncap; +return 0 ; +} + +static void nvme_realize (PCIDevice *pci_dev,Error **errp) +{ +NvmeCtrl *n =NVME (pci_dev); +int i; + +if (nvme_check_constraints (n, errp)) { +return ; + } + +nvme_init_state (n); + +if (nvme_init_blk (n, errp)) { +return ; }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 (n->ns_size >> - id_ns->lbaf[NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas)].ds); +if (nvme_init_namespace (n, &n->namespaces[i], errp)) { +return ; + } } + +nvme_init_pci (n, pci_dev); +nvme_init_ctrl (n); }static void nvme_exit (PCIDevice *pci_dev)hw/block/nvme.h +16
-2@@ -67,6 +67,22 @@ 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; +} + +static inline size_t nvme_ns_lbads_bytes (NvmeNamespace *ns) +{ +return 1 <<nvme_ns_lbads (ns); +} +#define TYPE_NVME "nvme"#define NVME (obj) \ OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)@@ -88,8 +104,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;uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */
hw/block/nvme.h typedef struct NvmeCtrl { · line 125
Quoted 9 lines
hw/block/nvme.h +5
-0@@ -103,4 +117,9 @@ typedef struct NvmeCtrl { NvmeIdCtrl id_ctrl; } NvmeCtrl; +static inline uint64_t nvme_ns_nlbas (NvmeCtrl *n,NvmeNamespace *ns) +{ +return n->ns_size >>nvme_ns_lbads (ns); +} +#endif /* HW_NVME_H */
Small nitpick: To be honest this not only refactoring in the device realization since you also (rightfully) removed the duplicated cmbsz/cmbloc so I would add a mention for this in the commit message. But that doesn't matter that much, so
Best regards,
Maxim Levitsky
Re: [PATCH v6 10/42] nvme: refactor device realization
Quoted 21 lines · Maxim Levitsky
Quoted 20 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This patch splits up
nvme_realizeinto multiple individual functions, each initializing a different subset of the device.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 178 ++++++++++++++++++++++++++++++------------------ hw/block/nvme.h | 23 ++++++- 2 files changed, 134 insertions(+), 67 deletions(-)hw/block/nvme.c +0
-0@@ -1340,57 +1337,100 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->params.max_ioqpairs = n->params.num_queues -1 ; }
Quoted 6 lines
hw/block/nvme.c static void nvme_realize(PCIDevice *pci_dev, Error **errp) · line 1342
Quoted 5 lines
hw/block/nvme.c +3
-2-if (!n->params.max_ioqpairs) { -error_setg (errp,"max_ioqpairs can't be less than 1" ); +if (params->max_ioqpairs <1 || + params->max_ioqpairs >PCI_MSIX_FLAGS_QSIZE ) { +error_setg (errp,"nvme: max_ioqpairs must be " );Looks like the error message is not complete now.
Fixed!
Quoted 5 lines
Small nitpick: To be honest this not only refactoring in the device realization since you also (rightfully) removed the duplicated cmbsz/cmbloc so I would add a mention for this in the commit message. But that doesn't matter that much, so
You are right. I've added it as a separate patch.
Quoted 5 lines
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
PATCH v6 11/42 nvme: add temperature threshold feature
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
It might seem wierd to implement this feature for an emulated device, but it is mandatory to support and the feature is useful for testing asynchronous event request support, which will be added in a later patch.
--- hw/block/nvme.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ hw/block/nvme.h | 2 ++ include/block/nvme.h | 8 +++++++- 3 files changed, 57 insertions(+), 1 deletion(-)
hw/block/nvme.c +48 -0
@@ -45,6 +45,9 @@#include "nvme.h" #define NVME_CMB_BIR 2 +#define NVME_TEMPERATURE 0x143 +#define NVME_TEMPERATURE_WARNING 0x157 +#define NVME_TEMPERATURE_CRITICAL 0x175#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \
@@ -798,9 +801,31 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) {uint32_t dw10 =le32_to_cpu (cmd->cdw10); +uint32_t dw11 =le32_to_cpu (cmd->cdw11);uint32_t result;switch (dw10) { +case NVME_TEMPERATURE_THRESHOLD : + result =0 ; + +/* +* The controller only implements the Composite Temperature sensor, so +* return 0 for all other sensors. +*/ +if (NVME_TEMP_TMPSEL (dw11)) { +break ; + } + +switch (NVME_TEMP_THSEL (dw11)) { +case 0x0 : + result =cpu_to_le16 (n->features.temp_thresh_hi); +break ; +case 0x1 : + result =cpu_to_le16 (n->features.temp_thresh_low); +break ; + } + +break ;case NVME_VOLATILE_WRITE_CACHE : result =blk_enable_write_cache (n->conf.blk);trace_nvme_dev_getfeat_vwcache (result ?"enabled" :"disabled" );
@@ -845,6 +870,23 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw11 =le32_to_cpu (cmd->cdw11);switch (dw10) { +case NVME_TEMPERATURE_THRESHOLD : +if (NVME_TEMP_TMPSEL (dw11)) { +break ; + } + +switch (NVME_TEMP_THSEL (dw11)) { +case 0x0 : + n->features.temp_thresh_hi =NVME_TEMP_TMPTH (dw11); +break ; +case 0x1 : + n->features.temp_thresh_low =NVME_TEMP_TMPTH (dw11); +break ; +default : +return NVME_INVALID_FIELD |NVME_DNR ; + } + +break ;case NVME_VOLATILE_WRITE_CACHE :blk_set_enable_write_cache (n->conf.blk, dw11 &1 );break ;
@@ -1374,6 +1416,7 @@ static void nvme_init_state(NvmeCtrl *n) 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); + n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; }static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev)
@@ -1451,6 +1494,11 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->acl =3 ; id->frmw =7 <<1 ; id->lpa =1 <<0 ; + +/* recommended default value (~70 C) */ + id->wctemp =cpu_to_le16 (NVME_TEMPERATURE_WARNING ); + id->cctemp =cpu_to_le16 (NVME_TEMPERATURE_CRITICAL ); + id->sqes = (0x6 <<4 ) |0x6 ; id->cqes = (0x4 <<4 ) |0x4 ; id->nn =cpu_to_le32 (n->num_namespaces);
hw/block/nvme.h +2 -0
@@ -108,6 +108,7 @@ typedef struct NvmeCtrl {uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */ +uint16_t temperature;NvmeNamespace *namespaces;NvmeSQueue **sq;
@@ -115,6 +116,7 @@ typedef struct NvmeCtrl {NvmeSQueue admin_sq;NvmeCQueue admin_cq;NvmeIdCtrl id_ctrl; +NvmeFeatureVal features; } NvmeCtrl;static inline uint64_t nvme_ns_nlbas (NvmeCtrl *n,NvmeNamespace *ns)
include/block/nvme.h +7 -1
@@ -688,7 +688,13 @@ enum NvmeIdCtrlOncs { typedef struct NvmeFeatureVal { uint32_t arbitration; uint32_t power_mgmt; - uint32_t temp_thresh; + union { + struct { + uint16_t temp_thresh_hi; + uint16_t temp_thresh_low; + }; + uint32_t temp_thresh; + }; uint32_t err_rec; uint32_t volatile_wc; uint32_t num_queues;
Signature · 1 line
2.25.1
Re: [PATCH v6 11/42] nvme: add temperature threshold feature
Quoted 110 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
It might seem wierd to implement this feature for an emulated device, but it is mandatory to support and the feature is useful for testing asynchronous event request support, which will be added in a later patch.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ hw/block/nvme.h | 2 ++ include/block/nvme.h | 8 +++++++- 3 files changed, 57 insertions(+), 1 deletion(-)hw/block/nvme.c +48
-0@@ -45,6 +45,9 @@#include "nvme.h" #define NVME_CMB_BIR 2 +#define NVME_TEMPERATURE 0x143 +#define NVME_TEMPERATURE_WARNING 0x157 +#define NVME_TEMPERATURE_CRITICAL 0x175#define NVME_GUEST_ERR (trace, fmt, ...) \ do { \@@ -798,9 +801,31 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) {uint32_t dw10 =le32_to_cpu (cmd->cdw10); +uint32_t dw11 =le32_to_cpu (cmd->cdw11);uint32_t result;switch (dw10) { +case NVME_TEMPERATURE_THRESHOLD : + result =0 ; + +/* +* The controller only implements the Composite Temperature sensor, so +* return 0 for all other sensors. +*/ +if (NVME_TEMP_TMPSEL (dw11)) { +break ; + } + +switch (NVME_TEMP_THSEL (dw11)) { +case 0x0 : + result =cpu_to_le16 (n->features.temp_thresh_hi); +break ; +case 0x1 : + result =cpu_to_le16 (n->features.temp_thresh_low); +break ; + } + +break ;case NVME_VOLATILE_WRITE_CACHE : result =blk_enable_write_cache (n->conf.blk);trace_nvme_dev_getfeat_vwcache (result ?"enabled" :"disabled" );@@ -845,6 +870,23 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw11 =le32_to_cpu (cmd->cdw11);switch (dw10) { +case NVME_TEMPERATURE_THRESHOLD : +if (NVME_TEMP_TMPSEL (dw11)) { +break ; + } + +switch (NVME_TEMP_THSEL (dw11)) { +case 0x0 : + n->features.temp_thresh_hi =NVME_TEMP_TMPTH (dw11); +break ; +case 0x1 : + n->features.temp_thresh_low =NVME_TEMP_TMPTH (dw11); +break ; +default : +return NVME_INVALID_FIELD |NVME_DNR ; + } + +break ;case NVME_VOLATILE_WRITE_CACHE :blk_set_enable_write_cache (n->conf.blk, dw11 &1 );break ;@@ -1374,6 +1416,7 @@ static void nvme_init_state(NvmeCtrl *n) 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); + n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; }static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev)@@ -1451,6 +1494,11 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->acl =3 ; id->frmw =7 <<1 ; id->lpa =1 <<0 ; + +/* recommended default value (~70 C) */ + id->wctemp =cpu_to_le16 (NVME_TEMPERATURE_WARNING ); + id->cctemp =cpu_to_le16 (NVME_TEMPERATURE_CRITICAL ); + id->sqes = (0x6 <<4 ) |0x6 ; id->cqes = (0x4 <<4 ) |0x4 ; id->nn =cpu_to_le32 (n->num_namespaces);hw/block/nvme.h +0
-0
hw/block/nvme.h typedef struct NvmeCtrl { · line 111
Quoted 4 lines
hw/block/nvme.h +1
-0@@ -108,6 +108,7 @@ typedef struct NvmeCtrl {uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */ +uint16_t temperature;
You forgot to move this too.
Quoted 20 lines
hw/block/nvme.h +1
-0NvmeNamespace *namespaces;NvmeSQueue **sq;@@ -115,6 +116,7 @@ typedef struct NvmeCtrl {NvmeSQueue admin_sq;NvmeCQueue admin_cq;NvmeIdCtrl id_ctrl; +NvmeFeatureVal features; } NvmeCtrl;static inline uint64_t nvme_ns_nlbas (NvmeCtrl *n,NvmeNamespace *ns)include/block/nvme.h +0
-1@@ -688,7 +688,13 @@ enum NvmeIdCtrlOncs { typedef struct NvmeFeatureVal { uint32_t arbitration; uint32_t power_mgmt; - uint32_t temp_thresh;
include/block/nvme.h enum NvmeIdCtrlOncs { · line 700
Quoted 10 lines
include/block/nvme.h +7
-0+union { +struct { +uint16_t temp_thresh_hi; +uint16_t temp_thresh_low; + }; +uint32_t temp_thresh; + };uint32_t err_rec;uint32_t volatile_wc;uint32_t num_queues;
With 'temperature' field removed from the header:
Best regards,
Maxim Levitsky
Re: [PATCH v6 11/42] nvme: add temperature threshold feature
Quoted 16 lines · Maxim Levitsky
Quoted 15 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
It might seem wierd to implement this feature for an emulated device, but it is mandatory to support and the feature is useful for testing asynchronous event request support, which will be added in a later patch.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ hw/block/nvme.h | 2 ++ include/block/nvme.h | 8 +++++++- 3 files changed, 57 insertions(+), 1 deletion(-)
Quoted 11 lines
hw/block/nvme.h typedef struct NvmeCtrl { · line 111
Quoted 9 lines
hw/block/nvme.h +1
-0@@ -108,6 +108,7 @@ typedef struct NvmeCtrl {uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */ +uint16_t temperature;You forgot to move this too.
Fixed!
Quoted 8 lines
With 'temperature' field removed from the header:
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
Re: [PATCH v6 11/42] nvme: add temperature threshold feature
Quoted 30 lines · Klaus Birkelund Jensen
Quoted 16 lines · Maxim Levitsky
Quoted 15 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
It might seem wierd to implement this feature for an emulated device, but it is mandatory to support and the feature is useful for testing asynchronous event request support, which will be added in a later patch.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ hw/block/nvme.h | 2 ++ include/block/nvme.h | 8 +++++++- 3 files changed, 57 insertions(+), 1 deletion(-)Quoted 12 lines
hw/block/nvme.h typedef struct NvmeCtrl { · line 111
Quoted 9 lines
hw/block/nvme.h +1
-0@@ -108,6 +108,7 @@ typedef struct NvmeCtrl {uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */ +uint16_t temperature;You forgot to move this too.
Quoted 1 line
Fixed!
Thanks.
Quoted 10 lines
Quoted 8 lines
With 'temperature' field removed from the header:
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
Best regards,
Maxim Levitsky
PATCH v6 12/42 nvme: add support for the get log page command
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add support for the Get Log Page command and basic implementations of the mandatory Error Information, SMART / Health Information and Firmware Slot Information log pages.
In violation of the specification, the SMART / Health Information log page does not persist information over the lifetime of the controller because the device has no place to store such persistent state.
Note that the LPA field in the Identify Controller data structure intentionally has bit 0 cleared because there is no namespace specific information in the SMART / Health information log page.
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.10 ("Get Log Page command").
--- hw/block/nvme.c | 138 +++++++++++++++++++++++++++++++++++++++++- hw/block/nvme.h | 10 +++ hw/block/trace-events | 2 + 3 files changed, 149 insertions(+), 1 deletion(-)
hw/block/nvme.c +137 -1
@@ -569,6 +569,138 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } +static uint16_t nvme_smart_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint32_t nsid =le32_to_cpu (cmd->nsid); + +uint32_t trans_len; +time_t current_ms; +uint64_t units_read =0 , units_written =0 ; +uint64_t read_commands =0 , write_commands =0 ; +NvmeSmartLog smart; +BlockAcctStats *s; + +if (nsid && nsid !=0xffffffff ) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + + s =blk_get_stats (n->conf.blk); + + units_read = s->nr_bytes[BLOCK_ACCT_READ ] >>BDRV_SECTOR_BITS ; + units_written = s->nr_bytes[BLOCK_ACCT_WRITE ] >>BDRV_SECTOR_BITS ; + read_commands = s->nr_ops[BLOCK_ACCT_READ ]; + write_commands = s->nr_ops[BLOCK_ACCT_WRITE ]; + +if (off >sizeof (smart)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + + trans_len =MIN (sizeof (smart) - off, buf_len); + +memset (&smart,0x0 ,sizeof (smart)); + + smart.data_units_read[0 ] =cpu_to_le64 (units_read /1000 ); + smart.data_units_written[0 ] =cpu_to_le64 (units_written /1000 ); + smart.host_read_commands[0 ] =cpu_to_le64 (read_commands); + smart.host_write_commands[0 ] =cpu_to_le64 (write_commands); + + smart.temperature[0 ] = n->temperature &0xff ; + smart.temperature[1 ] = (n->temperature >>8 ) &0xff ; + +if ((n->temperature > n->features.temp_thresh_hi) || + (n->temperature < n->features.temp_thresh_low)) { + smart.critical_warning |=NVME_SMART_TEMPERATURE ; + } + + current_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); + smart.power_on_hours[0 ] = +cpu_to_le64 ((((current_ms - n->starttime_ms) /1000 ) /60 ) /60 ); + +return nvme_dma_read_prp (n, (uint8_t *) &smart + off, trans_len, prp1, + prp2); +} + +static uint16_t nvme_fw_log_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +NvmeFwSlotInfoLog fw_log; + +if (off >sizeof (fw_log)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +memset (&fw_log,0 ,sizeof (NvmeFwSlotInfoLog)); + + trans_len =MIN (sizeof (fw_log) - off, buf_len); + +return nvme_dma_read_prp (n, (uint8_t *) &fw_log + off, trans_len, prp1, + prp2); +} + +static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint8_t errlog[64 ]; + +if (off >sizeof (errlog)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +memset (errlog,0x0 ,sizeof (errlog)); + + trans_len =MIN (sizeof (errlog) - off, buf_len); + +return nvme_dma_read_prp (n, errlog, trans_len, prp1, prp2); +} + +static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +uint32_t dw10 =le32_to_cpu (cmd->cdw10); +uint32_t dw11 =le32_to_cpu (cmd->cdw11); +uint32_t dw12 =le32_to_cpu (cmd->cdw12); +uint32_t dw13 =le32_to_cpu (cmd->cdw13); +uint8_t lid = dw10 &0xff ; +uint8_t rae = (dw10 >>15 ) &0x1 ; +uint32_t numdl, numdu; +uint64_t off, lpol, lpou; +size_t len; + + numdl = (dw10 >>16 ); + numdu = (dw11 &0xffff ); + lpol = dw12; + lpou = dw13; + + len = (((numdu <<16 ) | numdl) +1 ) <<2 ; + off = (lpou <<32ULL ) | lpol; + +if (off &0x3 ) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +trace_nvme_dev_get_log (nvme_cid (req), lid, rae, len, off); + +switch (lid) { +case NVME_LOG_ERROR_INFO : +return nvme_error_info (n, cmd, len, off, req); +case NVME_LOG_SMART_INFO : +return nvme_smart_info (n, cmd, len, off, req); +case NVME_LOG_FW_SLOT_INFO : +return nvme_fw_log_info (n, cmd, len, off, req); +default : +trace_nvme_dev_err_invalid_log_page (nvme_cid (req), lid); +return NVME_INVALID_FIELD |NVME_DNR ; + } +} +static void nvme_free_cq (NvmeCQueue *cq,NvmeCtrl *n) { n->cq[cq->cqid] =NULL ;
@@ -914,6 +1046,8 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return nvme_del_sq (n, cmd);case NVME_ADM_CMD_CREATE_SQ :return nvme_create_sq (n, cmd); +case NVME_ADM_CMD_GET_LOG_PAGE : +return nvme_get_log (n, cmd, req);case NVME_ADM_CMD_DELETE_CQ :return nvme_del_cq (n, cmd);case NVME_ADM_CMD_CREATE_CQ :
@@ -1416,7 +1550,9 @@ static void nvme_init_state(NvmeCtrl *n) 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); + n->temperature =NVME_TEMPERATURE ; n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; + n->starttime_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); }static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev)
@@ -1493,7 +1629,7 @@ static void nvme_init_ctrl(NvmeCtrl *n)*/ id->acl =3 ; id->frmw =7 <<1 ; - id->lpa =1 <<0 ; + id->lpa =1 <<2 ;/* recommended default value (~70 C) */ id->wctemp =cpu_to_le16 (NVME_TEMPERATURE_WARNING );
hw/block/nvme.h +10 -0
@@ -109,6 +109,7 @@ typedef struct NvmeCtrl {uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */ uint16_t temperature; +uint64_t starttime_ms;NvmeNamespace *namespaces;NvmeSQueue **sq;
@@ -124,4 +125,13 @@ static inline uint64_t nvme_ns_nlbas(NvmeCtrl *n, NvmeNamespace *ns) return n->ns_size >> nvme_ns_lbads(ns); } +static inline uint16_t nvme_cid (NvmeRequest *req) +{ +if (req) { +return le16_to_cpu (req->cqe.cid); + } + +return 0xffff ; +} +#endif /* HW_NVME_H */
hw/block/trace-events +2 -0
@@ -46,6 +46,7 @@ nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d" nvme_dev_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" nvme_dev_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" +nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" nvme_dev_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64""
@@ -85,6 +86,7 @@ nvme_dev_err_invalid_create_cq_qflags(uint16_t qflags) "failed creating completi nvme_dev_err_invalid_identify_cns(uint16_t cns) "identify, invalid cns=0x%"PRIx16"" nvme_dev_err_invalid_getfeat(int dw10) "invalid get features, dw10=0x%"PRIx32"" nvme_dev_err_invalid_setfeat(uint32_t dw10) "invalid set features, dw10=0x%"PRIx32"" +nvme_dev_err_invalid_log_page(uint16_t cid, uint16_t lid) "cid %"PRIu16" lid 0x%"PRIx16"" nvme_dev_err_startfail_cq(void) "nvme_start_ctrl failed because there are non-admin completion queues" nvme_dev_err_startfail_sq(void) "nvme_start_ctrl failed because there are non-admin submission queues" nvme_dev_err_startfail_nbarasq(void) "nvme_start_ctrl failed because the admin submission queue address is null"
Signature · 1 line
2.25.1
Re: [PATCH v6 12/42] nvme: add support for the get log page command
Quoted 72 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for the Get Log Page command and basic implementations of the mandatory Error Information, SMART / Health Information and Firmware Slot Information log pages.
In violation of the specification, the SMART / Health Information log page does not persist information over the lifetime of the controller because the device has no place to store such persistent state.
Note that the LPA field in the Identify Controller data structure intentionally has bit 0 cleared because there is no namespace specific information in the SMART / Health information log page.
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.10 ("Get Log Page command").
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 138 +++++++++++++++++++++++++++++++++++++++++- hw/block/nvme.h | 10 +++ hw/block/trace-events | 2 + 3 files changed, 149 insertions(+), 1 deletion(-)hw/block/nvme.c +39
-0@@ -569,6 +569,138 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } +static uint16_t nvme_smart_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint32_t nsid =le32_to_cpu (cmd->nsid); + +uint32_t trans_len; +time_t current_ms; +uint64_t units_read =0 , units_written =0 ; +uint64_t read_commands =0 , write_commands =0 ; +NvmeSmartLog smart; +BlockAcctStats *s; + +if (nsid && nsid !=0xffffffff ) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + + s =blk_get_stats (n->conf.blk); + + units_read = s->nr_bytes[BLOCK_ACCT_READ ] >>BDRV_SECTOR_BITS ; + units_written = s->nr_bytes[BLOCK_ACCT_WRITE ] >>BDRV_SECTOR_BITS ; + read_commands = s->nr_ops[BLOCK_ACCT_READ ]; + write_commands = s->nr_ops[BLOCK_ACCT_WRITE ]; + +if (off >sizeof (smart)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + + trans_len =MIN (sizeof (smart) - off, buf_len); + +memset (&smart,0x0 ,sizeof (smart)); + + smart.data_units_read[0 ] =cpu_to_le64 (units_read /1000 ); + smart.data_units_written[0 ] =cpu_to_le64 (units_written /1000 ); + smart.host_read_commands[0 ] =cpu_to_le64 (read_commands); + smart.host_write_commands[0 ] =cpu_to_le64 (write_commands); + + smart.temperature[0 ] = n->temperature &0xff ;
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 620
Quoted 10 lines
hw/block/nvme.c +10
-0+ smart.temperature[1 ] = (n->temperature >>8 ) &0xff ; + +if ((n->temperature > n->features.temp_thresh_hi) || + (n->temperature < n->features.temp_thresh_low)) { + smart.critical_warning |=NVME_SMART_TEMPERATURE ; + } + + current_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); + smart.power_on_hours[0 ] = +cpu_to_le64 ((((current_ms - n->starttime_ms) /1000 ) /60 ) /60 );
OH, I didn't notice that you didn't have the endian conversion in V5, it is needed here of course.
Quoted 22 lines
hw/block/nvme.c +22
-0+ +return nvme_dma_read_prp (n, (uint8_t *) &smart + off, trans_len, prp1, + prp2); +} + +static uint16_t nvme_fw_log_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +NvmeFwSlotInfoLog fw_log; + +if (off >sizeof (fw_log)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +memset (&fw_log,0 ,sizeof (NvmeFwSlotInfoLog)); + + trans_len =MIN (sizeof (fw_log) - off, buf_len); + + return nvme_dma_read_prp(n, (uint8_t *) &fw_log + off, trans_len, prp1,
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 652
Quoted 10 lines
hw/block/nvme.c +10
-0+ prp2); +} + +static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint8_t errlog[64 ];
I'll would replace this with sizeof(NvmeErrorLogEntry)
(and add NvmeErrorLogEntry to the nvme.h), just for the sake of consistency, and in case we end up reporting some errors to the log in the future.
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 663
Quoted 11 lines
hw/block/nvme.c +11
-0+ +if (off >sizeof (errlog)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +memset (errlog,0x0 ,sizeof (errlog)); + + trans_len =MIN (sizeof (errlog) - off, buf_len); + +return nvme_dma_read_prp (n, errlog, trans_len, prp1, prp2); +}
Besides this, looks good now.
Quoted 110 lines
hw/block/nvme.c +45
-1+ +static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +uint32_t dw10 =le32_to_cpu (cmd->cdw10); +uint32_t dw11 =le32_to_cpu (cmd->cdw11); +uint32_t dw12 =le32_to_cpu (cmd->cdw12); +uint32_t dw13 =le32_to_cpu (cmd->cdw13); +uint8_t lid = dw10 &0xff ; +uint8_t rae = (dw10 >>15 ) &0x1 ; +uint32_t numdl, numdu; +uint64_t off, lpol, lpou; +size_t len; + + numdl = (dw10 >>16 ); + numdu = (dw11 &0xffff ); + lpol = dw12; + lpou = dw13; + + len = (((numdu <<16 ) | numdl) +1 ) <<2 ; + off = (lpou <<32ULL ) | lpol; + +if (off &0x3 ) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +trace_nvme_dev_get_log (nvme_cid (req), lid, rae, len, off); + +switch (lid) { +case NVME_LOG_ERROR_INFO : +return nvme_error_info (n, cmd, len, off, req); +case NVME_LOG_SMART_INFO : +return nvme_smart_info (n, cmd, len, off, req); +case NVME_LOG_FW_SLOT_INFO : +return nvme_fw_log_info (n, cmd, len, off, req); +default : +trace_nvme_dev_err_invalid_log_page (nvme_cid (req), lid); +return NVME_INVALID_FIELD |NVME_DNR ; + } +} +static void nvme_free_cq (NvmeCQueue *cq,NvmeCtrl *n) { n->cq[cq->cqid] =NULL ;@@ -914,6 +1046,8 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return nvme_del_sq (n, cmd);case NVME_ADM_CMD_CREATE_SQ :return nvme_create_sq (n, cmd); +case NVME_ADM_CMD_GET_LOG_PAGE : +return nvme_get_log (n, cmd, req);case NVME_ADM_CMD_DELETE_CQ :return nvme_del_cq (n, cmd);case NVME_ADM_CMD_CREATE_CQ :@@ -1416,7 +1550,9 @@ static void nvme_init_state(NvmeCtrl *n) 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); + n->temperature =NVME_TEMPERATURE ; n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; + n->starttime_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); }static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev)@@ -1493,7 +1629,7 @@ static void nvme_init_ctrl(NvmeCtrl *n)*/ id->acl =3 ; id->frmw =7 <<1 ; - id->lpa =1 <<0 ; + id->lpa =1 <<2 ;/* recommended default value (~70 C) */ id->wctemp =cpu_to_le16 (NVME_TEMPERATURE_WARNING );hw/block/nvme.h +10
-0@@ -109,6 +109,7 @@ typedef struct NvmeCtrl {uint64_t host_timestamp;/* Timestamp sent by the host */ uint64_t timestamp_set_qemu_clock_ms;/* QEMU clock time */ uint16_t temperature; +uint64_t starttime_ms;NvmeNamespace *namespaces;NvmeSQueue **sq;@@ -124,4 +125,13 @@ static inline uint64_t nvme_ns_nlbas(NvmeCtrl *n, NvmeNamespace *ns) return n->ns_size >> nvme_ns_lbads(ns); } +static inline uint16_t nvme_cid (NvmeRequest *req) +{ +if (req) { +return le16_to_cpu (req->cqe.cid); + } + +return 0xffff ; +} +#endif /* HW_NVME_H */ hw/block/trace-events +1
-0@@ -46,6 +46,7 @@ nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d" nvme_dev_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" nvme_dev_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" +nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" nvme_dev_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64""
hw/block/trace-events nvme_dev_err_invalid_create_cq_qflags(uint16_t qflags) "failed creating completi · line 92
Quoted 7 lines
hw/block/trace-events +1
-0@@ -85,6 +86,7 @@ nvme_dev_err_invalid_create_cq_qflags(uint16_t qflags) "failed creating completi nvme_dev_err_invalid_identify_cns(uint16_t cns) "identify, invalid cns=0x%"PRIx16"" nvme_dev_err_invalid_getfeat(int dw10) "invalid get features, dw10=0x%"PRIx32"" nvme_dev_err_invalid_setfeat(uint32_t dw10) "invalid set features, dw10=0x%"PRIx32"" +nvme_dev_err_invalid_log_page(uint16_t cid, uint16_t lid) "cid %"PRIu16" lid 0x%"PRIx16"" nvme_dev_err_startfail_cq(void) "nvme_start_ctrl failed because there are non-admin completion queues" nvme_dev_err_startfail_sq(void) "nvme_start_ctrl failed because there are non-admin submission queues" nvme_dev_err_startfail_nbarasq(void) "nvme_start_ctrl failed because the admin submission queue address is null"
Best regards,
Maxim Levitsky
Re: [PATCH v6 12/42] nvme: add support for the get log page command
Quoted 29 lines · Maxim Levitsky
Quoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for the Get Log Page command and basic implementations of the mandatory Error Information, SMART / Health Information and Firmware Slot Information log pages.
In violation of the specification, the SMART / Health Information log page does not persist information over the lifetime of the controller because the device has no place to store such persistent state.
Note that the LPA field in the Identify Controller data structure intentionally has bit 0 cleared because there is no namespace specific information in the SMART / Health information log page.
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.10 ("Get Log Page command").
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 138 +++++++++++++++++++++++++++++++++++++++++- hw/block/nvme.h | 10 +++ hw/block/trace-events | 2 + 3 files changed, 149 insertions(+), 1 deletion(-)hw/block/nvme.c +0
-0
Quoted 11 lines
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 652
Quoted 7 lines
hw/block/nvme.c +7
-0+static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint8_t errlog[64 ];I'll would replace this with sizeof(NvmeErrorLogEntry)
(and add NvmeErrorLogEntry to thenvme.h), just for the sake of consistency, and in case we end up reporting some errors to the log in the future.
NvmeErrorLog is already in nvme.h; Fixed to actually use it.
Quoted 18 lines
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 663
Quoted 12 lines
hw/block/nvme.c +11
-0+ +if (off >sizeof (errlog)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +memset (errlog,0x0 ,sizeof (errlog)); + + trans_len =MIN (sizeof (errlog) - off, buf_len); + +return nvme_dma_read_prp (n, errlog, trans_len, prp1, prp2); +}Besides this, looks good now.
Best regards,
Maxim Levitsky
Re: [PATCH v6 12/42] nvme: add support for the get log page command
Quoted 43 lines · Klaus Birkelund Jensen
Quoted 29 lines · Maxim Levitsky
Quoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for the Get Log Page command and basic implementations of the mandatory Error Information, SMART / Health Information and Firmware Slot Information log pages.
In violation of the specification, the SMART / Health Information log page does not persist information over the lifetime of the controller because the device has no place to store such persistent state.
Note that the LPA field in the Identify Controller data structure intentionally has bit 0 cleared because there is no namespace specific information in the SMART / Health information log page.
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.10 ("Get Log Page command").
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 138 +++++++++++++++++++++++++++++++++++++++++- hw/block/nvme.h | 10 +++ hw/block/trace-events | 2 + 3 files changed, 149 insertions(+), 1 deletion(-)hw/block/nvme.c +0
-0Quoted 12 lines
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 652
Quoted 7 lines
hw/block/nvme.c +7
-0+static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint8_t errlog[64 ];I'll would replace this with sizeof(NvmeErrorLogEntry)
(and add NvmeErrorLogEntry to thenvme.h), just for the sake of consistency, and in case we end up reporting some errors to the log in the future.
Quoted 1 line
NvmeErrorLog is already in
nvme.h; Fixed to actually use it.
True that! I'll would rename it to NvmeErrorLogEntry to be honest (in that patch that added many nvme spec changes) but I don't mind keeping it as is as well.
Quoted 17 lines
Quoted 17 lines
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 663
Quoted 13 lines
hw/block/nvme.c +11
-0+ +if (off >sizeof (errlog)) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +memset (errlog,0x0 ,sizeof (errlog)); + + trans_len =MIN (sizeof (errlog) - off, buf_len); + +return nvme_dma_read_prp (n, errlog, trans_len, prp1, prp2); +}Besides this, looks good now.
Quoted 5 lines
Quoted 3 lines
Best regards,
Maxim Levitsky
Best regards,
Maxim Levitsky
Re: [PATCH v6 12/42] nvme: add support for the get log page command
Quoted 44 lines · Maxim Levitsky
Quoted 43 lines · Klaus Birkelund Jensen
Quoted 41 lines · Maxim Levitsky
Quoted 27 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for the Get Log Page command and basic implementations of the mandatory Error Information, SMART / Health Information and Firmware Slot Information log pages.
In violation of the specification, the SMART / Health Information log page does not persist information over the lifetime of the controller because the device has no place to store such persistent state.
Note that the LPA field in the Identify Controller data structure intentionally has bit 0 cleared because there is no namespace specific information in the SMART / Health information log page.
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.10 ("Get Log Page command").
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 138 +++++++++++++++++++++++++++++++++++++++++- hw/block/nvme.h | 10 +++ hw/block/trace-events | 2 + 3 files changed, 149 insertions(+), 1 deletion(-)hw/block/nvme.c +0
-0hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 652
Quoted 8 lines
hw/block/nvme.c +7
-0+static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint8_t errlog[64 ];I'll would replace this with sizeof(NvmeErrorLogEntry)
(and add NvmeErrorLogEntry to thenvme.h), just for the sake of consistency, and in case we end up reporting some errors to the log in the future.
Quoted 5 lines
Quoted 1 line
NvmeErrorLog is already in
nvme.h; Fixed to actually use it.True that! I'll would rename it to NvmeErrorLogEntry to be honest (in that patch that added many nvme spec changes) but I don't mind keeping it as is as well.
It is used in the block driver (block/nvme.c) as well, and I'd rather not involved that too much in this series.
Re: [PATCH v6 12/42] nvme: add support for the get log page command
Quoted 47 lines · Klaus Birkelund Jensen
Quoted 46 lines · Maxim Levitsky
Quoted 44 lines · Klaus Birkelund Jensen
Quoted 29 lines · Maxim Levitsky
Quoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for the Get Log Page command and basic implementations of the mandatory Error Information, SMART / Health Information and Firmware Slot Information log pages.
In violation of the specification, the SMART / Health Information log page does not persist information over the lifetime of the controller because the device has no place to store such persistent state.
Note that the LPA field in the Identify Controller data structure intentionally has bit 0 cleared because there is no namespace specific information in the SMART / Health information log page.
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.10 ("Get Log Page command").
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 138 +++++++++++++++++++++++++++++++++++++++++- hw/block/nvme.h | 10 +++ hw/block/trace-events | 2 + 3 files changed, 149 insertions(+), 1 deletion(-)hw/block/nvme.c +0
-0Quoted 12 lines
hw/block/nvme.c static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd) · line 652
Quoted 7 lines
hw/block/nvme.c +7
-0+static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, +uint64_t off,NvmeRequest *req) +{ +uint32_t trans_len; +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); +uint8_t errlog[64 ];I'll would replace this with sizeof(NvmeErrorLogEntry)
(and add NvmeErrorLogEntry to thenvme.h), just for the sake of consistency, and in case we end up reporting some errors to the log in the future.NvmeErrorLog is already in
nvme.h; Fixed to actually use it.
Quoted 8 lines
Quoted 4 lines
True that! I'll would rename it to NvmeErrorLogEntry to be honest (in that patch that added many nvme spec changes) but I don't mind keeping it as is as well.
It is used in the block driver (
block/nvme.c) as well, and I'd rather not involved that too much in this series.
All right, this can always be done later.
Best regards,
Maxim Levitsky
Quoted 1 line
PATCH v6 13/42 nvme: add support for the asynchronous event request command
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.2 ("Asynchronous Event Request command").
Mostly imported from Keith's qemu-nvme tree. Modified with a max number of queued events (controllable with the aer_max_queued device parameter). The spec states that the controller *should* retain events, so we do best effort here.
--- hw/block/nvme.c | 178 ++++++++++++++++++++++++++++++++++++++++-- hw/block/nvme.h | 14 +++- hw/block/trace-events | 9 +++ include/block/nvme.h | 8 +- 4 files changed, 199 insertions(+), 10 deletions(-)
hw/block/nvme.c +172 -6
@@ -325,6 +325,85 @@ static void nvme_enqueue_req_completion(NvmeCQueue *cq, NvmeRequest *req)timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 ); } +static void nvme_process_aers (void *opaque) +{ +NvmeCtrl *n = opaque; +NvmeAsyncEvent *event, *next; + +trace_nvme_dev_process_aers (n->aer_queued); + + QTAILQ_FOREACH_SAFE(event, &n->aer_queue, entry, next) { +NvmeRequest *req; +NvmeAerResult *result; + +/* can't post cqe if there is nothing to complete */ +if (!n->outstanding_aers) { +trace_nvme_dev_no_outstanding_aers (); +break ; + } + +/* ignore if masked (cqe posted, but event not cleared) */ +if (n->aer_mask & (1 << event->result.event_type)) { +trace_nvme_dev_aer_masked (event->result.event_type, n->aer_mask); +continue ; + } + +QTAILQ_REMOVE (&n->aer_queue, event, entry); + n->aer_queued--; + + n->aer_mask |=1 << event->result.event_type; + n->outstanding_aers--; + + req = n->aer_reqs[n->outstanding_aers]; + + result = (NvmeAerResult *) &req->cqe.result; + result->event_type = event->result.event_type; + result->event_info = event->result.event_info; + result->log_page = event->result.log_page; +g_free (event); + + req->status =NVME_SUCCESS ; + +trace_nvme_dev_aer_post_cqe (result->event_type, result->event_info, + result->log_page); + +nvme_enqueue_req_completion (&n->admin_cq, req); + } +} + +static void nvme_enqueue_event (NvmeCtrl *n,uint8_t event_type, +uint8_t event_info,uint8_t log_page) +{ +NvmeAsyncEvent *event; + +trace_nvme_dev_enqueue_event (event_type, event_info, log_page); + +if (n->aer_queued == n->params.aer_max_queued) { +trace_nvme_dev_enqueue_event_noqueue (n->aer_queued); +return ; + } + + event =g_new (NvmeAsyncEvent,1 ); + event->result = (NvmeAerResult ) { + .event_type = event_type, + .event_info = event_info, + .log_page = log_page, + }; + +QTAILQ_INSERT_TAIL (&n->aer_queue, event, entry); + n->aer_queued++; + +nvme_process_aers (n); +} + +static void nvme_clear_events (NvmeCtrl *n,uint8_t event_type) +{ + n->aer_mask &= ~(1 << event_type); +if (!QTAILQ_EMPTY (&n->aer_queue)) { +nvme_process_aers (n); + } +} +static void nvme_rw_cb (void *opaque,int ret) {NvmeRequest *req = opaque;
@@ -569,8 +648,9 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } -static uint16_t nvme_smart_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, -uint64_t off,NvmeRequest *req) +static uint16_t nvme_smart_info (NvmeCtrl *n,NvmeCmd *cmd,uint8_t rae, +uint32_t buf_len,uint64_t off, +NvmeRequest *req) {uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);
@@ -619,6 +699,10 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, smart.power_on_hours[0 ] =cpu_to_le64 ((((current_ms - n->starttime_ms) /1000 ) /60 ) /60 ); +if (!rae) { +nvme_clear_events (n,NVME_AER_TYPE_SMART ); + } +return nvme_dma_read_prp (n, (uint8_t *) &smart + off, trans_len, prp1, prp2); }
@@ -643,14 +727,19 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, prp2); } -static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, -uint64_t off,NvmeRequest *req) +static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint8_t rae, +uint32_t buf_len,uint64_t off, +NvmeRequest *req) {uint32_t trans_len;uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);uint8_t errlog[64 ]; +if (!rae) { +nvme_clear_events (n,NVME_AER_TYPE_ERROR ); + } +if (off >sizeof (errlog)) {return NVME_INVALID_FIELD |NVME_DNR ; }
@@ -690,9 +779,9 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)switch (lid) {case NVME_LOG_ERROR_INFO : -return nvme_error_info (n, cmd, len, off, req); +return nvme_error_info (n, cmd, rae, len, off, req);case NVME_LOG_SMART_INFO : -return nvme_smart_info (n, cmd, len, off, req); +return nvme_smart_info (n, cmd, rae, len, off, req);case NVME_LOG_FW_SLOT_INFO :return nvme_fw_log_info (n, cmd, len, off, req);default :
@@ -969,6 +1058,9 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd); +case NVME_ASYNCHRONOUS_EVENT_CONF : + result =cpu_to_le32 (n->features.async_config); +break ;default :trace_nvme_dev_err_invalid_getfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;
@@ -1018,6 +1110,14 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_INVALID_FIELD |NVME_DNR ; } +if (((n->temperature > n->features.temp_thresh_hi) || + (n->temperature < n->features.temp_thresh_low)) && +NVME_AEC_SMART (n->features.async_config) &NVME_SMART_TEMPERATURE ) { +nvme_enqueue_event (n,NVME_AER_TYPE_SMART , +NVME_AER_INFO_SMART_TEMP_THRESH , +NVME_LOG_SMART_INFO ); + } +break ;case NVME_VOLATILE_WRITE_CACHE :blk_set_enable_write_cache (n->conf.blk, dw11 &1 );
@@ -1032,6 +1132,9 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_set_feature_timestamp (n, cmd); +case NVME_ASYNCHRONOUS_EVENT_CONF : + n->features.async_config = dw11; +break ;default :trace_nvme_dev_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;
@@ -1039,6 +1142,25 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_SUCCESS ; } +static uint16_t nvme_aer (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +trace_nvme_dev_aer (nvme_cid (req)); + +if (n->outstanding_aers > n->params.aerl) { +trace_nvme_dev_aer_aerl_exceeded (); +return NVME_AER_LIMIT_EXCEEDED ; + } + + n->aer_reqs[n->outstanding_aers] = req; + n->outstanding_aers++; + +if (!QTAILQ_EMPTY (&n->aer_queue)) { +nvme_process_aers (n); + } + +return NVME_NO_COMPLETE ; +} +static uint16_t nvme_admin_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) {switch (cmd->opcode) {
@@ -1060,6 +1182,8 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return nvme_set_feature (n, cmd, req);case NVME_ADM_CMD_GET_FEATURES :return nvme_get_feature (n, cmd, req); +case NVME_ADM_CMD_ASYNC_EV_REQ : +return nvme_aer (n, cmd, req);default :trace_nvme_dev_err_invalid_admin_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ;
@@ -1114,6 +1238,15 @@ static void nvme_clear_ctrl(NvmeCtrl *n) } } +while (!QTAILQ_EMPTY (&n->aer_queue)) { +NvmeAsyncEvent *event =QTAILQ_FIRST (&n->aer_queue); +QTAILQ_REMOVE (&n->aer_queue, event, entry); +g_free (event); + } + + n->aer_queued =0 ; + n->outstanding_aers =0 ; +blk_flush (n->conf.blk); n->bar.cc =0 ; }
@@ -1210,6 +1343,8 @@ static int nvme_start_ctrl(NvmeCtrl *n)nvme_set_timestamp (n,0ULL ); +QTAILQ_INIT (&n->aer_queue); +return 0 ; }
@@ -1402,6 +1537,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)"completion queue doorbell write" " for nonexistent queue," " sqid=%"PRIu32", ignoring", qid); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_REGISTER , +NVME_LOG_ERROR_INFO ); + } +return ; }
@@ -1412,6 +1554,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)" beyond queue size, sqid=%" PRIu32"," " new_head=%" PRIu16", ignoring" , qid, new_head); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_VALUE , +NVME_LOG_ERROR_INFO ); + } +return ; }
@@ -1440,6 +1589,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)"submission queue doorbell write" " for nonexistent queue," " sqid=%"PRIu32", ignoring", qid); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_REGISTER , +NVME_LOG_ERROR_INFO ); + } +return ; }
@@ -1450,6 +1606,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)" beyond queue size, sqid=%" PRIu32"," " new_tail=%" PRIu16", ignoring" , qid, new_tail); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_VALUE , +NVME_LOG_ERROR_INFO ); + } +return ; }
@@ -1553,6 +1716,7 @@ static void nvme_init_state(NvmeCtrl *n) n->temperature =NVME_TEMPERATURE ; n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; n->starttime_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); + n->aer_reqs = g_new0(NvmeRequest *, n->params.aerl + 1); }static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev)
@@ -1628,6 +1792,7 @@ static void nvme_init_ctrl(NvmeCtrl *n)* inconsequential. */ id->acl =3 ; + id->aerl = n->params.aerl; id->frmw =7 <<1 ; id->lpa =1 <<2 ;
@@ -1713,6 +1878,7 @@ static void nvme_exit(PCIDevice *pci_dev)g_free (n->namespaces);g_free (n->cq);g_free (n->sq); +g_free (n->aer_reqs);if (n->params.cmb_size_mb) {g_free (n->cmbuf);
hw/block/nvme.h +12 -2
@@ -7,17 +7,21 @@DEFINE_PROP_STRING ("serial" , _state, _props.serial), \DEFINE_PROP_UINT32 ("cmb_size_mb" , _state, _props.cmb_size_mb,0 ), \DEFINE_PROP_UINT32 ("num_queues" , _state, _props.num_queues,0 ), \ - DEFINE_PROP_UINT32("max_ioqpairs", _state, _props.max_ioqpairs, 64) +DEFINE_PROP_UINT32 ("max_ioqpairs" , _state, _props.max_ioqpairs,64 ), \ +DEFINE_PROP_UINT8 ("aerl" , _state, _props.aerl,3 ), \ + DEFINE_PROP_UINT32("aer_max_queued", _state, _props.aer_max_queued, 64)typedef struct NvmeParams {char *serial;uint32_t num_queues;uint32_t max_ioqpairs;uint32_t cmb_size_mb; +uint8_t aerl; +uint32_t aer_max_queued; }NvmeParams ;typedef struct NvmeAsyncEvent { -QSIMPLEQ_ENTRY (NvmeAsyncEvent) entry; +QTAILQ_ENTRY (NvmeAsyncEvent) entry;NvmeAerResult result; }NvmeAsyncEvent ;
@@ -104,6 +108,7 @@ typedef struct NvmeCtrl {uint32_t num_namespaces;uint32_t max_q_ents;uint64_t ns_size; +uint8_t outstanding_aers;uint8_t *cmbuf;uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */
@@ -111,6 +116,11 @@ typedef struct NvmeCtrl {uint16_t temperature;uint64_t starttime_ms; +uint8_t aer_mask; +NvmeRequest **aer_reqs; + QTAILQ_HEAD(, NvmeAsyncEvent) aer_queue; +int aer_queued; +NvmeNamespace *namespaces;NvmeSQueue **sq;NvmeCQueue **cq;
hw/block/trace-events +9 -0
@@ -47,6 +47,15 @@ nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_ nvme_dev_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" nvme_dev_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" +nvme_dev_process_aers(int queued) "queued %d" +nvme_dev_aer(uint16_t cid) "cid %"PRIu16"" +nvme_dev_aer_aerl_exceeded(void) "aerl exceeded" +nvme_dev_aer_masked(uint8_t type, uint8_t mask) "type 0x%"PRIx8" mask 0x%"PRIx8"" +nvme_dev_aer_post_cqe(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" +nvme_dev_enqueue_event(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" +nvme_dev_enqueue_event_noqueue(int queued) "queued %d" +nvme_dev_enqueue_event_masked(uint8_t typ) "type 0x%"PRIx8"" +nvme_dev_no_outstanding_aers(void) "ignoring event; no outstanding AERs" nvme_dev_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64""
include/block/nvme.h +6 -2
@@ -425,8 +425,8 @@ enum NvmeAsyncEventRequest {NVME_AER_TYPE_SMART =1 ,NVME_AER_TYPE_IO_SPECIFIC =6 ,NVME_AER_TYPE_VENDOR_SPECIFIC =7 , -NVME_AER_INFO_ERR_INVALID_SQ =0 , -NVME_AER_INFO_ERR_INVALID_DB =1 , +NVME_AER_INFO_ERR_INVALID_DB_REGISTER =0 , +NVME_AER_INFO_ERR_INVALID_DB_VALUE =1 ,NVME_AER_INFO_ERR_DIAG_FAIL =2 ,NVME_AER_INFO_ERR_PERS_INTERNAL_ERR =3 , NVME_AER_INFO_ERR_TRANS_INTERNAL_ERR = 4,
@@ -717,6 +717,10 @@ typedef struct NvmeFeatureVal {#define NVME_TEMP_TMPSEL (temp) ((temp >> 16) & 0xf)#define NVME_TEMP_TMPTH (temp) ((temp >> 0) & 0xffff) +#define NVME_AEC_SMART (aec) (aec & 0xff) +#define NVME_AEC_NS_ATTR (aec) ((aec >> 8) & 0x1) +#define NVME_AEC_FW_ACTIVATION (aec) ((aec >> 9) & 0x1) +enum NvmeFeatureIds {NVME_ARBITRATION =0x1 ,NVME_POWER_MANAGEMENT =0x2 ,
Signature · 1 line
2.25.1
Re: [PATCH v6 13/42] nvme: add support for the asynchronous event request command
Quoted 426 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Required for compliance with NVMe revision 1.2.1. See NVM Express 1.2.1, Section 5.2 ("Asynchronous Event Request command").
Mostly imported from Keith's qemu-nvme tree. Modified with a max number of queued events (controllable with the
aer_max_queueddevice parameter). The spec states that the controller *should* retain events, so we do best effort here.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 178 ++++++++++++++++++++++++++++++++++++++++-- hw/block/nvme.h | 14 +++- hw/block/trace-events | 9 +++ include/block/nvme.h | 8 +- 4 files changed, 199 insertions(+), 10 deletions(-)hw/block/nvme.c +172
-6@@ -325,6 +325,85 @@ static void nvme_enqueue_req_completion(NvmeCQueue *cq, NvmeRequest *req)timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 ); } +static void nvme_process_aers (void *opaque) +{ +NvmeCtrl *n = opaque; +NvmeAsyncEvent *event, *next; + +trace_nvme_dev_process_aers (n->aer_queued); + + QTAILQ_FOREACH_SAFE(event, &n->aer_queue, entry, next) { +NvmeRequest *req; +NvmeAerResult *result; + +/* can't post cqe if there is nothing to complete */ +if (!n->outstanding_aers) { +trace_nvme_dev_no_outstanding_aers (); +break ; + } + +/* ignore if masked (cqe posted, but event not cleared) */ +if (n->aer_mask & (1 << event->result.event_type)) { +trace_nvme_dev_aer_masked (event->result.event_type, n->aer_mask); +continue ; + } + +QTAILQ_REMOVE (&n->aer_queue, event, entry); + n->aer_queued--; + + n->aer_mask |=1 << event->result.event_type; + n->outstanding_aers--; + + req = n->aer_reqs[n->outstanding_aers]; + + result = (NvmeAerResult *) &req->cqe.result; + result->event_type = event->result.event_type; + result->event_info = event->result.event_info; + result->log_page = event->result.log_page; +g_free (event); + + req->status =NVME_SUCCESS ; + +trace_nvme_dev_aer_post_cqe (result->event_type, result->event_info, + result->log_page); + +nvme_enqueue_req_completion (&n->admin_cq, req); + } +} + +static void nvme_enqueue_event (NvmeCtrl *n,uint8_t event_type, +uint8_t event_info,uint8_t log_page) +{ +NvmeAsyncEvent *event; + +trace_nvme_dev_enqueue_event (event_type, event_info, log_page); + +if (n->aer_queued == n->params.aer_max_queued) { +trace_nvme_dev_enqueue_event_noqueue (n->aer_queued); +return ; + } + + event =g_new (NvmeAsyncEvent,1 ); + event->result = (NvmeAerResult ) { + .event_type = event_type, + .event_info = event_info, + .log_page = log_page, + }; + +QTAILQ_INSERT_TAIL (&n->aer_queue, event, entry); + n->aer_queued++; + +nvme_process_aers (n); +} + +static void nvme_clear_events (NvmeCtrl *n,uint8_t event_type) +{ + n->aer_mask &= ~(1 << event_type); +if (!QTAILQ_EMPTY (&n->aer_queue)) { +nvme_process_aers (n); + } +} +static void nvme_rw_cb (void *opaque,int ret) {NvmeRequest *req = opaque;@@ -569,8 +648,9 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } -static uint16_t nvme_smart_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, -uint64_t off,NvmeRequest *req) +static uint16_t nvme_smart_info (NvmeCtrl *n,NvmeCmd *cmd,uint8_t rae, +uint32_t buf_len,uint64_t off, +NvmeRequest *req) {uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);@@ -619,6 +699,10 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, smart.power_on_hours[0 ] =cpu_to_le64 ((((current_ms - n->starttime_ms) /1000 ) /60 ) /60 ); +if (!rae) { +nvme_clear_events (n,NVME_AER_TYPE_SMART ); + } +return nvme_dma_read_prp (n, (uint8_t *) &smart + off, trans_len, prp1, prp2); }@@ -643,14 +727,19 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, prp2); } -static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, -uint64_t off,NvmeRequest *req) +static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint8_t rae, +uint32_t buf_len,uint64_t off, +NvmeRequest *req) {uint32_t trans_len;uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);uint8_t errlog[64 ]; +if (!rae) { +nvme_clear_events (n,NVME_AER_TYPE_ERROR ); + } +if (off >sizeof (errlog)) {return NVME_INVALID_FIELD |NVME_DNR ; }@@ -690,9 +779,9 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)switch (lid) {case NVME_LOG_ERROR_INFO : -return nvme_error_info (n, cmd, len, off, req); +return nvme_error_info (n, cmd, rae, len, off, req);case NVME_LOG_SMART_INFO : -return nvme_smart_info (n, cmd, len, off, req); +return nvme_smart_info (n, cmd, rae, len, off, req);case NVME_LOG_FW_SLOT_INFO :return nvme_fw_log_info (n, cmd, len, off, req);default :@@ -969,6 +1058,9 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd); +case NVME_ASYNCHRONOUS_EVENT_CONF : + result =cpu_to_le32 (n->features.async_config); +break ;default :trace_nvme_dev_err_invalid_getfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;@@ -1018,6 +1110,14 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_INVALID_FIELD |NVME_DNR ; } +if (((n->temperature > n->features.temp_thresh_hi) || + (n->temperature < n->features.temp_thresh_low)) && +NVME_AEC_SMART (n->features.async_config) &NVME_SMART_TEMPERATURE ) { +nvme_enqueue_event (n,NVME_AER_TYPE_SMART , +NVME_AER_INFO_SMART_TEMP_THRESH , +NVME_LOG_SMART_INFO ); + } +break ;case NVME_VOLATILE_WRITE_CACHE :blk_set_enable_write_cache (n->conf.blk, dw11 &1 );@@ -1032,6 +1132,9 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_set_feature_timestamp (n, cmd); +case NVME_ASYNCHRONOUS_EVENT_CONF : + n->features.async_config = dw11; +break ;default :trace_nvme_dev_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;@@ -1039,6 +1142,25 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_SUCCESS ; } +static uint16_t nvme_aer (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +trace_nvme_dev_aer (nvme_cid (req)); + +if (n->outstanding_aers > n->params.aerl) { +trace_nvme_dev_aer_aerl_exceeded (); +return NVME_AER_LIMIT_EXCEEDED ; + } + + n->aer_reqs[n->outstanding_aers] = req; + n->outstanding_aers++; + +if (!QTAILQ_EMPTY (&n->aer_queue)) { +nvme_process_aers (n); + } + +return NVME_NO_COMPLETE ; +} +static uint16_t nvme_admin_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) {switch (cmd->opcode) {@@ -1060,6 +1182,8 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return nvme_set_feature (n, cmd, req);case NVME_ADM_CMD_GET_FEATURES :return nvme_get_feature (n, cmd, req); +case NVME_ADM_CMD_ASYNC_EV_REQ : +return nvme_aer (n, cmd, req);default :trace_nvme_dev_err_invalid_admin_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ;@@ -1114,6 +1238,15 @@ static void nvme_clear_ctrl(NvmeCtrl *n) } } +while (!QTAILQ_EMPTY (&n->aer_queue)) { +NvmeAsyncEvent *event =QTAILQ_FIRST (&n->aer_queue); +QTAILQ_REMOVE (&n->aer_queue, event, entry); +g_free (event); + } + + n->aer_queued =0 ; + n->outstanding_aers =0 ; +blk_flush (n->conf.blk); n->bar.cc =0 ; }@@ -1210,6 +1343,8 @@ static int nvme_start_ctrl(NvmeCtrl *n)nvme_set_timestamp (n,0ULL ); +QTAILQ_INIT (&n->aer_queue); +return 0 ; }@@ -1402,6 +1537,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)"completion queue doorbell write" " for nonexistent queue," " sqid=%"PRIu32", ignoring", qid); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_REGISTER , +NVME_LOG_ERROR_INFO ); + } +return ; }@@ -1412,6 +1554,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)" beyond queue size, sqid=%" PRIu32"," " new_head=%" PRIu16", ignoring" , qid, new_head); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_VALUE , +NVME_LOG_ERROR_INFO ); + } +return ; }@@ -1440,6 +1589,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)"submission queue doorbell write" " for nonexistent queue," " sqid=%"PRIu32", ignoring", qid); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_REGISTER , +NVME_LOG_ERROR_INFO ); + } +return ; }@@ -1450,6 +1606,13 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)" beyond queue size, sqid=%" PRIu32"," " new_tail=%" PRIu16", ignoring" , qid, new_tail); + +if (n->outstanding_aers) { +nvme_enqueue_event (n,NVME_AER_TYPE_ERROR , +NVME_AER_INFO_ERR_INVALID_DB_VALUE , +NVME_LOG_ERROR_INFO ); + } +return ; }@@ -1553,6 +1716,7 @@ static void nvme_init_state(NvmeCtrl *n) n->temperature =NVME_TEMPERATURE ; n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; n->starttime_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); + n->aer_reqs = g_new0(NvmeRequest *, n->params.aerl + 1); }static void nvme_init_cmb (NvmeCtrl *n,PCIDevice *pci_dev)@@ -1628,6 +1792,7 @@ static void nvme_init_ctrl(NvmeCtrl *n)* inconsequential. */ id->acl =3 ; + id->aerl = n->params.aerl; id->frmw =7 <<1 ; id->lpa =1 <<2 ;@@ -1713,6 +1878,7 @@ static void nvme_exit(PCIDevice *pci_dev)g_free (n->namespaces);g_free (n->cq);g_free (n->sq); +g_free (n->aer_reqs);if (n->params.cmb_size_mb) {g_free (n->cmbuf);hw/block/nvme.h +12
-2@@ -7,17 +7,21 @@DEFINE_PROP_STRING ("serial" , _state, _props.serial), \DEFINE_PROP_UINT32 ("cmb_size_mb" , _state, _props.cmb_size_mb,0 ), \DEFINE_PROP_UINT32 ("num_queues" , _state, _props.num_queues,0 ), \ - DEFINE_PROP_UINT32("max_ioqpairs", _state, _props.max_ioqpairs, 64) +DEFINE_PROP_UINT32 ("max_ioqpairs" , _state, _props.max_ioqpairs,64 ), \ +DEFINE_PROP_UINT8 ("aerl" , _state, _props.aerl,3 ), \ + DEFINE_PROP_UINT32("aer_max_queued", _state, _props.aer_max_queued, 64)typedef struct NvmeParams {char *serial;uint32_t num_queues;uint32_t max_ioqpairs;uint32_t cmb_size_mb; +uint8_t aerl; +uint32_t aer_max_queued; }NvmeParams ;typedef struct NvmeAsyncEvent { -QSIMPLEQ_ENTRY (NvmeAsyncEvent) entry; +QTAILQ_ENTRY (NvmeAsyncEvent) entry;NvmeAerResult result; }NvmeAsyncEvent ;@@ -104,6 +108,7 @@ typedef struct NvmeCtrl {uint32_t num_namespaces;uint32_t max_q_ents;uint64_t ns_size; +uint8_t outstanding_aers;uint8_t *cmbuf;uint64_t irq_status;uint64_t host_timestamp;/* Timestamp sent by the host */ @@ -111,6 +116,11 @@ typedef struct NvmeCtrl {uint16_t temperature;uint64_t starttime_ms; +uint8_t aer_mask; +NvmeRequest **aer_reqs; + QTAILQ_HEAD(, NvmeAsyncEvent) aer_queue; +int aer_queued; +NvmeNamespace *namespaces;NvmeSQueue **sq;NvmeCQueue **cq;hw/block/trace-events +9
-0@@ -47,6 +47,15 @@ nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_ nvme_dev_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" nvme_dev_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" +nvme_dev_process_aers(int queued) "queued %d" +nvme_dev_aer(uint16_t cid) "cid %"PRIu16"" +nvme_dev_aer_aerl_exceeded(void) "aerl exceeded" +nvme_dev_aer_masked(uint8_t type, uint8_t mask) "type 0x%"PRIx8" mask 0x%"PRIx8"" +nvme_dev_aer_post_cqe(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" +nvme_dev_enqueue_event(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" +nvme_dev_enqueue_event_noqueue(int queued) "queued %d" +nvme_dev_enqueue_event_masked(uint8_t typ) "type 0x%"PRIx8"" +nvme_dev_no_outstanding_aers(void) "ignoring event; no outstanding AERs" nvme_dev_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64""include/block/nvme.h +2
-2@@ -425,8 +425,8 @@ enum NvmeAsyncEventRequest {NVME_AER_TYPE_SMART =1 ,NVME_AER_TYPE_IO_SPECIFIC =6 ,NVME_AER_TYPE_VENDOR_SPECIFIC =7 , -NVME_AER_INFO_ERR_INVALID_SQ =0 , -NVME_AER_INFO_ERR_INVALID_DB =1 , +NVME_AER_INFO_ERR_INVALID_DB_REGISTER =0 , +NVME_AER_INFO_ERR_INVALID_DB_VALUE =1 ,NVME_AER_INFO_ERR_DIAG_FAIL =2 ,NVME_AER_INFO_ERR_PERS_INTERNAL_ERR =3 , NVME_AER_INFO_ERR_TRANS_INTERNAL_ERR = 4,
include/block/nvme.h typedef struct NvmeFeatureVal { · line 726
Quoted 10 lines
include/block/nvme.h +4
-0@@ -717,6 +717,10 @@ typedef struct NvmeFeatureVal {#define NVME_TEMP_TMPSEL (temp) ((temp >> 16) & 0xf)#define NVME_TEMP_TMPTH (temp) ((temp >> 0) & 0xffff) +#define NVME_AEC_SMART (aec) (aec & 0xff) +#define NVME_AEC_NS_ATTR (aec) ((aec >> 8) & 0x1) +#define NVME_AEC_FW_ACTIVATION (aec) ((aec >> 9) & 0x1) +enum NvmeFeatureIds {NVME_ARBITRATION =0x1 ,NVME_POWER_MANAGEMENT =0x2 ,
Indention issues indeed looks like all fixed,
All other minor changes are OK as well,
So,
Best regards,
Maxim Levitsky
PATCH v6 14/42 nvme: add missing mandatory features
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add support for returning a resonable response to Get/Set Features of mandatory features.
--- hw/block/nvme.c | 60 ++++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 2 ++ include/block/nvme.h | 6 ++++- 3 files changed, 66 insertions(+), 2 deletions(-)
hw/block/nvme.c +59 -1
@@ -1025,7 +1025,15 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw11 =le32_to_cpu (cmd->cdw11);uint32_t result; +trace_nvme_dev_getfeat (nvme_cid (req), dw10); +switch (dw10) { +case NVME_ARBITRATION : + result =cpu_to_le32 (n->features.arbitration); +break ; +case NVME_POWER_MANAGEMENT : + result =cpu_to_le32 (n->features.power_mgmt); +break ;case NVME_TEMPERATURE_THRESHOLD : result =0 ;
@@ -1046,9 +1054,12 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ; } +break ; +case NVME_ERROR_RECOVERY : + result =cpu_to_le32 (n->features.err_rec);break ;case NVME_VOLATILE_WRITE_CACHE : - result =blk_enable_write_cache (n->conf.blk); + result =cpu_to_le32 (blk_enable_write_cache (n->conf.blk));trace_nvme_dev_getfeat_vwcache (result ?"enabled" :"disabled" );break ;case NVME_NUMBER_OF_QUEUES :
@@ -1058,6 +1069,19 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd); +case NVME_INTERRUPT_COALESCING : + result =cpu_to_le32 (n->features.int_coalescing); +break ; +case NVME_INTERRUPT_VECTOR_CONF : +if ((dw11 &0xffff ) > n->params.max_ioqpairs +1 ) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + + result =cpu_to_le32 (n->features.int_vector_config[dw11 &0xffff ]); +break ; +case NVME_WRITE_ATOMICITY : + result =cpu_to_le32 (n->features.write_atomicity); +break ;case NVME_ASYNCHRONOUS_EVENT_CONF : result =cpu_to_le32 (n->features.async_config);break ;
@@ -1093,6 +1117,8 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw10 =le32_to_cpu (cmd->cdw10);uint32_t dw11 =le32_to_cpu (cmd->cdw11); +trace_nvme_dev_setfeat (nvme_cid (req), dw10, dw11); +switch (dw10) {case NVME_TEMPERATURE_THRESHOLD :if (NVME_TEMP_TMPSEL (dw11)) {
@@ -1120,6 +1146,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_VOLATILE_WRITE_CACHE : +if (blk_enable_write_cache (n->conf.blk)) { +blk_flush (n->conf.blk); + } +blk_set_enable_write_cache (n->conf.blk, dw11 &1 );break ;case NVME_NUMBER_OF_QUEUES :
@@ -1135,6 +1165,13 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_ASYNCHRONOUS_EVENT_CONF : n->features.async_config = dw11;break ; +case NVME_ARBITRATION : +case NVME_POWER_MANAGEMENT : +case NVME_ERROR_RECOVERY : +case NVME_INTERRUPT_COALESCING : +case NVME_INTERRUPT_VECTOR_CONF : +case NVME_WRITE_ATOMICITY : +return NVME_FEAT_NOT_CHANGABLE |NVME_DNR ;default :trace_nvme_dev_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;
@@ -1716,6 +1753,25 @@ static void nvme_init_state(NvmeCtrl *n) n->temperature =NVME_TEMPERATURE ; n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; n->starttime_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); + +/* +* There is no limit on the number of commands that the controller may +* launch at one time from a particular Submission Queue. +*/ + n->features.arbitration =NVME_ARB_AB_NOLIMIT ; + + n->features.int_vector_config =g_malloc0_n (n->params.max_ioqpairs +1 , +sizeof (*n->features.int_vector_config)); + +for (int i =0 ; i < n->params.max_ioqpairs +1 ; i++) { + n->features.int_vector_config[i] = i; + +/* interrupt coalescing is not supported for the admin queue */ +if (i ==0 ) { + n->features.int_vector_config[i] |=NVME_INTVC_NOCOALESCING ; + } + } + n->aer_reqs = g_new0(NvmeRequest *, n->params.aerl + 1); }
@@ -1804,6 +1860,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->cqes = (0x4 <<4 ) |0x4 ; id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROS |NVME_ONCS_TIMESTAMP ); + id->psd[0 ].mp =cpu_to_le16 (0x9c4 ); id->psd[0 ].enlat =cpu_to_le32 (0x10 ); id->psd[0 ].exlat =cpu_to_le32 (0x4 );
@@ -1879,6 +1936,7 @@ static void nvme_exit(PCIDevice *pci_dev)g_free (n->cq);g_free (n->sq);g_free (n->aer_reqs); +g_free (n->features.int_vector_config);if (n->params.cmb_size_mb) {g_free (n->cmbuf);
hw/block/trace-events +2 -0
@@ -41,6 +41,8 @@ nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" nvme_dev_identify_ctrl(void) "identify controller" nvme_dev_identify_ns(uint16_t ns) "identify namespace, nsid=%"PRIu16"" nvme_dev_identify_nslist(uint16_t ns) "identify namespace list, nsid=%"PRIu16"" +nvme_dev_getfeat(uint16_t cid, uint32_t fid) "cid %"PRIu16" fid 0x%"PRIx32"" +nvme_dev_setfeat(uint16_t cid, uint32_t fid, uint32_t val) "cid %"PRIu16" fid 0x%"PRIx32" val 0x%"PRIx32"" nvme_dev_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s" nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d"
include/block/nvme.h +5 -1
@@ -490,7 +490,8 @@ enum NvmeStatusCodes {NVME_FW_REQ_RESET =0x010b ,NVME_INVALID_QUEUE_DEL =0x010c ,NVME_FID_NOT_SAVEABLE =0x010d , -NVME_FID_NOT_NSID_SPEC =0x010f , +NVME_FEAT_NOT_CHANGABLE =0x010e , +NVME_FEAT_NOT_NS_SPEC =0x010f ,NVME_FW_REQ_SUSYSTEM_RESET =0x0110 ,NVME_CONFLICTING_ATTRS =0x0180 , NVME_INVALID_PROT_INFO = 0x0181,
@@ -706,6 +707,7 @@ typedef struct NvmeFeatureVal { } NvmeFeatureVal;#define NVME_ARB_AB (arb) (arb & 0x7) +#define NVME_ARB_AB_NOLIMIT 0x7#define NVME_ARB_LPW (arb) ((arb >> 8) & 0xff)#define NVME_ARB_MPW (arb) ((arb >> 16) & 0xff)#define NVME_ARB_HPW (arb) ((arb >> 24) & 0xff)
@@ -713,6 +715,8 @@ typedef struct NvmeFeatureVal {#define NVME_INTC_THR (intc) (intc & 0xff)#define NVME_INTC_TIME (intc) ((intc >> 8) & 0xff) +#define NVME_INTVC_NOCOALESCING (0x1 << 16) +#define NVME_TEMP_THSEL (temp) ((temp >> 20) & 0x3)#define NVME_TEMP_TMPSEL (temp) ((temp >> 16) & 0xf)#define NVME_TEMP_TMPTH (temp) ((temp >> 0) & 0xffff)
Signature · 1 line
2.25.1
Re: [PATCH v6 14/42] nvme: add missing mandatory features
Quoted 48 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for returning a resonable response to Get/Set Features of mandatory features.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 60 ++++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 2 ++ include/block/nvme.h | 6 ++++- 3 files changed, 66 insertions(+), 2 deletions(-)hw/block/nvme.c +12
-1@@ -1025,7 +1025,15 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw11 =le32_to_cpu (cmd->cdw11);uint32_t result; +trace_nvme_dev_getfeat (nvme_cid (req), dw10); +switch (dw10) { +case NVME_ARBITRATION : + result =cpu_to_le32 (n->features.arbitration); +break ; +case NVME_POWER_MANAGEMENT : + result =cpu_to_le32 (n->features.power_mgmt); +break ;case NVME_TEMPERATURE_THRESHOLD : result =0 ;@@ -1046,9 +1054,12 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ; } +break ; +case NVME_ERROR_RECOVERY : + result =cpu_to_le32 (n->features.err_rec);break ;case NVME_VOLATILE_WRITE_CACHE : - result =blk_enable_write_cache (n->conf.blk); + result =cpu_to_le32 (blk_enable_write_cache (n->conf.blk));trace_nvme_dev_getfeat_vwcache (result ?"enabled" :"disabled" );break ;case NVME_NUMBER_OF_QUEUES :
hw/block/nvme.c static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) · line 1078
Quoted 10 lines
hw/block/nvme.c +7
-0@@ -1058,6 +1069,19 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd); +case NVME_INTERRUPT_COALESCING : + result =cpu_to_le32 (n->features.int_coalescing); +break ; +case NVME_INTERRUPT_VECTOR_CONF : +if ((dw11 &0xffff ) > n->params.max_ioqpairs +1 ) { +return NVME_INVALID_FIELD |NVME_DNR ; + }
I still think that this should be >= since the interrupt vector is not zero based. So if we have for example 3 IO queues, then we have 4 queues in total which translates to irq numbers 0..3.
BTW the user of the device doesn't have to have 1:1 mapping between qid and msi interrupt index, in fact when MSI is not used, all the queues will map to the same vector, which will be interrupt 0 from point of view of the device IMHO.
So it kind of makes sense IMHO to have num_irqs or something, even if it technically equals to number of queues.
Quoted 19 lines
hw/block/nvme.c +8
-0+ + result =cpu_to_le32 (n->features.int_vector_config[dw11 &0xffff ]); +break ; +case NVME_WRITE_ATOMICITY : + result =cpu_to_le32 (n->features.write_atomicity); +break ;case NVME_ASYNCHRONOUS_EVENT_CONF : result =cpu_to_le32 (n->features.async_config);break ;@@ -1093,6 +1117,8 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw10 =le32_to_cpu (cmd->cdw10);uint32_t dw11 =le32_to_cpu (cmd->cdw11); +trace_nvme_dev_setfeat (nvme_cid (req), dw10, dw11); +switch (dw10) {case NVME_TEMPERATURE_THRESHOLD :if (NVME_TEMP_TMPSEL (dw11)) {
hw/block/nvme.c static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) · line 1151
Quoted 6 lines
hw/block/nvme.c +3
-0@@ -1120,6 +1146,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_VOLATILE_WRITE_CACHE : +if (blk_enable_write_cache (n->conf.blk)) { +blk_flush (n->conf.blk); + }
(not your fault) but the blk_enable_write_cache function name is highly misleading, since it doesn't enable anything but just gets the flag if the write cache is enabled. It really should be called blk_get_enable_write_cache.
Quoted 45 lines
hw/block/nvme.c +27
-0+blk_set_enable_write_cache (n->conf.blk, dw11 &1 );break ;case NVME_NUMBER_OF_QUEUES :@@ -1135,6 +1165,13 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_ASYNCHRONOUS_EVENT_CONF : n->features.async_config = dw11;break ; +case NVME_ARBITRATION : +case NVME_POWER_MANAGEMENT : +case NVME_ERROR_RECOVERY : +case NVME_INTERRUPT_COALESCING : +case NVME_INTERRUPT_VECTOR_CONF : +case NVME_WRITE_ATOMICITY : +return NVME_FEAT_NOT_CHANGABLE |NVME_DNR ;default :trace_nvme_dev_err_invalid_setfeat (dw10);return NVME_INVALID_FIELD |NVME_DNR ;@@ -1716,6 +1753,25 @@ static void nvme_init_state(NvmeCtrl *n) n->temperature =NVME_TEMPERATURE ; n->features.temp_thresh_hi =NVME_TEMPERATURE_WARNING ; n->starttime_ms =qemu_clock_get_ms (QEMU_CLOCK_VIRTUAL ); + +/* +* There is no limit on the number of commands that the controller may +* launch at one time from a particular Submission Queue. +*/ + n->features.arbitration =NVME_ARB_AB_NOLIMIT ; + + n->features.int_vector_config =g_malloc0_n (n->params.max_ioqpairs +1 , +sizeof (*n->features.int_vector_config)); + +for (int i =0 ; i < n->params.max_ioqpairs +1 ; i++) { + n->features.int_vector_config[i] = i; + +/* interrupt coalescing is not supported for the admin queue */ +if (i ==0 ) { + n->features.int_vector_config[i] |=NVME_INTVC_NOCOALESCING ; + } + } + n->aer_reqs = g_new0(NvmeRequest *, n->params.aerl + 1); }
hw/block/nvme.c static void nvme_init_ctrl(NvmeCtrl *n) · line 1863
Quoted 4 lines
hw/block/nvme.c +1
-0@@ -1804,6 +1860,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->cqes = (0x4 <<4 ) |0x4 ; id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROS |NVME_ONCS_TIMESTAMP ); +
Unrelated whitespace change
Quoted 47 lines
hw/block/nvme.c +1
-0id->psd[0 ].mp =cpu_to_le16 (0x9c4 ); id->psd[0 ].enlat =cpu_to_le32 (0x10 ); id->psd[0 ].exlat =cpu_to_le32 (0x4 );@@ -1879,6 +1936,7 @@ static void nvme_exit(PCIDevice *pci_dev)g_free (n->cq);g_free (n->sq);g_free (n->aer_reqs); +g_free (n->features.int_vector_config);if (n->params.cmb_size_mb) {g_free (n->cmbuf);hw/block/trace-events +2
-0@@ -41,6 +41,8 @@ nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" nvme_dev_identify_ctrl(void) "identify controller" nvme_dev_identify_ns(uint16_t ns) "identify namespace, nsid=%"PRIu16"" nvme_dev_identify_nslist(uint16_t ns) "identify namespace list, nsid=%"PRIu16"" +nvme_dev_getfeat(uint16_t cid, uint32_t fid) "cid %"PRIu16" fid 0x%"PRIx32"" +nvme_dev_setfeat(uint16_t cid, uint32_t fid, uint32_t val) "cid %"PRIu16" fid 0x%"PRIx32" val 0x%"PRIx32"" nvme_dev_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s" nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d"include/block/nvme.h +3
-1@@ -490,7 +490,8 @@ enum NvmeStatusCodes {NVME_FW_REQ_RESET =0x010b ,NVME_INVALID_QUEUE_DEL =0x010c ,NVME_FID_NOT_SAVEABLE =0x010d , -NVME_FID_NOT_NSID_SPEC =0x010f , +NVME_FEAT_NOT_CHANGABLE =0x010e , +NVME_FEAT_NOT_NS_SPEC =0x010f ,NVME_FW_REQ_SUSYSTEM_RESET =0x0110 ,NVME_CONFLICTING_ATTRS =0x0180 , NVME_INVALID_PROT_INFO = 0x0181,@@ -706,6 +707,7 @@ typedef struct NvmeFeatureVal { } NvmeFeatureVal;#define NVME_ARB_AB (arb) (arb & 0x7) +#define NVME_ARB_AB_NOLIMIT 0x7#define NVME_ARB_LPW (arb) ((arb >> 8) & 0xff)#define NVME_ARB_MPW (arb) ((arb >> 16) & 0xff)#define NVME_ARB_HPW (arb) ((arb >> 24) & 0xff)
include/block/nvme.h typedef struct NvmeFeatureVal { · line 722
Quoted 8 lines
include/block/nvme.h +2
-0@@ -713,6 +715,8 @@ typedef struct NvmeFeatureVal {#define NVME_INTC_THR (intc) (intc & 0xff)#define NVME_INTC_TIME (intc) ((intc >> 8) & 0xff) +#define NVME_INTVC_NOCOALESCING (0x1 << 16) +#define NVME_TEMP_THSEL (temp) ((temp >> 20) & 0x3)#define NVME_TEMP_TMPSEL (temp) ((temp >> 16) & 0xf)#define NVME_TEMP_TMPTH (temp) ((temp >> 0) & 0xffff)
Best regards,
Maxim Levitsky
Re: [PATCH v6 14/42] nvme: add missing mandatory features
Quoted 24 lines · Maxim Levitsky
Quoted 23 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for returning a resonable response to Get/Set Features of mandatory features.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 60 ++++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 2 ++ include/block/nvme.h | 6 ++++- 3 files changed, 66 insertions(+), 2 deletions(-)hw/block/nvme.c +2
-0@@ -1058,6 +1069,19 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd); +case NVME_INTERRUPT_COALESCING : + result =cpu_to_le32 (n->features.int_coalescing);
Quoted 9 lines
hw/block/nvme.c static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) · line 1078
Quoted 5 lines
hw/block/nvme.c +5
-0+break ; +case NVME_INTERRUPT_VECTOR_CONF : +if ((dw11 &0xffff ) > n->params.max_ioqpairs +1 ) { +return NVME_INVALID_FIELD |NVME_DNR ; + }I still think that this should be >= since the interrupt vector is not zero based. So if we have for example 3 IO queues, then we have 4 queues in total which translates to irq numbers 0..3.
Yes you are right. The device will support max_ioqpairs + 1 IVs, so trying to access that would actually go 1 beyond the array.
Fixed.
Quoted 5 lines
BTW the user of the device doesn't have to have 1:1 mapping between qid and msi interrupt index, in fact when MSI is not used, all the queues will map to the same vector, which will be interrupt 0 from point of view of the device IMHO.
So it kind of makes sense IMHO to havenum_irqsor something, even if it technically equals to number of queues.
Yeah, but the device will still *support* the N IVs, so they can still be configured even though they will not be used. So I don't think we need to introduce an additional parameter?
Quoted 12 lines
hw/block/nvme.c static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) · line 1151
Quoted 7 lines
hw/block/nvme.c +3
-0@@ -1120,6 +1146,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_VOLATILE_WRITE_CACHE : +if (blk_enable_write_cache (n->conf.blk)) { +blk_flush (n->conf.blk); + }(not your fault) but the
blk_enable_write_cachefunction name is highly misleading, since it doesn't enable anything but just gets the flag if the write cache is enabled. It really should be calledblk_get_enable_write_cache.
Agreed :)
Quoted 6 lines
hw/block/nvme.c static void nvme_init_ctrl(NvmeCtrl *n) · line 1863
Quoted 5 lines
hw/block/nvme.c +1
-0@@ -1804,6 +1860,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->cqes = (0x4 <<4 ) |0x4 ; id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROS |NVME_ONCS_TIMESTAMP ); +Unrelated whitespace change
Fixed.
Quoted 7 lines
Best regards,
Maxim Levitsky
Re: [PATCH v6 14/42] nvme: add missing mandatory features
Quoted 47 lines · Klaus Birkelund Jensen
Quoted 25 lines · Maxim Levitsky
Quoted 24 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add support for returning a resonable response to Get/Set Features of mandatory features.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 60 ++++++++++++++++++++++++++++++++++++++++++- hw/block/trace-events | 2 ++ include/block/nvme.h | 6 ++++- 3 files changed, 66 insertions(+), 2 deletions(-)hw/block/nvme.c +3
-0@@ -1058,6 +1069,19 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_TIMESTAMP :return nvme_get_feature_timestamp (n, cmd); +case NVME_INTERRUPT_COALESCING : + result =cpu_to_le32 (n->features.int_coalescing); +break ;Quoted 9 lines
hw/block/nvme.c static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) · line 1078
Quoted 4 lines
hw/block/nvme.c +4
-0+case NVME_INTERRUPT_VECTOR_CONF : +if ((dw11 &0xffff ) > n->params.max_ioqpairs +1 ) { +return NVME_INVALID_FIELD |NVME_DNR ; + }I still think that this should be >= since the interrupt vector is not zero based. So if we have for example 3 IO queues, then we have 4 queues in total which translates to irq numbers 0..3.
Yes you are right. The device will support
max_ioqpairs+ 1 IVs, so trying to access that would actually go 1 beyond the array.Fixed.
Quoted 5 lines
BTW the user of the device doesn't have to have 1:1 mapping between qid and msi interrupt index, in fact when MSI is not used, all the queues will map to the same vector, which will be interrupt 0 from point of view of the device IMHO.
So it kind of makes sense IMHO to havenum_irqsor something, even if it technically equals to number of queues.
Quoted 3 lines
Yeah, but the device will still *support* the N IVs, so they can still be configured even though they will not be used. So I don't think we need to introduce an additional parameter?
Yes and no.
I wasn't thinking to add a new parameter for number of supporter interrupt vectors, but just to have an internal variable to represent it so that we could support in future case where these are not equal.
Also from point of view of validating the users of this virtual nvme drive, I think it kind of makes sense to allow having less supported IRQ vectors than IO queues, so to check how userspace copes with it. It is valid after all to have same interrupt vector shared between multiple queues.
In fact in theory (but that would complicate the implementation greatly) we should even support case when number of submission queues is not equal to number of completion queues. Yes nobody does in real hardware, and at least Linux nvme driver hard assumes 1:1 SQ/CQ mapping but still.
My nvme-mdev doesn't make this assumpiton (and neither any assumptions on interrupt vector counts) and allows the user to have any SQ/CQ mapping as far as the spec allows
(but it does hardcode maximum number of SQ/CQ supported)
BTW, I haven't looked at that but we should check that the virtual nvme drive can cope with using legacy interrupt (that is MSI disabled) - nvme-mdev does support this and was tested with it.
Quoted 24 lines
Quoted 13 lines
hw/block/nvme.c static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) · line 1151
Quoted 8 lines
hw/block/nvme.c +3
-0@@ -1120,6 +1146,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)break ;case NVME_VOLATILE_WRITE_CACHE : +if (blk_enable_write_cache (n->conf.blk)) { +blk_flush (n->conf.blk); + }(not your fault) but the
blk_enable_write_cachefunction name is highly misleading, since it doesn't enable anything but just gets the flag if the write cache is enabled. It really should be calledblk_get_enable_write_cache.Agreed :)
Quoted 7 lines
hw/block/nvme.c static void nvme_init_ctrl(NvmeCtrl *n) · line 1863
Quoted 5 lines
hw/block/nvme.c +1
-0@@ -1804,6 +1860,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->cqes = (0x4 <<4 ) |0x4 ; id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROS |NVME_ONCS_TIMESTAMP ); +Unrelated whitespace change
Quoted 9 lines
Fixed.
Quoted 7 lines
Best regards,
Maxim Levitsky
Best regards,
Maxim Levitsky
Quoted 2 lines
Re: [PATCH v6 14/42] nvme: add missing mandatory features
Quoted 17 lines · Maxim Levitsky
Quoted 10 lines · Klaus Birkelund Jensen
Quoted 5 lines · Maxim Levitsky
BTW the user of the device doesn't have to have 1:1 mapping between qid and msi interrupt index, in fact when MSI is not used, all the queues will map to the same vector, which will be interrupt 0 from point of view of the device IMHO.
So it kind of makes sense IMHO to havenum_irqsor something, even if it technically equals to number of queues.Yeah, but the device will still *support* the N IVs, so they can still be configured even though they will not be used. So I don't think we need to introduce an additional parameter?
Yes and no.
I wasn't thinking to add a new parameter for number of supporter interrupt vectors, but just to have an internal variable to represent it so that we could support in future case where these are not equal.
Quoted 5 lines
Also from point of view of validating the users of this virtual nvme drive, I think it kind of makes sense to allow having less supported IRQ vectors than IO queues, so to check how userspace copes with it. It is valid after all to have same interrupt vector shared between multiple queues.
I see that this could be useful for testing, but I think we can defer that to a later patch. Would you be okay with that for now?
Quoted 4 lines
In fact in theory (but that would complicate the implementation greatly) we should even support case when number of submission queues is not equal to number of completion queues. Yes nobody does in real hardware, and at least Linux nvme driver hard assumes 1:1 SQ/CQ mapping but still.
It is not the hardware that decides this and I believe that there definitely are applications that chooses to associate multiple SQs with a single CQ. The CQ is an attribute of the SQ and the IV of the CQ is also specified in the create command. I believe this is already supported.
Quoted 7 lines
My nvme-mdev doesn't make this assumpiton (and neither any assumptions on interrupt vector counts) and allows the user to have any SQ/CQ mapping as far as the spec allows
(but it does hardcode maximum number of SQ/CQ supported)BTW, I haven't looked at that but we should check that the virtual nvme drive can cope with using legacy interrupt (that is MSI disabled) - nvme-mdev does support this and was tested with it.
Yes, this is definitely not very well tested.
If you insist on all of the above being implemented, then I will do it, but I would rather defer this to later patches as this series is already pretty large ;)
PATCH v6 15/42 nvme: additional tracing
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add additional trace calls for nvme_enqueue_req_completion, mmio and doorbell writes.
Also, streamline nvme_identify_ns and nvme_identify_ns_list. They do not need to repeat the command, it is already in the trace name.
--- hw/block/nvme.c | 10 ++++++++++ hw/block/trace-events | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
hw/block/nvme.c +10 -0
@@ -320,6 +320,8 @@ static void nvme_post_cqes(void *opaque)static void nvme_enqueue_req_completion (NvmeCQueue *cq,NvmeRequest *req) {assert (cq->cqid == req->sq->cqid); +trace_nvme_dev_enqueue_req_completion (nvme_cid (req), cq->cqid, + req->status);QTAILQ_REMOVE (&req->sq->out_req_list, req, entry);QTAILQ_INSERT_TAIL (&cq->req_list, req, entry);timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 );
@@ -1527,6 +1529,8 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)uint8_t *ptr = (uint8_t *)&n->bar;uint64_t val =0 ; +trace_nvme_dev_mmio_read (addr); +if (unlikely (addr & (sizeof (uint32_t ) -1 ))) {NVME_GUEST_ERR (nvme_dev_ub_mmiord_misaligned32, "MMIO read not 32-bit aligned,"
@@ -1601,6 +1605,8 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)return ; } +trace_nvme_dev_mmio_doorbell_cq (cq->cqid, new_head); + start_sqs =nvme_cq_full (cq) ?1 :0 ; cq->head = new_head;if (start_sqs) {
@@ -1653,6 +1659,8 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)return ; } +trace_nvme_dev_mmio_doorbell_sq (sq->sqid, new_tail); + sq->tail = new_tail;timer_mod (sq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 ); }
@@ -1661,6 +1669,8 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)static void nvme_mmio_write (void *opaque,hwaddr addr,uint64_t data,unsigned size) { +trace_nvme_dev_mmio_write (addr, data); +NvmeCtrl *n = (NvmeCtrl *)opaque;if (addr <sizeof (n->bar)) {nvme_write_bar (n, addr, data, size);
hw/block/trace-events +7 -2
@@ -39,8 +39,8 @@ nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, nvme_dev_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" nvme_dev_identify_ctrl(void) "identify controller" -nvme_dev_identify_ns(uint16_t ns) "identify namespace, nsid=%"PRIu16"" -nvme_dev_identify_nslist(uint16_t ns) "identify namespace list, nsid=%"PRIu16"" +nvme_dev_identify_ns(uint32_t ns) "nsid %"PRIu32"" +nvme_dev_identify_nslist(uint32_t ns) "nsid %"PRIu32"" nvme_dev_getfeat(uint16_t cid, uint32_t fid) "cid %"PRIu16" fid 0x%"PRIx32"" nvme_dev_setfeat(uint16_t cid, uint32_t fid, uint32_t val) "cid %"PRIu16" fid 0x%"PRIx32" val 0x%"PRIx32"" nvme_dev_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s"
@@ -54,10 +54,13 @@ nvme_dev_aer(uint16_t cid) "cid %"PRIu16"" nvme_dev_aer_aerl_exceeded(void) "aerl exceeded" nvme_dev_aer_masked(uint8_t type, uint8_t mask) "type 0x%"PRIx8" mask 0x%"PRIx8"" nvme_dev_aer_post_cqe(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" +nvme_dev_enqueue_req_completion(uint16_t cid, uint16_t cqid, uint16_t status) "cid %"PRIu16" cqid %"PRIu16" status 0x%"PRIx16"" nvme_dev_enqueue_event(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" nvme_dev_enqueue_event_noqueue(int queued) "queued %d" nvme_dev_enqueue_event_masked(uint8_t typ) "type 0x%"PRIx8"" nvme_dev_no_outstanding_aers(void) "ignoring event; no outstanding AERs" +nvme_dev_mmio_read(uint64_t addr) "addr 0x%"PRIx64"" +nvme_dev_mmio_write(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64"" nvme_dev_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64""
@@ -70,6 +73,8 @@ nvme_dev_mmio_start_success(void) "setting controller enable bit succeeded" nvme_dev_mmio_stopped(void) "cleared controller enable bit" nvme_dev_mmio_shutdown_set(void) "shutdown bit set" nvme_dev_mmio_shutdown_cleared(void) "shutdown bit cleared" +nvme_dev_mmio_doorbell_cq(uint16_t cqid, uint16_t new_head) "cqid %"PRIu16" new_head %"PRIu16"" +nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_tail %"PRIu16"" # nvme traces for error conditions nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size"
Signature · 1 line
2.25.1
Re: [PATCH v6 15/42] nvme: additional tracing
Quoted 94 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add additional trace calls for
nvme_enqueue_req_completion, mmio and doorbell writes.Also, streamline
nvme_identify_nsandnvme_identify_ns_list. They do not need to repeat the command, it is already in the trace name.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 10 ++++++++++ hw/block/trace-events | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)hw/block/nvme.c +10
-0@@ -320,6 +320,8 @@ static void nvme_post_cqes(void *opaque)static void nvme_enqueue_req_completion (NvmeCQueue *cq,NvmeRequest *req) {assert (cq->cqid == req->sq->cqid); +trace_nvme_dev_enqueue_req_completion (nvme_cid (req), cq->cqid, + req->status);QTAILQ_REMOVE (&req->sq->out_req_list, req, entry);QTAILQ_INSERT_TAIL (&cq->req_list, req, entry);timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 );@@ -1527,6 +1529,8 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)uint8_t *ptr = (uint8_t *)&n->bar;uint64_t val =0 ; +trace_nvme_dev_mmio_read (addr); +if (unlikely (addr & (sizeof (uint32_t ) -1 ))) {NVME_GUEST_ERR (nvme_dev_ub_mmiord_misaligned32, "MMIO read not 32-bit aligned,"@@ -1601,6 +1605,8 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)return ; } +trace_nvme_dev_mmio_doorbell_cq (cq->cqid, new_head); + start_sqs =nvme_cq_full (cq) ?1 :0 ; cq->head = new_head;if (start_sqs) {@@ -1653,6 +1659,8 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)return ; } +trace_nvme_dev_mmio_doorbell_sq (sq->sqid, new_tail); + sq->tail = new_tail;timer_mod (sq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 ); }@@ -1661,6 +1669,8 @@ static void nvme_process_db(NvmeCtrl *n, hwaddr addr, int val)static void nvme_mmio_write (void *opaque,hwaddr addr,uint64_t data,unsigned size) { +trace_nvme_dev_mmio_write (addr, data); +NvmeCtrl *n = (NvmeCtrl *)opaque;if (addr <sizeof (n->bar)) {nvme_write_bar (n, addr, data, size);hw/block/trace-events +5
-2@@ -39,8 +39,8 @@ nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, nvme_dev_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16"" nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" nvme_dev_identify_ctrl(void) "identify controller" -nvme_dev_identify_ns(uint16_t ns) "identify namespace, nsid=%"PRIu16"" -nvme_dev_identify_nslist(uint16_t ns) "identify namespace list, nsid=%"PRIu16"" +nvme_dev_identify_ns(uint32_t ns) "nsid %"PRIu32"" +nvme_dev_identify_nslist(uint32_t ns) "nsid %"PRIu32"" nvme_dev_getfeat(uint16_t cid, uint32_t fid) "cid %"PRIu16" fid 0x%"PRIx32"" nvme_dev_setfeat(uint16_t cid, uint32_t fid, uint32_t val) "cid %"PRIu16" fid 0x%"PRIx32" val 0x%"PRIx32"" nvme_dev_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s"@@ -54,10 +54,13 @@ nvme_dev_aer(uint16_t cid) "cid %"PRIu16"" nvme_dev_aer_aerl_exceeded(void) "aerl exceeded" nvme_dev_aer_masked(uint8_t type, uint8_t mask) "type 0x%"PRIx8" mask 0x%"PRIx8"" nvme_dev_aer_post_cqe(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" +nvme_dev_enqueue_req_completion(uint16_t cid, uint16_t cqid, uint16_t status) "cid %"PRIu16" cqid %"PRIu16" status 0x%"PRIx16"" nvme_dev_enqueue_event(uint8_t typ, uint8_t info, uint8_t log_page) "type 0x%"PRIx8" info 0x%"PRIx8" lid 0x%"PRIx8"" nvme_dev_enqueue_event_noqueue(int queued) "queued %d" nvme_dev_enqueue_event_masked(uint8_t typ) "type 0x%"PRIx8"" nvme_dev_no_outstanding_aers(void) "ignoring event; no outstanding AERs" +nvme_dev_mmio_read(uint64_t addr) "addr 0x%"PRIx64"" +nvme_dev_mmio_write(uint64_t addr, uint64_t data) "addr 0x%"PRIx64" data 0x%"PRIx64"" nvme_dev_mmio_intm_set(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask set, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_intm_clr(uint64_t data, uint64_t new_mask) "wrote MMIO, interrupt mask clr, data=0x%"PRIx64", new_mask=0x%"PRIx64"" nvme_dev_mmio_cfg(uint64_t data) "wrote MMIO, config controller config=0x%"PRIx64""
hw/block/trace-events nvme_dev_mmio_start_success(void) "setting controller enable bit succeeded" · line 80
Quoted 8 lines
hw/block/trace-events +2
-0@@ -70,6 +73,8 @@ nvme_dev_mmio_start_success(void) "setting controller enable bit succeeded" nvme_dev_mmio_stopped(void) "cleared controller enable bit" nvme_dev_mmio_shutdown_set(void) "shutdown bit set" nvme_dev_mmio_shutdown_cleared(void) "shutdown bit cleared" +nvme_dev_mmio_doorbell_cq(uint16_t cqid, uint16_t new_head) "cqid %"PRIu16" new_head %"PRIu16"" +nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_tail %"PRIu16"" # nvme traces for error conditions nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size"
Looks good.
Best regards,
Maxim Levitsky
PATCH v6 16/42 nvme: make sure ncqr and nsqr is valid
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
0xffff is not an allowed value for NCQR and NSQR in Set Features on Number of Queues.
--- hw/block/nvme.c | 8 ++++++++ 1 file changed, 8 insertions(+)
hw/block/nvme.c +8 -0
@@ -1155,6 +1155,14 @@ 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 : +/* +* NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for NCQR +* and NSQR. +*/ +if ((dw11 &0xffff ) ==0xffff || ((dw11 >>16 ) &0xffff ) ==0xffff ) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + trace_nvme_dev_setfeat_numq((dw11 & 0xFFFF) + 1, ((dw11 >> 16) & 0xFFFF) + 1, n->params.max_ioqpairs,
Signature · 1 line
2.25.1
Re: [PATCH v6 16/42] nvme: make sure ncqr and nsqr is valid
Quoted 21 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
0xffffis not an allowed value for NCQR and NSQR in Set Features on Number of Queues.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 8 ++++++++ 1 file changed, 8 insertions(+)hw/block/nvme.c +1
-0@@ -1155,6 +1155,14 @@ 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 : +/*
hw/block/nvme.c static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) · line 1168
Quoted 10 lines
hw/block/nvme.c +7
-0+* NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for NCQR +* and NSQR. +*/ +if ((dw11 &0xffff ) ==0xffff || ((dw11 >>16 ) &0xffff ) ==0xffff ) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + trace_nvme_dev_setfeat_numq((dw11 & 0xFFFF) + 1, ((dw11 >> 16) & 0xFFFF) + 1, n->params.max_ioqpairs,
Best regards,
Maxim Levitsky
PATCH v6 17/42 nvme: add log specific field to trace events
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
The LSP field is not used directly now, but include it in the trace.
--- hw/block/nvme.c | 3 ++- hw/block/trace-events | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
hw/block/nvme.c +2 -1
@@ -760,6 +760,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw12 =le32_to_cpu (cmd->cdw12);uint32_t dw13 =le32_to_cpu (cmd->cdw13);uint8_t lid = dw10 &0xff ; +uint8_t lsp = (dw10 >>8 ) &0xf ;uint8_t rae = (dw10 >>15 ) &0x1 ;uint32_t numdl, numdu;uint64_t off, lpol, lpou;
@@ -777,7 +778,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_INVALID_FIELD |NVME_DNR ; } -trace_nvme_dev_get_log (nvme_cid (req), lid, rae, len, off); +trace_nvme_dev_get_log (nvme_cid (req), lid, lsp, rae, len, off);switch (lid) {case NVME_LOG_ERROR_INFO :
hw/block/trace-events +1 -1
@@ -48,7 +48,7 @@ nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d" nvme_dev_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" nvme_dev_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" -nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" +nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t lsp, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" lsp 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" nvme_dev_process_aers(int queued) "queued %d" nvme_dev_aer(uint16_t cid) "cid %"PRIu16"" nvme_dev_aer_aerl_exceeded(void) "aerl exceeded"
Signature · 1 line
2.25.1
Re: [PATCH v6 17/42] nvme: add log specific field to trace events
Quoted 36 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
The LSP field is not used directly now, but include it in the trace.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 3 ++- hw/block/trace-events | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)hw/block/nvme.c +2
-1@@ -760,6 +760,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t dw12 =le32_to_cpu (cmd->cdw12);uint32_t dw13 =le32_to_cpu (cmd->cdw13);uint8_t lid = dw10 &0xff ; +uint8_t lsp = (dw10 >>8 ) &0xf ;uint8_t rae = (dw10 >>15 ) &0x1 ;uint32_t numdl, numdu;uint64_t off, lpol, lpou;@@ -777,7 +778,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_INVALID_FIELD |NVME_DNR ; } -trace_nvme_dev_get_log (nvme_cid (req), lid, rae, len, off); +trace_nvme_dev_get_log (nvme_cid (req), lid, lsp, rae, len, off);switch (lid) {case NVME_LOG_ERROR_INFO :hw/block/trace-events +0
-0
hw/block/trace-events nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" · line 54
Quoted 8 lines
hw/block/trace-events +1
-1@@ -48,7 +48,7 @@ nvme_dev_getfeat_numq(int result) "get feature number of queues, result=%d" nvme_dev_setfeat_numq(int reqcq, int reqsq, int gotcq, int gotsq) "requested cq_count=%d sq_count=%d, responding with cq_count=%d sq_count=%d" nvme_dev_setfeat_timestamp(uint64_t ts) "set feature timestamp = 0x%"PRIx64"" nvme_dev_getfeat_timestamp(uint64_t ts) "get feature timestamp = 0x%"PRIx64"" -nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" +nvme_dev_get_log(uint16_t cid, uint8_t lid, uint8_t lsp, uint8_t rae, uint32_t len, uint64_t off) "cid %"PRIu16" lid 0x%"PRIx8" lsp 0x%"PRIx8" rae 0x%"PRIx8" len %"PRIu32" off %"PRIu64"" nvme_dev_process_aers(int queued) "queued %d" nvme_dev_aer(uint16_t cid) "cid %"PRIu16"" nvme_dev_aer_aerl_exceeded(void) "aerl exceeded"
Perfect!
Best regards,
Maxim Levitsky
PATCH v6 18/42 nvme: support identify namespace descriptor list
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Since we are not providing the NGUID or EUI64 fields, we must support the Namespace UUID. We do not have any way of storing a persistent unique identifier, so conjure up a UUID that is just the namespace id.
--- hw/block/nvme.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/block/trace-events | 1 + 2 files changed, 39 insertions(+)
hw/block/nvme.c +38 -0
@@ -942,6 +942,42 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)return ret; } +static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeIdentify *c) +{ +uint32_t nsid =le32_to_cpu (c->nsid); +uint64_t prp1 =le64_to_cpu (c->prp1); +uint64_t prp2 =le64_to_cpu (c->prp2); + +void *list; +uint16_t ret; +NvmeIdNsDescr *ns_descr; + +trace_nvme_dev_identify_ns_descr_list (nsid); + +if (unlikely (nsid ==0 || nsid > n->num_namespaces)) { +trace_nvme_dev_err_invalid_ns (nsid, n->num_namespaces); +return NVME_INVALID_NSID |NVME_DNR ; + } + + list =g_malloc0 (NVME_IDENTIFY_DATA_SIZE ); + ns_descr = list; + +/* +* Because the NGUID and EUI64 fields are 0 in the Identify Namespace data +* structure, a Namespace UUID (nidt = 0x3) must be reported in the +* Namespace Identification Descriptor. Add a very basic Namespace UUID +* here. +*/ + ns_descr->nidt =NVME_NIDT_UUID ; + ns_descr->nidl =NVME_NIDT_UUID_LEN ; +stl_be_p (ns_descr +sizeof (*ns_descr), nsid); + + ret =nvme_dma_read_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, + prp2); +g_free (list); +return ret; +} +static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd) {NvmeIdentify *c = (NvmeIdentify *)cmd;
@@ -953,6 +989,8 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd)return nvme_identify_ctrl (n, c);case NVME_ID_CNS_NS_ACTIVE_LIST :return nvme_identify_nslist (n, c); +case NVME_ID_CNS_NS_DESCR_LIST : +return nvme_identify_ns_descr_list (n, c);default :trace_nvme_dev_err_invalid_identify_cns (le32_to_cpu (c->cns));return NVME_INVALID_FIELD |NVME_DNR ;
hw/block/trace-events +1 -0
@@ -41,6 +41,7 @@ nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" nvme_dev_identify_ctrl(void) "identify controller" nvme_dev_identify_ns(uint32_t ns) "nsid %"PRIu32"" nvme_dev_identify_nslist(uint32_t ns) "nsid %"PRIu32"" +nvme_dev_identify_ns_descr_list(uint32_t ns) "nsid %"PRIu32"" nvme_dev_getfeat(uint16_t cid, uint32_t fid) "cid %"PRIu16" fid 0x%"PRIx32"" nvme_dev_setfeat(uint16_t cid, uint32_t fid, uint32_t val) "cid %"PRIu16" fid 0x%"PRIx32" val 0x%"PRIx32"" nvme_dev_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s"
Signature · 1 line
2.25.1
Re: [PATCH v6 18/42] nvme: support identify namespace descriptor list
Quoted 73 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Since we are not providing the NGUID or EUI64 fields, we must support the Namespace UUID. We do not have any way of storing a persistent unique identifier, so conjure up a UUID that is just the namespace id.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/block/trace-events | 1 + 2 files changed, 39 insertions(+)hw/block/nvme.c +38
-0@@ -942,6 +942,42 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)return ret; } +static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeIdentify *c) +{ +uint32_t nsid =le32_to_cpu (c->nsid); +uint64_t prp1 =le64_to_cpu (c->prp1); +uint64_t prp2 =le64_to_cpu (c->prp2); + +void *list; +uint16_t ret; +NvmeIdNsDescr *ns_descr; + +trace_nvme_dev_identify_ns_descr_list (nsid); + +if (unlikely (nsid ==0 || nsid > n->num_namespaces)) { +trace_nvme_dev_err_invalid_ns (nsid, n->num_namespaces); +return NVME_INVALID_NSID |NVME_DNR ; + } + + list =g_malloc0 (NVME_IDENTIFY_DATA_SIZE ); + ns_descr = list; + +/* +* Because the NGUID and EUI64 fields are 0 in the Identify Namespace data +* structure, a Namespace UUID (nidt = 0x3) must be reported in the +* Namespace Identification Descriptor. Add a very basic Namespace UUID +* here. +*/ + ns_descr->nidt =NVME_NIDT_UUID ; + ns_descr->nidl =NVME_NIDT_UUID_LEN ; +stl_be_p (ns_descr +sizeof (*ns_descr), nsid); + + ret =nvme_dma_read_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, + prp2); +g_free (list); +return ret; +} +static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd) {NvmeIdentify *c = (NvmeIdentify *)cmd;@@ -953,6 +989,8 @@ static uint16_t nvme_identify(NvmeCtrl *n, NvmeCmd *cmd)return nvme_identify_ctrl (n, c);case NVME_ID_CNS_NS_ACTIVE_LIST :return nvme_identify_nslist (n, c); +case NVME_ID_CNS_NS_DESCR_LIST : +return nvme_identify_ns_descr_list (n, c);default :trace_nvme_dev_err_invalid_identify_cns (le32_to_cpu (c->cns));return NVME_INVALID_FIELD |NVME_DNR ;hw/block/trace-events +0
-0
hw/block/trace-events nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" · line 47
Quoted 7 lines
hw/block/trace-events +1
-0@@ -41,6 +41,7 @@ nvme_dev_del_cq(uint16_t cqid) "deleted completion queue, sqid=%"PRIu16"" nvme_dev_identify_ctrl(void) "identify controller" nvme_dev_identify_ns(uint32_t ns) "nsid %"PRIu32"" nvme_dev_identify_nslist(uint32_t ns) "nsid %"PRIu32"" +nvme_dev_identify_ns_descr_list(uint32_t ns) "nsid %"PRIu32"" nvme_dev_getfeat(uint16_t cid, uint32_t fid) "cid %"PRIu16" fid 0x%"PRIx32"" nvme_dev_setfeat(uint16_t cid, uint32_t fid, uint32_t val) "cid %"PRIu16" fid 0x%"PRIx32" val 0x%"PRIx32"" nvme_dev_getfeat_vwcache(const char* result) "get feature volatile write cache, result=%s"
I think that we should add namespace uuid as a device parameter, but its OK to do this in follow up patch.
Best regards,
Maxim Levitsky
PATCH v6 19/42 nvme: enforce valid queue creation sequence
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Support returning Command Sequence Error if Set Features on Number of Queues is called after queues have been created.
--- hw/block/nvme.c | 7 +++++++ hw/block/nvme.h | 1 + 2 files changed, 8 insertions(+)
hw/block/nvme.c +7 -0
@@ -881,6 +881,8 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) cq =g_malloc0 (sizeof (*cq));nvme_init_cq (cq, n, prp1, cqid, vector, qsize +1 ,NVME_CQ_FLAGS_IEN (qflags)); + + n->qs_created = true;return NVME_SUCCESS ; }
@@ -1194,6 +1196,10 @@ 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 : +if (n->qs_created) { +return NVME_CMD_SEQ_ERROR |NVME_DNR ; + } +/* * NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for NCQR * and NSQR.
@@ -1332,6 +1338,7 @@ static void nvme_clear_ctrl(NvmeCtrl *n) n->aer_queued =0 ; n->outstanding_aers =0 ; + n->qs_created = false;blk_flush (n->conf.blk); n->bar.cc =0 ;
hw/block/nvme.h +1 -0
@@ -99,6 +99,7 @@ typedef struct NvmeCtrl {BlockConf conf;NvmeParams params; +bool qs_created;uint32_t page_size;uint16_t page_bits;uint16_t max_prp_ents;
Signature · 1 line
2.25.1
Re: [PATCH v6 19/42] nvme: enforce valid queue creation sequence
Quoted 16 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Support returning Command Sequence Error if Set Features on Number of Queues is called after queues have been created.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 7 +++++++ hw/block/nvme.h | 1 + 2 files changed, 8 insertions(+)hw/block/nvme.c +0
-0
hw/block/nvme.c static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) · line 885
Quoted 5 lines
hw/block/nvme.c +2
-0@@ -881,6 +881,8 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) cq =g_malloc0 (sizeof (*cq));nvme_init_cq (cq, n, prp1, cqid, vector, qsize +1 ,NVME_CQ_FLAGS_IEN (qflags)); + + n->qs_created = true;
Very minor nitpick, maybe it is worth mentioning in a comment, why this is only needed in CQ creation, as you explained to me.
Quoted 27 lines
hw/block/nvme.c +5
-0return NVME_SUCCESS ; }@@ -1194,6 +1196,10 @@ 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 : +if (n->qs_created) { +return NVME_CMD_SEQ_ERROR |NVME_DNR ; + } +/* * NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for NCQR * and NSQR. @@ -1332,6 +1338,7 @@ static void nvme_clear_ctrl(NvmeCtrl *n) n->aer_queued =0 ; n->outstanding_aers =0 ; + n->qs_created = false;blk_flush (n->conf.blk); n->bar.cc =0 ;hw/block/nvme.h +0
-0
hw/block/nvme.h typedef struct NvmeCtrl { · line 105
Quoted 7 lines
hw/block/nvme.h +1
-0@@ -99,6 +99,7 @@ typedef struct NvmeCtrl {BlockConf conf;NvmeParams params; +bool qs_created;uint32_t page_size;uint16_t page_bits;uint16_t max_prp_ents;
Best regards,
Maxim Levitsky
Re: [PATCH v6 19/42] nvme: enforce valid queue creation sequence
Quoted 12 lines · Maxim Levitsky
Quoted 11 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Support returning Command Sequence Error if Set Features on Number of Queues is called after queues have been created.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 7 +++++++ hw/block/nvme.h | 1 + 2 files changed, 8 insertions(+)
Quoted 13 lines
hw/block/nvme.c static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) · line 885
Quoted 10 lines
hw/block/nvme.c +2
-0@@ -881,6 +881,8 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) cq =g_malloc0 (sizeof (*cq));nvme_init_cq (cq, n, prp1, cqid, vector, qsize +1 ,NVME_CQ_FLAGS_IEN (qflags)); + + n->qs_created = true;Very minor nitpick, maybe it is worth mentioning in a comment, why this is only needed in CQ creation, as you explained to me.
Added.
Quoted 10 lines
Reviewed-by Maxim Levitsky <[email protected]>Best regards,
Maxim Levitsky
Re: [PATCH v6 19/42] nvme: enforce valid queue creation sequence
Quoted 28 lines · Klaus Birkelund Jensen
Quoted 12 lines · Maxim Levitsky
Quoted 11 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Support returning Command Sequence Error if Set Features on Number of Queues is called after queues have been created.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 7 +++++++ hw/block/nvme.h | 1 + 2 files changed, 8 insertions(+)Quoted 14 lines
hw/block/nvme.c static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) · line 885
Quoted 10 lines
hw/block/nvme.c +2
-0@@ -881,6 +881,8 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) cq =g_malloc0 (sizeof (*cq));nvme_init_cq (cq, n, prp1, cqid, vector, qsize +1 ,NVME_CQ_FLAGS_IEN (qflags)); + + n->qs_created = true;Very minor nitpick, maybe it is worth mentioning in a comment, why this is only needed in CQ creation, as you explained to me.
Quoted 1 line
Added.
Thanks a lot!
Quoted 4 lines
Quoted 4 lines
Reviewed-by Maxim Levitsky <[email protected]>
Quoted 9 lines
Quoted 7 lines
Best regards,
Maxim Levitsky
Best regards,
Maxim Levitsky
PATCH v6 20/42 nvme: provide the mandatory subnqn field
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 3 +++ 1 file changed, 3 insertions(+)
hw/block/nvme.c +3 -0
@@ -1925,6 +1925,9 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROS |NVME_ONCS_TIMESTAMP ); +pstrcpy ((char *) id->subnqn,sizeof (id->subnqn),"nqn.2019-08.org.qemu:" ); +pstrcat ((char *) id->subnqn,sizeof (id->subnqn), n->params.serial); + id->psd[0 ].mp =cpu_to_le16 (0x9c4 ); id->psd[0 ].enlat =cpu_to_le32 (0x10 ); id->psd[0 ].exlat =cpu_to_le32 (0x4 );
Signature · 1 line
2.25.1
Re: [PATCH v6 20/42] nvme: provide the mandatory subnqn field
Quoted 12 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 3 +++ 1 file changed, 3 insertions(+)hw/block/nvme.c +0
-0
hw/block/nvme.c static void nvme_init_ctrl(NvmeCtrl *n) · line 1933
Quoted 9 lines
hw/block/nvme.c +3
-0@@ -1925,6 +1925,9 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROS |NVME_ONCS_TIMESTAMP ); +pstrcpy ((char *) id->subnqn,sizeof (id->subnqn),"nqn.2019-08.org.qemu:" ); +pstrcat ((char *) id->subnqn,sizeof (id->subnqn), n->params.serial); + id->psd[0 ].mp =cpu_to_le16 (0x9c4 ); id->psd[0 ].enlat =cpu_to_le32 (0x10 ); id->psd[0 ].exlat =cpu_to_le32 (0x4 );
Best regards,
Maxim Levitsky
PATCH v6 21/42 nvme: bump supported version to v1.3
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/block/nvme.c +3 -1
@@ -44,6 +44,7 @@#include "trace.h" #include "nvme.h" +#define NVME_SPEC_VER 0x00010300#define NVME_CMB_BIR 2#define NVME_TEMPERATURE 0x143#define NVME_TEMPERATURE_WARNING 0x157
@@ -1898,6 +1899,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ; id->ieee[2 ] =0xb3 ; + id->ver =cpu_to_le32 (NVME_SPEC_VER ); id->oacs =cpu_to_le16 (0 );/*
@@ -1942,7 +1944,7 @@ static void nvme_init_ctrl(NvmeCtrl *n)NVME_CAP_SET_CSS (n->bar.cap,1 );NVME_CAP_SET_MPSMAX (n->bar.cap,4 ); - n->bar.vs =0x00010200 ; + n->bar.vs =NVME_SPEC_VER ; n->bar.intmc = n->bar.intms =0 ; }
Signature · 1 line
2.25.1
Re: [PATCH v6 21/42] nvme: bump supported version to v1.3
Quoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)hw/block/nvme.c +2
-0@@ -44,6 +44,7 @@#include "trace.h" #include "nvme.h" +#define NVME_SPEC_VER 0x00010300#define NVME_CMB_BIR 2#define NVME_TEMPERATURE 0x143#define NVME_TEMPERATURE_WARNING 0x157@@ -1898,6 +1899,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ; id->ieee[2 ] =0xb3 ; + id->ver =cpu_to_le32 (NVME_SPEC_VER ); id->oacs =cpu_to_le16 (0 );/*
hw/block/nvme.c static void nvme_init_ctrl(NvmeCtrl *n) · line 1950
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -1942,7 +1944,7 @@ static void nvme_init_ctrl(NvmeCtrl *n)NVME_CAP_SET_CSS (n->bar.cap,1 );NVME_CAP_SET_MPSMAX (n->bar.cap,4 ); - n->bar.vs =0x00010200 ; + n->bar.vs =NVME_SPEC_VER ; n->bar.intmc = n->bar.intms =0 ; }
Best regards,
Maxim Levitsky
PATCH v6 22/42 nvme: memset preallocated requests structures
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
This is preparatory to subsequent patches that change how QSGs/IOVs are handled. It is important that the qsg and iov members of the NvmeRequest are initially zeroed.
--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/block/nvme.c +1 -1
@@ -597,7 +597,7 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, sq->size = size; sq->cqid = cqid; sq->head = sq->tail =0 ; - sq->io_req =g_new (NvmeRequest, sq->size); + sq->io_req =g_new0 (NvmeRequest, sq->size);QTAILQ_INIT (&sq->req_list);QTAILQ_INIT (&sq->out_req_list);
Signature · 1 line
2.25.1
Re: [PATCH v6 22/42] nvme: memset preallocated requests structures
Quoted 16 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This is preparatory to subsequent patches that change how QSGs/IOVs are handled. It is important that the qsg and iov members of the NvmeRequest are initially zeroed.
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 void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, · line 603
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -597,7 +597,7 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, sq->size = size; sq->cqid = cqid; sq->head = sq->tail =0 ; - sq->io_req =g_new (NvmeRequest, sq->size); + sq->io_req =g_new0 (NvmeRequest, sq->size);QTAILQ_INIT (&sq->req_list);QTAILQ_INIT (&sq->out_req_list);
Best regards,
Maxim Levitsky
PATCH v6 23/42 nvme: add mapping helpers
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add nvme_map_addr, nvme_map_addr_cmb and nvme_addr_to_cmb helpers and use them in nvme_map_prp.
This fixes a bug where in the case of a CMB transfer, the device would map to the buffer with a wrong length.
--- hw/block/nvme.c | 97 +++++++++++++++++++++++++++++++++++-------- hw/block/trace-events | 1 + 2 files changed, 81 insertions(+), 17 deletions(-)
hw/block/nvme.c +80 -17
@@ -59,6 +59,11 @@static void nvme_process_sq (void *opaque); +static inline void *nvme_addr_to_cmb (NvmeCtrl *n,hwaddr addr) +{ +return &n->cmbuf[addr - n->ctrl_mem.addr]; +} +static inline bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr) {hwaddr low = n->ctrl_mem.addr;
@@ -70,7 +75,7 @@ static inline bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr)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); +memcpy (buf,nvme_addr_to_cmb (n, addr), size);return ; }
@@ -153,29 +158,79 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) } } +static uint16_t nvme_map_addr_cmb (NvmeCtrl *n,QEMUIOVector *iov,hwaddr addr, +size_t len) +{ +if (!nvme_addr_is_cmb (n, addr) || !nvme_addr_is_cmb (n, addr + len)) { +return NVME_DATA_TRAS_ERROR ; + } + +qemu_iovec_add (iov,nvme_addr_to_cmb (n, addr), len); + +return NVME_SUCCESS ; +} + +static uint16_t nvme_map_addr (NvmeCtrl *n,QEMUSGList *qsg,QEMUIOVector *iov, +hwaddr addr,size_t len) +{ +if (nvme_addr_is_cmb (n, addr)) { +if (qsg && qsg->sg) { +return NVME_INVALID_USE_OF_CMB |NVME_DNR ; + } + +assert (iov); + +if (!iov->iov) { +qemu_iovec_init (iov,1 ); + } + +return nvme_map_addr_cmb (n, iov, addr, len); + } + +if (iov && iov->iov) { +return NVME_INVALID_USE_OF_CMB |NVME_DNR ; + } + +assert (qsg); + +if (!qsg->sg) { +pci_dma_sglist_init (qsg, &n->parent_obj,1 ); + } + +qemu_sglist_add (qsg, addr, len); + +return NVME_SUCCESS ; +} +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); trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ; +uint16_t status;if (unlikely (!prp1)) {trace_nvme_dev_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)) { - qsg->nsg =0 ; + } + +if (nvme_addr_is_cmb (n, prp1)) {qemu_iovec_init (iov, num_prps); -qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - n->ctrl_mem.addr], trans_len); }else {pci_dma_sglist_init (qsg, &n->parent_obj, num_prps); -qemu_sglist_add (qsg, prp1, trans_len); } + + status =nvme_map_addr (n, qsg, iov, prp1, trans_len); +if (status) { + goto unmap; + } + len -= trans_len;if (len) {if (unlikely (!prp2)) {trace_nvme_dev_err_invalid_prp2_missing (); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; }if (len > n->page_size) {
@@ -192,6 +247,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_dev_err_invalid_prplist_ent (prp_ent); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; }
@@ -205,14 +261,14 @@ 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_dev_err_invalid_prplist_ent (prp_ent); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; } trans_len =MIN (len, n->page_size); -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); + status =nvme_map_addr (n, qsg, iov, prp_ent, trans_len); +if (status) { + goto unmap; } len -= trans_len; i++;
@@ -220,20 +276,27 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, }else {if (unlikely (prp2 & (n->page_size -1 ))) {trace_nvme_dev_err_invalid_prp2_align (prp2); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; } -if (qsg->nsg) { -qemu_sglist_add (qsg, prp2, len); - }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - n->ctrl_mem.addr], trans_len); + status =nvme_map_addr (n, qsg, iov, prp2, len); +if (status) { + goto unmap; } } }return NVME_SUCCESS ; - unmap: -qemu_sglist_destroy (qsg); -return NVME_INVALID_FIELD |NVME_DNR ; +unmap: +if (iov && iov->iov) { +qemu_iovec_destroy (iov); + } + +if (qsg && qsg->sg) { +qemu_sglist_destroy (qsg); + } + +return status; } static uint16_t nvme_dma_write_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,
hw/block/trace-events +1 -0
@@ -33,6 +33,7 @@ nvme_dev_irq_msix(uint32_t vector) "raising MSI-X IRQ vector %u" nvme_dev_irq_pin(void) "pulsing IRQ pin" nvme_dev_irq_masked(void) "IRQ is masked" nvme_dev_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" +nvme_dev_map_prp(uint16_t cid, uint8_t opc, uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "cid %"PRIu16" opc 0x%"PRIx8" trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64" num_prps %d" nvme_dev_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64"" nvme_dev_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16"" nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"
Signature · 1 line
2.25.1
Re: [PATCH v6 23/42] nvme: add mapping helpers
Quoted 41 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add
nvme_map_addr,nvme_map_addr_cmbandnvme_addr_to_cmbhelpers and use them innvme_map_prp.This fixes a bug where in the case of a CMB transfer, the device would map to the buffer with a wrong length.
Fixes b2b2b67a00574 ("nvme: Add support for Read Data and Write Data in CMBs.")Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 97 +++++++++++++++++++++++++++++++++++-------- hw/block/trace-events | 1 + 2 files changed, 81 insertions(+), 17 deletions(-)hw/block/nvme.c +6
-1@@ -59,6 +59,11 @@static void nvme_process_sq (void *opaque); +static inline void *nvme_addr_to_cmb (NvmeCtrl *n,hwaddr addr) +{ +return &n->cmbuf[addr - n->ctrl_mem.addr]; +} +static inline bool nvme_addr_is_cmb (NvmeCtrl *n,hwaddr addr) {hwaddr low = n->ctrl_mem.addr;@@ -70,7 +75,7 @@ static inline bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr)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); +memcpy (buf,nvme_addr_to_cmb (n, addr), size);return ; }
hw/block/nvme.c static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) · line 166
Quoted 9 lines
hw/block/nvme.c +6
-0@@ -153,29 +158,79 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) } } +static uint16_t nvme_map_addr_cmb (NvmeCtrl *n,QEMUIOVector *iov,hwaddr addr, +size_t len) +{ +if (!nvme_addr_is_cmb (n, addr) || !nvme_addr_is_cmb (n, addr + len)) { +return NVME_DATA_TRAS_ERROR ; + }
I just noticed that
in theory (not that it really matters) but addr+len refers to the byte which is already not the part of the transfer.
hw/block/nvme.c static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) · line 168
Quoted 2 lines
hw/block/nvme.c +2
-0+ +qemu_iovec_add (iov,nvme_addr_to_cmb (n, addr), len);
Also intersting is we can add 0 sized iovec.
Quoted 25 lines
hw/block/nvme.c +25
-0+ +return NVME_SUCCESS ; +} + +static uint16_t nvme_map_addr (NvmeCtrl *n,QEMUSGList *qsg,QEMUIOVector *iov, +hwaddr addr,size_t len) +{ +if (nvme_addr_is_cmb (n, addr)) { +if (qsg && qsg->sg) { +return NVME_INVALID_USE_OF_CMB |NVME_DNR ; + } + +assert (iov); + +if (!iov->iov) { +qemu_iovec_init (iov,1 ); + } + +return nvme_map_addr_cmb (n, iov, addr, len); + } + +if (iov && iov->iov) { +return NVME_INVALID_USE_OF_CMB |NVME_DNR ; + } +
hw/block/nvme.c static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) · line 203
Quoted 10 lines
hw/block/nvme.c +10
-0+assert (qsg); + +if (!qsg->sg) { +pci_dma_sglist_init (qsg, &n->parent_obj,1 ); + } + +qemu_sglist_add (qsg, addr, len); + +return NVME_SUCCESS ; +}
Looks very good.
Quoted 109 lines
hw/block/nvme.c +31
-16+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); trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ; +uint16_t status;if (unlikely (!prp1)) {trace_nvme_dev_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)) { - qsg->nsg =0 ; + } + +if (nvme_addr_is_cmb (n, prp1)) {qemu_iovec_init (iov, num_prps); -qemu_iovec_add (iov, (void *)&n->cmbuf[prp1 - n->ctrl_mem.addr], trans_len); }else {pci_dma_sglist_init (qsg, &n->parent_obj, num_prps); -qemu_sglist_add (qsg, prp1, trans_len); } + + status =nvme_map_addr (n, qsg, iov, prp1, trans_len); +if (status) { + goto unmap; + } + len -= trans_len;if (len) {if (unlikely (!prp2)) {trace_nvme_dev_err_invalid_prp2_missing (); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; }if (len > n->page_size) {@@ -192,6 +247,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_dev_err_invalid_prplist_ent (prp_ent); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; }@@ -205,14 +261,14 @@ 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_dev_err_invalid_prplist_ent (prp_ent); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; } trans_len =MIN (len, n->page_size); -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); + status =nvme_map_addr (n, qsg, iov, prp_ent, trans_len); +if (status) { + goto unmap; } len -= trans_len; i++;@@ -220,20 +276,27 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, }else {if (unlikely (prp2 & (n->page_size -1 ))) {trace_nvme_dev_err_invalid_prp2_align (prp2); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; } -if (qsg->nsg) { -qemu_sglist_add (qsg, prp2, len); - }else { -qemu_iovec_add (iov, (void *)&n->cmbuf[prp2 - n->ctrl_mem.addr], trans_len); + status =nvme_map_addr (n, qsg, iov, prp2, len); +if (status) { + goto unmap; } } }return NVME_SUCCESS ; - unmap: -qemu_sglist_destroy (qsg); -return NVME_INVALID_FIELD |NVME_DNR ; +unmap: +if (iov && iov->iov) { +qemu_iovec_destroy (iov); + } + +if (qsg && qsg->sg) { +qemu_sglist_destroy (qsg); + } + +return status; } static uint16_t nvme_dma_write_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,hw/block/trace-events +1
-0@@ -33,6 +33,7 @@ nvme_dev_irq_msix(uint32_t vector) "raising MSI-X IRQ vector %u" nvme_dev_irq_pin(void) "pulsing IRQ pin" nvme_dev_irq_masked(void) "IRQ is masked" nvme_dev_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" +nvme_dev_map_prp(uint16_t cid, uint8_t opc, uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "cid %"PRIu16" opc 0x%"PRIx8" trans_len %"PRIu64" len %"PRIu32" prp1
Quoted 6 lines
0x%"PRIx64" prp2 0x%"PRIx64"
num_prps%d"
nvme_dev_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba)"%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64""nvme_dev_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags)"create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16",
qflags=%"PRIu16""
nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien)"create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16",
qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"
Looks very good overall,
Best regards,
Maxim Levitsky
Re: [PATCH v6 23/42] nvme: add mapping helpers
Quoted 24 lines · Maxim Levitsky
Quoted 23 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add
nvme_map_addr,nvme_map_addr_cmbandnvme_addr_to_cmbhelpers and use them innvme_map_prp.This fixes a bug where in the case of a CMB transfer, the device would map to the buffer with a wrong length.
Fixes b2b2b67a00574 ("nvme: Add support for Read Data and Write Data in CMBs.")Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 97 +++++++++++++++++++++++++++++++++++-------- hw/block/trace-events | 1 + 2 files changed, 81 insertions(+), 17 deletions(-)hw/block/nvme.c +0
-0@@ -153,29 +158,79 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) } }
Quoted 11 lines
hw/block/nvme.c static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) · line 166
Quoted 6 lines
hw/block/nvme.c +6
-0+static uint16_t nvme_map_addr_cmb (NvmeCtrl *n,QEMUIOVector *iov,hwaddr addr, +size_t len) +{ +if (!nvme_addr_is_cmb (n, addr) || !nvme_addr_is_cmb (n, addr + len)) { +return NVME_DATA_TRAS_ERROR ; + }I just noticed that
in theory (not that it really matters) but addr+len refers to the byte which is already not the part of the transfer.
Oh. Good catch - and I think that it does matter? Can't we end up rejecting a valid access? Anyway, I fixed it with a '- 1'.
Quoted 5 lines
hw/block/nvme.c static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) · line 168
Quoted 3 lines
hw/block/nvme.c +2
-0+ +qemu_iovec_add (iov,nvme_addr_to_cmb (n, addr), len);Also intersting is we can add 0 sized iovec.
I added a check on len. This also makes sure the above '- 1' fix doesn't cause an 'addr + 0 - 1' to be done.
Re: [PATCH v6 23/42] nvme: add mapping helpers
Quoted 37 lines · Klaus Birkelund Jensen
Quoted 24 lines · Maxim Levitsky
Quoted 23 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add
nvme_map_addr,nvme_map_addr_cmbandnvme_addr_to_cmbhelpers and use them innvme_map_prp.This fixes a bug where in the case of a CMB transfer, the device would map to the buffer with a wrong length.
Fixes b2b2b67a00574 ("nvme: Add support for Read Data and Write Data in CMBs.")Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 97 +++++++++++++++++++++++++++++++++++-------- hw/block/trace-events | 1 + 2 files changed, 81 insertions(+), 17 deletions(-)hw/block/nvme.c +0
-0@@ -153,29 +158,79 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) } }Quoted 11 lines
hw/block/nvme.c static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) · line 166
Quoted 6 lines
hw/block/nvme.c +6
-0+static uint16_t nvme_map_addr_cmb (NvmeCtrl *n,QEMUIOVector *iov,hwaddr addr, +size_t len) +{ +if (!nvme_addr_is_cmb (n, addr) || !nvme_addr_is_cmb (n, addr + len)) { +return NVME_DATA_TRAS_ERROR ; + }I just noticed that
in theory (not that it really matters) but addr+len refers to the byte which is already not the part of the transfer.
Quoted 2 lines
Oh. Good catch - and I think that it does matter? Can't we end up rejecting a valid access? Anyway, I fixed it with a '- 1'.
Actually thinking again about it, we can indeed reject the access if the data happens to to include last byte of CMB. That can absolutely happen.
When I wrote this I was thinking the other way around that we might reject data that is in regular ram and 'touches' the CMB, which indeed won't happen since RAM usually don't come close to MMIO ranges.
Anyway there is not reason to not fix such issues.
Quoted 10 lines
Quoted 7 lines
hw/block/nvme.c static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) · line 168
Quoted 4 lines
hw/block/nvme.c +2
-0+ +qemu_iovec_add (iov,nvme_addr_to_cmb (n, addr), len);Also intersting is we can add 0 sized iovec.
I added a check on len. This also makes sure the above '- 1' fix doesn't cause an 'addr + 0 - 1' to be done.
Yes that is what I was thinking, len=0 needs a special case here.
Best regards,
Maxim Levitsky
PATCH v6 24/42 nvme: remove redundant has_sg member
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Remove the has_sg member from NvmeRequest since it's redundant.
--- hw/block/nvme.c | 18 ++++++++++++------ hw/block/nvme.h | 1 - 2 files changed, 12 insertions(+), 7 deletions(-)
hw/block/nvme.c +12 -6
@@ -484,16 +484,20 @@ static void nvme_rw_cb(void *opaque, int ret)block_acct_failed (blk_get_stats (n->conf.blk), &req->acct); req->status =NVME_INTERNAL_DEV_ERROR ; } -if (req->has_sg) { + +if (req->qsg.nalloc) {qemu_sglist_destroy (&req->qsg); } +if (req->iov.nalloc) { +qemu_iovec_destroy (&req->iov); + } +nvme_enqueue_req_completion (cq, req); }static uint16_t nvme_flush (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd,NvmeRequest *req) { - req->has_sg = false;block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 ,BLOCK_ACCT_FLUSH ); req->aiocb =blk_aio_flush (n->conf.blk, nvme_rw_cb, req);
@@ -517,7 +521,6 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_LBA_RANGE |NVME_DNR ; } - req->has_sg = false;block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 ,BLOCK_ACCT_WRITE ); req->aiocb = blk_aio_pwrite_zeroes(n->conf.blk, offset, count,
@@ -554,16 +557,19 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_INVALID_FIELD |NVME_DNR ; } -dma_acct_start (n->conf.blk, &req->acct, &req->qsg, acct);if (req->qsg.nsg >0 ) { - req->has_sg = true; +block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->qsg.size, + acct); + req->aiocb = is_write ?dma_blk_write (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , nvme_rw_cb, req) :dma_blk_read (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , nvme_rw_cb, req); }else { - req->has_sg = false; +block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->iov.size, + acct); + req->aiocb = is_write ?blk_aio_pwritev (n->conf.blk, data_offset, &req->iov,0 , nvme_rw_cb, req) :
hw/block/nvme.h +0 -1
@@ -29,7 +29,6 @@ typedef struct NvmeRequest {struct NvmeSQueue *sq;BlockAIOCB *aiocb;uint16_t status; -bool has_sg;NvmeCqe cqe;BlockAcctCookie acct;QEMUSGList qsg;
Signature · 1 line
2.25.1
Re: [PATCH v6 24/42] nvme: remove redundant has_sg member
Quoted 3 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Remove the
has_sgmember from NvmeRequest since it's redundant.
To be honest this patch also replaces the dma_acct_start with block_acct_start which looks right to me, and IMHO its OK to have both in the same patch, but that should be mentioned in the commit message
With this fixed,
Best regards,
Maxim Levitsky
Quoted 77 lines
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 18 ++++++++++++------ hw/block/nvme.h | 1 - 2 files changed, 12 insertions(+), 7 deletions(-)hw/block/nvme.c +12
-6@@ -484,16 +484,20 @@ static void nvme_rw_cb(void *opaque, int ret)block_acct_failed (blk_get_stats (n->conf.blk), &req->acct); req->status =NVME_INTERNAL_DEV_ERROR ; } -if (req->has_sg) { + +if (req->qsg.nalloc) {qemu_sglist_destroy (&req->qsg); } +if (req->iov.nalloc) { +qemu_iovec_destroy (&req->iov); + } +nvme_enqueue_req_completion (cq, req); }static uint16_t nvme_flush (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd,NvmeRequest *req) { - req->has_sg = false;block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 ,BLOCK_ACCT_FLUSH ); req->aiocb =blk_aio_flush (n->conf.blk, nvme_rw_cb, req);@@ -517,7 +521,6 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_LBA_RANGE |NVME_DNR ; } - req->has_sg = false;block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 ,BLOCK_ACCT_WRITE ); req->aiocb = blk_aio_pwrite_zeroes(n->conf.blk, offset, count,@@ -554,16 +557,19 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_INVALID_FIELD |NVME_DNR ; } -dma_acct_start (n->conf.blk, &req->acct, &req->qsg, acct);if (req->qsg.nsg >0 ) { - req->has_sg = true; +block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->qsg.size, + acct); + req->aiocb = is_write ?dma_blk_write (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , nvme_rw_cb, req) :dma_blk_read (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , nvme_rw_cb, req); }else { - req->has_sg = false; +block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->iov.size, + acct); + req->aiocb = is_write ?blk_aio_pwritev (n->conf.blk, data_offset, &req->iov,0 , nvme_rw_cb, req) :hw/block/nvme.h +0
-1@@ -29,7 +29,6 @@ typedef struct NvmeRequest {struct NvmeSQueue *sq;BlockAIOCB *aiocb;uint16_t status; -bool has_sg;NvmeCqe cqe;BlockAcctCookie acct;QEMUSGList qsg;
Re: [PATCH v6 24/42] nvme: remove redundant has_sg member
Quoted 9 lines · Maxim Levitsky
Quoted 3 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Remove the
has_sgmember from NvmeRequest since it's redundant.To be honest this patch also replaces the
dma_acct_startwithblock_acct_startwhich looks right to me, and IMHO its OK to have both in the same patch, but that should be mentioned in the commit message
I pulled it to a separate patch :)
Quoted 3 lines
With this fixed,
Reviewed-by Maxim Levitsky <[email protected]>
Re: [PATCH v6 24/42] nvme: remove redundant has_sg member
Quoted 4 lines · Klaus Birkelund Jensen
Quoted 3 lines · Maxim Levitsky
Quoted 2 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Remove the
has_sgmember from NvmeRequest since it's redundant.To be honest this patch also replaces the
dma_acct_startwithblock_acct_startwhich looks right to me, and IMHO its OK to have both in the same patch, but that should be mentioned in the commit messageI pulled it to a separate patch :)
Cool. Thanks
Quoted 6 lines
Quoted 4 lines
With this fixed,
Reviewed-by Maxim Levitsky <[email protected]>
Best regards,
Maxim Levitsky
PATCH v6 25/42 nvme: refactor dma read/write
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Refactor the nvme_dma_{read,write}_prp functions into a common function taking a DMADirection parameter.
--- hw/block/nvme.c | 89 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 46 deletions(-)
hw/block/nvme.c +43 -46
@@ -299,55 +299,50 @@ unmap:return status; } -static uint16_t nvme_dma_write_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, -uint64_t prp1,uint64_t prp2) +static uint16_t nvme_dma_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, +uint64_t prp1,uint64_t prp2,DMADirection dir) {QEMUSGList qsg;QEMUIOVector iov;uint16_t status =NVME_SUCCESS ; -if (nvme_map_prp (&qsg, &iov, prp1, prp2, len, n)) { -return NVME_INVALID_FIELD |NVME_DNR ; + status =nvme_map_prp (&qsg, &iov, prp1, prp2, len, n); +if (status) { +return status; } -if (qsg.nsg >0 ) { -if (dma_buf_write (ptr, len, &qsg)) { - status =NVME_INVALID_FIELD |NVME_DNR ; - } -qemu_sglist_destroy (&qsg); - }else { -if (qemu_iovec_to_buf (&iov,0 , ptr, len) != len) { - status =NVME_INVALID_FIELD |NVME_DNR ; - } -qemu_iovec_destroy (&iov); - } -return status; -} -static uint16_t nvme_dma_read_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, -uint64_t prp1,uint64_t prp2) -{ -QEMUSGList qsg; -QEMUIOVector iov; -uint16_t status =NVME_SUCCESS ; +if (qsg.nsg >0 ) { +uint64_t residual; -trace_nvme_dev_dma_read (prp1, prp2); +if (dir ==DMA_DIRECTION_TO_DEVICE ) { + residual =dma_buf_write (ptr, len, &qsg); + }else { + residual =dma_buf_read (ptr, len, &qsg); + } -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))) { +if (unlikely (residual)) {trace_nvme_dev_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)) { +size_t bytes; + +if (dir ==DMA_DIRECTION_TO_DEVICE ) { + bytes =qemu_iovec_to_buf (&iov,0 , ptr, len); + }else { + bytes =qemu_iovec_from_buf (&iov,0 , ptr, len); + } + +if (unlikely (bytes != len)) {trace_nvme_dev_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; } +qemu_iovec_destroy (&iov); } +return status; }
@@ -775,8 +770,8 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,nvme_clear_events (n,NVME_AER_TYPE_SMART ); } -return nvme_dma_read_prp (n, (uint8_t *) &smart + off, trans_len, prp1, - prp2); +return nvme_dma_prp (n, (uint8_t *) &smart + off, trans_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); } static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len,
@@ -795,8 +790,8 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, trans_len =MIN (sizeof (fw_log) - off, buf_len); -return nvme_dma_read_prp (n, (uint8_t *) &fw_log + off, trans_len, prp1, - prp2); +return nvme_dma_prp (n, (uint8_t *) &fw_log + off, trans_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); } static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,
@@ -820,7 +815,8 @@ static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, trans_len =MIN (sizeof (errlog) - off, buf_len); -return nvme_dma_read_prp (n, errlog, trans_len, prp1, prp2); +return nvme_dma_prp (n, errlog, trans_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
@@ -963,8 +959,8 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c)trace_nvme_dev_identify_ctrl (); -return nvme_dma_read_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), - prp1, prp2); +return nvme_dma_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), prp1, + prp2,DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeIdentify *c)
@@ -983,8 +979,8 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) ns = &n->namespaces[nsid -1 ]; -return nvme_dma_read_prp (n, (uint8_t *)&ns->id_ns,sizeof (ns->id_ns), - prp1, prp2); +return nvme_dma_prp (n, (uint8_t *)&ns->id_ns,sizeof (ns->id_ns), prp1, + prp2,DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c)
@@ -1009,7 +1005,8 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)break ; } } - ret =nvme_dma_read_prp (n, (uint8_t *)list, data_len, prp1, prp2); + ret =nvme_dma_prp (n, (uint8_t *)list, data_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE );g_free (list);return ret; }
@@ -1044,8 +1041,8 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c) ns_descr->nidl =NVME_NIDT_UUID_LEN ;stl_be_p (ns_descr +sizeof (*ns_descr), nsid); - ret =nvme_dma_read_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, - prp2); + ret =nvme_dma_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, + prp2,DMA_DIRECTION_FROM_DEVICE );g_free (list);return ret; }
@@ -1128,8 +1125,8 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t timestamp =nvme_get_timestamp (n); -return nvme_dma_read_prp (n, (uint8_t *)×tamp, -sizeof (timestamp), prp1, prp2); +return nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, + prp2,DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
@@ -1214,8 +1211,8 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); - ret =nvme_dma_write_prp (n, (uint8_t *)×tamp, -sizeof (timestamp), prp1, prp2); + ret =nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, + prp2,DMA_DIRECTION_TO_DEVICE );if (ret !=NVME_SUCCESS ) {return ret; }
Signature · 1 line
2.25.1
Re: [PATCH v6 25/42] nvme: refactor dma read/write
Quoted 182 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Refactor the nvme_dma_{read,write}_prp functions into a common function taking a DMADirection parameter.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 89 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 46 deletions(-)hw/block/nvme.c +41
-44@@ -299,55 +299,50 @@ unmap:return status; } -static uint16_t nvme_dma_write_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, -uint64_t prp1,uint64_t prp2) +static uint16_t nvme_dma_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, +uint64_t prp1,uint64_t prp2,DMADirection dir) {QEMUSGList qsg;QEMUIOVector iov;uint16_t status =NVME_SUCCESS ; -if (nvme_map_prp (&qsg, &iov, prp1, prp2, len, n)) { -return NVME_INVALID_FIELD |NVME_DNR ; + status =nvme_map_prp (&qsg, &iov, prp1, prp2, len, n); +if (status) { +return status; } -if (qsg.nsg >0 ) { -if (dma_buf_write (ptr, len, &qsg)) { - status =NVME_INVALID_FIELD |NVME_DNR ; - } -qemu_sglist_destroy (&qsg); - }else { -if (qemu_iovec_to_buf (&iov,0 , ptr, len) != len) { - status =NVME_INVALID_FIELD |NVME_DNR ; - } -qemu_iovec_destroy (&iov); - } -return status; -} -static uint16_t nvme_dma_read_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, -uint64_t prp1,uint64_t prp2) -{ -QEMUSGList qsg; -QEMUIOVector iov; -uint16_t status =NVME_SUCCESS ; +if (qsg.nsg >0 ) { +uint64_t residual; -trace_nvme_dev_dma_read (prp1, prp2); +if (dir ==DMA_DIRECTION_TO_DEVICE ) { + residual =dma_buf_write (ptr, len, &qsg); + }else { + residual =dma_buf_read (ptr, len, &qsg); + } -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))) { +if (unlikely (residual)) {trace_nvme_dev_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)) { +size_t bytes; + +if (dir ==DMA_DIRECTION_TO_DEVICE ) { + bytes =qemu_iovec_to_buf (&iov,0 , ptr, len); + }else { + bytes =qemu_iovec_from_buf (&iov,0 , ptr, len); + } + +if (unlikely (bytes != len)) {trace_nvme_dev_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; } +qemu_iovec_destroy (&iov); } +return status; }@@ -775,8 +770,8 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,nvme_clear_events (n,NVME_AER_TYPE_SMART ); } -return nvme_dma_read_prp (n, (uint8_t *) &smart + off, trans_len, prp1, - prp2); +return nvme_dma_prp (n, (uint8_t *) &smart + off, trans_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); } static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len,@@ -795,8 +790,8 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, trans_len =MIN (sizeof (fw_log) - off, buf_len); -return nvme_dma_read_prp (n, (uint8_t *) &fw_log + off, trans_len, prp1, - prp2); +return nvme_dma_prp (n, (uint8_t *) &fw_log + off, trans_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); } static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,@@ -820,7 +815,8 @@ static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, trans_len =MIN (sizeof (errlog) - off, buf_len); -return nvme_dma_read_prp (n, errlog, trans_len, prp1, prp2); +return nvme_dma_prp (n, errlog, trans_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)@@ -963,8 +959,8 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c)trace_nvme_dev_identify_ctrl (); -return nvme_dma_read_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), - prp1, prp2); +return nvme_dma_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), prp1, + prp2,DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeIdentify *c)@@ -983,8 +979,8 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) ns = &n->namespaces[nsid -1 ]; -return nvme_dma_read_prp (n, (uint8_t *)&ns->id_ns,sizeof (ns->id_ns), - prp1, prp2); +return nvme_dma_prp (n, (uint8_t *)&ns->id_ns,sizeof (ns->id_ns), prp1, + prp2,DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c)@@ -1009,7 +1005,8 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)break ; } } - ret =nvme_dma_read_prp (n, (uint8_t *)list, data_len, prp1, prp2); + ret =nvme_dma_prp (n, (uint8_t *)list, data_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE );g_free (list);return ret; }@@ -1044,8 +1041,8 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c) ns_descr->nidl =NVME_NIDT_UUID_LEN ;stl_be_p (ns_descr +sizeof (*ns_descr), nsid); - ret =nvme_dma_read_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, - prp2); + ret =nvme_dma_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, + prp2,DMA_DIRECTION_FROM_DEVICE );g_free (list);return ret; }@@ -1128,8 +1125,8 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t timestamp =nvme_get_timestamp (n); -return nvme_dma_read_prp (n, (uint8_t *)×tamp, -sizeof (timestamp), prp1, prp2); +return nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, + prp2,DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
hw/block/nvme.c static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) · line 1218
Quoted 10 lines
hw/block/nvme.c +2
-2@@ -1214,8 +1211,8 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); - ret =nvme_dma_write_prp (n, (uint8_t *)×tamp, -sizeof (timestamp), prp1, prp2); + ret =nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, + prp2,DMA_DIRECTION_TO_DEVICE );if (ret !=NVME_SUCCESS ) {return ret; }
Looks OK to me.
It was a bit difficult to read the diff, so I also read the code after it was applied. I hope I didn't miss anything.
Best regards,
Maxim Levitsky
PATCH v6 26/42 nvme: pass request along for tracing
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 67 +++++++++++++++++++++++++------------------ hw/block/trace-events | 2 +- 2 files changed, 40 insertions(+), 29 deletions(-)
hw/block/nvme.c +39 -28
@@ -202,14 +202,18 @@ static uint16_t nvme_map_addr(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov,return NVME_SUCCESS ; } -static uint16_t nvme_map_prp (QEMUSGList *qsg,QEMUIOVector *iov,uint64_t prp1, -uint64_t prp2,uint32_t len,NvmeCtrl *n) +static uint16_t nvme_map_prp (NvmeCtrl *n,QEMUSGList *qsg,QEMUIOVector *iov, +uint64_t prp1,uint64_t prp2,uint32_t len, +NvmeRequest *req) {hwaddr trans_len = n->page_size - (prp1 % n->page_size); trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +trace_nvme_dev_map_prp (nvme_cid (req), trans_len, len, prp1, prp2, + num_prps); +if (unlikely (!prp1)) {trace_nvme_dev_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ;
@@ -300,13 +304,14 @@ unmap: }static uint16_t nvme_dma_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, -uint64_t prp1,uint64_t prp2,DMADirection dir) +uint64_t prp1,uint64_t prp2,DMADirection dir, +NvmeRequest *req) {QEMUSGList qsg;QEMUIOVector iov;uint16_t status =NVME_SUCCESS ; - status =nvme_map_prp (&qsg, &iov, prp1, prp2, len, n); + status =nvme_map_prp (n, &qsg, &iov, prp1, prp2, len, req);if (status) {return status; }
@@ -547,7 +552,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_LBA_RANGE |NVME_DNR ; } -if (nvme_map_prp (&req->qsg, &req->iov, prp1, prp2, data_size, n)) { +if (nvme_map_prp (n, &req->qsg, &req->iov, prp1, prp2, data_size, req)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);return NVME_INVALID_FIELD |NVME_DNR ; }
@@ -771,7 +776,7 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, }return nvme_dma_prp (n, (uint8_t *) &smart + off, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); } static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len,
@@ -791,7 +796,7 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, trans_len =MIN (sizeof (fw_log) - off, buf_len);return nvme_dma_prp (n, (uint8_t *) &fw_log + off, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); } static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,
@@ -816,7 +821,7 @@ static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, trans_len =MIN (sizeof (errlog) - off, buf_len);return nvme_dma_prp (n, errlog, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
@@ -952,7 +957,8 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } -static uint16_t nvme_identify_ctrl (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ctrl (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2);
@@ -960,10 +966,11 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c)trace_nvme_dev_identify_ctrl ();return nvme_dma_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req); } -static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {NvmeNamespace *ns;uint32_t nsid =le32_to_cpu (c->nsid);
@@ -980,10 +987,11 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) ns = &n->namespaces[nsid -1 ];return nvme_dma_prp (n, (uint8_t *)&ns->id_ns,sizeof (ns->id_ns), prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req); } -static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {static const int data_len =NVME_IDENTIFY_DATA_SIZE ;uint32_t min_nsid =le32_to_cpu (c->nsid);
@@ -1006,12 +1014,13 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c) } } ret =nvme_dma_prp (n, (uint8_t *)list, data_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req);g_free (list);return ret; } -static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {uint32_t nsid =le32_to_cpu (c->nsid);uint64_t prp1 =le64_to_cpu (c->prp1);
@@ -1042,24 +1051,24 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c)stl_be_p (ns_descr +sizeof (*ns_descr), nsid); ret =nvme_dma_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req);g_free (list);return ret; } -static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) {NvmeIdentify *c = (NvmeIdentify *)cmd;switch (le32_to_cpu (c->cns)) {case NVME_ID_CNS_NS : -return nvme_identify_ns (n, c); +return nvme_identify_ns (n, c, req);case NVME_ID_CNS_CTRL : -return nvme_identify_ctrl (n, c); +return nvme_identify_ctrl (n, c, req);case NVME_ID_CNS_NS_ACTIVE_LIST : -return nvme_identify_nslist (n, c); +return nvme_identify_nslist (n, c, req);case NVME_ID_CNS_NS_DESCR_LIST : -return nvme_identify_ns_descr_list (n, c); +return nvme_identify_ns_descr_list (n, c, req);default :trace_nvme_dev_err_invalid_identify_cns (le32_to_cpu (c->cns));return NVME_INVALID_FIELD |NVME_DNR ;
@@ -1118,7 +1127,8 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)return cpu_to_le64 (ts.all); } -static uint16_t nvme_get_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_get_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd, +NvmeRequest *req) {uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);
@@ -1126,7 +1136,7 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t timestamp =nvme_get_timestamp (n);return nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
@@ -1178,7 +1188,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP : -return nvme_get_feature_timestamp (n, cmd); +return nvme_get_feature_timestamp (n, cmd, req);case NVME_INTERRUPT_COALESCING : result =cpu_to_le32 (n->features.int_coalescing);break ;
@@ -1204,7 +1214,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_SUCCESS ; } -static uint16_t nvme_set_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_set_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd, +NvmeRequest *req) {uint16_t ret;uint64_t timestamp;
@@ -1212,7 +1223,7 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); ret =nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, - prp2,DMA_DIRECTION_TO_DEVICE ); + prp2,DMA_DIRECTION_TO_DEVICE , req);if (ret !=NVME_SUCCESS ) {return ret; }
@@ -1283,7 +1294,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) ((n->params.max_ioqpairs - 1) << 16));break ;case NVME_TIMESTAMP : -return nvme_set_feature_timestamp (n, cmd); +return nvme_set_feature_timestamp (n, cmd, req);case NVME_ASYNCHRONOUS_EVENT_CONF : n->features.async_config = dw11;break ;
@@ -1334,7 +1345,7 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_ADM_CMD_CREATE_CQ :return nvme_create_cq (n, cmd);case NVME_ADM_CMD_IDENTIFY : -return nvme_identify (n, cmd); +return nvme_identify (n, cmd, req);case NVME_ADM_CMD_ABORT :return nvme_abort (n, cmd, req);case NVME_ADM_CMD_SET_FEATURES :
hw/block/trace-events +1 -1
@@ -33,7 +33,7 @@ nvme_dev_irq_msix(uint32_t vector) "raising MSI-X IRQ vector %u" nvme_dev_irq_pin(void) "pulsing IRQ pin" nvme_dev_irq_masked(void) "IRQ is masked" nvme_dev_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" -nvme_dev_map_prp(uint16_t cid, uint8_t opc, uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "cid %"PRIu16" opc 0x%"PRIx8" trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64" num_prps %d" +nvme_dev_map_prp(uint16_t cid, uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "cid %"PRIu16" trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64" num_prps %d" nvme_dev_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64"" nvme_dev_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16"" nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"
Signature · 1 line
2.25.1
Re: [PATCH v6 26/42] nvme: pass request along for tracing
Quoted 245 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 67 +++++++++++++++++++++++++------------------ hw/block/trace-events | 2 +- 2 files changed, 40 insertions(+), 29 deletions(-)hw/block/nvme.c +39
-28@@ -202,14 +202,18 @@ static uint16_t nvme_map_addr(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov,return NVME_SUCCESS ; } -static uint16_t nvme_map_prp (QEMUSGList *qsg,QEMUIOVector *iov,uint64_t prp1, -uint64_t prp2,uint32_t len,NvmeCtrl *n) +static uint16_t nvme_map_prp (NvmeCtrl *n,QEMUSGList *qsg,QEMUIOVector *iov, +uint64_t prp1,uint64_t prp2,uint32_t len, +NvmeRequest *req) {hwaddr trans_len = n->page_size - (prp1 % n->page_size); trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +trace_nvme_dev_map_prp (nvme_cid (req), trans_len, len, prp1, prp2, + num_prps); +if (unlikely (!prp1)) {trace_nvme_dev_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ;@@ -300,13 +304,14 @@ unmap: }static uint16_t nvme_dma_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, -uint64_t prp1,uint64_t prp2,DMADirection dir) +uint64_t prp1,uint64_t prp2,DMADirection dir, +NvmeRequest *req) {QEMUSGList qsg;QEMUIOVector iov;uint16_t status =NVME_SUCCESS ; - status =nvme_map_prp (&qsg, &iov, prp1, prp2, len, n); + status =nvme_map_prp (n, &qsg, &iov, prp1, prp2, len, req);if (status) {return status; }@@ -547,7 +552,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_LBA_RANGE |NVME_DNR ; } -if (nvme_map_prp (&req->qsg, &req->iov, prp1, prp2, data_size, n)) { +if (nvme_map_prp (n, &req->qsg, &req->iov, prp1, prp2, data_size, req)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);return NVME_INVALID_FIELD |NVME_DNR ; }@@ -771,7 +776,7 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, }return nvme_dma_prp (n, (uint8_t *) &smart + off, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); } static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len,@@ -791,7 +796,7 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, trans_len =MIN (sizeof (fw_log) - off, buf_len);return nvme_dma_prp (n, (uint8_t *) &fw_log + off, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); } static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae,@@ -816,7 +821,7 @@ static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, trans_len =MIN (sizeof (errlog) - off, buf_len);return nvme_dma_prp (n, errlog, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)@@ -952,7 +957,8 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } -static uint16_t nvme_identify_ctrl (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ctrl (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2);@@ -960,10 +966,11 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c)trace_nvme_dev_identify_ctrl ();return nvme_dma_prp (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req); } -static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {NvmeNamespace *ns;uint32_t nsid =le32_to_cpu (c->nsid);@@ -980,10 +987,11 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) ns = &n->namespaces[nsid -1 ];return nvme_dma_prp (n, (uint8_t *)&ns->id_ns,sizeof (ns->id_ns), prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req); } -static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {static const int data_len =NVME_IDENTIFY_DATA_SIZE ;uint32_t min_nsid =le32_to_cpu (c->nsid);@@ -1006,12 +1014,13 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c) } } ret =nvme_dma_prp (n, (uint8_t *)list, data_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req);g_free (list);return ret; } -static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeIdentify *c, +NvmeRequest *req) {uint32_t nsid =le32_to_cpu (c->nsid);uint64_t prp1 =le64_to_cpu (c->prp1);@@ -1042,24 +1051,24 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c)stl_be_p (ns_descr +sizeof (*ns_descr), nsid); ret =nvme_dma_prp (n, (uint8_t *) list,NVME_IDENTIFY_DATA_SIZE , prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req);g_free (list);return ret; } -static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) {NvmeIdentify *c = (NvmeIdentify *)cmd;switch (le32_to_cpu (c->cns)) {case NVME_ID_CNS_NS : -return nvme_identify_ns (n, c); +return nvme_identify_ns (n, c, req);case NVME_ID_CNS_CTRL : -return nvme_identify_ctrl (n, c); +return nvme_identify_ctrl (n, c, req);case NVME_ID_CNS_NS_ACTIVE_LIST : -return nvme_identify_nslist (n, c); +return nvme_identify_nslist (n, c, req);case NVME_ID_CNS_NS_DESCR_LIST : -return nvme_identify_ns_descr_list (n, c); +return nvme_identify_ns_descr_list (n, c, req);default :trace_nvme_dev_err_invalid_identify_cns (le32_to_cpu (c->cns));return NVME_INVALID_FIELD |NVME_DNR ;@@ -1118,7 +1127,8 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)return cpu_to_le64 (ts.all); } -static uint16_t nvme_get_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_get_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd, +NvmeRequest *req) {uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);@@ -1126,7 +1136,7 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t timestamp =nvme_get_timestamp (n);return nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, - prp2,DMA_DIRECTION_FROM_DEVICE ); + prp2,DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)@@ -1178,7 +1188,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_getfeat_numq (result);break ;case NVME_TIMESTAMP : -return nvme_get_feature_timestamp (n, cmd); +return nvme_get_feature_timestamp (n, cmd, req);case NVME_INTERRUPT_COALESCING : result =cpu_to_le32 (n->features.int_coalescing);break ;@@ -1204,7 +1214,8 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_SUCCESS ; } -static uint16_t nvme_set_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_set_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd, +NvmeRequest *req) {uint16_t ret;uint64_t timestamp;@@ -1212,7 +1223,7 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); ret =nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, - prp2,DMA_DIRECTION_TO_DEVICE ); + prp2,DMA_DIRECTION_TO_DEVICE , req);if (ret !=NVME_SUCCESS ) {return ret; }@@ -1283,7 +1294,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) ((n->params.max_ioqpairs - 1) << 16));break ;case NVME_TIMESTAMP : -return nvme_set_feature_timestamp (n, cmd); +return nvme_set_feature_timestamp (n, cmd, req);case NVME_ASYNCHRONOUS_EVENT_CONF : n->features.async_config = dw11;break ;@@ -1334,7 +1345,7 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)case NVME_ADM_CMD_CREATE_CQ :return nvme_create_cq (n, cmd);case NVME_ADM_CMD_IDENTIFY : -return nvme_identify (n, cmd); +return nvme_identify (n, cmd, req);case NVME_ADM_CMD_ABORT :return nvme_abort (n, cmd, req);case NVME_ADM_CMD_SET_FEATURES :hw/block/trace-events +0
-1@@ -33,7 +33,7 @@ nvme_dev_irq_msix(uint32_t vector) "raising MSI-X IRQ vector %u" nvme_dev_irq_pin(void) "pulsing IRQ pin" nvme_dev_irq_masked(void) "IRQ is masked" nvme_dev_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" -nvme_dev_map_prp(uint16_t cid, uint8_t opc, uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "cid %"PRIu16" opc 0x%"PRIx8" trans_len %"PRIu64" len %"PRIu32" prp1
Quoted 8 lines
0x%"PRIx64" prp2 0x%"PRIx64"
num_prps%d"
+nvme_dev_map_prp(uint16_t cid,uint64_ttrans_len,uint32_tlen,uint64_tprp1,uint64_tprp2, intnum_prps) "cid %"PRIu16"trans_len%"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64"num_prps%d"
nvme_dev_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba)"%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64""nvme_dev_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags)"create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16",
qflags=%"PRIu16""
nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien)"create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16",
qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"
Another very easy to review patch
Best regards,
Maxim Levitsky
PATCH v6 27/42 nvme: add request mapping helper
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Introduce the nvme_map helper to remove some noise in the main nvme_rw function.
--- hw/block/nvme.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
hw/block/nvme.c +10 -3
@@ -351,6 +351,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,return status; } +static uint16_t nvme_map (NvmeCtrl *n,NvmeCmd *cmd,QEMUSGList *qsg, +QEMUIOVector *iov,size_t len,NvmeRequest *req) +{ +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); + +return nvme_map_prp (n, qsg, iov, prp1, prp2, len, req); +} +static void nvme_post_cqes (void *opaque) {NvmeCQueue *cq = opaque;
@@ -534,8 +543,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,NvmeRwCmd *rw = (NvmeRwCmd *)cmd;uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba); -uint64_t prp1 =le64_to_cpu (rw->dptr.prp1); -uint64_t prp2 =le64_to_cpu (rw->dptr.prp2);uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas);uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;
@@ -552,7 +559,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_LBA_RANGE |NVME_DNR ; } -if (nvme_map_prp (n, &req->qsg, &req->iov, prp1, prp2, data_size, req)) { +if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);return NVME_INVALID_FIELD |NVME_DNR ; }
Signature · 1 line
2.25.1
Re: [PATCH v6 27/42] nvme: add request mapping helper
Quoted 40 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Introduce the
nvme_maphelper to remove some noise in the mainnvme_rwfunction.Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)hw/block/nvme.c +9
-2@@ -351,6 +351,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,return status; } +static uint16_t nvme_map (NvmeCtrl *n,NvmeCmd *cmd,QEMUSGList *qsg, +QEMUIOVector *iov,size_t len,NvmeRequest *req) +{ +uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1); +uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2); + +return nvme_map_prp (n, qsg, iov, prp1, prp2, len, req); +} +static void nvme_post_cqes (void *opaque) {NvmeCQueue *cq = opaque;@@ -534,8 +543,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,NvmeRwCmd *rw = (NvmeRwCmd *)cmd;uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba); -uint64_t prp1 =le64_to_cpu (rw->dptr.prp1); -uint64_t prp2 =le64_to_cpu (rw->dptr.prp2);uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas);uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;
hw/block/nvme.c static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, · line 565
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -552,7 +559,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_LBA_RANGE |NVME_DNR ; } -if (nvme_map_prp (n, &req->qsg, &req->iov, prp1, prp2, data_size, req)) { +if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);return NVME_INVALID_FIELD |NVME_DNR ; }
Best regards,
Maxim Levitsky
PATCH v6 28/42 nvme: verify validity of prp lists in the cmb
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Before this patch the device already supported this, but it did not check for the validity of it nor announced the support in the LISTS field.
If some of the PRPs in a PRP list are in the CMB, then ALL entries must be there. This patch makes sure that is verified as well as properly announcing support for PRP lists in the CMB.
--- hw/block/nvme.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
hw/block/nvme.c +13 -1
@@ -210,6 +210,7 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +bool prp_list_in_cmb = false;trace_nvme_dev_map_prp (nvme_cid (req), trans_len, len, prp1, prp2, num_prps);
@@ -237,11 +238,16 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; } +if (len > n->page_size) {uint64_t prp_list[n->max_prp_ents];uint32_t nents, prp_trans;int i =0 ; +if (nvme_addr_is_cmb (n, prp2)) { + prp_list_in_cmb = true; + } + nents = (len + n->page_size -1 ) >> n->page_bits; prp_trans =MIN (n->max_prp_ents, nents) *sizeof (uint64_t );nvme_addr_read (n, prp2, (void *)prp_list, prp_trans);
@@ -255,6 +261,11 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, goto unmap; } +if (prp_list_in_cmb !=nvme_addr_is_cmb (n, prp_ent)) { + status =NVME_INVALID_USE_OF_CMB |NVME_DNR ; + goto unmap; + } + i =0 ; nents = (len + n->page_size -1 ) >> n->page_bits; prp_trans =MIN (n->max_prp_ents, nents) *sizeof (uint64_t );
@@ -274,6 +285,7 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov,if (status) { goto unmap; } + len -= trans_len; i++; }
@@ -1931,7 +1943,7 @@ static void nvme_init_cmb(NvmeCtrl *n, PCIDevice *pci_dev)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_LISTS (n->bar.cmbsz,1 );NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 );NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 );NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );
Signature · 1 line
2.25.1
Re: [PATCH v6 28/42] nvme: verify validity of prp lists in the cmb
Quoted 65 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Before this patch the device already supported this, but it did not check for the validity of it nor announced the support in the LISTS field.
If some of the PRPs in a PRP list are in the CMB, then ALL entries must be there. This patch makes sure that is verified as well as properly announcing support for PRP lists in the CMB.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)hw/block/nvme.c +12
-0@@ -210,6 +210,7 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +bool prp_list_in_cmb = false;trace_nvme_dev_map_prp (nvme_cid (req), trans_len, len, prp1, prp2, num_prps);@@ -237,11 +238,16 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; } +if (len > n->page_size) {uint64_t prp_list[n->max_prp_ents];uint32_t nents, prp_trans;int i =0 ; +if (nvme_addr_is_cmb (n, prp2)) { + prp_list_in_cmb = true; + } + nents = (len + n->page_size -1 ) >> n->page_bits; prp_trans =MIN (n->max_prp_ents, nents) *sizeof (uint64_t );nvme_addr_read (n, prp2, (void *)prp_list, prp_trans);@@ -255,6 +261,11 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, goto unmap; } +if (prp_list_in_cmb !=nvme_addr_is_cmb (n, prp_ent)) { + status =NVME_INVALID_USE_OF_CMB |NVME_DNR ; + goto unmap; + } + i =0 ; nents = (len + n->page_size -1 ) >> n->page_bits; prp_trans =MIN (n->max_prp_ents, nents) *sizeof (uint64_t );@@ -274,6 +285,7 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov,if (status) { goto unmap; } + len -= trans_len; i++; }
hw/block/nvme.c static void nvme_init_cmb(NvmeCtrl *n, PCIDevice *pci_dev) · line 1949
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -1931,7 +1943,7 @@ static void nvme_init_cmb(NvmeCtrl *n, PCIDevice *pci_dev)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_LISTS (n->bar.cmbsz,1 );NVME_CMBSZ_SET_RDS (n->bar.cmbsz,1 );NVME_CMBSZ_SET_WDS (n->bar.cmbsz,1 );NVME_CMBSZ_SET_SZU (n->bar.cmbsz,2 );
Best regards,
Maxim Levitsky
PATCH v6 29/42 nvme: refactor request bounds checking
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
--- hw/block/nvme.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)
hw/block/nvme.c +22 -6
@@ -491,6 +491,20 @@ static void nvme_clear_events(NvmeCtrl *n, uint8_t event_type) } } +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns, +uint64_t slba,uint32_t nlb, +NvmeRequest *req) +{ +uint64_t nsze =le64_to_cpu (ns->id_ns.nsze); + +if (unlikely (UINT64_MAX - slba < nlb || slba + nlb > nsze)) { +trace_nvme_dev_err_invalid_lba_range (slba, nlb, nsze); +return NVME_LBA_RANGE |NVME_DNR ; + } + +return NVME_SUCCESS ; +} +static void nvme_rw_cb (void *opaque,int ret) {NvmeRequest *req = opaque;
@@ -536,10 +550,11 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint32_t nlb =le16_to_cpu (rw->nlb) +1 ;uint64_t offset = slba << data_shift;uint32_t count = nlb << data_shift; +uint16_t status; -if (unlikely (slba + nlb > ns->id_ns.nsze)) { -trace_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; + status =nvme_check_bounds (n, ns, slba, nlb, req); +if (status) { +return status; } block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,
@@ -562,13 +577,14 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint64_t data_offset = slba << data_shift;int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ;enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; +uint16_t status;trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba); -if (unlikely ((slba + nlb) > ns->id_ns.nsze)) { + status =nvme_check_bounds (n, ns, slba, nlb, req); +if (status) {block_acct_invalid (blk_get_stats (n->conf.blk), acct); -trace_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; +return status; }if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) {
Signature · 1 line
2.25.1
Re: [PATCH v6 29/42] nvme: refactor request bounds checking
Quoted 18 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)hw/block/nvme.c +3
-0@@ -491,6 +491,20 @@ static void nvme_clear_events(NvmeCtrl *n, uint8_t event_type) } } +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns, +uint64_t slba,uint32_t nlb, +NvmeRequest *req)
hw/block/nvme.c static void nvme_clear_events(NvmeCtrl *n, uint8_t event_type) · line 506
Quoted 10 lines
hw/block/nvme.c +10
-0+{ +uint64_t nsze =le64_to_cpu (ns->id_ns.nsze); + +if (unlikely (UINT64_MAX - slba < nlb || slba + nlb > nsze)) { +trace_nvme_dev_err_invalid_lba_range (slba, nlb, nsze); +return NVME_LBA_RANGE |NVME_DNR ; + } + +return NVME_SUCCESS ; +}
Looks good.
Quoted 27 lines
hw/block/nvme.c +6
-3+static void nvme_rw_cb (void *opaque,int ret) {NvmeRequest *req = opaque;@@ -536,10 +550,11 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint32_t nlb =le16_to_cpu (rw->nlb) +1 ;uint64_t offset = slba << data_shift;uint32_t count = nlb << data_shift; +uint16_t status; -if (unlikely (slba + nlb > ns->id_ns.nsze)) { -trace_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; + status =nvme_check_bounds (n, ns, slba, nlb, req); +if (status) { +return status; } block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,@@ -562,13 +577,14 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint64_t data_offset = slba << data_shift;int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ;enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; +uint16_t status;trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba);
hw/block/nvme.c static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, · line 590
Quoted 10 lines
hw/block/nvme.c +3
-3-if (unlikely ((slba + nlb) > ns->id_ns.nsze)) { + status =nvme_check_bounds (n, ns, slba, nlb, req); +if (status) {block_acct_invalid (blk_get_stats (n->conf.blk), acct); -trace_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; +return status; }if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) {
Looks good as well, once we get support for discard, it will use this as well, but for now indeed only write zeros and read/write need bounds checking on the IO path.
Best regards,
Maxim Levitsky
Re: [PATCH v6 29/42] nvme: refactor request bounds checking
Quoted 29 lines · Maxim Levitsky
Quoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)hw/block/nvme.c +4
-3@@ -562,13 +577,14 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint64_t data_offset = slba << data_shift;int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ;enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; +uint16_t status;trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba); -if (unlikely ((slba + nlb) > ns->id_ns.nsze)) { + status =nvme_check_bounds (n, ns, slba, nlb, req); +if (status) {block_acct_invalid (blk_get_stats (n->conf.blk), acct); -trace_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; +return status; }
Quoted 5 lines
hw/block/nvme.c static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, · line 590
Quoted 1 line
hw/block/nvme.c +0
-0if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) {Looks good as well, once we get support for discard, it will use this as well, but for now indeed only write zeros and read/write need bounds checking on the IO path.
I have that patch in the submission queue and the check is factored out there ;)
Quoted 2 lines
Reviewed-by Maxim Levitsky <[email protected]>
Re: [PATCH v6 29/42] nvme: refactor request bounds checking
Quoted 37 lines · Klaus Birkelund Jensen
Quoted 29 lines · Maxim Levitsky
Quoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-)hw/block/nvme.c +4
-3@@ -562,13 +577,14 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint64_t data_offset = slba << data_shift;int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ;enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; +uint16_t status;trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba); -if (unlikely ((slba + nlb) > ns->id_ns.nsze)) { + status =nvme_check_bounds (n, ns, slba, nlb, req); +if (status) {block_acct_invalid (blk_get_stats (n->conf.blk), acct); -trace_nvme_dev_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; +return status; }Quoted 6 lines
hw/block/nvme.c static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, · line 590
Quoted 1 line
hw/block/nvme.c +0
-0if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) {Looks good as well, once we get support for discard, it will use this as well, but for now indeed only write zeros and read/write need bounds checking on the IO path.
Quoted 2 lines
I have that patch in the submission queue and the check is factored out there ;)
Perfect!
Quoted 5 lines
Quoted 3 lines
Reviewed-by Maxim Levitsky <[email protected]>
Best regards,
Maxim Levitsky
PATCH v6 30/42 nvme: add check for mdts
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add 'mdts' device parameter to control the Maximum Data Transfer Size of the controller and check that it is respected.
--- hw/block/nvme.c | 29 ++++++++++++++++++++++++++++- hw/block/nvme.h | 4 +++- hw/block/trace-events | 1 + 3 files changed, 32 insertions(+), 2 deletions(-)
hw/block/nvme.c +28 -1
@@ -19,7 +19,8 @@* -drive file=<file>,if=none,id=<drive_id> * -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \ * cmb_size_mb=<cmb_size_mb[optional]>, \ -* max_ioqpairs=<N[optional]> +* max_ioqpairs=<N[optional]>, \ +* mdts=<mdts[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.
@@ -491,6 +492,19 @@ static void nvme_clear_events(NvmeCtrl *n, uint8_t event_type) } } +static inline uint16_t nvme_check_mdts (NvmeCtrl *n,size_t len, +NvmeRequest *req) +{ +uint8_t mdts = n->params.mdts; + +if (mdts && len > n->page_size << mdts) { +trace_nvme_dev_err_mdts (nvme_cid (req), n->page_size << mdts, len); +return NVME_INVALID_FIELD |NVME_DNR ; + } + +return NVME_SUCCESS ; +} +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns,uint64_t slba,uint32_t nlb,NvmeRequest *req)
@@ -581,6 +595,12 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba); + status =nvme_check_mdts (n, data_size, req); +if (status) { +block_acct_invalid (blk_get_stats (n->conf.blk), acct); +return status; + } + status =nvme_check_bounds (n, ns, slba, nlb, req);if (status) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);
@@ -871,6 +891,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t numdl, numdu;uint64_t off, lpol, lpou;size_t len; +uint16_t status; numdl = (dw10 >>16 ); numdu = (dw11 &0xffff );
@@ -886,6 +907,11 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_get_log (nvme_cid (req), lid, lsp, rae, len, off); + status =nvme_check_mdts (n, len, req); +if (status) { +return status; + } +switch (lid) {case NVME_LOG_ERROR_INFO :return nvme_error_info (n, cmd, rae, len, off, req);
@@ -2011,6 +2037,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ; id->ieee[2 ] =0xb3 ; + id->mdts = params->mdts; id->ver =cpu_to_le32 (NVME_SPEC_VER ); id->oacs =cpu_to_le16 (0 );
hw/block/nvme.h +3 -1
@@ -9,7 +9,8 @@DEFINE_PROP_UINT32 ("num_queues" , _state, _props.num_queues,0 ), \DEFINE_PROP_UINT32 ("max_ioqpairs" , _state, _props.max_ioqpairs,64 ), \DEFINE_PROP_UINT8 ("aerl" , _state, _props.aerl,3 ), \ - DEFINE_PROP_UINT32("aer_max_queued", _state, _props.aer_max_queued, 64) +DEFINE_PROP_UINT32 ("aer_max_queued" , _state, _props.aer_max_queued,64 ), \ + DEFINE_PROP_UINT8("mdts", _state, _props.mdts, 7) typedef struct NvmeParams { char *serial;
@@ -18,6 +19,7 @@ typedef struct NvmeParams {uint32_t cmb_size_mb;uint8_t aerl;uint32_t aer_max_queued; +uint8_t mdts; } NvmeParams; typedef struct NvmeAsyncEvent {
hw/block/trace-events +1 -0
@@ -79,6 +79,7 @@ nvme_dev_mmio_doorbell_cq(uint16_t cqid, uint16_t new_head) "cqid %"PRIu16" new_ nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_tail %"PRIu16"" # nvme traces for error conditions +nvme_dev_err_mdts(uint16_t cid, size_t mdts, size_t len) "cid %"PRIu16" mdts %"PRIu64" len %"PRIu64"" nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size" nvme_dev_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" nvme_dev_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64""
Signature · 1 line
2.25.1
Re: [PATCH v6 30/42] nvme: add check for mdts
Quoted 114 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add 'mdts' device parameter to control the Maximum Data Transfer Size of the controller and check that it is respected.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 29 ++++++++++++++++++++++++++++- hw/block/nvme.h | 4 +++- hw/block/trace-events | 1 + 3 files changed, 32 insertions(+), 2 deletions(-)hw/block/nvme.c +28
-1@@ -19,7 +19,8 @@* -drive file=<file>,if=none,id=<drive_id> * -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \ * cmb_size_mb=<cmb_size_mb[optional]>, \ -* max_ioqpairs=<N[optional]> +* max_ioqpairs=<N[optional]>, \ +* mdts=<mdts[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. @@ -491,6 +492,19 @@ static void nvme_clear_events(NvmeCtrl *n, uint8_t event_type) } } +static inline uint16_t nvme_check_mdts (NvmeCtrl *n,size_t len, +NvmeRequest *req) +{ +uint8_t mdts = n->params.mdts; + +if (mdts && len > n->page_size << mdts) { +trace_nvme_dev_err_mdts (nvme_cid (req), n->page_size << mdts, len); +return NVME_INVALID_FIELD |NVME_DNR ; + } + +return NVME_SUCCESS ; +} +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns,uint64_t slba,uint32_t nlb,NvmeRequest *req)@@ -581,6 +595,12 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba); + status =nvme_check_mdts (n, data_size, req); +if (status) { +block_acct_invalid (blk_get_stats (n->conf.blk), acct); +return status; + } + status =nvme_check_bounds (n, ns, slba, nlb, req);if (status) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);@@ -871,6 +891,7 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)uint32_t numdl, numdu;uint64_t off, lpol, lpou;size_t len; +uint16_t status; numdl = (dw10 >>16 ); numdu = (dw11 &0xffff );@@ -886,6 +907,11 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_nvme_dev_get_log (nvme_cid (req), lid, lsp, rae, len, off); + status =nvme_check_mdts (n, len, req); +if (status) { +return status; + } +switch (lid) {case NVME_LOG_ERROR_INFO :return nvme_error_info (n, cmd, rae, len, off, req);@@ -2011,6 +2037,7 @@ static void nvme_init_ctrl(NvmeCtrl *n) id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ; id->ieee[2 ] =0xb3 ; + id->mdts = params->mdts; id->ver =cpu_to_le32 (NVME_SPEC_VER ); id->oacs =cpu_to_le16 (0 );hw/block/nvme.h +3
-1@@ -9,7 +9,8 @@DEFINE_PROP_UINT32 ("num_queues" , _state, _props.num_queues,0 ), \DEFINE_PROP_UINT32 ("max_ioqpairs" , _state, _props.max_ioqpairs,64 ), \DEFINE_PROP_UINT8 ("aerl" , _state, _props.aerl,3 ), \ - DEFINE_PROP_UINT32("aer_max_queued", _state, _props.aer_max_queued, 64) +DEFINE_PROP_UINT32 ("aer_max_queued" , _state, _props.aer_max_queued,64 ), \ + DEFINE_PROP_UINT8("mdts", _state, _props.mdts, 7) typedef struct NvmeParams { char *serial;@@ -18,6 +19,7 @@ typedef struct NvmeParams {uint32_t cmb_size_mb;uint8_t aerl;uint32_t aer_max_queued; +uint8_t mdts; } NvmeParams; typedef struct NvmeAsyncEvent {hw/block/trace-events +0
-0
hw/block/trace-events nvme_dev_mmio_doorbell_cq(uint16_t cqid, uint16_t new_head) "cqid %"PRIu16" new_ · line 85
Quoted 7 lines
hw/block/trace-events +1
-0@@ -79,6 +79,7 @@ nvme_dev_mmio_doorbell_cq(uint16_t cqid, uint16_t new_head) "cqid %"PRIu16" new_ nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_tail %"PRIu16"" # nvme traces for error conditions +nvme_dev_err_mdts(uint16_t cid, size_t mdts, size_t len) "cid %"PRIu16" mdts %"PRIu64" len %"PRIu64"" nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size" nvme_dev_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" nvme_dev_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64""
Best regards,
Maxim Levitsky
PATCH v6 31/42 nvme: add check for prinfo
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Check the validity of the PRINFO field.
--- hw/block/nvme.c | 50 ++++++++++++++++++++++++++++++++++++------- hw/block/trace-events | 1 + include/block/nvme.h | 1 + 3 files changed, 44 insertions(+), 8 deletions(-)
hw/block/nvme.c +42 -8
@@ -505,6 +505,17 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,return NVME_SUCCESS ; } +static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,NvmeNamespace *ns, +uint16_t ctrl,NvmeRequest *req) +{ +if ((ctrl &NVME_RW_PRINFO_PRACT ) && !(ns->id_ns.dps &DPS_TYPE_MASK )) { +trace_nvme_dev_err_prinfo (nvme_cid (req), ctrl); +return NVME_INVALID_FIELD |NVME_DNR ; + } + +return NVME_SUCCESS ; +} +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns,uint64_t slba,uint32_t nlb,NvmeRequest *req)
@@ -564,11 +575,22 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint32_t nlb =le16_to_cpu (rw->nlb) +1 ;uint64_t offset = slba << data_shift;uint32_t count = nlb << data_shift; +uint16_t ctrl =le16_to_cpu (rw->control);uint16_t status; + status =nvme_check_prinfo (n, ns, ctrl, req); +if (status) { + goto invalid; + } + +if (ctrl &NVME_RW_PRINFO_PRCHK_MASK ) { + status =NVME_INVALID_PROT_INFO |NVME_DNR ; + goto invalid; + } + status =nvme_check_bounds (n, ns, slba, nlb, req);if (status) { -return status; + goto invalid; } block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,
@@ -576,6 +598,10 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, req->aiocb =blk_aio_pwrite_zeroes (n->conf.blk, offset, count,BDRV_REQ_MAY_UNMAP , nvme_rw_cb, req);return NVME_NO_COMPLETE ; + +invalid: +block_acct_invalid (blk_get_stats (n->conf.blk),BLOCK_ACCT_WRITE ); +return status; } static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,
@@ -584,6 +610,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,NvmeRwCmd *rw = (NvmeRwCmd *)cmd;uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba); +uint16_t ctrl =le16_to_cpu (rw->control);uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas);uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;
@@ -597,19 +624,22 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, status =nvme_check_mdts (n, data_size, req);if (status) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return status; + goto invalid; + } + + status =nvme_check_prinfo (n, ns, ctrl, req); +if (status) { + goto invalid; } status =nvme_check_bounds (n, ns, slba, nlb, req);if (status) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return status; + goto invalid; } -if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return NVME_INVALID_FIELD |NVME_DNR ; + status =nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req); +if (status) { + goto invalid; }if (req->qsg.nsg >0 ) {
@@ -633,6 +663,10 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, }return NVME_NO_COMPLETE ; + +invalid: +block_acct_invalid (blk_get_stats (n->conf.blk), acct); +return status; }static uint16_t nvme_io_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
hw/block/trace-events +1 -0
@@ -80,6 +80,7 @@ nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_ # nvme traces for error conditions nvme_dev_err_mdts(uint16_t cid, size_t mdts, size_t len) "cid %"PRIu16" mdts %"PRIu64" len %"PRIu64"" +nvme_dev_err_prinfo(uint16_t cid, uint16_t ctrl) "cid %"PRIu16" ctrl %"PRIu16"" nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size" nvme_dev_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" nvme_dev_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64""
include/block/nvme.h +1 -0
@@ -394,6 +394,7 @@ enum {NVME_RW_PRINFO_PRCHK_GUARD =1 <<12 ,NVME_RW_PRINFO_PRCHK_APP =1 <<11 ,NVME_RW_PRINFO_PRCHK_REF =1 <<10 , + NVME_RW_PRINFO_PRCHK_MASK = 7 << 10, }; typedef struct NvmeDsmCmd {
Signature · 1 line
2.25.1
Re: [PATCH v6 31/42] nvme: add check for prinfo
Quoted 16 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Check the validity of the PRINFO field.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 50 ++++++++++++++++++++++++++++++++++++------- hw/block/trace-events | 1 + include/block/nvme.h | 1 + 3 files changed, 44 insertions(+), 8 deletions(-)hw/block/nvme.c +0
-0
hw/block/nvme.c static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len, · line 514
Quoted 10 lines
hw/block/nvme.c +7
-0@@ -505,6 +505,17 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,return NVME_SUCCESS ; } +static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,NvmeNamespace *ns, +uint16_t ctrl,NvmeRequest *req) +{ +if ((ctrl &NVME_RW_PRINFO_PRACT ) && !(ns->id_ns.dps &DPS_TYPE_MASK )) { +trace_nvme_dev_err_prinfo (nvme_cid (req), ctrl); +return NVME_INVALID_FIELD |NVME_DNR ; + }
I refreshed my (still very limited) knowelege on the metadata and the protection info, and this is what I found:
I think that this is very far from complete, because we also have:
1. PRCHECK. According to the spec it is independent of PRACT
And when some of it is set,
together with enabled protection (the DPS field in namespace),
Then the 8 bytes of the protection info is checked (optionally using the the EILBRT and ELBAT/ELBATM fields in the command and CRC of the data for the guard field)
So this field should also be checked to be zero when protection is disabled (I don't see an explicit requirement for that in the spec, but neither I see such requirement for PRACT)
2. The protection values to be written / checked ((E)ILBRT/(E)LBATM/(E)LBAT) Same here, but also these should not be set when PRCHECK is not set for reads, plus some are protection type specific.
The spec does mention the 'Invalid Protection Information' error code which refers to invalid values in the PRINFO field.
So this error code I think should be returned instead of the 'Invalid field'
Another thing to optionaly check is that the metadata pointer for separate metadata.
Is zero as long as we don't support metadata
(again I don't see an explicit requirement for this in the spec, but it mentions:
"This field is valid only if the command has metadata that is not interleaved with the logical block data, as specified in the Format NVM command"
)
Quoted 108 lines
hw/block/nvme.c +35
-8+ +return NVME_SUCCESS ; +} +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns,uint64_t slba,uint32_t nlb,NvmeRequest *req)@@ -564,11 +575,22 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,uint32_t nlb =le16_to_cpu (rw->nlb) +1 ;uint64_t offset = slba << data_shift;uint32_t count = nlb << data_shift; +uint16_t ctrl =le16_to_cpu (rw->control);uint16_t status; + status =nvme_check_prinfo (n, ns, ctrl, req); +if (status) { + goto invalid; + } + +if (ctrl &NVME_RW_PRINFO_PRCHK_MASK ) { + status =NVME_INVALID_PROT_INFO |NVME_DNR ; + goto invalid; + } + status =nvme_check_bounds (n, ns, slba, nlb, req);if (status) { -return status; + goto invalid; } block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,@@ -576,6 +598,10 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, req->aiocb =blk_aio_pwrite_zeroes (n->conf.blk, offset, count,BDRV_REQ_MAY_UNMAP , nvme_rw_cb, req);return NVME_NO_COMPLETE ; + +invalid: +block_acct_invalid (blk_get_stats (n->conf.blk),BLOCK_ACCT_WRITE ); +return status; } static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,@@ -584,6 +610,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,NvmeRwCmd *rw = (NvmeRwCmd *)cmd;uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba); +uint16_t ctrl =le16_to_cpu (rw->control);uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas);uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;@@ -597,19 +624,22 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, status =nvme_check_mdts (n, data_size, req);if (status) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return status; + goto invalid; + } + + status =nvme_check_prinfo (n, ns, ctrl, req); +if (status) { + goto invalid; } status =nvme_check_bounds (n, ns, slba, nlb, req);if (status) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return status; + goto invalid; } -if (nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req)) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return NVME_INVALID_FIELD |NVME_DNR ; + status =nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req); +if (status) { + goto invalid; }if (req->qsg.nsg >0 ) {@@ -633,6 +663,10 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, }return NVME_NO_COMPLETE ; + +invalid: +block_acct_invalid (blk_get_stats (n->conf.blk), acct); +return status; }static uint16_t nvme_io_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)hw/block/trace-events +1
-0@@ -80,6 +80,7 @@ nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_ # nvme traces for error conditions nvme_dev_err_mdts(uint16_t cid, size_t mdts, size_t len) "cid %"PRIu16" mdts %"PRIu64" len %"PRIu64"" +nvme_dev_err_prinfo(uint16_t cid, uint16_t ctrl) "cid %"PRIu16" ctrl %"PRIu16"" nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size" nvme_dev_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" nvme_dev_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64""include/block/nvme.h +0
-0
include/block/nvme.h enum { · line 400
Quoted 7 lines
include/block/nvme.h +1
-0@@ -394,6 +394,7 @@ enum {NVME_RW_PRINFO_PRCHK_GUARD =1 <<12 ,NVME_RW_PRINFO_PRCHK_APP =1 <<11 ,NVME_RW_PRINFO_PRCHK_REF =1 <<10 , + NVME_RW_PRINFO_PRCHK_MASK = 7 << 10, }; typedef struct NvmeDsmCmd {
Best regards,
Maxim Levitsky
Re: [PATCH v6 31/42] nvme: add check for prinfo
Quoted 52 lines · Maxim Levitsky
Quoted 16 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Check the validity of the PRINFO field.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 50 ++++++++++++++++++++++++++++++++++++------- hw/block/trace-events | 1 + include/block/nvme.h | 1 + 3 files changed, 44 insertions(+), 8 deletions(-)hw/block/nvme.c +0
-0hw/block/nvme.c static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len, · line 514
Quoted 10 lines
hw/block/nvme.c +7
-0@@ -505,6 +505,17 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,return NVME_SUCCESS ; } +static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,NvmeNamespace *ns, +uint16_t ctrl,NvmeRequest *req) +{ +if ((ctrl &NVME_RW_PRINFO_PRACT ) && !(ns->id_ns.dps &DPS_TYPE_MASK )) { +trace_nvme_dev_err_prinfo (nvme_cid (req), ctrl); +return NVME_INVALID_FIELD |NVME_DNR ; + }I refreshed my (still very limited) knowelege on the metadata and the protection info, and this is what I found:
I think that this is very far from complete, because we also have:
1. PRCHECK. According to the spec it is independent of PRACT
And when some of it is set,
together with enabled protection (the DPS field in namespace),
Then the 8 bytes of the protection info is checked (optionally using the the EILBRT and ELBAT/ELBATM fields in the command and CRC of the data for the guard field)So this field should also be checked to be zero when protection is disabled (I don't see an explicit requirement for that in the spec, but neither I see such requirement for PRACT)
2. The protection values to be written / checked ((E)ILBRT/(E)LBATM/(E)LBAT) Same here, but also these should not be set when PRCHECK is not set for reads, plus some are protection type specific.
The spec does mention the 'Invalid Protection Information' error code which refers to invalid values in the PRINFO field.
So this error code I think should be returned instead of the 'Invalid field'
Quoted 9 lines
Another thing to optionaly check is that the metadata pointer for separate metadata.
Is zero as long as we don't support metadata
(again I don't see an explicit requirement for this in the spec, but it mentions:"This field is valid only if the command has metadata that is not interleaved with the logical block data, as specified in the Format NVM command"
)
I'm kinda inclined to just drop this patch. The spec actually says that the PRACT and PRCHK fields are used only if the namespace is formatted to use end-to-end protection information. Since we do not support that, I don't think we even need to check it.
Any opinion on this?
Re: [PATCH v6 31/42] nvme: add check for prinfo
Quoted 63 lines · Klaus Birkelund Jensen
Quoted 52 lines · Maxim Levitsky
Quoted 16 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Check the validity of the PRINFO field.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 50 ++++++++++++++++++++++++++++++++++++------- hw/block/trace-events | 1 + include/block/nvme.h | 1 + 3 files changed, 44 insertions(+), 8 deletions(-)hw/block/nvme.c +0
-0hw/block/nvme.c static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len, · line 514
Quoted 10 lines
hw/block/nvme.c +7
-0@@ -505,6 +505,17 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,return NVME_SUCCESS ; } +static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,NvmeNamespace *ns, +uint16_t ctrl,NvmeRequest *req) +{ +if ((ctrl &NVME_RW_PRINFO_PRACT ) && !(ns->id_ns.dps &DPS_TYPE_MASK )) { +trace_nvme_dev_err_prinfo (nvme_cid (req), ctrl); +return NVME_INVALID_FIELD |NVME_DNR ; + }I refreshed my (still very limited) knowelege on the metadata and the protection info, and this is what I found:
I think that this is very far from complete, because we also have:
1. PRCHECK. According to the spec it is independent of PRACT
And when some of it is set,
together with enabled protection (the DPS field in namespace),
Then the 8 bytes of the protection info is checked (optionally using the the EILBRT and ELBAT/ELBATM fields in the command and CRC of the data for the guard field)So this field should also be checked to be zero when protection is disabled (I don't see an explicit requirement for that in the spec, but neither I see such requirement for PRACT)
2. The protection values to be written / checked ((E)ILBRT/(E)LBATM/(E)LBAT) Same here, but also these should not be set when PRCHECK is not set for reads, plus some are protection type specific.
The spec does mention the 'Invalid Protection Information' error code which refers to invalid values in the PRINFO field.
So this error code I think should be returned instead of the 'Invalid field'Quoted 9 lines
Another thing to optionaly check is that the metadata pointer for separate metadata.
Is zero as long as we don't support metadata
(again I don't see an explicit requirement for this in the spec, but it mentions:"This field is valid only if the command has metadata that is not interleaved with the logical block data, as specified in the Format NVM command"
)
Quoted 6 lines
I'm kinda inclined to just drop this patch. The spec actually says that the PRACT and PRCHK fields are used only if the namespace is formatted to use end-to-end protection information. Since we do not support that, I don't think we even need to check it.
Any opinion on this?
Yep. I also think so.
I did add as much as possible checks on all the reserved fields in nvme-mdev, checks for all all the unused fields like that, to make it as defensive as possible and to reduce the attack surface to the minimum.
This can be done later when all the dust settles, its not a high priority for sure.
Best regard,
Maxim Levitsky
Quoted 1 line
PATCH v6 32/42 nvme: allow multiple aios per command
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
This refactors how the device issues asynchronous block backend requests. The NvmeRequest now holds a queue of NvmeAIOs that are associated with the command. This allows multiple aios to be issued for a command. Only when all requests have been completed will the device post a completion queue entry.
Because the device is currently guaranteed to only issue a single aio request per command, the benefit is not immediately obvious. But this functionality is required to support metadata, the dataset management command and other features.
--- hw/block/nvme.c | 377 +++++++++++++++++++++++++++++++----------- hw/block/nvme.h | 129 +++++++++++++-- hw/block/trace-events | 6 + 3 files changed, 407 insertions(+), 105 deletions(-)
hw/block/nvme.c +283 -94
@@ -59,6 +59,7 @@ }while (0 ) static void nvme_process_sq(void *opaque); +static void nvme_aio_cb (void *opaque,int ret);static inline void *nvme_addr_to_cmb (NvmeCtrl *n,hwaddr addr) {
@@ -373,6 +374,99 @@ static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg,return nvme_map_prp (n, qsg, iov, prp1, prp2, len, req); } +static void nvme_aio_destroy (NvmeAIO *aio) +{ +g_free (aio); +} + +static inline void nvme_req_register_aio (NvmeRequest *req,NvmeAIO *aio, +NvmeAIOOp opc) +{ + aio->opc = opc; + +trace_nvme_dev_req_register_aio (nvme_cid (req), aio,blk_name (aio->blk), + aio->offset, aio->len, +nvme_aio_opc_str (aio), req); + +if (req) { +QTAILQ_INSERT_TAIL (&req->aio_tailq, aio, tailq_entry); + } +} + +static void nvme_submit_aio (NvmeAIO *aio) +{ +BlockBackend *blk = aio->blk; +BlockAcctCookie *acct = &aio->acct; +BlockAcctStats *stats =blk_get_stats (blk); + +bool is_write; + +switch (aio->opc) { +case NVME_AIO_OPC_NONE : +break ; + +case NVME_AIO_OPC_FLUSH : +block_acct_start (stats, acct,0 ,BLOCK_ACCT_FLUSH ); + aio->aiocb =blk_aio_flush (blk, nvme_aio_cb, aio); +break ; + +case NVME_AIO_OPC_WRITE_ZEROES : +block_acct_start (stats, acct, aio->len,BLOCK_ACCT_WRITE ); + aio->aiocb =blk_aio_pwrite_zeroes (blk, aio->offset, aio->len, +BDRV_REQ_MAY_UNMAP , nvme_aio_cb, + aio); +break ; + +case NVME_AIO_OPC_READ : +case NVME_AIO_OPC_WRITE : + is_write = (aio->opc ==NVME_AIO_OPC_WRITE ); + +block_acct_start (stats, acct, aio->len, + is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ); + +if (aio->qsg) { +if (is_write) { + aio->aiocb =dma_blk_write (blk, aio->qsg, aio->offset, +BDRV_SECTOR_SIZE , nvme_aio_cb, aio); + }else { + aio->aiocb =dma_blk_read (blk, aio->qsg, aio->offset, +BDRV_SECTOR_SIZE , nvme_aio_cb, aio); + } + }else { +if (is_write) { + aio->aiocb =blk_aio_pwritev (blk, aio->offset, aio->iov,0 , + nvme_aio_cb, aio); + }else { + aio->aiocb =blk_aio_preadv (blk, aio->offset, aio->iov,0 , + nvme_aio_cb, aio); + } + } + +break ; + } +} + +static void nvme_rw_aio (BlockBackend *blk,uint64_t offset,NvmeRequest *req) +{ +NvmeAIO *aio; +size_t len = req->qsg.nsg >0 ? req->qsg.size : req->iov.size; + + aio =g_new0 (NvmeAIO,1 ); + + *aio = (NvmeAIO ) { + .blk = blk, + .offset = offset, + .len = len, + .req = req, + .qsg = req->qsg.sg ? &req->qsg :NULL , + .iov = req->iov.iov ? &req->iov :NULL , + }; + +nvme_req_register_aio (req, aio,nvme_req_is_write (req) ? +NVME_AIO_OPC_WRITE :NVME_AIO_OPC_READ ); +nvme_submit_aio (aio); +} +static void nvme_post_cqes (void *opaque) {NvmeCQueue *cq = opaque;
@@ -396,6 +490,7 @@ static void nvme_post_cqes(void *opaque)nvme_inc_cq_tail (cq);pci_dma_write (&n->parent_obj, addr, (void *)&req->cqe,sizeof (req->cqe)); +nvme_req_clear (req);QTAILQ_INSERT_TAIL (&sq->req_list, req, entry); }if (cq->tail != cq->head) {
@@ -406,8 +501,8 @@ static void nvme_post_cqes(void *opaque)static void nvme_enqueue_req_completion (NvmeCQueue *cq,NvmeRequest *req) {assert (cq->cqid == req->sq->cqid); -trace_nvme_dev_enqueue_req_completion (nvme_cid (req), cq->cqid, - req->status); +trace_nvme_dev_enqueue_req_completion (nvme_cid (req), cq->cqid, req->status); +QTAILQ_REMOVE (&req->sq->out_req_list, req, entry);QTAILQ_INSERT_TAIL (&cq->req_list, req, entry);timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 );
@@ -505,9 +600,11 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,return NVME_SUCCESS ; } -static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,NvmeNamespace *ns, -uint16_t ctrl,NvmeRequest *req) +static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,uint16_t ctrl, +NvmeRequest *req) { +NvmeNamespace *ns = req->ns; +if ((ctrl &NVME_RW_PRINFO_PRACT ) && !(ns->id_ns.dps &DPS_TYPE_MASK )) {trace_nvme_dev_err_prinfo (nvme_cid (req), ctrl);return NVME_INVALID_FIELD |NVME_DNR ;
@@ -516,10 +613,10 @@ static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, NvmeNamespace *ns,return NVME_SUCCESS ; } -static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns, -uint64_t slba,uint32_t nlb, -NvmeRequest *req) +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,uint64_t slba, +uint32_t nlb,NvmeRequest *req) { +NvmeNamespace *ns = req->ns;uint64_t nsze =le64_to_cpu (ns->id_ns.nsze);if (unlikely (UINT64_MAX - slba < nlb || slba + nlb > nsze)) {
@@ -530,55 +627,154 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns,return NVME_SUCCESS ; } -static void nvme_rw_cb (void *opaque,int ret) +static uint16_t nvme_check_rw (NvmeCtrl *n,NvmeRequest *req) +{ +NvmeNamespace *ns = req->ns; +NvmeRwCmd *rw = (NvmeRwCmd *) &req->cmd; +uint16_t ctrl =le16_to_cpu (rw->control); +size_t len = req->nlb <<nvme_ns_lbads (ns); +uint16_t status; + + status =nvme_check_mdts (n, len, req); +if (status) { +return status; + } + + status =nvme_check_prinfo (n, ctrl, req); +if (status) { +return status; + } + + status =nvme_check_bounds (n, req->slba, req->nlb, req); +if (status) { +return status; + } + +return NVME_SUCCESS ; +} + +static void nvme_rw_cb (NvmeRequest *req,void *opaque) { -NvmeRequest *req = opaque;NvmeSQueue *sq = req->sq;NvmeCtrl *n = sq->ctrl;NvmeCQueue *cq = n->cq[sq->cqid]; -if (!ret) { -block_acct_done (blk_get_stats (n->conf.blk), &req->acct); - req->status =NVME_SUCCESS ; - }else { -block_acct_failed (blk_get_stats (n->conf.blk), &req->acct); - req->status =NVME_INTERNAL_DEV_ERROR ; - } - -if (req->qsg.nalloc) { -qemu_sglist_destroy (&req->qsg); - } -if (req->iov.nalloc) { -qemu_iovec_destroy (&req->iov); - } +trace_nvme_dev_rw_cb (nvme_cid (req), req->cmd.nsid);nvme_enqueue_req_completion (cq, req); } -static uint16_t nvme_flush (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static void nvme_aio_cb (void *opaque,int ret) { -block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 , -BLOCK_ACCT_FLUSH ); - req->aiocb =blk_aio_flush (n->conf.blk, nvme_rw_cb, req); +NvmeAIO *aio = opaque; +NvmeRequest *req = aio->req; + +BlockBackend *blk = aio->blk; +BlockAcctCookie *acct = &aio->acct; +BlockAcctStats *stats =blk_get_stats (blk); + +Error *local_err =NULL ; + +trace_nvme_dev_aio_cb (nvme_cid (req), aio,blk_name (blk), aio->offset, +nvme_aio_opc_str (aio), req); + +if (req) { +QTAILQ_REMOVE (&req->aio_tailq, aio, tailq_entry); + } + +if (!ret) { +block_acct_done (stats, acct); + }else { +block_acct_failed (stats, acct); + +if (req) { +uint16_t status; + +switch (aio->opc) { +case NVME_AIO_OPC_READ : + status =NVME_UNRECOVERED_READ ; +break ; +case NVME_AIO_OPC_WRITE : +case NVME_AIO_OPC_WRITE_ZEROES : + status =NVME_WRITE_FAULT ; +break ; +default : + status =NVME_INTERNAL_DEV_ERROR ; +break ; + } + +trace_nvme_dev_err_aio (nvme_cid (req), aio,blk_name (blk), + aio->offset,nvme_aio_opc_str (aio), req, + status); + +error_setg_errno (&local_err, -ret,"aio failed" ); +error_report_err (local_err); + +/* +* An Internal Error trumps all other errors. For other errors, +* only set the first error encountered. Any additional errors will +* be recorded in the error information log page. +*/ +if (!req->status || +nvme_status_is_error (status,NVME_INTERNAL_DEV_ERROR )) { + req->status = status; + } + } + } + +if (aio->cb) { + aio->cb (aio, aio->cb_arg, ret); + } + +if (req &&QTAILQ_EMPTY (&req->aio_tailq)) { +if (req->cb) { + req->cb (req, req->cb_arg); + }else { +NvmeSQueue *sq = req->sq; +NvmeCtrl *n = sq->ctrl; +NvmeCQueue *cq = n->cq[sq->cqid]; + +nvme_enqueue_req_completion (cq, req); + } + } + +nvme_aio_destroy (aio); +} + +static uint16_t nvme_flush (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +NvmeAIO *aio =g_new0 (NvmeAIO,1 ); + + *aio = (NvmeAIO ) { + .blk = n->conf.blk, + .req = req, + }; + +nvme_req_register_aio (req, aio,NVME_AIO_OPC_FLUSH ); +nvme_submit_aio (aio);return NVME_NO_COMPLETE ; } -static uint16_t nvme_write_zeros (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_write_zeroes (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) { -NvmeRwCmd *rw = (NvmeRwCmd *)cmd; -const uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas); -const uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; -uint64_t slba =le64_to_cpu (rw->slba); -uint32_t nlb =le16_to_cpu (rw->nlb) +1 ; -uint64_t offset = slba << data_shift; -uint32_t count = nlb << data_shift; +NvmeAIO *aio; + +NvmeNamespace *ns = req->ns; +NvmeRwCmd *rw = (NvmeRwCmd *) cmd;uint16_t ctrl =le16_to_cpu (rw->control); + +int64_t offset; +size_t count;uint16_t status; - status =nvme_check_prinfo (n, ns, ctrl, req); + req->slba =le64_to_cpu (rw->slba); + req->nlb =le16_to_cpu (rw->nlb) +1 ; + +trace_nvme_dev_write_zeroes (nvme_cid (req),le32_to_cpu (cmd->nsid), + req->slba, req->nlb); + + status =nvme_check_prinfo (n, ctrl, req);if (status) { goto invalid; }
@@ -588,15 +784,26 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, goto invalid; } - status =nvme_check_bounds (n, ns, slba, nlb, req); + status =nvme_check_bounds (n, req->slba, req->nlb, req);if (status) { goto invalid; } -block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 , -BLOCK_ACCT_WRITE ); - req->aiocb =blk_aio_pwrite_zeroes (n->conf.blk, offset, count, -BDRV_REQ_MAY_UNMAP , nvme_rw_cb, req); + offset = req->slba <<nvme_ns_lbads (ns); + count = req->nlb <<nvme_ns_lbads (ns); + + aio =g_new0 (NvmeAIO,1 ); + + *aio = (NvmeAIO ) { + .blk = n->conf.blk, + .offset = offset, + .len = count, + .req = req, + }; + +nvme_req_register_aio (req, aio,NVME_AIO_OPC_WRITE_ZEROES ); +nvme_submit_aio (aio); +return NVME_NO_COMPLETE ; invalid:
@@ -604,63 +811,36 @@ invalid:return status; } -static uint16_t nvme_rw (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_rw (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) { -NvmeRwCmd *rw = (NvmeRwCmd *)cmd; -uint32_t nlb =le32_to_cpu (rw->nlb) +1 ; -uint64_t slba =le64_to_cpu (rw->slba); -uint16_t ctrl =le16_to_cpu (rw->control); +NvmeRwCmd *rw = (NvmeRwCmd *) cmd; +NvmeNamespace *ns = req->ns; +uint32_t len; +int status; -uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas); -uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; -uint64_t data_size = (uint64_t )nlb << data_shift; -uint64_t data_offset = slba << data_shift; -int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ; -enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; -uint16_t status; +enum BlockAcctType acct = +nvme_req_is_write (req) ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; -trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba); + req->nlb =le16_to_cpu (rw->nlb) +1 ; + req->slba =le64_to_cpu (rw->slba); - status =nvme_check_mdts (n, data_size, req); -if (status) { - goto invalid; - } + len = req->nlb <<nvme_ns_lbads (ns); - status =nvme_check_prinfo (n, ns, ctrl, req); -if (status) { - goto invalid; - } +trace_nvme_dev_rw (nvme_req_is_write (req) ?"write" :"read" , req->nlb, + req->nlb <<nvme_ns_lbads (req->ns), req->slba); - status =nvme_check_bounds (n, ns, slba, nlb, req); + status =nvme_check_rw (n, req);if (status) { goto invalid; } - status =nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req); + status =nvme_map (n, cmd, &req->qsg, &req->iov, len, req);if (status) { goto invalid; } -if (req->qsg.nsg >0 ) { -block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->qsg.size, - acct); - - req->aiocb = is_write ? -dma_blk_write (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , - nvme_rw_cb, req) : -dma_blk_read (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , - nvme_rw_cb, req); - }else { -block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->iov.size, - acct); - - req->aiocb = is_write ? -blk_aio_pwritev (n->conf.blk, data_offset, &req->iov,0 , nvme_rw_cb, - req) : -blk_aio_preadv (n->conf.blk, data_offset, &req->iov,0 , nvme_rw_cb, - req); - } +nvme_rw_aio (n->conf.blk, req->slba <<nvme_ns_lbads (ns), req); +nvme_req_set_cb (req, nvme_rw_cb,NULL );return NVME_NO_COMPLETE ;
@@ -671,23 +851,26 @@ invalid:static uint16_t nvme_io_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) { -NvmeNamespace *ns;uint32_t nsid =le32_to_cpu (cmd->nsid); +trace_nvme_dev_io_cmd (nvme_cid (req), nsid,le16_to_cpu (req->sq->sqid), + cmd->opcode); +if (unlikely (nsid ==0 || nsid > n->num_namespaces)) {trace_nvme_dev_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; } - ns = &n->namespaces[nsid -1 ]; + req->ns = &n->namespaces[nsid -1 ]; +switch (cmd->opcode) {case NVME_CMD_FLUSH : -return nvme_flush (n, ns, cmd, req); +return nvme_flush (n, cmd, req);case NVME_CMD_WRITE_ZEROS : -return nvme_write_zeros (n, ns, cmd, req); +return nvme_write_zeroes (n, cmd, req);case NVME_CMD_WRITE :case NVME_CMD_READ : -return nvme_rw (n, ns, cmd, req); +return nvme_rw (n, cmd, req);default :trace_nvme_dev_err_invalid_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ;
@@ -711,6 +894,7 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeCmd *cmd)NvmeRequest *req, *next;NvmeSQueue *sq;NvmeCQueue *cq; +NvmeAIO *aio;uint16_t qid =le16_to_cpu (c->qid);if (unlikely (!qid ||nvme_check_sqid (n, qid))) {
@@ -723,8 +907,11 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeCmd *cmd) sq = n->sq[qid];while (!QTAILQ_EMPTY (&sq->out_req_list)) { req =QTAILQ_FIRST (&sq->out_req_list); -assert (req->aiocb); -blk_aio_cancel (req->aiocb); +while (!QTAILQ_EMPTY (&req->aio_tailq)) { + aio =QTAILQ_FIRST (&req->aio_tailq); +assert (aio->aiocb); +blk_aio_cancel (aio->aiocb); + } }if (!nvme_check_cqid (n, sq->cqid)) { cq = n->cq[sq->cqid];
@@ -761,6 +948,7 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,QTAILQ_INIT (&sq->out_req_list);for (i =0 ; i < sq->size; i++) { sq->io_req[i].sq = sq; +QTAILQ_INIT (&(sq->io_req[i].aio_tailq));QTAILQ_INSERT_TAIL (&(sq->req_list), &sq->io_req[i], entry); } sq->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , nvme_process_sq, sq);
@@ -1474,8 +1662,9 @@ static void nvme_process_sq(void *opaque) req =QTAILQ_FIRST (&sq->req_list);QTAILQ_REMOVE (&sq->req_list, req, entry);QTAILQ_INSERT_TAIL (&sq->out_req_list, req, entry); -memset (&req->cqe,0 ,sizeof (req->cqe)); + req->cqe.cid = cmd.cid; +memcpy (&req->cmd, &cmd,sizeof (NvmeCmd)); status = sq->sqid ?nvme_io_cmd (n, &cmd, req) :nvme_admin_cmd (n, &cmd, req);
hw/block/nvme.h +118 -11
150 lines not on this page · raw message
hw/block/trace-events +6 -0
@@ -34,7 +34,12 @@ nvme_dev_irq_pin(void) "pulsing IRQ pin" nvme_dev_irq_masked(void) "IRQ is masked" nvme_dev_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" nvme_dev_map_prp(uint16_t cid, uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "cid %"PRIu16" trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64" num_prps %d" +nvme_dev_req_register_aio(uint16_t cid, void *aio, const char *blkname, uint64_t offset, uint64_t count, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" count %"PRIu64" opc \"%s\" req %p" +nvme_dev_aio_cb(uint16_t cid, void *aio, const char *blkname, uint64_t offset, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" opc \"%s\" req %p" +nvme_dev_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8"" nvme_dev_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64"" +nvme_dev_rw_cb(uint16_t cid, uint32_t nsid) "cid %"PRIu16" nsid %"PRIu32"" +nvme_dev_write_zeroes(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32"" nvme_dev_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16"" nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien) "create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16", qsize=%"PRIu16", qflags=%"PRIu16", ien=%d" nvme_dev_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16""
@@ -81,6 +86,7 @@ nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_ # nvme traces for error conditions nvme_dev_err_mdts(uint16_t cid, size_t mdts, size_t len) "cid %"PRIu16" mdts %"PRIu64" len %"PRIu64"" nvme_dev_err_prinfo(uint16_t cid, uint16_t ctrl) "cid %"PRIu16" ctrl %"PRIu16"" +nvme_dev_err_aio(uint16_t cid, void *aio, const char *blkname, uint64_t offset, const char *opc, void *req, uint16_t status) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" opc \"%s\" req %p status 0x%"PRIx16"" nvme_dev_err_invalid_dma(void) "PRP/SGL is too small for transfer size" nvme_dev_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" nvme_dev_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64""
Signature · 1 line
2.25.1
Re: [PATCH v6 32/42] nvme: allow multiple aios per command
Quoted 35 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This refactors how the device issues asynchronous block backend requests. The NvmeRequest now holds a queue of NvmeAIOs that are associated with the command. This allows multiple aios to be issued for a command. Only when all requests have been completed will the device post a completion queue entry.
Because the device is currently guaranteed to only issue a single aio request per command, the benefit is not immediately obvious. But this functionality is required to support metadata, the dataset management command and other features.
Signed-off-by Klaus Jensen <[email protected]>Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 377 +++++++++++++++++++++++++++++++----------- hw/block/nvme.h | 129 +++++++++++++-- hw/block/trace-events | 6 + 3 files changed, 407 insertions(+), 105 deletions(-)hw/block/nvme.c +1
-0@@ -59,6 +59,7 @@ }while (0 ) static void nvme_process_sq(void *opaque); +static void nvme_aio_cb (void *opaque,int ret);static inline void *nvme_addr_to_cmb (NvmeCtrl *n,hwaddr addr) {
hw/block/nvme.c static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg, · line 382
Quoted 9 lines
hw/block/nvme.c +6
-0@@ -373,6 +374,99 @@ static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg,return nvme_map_prp (n, qsg, iov, prp1, prp2, len, req); } +static void nvme_aio_destroy (NvmeAIO *aio) +{ +g_free (aio); +} + +static inline void nvme_req_register_aio(NvmeRequest *req, NvmeAIO *aio,
I guess I'll call this nvme_req_add_aio,
or nvme_add_aio_to_reg.
Thoughts?
Also you can leave this as is, but add a comment on top explaining this
Quoted 4 lines
hw/block/nvme.c +4
-0+ NvmeAIOOp opc) +{ + aio->opc = opc; +
hw/block/nvme.c static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg, · line 396
Quoted 10 lines
hw/block/nvme.c +10
-0+trace_nvme_dev_req_register_aio (nvme_cid (req), aio,blk_name (aio->blk), + aio->offset, aio->len, +nvme_aio_opc_str (aio), req); + +if (req) { +QTAILQ_INSERT_TAIL (&req->aio_tailq, aio, tailq_entry); + } +} + +static void nvme_submit_aio (NvmeAIO *aio)
OK, this name makes sense
Also please add a comment on top.
Quoted 37 lines
hw/block/nvme.c +37
-0+{ +BlockBackend *blk = aio->blk; +BlockAcctCookie *acct = &aio->acct; +BlockAcctStats *stats =blk_get_stats (blk); + +bool is_write; + +switch (aio->opc) { +case NVME_AIO_OPC_NONE : +break ; + +case NVME_AIO_OPC_FLUSH : +block_acct_start (stats, acct,0 ,BLOCK_ACCT_FLUSH ); + aio->aiocb =blk_aio_flush (blk, nvme_aio_cb, aio); +break ; + +case NVME_AIO_OPC_WRITE_ZEROES : +block_acct_start (stats, acct, aio->len,BLOCK_ACCT_WRITE ); + aio->aiocb =blk_aio_pwrite_zeroes (blk, aio->offset, aio->len, +BDRV_REQ_MAY_UNMAP , nvme_aio_cb, + aio); +break ; + +case NVME_AIO_OPC_READ : +case NVME_AIO_OPC_WRITE : + is_write = (aio->opc ==NVME_AIO_OPC_WRITE ); + +block_acct_start (stats, acct, aio->len, + is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ); + +if (aio->qsg) { +if (is_write) { + aio->aiocb =dma_blk_write (blk, aio->qsg, aio->offset, +BDRV_SECTOR_SIZE , nvme_aio_cb, aio); + }else { + aio->aiocb =dma_blk_read (blk, aio->qsg, aio->offset, +BDRV_SECTOR_SIZE , nvme_aio_cb, aio);
hw/block/nvme.c static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg, · line 443
Quoted 10 lines
hw/block/nvme.c +10
-0+ } + }else { +if (is_write) { + aio->aiocb =blk_aio_pwritev (blk, aio->offset, aio->iov,0 , + nvme_aio_cb, aio); + }else { + aio->aiocb =blk_aio_preadv (blk, aio->offset, aio->iov,0 , + nvme_aio_cb, aio); + } + }
Looks much better that way that a early return!
Quoted 9 lines
hw/block/nvme.c +9
-0+ +break ; + } +} + +static void nvme_rw_aio (BlockBackend *blk,uint64_t offset,NvmeRequest *req) +{ +NvmeAIO *aio; +size_t len = req->qsg.nsg >0 ? req->qsg.size : req->iov.size;
hw/block/nvme.c static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg, · line 462
Quoted 10 lines
hw/block/nvme.c +10
-0+ + aio =g_new0 (NvmeAIO,1 ); + + *aio = (NvmeAIO ) { + .blk = blk, + .offset = offset, + .len = len, + .req = req, + .qsg = req->qsg.sg ? &req->qsg :NULL , + .iov = req->iov.iov ? &req->iov :NULL ,
OK, this is the fix for the bug I mentioned in V5, looks good.
Quoted 30 lines
hw/block/nvme.c +10
-2+ }; + +nvme_req_register_aio (req, aio,nvme_req_is_write (req) ? +NVME_AIO_OPC_WRITE :NVME_AIO_OPC_READ ); +nvme_submit_aio (aio); +} +static void nvme_post_cqes (void *opaque) {NvmeCQueue *cq = opaque;@@ -396,6 +490,7 @@ static void nvme_post_cqes(void *opaque)nvme_inc_cq_tail (cq);pci_dma_write (&n->parent_obj, addr, (void *)&req->cqe,sizeof (req->cqe)); +nvme_req_clear (req);QTAILQ_INSERT_TAIL (&sq->req_list, req, entry); }if (cq->tail != cq->head) {@@ -406,8 +501,8 @@ static void nvme_post_cqes(void *opaque)static void nvme_enqueue_req_completion (NvmeCQueue *cq,NvmeRequest *req) {assert (cq->cqid == req->sq->cqid); -trace_nvme_dev_enqueue_req_completion (nvme_cid (req), cq->cqid, - req->status); +trace_nvme_dev_enqueue_req_completion (nvme_cid (req), cq->cqid, req->status); +QTAILQ_REMOVE (&req->sq->out_req_list, req, entry);QTAILQ_INSERT_TAIL (&cq->req_list, req, entry);timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) +500 );
hw/block/nvme.c static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len, · line 607
Quoted 10 lines
hw/block/nvme.c +4
-2@@ -505,9 +600,11 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,return NVME_SUCCESS ; } -static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,NvmeNamespace *ns, -uint16_t ctrl,NvmeRequest *req) +static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,uint16_t ctrl, +NvmeRequest *req) { +NvmeNamespace *ns = req->ns; +
This should go to the patch that added nvme_check_prinfo
Quoted 5 lines
hw/block/nvme.c +0
-0if ((ctrl &NVME_RW_PRINFO_PRACT ) && !(ns->id_ns.dps &DPS_TYPE_MASK )) {trace_nvme_dev_err_prinfo (nvme_cid (req), ctrl);return NVME_INVALID_FIELD |NVME_DNR ;@@ -516,10 +613,10 @@ static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, NvmeNamespace *ns,return NVME_SUCCESS ;
hw/block/nvme.c static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, NvmeNamespace *ns, · line 620
Quoted 10 lines
hw/block/nvme.c +3
-3} -static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns, -uint64_t slba,uint32_t nlb, -NvmeRequest *req) +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,uint64_t slba, +uint32_t nlb,NvmeRequest *req) { +NvmeNamespace *ns = req->ns;uint64_t nsze =le64_to_cpu (ns->id_ns.nsze);
This should go to the patch that added nvme_check_bounds as well
Quoted 22 lines
hw/block/nvme.c +15
-1if (unlikely (UINT64_MAX - slba < nlb || slba + nlb > nsze)) {@@ -530,55 +627,154 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns,return NVME_SUCCESS ; } -static void nvme_rw_cb (void *opaque,int ret) +static uint16_t nvme_check_rw (NvmeCtrl *n,NvmeRequest *req) +{ +NvmeNamespace *ns = req->ns; +NvmeRwCmd *rw = (NvmeRwCmd *) &req->cmd; +uint16_t ctrl =le16_to_cpu (rw->control); +size_t len = req->nlb <<nvme_ns_lbads (ns); +uint16_t status; + + status =nvme_check_mdts (n, len, req); +if (status) { +return status; + } + + status =nvme_check_prinfo (n, ctrl, req); +if (status) {
hw/block/nvme.c static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns, · line 654
Quoted 10 lines
hw/block/nvme.c +10
-0+return status; + } + + status =nvme_check_bounds (n, req->slba, req->nlb, req); +if (status) { +return status; + } + +return NVME_SUCCESS ; +}
Nitpick: I hate to say it but nvme_check_rw should be in a separate patch as well. It will also make diff more readable (when adding a funtion and changing a function at the same time, you get a diff between two unrelated things)
Quoted 117 lines
hw/block/nvme.c +87
-20+ +static void nvme_rw_cb (NvmeRequest *req,void *opaque) { -NvmeRequest *req = opaque;NvmeSQueue *sq = req->sq;NvmeCtrl *n = sq->ctrl;NvmeCQueue *cq = n->cq[sq->cqid]; -if (!ret) { -block_acct_done (blk_get_stats (n->conf.blk), &req->acct); - req->status =NVME_SUCCESS ; - }else { -block_acct_failed (blk_get_stats (n->conf.blk), &req->acct); - req->status =NVME_INTERNAL_DEV_ERROR ; - } - -if (req->qsg.nalloc) { -qemu_sglist_destroy (&req->qsg); - } -if (req->iov.nalloc) { -qemu_iovec_destroy (&req->iov); - } +trace_nvme_dev_rw_cb (nvme_cid (req), req->cmd.nsid);nvme_enqueue_req_completion (cq, req); } -static uint16_t nvme_flush (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static void nvme_aio_cb (void *opaque,int ret) { -block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 , -BLOCK_ACCT_FLUSH ); - req->aiocb =blk_aio_flush (n->conf.blk, nvme_rw_cb, req); +NvmeAIO *aio = opaque; +NvmeRequest *req = aio->req; + +BlockBackend *blk = aio->blk; +BlockAcctCookie *acct = &aio->acct; +BlockAcctStats *stats =blk_get_stats (blk); + +Error *local_err =NULL ; + +trace_nvme_dev_aio_cb (nvme_cid (req), aio,blk_name (blk), aio->offset, +nvme_aio_opc_str (aio), req); + +if (req) { +QTAILQ_REMOVE (&req->aio_tailq, aio, tailq_entry); + } + +if (!ret) { +block_acct_done (stats, acct); + }else { +block_acct_failed (stats, acct); + +if (req) { +uint16_t status; + +switch (aio->opc) { +case NVME_AIO_OPC_READ : + status =NVME_UNRECOVERED_READ ; +break ; +case NVME_AIO_OPC_WRITE : +case NVME_AIO_OPC_WRITE_ZEROES : + status =NVME_WRITE_FAULT ; +break ; +default : + status =NVME_INTERNAL_DEV_ERROR ; +break ; + } + +trace_nvme_dev_err_aio (nvme_cid (req), aio,blk_name (blk), + aio->offset,nvme_aio_opc_str (aio), req, + status); + +error_setg_errno (&local_err, -ret,"aio failed" ); +error_report_err (local_err); + +/* +* An Internal Error trumps all other errors. For other errors, +* only set the first error encountered. Any additional errors will +* be recorded in the error information log page. +*/ +if (!req->status || +nvme_status_is_error (status,NVME_INTERNAL_DEV_ERROR )) { + req->status = status; + } + } + } + +if (aio->cb) { + aio->cb (aio, aio->cb_arg, ret); + } + +if (req &&QTAILQ_EMPTY (&req->aio_tailq)) { +if (req->cb) { + req->cb (req, req->cb_arg); + }else { +NvmeSQueue *sq = req->sq; +NvmeCtrl *n = sq->ctrl; +NvmeCQueue *cq = n->cq[sq->cqid]; + +nvme_enqueue_req_completion (cq, req); + } + } + +nvme_aio_destroy (aio); +} + +static uint16_t nvme_flush (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +{ +NvmeAIO *aio =g_new0 (NvmeAIO,1 ); + + *aio = (NvmeAIO ) { + .blk = n->conf.blk, + .req = req, + };
hw/block/nvme.c static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns, · line 759
Quoted 10 lines
hw/block/nvme.c +4
-2+ +nvme_req_register_aio (req, aio,NVME_AIO_OPC_FLUSH ); +nvme_submit_aio (aio);return NVME_NO_COMPLETE ; } -static uint16_t nvme_write_zeros (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_write_zeroes (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
Very small nitpick about zeros/zeroes: This should move to some refactoring patch to be honest.
Quoted 397 lines
hw/block/nvme.c +63
-64{ -NvmeRwCmd *rw = (NvmeRwCmd *)cmd; -const uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas); -const uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; -uint64_t slba =le64_to_cpu (rw->slba); -uint32_t nlb =le16_to_cpu (rw->nlb) +1 ; -uint64_t offset = slba << data_shift; -uint32_t count = nlb << data_shift; +NvmeAIO *aio; + +NvmeNamespace *ns = req->ns; +NvmeRwCmd *rw = (NvmeRwCmd *) cmd;uint16_t ctrl =le16_to_cpu (rw->control); + +int64_t offset; +size_t count;uint16_t status; - status =nvme_check_prinfo (n, ns, ctrl, req); + req->slba =le64_to_cpu (rw->slba); + req->nlb =le16_to_cpu (rw->nlb) +1 ; + +trace_nvme_dev_write_zeroes (nvme_cid (req),le32_to_cpu (cmd->nsid), + req->slba, req->nlb); + + status =nvme_check_prinfo (n, ctrl, req);if (status) { goto invalid; }@@ -588,15 +784,26 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, goto invalid; } - status =nvme_check_bounds (n, ns, slba, nlb, req); + status =nvme_check_bounds (n, req->slba, req->nlb, req);if (status) { goto invalid; } -block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 , -BLOCK_ACCT_WRITE ); - req->aiocb =blk_aio_pwrite_zeroes (n->conf.blk, offset, count, -BDRV_REQ_MAY_UNMAP , nvme_rw_cb, req); + offset = req->slba <<nvme_ns_lbads (ns); + count = req->nlb <<nvme_ns_lbads (ns); + + aio =g_new0 (NvmeAIO,1 ); + + *aio = (NvmeAIO ) { + .blk = n->conf.blk, + .offset = offset, + .len = count, + .req = req, + }; + +nvme_req_register_aio (req, aio,NVME_AIO_OPC_WRITE_ZEROES ); +nvme_submit_aio (aio); +return NVME_NO_COMPLETE ; invalid:@@ -604,63 +811,36 @@ invalid:return status; } -static uint16_t nvme_rw (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_rw (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) { -NvmeRwCmd *rw = (NvmeRwCmd *)cmd; -uint32_t nlb =le32_to_cpu (rw->nlb) +1 ; -uint64_t slba =le64_to_cpu (rw->slba); -uint16_t ctrl =le16_to_cpu (rw->control); +NvmeRwCmd *rw = (NvmeRwCmd *) cmd; +NvmeNamespace *ns = req->ns; +uint32_t len; +int status; -uint8_t lba_index =NVME_ID_NS_FLBAS_INDEX (ns->id_ns.flbas); -uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds; -uint64_t data_size = (uint64_t )nlb << data_shift; -uint64_t data_offset = slba << data_shift; -int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ; -enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; -uint16_t status; +enum BlockAcctType acct = +nvme_req_is_write (req) ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; -trace_nvme_dev_rw (is_write ?"write" :"read" , nlb, data_size, slba); + req->nlb =le16_to_cpu (rw->nlb) +1 ; + req->slba =le64_to_cpu (rw->slba); - status =nvme_check_mdts (n, data_size, req); -if (status) { - goto invalid; - } + len = req->nlb <<nvme_ns_lbads (ns); - status =nvme_check_prinfo (n, ns, ctrl, req); -if (status) { - goto invalid; - } +trace_nvme_dev_rw (nvme_req_is_write (req) ?"write" :"read" , req->nlb, + req->nlb <<nvme_ns_lbads (req->ns), req->slba); - status =nvme_check_bounds (n, ns, slba, nlb, req); + status =nvme_check_rw (n, req);if (status) { goto invalid; } - status =nvme_map (n, cmd, &req->qsg, &req->iov, data_size, req); + status =nvme_map (n, cmd, &req->qsg, &req->iov, len, req);if (status) { goto invalid; } -if (req->qsg.nsg >0 ) { -block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->qsg.size, - acct); - - req->aiocb = is_write ? -dma_blk_write (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , - nvme_rw_cb, req) : -dma_blk_read (n->conf.blk, &req->qsg, data_offset,BDRV_SECTOR_SIZE , - nvme_rw_cb, req); - }else { -block_acct_start (blk_get_stats (n->conf.blk), &req->acct, req->iov.size, - acct); - - req->aiocb = is_write ? -blk_aio_pwritev (n->conf.blk, data_offset, &req->iov,0 , nvme_rw_cb, - req) : -blk_aio_preadv (n->conf.blk, data_offset, &req->iov,0 , nvme_rw_cb, - req); - } +nvme_rw_aio (n->conf.blk, req->slba <<nvme_ns_lbads (ns), req); +nvme_req_set_cb (req, nvme_rw_cb,NULL );return NVME_NO_COMPLETE ;@@ -671,23 +851,26 @@ invalid:static uint16_t nvme_io_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) { -NvmeNamespace *ns;uint32_t nsid =le32_to_cpu (cmd->nsid); +trace_nvme_dev_io_cmd (nvme_cid (req), nsid,le16_to_cpu (req->sq->sqid), + cmd->opcode); +if (unlikely (nsid ==0 || nsid > n->num_namespaces)) {trace_nvme_dev_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; } - ns = &n->namespaces[nsid -1 ]; + req->ns = &n->namespaces[nsid -1 ]; +switch (cmd->opcode) {case NVME_CMD_FLUSH : -return nvme_flush (n, ns, cmd, req); +return nvme_flush (n, cmd, req);case NVME_CMD_WRITE_ZEROS : -return nvme_write_zeros (n, ns, cmd, req); +return nvme_write_zeroes (n, cmd, req);case NVME_CMD_WRITE :case NVME_CMD_READ : -return nvme_rw (n, ns, cmd, req); +return nvme_rw (n, cmd, req);default :trace_nvme_dev_err_invalid_opc (cmd->opcode);return NVME_INVALID_OPCODE |NVME_DNR ;@@ -711,6 +894,7 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeCmd *cmd)NvmeRequest *req, *next;NvmeSQueue *sq;NvmeCQueue *cq; +NvmeAIO *aio;uint16_t qid =le16_to_cpu (c->qid);if (unlikely (!qid ||nvme_check_sqid (n, qid))) {@@ -723,8 +907,11 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeCmd *cmd) sq = n->sq[qid];while (!QTAILQ_EMPTY (&sq->out_req_list)) { req =QTAILQ_FIRST (&sq->out_req_list); -assert (req->aiocb); -blk_aio_cancel (req->aiocb); +while (!QTAILQ_EMPTY (&req->aio_tailq)) { + aio =QTAILQ_FIRST (&req->aio_tailq); +assert (aio->aiocb); +blk_aio_cancel (aio->aiocb); + } }if (!nvme_check_cqid (n, sq->cqid)) { cq = n->cq[sq->cqid];@@ -761,6 +948,7 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,QTAILQ_INIT (&sq->out_req_list);for (i =0 ; i < sq->size; i++) { sq->io_req[i].sq = sq; +QTAILQ_INIT (&(sq->io_req[i].aio_tailq));QTAILQ_INSERT_TAIL (&(sq->req_list), &sq->io_req[i], entry); } sq->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , nvme_process_sq, sq);@@ -1474,8 +1662,9 @@ static void nvme_process_sq(void *opaque) req =QTAILQ_FIRST (&sq->req_list);QTAILQ_REMOVE (&sq->req_list, req, entry);QTAILQ_INSERT_TAIL (&sq->out_req_list, req, entry); -memset (&req->cqe,0 ,sizeof (req->cqe)); + req->cqe.cid = cmd.cid; +memcpy (&req->cmd, &cmd,sizeof (NvmeCmd)); status = sq->sqid ?nvme_io_cmd (n, &cmd, req) :nvme_admin_cmd (n, &cmd, req);hw/block/nvme.h +118
-11@@ -27,16 +27,58 @@ typedef struct NvmeAsyncEvent {NvmeAerResult result; } NvmeAsyncEvent; -typedef struct NvmeRequest { -struct NvmeSQueue *sq; -BlockAIOCB *aiocb; -uint16_t status; -NvmeCqe cqe; -BlockAcctCookie acct; -QEMUSGList qsg; -QEMUIOVector iov; -QTAILQ_ENTRY (NvmeRequest)entry; -}NvmeRequest ; +typedef struct NvmeRequest NvmeRequest ; +typedef void NvmeRequestCompletionFunc (NvmeRequest *req,void *opaque); + +struct NvmeRequest { +struct NvmeSQueue *sq; +struct NvmeNamespace *ns; + +NvmeCqe cqe; +NvmeCmd cmd; +uint16_t status; + +uint64_t slba; +uint32_t nlb; + +QEMUSGList qsg; +QEMUIOVector iov; + +NvmeRequestCompletionFunc *cb; +void *cb_arg; + + QTAILQ_HEAD(, NvmeAIO) aio_tailq; +QTAILQ_ENTRY (NvmeRequest) entry; +}; + +static inline void nvme_req_clear (NvmeRequest *req) +{ + req->ns =NULL ; +memset (&req->cqe,0 ,sizeof (req->cqe)); + req->status =NVME_SUCCESS ; + req->slba = req->nlb =0x0 ; + req->cb = req->cb_arg =NULL ; + +if (req->qsg.sg) { +qemu_sglist_destroy (&req->qsg); + } + +if (req->iov.iov) { +qemu_iovec_destroy (&req->iov); + } +} + +static inline void nvme_req_set_cb (NvmeRequest *req, +NvmeRequestCompletionFunc *cb,void *cb_arg) +{ + req->cb = cb; + req->cb_arg = cb_arg; +} + +static inline void nvme_req_clear_cb (NvmeRequest *req) +{ + req->cb = req->cb_arg =NULL ; +} typedef struct NvmeSQueue { struct NvmeCtrl *ctrl;@@ -88,6 +130,60 @@ static inline size_t nvme_ns_lbads_bytes(NvmeNamespace *ns)return 1 <<nvme_ns_lbads (ns); } +typedef enum NvmeAIOOp { +NVME_AIO_OPC_NONE =0x0 , +NVME_AIO_OPC_FLUSH =0x1 , +NVME_AIO_OPC_READ =0x2 , +NVME_AIO_OPC_WRITE =0x3 , +NVME_AIO_OPC_WRITE_ZEROES =0x4 , +}NvmeAIOOp ; + +typedef struct NvmeAIO NvmeAIO ; +typedef void NvmeAIOCompletionFunc (NvmeAIO *aio,void *opaque,int ret); + +struct NvmeAIO { +NvmeRequest *req; + +NvmeAIOOp opc; +int64_t offset; +size_t len; +BlockBackend *blk; +BlockAIOCB *aiocb; +BlockAcctCookie acct; + +NvmeAIOCompletionFunc *cb; +void *cb_arg; + +QEMUSGList *qsg; +QEMUIOVector *iov; + +QTAILQ_ENTRY (NvmeAIO) tailq_entry; +}; + +static inline const char *nvme_aio_opc_str (NvmeAIO *aio) +{ +switch (aio->opc) { +case NVME_AIO_OPC_NONE :return "NVME_AIO_OP_NONE" ; +case NVME_AIO_OPC_FLUSH :return "NVME_AIO_OP_FLUSH" ; +case NVME_AIO_OPC_READ :return "NVME_AIO_OP_READ" ; +case NVME_AIO_OPC_WRITE :return "NVME_AIO_OP_WRITE" ; +case NVME_AIO_OPC_WRITE_ZEROES :return "NVME_AIO_OP_WRITE_ZEROES" ; +default :return "NVME_AIO_OP_UNKNOWN" ; + } +} + +static inline bool nvme_req_is_write (NvmeRequest *req) +{ +switch (req->cmd.opcode) { +case NVME_CMD_WRITE : +case NVME_CMD_WRITE_UNCOR : +case NVME_CMD_WRITE_ZEROS : +return true; +default : +return false; + } +} +#define TYPE_NVME "nvme"#define NVME (obj) \ OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)@@ -140,10 +236,21 @@ static inline uint64_t nvme_ns_nlbas(NvmeCtrl *n, NvmeNamespace *ns)static inline uint16_t nvme_cid (NvmeRequest *req) {if (req) { -return le16_to_cpu (req->cqe.cid); +return le16_to_cpu (req->cmd.cid); }return 0xffff ; } +static inline bool nvme_status_is_error (uint16_t status,uint16_t err) +{ +/* strip DNR and MORE */ +return (status &0xfff ) == err; +} + +static inline NvmeCtrl *nvme_ctrl (NvmeRequest *req) +{ +return req->sq->ctrl; +} +#endif /* HW_NVME_H */ hw/block/trace-events +0
-0@@ -34,7 +34,12 @@ nvme_dev_irq_pin(void) "pulsing IRQ pin" nvme_dev_irq_masked(void) "IRQ is masked" nvme_dev_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" nvme_dev_map_prp(uint16_t cid, uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "cid %"PRIu16" trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64"
num_prps%d"
+nvme_dev_req_register_aio(uint16_t cid, void *aio, const char *blkname,uint64_toffset,uint64_tcount, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" count %"PRIu64" opc \"%s\" req %p"hw/block/trace-events +4
-0+nvme_dev_aio_cb(uint16_t cid, void *aio, const char *blkname, uint64_t offset, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" opc \"%s\" req %p" +nvme_dev_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8"" nvme_dev_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64"" +nvme_dev_rw_cb(uint16_t cid, uint32_t nsid) "cid %"PRIu16" nsid %"PRIu32"" +nvme_dev_write_zeroes(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32"" nvme_dev_create_sq(uint64_t addr, uint16_t sqid, uint16_t cqid, uint16_t qsize, uint16_t qflags) "create submission queue, addr=0x%"PRIx64", sqid=%"PRIu16", cqid=%"PRIu16", qsize=%"PRIu16",qflags=%"PRIu16""
nvme_dev_create_cq(uint64_t addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t qflags, int ien)"create completion queue, addr=0x%"PRIx64", cqid=%"PRIu16", vector=%"PRIu16",
qsize=%"PRIu16", qflags=%"PRIu16", ien=%d"
nvme_dev_del_sq(uint16_t qid)"deleting submission queue sqid=%"PRIu16""hw/block/trace-events +1
-0@@ -81,6 +86,7 @@ nvme_dev_mmio_doorbell_sq(uint16_t sqid, uint16_t new_tail) "cqid %"PRIu16" new_ # nvme traces for error conditions nvme_dev_err_mdts(uint16_t cid, size_t mdts, size_t len) "cid %"PRIu16" mdts %"PRIu64" len %"PRIu64"" nvme_dev_err_prinfo(uint16_t cid, uint16_t ctrl) "cid %"PRIu16" ctrl %"PRIu16"" +nvme_dev_err_aio(uint16_t cid, void *aio, const char *blkname, uint64_t offset, const char *opc, void *req, uint16_t status) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" opc \"%s\" req %p
Quoted 4 lines
status 0x%"PRIx16""
nvme_dev_err_invalid_dma(void)"PRP/SGL is too small for transfer size"nvme_dev_err_invalid_prplist_ent(uint64_t prplist)"PRP list entry is null or not page aligned: 0x%"PRIx64""nvme_dev_err_invalid_prp2_align(uint64_t prp2)"PRP2 is not page aligned: 0x%"PRIx64""
The patch is still too large IMHO to review properly and few things can be split from it. I tried my best to review it but I might have missed something.
Best regards,
Maxim Levitsky
Re: [PATCH v6 32/42] nvme: allow multiple aios per command
Quoted 31 lines · Maxim Levitsky
Quoted 30 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This refactors how the device issues asynchronous block backend requests. The NvmeRequest now holds a queue of NvmeAIOs that are associated with the command. This allows multiple aios to be issued for a command. Only when all requests have been completed will the device post a completion queue entry.
Because the device is currently guaranteed to only issue a single aio request per command, the benefit is not immediately obvious. But this functionality is required to support metadata, the dataset management command and other features.
Signed-off-by Klaus Jensen <[email protected]>Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>--- hw/block/nvme.c | 377 +++++++++++++++++++++++++++++++----------- hw/block/nvme.h | 129 +++++++++++++-- hw/block/trace-events | 6 + 3 files changed, 407 insertions(+), 105 deletions(-)hw/block/nvme.c +0
-0@@ -373,6 +374,99 @@ static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg,return nvme_map_prp (n, qsg, iov, prp1, prp2, len, req); }
Quoted 11 lines
hw/block/nvme.c static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg, · line 382
Quoted 6 lines
hw/block/nvme.c +6
-0+static void nvme_aio_destroy (NvmeAIO *aio) +{ +g_free (aio); +} + +static inline void nvme_req_register_aio(NvmeRequest *req, NvmeAIO *aio,I guess I'll call this
nvme_req_add_aio,
ornvme_add_aio_to_reg.
Thoughts?
Also you can leave this as is, but add a comment on top explaining this
nvme_req_add_aio it is :) And comment added.
Quoted 8 lines
Quoted 8 lines
hw/block/nvme.c +8
-0+ NvmeAIOOp opc) +{ + aio->opc = opc; + +trace_nvme_dev_req_register_aio (nvme_cid (req), aio,blk_name (aio->blk), + aio->offset, aio->len, +nvme_aio_opc_str (aio), req); +
Quoted 8 lines
hw/block/nvme.c static uint16_t nvme_map(NvmeCtrl *n, NvmeCmd *cmd, QEMUSGList *qsg, · line 396
Quoted 6 lines
hw/block/nvme.c +6
-0+if (req) { +QTAILQ_INSERT_TAIL (&req->aio_tailq, aio, tailq_entry); + } +} + +static void nvme_submit_aio (NvmeAIO *aio)OK, this name makes sense
Also please add a comment on top.
Done.
Quoted 4 lines
Quoted 4 lines
hw/block/nvme.c +0
-0@@ -505,9 +600,11 @@ static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len,return NVME_SUCCESS ; }
Quoted 9 lines
hw/block/nvme.c static inline uint16_t nvme_check_mdts(NvmeCtrl *n, size_t len, · line 607
Quoted 7 lines
hw/block/nvme.c +4
-2-static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,NvmeNamespace *ns, -uint16_t ctrl,NvmeRequest *req) +static inline uint16_t nvme_check_prinfo (NvmeCtrl *n,uint16_t ctrl, +NvmeRequest *req) { +NvmeNamespace *ns = req->ns; +This should go to the patch that added
nvme_check_prinfo
Probably killing that patch.
Quoted 4 lines
Quoted 4 lines
hw/block/nvme.c +0
-0@@ -516,10 +613,10 @@ static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, NvmeNamespace *ns,return NVME_SUCCESS ; }
Quoted 10 lines
hw/block/nvme.c static inline uint16_t nvme_check_prinfo(NvmeCtrl *n, NvmeNamespace *ns, · line 620
Quoted 8 lines
hw/block/nvme.c +3
-3-static inline uint16_t nvme_check_bounds (NvmeCtrl *n,NvmeNamespace *ns, -uint64_t slba,uint32_t nlb, -NvmeRequest *req) +static inline uint16_t nvme_check_bounds (NvmeCtrl *n,uint64_t slba, +uint32_t nlb,NvmeRequest *req) { +NvmeNamespace *ns = req->ns;uint64_t nsze =le64_to_cpu (ns->id_ns.nsze);This should go to the patch that added
nvme_check_boundsas well
We can't really, because the NvmeRequest does not hold a reference to the namespace as a struct member at that point. This is also an issue with the nvme_check_prinfo function above.
Quoted 28 lines
Quoted 28 lines
hw/block/nvme.c +21
-1if (unlikely (UINT64_MAX - slba < nlb || slba + nlb > nsze)) {@@ -530,55 +627,154 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns,return NVME_SUCCESS ; } -static void nvme_rw_cb (void *opaque,int ret) +static uint16_t nvme_check_rw (NvmeCtrl *n,NvmeRequest *req) +{ +NvmeNamespace *ns = req->ns; +NvmeRwCmd *rw = (NvmeRwCmd *) &req->cmd; +uint16_t ctrl =le16_to_cpu (rw->control); +size_t len = req->nlb <<nvme_ns_lbads (ns); +uint16_t status; + + status =nvme_check_mdts (n, len, req); +if (status) { +return status; + } + + status =nvme_check_prinfo (n, ctrl, req); +if (status) { +return status; + } + + status =nvme_check_bounds (n, req->slba, req->nlb, req); +if (status) { +return status;
Quoted 9 lines
hw/block/nvme.c static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns, · line 654
Quoted 4 lines
hw/block/nvme.c +4
-0+ } + +return NVME_SUCCESS ; +}Nitpick: I hate to say it but
nvme_check_rwshould be in a separate patch as well. It will also make diff more readable (when adding a funtion and changing a function at the same time, you get a diff between two unrelated things)
Done, but had to do it as a follow up patch.
Quoted 6 lines
hw/block/nvme.c static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns, · line 759
Quoted 4 lines
hw/block/nvme.c +1
-2-static uint16_t nvme_write_zeros (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_write_zeroes (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)Very small nitpick about zeros/zeroes: This should move to some refactoring patch to be honest.
Done ;)
Quoted 4 lines
The patch is still too large IMHO to review properly and few things can be split from it. I tried my best to review it but I might have missed something.
Yeah, I know, but thanks for trying!