hw/block/nvme: dma handling and address mapping cleanup
v2 cover hw/block/nvme: dma handling and address mapping cleanup
From: Klaus Jensen <[email protected]>
This series consists of patches that refactors dma read/write and adds a number of address mapping helper functions.
v2:
* hw/block/nvme: add mapping helpers
- Add an assert in case of out of bounds array access. (Maxim)
* hw/block/nvme: remove redundant has_sg member
- Split the fix for the missing qemu_iov_destroy into a fresh patch ("hw/block/nvme: destroy request iov before reuse"). (Minwoo)
* hw/block/nvme: pass request along for tracing [DROPPED]
- Dropped the patch and replaced it with a simple patch that just adds tracing to the nvme_map_prp function ("hw/block/nvme: add tracing to nvme_map_prp"). (Minwoo)
* hw/block/nvme: add request mapping helper
- Changed the name from nvme_map to nvme_map_dptr. (Minwoo, Maxim)
* hw/block/nvme: add check for mdts
- Don't touch the documentaiton for the cmb_size_mb and max_ioqpairs parameters in this patch. (Minwoo)
* hw/block/nvme: refactor NvmeRequest clearing [DROPPED]
- Keep NvmeRequest structure clearing as "before use". (Maxim)
* hw/block/nvme: add a namespace reference in NvmeRequest
* hw/block/nvme: remove NvmeCmd parameter
- Squash these two patches together into "hw/block/nvme: add ns/cmd references in NvmeRequest".
* hw/block/nvme: consolidate qsg/iov clearing
- Move the qsg/iov destroys to a new nvme_req_exit function that is called after the cqe has been posted.
* hw/block/nvme: remove explicit qsg/iov parameters
- New patch. THe nvme_map_prp() function doesn't require the qsg and iov parameters since it can just get them from the passed NvmeRequest.
Based-on: <[email protected]>
Klaus Jensen (16):
hw/block/nvme: memset preallocated requests structures hw/block/nvme: add mapping helpers hw/block/nvme: replace dma_acct with blk_acct equivalent hw/block/nvme: remove redundant has_sg member hw/block/nvme: destroy request iov before reuse hw/block/nvme: refactor dma read/write hw/block/nvme: add tracing to nvme_map_prp hw/block/nvme: add request mapping helper hw/block/nvme: verify validity of prp lists in the cmb hw/block/nvme: refactor request bounds checking hw/block/nvme: add check for mdts hw/block/nvme: be consistent about zeros vs zeroes hw/block/nvme: add ns/cmd references in NvmeRequest hw/block/nvme: consolidate qsg/iov clearing hw/block/nvme: use preallocated qsg/iov in nvme_dma_prp hw/block/nvme: remove explicit qsg/iov parameters
block/nvme.c | 4 +- hw/block/nvme.c | 506 +++++++++++++++++++++++++++--------------- hw/block/nvme.h | 4 +- hw/block/trace-events | 4 + include/block/nvme.h | 4 +- 5 files changed, 340 insertions(+), 182 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/16 hw/block/nvme: memset preallocated requests structures
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.
--- hw/block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/block/nvme.c +1 -1
@@ -653,7 +653,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.27.0
Re: [PATCH v2 01/16] hw/block/nvme: memset preallocated requests structures
Quoted 9 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]>Reviewed-by Maxim Levitsky <[email protected]>
PATCH v2 2/16 hw/block/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 | 111 +++++++++++++++++++++++++++++++++++------- hw/block/trace-events | 2 + 2 files changed, 96 insertions(+), 17 deletions(-)
hw/block/nvme.c +94 -17
@@ -117,10 +117,17 @@ static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr)return addr >= low && addr < hi; } +static inline void *nvme_addr_to_cmb (NvmeCtrl *n,hwaddr addr) +{ +assert (nvme_addr_is_cmb (n, addr)); + +return &n->cmbuf[addr - n->ctrl_mem.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 ; }
@@ -203,29 +210,91 @@ 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 (!len) { +return NVME_SUCCESS ; + } + +trace_pci_nvme_map_addr_cmb (addr, len); + +if (!nvme_addr_is_cmb (n, addr) || !nvme_addr_is_cmb (n, addr + len -1 )) { +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 (!len) { +return NVME_SUCCESS ; + } + +trace_pci_nvme_map_addr (addr, 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_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ; - }else if (n->bar.cmbsz && prp1 >= n->ctrl_mem.addr && - prp1 < n->ctrl_mem.addr +int128_get64 (n->ctrl_mem.size)) { - 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_pci_nvme_err_invalid_prp2_missing (); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; }if (len > n->page_size) {
@@ -242,6 +311,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_pci_nvme_err_invalid_prplist_ent (prp_ent); + status =NVME_INVALID_FIELD |NVME_DNR ; goto unmap; }
@@ -255,14 +325,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_pci_nvme_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++;
@@ -270,20 +340,27 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, }else {if (unlikely (prp2 & (n->page_size -1 ))) {trace_pci_nvme_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 +2 -0
@@ -33,6 +33,8 @@ pci_nvme_irq_msix(uint32_t vector) "raising MSI-X IRQ vector %u" pci_nvme_irq_pin(void) "pulsing IRQ pin" pci_nvme_irq_masked(void) "IRQ is masked" pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" +pci_nvme_map_addr(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" +pci_nvme_map_addr_cmb(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64""
Signature · 1 line
2.27.0
PATCH v2 3/16 hw/block/nvme: replace dma_acct with blk_acct equivalent
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
The QSG isn't always initialized, so accounting could be wrong. Issue a call to blk_acct_start instead with the size taken from the QSG or IOV depending on the kind of I/O.
--- hw/block/nvme.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
hw/block/nvme.c +4 -1
@@ -622,9 +622,10 @@ 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) :
@@ -632,6 +633,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, 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) :
Signature · 1 line
2.27.0
PATCH v2 4/16 hw/block/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 | 7 ++----- hw/block/nvme.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-)
hw/block/nvme.c +2 -5
@@ -550,7 +550,8 @@ 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); }nvme_enqueue_req_completion (cq, req);
@@ -559,7 +560,6 @@ static void nvme_rw_cb(void *opaque, int ret)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);
@@ -585,7 +585,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,
@@ -623,7 +622,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, }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 ?
@@ -632,7 +630,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,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 ?
hw/block/nvme.h +0 -1
@@ -22,7 +22,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.27.0
Re: [PATCH v2 04/16] hw/block/nvme: remove redundant has_sg member
Quoted 6 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Remove the
has_sgmember from NvmeRequest since it's redundant.Signed-off-by Klaus Jensen <[email protected]>
Looks better than the previous one to me.
Re: [PATCH v2 04/16] hw/block/nvme: remove redundant has_sg member
In reply to Klaus JensenQuoted 5 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Remove the
has_sgmember from NvmeRequest since it's redundant.Signed-off-by Klaus Jensen <[email protected]>
Best regards,
Maxim Levitsky
Quoted 63 lines
--- hw/block/nvme.c | 7 ++----- hw/block/nvme.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-)hw/block/nvme.c +2
-5@@ -550,7 +550,8 @@ 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); }nvme_enqueue_req_completion (cq, req);@@ -559,7 +560,6 @@ static void nvme_rw_cb(void *opaque, int ret)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);@@ -585,7 +585,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,@@ -623,7 +622,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, }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 ?@@ -632,7 +630,6 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,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 ?hw/block/nvme.h +0
-1@@ -22,7 +22,6 @@ typedef struct NvmeRequest {struct NvmeSQueue *sq;BlockAIOCB *aiocb;uint16_t status; -bool has_sg;NvmeCqe cqe;BlockAcctCookie acct;QEMUSGList qsg;
PATCH v2 5/16 hw/block/nvme: destroy request iov before reuse
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Make sure the request iov is destroyed before reuse; fixing a memory leak.
--- hw/block/nvme.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/block/nvme.c +4 -0
@@ -554,6 +554,10 @@ static void nvme_rw_cb(void *opaque, int ret)if (req->qsg.nalloc) {qemu_sglist_destroy (&req->qsg); } +if (req->iov.nalloc) { +qemu_iovec_destroy (&req->iov); + } +nvme_enqueue_req_completion (cq, req); }
Signature · 1 line
2.27.0
Re: [PATCH v2 05/16] hw/block/nvme: destroy request iov before reuse
Quoted 7 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Make sure the request iov is destroyed before reuse; fixing a memory leak.
Signed-off-by Klaus Jensen <[email protected]>
Looks good to me and Thanks for splitting this up.
Re: [PATCH v2 05/16] hw/block/nvme: destroy request iov before reuse
In reply to Klaus JensenQuoted 15 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Make sure the request iov is destroyed before reuse; fixing a memory leak.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 4 ++++ 1 file changed, 4 insertions(+)hw/block/nvme.c +0
-0
hw/block/nvme.c static void nvme_rw_cb(void *opaque, int ret) · line 563
Quoted 10 lines
hw/block/nvme.c +4
-0@@ -554,6 +554,10 @@ static void nvme_rw_cb(void *opaque, int ret)if (req->qsg.nalloc) {qemu_sglist_destroy (&req->qsg); } +if (req->iov.nalloc) { +qemu_iovec_destroy (&req->iov); + } +nvme_enqueue_req_completion (cq, req); }
Best regards,
Maxim Levitsky
PATCH v2 6/16 hw/block/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 | 91 +++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 45 deletions(-)
hw/block/nvme.c +46 -45
@@ -363,55 +363,53 @@ 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; } + +/* assert that only one of qsg and iov carries data */ +assert ((qsg.nsg >0 ) != (iov.niov >0 )); +if (qsg.nsg >0 ) { -if (dma_buf_write (ptr, len, &qsg)) { - status =NVME_INVALID_FIELD |NVME_DNR ; +uint64_t residual; + +if (dir ==DMA_DIRECTION_TO_DEVICE ) { + residual =dma_buf_write (ptr, len, &qsg); + }else { + residual =dma_buf_read (ptr, len, &qsg); } -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 ; - -trace_pci_nvme_dma_read (prp1, prp2); - -if (nvme_map_prp (&qsg, &iov, prp1, prp2, len, n)) { -return NVME_INVALID_FIELD |NVME_DNR ; - } -if (qsg.nsg >0 ) { -if (unlikely (dma_buf_read (ptr, len, &qsg))) { +if (unlikely (residual)) {trace_pci_nvme_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; } +qemu_sglist_destroy (&qsg); }else { -if (unlikely (qemu_iovec_from_buf (&iov,0 , ptr, len) != len)) { +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_pci_nvme_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; } +qemu_iovec_destroy (&iov); } +return status; }
@@ -843,8 +841,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,
@@ -865,8 +863,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,
@@ -890,7 +888,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, (uint8_t *)&errlog, trans_len, prp1, prp2); +return nvme_dma_prp (n, (uint8_t *)&errlog, trans_len, prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req)
@@ -1045,8 +1044,8 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c)trace_pci_nvme_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)
@@ -1065,8 +1064,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)
@@ -1101,7 +1100,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; }
@@ -1142,7 +1142,8 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c) ns_descrs->uuid.hdr.nidl =NVME_NIDT_UUID_LEN ;stl_be_p (&ns_descrs->uuid.v, nsid); -return nvme_dma_read_prp (n, list,NVME_IDENTIFY_DATA_SIZE , prp1, prp2); +return nvme_dma_prp (n, list,NVME_IDENTIFY_DATA_SIZE , prp1, prp2, +DMA_DIRECTION_FROM_DEVICE ); }static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd)
@@ -1223,8 +1224,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)
@@ -1355,8 +1356,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.27.0
PATCH v2 7/16 hw/block/nvme: add tracing to nvme_map_prp
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add tracing to nvme_map_prp.
--- hw/block/nvme.c | 2 ++ hw/block/trace-events | 1 + 2 files changed, 3 insertions(+)
hw/block/nvme.c +2 -0
@@ -274,6 +274,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +trace_pci_nvme_map_prp (trans_len, len, prp1, prp2, num_prps); +if (unlikely (!prp1)) {trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ;
hw/block/trace-events +1 -0
@@ -35,6 +35,7 @@ pci_nvme_irq_masked(void) "IRQ is masked" pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" pci_nvme_map_addr(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" pci_nvme_map_addr_cmb(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" +pci_nvme_map_prp(uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64" num_prps %d" pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64""
Signature · 1 line
2.27.0
Re: [PATCH v2 07/16] hw/block/nvme: add tracing to nvme_map_prp
Quoted 16 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add tracing to
nvme_map_prp.Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 2 ++ hw/block/trace-events | 1 + 2 files changed, 3 insertions(+)hw/block/nvme.c +0
-0
hw/block/nvme.c static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, · line 277
Quoted 4 lines
hw/block/nvme.c +1
-0@@ -274,6 +274,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +trace_pci_nvme_map_prp (trans_len, len, prp1, prp2, num_prps);
Hmm.. Okay with this. But once QEMUSGList and QEMUIOVector instances are coming into the NvmeRequest, we just can pass the NvmeRequest instance here and print the cid as well
later :)
Thanks!
Quoted 19 lines
hw/block/nvme.c +1
-0+if (unlikely (!prp1)) {trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ;hw/block/trace-events +1
-1@@ -35,6 +35,7 @@ pci_nvme_irq_masked(void) "IRQ is masked" pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" pci_nvme_map_addr(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" pci_nvme_map_addr_cmb(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" +pci_nvme_map_prp(uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64" num_prps %d" pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64"" --2.27.0
Re: [PATCH v2 07/16] hw/block/nvme: add tracing to nvme_map_prp
In reply to Klaus JensenQuoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add tracing to
nvme_map_prp.Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 2 ++ hw/block/trace-events | 1 + 2 files changed, 3 insertions(+)hw/block/nvme.c +2
-0@@ -274,6 +274,8 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +trace_pci_nvme_map_prp (trans_len, len, prp1, prp2, num_prps); +if (unlikely (!prp1)) {trace_pci_nvme_err_invalid_prp ();return NVME_INVALID_FIELD |NVME_DNR ;hw/block/trace-events +0
-0
hw/block/trace-events pci_nvme_irq_masked(void) "IRQ is masked" · line 41
Quoted 7 lines
hw/block/trace-events +1
-0@@ -35,6 +35,7 @@ pci_nvme_irq_masked(void) "IRQ is masked" pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2=0x%"PRIx64"" pci_nvme_map_addr(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" pci_nvme_map_addr_cmb(uint64_t addr, uint64_t len) "addr 0x%"PRIx64" len %"PRIu64"" +pci_nvme_map_prp(uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, int num_prps) "trans_len %"PRIu64" len %"PRIu32" prp1 0x%"PRIx64" prp2 0x%"PRIx64" num_prps %d" pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8"" pci_nvme_rw(const char *verb, uint32_t blk_count, uint64_t byte_count, uint64_t lba) "%s %"PRIu32" blocks (%"PRIu64" bytes) from LBA %"PRIu64""
Best regards,
Maxim Levitsky
PATCH v2 8/16 hw/block/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
@@ -415,6 +415,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,return status; } +static uint16_t nvme_map_dptr (NvmeCtrl *n,NvmeCmd *cmd,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 (&req->qsg, &req->iov, prp1, prp2, len, n); +} +static void nvme_post_cqes (void *opaque) {NvmeCQueue *cq = opaque;
@@ -602,8 +611,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;
@@ -620,7 +627,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_dptr (n, cmd, data_size, req)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);return NVME_INVALID_FIELD |NVME_DNR ; }
Signature · 1 line
2.27.0
Re: [PATCH v2 08/16] hw/block/nvme: add request mapping helper
Quoted 18 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]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)hw/block/nvme.c +0
-0@@ -415,6 +415,15 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,return status;
hw/block/nvme.c static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, · line 425
Quoted 10 lines
hw/block/nvme.c +8
-0} +static uint16_t nvme_map_dptr (NvmeCtrl *n,NvmeCmd *cmd,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 (&req->qsg, &req->iov, prp1, prp2, len, n); +}
Let's do something for MPTR laster also when we are right in front of that.
Looks good to me.
Quoted 25 lines
hw/block/nvme.c +2
-4+static void nvme_post_cqes (void *opaque) {NvmeCQueue *cq = opaque;@@ -602,8 +611,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;@@ -620,7 +627,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_dptr (n, cmd, data_size, req)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);return NVME_INVALID_FIELD |NVME_DNR ; } --2.27.0
PATCH v2 9/16 hw/block/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 PRP lists in the CMB, but it did not check for the validity of it nor announced the support in the Identify Controller data structure 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 requirement 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
@@ -273,6 +273,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, trans_len =MIN (len, trans_len);int num_prps = (len >> n->page_bits) +1 ;uint16_t status; +bool prp_list_in_cmb = false;trace_pci_nvme_map_prp (trans_len, len, prp1, prp2, num_prps);
@@ -299,11 +300,16 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, 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);
@@ -317,6 +323,11 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, 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 );
@@ -336,6 +347,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (status) { goto unmap; } + len -= trans_len; i++; }
@@ -2153,7 +2165,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 );/* MBs */
Signature · 1 line
2.27.0
PATCH v2 10/16 hw/block/nvme: refactor request bounds checking
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Hoist bounds checking into its own function and check for wrap-around.
--- hw/block/nvme.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
hw/block/nvme.c +21 -5
@@ -555,6 +555,18 @@ 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) +{ +uint64_t nsze =le64_to_cpu (ns->id_ns.nsze); + +if (unlikely (UINT64_MAX - slba < nlb || slba + nlb > nsze)) { +return NVME_LBA_RANGE |NVME_DNR ; + } + +return NVME_SUCCESS ; +} +static void nvme_rw_cb (void *opaque,int ret) {NvmeRequest *req = opaque;
@@ -602,12 +614,14 @@ 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;trace_pci_nvme_write_zeroes (nvme_cid (req), slba, nlb); -if (unlikely (slba + nlb > ns->id_ns.nsze)) { + status =nvme_check_bounds (n, ns, slba, nlb); +if (status) {trace_pci_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; +return status; } block_acct_start(blk_get_stats(n->conf.blk), &req->acct, 0,
@@ -630,13 +644,15 @@ 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_pci_nvme_rw (is_write ?"write" :"read" , nlb, data_size, slba); -if (unlikely ((slba + nlb) > ns->id_ns.nsze)) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); + status =nvme_check_bounds (n, ns, slba, nlb); +if (status) {trace_pci_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -return NVME_LBA_RANGE |NVME_DNR ; +block_acct_invalid (blk_get_stats (n->conf.blk), acct); +return status; }if (nvme_map_dptr (n, cmd, data_size, req)) {
Signature · 1 line
2.27.0
PATCH v2 11/16 hw/block/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 | 30 +++++++++++++++++++++++++++++- hw/block/nvme.h | 1 + hw/block/trace-events | 1 + 3 files changed, 31 insertions(+), 1 deletion(-)
hw/block/nvme.c +29 -1
@@ -20,7 +20,8 @@* -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \ * cmb_size_mb=<cmb_size_mb[optional]>, \ * [pmrdev=<mem_backend_file_id>,] \ -* max_ioqpairs=<N[optional]> +* max_ioqpairs=<N[optional]>, \ +* mdts=<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.
@@ -555,6 +556,17 @@ static void nvme_clear_events(NvmeCtrl *n, uint8_t event_type) } } +static inline uint16_t nvme_check_mdts (NvmeCtrl *n,size_t len) +{ +uint8_t mdts = n->params.mdts; + +if (mdts && len > n->page_size << mdts) { +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) {
@@ -648,6 +660,13 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,trace_pci_nvme_rw (is_write ?"write" :"read" , nlb, data_size, slba); + status =nvme_check_mdts (n, data_size); +if (status) { +trace_pci_nvme_err_mdts (nvme_cid (req), data_size); +block_acct_invalid (blk_get_stats (n->conf.blk), acct); +return status; + } + status =nvme_check_bounds (n, ns, slba, nlb);if (status) {trace_pci_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);
@@ -941,6 +960,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 );
@@ -956,6 +976,12 @@ static uint16_t nvme_get_log(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)trace_pci_nvme_get_log (nvme_cid (req), lid, lsp, rae, len, off); + status =nvme_check_mdts (n, len); +if (status) { +trace_pci_nvme_err_mdts (nvme_cid (req), len); +return status; + } +switch (lid) {case NVME_LOG_ERROR_INFO :return nvme_error_info (n, cmd, rae, len, off, req);
@@ -2284,6 +2310,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) id->ieee[0 ] =0x00 ; id->ieee[1 ] =0x02 ; id->ieee[2 ] =0xb3 ; + id->mdts = n->params.mdts; id->ver =cpu_to_le32 (NVME_SPEC_VER ); id->oacs =cpu_to_le16 (0 );
@@ -2403,6 +2430,7 @@ static Property nvme_props[] = {DEFINE_PROP_UINT16 ("msix_qsize" , NvmeCtrl, params.msix_qsize,65 ),DEFINE_PROP_UINT8 ("aerl" , NvmeCtrl, params.aerl,3 ),DEFINE_PROP_UINT32 ("aer_max_queued" , NvmeCtrl, params.aer_max_queued,64 ), +DEFINE_PROP_UINT8 ("mdts" , NvmeCtrl, params.mdts,7 ), DEFINE_PROP_END_OF_LIST(), };
hw/block/nvme.h +1 -0
@@ -11,6 +11,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
@@ -85,6 +85,7 @@ pci_nvme_mmio_shutdown_set(void) "shutdown bit set" pci_nvme_mmio_shutdown_cleared(void) "shutdown bit cleared" # nvme traces for error conditions +pci_nvme_err_mdts(uint16_t cid, size_t len) "cid %"PRIu16" len %"PRIu64"" pci_nvme_err_invalid_dma(void) "PRP/SGL is too small for transfer size" pci_nvme_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or not page aligned: 0x%"PRIx64"" pci_nvme_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64""
Signature · 1 line
2.27.0
PATCH v2 12/16 hw/block/nvme: be consistent about zeros vs zeroes
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
The NVM Express specification generally uses 'zeroes' and not 'zeros', so let us align with it.
--- block/nvme.c | 4 ++-- hw/block/nvme.c | 8 ++++---- include/block/nvme.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
block/nvme.c +2 -2
@@ -537,7 +537,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) s->page_size / sizeof(uint64_t) * s->page_size); oncs =le16_to_cpu (idctrl->oncs); - s->supports_write_zeroes = !!(oncs &NVME_ONCS_WRITE_ZEROS ); + s->supports_write_zeroes = !!(oncs &NVME_ONCS_WRITE_ZEROES ); s->supports_discard = !!(oncs &NVME_ONCS_DSM );memset (resp,0 ,4096 );
@@ -1201,7 +1201,7 @@ static coroutine_fn int nvme_co_pwrite_zeroes(BlockDriverState *bs, }NvmeCmd cmd = { - .opcode =NVME_CMD_WRITE_ZEROS , + .opcode =NVME_CMD_WRITE_ZEROES , .nsid =cpu_to_le32 (s->nsid), .cdw10 =cpu_to_le32 ((offset >> s->blkshift) &0xFFFFFFFF ), .cdw11 =cpu_to_le32 (((offset >> s->blkshift) >>32 ) &0xFFFFFFFF ),
hw/block/nvme.c +4 -4
@@ -616,7 +616,7 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_NO_COMPLETE ; } -static uint16_t nvme_write_zeros (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, +static uint16_t nvme_write_zeroes (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd,NvmeRequest *req) {NvmeRwCmd *rw = (NvmeRwCmd *)cmd;
@@ -716,8 +716,8 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)switch (cmd->opcode) {case NVME_CMD_FLUSH :return nvme_flush (n, ns, cmd, req); -case NVME_CMD_WRITE_ZEROS : -return nvme_write_zeros (n, ns, cmd, req); +case NVME_CMD_WRITE_ZEROES : +return nvme_write_zeroes (n, ns, cmd, req);case NVME_CMD_WRITE :case NVME_CMD_READ :return nvme_rw (n, ns, cmd, req);
@@ -2337,7 +2337,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) id->sqes = (0x6 <<4 ) |0x6 ; 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->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROES |NVME_ONCS_TIMESTAMP |NVME_ONCS_FEATURES ); subnqn =g_strdup_printf ("nqn.2019-08.org.qemu:%s" , n->params.serial);
include/block/nvme.h +2 -2
@@ -460,7 +460,7 @@ enum NvmeIoCommands {NVME_CMD_READ =0x02 ,NVME_CMD_WRITE_UNCOR =0x04 ,NVME_CMD_COMPARE =0x05 , -NVME_CMD_WRITE_ZEROS =0x08 , +NVME_CMD_WRITE_ZEROES =0x08 , NVME_CMD_DSM = 0x09, };
@@ -838,7 +838,7 @@ enum NvmeIdCtrlOncs {NVME_ONCS_COMPARE =1 <<0 ,NVME_ONCS_WRITE_UNCORR =1 <<1 ,NVME_ONCS_DSM =1 <<2 , -NVME_ONCS_WRITE_ZEROS =1 <<3 , +NVME_ONCS_WRITE_ZEROES =1 <<3 ,NVME_ONCS_FEATURES =1 <<4 ,NVME_ONCS_RESRVATIONS =1 <<5 , NVME_ONCS_TIMESTAMP = 1 << 6,
Signature · 1 line
2.27.0
PATCH v2 13/16 hw/block/nvme: add ns/cmd references in NvmeRequest
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Instead of passing around the NvmeNamespace and the NvmeCmd, add them as members in the NvmeRequest structure.
--- hw/block/nvme.c | 187 ++++++++++++++++++++++++++---------------------- hw/block/nvme.h | 2 + 2 files changed, 104 insertions(+), 85 deletions(-)
hw/block/nvme.c +102 -85
@@ -211,6 +211,12 @@ static void nvme_irq_deassert(NvmeCtrl *n, NvmeCQueue *cq) } } +static void nvme_req_clear (NvmeRequest *req) +{ + req->ns =NULL ; +memset (&req->cqe,0x0 ,sizeof (req->cqe)); +} +static uint16_t nvme_map_addr_cmb (NvmeCtrl *n,QEMUIOVector *iov,hwaddr addr,size_t len) {
@@ -428,9 +434,9 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,return status; } -static uint16_t nvme_map_dptr (NvmeCtrl *n,NvmeCmd *cmd,size_t len, -NvmeRequest *req) +static uint16_t nvme_map_dptr (NvmeCtrl *n,size_t len,NvmeRequest *req) { +NvmeCmd *cmd = &req->cmd;uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);
@@ -606,8 +612,7 @@ static void nvme_rw_cb(void *opaque, int ret)nvme_enqueue_req_completion (cq, req); } -static uint16_t nvme_flush (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_flush (NvmeCtrl *n,NvmeRequest *req) {block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 ,BLOCK_ACCT_FLUSH );
@@ -616,10 +621,10 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_NO_COMPLETE ; } -static uint16_t nvme_write_zeroes (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_write_zeroes (NvmeCtrl *n,NvmeRequest *req) { -NvmeRwCmd *rw = (NvmeRwCmd *)cmd; +NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd; +NvmeNamespace *ns = req->ns;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);
@@ -643,10 +648,10 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_NO_COMPLETE ; } -static uint16_t nvme_rw (NvmeCtrl *n,NvmeNamespace *ns,NvmeCmd *cmd, -NvmeRequest *req) +static uint16_t nvme_rw (NvmeCtrl *n,NvmeRequest *req) { -NvmeRwCmd *rw = (NvmeRwCmd *)cmd; +NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd; +NvmeNamespace *ns = req->ns;uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba);
@@ -674,7 +679,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return status; } -if (nvme_map_dptr (n, cmd, data_size, req)) { +if (nvme_map_dptr (n, data_size, req)) {block_acct_invalid (blk_get_stats (n->conf.blk), acct);return NVME_INVALID_FIELD |NVME_DNR ; }
@@ -700,29 +705,29 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,return NVME_NO_COMPLETE ; } -static uint16_t nvme_io_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +static uint16_t nvme_io_cmd (NvmeCtrl *n,NvmeRequest *req) { -NvmeNamespace *ns; -uint32_t nsid =le32_to_cpu (cmd->nsid); +uint32_t nsid =le32_to_cpu (req->cmd.nsid); -trace_pci_nvme_io_cmd (nvme_cid (req), nsid,nvme_sqid (req), cmd->opcode); +trace_pci_nvme_io_cmd (nvme_cid (req), nsid,nvme_sqid (req), + req->cmd.opcode);if (unlikely (nsid ==0 || nsid > n->num_namespaces)) {trace_pci_nvme_err_invalid_ns (nsid, n->num_namespaces);return NVME_INVALID_NSID |NVME_DNR ; } - ns = &n->namespaces[nsid -1 ]; -switch (cmd->opcode) { + req->ns = &n->namespaces[nsid -1 ]; +switch (req->cmd.opcode) {case NVME_CMD_FLUSH : -return nvme_flush (n, ns, cmd, req); +return nvme_flush (n, req);case NVME_CMD_WRITE_ZEROES : -return nvme_write_zeroes (n, ns, cmd, req); +return nvme_write_zeroes (n, req);case NVME_CMD_WRITE :case NVME_CMD_READ : -return nvme_rw (n, ns, cmd, req); +return nvme_rw (n, req);default : -trace_pci_nvme_err_invalid_opc (cmd->opcode); +trace_pci_nvme_err_invalid_opc (req->cmd.opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }
@@ -738,10 +743,10 @@ static void nvme_free_sq(NvmeSQueue *sq, NvmeCtrl *n) } } -static uint16_t nvme_del_sq (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_del_sq (NvmeCtrl *n,NvmeRequest *req) { -NvmeDeleteQ *c = (NvmeDeleteQ *)cmd; -NvmeRequest *req, *next; +NvmeDeleteQ *c = (NvmeDeleteQ *)&req->cmd; +NvmeRequest *r, *next;NvmeSQueue *sq;NvmeCQueue *cq;uint16_t qid =le16_to_cpu (c->qid);
@@ -755,19 +760,19 @@ 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); + r =QTAILQ_FIRST (&sq->out_req_list); +assert (r->aiocb); +blk_aio_cancel (r->aiocb); }if (!nvme_check_cqid (n, sq->cqid)) { cq = n->cq[sq->cqid];QTAILQ_REMOVE (&cq->sq_list, sq, entry);nvme_post_cqes (cq); - QTAILQ_FOREACH_SAFE(req, &cq->req_list, entry, next) { -if (req->sq == sq) { -QTAILQ_REMOVE (&cq->req_list, req, entry); -QTAILQ_INSERT_TAIL (&sq->req_list, req, entry); + QTAILQ_FOREACH_SAFE(r, &cq->req_list, entry, next) { +if (r->sq == sq) { +QTAILQ_REMOVE (&cq->req_list, r, entry); +QTAILQ_INSERT_TAIL (&sq->req_list, r, entry); } } }
@@ -804,10 +809,10 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr, n->sq[sqid] = sq; } -static uint16_t nvme_create_sq (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_create_sq (NvmeCtrl *n,NvmeRequest *req) {NvmeSQueue *sq; -NvmeCreateSq *c = (NvmeCreateSq *)cmd; +NvmeCreateSq *c = (NvmeCreateSq *)&req->cmd;uint16_t cqid =le16_to_cpu (c->cqid);uint16_t sqid =le16_to_cpu (c->sqid);
@@ -842,10 +847,10 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } -static uint16_t nvme_smart_info (NvmeCtrl *n,NvmeCmd *cmd,uint8_t rae, -uint32_t buf_len,uint64_t off, -NvmeRequest *req) +static uint16_t nvme_smart_info (NvmeCtrl *n,uint8_t rae,uint32_t buf_len, +uint64_t off,NvmeRequest *req) { +NvmeCmd *cmd = &req->cmd;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);
@@ -901,10 +906,11 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, DMA_DIRECTION_FROM_DEVICE); } -static uint16_t nvme_fw_log_info (NvmeCtrl *n,NvmeCmd *cmd,uint32_t buf_len, -uint64_t off,NvmeRequest *req) +static uint16_t nvme_fw_log_info (NvmeCtrl *n,uint32_t buf_len,uint64_t off, +NvmeRequest *req) {uint32_t trans_len; +NvmeCmd *cmd = &req->cmd;uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);NvmeFwSlotInfoLog fw_log = {
@@ -923,11 +929,11 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, NvmeCmd *cmd, uint32_t buf_len, DMA_DIRECTION_FROM_DEVICE); } -static uint16_t nvme_error_info (NvmeCtrl *n,NvmeCmd *cmd,uint8_t rae, -uint32_t buf_len,uint64_t off, -NvmeRequest *req) +static uint16_t nvme_error_info (NvmeCtrl *n,uint8_t rae,uint32_t buf_len, +uint64_t off,NvmeRequest *req) {uint32_t trans_len; +NvmeCmd *cmd = &req->cmd;uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);NvmeErrorLog errlog;
@@ -948,8 +954,10 @@ static uint16_t nvme_error_info(NvmeCtrl *n, NvmeCmd *cmd, uint8_t rae, DMA_DIRECTION_FROM_DEVICE); } -static uint16_t nvme_get_log (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +static uint16_t nvme_get_log (NvmeCtrl *n,NvmeRequest *req) { +NvmeCmd *cmd = &req->cmd; +uint32_t dw10 =le32_to_cpu (cmd->cdw10);uint32_t dw11 =le32_to_cpu (cmd->cdw11);uint32_t dw12 =le32_to_cpu (cmd->cdw12);
@@ -984,11 +992,11 @@ 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, rae, len, off, req); +return nvme_error_info (n, rae, len, off, req);case NVME_LOG_SMART_INFO : -return nvme_smart_info (n, cmd, rae, len, off, req); +return nvme_smart_info (n, rae, len, off, req);case NVME_LOG_FW_SLOT_INFO : -return nvme_fw_log_info (n, cmd, len, off, req); +return nvme_fw_log_info (n, len, off, req);default :trace_pci_nvme_err_invalid_log_page (nvme_cid (req), lid);return NVME_INVALID_FIELD |NVME_DNR ;
@@ -1006,9 +1014,9 @@ static void nvme_free_cq(NvmeCQueue *cq, NvmeCtrl *n) } } -static uint16_t nvme_del_cq (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_del_cq (NvmeCtrl *n,NvmeRequest *req) { -NvmeDeleteQ *c = (NvmeDeleteQ *)cmd; +NvmeDeleteQ *c = (NvmeDeleteQ *)&req->cmd;NvmeCQueue *cq;uint16_t qid =le16_to_cpu (c->qid);
@@ -1049,10 +1057,10 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, cq->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , nvme_post_cqes, cq); } -static uint16_t nvme_create_cq (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_create_cq (NvmeCtrl *n,NvmeRequest *req) {NvmeCQueue *cq; -NvmeCreateCq *c = (NvmeCreateCq *)cmd; +NvmeCreateCq *c = (NvmeCreateCq *)&req->cmd;uint16_t cqid =le16_to_cpu (c->cqid);uint16_t vector =le16_to_cpu (c->irq_vector);uint16_t qsize =le16_to_cpu (c->qsize);
@@ -1100,8 +1108,9 @@ 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,NvmeRequest *req) { +NvmeIdentify *c = (NvmeIdentify *)&req->cmd;uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2);
@@ -1111,9 +1120,10 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeIdentify *c) prp2, DMA_DIRECTION_FROM_DEVICE); } -static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeRequest *req) {NvmeNamespace *ns; +NvmeIdentify *c = (NvmeIdentify *)&req->cmd;uint32_t nsid =le32_to_cpu (c->nsid);uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2);
@@ -1131,8 +1141,9 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeIdentify *c) prp2, DMA_DIRECTION_FROM_DEVICE); } -static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeRequest *req) { +NvmeIdentify *c = (NvmeIdentify *)&req->cmd;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);
@@ -1169,8 +1180,9 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeIdentify *c)return ret; } -static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeIdentify *c) +static uint16_t nvme_identify_ns_descr_list (NvmeCtrl *n,NvmeRequest *req) { +NvmeIdentify *c = (NvmeIdentify *)&req->cmd;uint32_t nsid =le32_to_cpu (c->nsid);uint64_t prp1 =le64_to_cpu (c->prp1);uint64_t prp2 =le64_to_cpu (c->prp2);
@@ -1209,28 +1221,28 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeIdentify *c) DMA_DIRECTION_FROM_DEVICE); } -static uint16_t nvme_identify (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_identify (NvmeCtrl *n,NvmeRequest *req) { -NvmeIdentify *c = (NvmeIdentify *)cmd; +NvmeIdentify *c = (NvmeIdentify *)&req->cmd;switch (le32_to_cpu (c->cns)) {case NVME_ID_CNS_NS : -return nvme_identify_ns (n, c); +return nvme_identify_ns (n, req);case NVME_ID_CNS_CTRL : -return nvme_identify_ctrl (n, c); +return nvme_identify_ctrl (n, req);case NVME_ID_CNS_NS_ACTIVE_LIST : -return nvme_identify_nslist (n, c); +return nvme_identify_nslist (n, req);case NVME_ID_CNS_NS_DESCR_LIST : -return nvme_identify_ns_descr_list (n, c); +return nvme_identify_ns_descr_list (n, req);default :trace_pci_nvme_err_invalid_identify_cns (le32_to_cpu (c->cns));return NVME_INVALID_FIELD |NVME_DNR ; } } -static uint16_t nvme_abort (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +static uint16_t nvme_abort (NvmeCtrl *n,NvmeRequest *req) { -uint16_t sqid =le32_to_cpu (cmd->cdw10) &0xffff ; +uint16_t sqid =le32_to_cpu (req->cmd.cdw10) &0xffff ; req->cqe.result =1 ;if (nvme_check_sqid (n, sqid)) {
@@ -1280,8 +1292,9 @@ 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,NvmeRequest *req) { +NvmeCmd *cmd = &req->cmd;uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);
@@ -1291,8 +1304,9 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd) prp2, DMA_DIRECTION_FROM_DEVICE); } -static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeRequest *req) { +NvmeCmd *cmd = &req->cmd;uint32_t dw10 =le32_to_cpu (cmd->cdw10);uint32_t dw11 =le32_to_cpu (cmd->cdw11);uint32_t nsid =le32_to_cpu (cmd->nsid);
@@ -1366,7 +1380,7 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) result = n->features.async_config; goto out;case NVME_TIMESTAMP : -return nvme_get_feature_timestamp (n, cmd); +return nvme_get_feature_timestamp (n, req);default :break ; }
@@ -1412,10 +1426,11 @@ out:return NVME_SUCCESS ; } -static uint16_t nvme_set_feature_timestamp (NvmeCtrl *n,NvmeCmd *cmd) +static uint16_t nvme_set_feature_timestamp (NvmeCtrl *n,NvmeRequest *req) {uint16_t ret;uint64_t timestamp; +NvmeCmd *cmd = &req->cmd;uint64_t prp1 =le64_to_cpu (cmd->dptr.prp1);uint64_t prp2 =le64_to_cpu (cmd->dptr.prp2);
@@ -1430,8 +1445,9 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeCmd *cmd)return NVME_SUCCESS ; } -static uint16_t nvme_set_feature (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +static uint16_t nvme_set_feature (NvmeCtrl *n,NvmeRequest *req) { +NvmeCmd *cmd = &req->cmd;uint32_t dw10 =le32_to_cpu (cmd->cdw10);uint32_t dw11 =le32_to_cpu (cmd->cdw11);uint32_t nsid =le32_to_cpu (cmd->nsid);
@@ -1522,14 +1538,14 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) n->features.async_config = dw11;break ;case NVME_TIMESTAMP : -return nvme_set_feature_timestamp (n, cmd); +return nvme_set_feature_timestamp (n, req);default :return NVME_FEAT_NOT_CHANGEABLE |NVME_DNR ; }return NVME_SUCCESS ; } -static uint16_t nvme_aer (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +static uint16_t nvme_aer (NvmeCtrl *n,NvmeRequest *req) {trace_pci_nvme_aer (nvme_cid (req));
@@ -1548,33 +1564,33 @@ static uint16_t nvme_aer(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)return NVME_NO_COMPLETE ; } -static uint16_t nvme_admin_cmd (NvmeCtrl *n,NvmeCmd *cmd,NvmeRequest *req) +static uint16_t nvme_admin_cmd (NvmeCtrl *n,NvmeRequest *req) { -trace_pci_nvme_admin_cmd (nvme_cid (req),nvme_sqid (req), cmd->opcode); +trace_pci_nvme_admin_cmd (nvme_cid (req),nvme_sqid (req), req->cmd.opcode); -switch (cmd->opcode) { +switch (req->cmd.opcode) {case NVME_ADM_CMD_DELETE_SQ : -return nvme_del_sq (n, cmd); +return nvme_del_sq (n, req);case NVME_ADM_CMD_CREATE_SQ : -return nvme_create_sq (n, cmd); +return nvme_create_sq (n, req);case NVME_ADM_CMD_GET_LOG_PAGE : -return nvme_get_log (n, cmd, req); +return nvme_get_log (n, req);case NVME_ADM_CMD_DELETE_CQ : -return nvme_del_cq (n, cmd); +return nvme_del_cq (n, req);case NVME_ADM_CMD_CREATE_CQ : -return nvme_create_cq (n, cmd); +return nvme_create_cq (n, req);case NVME_ADM_CMD_IDENTIFY : -return nvme_identify (n, cmd); +return nvme_identify (n, req);case NVME_ADM_CMD_ABORT : -return nvme_abort (n, cmd, req); +return nvme_abort (n, req);case NVME_ADM_CMD_SET_FEATURES : -return nvme_set_feature (n, cmd, req); +return nvme_set_feature (n, req);case NVME_ADM_CMD_GET_FEATURES : -return nvme_get_feature (n, cmd, req); +return nvme_get_feature (n, req);case NVME_ADM_CMD_ASYNC_EV_REQ : -return nvme_aer (n, cmd, req); +return nvme_aer (n, req);default : -trace_pci_nvme_err_invalid_admin_opc (cmd->opcode); +trace_pci_nvme_err_invalid_admin_opc (req->cmd.opcode);return NVME_INVALID_OPCODE |NVME_DNR ; } }
@@ -1598,11 +1614,12 @@ 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)); +nvme_req_clear (req); 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); + status = sq->sqid ?nvme_io_cmd (n, req) : +nvme_admin_cmd (n, req);if (status !=NVME_NO_COMPLETE ) { req->status = status;nvme_enqueue_req_completion (cq, req);
hw/block/nvme.h +2 -0
@@ -21,9 +21,11 @@ typedef struct NvmeAsyncEvent { typedef struct NvmeRequest { struct NvmeSQueue *sq; + struct NvmeNamespace *ns; BlockAIOCB *aiocb; uint16_t status; NvmeCqe cqe; + NvmeCmd cmd; BlockAcctCookie acct; QEMUSGList qsg; QEMUIOVector iov;
Signature · 1 line
2.27.0
PATCH v2 14/16 hw/block/nvme: consolidate qsg/iov clearing
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Always destroy the request qsg/iov at the end of request use.
--- hw/block/nvme.c | 52 ++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 31 deletions(-)
hw/block/nvme.c +21 -31
@@ -217,6 +217,17 @@ static void nvme_req_clear(NvmeRequest *req)memset (&req->cqe,0x0 ,sizeof (req->cqe)); } +static void nvme_req_exit (NvmeRequest *req) +{ +if (req->qsg.sg) { +qemu_sglist_destroy (&req->qsg); + } + +if (req->iov.iov) { +qemu_iovec_destroy (&req->iov); + } +} +static uint16_t nvme_map_addr_cmb (NvmeCtrl *n,QEMUIOVector *iov,hwaddr addr,size_t len) {
@@ -297,15 +308,14 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, status =nvme_map_addr (n, qsg, iov, prp1, trans_len);if (status) { - goto unmap; +return status; } len -= trans_len;if (len) {if (unlikely (!prp2)) {trace_pci_nvme_err_invalid_prp2_missing (); - status =NVME_INVALID_FIELD |NVME_DNR ; - goto unmap; +return NVME_INVALID_FIELD |NVME_DNR ; }if (len > n->page_size) {
@@ -326,13 +336,11 @@ 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_pci_nvme_err_invalid_prplist_ent (prp_ent); - status =NVME_INVALID_FIELD |NVME_DNR ; - goto unmap; +return NVME_INVALID_FIELD |NVME_DNR ; }if (prp_list_in_cmb !=nvme_addr_is_cmb (n, prp_ent)) { - status =NVME_INVALID_USE_OF_CMB |NVME_DNR ; - goto unmap; +return NVME_INVALID_USE_OF_CMB |NVME_DNR ; } i =0 ;
@@ -345,14 +353,13 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,if (unlikely (!prp_ent || prp_ent & (n->page_size -1 ))) {trace_pci_nvme_err_invalid_prplist_ent (prp_ent); - status =NVME_INVALID_FIELD |NVME_DNR ; - goto unmap; +return NVME_INVALID_FIELD |NVME_DNR ; } trans_len =MIN (len, n->page_size); status =nvme_map_addr (n, qsg, iov, prp_ent, trans_len);if (status) { - goto unmap; +return status; } len -= trans_len;
@@ -361,27 +368,16 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, }else {if (unlikely (prp2 & (n->page_size -1 ))) {trace_pci_nvme_err_invalid_prp2_align (prp2); - status =NVME_INVALID_FIELD |NVME_DNR ; - goto unmap; +return NVME_INVALID_FIELD |NVME_DNR ; } status =nvme_map_addr (n, qsg, iov, prp2, len);if (status) { - goto unmap; +return status; } } } +return NVME_SUCCESS ; - -unmap: -if (iov && iov->iov) { -qemu_iovec_destroy (iov); - } - -if (qsg && qsg->sg) { -qemu_sglist_destroy (qsg); - } - -return status; } static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,
@@ -466,6 +462,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_exit (req);QTAILQ_INSERT_TAIL (&sq->req_list, req, entry); }if (cq->tail != cq->head) {
@@ -602,13 +599,6 @@ static void nvme_rw_cb(void *opaque, int ret) req->status =NVME_INTERNAL_DEV_ERROR ; } -if (req->qsg.nalloc) { -qemu_sglist_destroy (&req->qsg); - } -if (req->iov.nalloc) { -qemu_iovec_destroy (&req->iov); - } -nvme_enqueue_req_completion (cq, req); }
Signature · 1 line
2.27.0
Re: [PATCH v2 14/16] hw/block/nvme: consolidate qsg/iov clearing
Quoted 18 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Always destroy the request qsg/iov at the end of request use.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 52 ++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 31 deletions(-)hw/block/nvme.c +1
-0@@ -217,6 +217,17 @@ static void nvme_req_clear(NvmeRequest *req)memset (&req->cqe,0x0 ,sizeof (req->cqe)); } +static void nvme_req_exit (NvmeRequest *req)
hw/block/nvme.c static void nvme_req_clear(NvmeRequest *req) · line 230
Quoted 10 lines
hw/block/nvme.c +10
-0+{ +if (req->qsg.sg) { +qemu_sglist_destroy (&req->qsg); + } + +if (req->iov.iov) { +qemu_iovec_destroy (&req->iov); + } +} +
Klaus,
What is differences between 'clear' and 'exit' from the request perspective?
Thanks,
Maxim Levitsky
Reviewed-byRe: [PATCH v2 14/16] hw/block/nvme: consolidate qsg/iov clearing
Quoted 32 lines · Minwoo Im
Quoted 18 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Always destroy the request qsg/iov at the end of request use.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 52 ++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 31 deletions(-)hw/block/nvme.c +1
-0@@ -217,6 +217,17 @@ static void nvme_req_clear(NvmeRequest *req)memset (&req->cqe,0x0 ,sizeof (req->cqe)); } +static void nvme_req_exit (NvmeRequest *req)hw/block/nvme.c static void nvme_req_clear(NvmeRequest *req) · line 230
Quoted 10 lines
hw/block/nvme.c +10
-0+{ +if (req->qsg.sg) { +qemu_sglist_destroy (&req->qsg); + } + +if (req->iov.iov) { +qemu_iovec_destroy (&req->iov); + } +} +Klaus,
Quoted 5 lines
What is differences between 'clear' and 'exit' from the request perspective?
Thanks,
In my personal opinion, I don't think the name matters that much here.
Best regards,
Maxim Levitsky
Re: [PATCH v2 14/16] hw/block/nvme: consolidate qsg/iov clearing
In reply to Minwoo ImQuoted 32 lines · Minwoo Im
Quoted 18 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Always destroy the request qsg/iov at the end of request use.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 52 ++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 31 deletions(-)hw/block/nvme.c +1
-0@@ -217,6 +217,17 @@ static void nvme_req_clear(NvmeRequest *req)memset (&req->cqe,0x0 ,sizeof (req->cqe)); } +static void nvme_req_exit (NvmeRequest *req)hw/block/nvme.c static void nvme_req_clear(NvmeRequest *req) · line 230
Quoted 10 lines
hw/block/nvme.c +10
-0+{ +if (req->qsg.sg) { +qemu_sglist_destroy (&req->qsg); + } + +if (req->iov.iov) { +qemu_iovec_destroy (&req->iov); + } +} +Klaus,
Quoted 3 lines
What is differences between 'clear' and 'exit' from the request perspective?
Hi Minwoo,
The is that on 'exit' we release request resources (like the qsg and iov). On 'clear' we initialize the request by clearing the struct. I guess I could call it nvme_req_init instead maybe, but really - it is clearing it.
Minwoo Im
Reviewed-byRe: [PATCH v2 14/16] hw/block/nvme: consolidate qsg/iov clearing
Quoted 6 lines
Hi Minwoo,
The is that on 'exit' we release request resources (like the qsg and iov). On 'clear' we initialize the request by clearing the struct. I guess I could call it
nvme_req_initinstead maybe, but really - it is clearing it.
Yeah, I just wanted to make it clear to understand myself here.
PATCH v2 15/16 hw/block/nvme: use preallocated qsg/iov in nvme_dma_prp
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Since clean up of the request qsg/iov is now always done post-use, there is no need to use a stack-allocated qsg/iov in nvme_dma_prp.
--- hw/block/nvme.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-)
hw/block/nvme.c +18 -23
@@ -381,50 +381,45 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1, }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 (&req->qsg, &req->iov, prp1, prp2, len, n);if (status) {return status; }/* assert that only one of qsg and iov carries data */ -assert ((qsg.nsg >0 ) != (iov.niov >0 )); +assert ((req->qsg.nsg >0 ) != (req->iov.niov >0 )); -if (qsg.nsg >0 ) { +if (req->qsg.nsg >0 ) {uint64_t residual;if (dir ==DMA_DIRECTION_TO_DEVICE ) { - residual =dma_buf_write (ptr, len, &qsg); + residual =dma_buf_write (ptr, len, &req->qsg); }else { - residual =dma_buf_read (ptr, len, &qsg); + residual =dma_buf_read (ptr, len, &req->qsg); }if (unlikely (residual)) {trace_pci_nvme_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; } - -qemu_sglist_destroy (&qsg); }else {size_t bytes;if (dir ==DMA_DIRECTION_TO_DEVICE ) { - bytes =qemu_iovec_to_buf (&iov,0 , ptr, len); + bytes =qemu_iovec_to_buf (&req->iov,0 , ptr, len); }else { - bytes =qemu_iovec_from_buf (&iov,0 , ptr, len); + bytes =qemu_iovec_from_buf (&req->iov,0 , ptr, len); }if (unlikely (bytes != len)) {trace_pci_nvme_err_invalid_dma (); status =NVME_INVALID_FIELD |NVME_DNR ; } - -qemu_iovec_destroy (&iov); }return status;
@@ -893,7 +888,7 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, uint8_t rae, uint32_t buf_len, }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, uint32_t buf_len, uint64_t off,
@@ -916,7 +911,7 @@ static uint16_t nvme_fw_log_info(NvmeCtrl *n, uint32_t buf_len, uint64_t off, 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, uint8_t rae, uint32_t buf_len,
@@ -941,7 +936,7 @@ static uint16_t nvme_error_info(NvmeCtrl *n, uint8_t rae, uint32_t buf_len, trans_len =MIN (sizeof (errlog) - off, buf_len);return nvme_dma_prp (n, (uint8_t *)&errlog, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_get_log (NvmeCtrl *n,NvmeRequest *req)
@@ -1107,7 +1102,7 @@ static uint16_t nvme_identify_ctrl(NvmeCtrl *n, NvmeRequest *req)trace_pci_nvme_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,NvmeRequest *req)
@@ -1128,7 +1123,7 @@ static uint16_t nvme_identify_ns(NvmeCtrl *n, NvmeRequest *req) 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,NvmeRequest *req)
@@ -1165,7 +1160,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) } } 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; }
@@ -1208,7 +1203,7 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req)stl_be_p (&ns_descrs->uuid.v, nsid);return nvme_dma_prp (n, list,NVME_IDENTIFY_DATA_SIZE , prp1, prp2, -DMA_DIRECTION_FROM_DEVICE ); +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_identify (NvmeCtrl *n,NvmeRequest *req)
@@ -1291,7 +1286,7 @@ static uint16_t nvme_get_feature_timestamp(NvmeCtrl *n, NvmeRequest *req)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,NvmeRequest *req)
@@ -1425,7 +1420,7 @@ static uint16_t nvme_set_feature_timestamp(NvmeCtrl *n, NvmeRequest *req)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; }
Signature · 1 line
2.27.0
Re: [PATCH v2 15/16] hw/block/nvme: use preallocated qsg/iov in nvme_dma_prp
Quoted 8 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Since clean up of the request qsg/iov is now always done post-use, there is no need to use a stack-allocated qsg/iov in
nvme_dma_prp.Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>
PATCH v2 16/16 hw/block/nvme: remove explicit qsg/iov parameters
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Since nvme_map_prp always operate on the request-scoped qsg/iovs, just pass a single pointer to the NvmeRequest instead of two for each of the qsg and iov.
--- hw/block/nvme.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
hw/block/nvme.c +7 -4
@@ -284,8 +284,8 @@ 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,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);
@@ -293,6 +293,9 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,uint16_t status;bool prp_list_in_cmb = false; +QEMUSGList *qsg = &req->qsg; +QEMUIOVector *iov = &req->iov; +trace_pci_nvme_map_prp (trans_len, len, prp1, prp2, num_prps);if (unlikely (!prp1)) {
@@ -386,7 +389,7 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, {uint16_t status =NVME_SUCCESS ; - status =nvme_map_prp (&req->qsg, &req->iov, prp1, prp2, len, n); + status =nvme_map_prp (n, prp1, prp2, len, req);if (status) {return status; }
@@ -431,7 +434,7 @@ static uint16_t nvme_map_dptr(NvmeCtrl *n, 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 (&req->qsg, &req->iov, prp1, prp2, len, n); +return nvme_map_prp (n, prp1, prp2, len, req); }static void nvme_post_cqes (void *opaque)
Signature · 1 line
2.27.0
Re: [PATCH v2 16/16] hw/block/nvme: remove explicit qsg/iov parameters
Quoted 47 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Since
nvme_map_prpalways operate on the request-scoped qsg/iovs, just pass a single pointer to the NvmeRequest instead of two for each of the qsg and iov.Suggested-by Minwoo Im <[email protected]>Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)hw/block/nvme.c +6
-3@@ -284,8 +284,8 @@ 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,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);@@ -293,6 +293,9 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,uint16_t status;bool prp_list_in_cmb = false; +QEMUSGList *qsg = &req->qsg; +QEMUIOVector *iov = &req->iov; +trace_pci_nvme_map_prp (trans_len, len, prp1, prp2, num_prps);if (unlikely (!prp1)) {@@ -386,7 +389,7 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, {uint16_t status =NVME_SUCCESS ; - status =nvme_map_prp (&req->qsg, &req->iov, prp1, prp2, len, n); + status =nvme_map_prp (n, prp1, prp2, len, req);if (status) {return status; }
hw/block/nvme.c static uint16_t nvme_map_dptr(NvmeCtrl *n, size_t len, NvmeRequest *req) · line 440
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -431,7 +434,7 @@ static uint16_t nvme_map_dptr(NvmeCtrl *n, 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 (&req->qsg, &req->iov, prp1, prp2, len, n); +return nvme_map_prp (n, prp1, prp2, len, req); }static void nvme_post_cqes (void *opaque)
This looks better to have qsg and iov in the NvmeRequest.
Re: [PATCH v2 16/16] hw/block/nvme: remove explicit qsg/iov parameters
In reply to Klaus JensenQuoted 47 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Since
nvme_map_prpalways operate on the request-scoped qsg/iovs, just pass a single pointer to the NvmeRequest instead of two for each of the qsg and iov.Suggested-by Minwoo Im <[email protected]>Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)hw/block/nvme.c +6
-3@@ -284,8 +284,8 @@ 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,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);@@ -293,6 +293,9 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,uint16_t status;bool prp_list_in_cmb = false; +QEMUSGList *qsg = &req->qsg; +QEMUIOVector *iov = &req->iov; +trace_pci_nvme_map_prp (trans_len, len, prp1, prp2, num_prps);if (unlikely (!prp1)) {@@ -386,7 +389,7 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len, {uint16_t status =NVME_SUCCESS ; - status =nvme_map_prp (&req->qsg, &req->iov, prp1, prp2, len, n); + status =nvme_map_prp (n, prp1, prp2, len, req);if (status) {return status; }
hw/block/nvme.c static uint16_t nvme_map_dptr(NvmeCtrl *n, size_t len, NvmeRequest *req) · line 440
Quoted 8 lines
hw/block/nvme.c +1
-1@@ -431,7 +434,7 @@ static uint16_t nvme_map_dptr(NvmeCtrl *n, 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 (&req->qsg, &req->iov, prp1, prp2, len, n); +return nvme_map_prp (n, prp1, prp2, len, req); }static void nvme_post_cqes (void *opaque)
Best regards,
Maxim Levitsky
Klaus Jensen
AppliedQuoted 61 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This series consists of patches that refactors dma read/write and adds a number of address mapping helper functions.
v2:
* hw/block/nvme: add mapping helpers
- Add an assert in case of out of bounds array access. (Maxim)* hw/block/nvme: remove redundant
has_sgmember
- Split the fix for the missingqemu_iov_destroyinto a fresh patch ("hw/block/nvme: destroy request iov before reuse"). (Minwoo)* hw/block/nvme: pass request along for tracing [DROPPED]
- Dropped the patch and replaced it with a simple patch that just adds tracing to thenvme_map_prpfunction ("hw/block/nvme: add tracing tonvme_map_prp"). (Minwoo)* hw/block/nvme: add request mapping helper
- Changed the name fromnvme_maptonvme_map_dptr. (Minwoo, Maxim)* hw/block/nvme: add check for mdts
- Don't touch the documentaiton for thecmb_size_mbandmax_ioqpairsparameters in this patch. (Minwoo)* hw/block/nvme: refactor NvmeRequest clearing [DROPPED]
- Keep NvmeRequest structure clearing as "before use". (Maxim)* hw/block/nvme: add a namespace reference in NvmeRequest
* hw/block/nvme: remove NvmeCmd parameter
- Squash these two patches together into "hw/block/nvme: add ns/cmd references in NvmeRequest".* hw/block/nvme: consolidate qsg/iov clearing
- Move the qsg/iov destroys to a newnvme_req_exitfunction that is called after the cqe has been posted.* hw/block/nvme: remove explicit qsg/iov parameters
- New patch. THenvme_map_prp()function doesn't require the qsg and iov parameters since it can just get them from the passed NvmeRequest.Based-on: <[email protected]>
Klaus Jensen (16):
hw/block/nvme: memset preallocated requests structures hw/block/nvme: add mapping helpers hw/block/nvme: replacedma_acctwithblk_acctequivalent hw/block/nvme: remove redundanthas_sgmember hw/block/nvme: destroy request iov before reuse hw/block/nvme: refactor dma read/write hw/block/nvme: add tracing tonvme_map_prphw/block/nvme: add request mapping helper hw/block/nvme: verify validity of prp lists in the cmb hw/block/nvme: refactor request bounds checking hw/block/nvme: add check for mdts hw/block/nvme: be consistent about zeros vs zeroes hw/block/nvme: add ns/cmd references in NvmeRequest hw/block/nvme: consolidate qsg/iov clearing hw/block/nvme: use preallocated qsg/iov innvme_dma_prphw/block/nvme: remove explicit qsg/iov parameters
Quoted 11 lines
block/nvme.c | 4 +- hw/block/nvme.c | 506 +++++++++++++++++++++++++++--------------- hw/block/nvme.h | 4 +- hw/block/trace-events | 4 + include/block/nvme.h | 4 +- 5 files changed, 340 insertions(+), 182 deletions(-)Signature · 1 line
2.27.0
Thanks for the reviews everyone.
Pushed to nvme-next.