hw/block/nvme: multiple namespaces support
cover hw/block/nvme: multiple namespaces support
From: Klaus Jensen <[email protected]>
This is the next round of my patches for the nvme device.
This includes a bit of cleanup and three new features:
* refactored aio submission
This also adds support for multiple parallel AIOs per request which is in preparation for DULBE, ZNS and metadata support. If it is found controversial, it can easily be dropped from this series.
* support for scatter/gather lists
* multiple namespaces support through a new nvme-ns device
Finally, the series ends with changing the PCI vendor and device ID to get rid of the internal Intel id and as a side-effect get rid of some Linux kernel quirks that no longer applies.
"pci: pass along the return value of dma_memory_rw" has already been posted by Philippe in another series, but since it is not applied yet, I am including it here.
Gollu Appalanaidu (1):
hw/block/nvme: add support for sgl bit bucket descriptor
Klaus Jensen (16):
pci: pass along the return value of dma_memory_rw hw/block/nvme: handle dma errors
hw/block/nvme: commonize nvme_rw error handling hw/block/nvme: alignment style fixes hw/block/nvme: add a lba to bytes helper hw/block/nvme: fix endian conversion hw/block/nvme: add symbolic command name to trace events hw/block/nvme: refactor aio submission hw/block/nvme: default request status to success hw/block/nvme: support multiple parallel aios per request hw/block/nvme: harden cmb access
hw/block/nvme: add support for scatter gather lists hw/block/nvme: refactor identify active namespace id list hw/block/nvme: support multiple namespaces
pci: allocate pci id for nvme
hw/block/nvme: change controller pci id
MAINTAINERS | 1 + docs/specs/nvme.txt | 23 + docs/specs/pci-ids.txt | 1 + hw/block/meson.build | 2 +- hw/block/nvme-ns.c | 185 +++++++++ hw/block/nvme-ns.h | 74 ++++ hw/block/nvme.c | 923 +++++++++++++++++++++++++++++++---------- hw/block/nvme.h | 126 +++++- hw/block/trace-events | 21 +- hw/core/machine.c | 1 + include/block/nvme.h | 8 +- include/hw/pci/pci.h | 4 +- 12 files changed, 1108 insertions(+), 261 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.28.0
PATCH 1/17 pci: pass along the return value of dma_memory_rw
From: Klaus Jensen <[email protected]>
Some devices might want to know the return value of dma_memory_rw, so pass it along instead of ignoring it.
There are no existing users of the return value, so this patch should be safe.
--- include/hw/pci/pci.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/hw/pci/pci.h +1 -2
@@ -788,8 +788,7 @@ static inline AddressSpace *pci_get_address_space(PCIDevice *dev)static inline int pci_dma_rw (PCIDevice *dev,dma_addr_t addr,void *buf,dma_addr_t len,DMADirection dir) { -dma_memory_rw (pci_get_address_space (dev), addr, buf, len, dir); -return 0 ; +return dma_memory_rw (pci_get_address_space (dev), addr, buf, len, dir); } static inline int pci_dma_read(PCIDevice *dev, dma_addr_t addr,
Signature · 1 line
2.28.0
PATCH 2/17 hw/block/nvme: handle dma errors
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Handling DMA errors gracefully is required for the device to pass the block/011 test ("disable PCI device while doing I/O") in the blktests suite.
With this patch the device passes the test by retrying "critical" transfers (posting of completion entries and processing of submission queue entries).
If DMA errors occur at any other point in the execution of the command (say, while mapping the PRPs), the command is aborted with a Data Transfer Error status code.
--- hw/block/nvme.c | 43 ++++++++++++++++++++++++++++++++----------- hw/block/trace-events | 2 ++ include/block/nvme.h | 2 +- 3 files changed, 35 insertions(+), 12 deletions(-)
hw/block/nvme.c +32 -11
@@ -140,14 +140,14 @@ static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr)return &n->cmbuf[addr - n->ctrl_mem.addr]; } -static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) +static int nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) {if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr)) {memcpy (buf,nvme_addr_to_cmb (n, addr), size); -return ; +return 0 ; } -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)
@@ -253,7 +253,7 @@ static uint16_t nvme_map_addr_cmb(NvmeCtrl *n, QEMUIOVector *iov, hwaddr addr,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 ; +return NVME_DATA_TRANSFER_ERROR ; }qemu_iovec_add (iov,nvme_addr_to_cmb (n, addr), len);
@@ -307,6 +307,7 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2,int num_prps = (len >> n->page_bits) +1 ;uint16_t status;bool prp_list_in_cmb = false; +int ret;QEMUSGList *qsg = &req->qsg;QEMUIOVector *iov = &req->iov;
@@ -347,7 +348,11 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2, 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); + ret =nvme_addr_read (n, prp2, (void *)prp_list, prp_trans); +if (ret) { +trace_pci_nvme_err_addr_read (prp2); +return NVME_DATA_TRANSFER_ERROR ; + }while (len !=0 ) {uint64_t prp_ent =le64_to_cpu (prp_list[i]);
@@ -364,8 +369,12 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2, i =0 ; nents = (len + n->page_size -1 ) >> n->page_bits; prp_trans =MIN (n->max_prp_ents, nents) *sizeof (uint64_t ); -nvme_addr_read (n, prp_ent, (void *)prp_list, - prp_trans); + ret =nvme_addr_read (n, prp_ent, (void *)prp_list, + prp_trans); +if (ret) { +trace_pci_nvme_err_addr_read (prp_ent); +return NVME_DATA_TRANSFER_ERROR ; + } prp_ent =le64_to_cpu (prp_list[i]); }
@@ -457,6 +466,7 @@ static void nvme_post_cqes(void *opaque)NvmeCQueue *cq = opaque;NvmeCtrl *n = cq->ctrl;NvmeRequest *req, *next; +int ret; QTAILQ_FOREACH_SAFE(req, &cq->req_list, entry, next) {NvmeSQueue *sq;
@@ -466,15 +476,21 @@ static void nvme_post_cqes(void *opaque)break ; } -QTAILQ_REMOVE (&cq->req_list, req, entry); sq = req->sq; req->cqe.status =cpu_to_le16 ((req->status <<1 ) | cq->phase); req->cqe.sq_id =cpu_to_le16 (sq->sqid); req->cqe.sq_head =cpu_to_le16 (sq->head); addr = cq->dma_addr + cq->tail * n->cqe_size; + ret =pci_dma_write (&n->parent_obj, addr, (void *)&req->cqe, +sizeof (req->cqe)); +if (ret) { +trace_pci_nvme_err_addr_write (addr); +timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + +500 *SCALE_MS ); +break ; + } +QTAILQ_REMOVE (&cq->req_list, req, entry);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); }
@@ -1611,7 +1627,12 @@ static void nvme_process_sq(void *opaque)while (!(nvme_sq_empty (sq) ||QTAILQ_EMPTY (&sq->req_list))) { addr = sq->dma_addr + sq->head * n->sqe_size; -nvme_addr_read (n, addr, (void *)&cmd,sizeof (cmd)); +if (nvme_addr_read (n, addr, (void *)&cmd,sizeof (cmd))) { +trace_pci_nvme_err_addr_read (addr); +timer_mod (sq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + +500 *SCALE_MS ); +break ; + }nvme_inc_sq_head (sq); req =QTAILQ_FIRST (&sq->req_list);
hw/block/trace-events +2 -0
@@ -86,6 +86,8 @@ 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 %zu" +pci_nvme_err_addr_read(uint64_t addr) "addr 0x%"PRIx64"" +pci_nvme_err_addr_write(uint64_t addr) "addr 0x%"PRIx64"" 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""
include/block/nvme.h +1 -1
@@ -630,7 +630,7 @@ enum NvmeStatusCodes {NVME_INVALID_OPCODE =0x0001 ,NVME_INVALID_FIELD =0x0002 ,NVME_CID_CONFLICT =0x0003 , -NVME_DATA_TRAS_ERROR =0x0004 , +NVME_DATA_TRANSFER_ERROR =0x0004 ,NVME_POWER_LOSS_ABORT =0x0005 ,NVME_INTERNAL_DEV_ERROR =0x0006 , NVME_CMD_ABORT_REQ = 0x0007,
Signature · 1 line
2.28.0
Re: [PATCH 02/17] hw/block/nvme: handle dma errors
Hi Klaus,
Quoted 28 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Handling DMA errors gracefully is required for the device to pass the block/011 test ("disable PCI device while doing I/O") in the blktests suite.
With this patch the device passes the test by retrying "critical" transfers (posting of completion entries and processing of submission queue entries).
If DMA errors occur at any other point in the execution of the command (say, while mapping the PRPs), the command is aborted with a Data Transfer Error status code.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 43 ++++++++++++++++++++++++++++++++----------- hw/block/trace-events | 2 ++ include/block/nvme.h | 2 +- 3 files changed, 35 insertions(+), 12 deletions(-)hw/block/nvme.c +0
-0
hw/block/nvme.c static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr) · line 143
Quoted 5 lines
hw/block/nvme.c +1
-1@@ -140,14 +140,14 @@ static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr)return &n->cmbuf[addr - n->ctrl_mem.addr]; } -static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) +static int nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size)
If this get merged first:
https://www.mail-archive.com/[email protected]/msg737483.html
then please return MemTxResult, ...
Quoted 30 lines
hw/block/nvme.c +4
-3{if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr)) {memcpy (buf,nvme_addr_to_cmb (n, addr), size); -return ; +return 0 ; } -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)@@ -253,7 +253,7 @@ static uint16_t nvme_map_addr_cmb(NvmeCtrl *n, QEMUIOVector *iov, hwaddr addr,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 ; +return NVME_DATA_TRANSFER_ERROR ; }qemu_iovec_add (iov,nvme_addr_to_cmb (n, addr), len);@@ -307,6 +307,7 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2,int num_prps = (len >> n->page_bits) +1 ;uint16_t status;bool prp_list_in_cmb = false; +int ret;QEMUSGList *qsg = &req->qsg;QEMUIOVector *iov = &req->iov;
hw/block/nvme.c static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2, · line 352
Quoted 6 lines
hw/block/nvme.c +2
-1@@ -347,7 +348,11 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2, 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); + ret =nvme_addr_read (n, prp2, (void *)prp_list, prp_trans); +if (ret) {
... and check it (other cases following).
Quoted 95 lines
hw/block/nvme.c +25
-6+trace_pci_nvme_err_addr_read (prp2); +return NVME_DATA_TRANSFER_ERROR ; + }while (len !=0 ) {uint64_t prp_ent =le64_to_cpu (prp_list[i]);@@ -364,8 +369,12 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2, i =0 ; nents = (len + n->page_size -1 ) >> n->page_bits; prp_trans =MIN (n->max_prp_ents, nents) *sizeof (uint64_t ); -nvme_addr_read (n, prp_ent, (void *)prp_list, - prp_trans); + ret =nvme_addr_read (n, prp_ent, (void *)prp_list, + prp_trans); +if (ret) { +trace_pci_nvme_err_addr_read (prp_ent); +return NVME_DATA_TRANSFER_ERROR ; + } prp_ent =le64_to_cpu (prp_list[i]); }@@ -457,6 +466,7 @@ static void nvme_post_cqes(void *opaque)NvmeCQueue *cq = opaque;NvmeCtrl *n = cq->ctrl;NvmeRequest *req, *next; +int ret; QTAILQ_FOREACH_SAFE(req, &cq->req_list, entry, next) {NvmeSQueue *sq;@@ -466,15 +476,21 @@ static void nvme_post_cqes(void *opaque)break ; } -QTAILQ_REMOVE (&cq->req_list, req, entry); sq = req->sq; req->cqe.status =cpu_to_le16 ((req->status <<1 ) | cq->phase); req->cqe.sq_id =cpu_to_le16 (sq->sqid); req->cqe.sq_head =cpu_to_le16 (sq->head); addr = cq->dma_addr + cq->tail * n->cqe_size; + ret =pci_dma_write (&n->parent_obj, addr, (void *)&req->cqe, +sizeof (req->cqe)); +if (ret) { +trace_pci_nvme_err_addr_write (addr); +timer_mod (cq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + +500 *SCALE_MS ); +break ; + } +QTAILQ_REMOVE (&cq->req_list, req, entry);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); }@@ -1611,7 +1627,12 @@ static void nvme_process_sq(void *opaque)while (!(nvme_sq_empty (sq) ||QTAILQ_EMPTY (&sq->req_list))) { addr = sq->dma_addr + sq->head * n->sqe_size; -nvme_addr_read (n, addr, (void *)&cmd,sizeof (cmd)); +if (nvme_addr_read (n, addr, (void *)&cmd,sizeof (cmd))) { +trace_pci_nvme_err_addr_read (addr); +timer_mod (sq->timer,qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + +500 *SCALE_MS ); +break ; + }nvme_inc_sq_head (sq); req =QTAILQ_FIRST (&sq->req_list);hw/block/trace-events +2
-0@@ -86,6 +86,8 @@ 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 %zu" +pci_nvme_err_addr_read(uint64_t addr) "addr 0x%"PRIx64"" +pci_nvme_err_addr_write(uint64_t addr) "addr 0x%"PRIx64"" 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""include/block/nvme.h +1
-1@@ -630,7 +630,7 @@ enum NvmeStatusCodes {NVME_INVALID_OPCODE =0x0001 ,NVME_INVALID_FIELD =0x0002 ,NVME_CID_CONFLICT =0x0003 , -NVME_DATA_TRAS_ERROR =0x0004 , +NVME_DATA_TRANSFER_ERROR =0x0004 ,NVME_POWER_LOSS_ABORT =0x0005 ,NVME_INTERNAL_DEV_ERROR =0x0006 , NVME_CMD_ABORT_REQ = 0x0007,
Re: [PATCH 02/17] hw/block/nvme: handle dma errors
Quoted 34 lines · Philippe Mathieu-Daudé
Hi Klaus,
Quoted 31 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Handling DMA errors gracefully is required for the device to pass the block/011 test ("disable PCI device while doing I/O") in the blktests suite.
With this patch the device passes the test by retrying "critical" transfers (posting of completion entries and processing of submission queue entries).
If DMA errors occur at any other point in the execution of the command (say, while mapping the PRPs), the command is aborted with a Data Transfer Error status code.
Signed-off-by Klaus Jensen <[email protected]>Acked-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 43 ++++++++++++++++++++++++++++++++----------- hw/block/trace-events | 2 ++ include/block/nvme.h | 2 +- 3 files changed, 35 insertions(+), 12 deletions(-)hw/block/nvme.c +0
-0@@ -140,14 +140,14 @@ static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr)return &n->cmbuf[addr - n->ctrl_mem.addr]; }
Quoted 7 lines
hw/block/nvme.c static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr) · line 143
Quoted 2 lines
hw/block/nvme.c +1
-1-static void nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) +static int nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size)If this get merged first:
https://www.mail-archive.com/[email protected]/msg737483.html
then please return MemTxResult, ...
Noted! :)
PATCH 3/17 hw/block/nvme: commonize nvme_rw error handling
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Move common error handling to a label.
--- hw/block/nvme.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
hw/block/nvme.c +9 -7
@@ -687,20 +687,18 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) 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; + goto invalid; } status =nvme_check_bounds (n, ns, slba, nlb);if (status) {trace_pci_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze); -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return status; + goto invalid; } -if (nvme_map_dptr (n, data_size, req)) { -block_acct_invalid (blk_get_stats (n->conf.blk), acct); -return NVME_INVALID_FIELD |NVME_DNR ; + status =nvme_map_dptr (n, data_size, req); +if (status) { + goto invalid; }if (req->qsg.nsg >0 ) {
@@ -722,6 +720,10 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) }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,NvmeRequest *req)
Signature · 1 line
2.28.0
PATCH 4/17 hw/block/nvme: alignment style fixes
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Style fixes.
--- hw/block/nvme.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
hw/block/nvme.c +13 -12
@@ -634,7 +634,7 @@ static void nvme_rw_cb(void *opaque, int ret)static uint16_t nvme_flush (NvmeCtrl *n,NvmeRequest *req) {block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 , -BLOCK_ACCT_FLUSH ); +BLOCK_ACCT_FLUSH ); req->aiocb =blk_aio_flush (n->conf.blk, nvme_rw_cb, req);return NVME_NO_COMPLETE ;
@@ -663,7 +663,7 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequest *req)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); +BDRV_REQ_MAY_UNMAP , nvme_rw_cb, req);return NVME_NO_COMPLETE ; }
@@ -803,7 +803,7 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest *req) }static void nvme_init_sq (NvmeSQueue *sq,NvmeCtrl *n,uint64_t dma_addr, -uint16_t sqid,uint16_t cqid,uint16_t size) +uint16_t sqid,uint16_t cqid,uint16_t size) {int i;NvmeCQueue *cq;
@@ -1058,7 +1058,8 @@ static uint16_t nvme_del_cq(NvmeCtrl *n, NvmeRequest *req) }static void nvme_init_cq (NvmeCQueue *cq,NvmeCtrl *n,uint64_t dma_addr, -uint16_t cqid,uint16_t vector,uint16_t size,uint16_t irq_enabled) +uint16_t cqid,uint16_t vector,uint16_t size, +uint16_t irq_enabled) {int ret;
@@ -1118,7 +1119,7 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req) cq =g_malloc0 (sizeof (*cq));nvme_init_cq (cq, n, prp1, cqid, vector, qsize +1 , -NVME_CQ_FLAGS_IEN (qflags)); +NVME_CQ_FLAGS_IEN (qflags));/* * It is only required to set qs_created when creating a completion queue;
@@ -1520,7 +1521,7 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeRequest *req) }if (((n->temperature >= n->features.temp_thresh_hi) || - (n->temperature <= n->features.temp_thresh_low)) && + (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,
@@ -1770,9 +1771,9 @@ static int nvme_start_ctrl(NvmeCtrl *n) n->cqe_size =1 <<NVME_CC_IOCQES (n->bar.cc); n->sqe_size =1 <<NVME_CC_IOSQES (n->bar.cc);nvme_init_cq (&n->admin_cq, n, n->bar.acq,0 ,0 , -NVME_AQA_ACQS (n->bar.aqa) +1 ,1 ); +NVME_AQA_ACQS (n->bar.aqa) +1 ,1 );nvme_init_sq (&n->admin_sq, n, n->bar.asq,0 ,0 , -NVME_AQA_ASQS (n->bar.aqa) +1 ); +NVME_AQA_ASQS (n->bar.aqa) +1 );nvme_set_timestamp (n,0ULL );
@@ -1782,7 +1783,7 @@ static int nvme_start_ctrl(NvmeCtrl *n) }static void nvme_write_bar (NvmeCtrl *n,hwaddr offset,uint64_t data, -unsigned size) +unsigned size) {if (unlikely (offset & (sizeof (uint32_t ) -1 ))) { NVME_GUEST_ERR(pci_nvme_ub_mmiowr_misaligned32,
@@ -1925,7 +1926,7 @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data, "invalid write to PMRSWTP register, ignored");return ;case 0xE14 :/* TODO PMRMSC */ -break ; +break ;default :NVME_GUEST_ERR (pci_nvme_ub_mmiowr_invalid, "invalid MMIO write,"
@@ -2101,7 +2102,7 @@ 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) +unsigned size) {NvmeCtrl *n = (NvmeCtrl *)opaque;
@@ -2125,7 +2126,7 @@ static const MemoryRegionOps nvme_mmio_ops = { };static void nvme_cmb_write (void *opaque,hwaddr addr,uint64_t data, -unsigned size) +unsigned size) {NvmeCtrl *n = (NvmeCtrl *)opaque;stn_le_p (&n->cmbuf[addr], size, data);
Signature · 1 line
2.28.0
Re: [PATCH 04/17] hw/block/nvme: alignment style fixes
Quoted 8 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Style fixes.
Signed-off-by Klaus Jensen <[email protected]>--- hw/block/nvme.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-)
PATCH 5/17 hw/block/nvme: add a lba to bytes helper
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add the nvme_l2b helper and use it for converting NLB and SLBA to byte counts and offsets.
--- hw/block/nvme.c | 12 ++++-------- hw/block/nvme.h | 6 ++++++ 2 files changed, 10 insertions(+), 8 deletions(-)
hw/block/nvme.c +4 -8
@@ -644,12 +644,10 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequest *req) {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);uint32_t nlb =le16_to_cpu (rw->nlb) +1 ; -uint64_t offset = slba << data_shift; -uint32_t count = nlb << data_shift; +uint64_t offset =nvme_l2b (ns, slba); +uint32_t count =nvme_l2b (ns, nlb);uint16_t status;trace_pci_nvme_write_zeroes (nvme_cid (req), slba, nlb);
@@ -674,10 +672,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req)uint32_t nlb =le32_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba); -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; +uint64_t data_size =nvme_l2b (ns, nlb); +uint64_t data_offset =nvme_l2b (ns, slba);int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ;enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ;uint16_t status;
hw/block/nvme.h +6 -0
@@ -77,6 +77,12 @@ static inline uint8_t nvme_ns_lbads(NvmeNamespace *ns)return nvme_ns_lbaf (ns)->ds; } +/* convert an LBA to the equivalent in bytes */ +static inline size_t nvme_l2b (NvmeNamespace *ns,uint64_t lba) +{ +return lba <<nvme_ns_lbads (ns); +} +#define TYPE_NVME "nvme"#define NVME (obj) \ OBJECT_CHECK(NvmeCtrl, (obj), TYPE_NVME)
Signature · 1 line
2.28.0
PATCH 6/17 hw/block/nvme: fix endian conversion
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
The raw NLB field is a 16 bit value, so use le16_to_cpu instead of le32_to_cpu and cast to uint32_t before incrementing the value to not wrap around.
--- hw/block/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/block/nvme.c +2 -2
@@ -645,7 +645,7 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequest *req)NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;NvmeNamespace *ns = req->ns;uint64_t slba =le64_to_cpu (rw->slba); -uint32_t nlb =le16_to_cpu (rw->nlb) +1 ; +uint32_t nlb = (uint32_t )le16_to_cpu (rw->nlb) +1 ;uint64_t offset =nvme_l2b (ns, slba);uint32_t count =nvme_l2b (ns, nlb);uint16_t status;
@@ -669,7 +669,7 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) {NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;NvmeNamespace *ns = req->ns; -uint32_t nlb =le32_to_cpu (rw->nlb) +1 ; +uint32_t nlb = (uint32_t )le16_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba);uint64_t data_size =nvme_l2b (ns, nlb);
Signature · 1 line
2.28.0
PATCH 7/17 hw/block/nvme: add symbolic command name to trace events
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Add the symbolic command name to the pci_nvme_{io,admin}_cmd and pci_nvme_rw trace events.
--- hw/block/nvme.c | 8 +++++--- hw/block/nvme.h | 28 ++++++++++++++++++++++++++++ hw/block/trace-events | 6 +++--- 3 files changed, 36 insertions(+), 6 deletions(-)
hw/block/nvme.c +5 -3
@@ -678,7 +678,8 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req)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); +trace_pci_nvme_rw (nvme_cid (req),nvme_io_opc_str (rw->opcode), nlb, + data_size, slba); status =nvme_check_mdts (n, data_size);if (status) {
@@ -727,7 +728,7 @@ static uint16_t nvme_io_cmd(NvmeCtrl *n, NvmeRequest *req)uint32_t nsid =le32_to_cpu (req->cmd.nsid);trace_pci_nvme_io_cmd (nvme_cid (req), nsid,nvme_sqid (req), - req->cmd.opcode); + req->cmd.opcode,nvme_io_opc_str (req->cmd.opcode));if (unlikely (nsid ==0 || nsid > n->num_namespaces)) {trace_pci_nvme_err_invalid_ns (nsid, n->num_namespaces);
@@ -1584,7 +1585,8 @@ static uint16_t nvme_aer(NvmeCtrl *n, NvmeRequest *req)static uint16_t nvme_admin_cmd (NvmeCtrl *n,NvmeRequest *req) { -trace_pci_nvme_admin_cmd (nvme_cid (req),nvme_sqid (req), req->cmd.opcode); +trace_pci_nvme_admin_cmd (nvme_cid (req),nvme_sqid (req), req->cmd.opcode, +nvme_adm_opc_str (req->cmd.opcode));switch (req->cmd.opcode) {case NVME_ADM_CMD_DELETE_SQ :
hw/block/nvme.h +28 -0
@@ -32,6 +32,34 @@ typedef struct NvmeRequest {QTAILQ_ENTRY (NvmeRequest)entry; } NvmeRequest; +static inline const char *nvme_adm_opc_str (uint8_t opc) +{ +switch (opc) { +case NVME_ADM_CMD_DELETE_SQ :return "NVME_ADM_CMD_DELETE_SQ" ; +case NVME_ADM_CMD_CREATE_SQ :return "NVME_ADM_CMD_CREATE_SQ" ; +case NVME_ADM_CMD_GET_LOG_PAGE :return "NVME_ADM_CMD_GET_LOG_PAGE" ; +case NVME_ADM_CMD_DELETE_CQ :return "NVME_ADM_CMD_DELETE_CQ" ; +case NVME_ADM_CMD_CREATE_CQ :return "NVME_ADM_CMD_CREATE_CQ" ; +case NVME_ADM_CMD_IDENTIFY :return "NVME_ADM_CMD_IDENTIFY" ; +case NVME_ADM_CMD_ABORT :return "NVME_ADM_CMD_ABORT" ; +case NVME_ADM_CMD_SET_FEATURES :return "NVME_ADM_CMD_SET_FEATURES" ; +case NVME_ADM_CMD_GET_FEATURES :return "NVME_ADM_CMD_GET_FEATURES" ; +case NVME_ADM_CMD_ASYNC_EV_REQ :return "NVME_ADM_CMD_ASYNC_EV_REQ" ; +default :return "NVME_ADM_CMD_UNKNOWN" ; + } +} + +static inline const char *nvme_io_opc_str (uint8_t opc) +{ +switch (opc) { +case NVME_CMD_FLUSH :return "NVME_NVM_CMD_FLUSH" ; +case NVME_CMD_WRITE :return "NVME_NVM_CMD_WRITE" ; +case NVME_CMD_READ :return "NVME_NVM_CMD_READ" ; +case NVME_CMD_WRITE_ZEROES :return "NVME_NVM_CMD_WRITE_ZEROES" ; +default :return "NVME_NVM_CMD_UNKNOWN" ; + } +} + typedef struct NvmeSQueue { struct NvmeCtrl *ctrl; uint16_t sqid;
hw/block/trace-events +3 -3
@@ -36,9 +36,9 @@ pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2 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"" +pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" +pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" +pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" \"%s\" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" pci_nvme_rw_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_write_zeroes(uint16_t cid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" slba %"PRIu64" nlb %"PRIu32"" pci_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""
Signature · 1 line
2.28.0
Re: [PATCH 07/17] hw/block/nvme: add symbolic command name to trace events
Quoted 5 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Add the symbolic command name to the pci_nvme_{io,admin}_cmd and
pci_nvme_rwtrace events.
[...]> diff --git a/hw/block/trace-events b/hw/block/trace-events
Quoted 7 lines
index
50d5702e6b80..0823d0fb47c5100644hw/block/trace-events +0
-0@@ -36,9 +36,9 @@ pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2 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""
hw/block/trace-events pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2 · line 44
Quoted 10 lines
hw/block/trace-events +3
-3pci_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"" +pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" +pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" +pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" \"%s\" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" pci_nvme_rw_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_write_zeroes(uint16_t cid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" slba %"PRIu64" nlb %"PRIu32"" pci_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""
I'd display the command name using simple quote.
Otherwise:
PATCH 8/17 hw/block/nvme: refactor aio submission
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
This pulls block layer aio submission to a common function an introduces the NvmeAIO structure that encapsulates this.
This adds more code with no immediate benefit, but is in preparation for supporting multiple aios per request.
--- hw/block/nvme.c | 191 ++++++++++++++++++++++++++++++++---------- hw/block/nvme.h | 51 +++++++++++ hw/block/trace-events | 3 + 3 files changed, 203 insertions(+), 42 deletions(-)
hw/block/nvme.c +149 -42
@@ -110,6 +110,7 @@ static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { };static void nvme_process_sq (void *opaque); +static void nvme_aio_cb (void *opaque,int ret);static uint16_t nvme_cid (NvmeRequest *req) {
@@ -611,39 +612,151 @@ static inline uint16_t nvme_check_bounds(NvmeCtrl *n, NvmeNamespace *ns,return NVME_SUCCESS ; } -static void nvme_rw_cb (void *opaque,int ret) +static NvmeAIO *nvme_aio_new (NvmeAIOOp opc,BlockBackend *blk,int64_t offset) { -NvmeRequest *req = opaque; -NvmeSQueue *sq = req->sq; -NvmeCtrl *n = sq->ctrl; -NvmeCQueue *cq = n->cq[sq->cqid]; +NvmeAIO *aio =g_new0 (NvmeAIO,1 ); -trace_pci_nvme_rw_cb (nvme_cid (req)); + aio->opc = opc; + aio->blk = blk; + aio->offset = offset; -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 ; +return aio; +} + +static void nvme_aio_destroy (NvmeAIO *aio) +{ +g_free (aio); +} + +static uint16_t nvme_do_aio (NvmeAIO *aio) +{ +NvmeRequest *req = aio->req; + +BlockBackend *blk = aio->blk; +BlockAcctCookie *acct = &req->acct; +BlockAcctStats *stats =blk_get_stats (blk); + +bool is_write; + +switch (aio->opc) { +case NVME_AIO_OPC_FLUSH : +block_acct_start (stats, acct,0 ,BLOCK_ACCT_FLUSH ); + req->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 ); + req->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->flags &NVME_AIO_DMA ) { +QEMUSGList *qsg = (QEMUSGList *)aio->payload; + +if (is_write) { + req->aiocb =dma_blk_write (blk, qsg, aio->offset, +BDRV_SECTOR_SIZE , nvme_aio_cb, aio); + }else { + req->aiocb =dma_blk_read (blk, qsg, aio->offset, +BDRV_SECTOR_SIZE , nvme_aio_cb, aio); + } + }else { +QEMUIOVector *iov = (QEMUIOVector *)aio->payload; + +if (is_write) { + req->aiocb =blk_aio_pwritev (blk, aio->offset, iov,0 , + nvme_aio_cb, aio); + }else { + req->aiocb =blk_aio_preadv (blk, aio->offset, iov,0 , + nvme_aio_cb, aio); + } + } + +break ; } -nvme_enqueue_req_completion (cq, req); +return NVME_NO_COMPLETE ; +} + +static uint16_t nvme_aio_add (NvmeRequest *req,NvmeAIO *aio) +{ + aio->req = req; + +trace_pci_nvme_aio_add (nvme_cid (req), aio,blk_name (aio->blk), + aio->offset, aio->len,nvme_aio_opc_str (aio), + req); + +return nvme_do_aio (aio); +} + +static void nvme_aio_cb (void *opaque,int ret) +{ +NvmeAIO *aio = opaque; +NvmeRequest *req = aio->req; + +BlockBackend *blk = aio->blk; +BlockAcctCookie *acct = &req->acct; +BlockAcctStats *stats =blk_get_stats (blk); + +Error *local_err =NULL ; + +trace_pci_nvme_aio_cb (nvme_cid (req), aio,blk_name (blk), aio->offset, + aio->len,nvme_aio_opc_str (aio), req); + +if (!ret) { +block_acct_done (stats, acct); + req->status =NVME_SUCCESS ; + }else { +uint16_t status; + +block_acct_failed (stats, acct); + +switch (aio->opc) { +case NVME_AIO_OPC_READ : + status =NVME_UNRECOVERED_READ ; +break ; +case NVME_AIO_OPC_FLUSH : +case NVME_AIO_OPC_WRITE : +case NVME_AIO_OPC_WRITE_ZEROES : + status =NVME_WRITE_FAULT ; +break ; +default : + status =NVME_INTERNAL_DEV_ERROR ; +break ; + } + +trace_pci_nvme_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); + + req->status = status; + } + +nvme_enqueue_req_completion (nvme_cq (req), req); +nvme_aio_destroy (aio); }static uint16_t nvme_flush (NvmeCtrl *n,NvmeRequest *req) { -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); - -return NVME_NO_COMPLETE ; +return nvme_aio_add (req,nvme_aio_new (NVME_AIO_OPC_FLUSH , n->conf.blk,0 )); }static uint16_t nvme_write_zeroes (NvmeCtrl *n,NvmeRequest *req) {NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;NvmeNamespace *ns = req->ns; +NvmeAIO *aio;uint64_t slba =le64_to_cpu (rw->slba);uint32_t nlb = (uint32_t )le16_to_cpu (rw->nlb) +1 ;uint64_t offset =nvme_l2b (ns, slba);
@@ -658,24 +771,23 @@ static uint16_t nvme_write_zeroes(NvmeCtrl *n, NvmeRequest *req)return status; } -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); -return NVME_NO_COMPLETE ; + aio =nvme_aio_new (NVME_AIO_OPC_WRITE_ZEROES , n->conf.blk, offset); + aio->len = count; + +return nvme_aio_add (req, aio); }static uint16_t nvme_rw (NvmeCtrl *n,NvmeRequest *req) {NvmeRwCmd *rw = (NvmeRwCmd *)&req->cmd;NvmeNamespace *ns = req->ns; +NvmeAIO *aio;uint32_t nlb = (uint32_t )le16_to_cpu (rw->nlb) +1 ;uint64_t slba =le64_to_cpu (rw->slba);uint64_t data_size =nvme_l2b (ns, nlb);uint64_t data_offset =nvme_l2b (ns, slba); -int is_write = rw->opcode ==NVME_CMD_WRITE ?1 :0 ; -enum BlockAcctType acct = is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ ; +bool is_write =nvme_req_is_write (req);uint16_t status; trace_pci_nvme_rw(nvme_cid(req), nvme_io_opc_str(rw->opcode), nlb,
@@ -698,28 +810,23 @@ static uint16_t nvme_rw(NvmeCtrl *n, NvmeRequest *req) 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); + aio =nvme_aio_new (is_write ?NVME_AIO_OPC_WRITE :NVME_AIO_OPC_READ , + n->conf.blk, data_offset); + +if (req->qsg.sg) { + aio->payload = &req->qsg; + aio->len = req->qsg.size; + aio->flags |=NVME_AIO_DMA ; }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); + aio->payload = &req->iov; + aio->len = req->iov.size; } -return NVME_NO_COMPLETE ; +return nvme_aio_add (req, aio); invalid: -block_acct_invalid (blk_get_stats (n->conf.blk), acct); +block_acct_invalid (blk_get_stats (n->conf.blk), + is_write ?BLOCK_ACCT_WRITE :BLOCK_ACCT_READ );return status; }
hw/block/nvme.h +51 -0
67 lines not on this page · raw message
hw/block/trace-events +3 -0
@@ -39,6 +39,8 @@ pci_nvme_map_prp(uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" \"%s\" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" +pci_nvme_aio_add(uint16_t cid, void *aio, const char *blkname, uint64_t offset, uint64_t len, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" len %"PRIu64" opc \"%s\" req %p" +pci_nvme_aio_cb(uint16_t cid, void *aio, const char *blkname, uint64_t offset, uint64_t len, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" len %"PRIu64" opc \"%s\" req %p" pci_nvme_rw_cb(uint16_t cid) "cid %"PRIu16"" pci_nvme_write_zeroes(uint16_t cid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" slba %"PRIu64" nlb %"PRIu32"" pci_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""
@@ -88,6 +90,7 @@ pci_nvme_mmio_shutdown_cleared(void) "shutdown bit cleared" pci_nvme_err_mdts(uint16_t cid, size_t len) "cid %"PRIu16" len %zu" pci_nvme_err_addr_read(uint64_t addr) "addr 0x%"PRIx64"" pci_nvme_err_addr_write(uint64_t addr) "addr 0x%"PRIx64"" +pci_nvme_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"" 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.28.0
Re: [PATCH 08/17] hw/block/nvme: refactor aio submission
hw/block/nvme.c static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { · line 113
Quoted 9 lines · Klaus Jensen
hw/block/nvme.c +1
-0@@ -110,6 +110,7 @@ static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { };static void nvme_process_sq (void *opaque); +static void nvme_aio_cb (void *opaque,int ret);
You don't need the forward declaration here. Just move the implementation above where it's used. It looks safe: nvme_aio_cb() doesn't have any circular dependencies.
Re: [PATCH 08/17] hw/block/nvme: refactor aio submission
Quoted 8 lines · Keith Busch
Quoted 7 lines · Klaus Jensen
hw/block/nvme.c +0
-0@@ -110,6 +110,7 @@ static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { };
Quoted 6 lines
hw/block/nvme.c static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { · line 113
Quoted 2 lines
hw/block/nvme.c +1
-0static void nvme_process_sq (void *opaque); +static void nvme_aio_cb (void *opaque,int ret);You don't need the forward declaration here. Just move the implementation above where it's used. It looks safe:
nvme_aio_cb()doesn't have any circular dependencies.
You are right, of course. But it is getting a circular dependency in a later patch. I left it there to reduce code movement later.
Re: [PATCH 08/17] hw/block/nvme: refactor aio submission
Quoted 16 lines · Klaus Jensen
Quoted 8 lines · Keith Busch
Quoted 7 lines · Klaus Jensen
hw/block/nvme.c +0
-0@@ -110,6 +110,7 @@ static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { };Quoted 6 lines
hw/block/nvme.c static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { · line 113
Quoted 2 lines
hw/block/nvme.c +1
-0static void nvme_process_sq (void *opaque); +static void nvme_aio_cb (void *opaque,int ret);You don't need the forward declaration here. Just move the implementation above where it's used. It looks safe:
nvme_aio_cb()doesn't have any circular dependencies.
Quoted 2 lines
You are right, of course. But it is getting a circular dependency in a later patch. I left it there to reduce code movement later.
Is that coming in a future patch? Not finding it in this series.
About the whole patch in general, are multiple aio's per-request coming in later patch as well? I didn't see any use for it here, and the overhead of dynamic allocation and zeroing a new struct in the IO path is a bit concerning for performance. I'd like to see your intended use for this.
Re: [PATCH 08/17] hw/block/nvme: refactor aio submission
Quoted 20 lines · Keith Busch
Quoted 16 lines · Klaus Jensen
Quoted 8 lines · Keith Busch
Quoted 7 lines · Klaus Jensen
hw/block/nvme.c +0
-0@@ -110,6 +110,7 @@ static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { };Quoted 6 lines
hw/block/nvme.c static const uint32_t nvme_feature_cap[NVME_FID_MAX] = { · line 113
Quoted 2 lines
hw/block/nvme.c +1
-0static void nvme_process_sq (void *opaque); +static void nvme_aio_cb (void *opaque,int ret);You don't need the forward declaration here. Just move the implementation above where it's used. It looks safe:
nvme_aio_cb()doesn't have any circular dependencies.Quoted 2 lines
You are right, of course. But it is getting a circular dependency in a later patch. I left it there to reduce code movement later.
Quoted 7 lines
Is that coming in a future patch? Not finding it in this series.
About the whole patch in general, are multiple aio's per-request coming in later patch as well? I didn't see any use for it here, and the overhead of dynamic allocation and zeroing a new struct in the IO path is a bit concerning for performance. I'd like to see your intended use for this.
Intended use-case was parallel aios. There are a lot of use cases for this, DSM, metadata, block allocation tracking and zns zoneinfo.
But I'll rip it out of the series and repost so we can focus on multiple namespaces.
PATCH 9/17 hw/block/nvme: default request status to success
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Make the default request status NVME_SUCCESS so only error status codes has to be set.
--- hw/block/nvme.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/block/nvme.c +1 -3
@@ -231,6 +231,7 @@ static void nvme_req_clear(NvmeRequest *req) { req->ns =NULL ;memset (&req->cqe,0x0 ,sizeof (req->cqe)); + req->status =NVME_SUCCESS ; }static void nvme_req_exit (NvmeRequest *req)
@@ -547,8 +548,6 @@ static void nvme_process_aers(void *opaque) result->log_page = event->result.log_page;g_free (event); - req->status =NVME_SUCCESS ; -trace_pci_nvme_aer_post_cqe (result->event_type, result->event_info, result->log_page);
@@ -713,7 +712,6 @@ static void nvme_aio_cb(void *opaque, int ret)if (!ret) {block_acct_done (stats, acct); - req->status =NVME_SUCCESS ; }else {uint16_t status;
Signature · 1 line
2.28.0
Re: [PATCH 09/17] hw/block/nvme: default request status to success
Quoted 4 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
Make the default request status
NVME_SUCCESSso only error status codes has to be set.
Typo 'has' -> 'have'.
Quoted 2 lines
Signed-off-by Klaus Jensen <[email protected]>
Quoted 34 lines
--- hw/block/nvme.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)hw/block/nvme.c +1
-3@@ -231,6 +231,7 @@ static void nvme_req_clear(NvmeRequest *req) { req->ns =NULL ;memset (&req->cqe,0x0 ,sizeof (req->cqe)); + req->status =NVME_SUCCESS ; }static void nvme_req_exit (NvmeRequest *req)@@ -547,8 +548,6 @@ static void nvme_process_aers(void *opaque) result->log_page = event->result.log_page;g_free (event); - req->status =NVME_SUCCESS ; -trace_pci_nvme_aer_post_cqe (result->event_type, result->event_info, result->log_page);@@ -713,7 +712,6 @@ static void nvme_aio_cb(void *opaque, int ret)if (!ret) {block_acct_done (stats, acct); - req->status =NVME_SUCCESS ; }else {uint16_t status;
PATCH 10/17 hw/block/nvme: support multiple parallel aios per request
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Move the BlockAIOCB to NvmeAIO and add a queue of pending AIOs to the NvmeRequest. Only when the queue is empty is a completion enqueued.
--- hw/block/nvme.c | 44 ++++++++++++++++++++++++++++++-------------- hw/block/nvme.h | 6 ++++-- 2 files changed, 34 insertions(+), 16 deletions(-)
hw/block/nvme.c +30 -14
@@ -629,10 +629,8 @@ static void nvme_aio_destroy(NvmeAIO *aio)static uint16_t nvme_do_aio (NvmeAIO *aio) { -NvmeRequest *req = aio->req; -BlockBackend *blk = aio->blk; -BlockAcctCookie *acct = &req->acct; +BlockAcctCookie *acct = &aio->acct;BlockAcctStats *stats =blk_get_stats (blk);bool is_write;
@@ -640,12 +638,12 @@ static uint16_t nvme_do_aio(NvmeAIO *aio)switch (aio->opc) {case NVME_AIO_OPC_FLUSH :block_acct_start (stats, acct,0 ,BLOCK_ACCT_FLUSH ); - req->aiocb =blk_aio_flush (blk, nvme_aio_cb, aio); + 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 ); - req->aiocb =blk_aio_pwrite_zeroes (blk, aio->offset, aio->len, + aio->aiocb =blk_aio_pwrite_zeroes (blk, aio->offset, aio->len,BDRV_REQ_MAY_UNMAP , nvme_aio_cb, aio);break ;
@@ -661,20 +659,20 @@ static uint16_t nvme_do_aio(NvmeAIO *aio)QEMUSGList *qsg = (QEMUSGList *)aio->payload;if (is_write) { - req->aiocb =dma_blk_write (blk, qsg, aio->offset, + aio->aiocb =dma_blk_write (blk, qsg, aio->offset,BDRV_SECTOR_SIZE , nvme_aio_cb, aio); }else { - req->aiocb =dma_blk_read (blk, qsg, aio->offset, + aio->aiocb =dma_blk_read (blk, qsg, aio->offset,BDRV_SECTOR_SIZE , nvme_aio_cb, aio); } }else {QEMUIOVector *iov = (QEMUIOVector *)aio->payload;if (is_write) { - req->aiocb =blk_aio_pwritev (blk, aio->offset, iov,0 , + aio->aiocb =blk_aio_pwritev (blk, aio->offset, iov,0 , nvme_aio_cb, aio); }else { - req->aiocb =blk_aio_preadv (blk, aio->offset, iov,0 , + aio->aiocb =blk_aio_preadv (blk, aio->offset, iov,0 , nvme_aio_cb, aio); } }
@@ -693,6 +691,8 @@ static uint16_t nvme_aio_add(NvmeRequest *req, NvmeAIO *aio) aio->offset, aio->len,nvme_aio_opc_str (aio), req); +QTAILQ_INSERT_TAIL (&req->aio_tailq, aio, entry); +return nvme_do_aio (aio); }
@@ -702,7 +702,7 @@ static void nvme_aio_cb(void *opaque, int ret)NvmeRequest *req = aio->req;BlockBackend *blk = aio->blk; -BlockAcctCookie *acct = &req->acct; +BlockAcctCookie *acct = &aio->acct;BlockAcctStats *stats =blk_get_stats (blk);Error *local_err =NULL ;
@@ -710,6 +710,8 @@ static void nvme_aio_cb(void *opaque, int ret)trace_pci_nvme_aio_cb (nvme_cid (req), aio,blk_name (blk), aio->offset, aio->len,nvme_aio_opc_str (aio), req); +QTAILQ_REMOVE (&req->aio_tailq, aio, entry); +if (!ret) {block_acct_done (stats, acct); }else {
@@ -738,10 +740,19 @@ static void nvme_aio_cb(void *opaque, int ret)error_setg_errno (&local_err, -ret,"aio failed" );error_report_err (local_err); - req->status = status; +/* +* An Internal Error trumps all other errors. For other errors, only +* set the first encountered. +*/ +if (!req->status || (status &0xfff ) ==NVME_INTERNAL_DEV_ERROR ) { + req->status = status; + } + } + +if (QTAILQ_EMPTY (&req->aio_tailq)) { +nvme_enqueue_req_completion (nvme_cq (req), req); } -nvme_enqueue_req_completion (nvme_cq (req), req);nvme_aio_destroy (aio); }
@@ -872,6 +883,7 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest *req)NvmeRequest *r, *next;NvmeSQueue *sq;NvmeCQueue *cq; +NvmeAIO *aio;uint16_t qid =le16_to_cpu (c->qid);if (unlikely (!qid ||nvme_check_sqid (n, qid))) {
@@ -884,8 +896,11 @@ static uint16_t nvme_del_sq(NvmeCtrl *n, NvmeRequest *req) sq = n->sq[qid];while (!QTAILQ_EMPTY (&sq->out_req_list)) { r =QTAILQ_FIRST (&sq->out_req_list); -assert (r->aiocb); -blk_aio_cancel (r->aiocb); +while (!QTAILQ_EMPTY (&r->aio_tailq)) { + aio =QTAILQ_FIRST (&r->aio_tailq); +assert (aio->aiocb); +blk_aio_cancel (aio->aiocb); + } }if (!nvme_check_cqid (n, sq->cqid)) { cq = n->cq[sq->cqid];
@@ -923,6 +938,7 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,for (i =0 ; i < sq->size; i++) { sq->io_req[i].sq = sq;QTAILQ_INSERT_TAIL (&(sq->req_list), &sq->io_req[i], entry); +QTAILQ_INIT (&(sq->io_req[i].aio_tailq)); } sq->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , nvme_process_sq, sq);
hw/block/nvme.h +4 -2
@@ -22,14 +22,13 @@ 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;QTAILQ_ENTRY (NvmeRequest)entry; + QTAILQ_HEAD(, NvmeAIO) aio_tailq; }NvmeRequest ;static inline bool nvme_req_is_write (NvmeRequest *req)
@@ -86,10 +85,13 @@ typedef struct NvmeAIO {NvmeAIOOp opc;NvmeRequest *req;BlockBackend *blk; +BlockAcctCookie acct; +BlockAIOCB *aiocb;int64_t offset;size_t len;int flags;void *payload; +QTAILQ_ENTRY (NvmeAIO) entry; } NvmeAIO;static inline const char *nvme_aio_opc_str (NvmeAIO *aio)
Signature · 1 line
2.28.0
PATCH 11/17 hw/block/nvme: harden cmb access
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Since the controller has only supported PRPs so far it has not been required to check the ending address (addr + len - 1) of the CMB access for validity since it has been guaranteed to be in range of the CMB.
This changes when the controller adds support for SGLs (next patch), so add that check.
--- hw/block/nvme.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
hw/block/nvme.c +6 -1
@@ -143,7 +143,12 @@ static inline void *nvme_addr_to_cmb(NvmeCtrl *n, hwaddr addr)static int nvme_addr_read (NvmeCtrl *n,hwaddr addr,void *buf,int size) { -if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr)) { +hwaddr hi = addr + size -1 ; +if (hi < addr) { +return 1 ; + } + +if (n->bar.cmbsz &&nvme_addr_is_cmb (n, addr) &&nvme_addr_is_cmb (n, hi)) {memcpy (buf,nvme_addr_to_cmb (n, addr), size);return 0 ; }
Signature · 1 line
2.28.0
PATCH 12/17 hw/block/nvme: add support for scatter gather lists
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
For now, support the Data Block, Segment and Last Segment descriptor types.
See NVM Express 1.3d, Section 4.4 ("Scatter Gather List (SGL)").
--- hw/block/nvme.c | 329 ++++++++++++++++++++++++++++++++++-------- hw/block/trace-events | 4 + include/block/nvme.h | 6 +- 3 files changed, 279 insertions(+), 60 deletions(-)
hw/block/nvme.c +272 -57
@@ -414,13 +414,262 @@ static uint16_t nvme_map_prp(NvmeCtrl *n, uint64_t prp1, uint64_t prp2,return NVME_SUCCESS ; } -static uint16_t nvme_dma_prp (NvmeCtrl *n,uint8_t *ptr,uint32_t len, -uint64_t prp1,uint64_t prp2,DMADirection dir, +/* +* Map 'nsgld' data descriptors from 'segment'. The function will subtract the +* number of bytes mapped in len. +*/ +static uint16_t nvme_map_sgl_data (NvmeCtrl *n,QEMUSGList *qsg, +QEMUIOVector *iov, +NvmeSglDescriptor *segment,uint64_t nsgld, +size_t *len,NvmeRequest *req) +{ +dma_addr_t addr, trans_len; +uint32_t dlen; +uint16_t status; + +for (int i =0 ; i < nsgld; i++) { +uint8_t type =NVME_SGL_TYPE (segment[i].type); + +switch (type) { +case NVME_SGL_DESCR_TYPE_DATA_BLOCK : +break ; +case NVME_SGL_DESCR_TYPE_SEGMENT : +case NVME_SGL_DESCR_TYPE_LAST_SEGMENT : +return NVME_INVALID_NUM_SGL_DESCRS |NVME_DNR ; +default : +return NVME_SGL_DESCR_TYPE_INVALID |NVME_DNR ; + } + + dlen =le32_to_cpu (segment[i].len); +if (!dlen) { +continue ; + } + +if (*len ==0 ) { +/* +* All data has been mapped, but the SGL contains additional +* segments and/or descriptors. The controller might accept +* ignoring the rest of the SGL. +*/ +uint16_t sgls =le16_to_cpu (n->id_ctrl.sgls); +if (sgls &NVME_CTRL_SGLS_EXCESS_LENGTH ) { +break ; + } + +trace_pci_nvme_err_invalid_sgl_excess_length (nvme_cid (req)); +return NVME_DATA_SGL_LEN_INVALID |NVME_DNR ; + } + + trans_len =MIN (*len, dlen); + addr =le64_to_cpu (segment[i].addr); + +if (UINT64_MAX - addr < dlen) { +return NVME_DATA_SGL_LEN_INVALID |NVME_DNR ; + } + + status =nvme_map_addr (n, qsg, iov, addr, trans_len); +if (status) { +return status; + } + + *len -= trans_len; + } + +return NVME_SUCCESS ; +} + +static uint16_t nvme_map_sgl (NvmeCtrl *n,QEMUSGList *qsg,QEMUIOVector *iov, +NvmeSglDescriptor sgl,size_t len,NvmeRequest *req) +{ +/* +* Read the segment in chunks of 256 descriptors (one 4k page) to avoid +* dynamically allocating a potentially huge SGL. The spec allows the SGL +* to be larger (as in number of bytes required to describe the SGL +* descriptors and segment chain) than the command transfer size, so it is +* not bounded by MDTS. +*/ +const int SEG_CHUNK_SIZE =256 ; + +NvmeSglDescriptor segment[SEG_CHUNK_SIZE ], *sgld, *last_sgld; +uint64_t nsgld; +uint32_t seg_len; +uint16_t status; +bool sgl_in_cmb = false; +hwaddr addr; +int ret; + + sgld = &sgl; + addr =le64_to_cpu (sgl.addr); + +trace_pci_nvme_map_sgl (nvme_cid (req),NVME_SGL_TYPE (sgl.type), len); + +/* +* If the entire transfer can be described with a single data block it can +* be mapped directly. +*/ +if (NVME_SGL_TYPE (sgl.type) ==NVME_SGL_DESCR_TYPE_DATA_BLOCK ) { + status =nvme_map_sgl_data (n, qsg, iov, sgld,1 , &len, req); +if (status) { + goto unmap; + } + + goto out; + } + +/* +* If the segment is located in the CMB, the submission queue of the +* request must also reside there. +*/ +if (nvme_addr_is_cmb (n, addr)) { +if (!nvme_addr_is_cmb (n, req->sq->dma_addr)) { +return NVME_INVALID_USE_OF_CMB |NVME_DNR ; + } + + sgl_in_cmb = true; + } + +for (;;) { +switch (NVME_SGL_TYPE (sgld->type)) { +case NVME_SGL_DESCR_TYPE_SEGMENT : +case NVME_SGL_DESCR_TYPE_LAST_SEGMENT : +break ; +default : +return NVME_INVALID_SGL_SEG_DESCR |NVME_DNR ; + } + + seg_len =le32_to_cpu (sgld->len); + +/* check the length of the (Last) Segment descriptor */ +if (!seg_len || seg_len &0xf ) { +return NVME_INVALID_SGL_SEG_DESCR |NVME_DNR ; + } + +if (UINT64_MAX - addr < seg_len) { +return NVME_DATA_SGL_LEN_INVALID |NVME_DNR ; + } + + nsgld = seg_len /sizeof (NvmeSglDescriptor); + +while (nsgld >SEG_CHUNK_SIZE ) { +if (nvme_addr_read (n, addr, segment,sizeof (segment))) { +trace_pci_nvme_err_addr_read (addr); + status =NVME_DATA_TRANSFER_ERROR ; + goto unmap; + } + + status =nvme_map_sgl_data (n, qsg, iov, segment,SEG_CHUNK_SIZE , + &len, req); +if (status) { + goto unmap; + } + + nsgld -=SEG_CHUNK_SIZE ; + addr +=SEG_CHUNK_SIZE *sizeof (NvmeSglDescriptor); + } + + ret =nvme_addr_read (n, addr, segment, nsgld * +sizeof (NvmeSglDescriptor)); +if (ret) { +trace_pci_nvme_err_addr_read (addr); + status =NVME_DATA_TRANSFER_ERROR ; + goto unmap; + } + + last_sgld = &segment[nsgld -1 ]; + +/* if the segment ends with a Data Block, then we are done */ +if (NVME_SGL_TYPE (last_sgld->type) ==NVME_SGL_DESCR_TYPE_DATA_BLOCK ) { + status =nvme_map_sgl_data (n, qsg, iov, segment, nsgld, &len, req); +if (status) { + goto unmap; + } + + goto out; + } + +/* +* If the last descriptor was not a Data Block, then the current +* segment must not be a Last Segment. +*/ +if (NVME_SGL_TYPE (sgld->type) ==NVME_SGL_DESCR_TYPE_LAST_SEGMENT ) { + status =NVME_INVALID_SGL_SEG_DESCR |NVME_DNR ; + goto unmap; + } + + sgld = last_sgld; + addr =le64_to_cpu (sgld->addr); + +/* +* Do not map the last descriptor; it will be a Segment or Last Segment +* descriptor and is handled by the next iteration. +*/ + status =nvme_map_sgl_data (n, qsg, iov, segment, nsgld -1 , &len, req); +if (status) { + goto unmap; + } + +/* +* If the next segment is in the CMB, make sure that the sgl was +* already located there. +*/ +if (sgl_in_cmb !=nvme_addr_is_cmb (n, addr)) { + status =NVME_INVALID_USE_OF_CMB |NVME_DNR ; + goto unmap; + } + } + +out: +/* if there is any residual left in len, the SGL was too short */ +if (len) { + status =NVME_DATA_SGL_LEN_INVALID |NVME_DNR ; + goto unmap; + } + +return NVME_SUCCESS ; + +unmap: +if (iov->iov) { +qemu_iovec_destroy (iov); + } + +if (qsg->sg) { +qemu_sglist_destroy (qsg); + } + +return status; +} + +static uint16_t nvme_map_dptr (NvmeCtrl *n,size_t len,NvmeRequest *req) +{ +uint64_t prp1, prp2; + +switch (NVME_CMD_FLAGS_PSDT (req->cmd.flags)) { +case NVME_PSDT_PRP : + prp1 =le64_to_cpu (req->cmd.dptr.prp1); + prp2 =le64_to_cpu (req->cmd.dptr.prp2); + +return nvme_map_prp (n, prp1, prp2, len, req); +case NVME_PSDT_SGL_MPTR_CONTIGUOUS : +case NVME_PSDT_SGL_MPTR_SGL : +/* SGLs shall not be used for Admin commands in NVMe over PCIe */ +if (!req->sq->sqid) { +return NVME_INVALID_FIELD |NVME_DNR ; + } + +return nvme_map_sgl (n, &req->qsg, &req->iov, req->cmd.dptr.sgl, len, + req); +default : +return NVME_INVALID_FIELD ; + } +} + +static uint16_t nvme_dma (NvmeCtrl *n,uint8_t *ptr,uint32_t len, +DMADirection dir,NvmeRequest *req) {uint16_t status =NVME_SUCCESS ; - status =nvme_map_prp (n, prp1, prp2, len, req); + status =nvme_map_dptr (n, len, req);if (status) {return status; }
@@ -459,15 +708,6 @@ static uint16_t nvme_dma_prp(NvmeCtrl *n, uint8_t *ptr, uint32_t len,return status; } -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); - -return nvme_map_prp (n, prp1, prp2, len, req); -} -static void nvme_post_cqes (void *opaque) {NvmeCQueue *cq = opaque;
@@ -994,10 +1234,7 @@ static uint16_t nvme_create_sq(NvmeCtrl *n, 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); +uint32_t nsid =le32_to_cpu (req->cmd.nsid);uint32_t trans_len;time_t current_ms;
@@ -1046,17 +1283,14 @@ static uint16_t nvme_smart_info(NvmeCtrl *n, uint8_t rae, uint32_t buf_len,nvme_clear_events (n,NVME_AER_TYPE_SMART ); } -return nvme_dma_prp (n, (uint8_t *) &smart + off, trans_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE , req); +return nvme_dma (n, (uint8_t *) &smart + off, trans_len, +DMA_DIRECTION_FROM_DEVICE , 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 = { .afi =0x1 , };
@@ -1069,17 +1303,14 @@ 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 , req); +return nvme_dma (n, (uint8_t *) &fw_log + off, trans_len, +DMA_DIRECTION_FROM_DEVICE , 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;if (!rae) {
@@ -1094,8 +1325,8 @@ 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 , req); +return nvme_dma (n, (uint8_t *)&errlog, trans_len, +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_get_log (NvmeCtrl *n,NvmeRequest *req)
@@ -1255,14 +1486,10 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req)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); -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 , req); +return nvme_dma (n, (uint8_t *)&n->id_ctrl,sizeof (n->id_ctrl), +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_identify_ns (NvmeCtrl *n,NvmeRequest *req)
@@ -1270,8 +1497,6 @@ 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);trace_pci_nvme_identify_ns (nsid);
@@ -1282,8 +1507,8 @@ 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 , req); +return nvme_dma (n, (uint8_t *)&ns->id_ns,sizeof (ns->id_ns), +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_identify_nslist (NvmeCtrl *n,NvmeRequest *req)
@@ -1291,8 +1516,6 @@ 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); -uint64_t prp2 =le64_to_cpu (c->prp2);uint32_t *list;uint16_t ret;int i, j =0 ;
@@ -1319,8 +1542,8 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req)break ; } } - ret =nvme_dma_prp (n, (uint8_t *)list, data_len, prp1, prp2, -DMA_DIRECTION_FROM_DEVICE , req); + ret =nvme_dma (n, (uint8_t *)list, data_len,DMA_DIRECTION_FROM_DEVICE , + req);g_free (list);return ret; }
@@ -1329,8 +1552,6 @@ 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);uint8_t list[NVME_IDENTIFY_DATA_SIZE ];
@@ -1362,8 +1583,8 @@ static uint16_t nvme_identify_ns_descr_list(NvmeCtrl *n, NvmeRequest *req) ns_descrs->uuid.hdr.nidl =NVME_NIDT_UUID_LEN ;stl_be_p (&ns_descrs->uuid.v, nsid); -return nvme_dma_prp (n, list,NVME_IDENTIFY_DATA_SIZE , prp1, prp2, -DMA_DIRECTION_FROM_DEVICE , req); +return nvme_dma (n, list,NVME_IDENTIFY_DATA_SIZE , +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_identify (NvmeCtrl *n,NvmeRequest *req)
@@ -1439,14 +1660,10 @@ static inline uint64_t nvme_get_timestamp(const NvmeCtrl *n)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); -uint64_t timestamp =nvme_get_timestamp (n); -return nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, - prp2,DMA_DIRECTION_FROM_DEVICE , req); +return nvme_dma (n, (uint8_t *)×tamp,sizeof (timestamp), +DMA_DIRECTION_FROM_DEVICE , req); }static uint16_t nvme_get_feature (NvmeCtrl *n,NvmeRequest *req)
@@ -1575,12 +1792,9 @@ 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); - ret =nvme_dma_prp (n, (uint8_t *)×tamp,sizeof (timestamp), prp1, - prp2,DMA_DIRECTION_TO_DEVICE , req); + ret =nvme_dma (n, (uint8_t *)×tamp,sizeof (timestamp), +DMA_DIRECTION_TO_DEVICE , req);if (ret !=NVME_SUCCESS ) {return ret; }
@@ -2507,6 +2721,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROES |NVME_ONCS_TIMESTAMP |NVME_ONCS_FEATURES ); + id->sgls =cpu_to_le32 (NVME_CTRL_SGLS_SUPPORT_NO_ALIGN ); subnqn =g_strdup_printf ("nqn.2019-08.org.qemu:%s" , n->params.serial);strpadcpy ((char *)id->subnqn,sizeof (id->subnqn), subnqn,'\0' );
hw/block/trace-events +4 -0
@@ -36,6 +36,7 @@ pci_nvme_dma_read(uint64_t prp1, uint64_t prp2) "DMA read, prp1=0x%"PRIx64" prp2 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_map_sgl(uint16_t cid, uint8_t typ, uint64_t len) "cid %"PRIu16" type 0x%"PRIx8" len %"PRIu64"" pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" \"%s\" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64""
@@ -91,6 +92,9 @@ pci_nvme_err_mdts(uint16_t cid, size_t len) "cid %"PRIu16" len %zu" pci_nvme_err_addr_read(uint64_t addr) "addr 0x%"PRIx64"" pci_nvme_err_addr_write(uint64_t addr) "addr 0x%"PRIx64"" pci_nvme_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"" +pci_nvme_err_invalid_sgld(uint16_t cid, uint8_t typ) "cid %"PRIu16" type 0x%"PRIx8"" +pci_nvme_err_invalid_num_sgld(uint16_t cid, uint8_t typ) "cid %"PRIu16" type 0x%"PRIx8"" +pci_nvme_err_invalid_sgl_excess_length(uint16_t cid) "cid %"PRIu16"" 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""
include/block/nvme.h +3 -3
@@ -412,9 +412,9 @@ typedef union NvmeCmdDptr { } NvmeCmdDptr;enum NvmePsdt { -PSDT_PRP =0x0 , -PSDT_SGL_MPTR_CONTIGUOUS =0x1 , -PSDT_SGL_MPTR_SGL =0x2 , +NVME_PSDT_PRP =0x0 , +NVME_PSDT_SGL_MPTR_CONTIGUOUS =0x1 , +NVME_PSDT_SGL_MPTR_SGL =0x2 , }; typedef struct QEMU_PACKED NvmeCmd {
Signature · 1 line
2.28.0
PATCH 13/17 hw/block/nvme: add support for sgl bit bucket descriptor
In reply to Klaus JensenFrom: Gollu Appalanaidu <[email protected]>
This adds support for SGL descriptor type 0x1 (bit bucket descriptor). See the NVM Express v1.3d specification, Section 4.4 ("Scatter Gather List (SGL)").
--- hw/block/nvme.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-)
hw/block/nvme.c +27 -6
@@ -431,6 +431,10 @@ static uint16_t nvme_map_sgl_data(NvmeCtrl *n, QEMUSGList *qsg,uint8_t type =NVME_SGL_TYPE (segment[i].type);switch (type) { +case NVME_SGL_DESCR_TYPE_BIT_BUCKET : +if (req->cmd.opcode ==NVME_CMD_WRITE ) { +continue ; + }case NVME_SGL_DESCR_TYPE_DATA_BLOCK :break ;case NVME_SGL_DESCR_TYPE_SEGMENT :
@@ -441,6 +445,7 @@ static uint16_t nvme_map_sgl_data(NvmeCtrl *n, QEMUSGList *qsg, } dlen =le32_to_cpu (segment[i].len); +if (!dlen) {continue ; }
@@ -461,6 +466,11 @@ static uint16_t nvme_map_sgl_data(NvmeCtrl *n, QEMUSGList *qsg, } trans_len =MIN (*len, dlen); + +if (type ==NVME_SGL_DESCR_TYPE_BIT_BUCKET ) { + goto next; + } + addr =le64_to_cpu (segment[i].addr);if (UINT64_MAX - addr < dlen) {
@@ -472,6 +482,7 @@ static uint16_t nvme_map_sgl_data(NvmeCtrl *n, QEMUSGList *qsg,return status; } +next: *len -= trans_len; }
@@ -541,7 +552,8 @@ static uint16_t nvme_map_sgl(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, seg_len =le32_to_cpu (sgld->len);/* check the length of the (Last) Segment descriptor */ -if (!seg_len || seg_len &0xf ) { +if ((!seg_len || seg_len &0xf ) && + (NVME_SGL_TYPE (sgld->type) !=NVME_SGL_DESCR_TYPE_BIT_BUCKET )) {return NVME_INVALID_SGL_SEG_DESCR |NVME_DNR ; }
@@ -578,19 +590,27 @@ static uint16_t nvme_map_sgl(NvmeCtrl *n, QEMUSGList *qsg, QEMUIOVector *iov, last_sgld = &segment[nsgld -1 ]; -/* if the segment ends with a Data Block, then we are done */ -if (NVME_SGL_TYPE (last_sgld->type) ==NVME_SGL_DESCR_TYPE_DATA_BLOCK ) { +/* +* If the segment ends with a Data Block or Bit Bucket Descriptor Type, +* then we are done. +*/ +switch (NVME_SGL_TYPE (last_sgld->type)) { +case NVME_SGL_DESCR_TYPE_DATA_BLOCK : +case NVME_SGL_DESCR_TYPE_BIT_BUCKET : status =nvme_map_sgl_data (n, qsg, iov, segment, nsgld, &len, req);if (status) { goto unmap; } goto out; + +default : +break ; }/* -* If the last descriptor was not a Data Block, then the current -* segment must not be a Last Segment. +* If the last descriptor was not a Data Block or Bit Bucket, then the +* current segment must not be a Last Segment. */ if (NVME_SGL_TYPE (sgld->type) ==NVME_SGL_DESCR_TYPE_LAST_SEGMENT ) { status =NVME_INVALID_SGL_SEG_DESCR |NVME_DNR ;
@@ -2721,7 +2741,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev) id->nn =cpu_to_le32 (n->num_namespaces); id->oncs =cpu_to_le16 (NVME_ONCS_WRITE_ZEROES |NVME_ONCS_TIMESTAMP |NVME_ONCS_FEATURES ); - id->sgls =cpu_to_le32 (NVME_CTRL_SGLS_SUPPORT_NO_ALIGN ); + id->sgls =cpu_to_le32 (NVME_CTRL_SGLS_SUPPORT_NO_ALIGN | +NVME_CTRL_SGLS_BITBUCKET ); subnqn =g_strdup_printf ("nqn.2019-08.org.qemu:%s" , n->params.serial);strpadcpy ((char *)id->subnqn,sizeof (id->subnqn), subnqn,'\0' );
Signature · 1 line
2.28.0
PATCH 14/17 hw/block/nvme: refactor identify active namespace id list
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
Prepare to support inactive namespaces.
--- hw/block/nvme.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/block/nvme.c +4 -4
@@ -1538,7 +1538,7 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req)uint32_t min_nsid =le32_to_cpu (c->nsid);uint32_t *list;uint16_t ret; -int i, j =0 ; +int j =0 ;trace_pci_nvme_identify_nslist (min_nsid);
@@ -1553,11 +1553,11 @@ static uint16_t nvme_identify_nslist(NvmeCtrl *n, NvmeRequest *req) } list =g_malloc0 (data_len); -for (i =0 ; i < n->num_namespaces; i++) { -if (i < min_nsid) { +for (int i =1 ; i <= n->num_namespaces; i++) { +if (i <= min_nsid) {continue ; } - list[j++] =cpu_to_le32 (i +1 ); + list[j++] =cpu_to_le32 (i);if (j == data_len /sizeof (uint32_t )) {break ; }
Signature · 1 line
2.28.0
PATCH 15/17 hw/block/nvme: support multiple namespaces
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
This adds support for multiple namespaces by introducing a new 'nvme-ns' device model. The nvme device creates a bus named from the device name ('id'). The nvme-ns devices then connect to this and registers themselves with the nvme device.
This changes how an nvme device is created. Example with two namespaces:
-drive file=nvme0n1.img,if=none,id=disk1
-drive file=nvme0n2.img,if=none,id=disk2
-device nvme,serial=deadbeef,id=nvme0
-device nvme-ns,drive=disk1,bus=nvme0,nsid=1
-device nvme-ns,drive=disk2,bus=nvme0,nsid=2
The drive property is kept on the nvme device to keep the change backward compatible, but the property is now optional. Specifying a drive for the nvme device will always create the namespace with nsid 1.
--- hw/block/meson.build | 2 +- hw/block/nvme-ns.c | 185 +++++++++++++++++++++++++++++++ hw/block/nvme-ns.h | 74 +++++++++++++ hw/block/nvme.c | 247 +++++++++++++++++++++++++++--------------- hw/block/nvme.h | 46 ++++---- hw/block/trace-events | 8 +- 6 files changed, 447 insertions(+), 115 deletions(-) create mode 100644 hw/block/nvme-ns.c create mode 100644 hw/block/nvme-ns.h
hw/block/meson.build +1 -1
@@ -13,7 +13,7 @@ softmmu_ss.add(when: 'CONFIG_SSI_M25P80', if_true: files('m25p80.c')) softmmu_ss.add(when: 'CONFIG_SWIM', if_true: files('swim.c')) softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen-block.c')) softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('tc58128.c')) -softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c')) +softmmu_ss.add(when: 'CONFIG_NVME_PCI', if_true: files('nvme.c', 'nvme-ns.c')) specific_ss.add(when: 'CONFIG_VIRTIO_BLK', if_true: files('virtio-blk.c')) specific_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk.c'))
hw/block/nvme-ns.c new file +185 -0
185 lines not on this page · raw message
hw/block/nvme-ns.h new file +74 -0
74 lines not on this page · raw message
hw/block/nvme.c +162 -85
511 lines not on this page · raw message
hw/block/nvme.h +21 -25
95 lines not on this page · raw message
hw/block/trace-events +4 -4
@@ -29,6 +29,7 @@ hd_geometry_guess(void *blk, uint32_t cyls, uint32_t heads, uint32_t secs, int t # nvme.c # nvme traces for successful events +pci_nvme_register_namespace(uint32_t nsid) "nsid %"PRIu32"" 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"
@@ -39,11 +40,11 @@ pci_nvme_map_prp(uint64_t trans_len, uint32_t len, uint64_t prp1, uint64_t prp2, pci_nvme_map_sgl(uint16_t cid, uint8_t typ, uint64_t len) "cid %"PRIu16" type 0x%"PRIx8" len %"PRIu64"" pci_nvme_io_cmd(uint16_t cid, uint32_t nsid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" nsid %"PRIu32" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" pci_nvme_admin_cmd(uint16_t cid, uint16_t sqid, uint8_t opcode, const char *opname) "cid %"PRIu16" sqid %"PRIu16" opc 0x%"PRIx8" opname \"%s\"" -pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" \"%s\" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" +pci_nvme_rw(uint16_t cid, const char *verb, uint32_t nsid, uint32_t nlb, uint64_t count, uint64_t lba) "cid %"PRIu16" opname \"%s\" nsid %"PRIu32" nlb %"PRIu32" count %"PRIu64" lba 0x%"PRIx64"" +pci_nvme_rw_cb(uint16_t cid, uint32_t nsid) "cid %"PRIu16" nsid %"PRIu32"" +pci_nvme_write_zeroes(uint16_t cid, uint32_t nsid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" nsid %"PRIu32" slba %"PRIu64" nlb %"PRIu32"" pci_nvme_aio_add(uint16_t cid, void *aio, const char *blkname, uint64_t offset, uint64_t len, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" len %"PRIu64" opc \"%s\" req %p" pci_nvme_aio_cb(uint16_t cid, void *aio, const char *blkname, uint64_t offset, uint64_t len, const char *opc, void *req) "cid %"PRIu16" aio %p blk \"%s\" offset %"PRIu64" len %"PRIu64" opc \"%s\" req %p" -pci_nvme_rw_cb(uint16_t cid) "cid %"PRIu16"" -pci_nvme_write_zeroes(uint16_t cid, uint64_t slba, uint32_t nlb) "cid %"PRIu16" slba %"PRIu64" nlb %"PRIu32"" pci_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"" pci_nvme_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" pci_nvme_del_sq(uint16_t qid) "deleting submission queue sqid=%"PRIu16""
@@ -100,7 +101,6 @@ pci_nvme_err_invalid_prplist_ent(uint64_t prplist) "PRP list entry is null or no pci_nvme_err_invalid_prp2_align(uint64_t prp2) "PRP2 is not page aligned: 0x%"PRIx64"" pci_nvme_err_invalid_prp2_missing(void) "PRP2 is null and more data to be transferred" pci_nvme_err_invalid_prp(void) "invalid PRP" -pci_nvme_err_invalid_ns(uint32_t ns, uint32_t limit) "invalid namespace %u not within 1-%u" pci_nvme_err_invalid_opc(uint8_t opc) "invalid opcode 0x%"PRIx8"" pci_nvme_err_invalid_admin_opc(uint8_t opc) "invalid admin opcode 0x%"PRIx8"" pci_nvme_err_invalid_lba_range(uint64_t start, uint64_t len, uint64_t limit) "Invalid LBA start=%"PRIu64" len=%"PRIu64" limit=%"PRIu64""
Signature · 1 line
2.28.0
PATCH 16/17 pci: allocate pci id for nvme
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
The emulated nvme device (hw/block/nvme.c) is currently using an internal Intel device id.
Prepare to change that by allocating a device id under the 1b36 (Red Hat, Inc.) vendor id.
--- MAINTAINERS | 1 + docs/specs/nvme.txt | 23 +++++++++++++++++++++++ docs/specs/pci-ids.txt | 1 + include/hw/pci/pci.h | 1 + 4 files changed, 26 insertions(+) create mode 100644 docs/specs/nvme.txt
MAINTAINERS +1 -0
@@ -1861,6 +1861,7 @@ L: [email protected] S: Supported F: hw/block/nvme* F: tests/qtest/nvme-test.c +F: docs/specs/nvme.txt T: git git://git.infradead.org/qemu-nvme.git nvme-next megasas
docs/specs/nvme.txt new file +23 -0
@@ -0,0 +1,23 @@ +NVM Express Controller +====================== + +The nvme device (-device nvme) emulates an NVM Express Controller. + + +Reference Specifications +------------------------ + +The device currently implements most mandatory features of NVMe v1.3d, see + + https://nvmexpress.org/resources/specifications/ + +for the specification. + + +Known issues +------------ + +* The accounting numbers in the SMART/Health are reset across power cycles + +* Interrupt Coalescing is not supported and is disabled by default in volation + of the specification.
docs/specs/pci-ids.txt +1 -0
@@ -63,6 +63,7 @@ PCI devices (other than virtio): 1b36:000b PCIe Expander Bridge (-device pxb-pcie) 1b36:000d PCI xhci usb host adapter 1b36:000f mdpy (mdev sample device), linux/samples/vfio-mdev/mdpy.c +1b36:0010 PCIe NVMe device (-device nvme) All these devices are documented in docs/specs.
include/hw/pci/pci.h +1 -0
@@ -105,6 +105,7 @@ extern bool pci_available;#define PCI_DEVICE_ID_REDHAT_XHCI 0x000d#define PCI_DEVICE_ID_REDHAT_PCIE_BRIDGE 0x000e#define PCI_DEVICE_ID_REDHAT_MDPY 0x000f +#define PCI_DEVICE_ID_REDHAT_NVME 0x0010#define PCI_DEVICE_ID_REDHAT_QXL 0x0100#define FMT_PCIBUS PRIx64
Signature · 1 line
2.28.0
PATCH 17/17 hw/block/nvme: change controller pci id
In reply to Klaus JensenFrom: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.
As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
--- hw/block/nvme.c | 12 ++++++++++-- hw/block/nvme.h | 1 + hw/core/machine.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-)
hw/block/nvme.c +10 -2
@@ -2749,6 +2749,15 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_conf,0x2 ); + +if (n->params.use_intel_id) { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5846 ); + }else { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_REDHAT ); +pci_config_set_device_id (pci_conf,PCI_DEVICE_ID_REDHAT_NVME ); + } +pci_config_set_class (pci_conf,PCI_CLASS_STORAGE_EXPRESS );pcie_endpoint_cap_init (pci_dev,0x80 );
@@ -2903,6 +2912,7 @@ static Property nvme_props[] = {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_BOOL ("x-use-intel-id" , NvmeCtrl, params.use_intel_id, false), DEFINE_PROP_END_OF_LIST(), };
@@ -2919,8 +2929,6 @@ static void nvme_class_init(ObjectClass *oc, void *data) pc->realize = nvme_realize; pc->exit = nvme_exit; pc->class_id =PCI_CLASS_STORAGE_EXPRESS ; - pc->vendor_id =PCI_VENDOR_ID_INTEL ; - pc->device_id =0x5845 ; pc->revision =2 ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories);
hw/block/nvme.h +1 -0
@@ -15,6 +15,7 @@ typedef struct NvmeParams {uint8_t aerl;uint32_t aer_max_queued;uint8_t mdts; +bool use_intel_id; } NvmeParams; typedef struct NvmeAsyncEvent {
hw/core/machine.c +1 -0
@@ -34,6 +34,7 @@ GlobalProperty hw_compat_5_1[] = { { "vhost-user-scsi", "num_queues", "1"}, { "virtio-blk-device", "num-queues", "1"}, { "virtio-scsi-device", "num_queues", "1"}, + { "nvme", "x-use-intel-id", "on"}, };const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1);
Signature · 1 line
2.28.0
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
+David in case
Quoted 10 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.
Quoted 7 lines
As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Quoted 72 lines
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 12 ++++++++++-- hw/block/nvme.h | 1 + hw/core/machine.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-)hw/block/nvme.c +10
-2@@ -2749,6 +2749,15 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_conf,0x2 ); + +if (n->params.use_intel_id) { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5846 ); + }else { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_REDHAT ); +pci_config_set_device_id (pci_conf,PCI_DEVICE_ID_REDHAT_NVME ); + } +pci_config_set_class (pci_conf,PCI_CLASS_STORAGE_EXPRESS );pcie_endpoint_cap_init (pci_dev,0x80 );@@ -2903,6 +2912,7 @@ static Property nvme_props[] = {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_BOOL ("x-use-intel-id" , NvmeCtrl, params.use_intel_id, false), DEFINE_PROP_END_OF_LIST(), };@@ -2919,8 +2929,6 @@ static void nvme_class_init(ObjectClass *oc, void *data) pc->realize = nvme_realize; pc->exit = nvme_exit; pc->class_id =PCI_CLASS_STORAGE_EXPRESS ; - pc->vendor_id =PCI_VENDOR_ID_INTEL ; - pc->device_id =0x5845 ; pc->revision =2 ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories);hw/block/nvme.h +1
-0@@ -15,6 +15,7 @@ typedef struct NvmeParams {uint8_t aerl;uint32_t aer_max_queued;uint8_t mdts; +bool use_intel_id; } NvmeParams; typedef struct NvmeAsyncEvent {hw/core/machine.c +1
-0@@ -34,6 +34,7 @@ GlobalProperty hw_compat_5_1[] = { { "vhost-user-scsi", "num_queues", "1"}, { "virtio-blk-device", "num-queues", "1"}, { "virtio-scsi-device", "num_queues", "1"}, + { "nvme", "x-use-intel-id", "on"}, };const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1);
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 16 lines · Philippe Mathieu-Daudé
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 9 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Yes, the kernel will then just apply unneccesary quirks, these are:
1. NVME_QUIRK_IDENTIFY_CNS which says that the device does not support anything else than values 0x0 and 0x1 for CNS (Identify Namespace and Identify Namespace). With multiple namespace support, this just means that the kernel will "scan" namespaces instead of using "Active Namespace ID list" (CNS 0x2).
2. NVME_QUIRK_DISABLE_WRITE_ZEROES. The nvme device started out with a broken Write Zeroes implementation which has since been fixed in commit 9d6459d21a6e ("nvme: fix write zeroes offset and count").
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 35 lines · Klaus Jensen
Quoted 16 lines · Philippe Mathieu-Daudé
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 9 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Yes, the kernel will then just apply unneccesary quirks, these are:
1.
NVME_QUIRK_IDENTIFY_CNSwhich says that the device does not support anything else than values0x0and0x1for CNS (Identify Namespace and Identify Namespace). With multiple namespace support, this just means that the kernel will "scan" namespaces instead of using "Active Namespace ID list" (CNS0x2).
Quoted 3 lines
2.
NVME_QUIRK_DISABLE_WRITE_ZEROES. The nvme device started out with a broken Write Zeroes implementation which has since been fixed in commit9d6459d21a6e("nvme: fix write zeroes offset and count").
OK thanks. Can you amend that information in the commit description please?
Thanks,
Phil.
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 36 lines · Philippe Mathieu-Daudé
Quoted 35 lines · Klaus Jensen
Quoted 16 lines · Philippe Mathieu-Daudé
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 9 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Yes, the kernel will then just apply unneccesary quirks, these are:
1.
NVME_QUIRK_IDENTIFY_CNSwhich says that the device does not support anything else than values0x0and0x1for CNS (Identify Namespace and Identify Namespace). With multiple namespace support, this just means that the kernel will "scan" namespaces instead of using "Active Namespace ID list" (CNS0x2).
Quoted 7 lines
Quoted 3 lines
2.
NVME_QUIRK_DISABLE_WRITE_ZEROES. The nvme device started out with a broken Write Zeroes implementation which has since been fixed in commit9d6459d21a6e("nvme: fix write zeroes offset and count").OK thanks. Can you amend that information in the commit description please?
Yes, absolutely.
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 41 lines · Klaus Jensen
Quoted 40 lines · Philippe Mathieu-Daudé
Quoted 38 lines · Klaus Jensen
Quoted 16 lines · Philippe Mathieu-Daudé
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 9 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Yes, the kernel will then just apply unneccesary quirks, these are:
1.
NVME_QUIRK_IDENTIFY_CNSwhich says that the device does not support anything else than values0x0and0x1for CNS (Identify Namespace and Identify Namespace). With multiple namespace support, this just means that the kernel will "scan" namespaces instead of using "Active Namespace ID list" (CNS0x2).2.
NVME_QUIRK_DISABLE_WRITE_ZEROES. The nvme device started out with a broken Write Zeroes implementation which has since been fixed in commit9d6459d21a6e("nvme: fix write zeroes offset and count").
Quoted 5 lines
Quoted 3 lines
OK thanks. Can you amend that information in the commit description please?
Yes, absolutely.
By the way. Is it correct use of an 'x-' parameter here - since it is something that we might remove in the future? I was unable to find any documentation on the purpose of the 'x-' prefix, but I was guessing it was for stuff like this.
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 46 lines · Klaus Jensen
Quoted 45 lines · Klaus Jensen
Quoted 43 lines · Philippe Mathieu-Daudé
Quoted 35 lines · Klaus Jensen
Quoted 16 lines · Philippe Mathieu-Daudé
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 9 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Yes, the kernel will then just apply unneccesary quirks, these are:
1.
NVME_QUIRK_IDENTIFY_CNSwhich says that the device does not support anything else than values0x0and0x1for CNS (Identify Namespace and Identify Namespace). With multiple namespace support, this just means that the kernel will "scan" namespaces instead of using "Active Namespace ID list" (CNS0x2).Quoted 3 lines
2.
NVME_QUIRK_DISABLE_WRITE_ZEROES. The nvme device started out with a broken Write Zeroes implementation which has since been fixed in commit9d6459d21a6e("nvme: fix write zeroes offset and count").OK thanks. Can you amend that information in the commit description please?
Quoted 6 lines
Quoted 1 line
Yes, absolutely.
By the way. Is it correct use of an 'x-' parameter here - since it is something that we might remove in the future? I was unable to find any documentation on the purpose of the 'x-' prefix, but I was guessing it was for stuff like this.
Probably not. 'x-' is for unstable debugging/testing features.
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
In reply to Philippe Mathieu-DaudéQuoted 16 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 8 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Seems reasonable to me...but...
Quoted 16 lines
Quoted 16 lines
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 12 ++++++++++-- hw/block/nvme.h | 1 + hw/core/machine.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-)hw/block/nvme.c +0
-0@@ -2749,6 +2749,15 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
Quoted 6 lines
hw/block/nvme.c static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) · line 2755
Quoted 6 lines
hw/block/nvme.c +4
-0pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_conf,0x2 ); + +if (n->params.use_intel_id) { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5846 );
Wasn't that magic number 5845 down there ?
Dave
Quoted 51 lines
Quoted 50 lines
hw/block/nvme.c +6
-2+ }else { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_REDHAT ); +pci_config_set_device_id (pci_conf,PCI_DEVICE_ID_REDHAT_NVME ); + } +pci_config_set_class (pci_conf,PCI_CLASS_STORAGE_EXPRESS );pcie_endpoint_cap_init (pci_dev,0x80 );@@ -2903,6 +2912,7 @@ static Property nvme_props[] = {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_BOOL ("x-use-intel-id" , NvmeCtrl, params.use_intel_id, false), DEFINE_PROP_END_OF_LIST(), };@@ -2919,8 +2929,6 @@ static void nvme_class_init(ObjectClass *oc, void *data) pc->realize = nvme_realize; pc->exit = nvme_exit; pc->class_id =PCI_CLASS_STORAGE_EXPRESS ; - pc->vendor_id =PCI_VENDOR_ID_INTEL ; - pc->device_id =0x5845 ; pc->revision =2 ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories);hw/block/nvme.h +1
-0@@ -15,6 +15,7 @@ typedef struct NvmeParams {uint8_t aerl;uint32_t aer_max_queued;uint8_t mdts; +bool use_intel_id; } NvmeParams; typedef struct NvmeAsyncEvent {hw/core/machine.c +1
-0@@ -34,6 +34,7 @@ GlobalProperty hw_compat_5_1[] = { { "vhost-user-scsi", "num_queues", "1"}, { "virtio-blk-device", "num-queues", "1"}, { "virtio-scsi-device", "num_queues", "1"}, + { "nvme", "x-use-intel-id", "on"}, };const size_t hw_compat_5_1_len =G_N_ELEMENTS (hw_compat_5_1);
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 44 lines · Dr. David Alan Gilbert
Quoted 16 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 8 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Seems reasonable to me...but...
Quoted 16 lines
Quoted 16 lines
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 12 ++++++++++-- hw/block/nvme.h | 1 + hw/core/machine.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-)hw/block/nvme.c +0
-0@@ -2749,6 +2749,15 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)
Quoted 9 lines
Quoted 6 lines
hw/block/nvme.c static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) · line 2755
Quoted 6 lines
hw/block/nvme.c +4
-0pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_conf,0x2 ); + +if (n->params.use_intel_id) { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5846 );Wasn't that magic number 5845 down there ?
Argh! My first version of this just bumbed the intel device id and it got left there.
Good find! Thank you!
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 55 lines · * Klaus Jensen ([email protected]) wrote:
Quoted 44 lines · Dr. David Alan Gilbert
Quoted 16 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 8 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Seems reasonable to me...but...
Quoted 16 lines
Quoted 16 lines
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 12 ++++++++++-- hw/block/nvme.h | 1 + hw/core/machine.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-)hw/block/nvme.c +0
-0@@ -2749,6 +2749,15 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)Quoted 9 lines
Quoted 6 lines
hw/block/nvme.c static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) · line 2755
Quoted 6 lines
hw/block/nvme.c +4
-0pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_conf,0x2 ); + +if (n->params.use_intel_id) { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5846 );Wasn't that magic number 5845 down there ?
Quoted 4 lines
Argh! My first version of this just bumbed the intel device id and it got left there.
Good find! Thank you!
It may be best to turn it into a constant in include/hw/pci/pci_ids.h if it corresponds to some real Intel device.
Dave
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 56 lines · Dr. David Alan Gilbert
Quoted 55 lines · * Klaus Jensen ([email protected]) wrote:
Quoted 53 lines · Dr. David Alan Gilbert
Quoted 16 lines · * Philippe Mathieu-Daudé ([email protected]) wrote:
+David in case
Quoted 13 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
There are two reasons for changing this:
1. The nvme device currently uses an internal Intel device id.
2. Since commits "nvme: fix write zeroes offset and count" and "nvme:
support multiple namespaces" the controller device no longer has the quirks that the Linux kernel think it has.As the quirks are applied based on pci vendor and device id, change them to get rid of the quirks.
Quoted 8 lines
Quoted 4 lines
To keep backward compatibility, add a new 'x-use-intel-id' parameter to the nvme device to force use of the Intel vendor and device id. This is off by default but add a compat property to set this for 5.1 machines and older.
So now what happens if you start a 5.1 machine with a recent kernel? Simply the kernel will use unnecessary quirks, or are there more changes in behavior?
Seems reasonable to me...but...
Quoted 16 lines
Quoted 16 lines
Signed-off-by Klaus Jensen <[email protected]>Reviewed-by Keith Busch <[email protected]>Reviewed-by Maxim Levitsky <[email protected]>--- hw/block/nvme.c | 12 ++++++++++-- hw/block/nvme.h | 1 + hw/core/machine.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-)hw/block/nvme.c +0
-0@@ -2749,6 +2749,15 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)Quoted 6 lines
hw/block/nvme.c static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) · line 2755
Quoted 6 lines
hw/block/nvme.c +4
-0pci_conf[PCI_INTERRUPT_PIN ] =1 ;pci_config_set_prog_interface (pci_conf,0x2 ); + +if (n->params.use_intel_id) { +pci_config_set_vendor_id (pci_conf,PCI_VENDOR_ID_INTEL ); +pci_config_set_device_id (pci_conf,0x5846 );Wasn't that magic number 5845 down there ?
Quoted 8 lines
Quoted 4 lines
Argh! My first version of this just bumbed the intel device id and it got left there.
Good find! Thank you!
It may be best to turn it into a constant in
include/hw/pci/pci_ids.hif it corresponds to some real Intel device.
Yes, but that is just the thing - it does not correspond to an officially allocated device; which is why I think we should leave it out of pci_ids.h.
The end goal is to get rid of its use in the code by deprecating the use-intel-id parameter in the future. I guess the parameter should just be deprecated immediately? Then we can get rid of it in, what, 5.4?
Re: [PATCH 17/17] hw/block/nvme: change controller pci id
Quoted 6 lines · Klaus Jensen
Quoted 3 lines · Dr. David Alan Gilbert
It may be best to turn it into a constant in
include/hw/pci/pci_ids.hif it corresponds to some real Intel device.
Quoted 7 lines
Yes, but that is just the thing - it does not correspond to an officially allocated device; which is why I think we should leave it out of
pci_ids.h.The end goal is to get rid of its use in the code by deprecating the use-intel-id parameter in the future. I guess the parameter should just be deprecated immediately? Then we can get rid of it in, what, 5.4?
It's not a real device yet, but it likely will not be an nvme device once a product does release with this identifier. There may be trouble with driver binding when that happens, so deprecating it here sooner than later is my preference.
Hi Klaus,
Quoted 44 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This is the next round of my patches for the nvme device.
This includes a bit of cleanup and three new features:
* refactored aio submission
This also adds support for multiple parallel AIOs per request which is in preparation for DULBE, ZNS and metadata support. If it is found controversial, it can easily be dropped from this series.* support for scatter/gather lists
* multiple namespaces support through a new nvme-ns device
Finally, the series ends with changing the PCI vendor and device ID to get rid of the internal Intel id and as a side-effect get rid of some Linux kernel quirks that no longer applies.
"pci: pass along the return value of
dma_memory_rw" has already been posted by Philippe in another series, but since it is not applied yet, I am including it here.Gollu Appalanaidu (1):
hw/block/nvme: add support for sgl bit bucket descriptorKlaus Jensen (16):
pci: pass along the return value ofdma_memory_rwhw/block/nvme: handle dma errors
hw/block/nvme: commonizenvme_rwerror handling hw/block/nvme: alignment style fixes hw/block/nvme: add a lba to bytes helper hw/block/nvme: fix endian conversion hw/block/nvme: add symbolic command name to trace events hw/block/nvme: refactor aio submission hw/block/nvme: default request status to success hw/block/nvme: support multiple parallel aios per request hw/block/nvme: harden cmb access
hw/block/nvme: add support for scatter gather lists hw/block/nvme: refactor identify active namespace id list hw/block/nvme: support multiple namespaces
pci: allocate pci id for nvme
hw/block/nvme: change controller pci id
Quoted 12 lines
MAINTAINERS | 1 + docs/specs/nvme.txt | 23 + docs/specs/pci-ids.txt | 1 + hw/block/meson.build | 2 +- hw/block/nvme-ns.c | 185 +++++++++ hw/block/nvme-ns.h | 74 ++++ hw/block/nvme.c | 923 +++++++++++++++++++++++++++++++---------- hw/block/nvme.h | 126 +++++- hw/block/trace-events | 21 +- hw/core/machine.c | 1 + include/block/nvme.h | 8 +- include/hw/pci/pci.h | 4 +-
To ease the review, consider setup'ing scripts/git.orderfile, as it avoid reviewers to scroll patches in their email client.
Thanks,
Phil.
Quoted 60 lines · Philippe Mathieu-Daudé
Hi Klaus,
Quoted 44 lines · Klaus Jensen
From: Klaus Jensen <[email protected]>
This is the next round of my patches for the nvme device.
This includes a bit of cleanup and three new features:
* refactored aio submission
This also adds support for multiple parallel AIOs per request which is in preparation for DULBE, ZNS and metadata support. If it is found controversial, it can easily be dropped from this series.* support for scatter/gather lists
* multiple namespaces support through a new nvme-ns device
Finally, the series ends with changing the PCI vendor and device ID to get rid of the internal Intel id and as a side-effect get rid of some Linux kernel quirks that no longer applies.
"pci: pass along the return value of
dma_memory_rw" has already been posted by Philippe in another series, but since it is not applied yet, I am including it here.Gollu Appalanaidu (1):
hw/block/nvme: add support for sgl bit bucket descriptorKlaus Jensen (16):
pci: pass along the return value ofdma_memory_rwhw/block/nvme: handle dma errors
hw/block/nvme: commonizenvme_rwerror handling hw/block/nvme: alignment style fixes hw/block/nvme: add a lba to bytes helper hw/block/nvme: fix endian conversion hw/block/nvme: add symbolic command name to trace events hw/block/nvme: refactor aio submission hw/block/nvme: default request status to success hw/block/nvme: support multiple parallel aios per request hw/block/nvme: harden cmb access
hw/block/nvme: add support for scatter gather lists hw/block/nvme: refactor identify active namespace id list hw/block/nvme: support multiple namespaces
pci: allocate pci id for nvme
hw/block/nvme: change controller pci idQuoted 12 lines
MAINTAINERS | 1 + docs/specs/nvme.txt | 23 + docs/specs/pci-ids.txt | 1 + hw/block/meson.build | 2 +- hw/block/nvme-ns.c | 185 +++++++++ hw/block/nvme-ns.h | 74 ++++ hw/block/nvme.c | 923 +++++++++++++++++++++++++++++++---------- hw/block/nvme.h | 126 +++++- hw/block/trace-events | 21 +- hw/core/machine.c | 1 + include/block/nvme.h | 8 +- include/hw/pci/pci.h | 4 +-
Quoted 3 lines
To ease the review, consider setup'ing
scripts/git.orderfile, as it avoid reviewers to scroll patches in their email client.
Oh wow. You learn something new everyday. That's really neat!
Thanks!