block/nvme: Fix Aarch64 or big-endian hosts
v2 cover block/nvme: Fix Aarch64 or big-endian hosts
Add a bit of tracing, clean around to finally fix few bugs. In particular, restore NVMe on Aarch64 host.
Since v1:
- addressed Stefan and Eric review comments
- dropped unnecessary patches
- added BE fix reported by Keith
Patches missing review: #10, #24, #25
Supersedes: <[email protected]>
Eric Auger (4):
block/nvme: Change size and alignment of IDENTIFY response buffer block/nvme: Change size and alignment of queue block/nvme: Change size and alignment of prp_list_pages block/nvme: Align iov's va and size on host page size
Philippe Mathieu-Daudé (21):
MAINTAINERS: Cover 'block/nvme.h' file
block/nvme: Use hex format to display offset in trace events block/nvme: Report warning with warn_report()
block/nvme: Trace controller capabilities
block/nvme: Trace nvme_poll_queue() per queue
block/nvme: Improve nvme_free_req_queue_wait() trace information block/nvme: Trace queue pair creation/deletion
block/nvme: Move definitions before structure declarations block/nvme: Use unsigned integer for queue counter/size block/nvme: Make nvme_identify() return boolean indicating error block/nvme: Make nvme_init_queue() return boolean indicating error block/nvme: Introduce Completion Queue definitions block/nvme: Use definitions instead of magic values in add_io_queue() block/nvme: Correctly initialize Admin Queue Attributes block/nvme: Simplify ADMIN queue access
block/nvme: Simplify nvme_cmd_sync()
block/nvme: Set request_alignment at initialization block/nvme: Correct minimum device page size
block/nvme: Fix use of write-only doorbells page on Aarch64 arch block/nvme: Fix nvme_submit_command() on big-endian host block/nvme: Simplify Completion Queue Command Identifier field use
include/block/nvme.h | 18 ++-- block/nvme.c | 213 ++++++++++++++++++++++++------------------- MAINTAINERS | 2 + block/trace-events | 30 +++--- 4 files changed, 150 insertions(+), 113 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/25 MAINTAINERS: Cover 'block/nvme.h' file
The "block/nvme.h" header is shared by both the NVMe block driver and the NVMe emulated device. Add the 'F:' entry on both sections, so all maintainers/reviewers are notified when it is changed.
--- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+)
MAINTAINERS +2 -0
@@ -1876,6 +1876,7 @@ M: Klaus Jensen <[email protected]> L: [email protected] S: Supported F: hw/block/nvme* +F: include/block/nvme.h F: tests/qtest/nvme-test.c T: git git://git.infradead.org/qemu-nvme.git nvme-next
@@ -2959,6 +2960,7 @@ R: Fam Zheng <[email protected]> L: [email protected] S: Supported F: block/nvme* +F: include/block/nvme.h T: git https://github.com/stefanha/qemu.git block Bootdevice
Signature · 1 line
2.26.2
PATCH v2 2/25 block/nvme: Use hex format to display offset in trace events
In reply to Philippe Mathieu-DaudéUse the same format used for the hw/vfio/ trace events.
--- block/trace-events | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
block/trace-events +6 -6
@@ -144,13 +144,13 @@ nvme_submit_command(void *s, int index, int cid) "s %p queue %d cid %d" nvme_submit_command_raw(int c0, int c1, int c2, int c3, int c4, int c5, int c6, int c7) "%02x %02x %02x %02x %02x %02x %02x %02x" nvme_handle_event(void *s) "s %p" nvme_poll_cb(void *s) "s %p" -nvme_prw_aligned(void *s, int is_write, uint64_t offset, uint64_t bytes, int flags, int niov) "s %p is_write %d offset %"PRId64" bytes %"PRId64" flags %d niov %d" -nvme_write_zeroes(void *s, uint64_t offset, uint64_t bytes, int flags) "s %p offset %"PRId64" bytes %"PRId64" flags %d" +nvme_prw_aligned(void *s, int is_write, uint64_t offset, uint64_t bytes, int flags, int niov) "s %p is_write %d offset 0x%"PRIx64" bytes %"PRId64" flags %d niov %d" +nvme_write_zeroes(void *s, uint64_t offset, uint64_t bytes, int flags) "s %p offset 0x%"PRIx64" bytes %"PRId64" flags %d" nvme_qiov_unaligned(const void *qiov, int n, void *base, size_t size, int align) "qiov %p n %d base %p size 0x%zx align 0x%x" -nvme_prw_buffered(void *s, uint64_t offset, uint64_t bytes, int niov, int is_write) "s %p offset %"PRId64" bytes %"PRId64" niov %d is_write %d" -nvme_rw_done(void *s, int is_write, uint64_t offset, uint64_t bytes, int ret) "s %p is_write %d offset %"PRId64" bytes %"PRId64" ret %d" -nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset %"PRId64" bytes %"PRId64"" -nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p offset %"PRId64" bytes %"PRId64" ret %d" +nvme_prw_buffered(void *s, uint64_t offset, uint64_t bytes, int niov, int is_write) "s %p offset 0x%"PRIx64" bytes %"PRId64" niov %d is_write %d" +nvme_rw_done(void *s, int is_write, uint64_t offset, uint64_t bytes, int ret) "s %p is_write %d offset 0x%"PRIx64" bytes %"PRId64" ret %d" +nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset 0x%"PRIx64" bytes %"PRId64"" +nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p offset 0x%"PRIx64" bytes %"PRId64" ret %d" nvme_dma_map_flush(void *s) "s %p" nvme_free_req_queue_wait(void *q) "q %p" nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) "s %p cmd %p req %p qiov %p entries %d"
Signature · 1 line
2.26.2
PATCH v2 3/25 block/nvme: Report warning with warn_report()
In reply to Philippe Mathieu-DaudéInstead of displaying warning on stderr, use warn_report() which also displays it on the monitor.
--- block/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/nvme.c +2 -2
@@ -399,8 +399,8 @@ static bool nvme_process_completion(NVMeQueuePair *q) } cid =le16_to_cpu (c->cid);if (cid ==0 || cid >NVME_QUEUE_SIZE ) { -fprintf (stderr,"Unexpected CID in completion queue: %" PRIu32"\n" , - cid); +warn_report ("NVMe: Unexpected CID in completion queue: %" PRIu32", " +"queue size: %u" , cid,NVME_QUEUE_SIZE );continue ; }trace_nvme_complete_command (s, q->index, cid);
Signature · 1 line
2.26.2
PATCH v2 4/25 block/nvme: Trace controller capabilities
In reply to Philippe Mathieu-DaudéControllers have different capabilities and report them in the CAP register. We are particularly interested by the page size limits.
--- block/nvme.c | 13 +++++++++++++ block/trace-events | 2 ++ 2 files changed, 15 insertions(+)
block/nvme.c +13 -0
@@ -727,6 +727,19 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, * Initialization". */ cap =le64_to_cpu (regs->cap); +trace_nvme_controller_capability_raw (cap); +trace_nvme_controller_capability ("Maximum Queue Entries Supported" , +1 +NVME_CAP_MQES (cap)); +trace_nvme_controller_capability ("Contiguous Queues Required" , +NVME_CAP_CQR (cap)); +trace_nvme_controller_capability ("Doorbell Stride" , +2 << (2 +NVME_CAP_DSTRD (cap))); +trace_nvme_controller_capability ("Subsystem Reset Supported" , +NVME_CAP_NSSRS (cap)); +trace_nvme_controller_capability ("Memory Page Size Minimum" , +1 << (12 +NVME_CAP_MPSMIN (cap))); +trace_nvme_controller_capability ("Memory Page Size Maximum" , +1 << (12 +NVME_CAP_MPSMAX (cap)));if (!NVME_CAP_CSS (cap)) {error_setg (errp,"Device doesn't support NVMe command set" ); ret = -EINVAL ;
block/trace-events +2 -0
@@ -134,6 +134,8 @@ qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu" # nvme.c +nvme_controller_capability_raw(uint64_t value) "0x%08"PRIx64 +nvme_controller_capability(const char *desc, uint64_t value) "%s: %"PRIu64 nvme_kick(void *s, int queue) "s %p queue %d" nvme_dma_flush_queue_wait(void *s) "s %p" nvme_error(int cmd_specific, int sq_head, int sqid, int cid, int status) "cmd_specific %d sq_head %d sqid %d cid %d status 0x%x"
Signature · 1 line
2.26.2
PATCH v2 5/25 block/nvme: Trace nvme_poll_queue() per queue
In reply to Philippe Mathieu-DaudéAs we want to enable multiple queues, report the event in each nvme_poll_queue() call, rather than once in the callback calling nvme_poll_queues().
--- block/nvme.c | 2 +- block/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
block/nvme.c +1 -1
@@ -594,6 +594,7 @@ static bool nvme_poll_queue(NVMeQueuePair *q)const size_t cqe_offset = q->cq.head *NVME_CQ_ENTRY_BYTES ;NvmeCqe *cqe = (NvmeCqe *)&q->cq.queue[cqe_offset]; +trace_nvme_poll_queue (q->s, q->index);/* * Do an early check for completions. q->lock isn't needed because * nvme_process_completion() only runs in the event loop thread and
@@ -684,7 +685,6 @@ static bool nvme_poll_cb(void *opaque)BDRVNVMeState *s =container_of (e, BDRVNVMeState, irq_notifier[MSIX_SHARED_IRQ_IDX ]); -trace_nvme_poll_cb (s);return nvme_poll_queues (s); }
block/trace-events +1 -1
@@ -145,7 +145,7 @@ nvme_complete_command(void *s, int index, int cid) "s %p queue %d cid %d" nvme_submit_command(void *s, int index, int cid) "s %p queue %d cid %d" nvme_submit_command_raw(int c0, int c1, int c2, int c3, int c4, int c5, int c6, int c7) "%02x %02x %02x %02x %02x %02x %02x %02x" nvme_handle_event(void *s) "s %p" -nvme_poll_cb(void *s) "s %p" +nvme_poll_queue(void *s, unsigned q_index) "s %p q #%u" nvme_prw_aligned(void *s, int is_write, uint64_t offset, uint64_t bytes, int flags, int niov) "s %p is_write %d offset 0x%"PRIx64" bytes %"PRId64" flags %d niov %d" nvme_write_zeroes(void *s, uint64_t offset, uint64_t bytes, int flags) "s %p offset 0x%"PRIx64" bytes %"PRId64" flags %d" nvme_qiov_unaligned(const void *qiov, int n, void *base, size_t size, int align) "qiov %p n %d base %p size 0x%zx align 0x%x"
Signature · 1 line
2.26.2
PATCH v2 6/25 block/nvme: Improve nvme_free_req_queue_wait() trace information
In reply to Philippe Mathieu-DaudéWhat we want to trace is the block driver state and the queue index.
--- block/nvme.c | 2 +- block/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
block/nvme.c +1 -1
@@ -292,7 +292,7 @@ static NVMeRequest *nvme_get_free_req(NVMeQueuePair *q)while (q->free_req_head ==-1 ) {if (qemu_in_coroutine ()) { -trace_nvme_free_req_queue_wait (q); +trace_nvme_free_req_queue_wait (q->s, q->index);qemu_co_queue_wait (&q->free_req_queue, &q->lock); }else {qemu_mutex_unlock (&q->lock);
block/trace-events +1 -1
@@ -154,7 +154,7 @@ nvme_rw_done(void *s, int is_write, uint64_t offset, uint64_t bytes, int ret) "s nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset 0x%"PRIx64" bytes %"PRId64"" nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p offset 0x%"PRIx64" bytes %"PRId64" ret %d" nvme_dma_map_flush(void *s) "s %p" -nvme_free_req_queue_wait(void *q) "q %p" +nvme_free_req_queue_wait(void *s, unsigned q_index) "s %p q #%u" nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) "s %p cmd %p req %p qiov %p entries %d" nvme_cmd_map_qiov_pages(void *s, int i, uint64_t page) "s %p page[%d] 0x%"PRIx64 nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d] %p pages %d"
Signature · 1 line
2.26.2
PATCH v2 7/25 block/nvme: Trace queue pair creation/deletion
In reply to Philippe Mathieu-Daudé--- block/nvme.c | 3 +++ block/trace-events | 2 ++ 2 files changed, 5 insertions(+)
block/nvme.c +3 -0
@@ -181,6 +181,7 @@ static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,static void nvme_free_queue_pair (NVMeQueuePair *q) { +trace_nvme_free_queue_pair (q->index, q);if (q->completion_bh) {qemu_bh_delete (q->completion_bh); }
@@ -216,6 +217,8 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s,if (!q) {return NULL ; } +trace_nvme_create_queue_pair (idx, q, size, aio_context, +event_notifier_get_fd (s->irq_notifier)); q->prp_list_pages =qemu_try_memalign (s->page_size, s->page_size *NVME_NUM_REQS );if (!q->prp_list_pages) {
block/trace-events +2 -0
@@ -155,6 +155,8 @@ nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset 0x%"PRIx64" byte nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p offset 0x%"PRIx64" bytes %"PRId64" ret %d" nvme_dma_map_flush(void *s) "s %p" nvme_free_req_queue_wait(void *s, unsigned q_index) "s %p q #%u" +nvme_create_queue_pair(unsigned q_index, void *q, unsigned size, void *aio_context, int fd) "index %u q %p size %u aioctx %p fd %d" +nvme_free_queue_pair(unsigned q_index, void *q) "index %u q %p" nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) "s %p cmd %p req %p qiov %p entries %d" nvme_cmd_map_qiov_pages(void *s, int i, uint64_t page) "s %p page[%d] 0x%"PRIx64 nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d] %p pages %d"
Signature · 1 line
2.26.2
PATCH v2 8/25 block/nvme: Move definitions before structure declarations
In reply to Philippe Mathieu-DaudéTo be able to use some definitions in structure declarations, move them earlier. No logical change.
--- block/nvme.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
block/nvme.c +10 -9
@@ -41,6 +41,16 @@typedef struct BDRVNVMeState BDRVNVMeState ; +/* Same index is used for queues and IRQs */ +#define INDEX_ADMIN 0 +#define INDEX_IO (n) (1 + n) + +/* This driver shares a single MSIX IRQ for the admin and I/O queues */ +enum { +MSIX_SHARED_IRQ_IDX =0 , +MSIX_IRQ_COUNT =1 +}; + typedef struct { int32_t head, tail; uint8_t *queue;
@@ -81,15 +91,6 @@ typedef struct {QEMUBH *completion_bh; } NVMeQueuePair; -#define INDEX_ADMIN 0 -#define INDEX_IO (n) (1 + n) - -/* This driver shares a single MSIX IRQ for the admin and I/O queues */ -enum { -MSIX_SHARED_IRQ_IDX =0 , -MSIX_IRQ_COUNT =1 -}; -struct BDRVNVMeState {AioContext *aio_context;QEMUVFIOState *vfio;
Signature · 1 line
2.26.2
PATCH v2 9/25 block/nvme: Use unsigned integer for queue counter/size
In reply to Philippe Mathieu-DaudéWe can not have negative queue count/size/index, use unsigned type. Rename 'nr_queues' as 'queue_count' to match the spec naming.
--- block/nvme.c | 38 ++++++++++++++++++-------------------- block/trace-events | 10 +++++----- 2 files changed, 23 insertions(+), 25 deletions(-)
block/nvme.c +18 -20
@@ -104,7 +104,7 @@ struct BDRVNVMeState {* [1..]: io queues. */ NVMeQueuePair **queues; -int nr_queues; +unsigned queue_count;size_t page_size;/* How many uint32_t elements does each doorbell entry take. */ size_t doorbell_scale;
@@ -161,7 +161,7 @@ static QemuOptsList runtime_opts = { };static void nvme_init_queue (BDRVNVMeState *s,NVMeQueue *q, -int nentries,int entry_bytes,Error **errp) +unsigned nentries,size_t entry_bytes,Error **errp) {size_t bytes;int r;
@@ -206,7 +206,7 @@ static void nvme_free_req_queue_cb(void *opaque)static NVMeQueuePair *nvme_create_queue_pair (BDRVNVMeState *s,AioContext *aio_context, -int idx,int size, +unsigned idx,size_t size,Error **errp) {int i, r;
@@ -623,7 +623,7 @@ static bool nvme_poll_queues(BDRVNVMeState *s)bool progress = false;int i; -for (i =0 ; i < s->nr_queues; i++) { +for (i =0 ; i < s->queue_count; i++) {if (nvme_poll_queue (s->queues[i])) { progress = true; }
@@ -644,10 +644,10 @@ static void nvme_handle_event(EventNotifier *n)static bool nvme_add_io_queue (BlockDriverState *bs,Error **errp) {BDRVNVMeState *s = bs->opaque; -int n = s->nr_queues; +unsigned n = s->queue_count;NVMeQueuePair *q;NvmeCmd cmd; -int queue_size =NVME_QUEUE_SIZE ; +unsigned queue_size =NVME_QUEUE_SIZE ; q =nvme_create_queue_pair (s,bdrv_get_aio_context (bs), n, queue_size, errp);
@@ -661,7 +661,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) .cdw11 = cpu_to_le32(0x3), };if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) { -error_setg (errp,"Failed to create CQ io queue [%d]" , n); +error_setg (errp,"Failed to create CQ io queue [%u]" , n); goto out_error; } cmd = (NvmeCmd ) {
@@ -671,12 +671,12 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) .cdw11 = cpu_to_le32(0x1 | (n << 16)), };if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) { -error_setg (errp,"Failed to create SQ io queue [%d]" , n); +error_setg (errp,"Failed to create SQ io queue [%u]" , n); goto out_error; } s->queues = g_renew(NVMeQueuePair *, s->queues, n + 1); s->queues[n] = q; - s->nr_queues++; + s->queue_count++;return true; out_error:nvme_free_queue_pair (q);
@@ -785,7 +785,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, ret = -EINVAL ; goto out; } - s->nr_queues =1 ; + s->queue_count =1 ;QEMU_BUILD_BUG_ON (NVME_QUEUE_SIZE &0xF000 ); regs->aqa =cpu_to_le32 ((NVME_QUEUE_SIZE <<AQA_ACQS_SHIFT ) | (NVME_QUEUE_SIZE <<AQA_ASQS_SHIFT ));
@@ -895,10 +895,9 @@ static int nvme_enable_disable_write_cache(BlockDriverState *bs, bool enable,static void nvme_close (BlockDriverState *bs) { -int i;BDRVNVMeState *s = bs->opaque; -for (i =0 ; i < s->nr_queues; ++i) { +for (unsigned i =0 ; i < s->queue_count; ++i) {nvme_free_queue_pair (s->queues[i]); }g_free (s->queues);
@@ -1123,7 +1122,7 @@ static coroutine_fn int nvme_co_prw_aligned(BlockDriverState *bs, };trace_nvme_prw_aligned (s, is_write, offset, bytes, flags, qiov->niov); -assert (s->nr_queues >1 ); +assert (s->queue_count >1 ); req =nvme_get_free_req (ioq);assert (req);
@@ -1233,7 +1232,7 @@ static coroutine_fn int nvme_co_flush(BlockDriverState *bs) .ret = -EINPROGRESS, }; -assert (s->nr_queues >1 ); +assert (s->queue_count >1 ); req =nvme_get_free_req (ioq);assert (req);nvme_submit_command (ioq, req, &cmd, nvme_rw_cb, &data);
@@ -1285,7 +1284,7 @@ static coroutine_fn int nvme_co_pwrite_zeroes(BlockDriverState *bs, cmd.cdw12 =cpu_to_le32 (cdw12);trace_nvme_write_zeroes (s, offset, bytes, flags); -assert (s->nr_queues >1 ); +assert (s->queue_count >1 ); req =nvme_get_free_req (ioq);assert (req);
@@ -1328,7 +1327,7 @@ static int coroutine_fn nvme_co_pdiscard(BlockDriverState *bs,return -ENOTSUP ; } -assert (s->nr_queues >1 ); +assert (s->queue_count >1 ); buf =qemu_try_memalign (s->page_size, s->page_size);if (!buf) {
@@ -1408,7 +1407,7 @@ static void nvme_detach_aio_context(BlockDriverState *bs) {BDRVNVMeState *s = bs->opaque; -for (int i =0 ; i < s->nr_queues; i++) { +for (unsigned i =0 ; i < s->queue_count; i++) {NVMeQueuePair *q = s->queues[i];qemu_bh_delete (q->completion_bh);
@@ -1429,7 +1428,7 @@ static void nvme_attach_aio_context(BlockDriverState *bs,aio_set_event_notifier (new_context, &s->irq_notifier[MSIX_SHARED_IRQ_IDX ], false, nvme_handle_event, nvme_poll_cb); -for (int i =0 ; i < s->nr_queues; i++) { +for (unsigned i =0 ; i < s->queue_count; i++) {NVMeQueuePair *q = s->queues[i]; q->completion_bh =
@@ -1446,11 +1445,10 @@ static void nvme_aio_plug(BlockDriverState *bs)static void nvme_aio_unplug (BlockDriverState *bs) { -int i;BDRVNVMeState *s = bs->opaque;assert (s->plugged); s->plugged = false; -for (i =INDEX_IO (0 ); i < s->nr_queues; i++) { +for (unsigned i =INDEX_IO (0 ); i < s->queue_count; i++) {NVMeQueuePair *q = s->queues[i];qemu_mutex_lock (&q->lock);nvme_kick (q);
block/trace-events +5 -5
@@ -136,13 +136,13 @@ qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s # nvme.c nvme_controller_capability_raw(uint64_t value) "0x%08"PRIx64 nvme_controller_capability(const char *desc, uint64_t value) "%s: %"PRIu64 -nvme_kick(void *s, int queue) "s %p queue %d" +nvme_kick(void *s, unsigned q_index) "s %p q #%u" nvme_dma_flush_queue_wait(void *s) "s %p" nvme_error(int cmd_specific, int sq_head, int sqid, int cid, int status) "cmd_specific %d sq_head %d sqid %d cid %d status 0x%x" -nvme_process_completion(void *s, int index, int inflight) "s %p queue %d inflight %d" -nvme_process_completion_queue_plugged(void *s, int index) "s %p queue %d" -nvme_complete_command(void *s, int index, int cid) "s %p queue %d cid %d" -nvme_submit_command(void *s, int index, int cid) "s %p queue %d cid %d" +nvme_process_completion(void *s, unsigned q_index, int inflight) "s %p q #%u inflight %d" +nvme_process_completion_queue_plugged(void *s, unsigned q_index) "s %p q #%u" +nvme_complete_command(void *s, unsigned q_index, int cid) "s %p q #%u cid %d" +nvme_submit_command(void *s, unsigned q_index, int cid) "s %p q #%u cid %d" nvme_submit_command_raw(int c0, int c1, int c2, int c3, int c4, int c5, int c6, int c7) "%02x %02x %02x %02x %02x %02x %02x %02x" nvme_handle_event(void *s) "s %p" nvme_poll_queue(void *s, unsigned q_index) "s %p q #%u"
Signature · 1 line
2.26.2
PATCH v2 10/25 block/nvme: Make nvme_identify() return boolean indicating error
In reply to Philippe Mathieu-DaudéJust for consistency, following the example documented since commit e3fe3988d7 ("error: Document Error API usage rules"), return a boolean value indicating an error is set or not. Directly pass errp as the local_err is not requested in our case.
--- block/nvme.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
block/nvme.c +7 -5
@@ -506,9 +506,11 @@ static int nvme_cmd_sync(BlockDriverState *bs, NVMeQueuePair *q,return ret; } -static void nvme_identify (BlockDriverState *bs,int namespace,Error **errp) +/* Returns true on success, false on failure. */ +static bool nvme_identify (BlockDriverState *bs,int namespace,Error **errp) {BDRVNVMeState *s = bs->opaque; +bool ret = false;union {NvmeIdCtrl ctrl;NvmeIdNs ns;
@@ -585,10 +587,13 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) goto out; } + ret = true; s->blkshift = lbaf->ds; out:qemu_vfio_dma_unmap (s->vfio, id);qemu_vfree (id); + +return ret; }static bool nvme_poll_queue (NVMeQueuePair *q)
@@ -701,7 +706,6 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace,uint64_t cap;uint64_t timeout_ms;uint64_t deadline, now; -Error *local_err =NULL ;volatile NvmeBar *regs =NULL ;qemu_co_mutex_init (&s->dma_map_lock);
@@ -818,9 +822,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, &s->irq_notifier[MSIX_SHARED_IRQ_IDX ], false, nvme_handle_event, nvme_poll_cb); -nvme_identify (bs, namespace, &local_err); -if (local_err) { -error_propagate (errp, local_err); +if (!nvme_identify (bs, namespace, errp)) { ret = -EIO ; goto out; }
Signature · 1 line
2.26.2
Re: [PATCH-for-5.2 v2 10/25] block/nvme: Make nvme_identify() return boolean indicating error
Quoted 11 lines · Philippe Mathieu-Daudé
Just for consistency, following the example documented since commit
e3fe3988d7("error: Document Error API usage rules"), return a boolean value indicating an error is set or not. Directly pass errp as thelocal_erris not requested in our case.Tested-by Eric Auger <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nvme.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
PATCH v2 11/25 block/nvme: Make nvme_init_queue() return boolean indicating error
In reply to Philippe Mathieu-DaudéJust for consistency, following the example documented since commit e3fe3988d7 ("error: Document Error API usage rules"), return a boolean value indicating an error is set or not. Directly pass errp as the local_err is not requested in our case. This simplifies a bit nvme_create_queue_pair().
--- block/nvme.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
block/nvme.c +7 -9
@@ -160,7 +160,8 @@ static QemuOptsList runtime_opts = { }, }; -static void nvme_init_queue (BDRVNVMeState *s,NVMeQueue *q, +/* Returns true on success, false on failure. */ +static bool nvme_init_queue (BDRVNVMeState *s,NVMeQueue *q,unsigned nentries,size_t entry_bytes,Error **errp) {size_t bytes;
@@ -171,13 +172,15 @@ static void nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q, q->queue =qemu_try_memalign (s->page_size, bytes);if (!q->queue) {error_setg (errp,"Cannot allocate queue" ); -return ; +return false; }memset (q->queue,0 , bytes); r =qemu_vfio_dma_map (s->vfio, q->queue, bytes, false, &q->iova);if (r) {error_setg (errp,"Cannot map queue" ); +return false; } +return true; }static void nvme_free_queue_pair (NVMeQueuePair *q)
@@ -210,7 +213,6 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s, Error **errp) {int i, r; -Error *local_err =NULL ;NVMeQueuePair *q;uint64_t prp_list_iova;
@@ -247,16 +249,12 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s, req->prp_list_iova = prp_list_iova + i * s->page_size; } -nvme_init_queue (s, &q->sq, size,NVME_SQ_ENTRY_BYTES , &local_err); -if (local_err) { -error_propagate (errp, local_err); +if (!nvme_init_queue (s, &q->sq, size,NVME_SQ_ENTRY_BYTES , errp)) { goto fail; } q->sq.doorbell = &s->doorbells[idx * s->doorbell_scale].sq_tail; -nvme_init_queue (s, &q->cq, size,NVME_CQ_ENTRY_BYTES , &local_err); -if (local_err) { -error_propagate (errp, local_err); +if (!nvme_init_queue (s, &q->cq, size,NVME_CQ_ENTRY_BYTES , errp)) { goto fail; } q->cq.doorbell = &s->doorbells[idx * s->doorbell_scale].cq_head;
Signature · 1 line
2.26.2
PATCH v2 12/25 block/nvme: Introduce Completion Queue definitions
In reply to Philippe Mathieu-DaudéRename Submission Queue flags with 'Sq' to differentiate submission queue flags from command queue flags, and introduce Completion Queue flag definitions.
--- include/block/nvme.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
include/block/nvme.h +12 -6
@@ -491,6 +491,11 @@ typedef struct QEMU_PACKED NvmeCreateCq {#define NVME_CQ_FLAGS_PC (cq_flags) (cq_flags & 0x1)#define NVME_CQ_FLAGS_IEN (cq_flags) ((cq_flags >> 1) & 0x1) +enum NvmeFlagsCq { +NVME_CQ_PC =1 , +NVME_CQ_IEN =2 , +}; + typedef struct QEMU_PACKED NvmeCreateSq {uint8_t opcode;uint8_t flags;
@@ -508,12 +513,13 @@ typedef struct QEMU_PACKED NvmeCreateSq {#define NVME_SQ_FLAGS_PC (sq_flags) (sq_flags & 0x1)#define NVME_SQ_FLAGS_QPRIO (sq_flags) ((sq_flags >> 1) & 0x3) -enum NvmeQueueFlags { -NVME_Q_PC =1 , -NVME_Q_PRIO_URGENT =0 , -NVME_Q_PRIO_HIGH =1 , -NVME_Q_PRIO_NORMAL =2 , -NVME_Q_PRIO_LOW =3 , +enum NvmeFlagsSq { +NVME_SQ_PC =1 , + +NVME_SQ_PRIO_URGENT =0 , +NVME_SQ_PRIO_HIGH =1 , +NVME_SQ_PRIO_NORMAL =2 , +NVME_SQ_PRIO_LOW =3 , }; typedef struct QEMU_PACKED NvmeIdentify {
Signature · 1 line
2.26.2
Re: [PATCH-for-5.2 v2 12/25] block/nvme: Introduce Completion Queue definitions
Quoted 10 lines · Philippe Mathieu-Daudé
Rename Submission Queue flags with 'Sq' to differentiate submission queue flags from command queue flags, and introduce Completion Queue flag definitions.
Reviewed-by Eric Auger <[email protected]>Tested-by Eric Auger <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/block/nvme.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
I mentioned more possible cleanups in the previous revision, but they are not a blocker:
Re: [PATCH-for-5.2 v2 12/25] block/nvme: Introduce Completion Queue definitions
Quoted 12 lines · Stefan Hajnoczi
Quoted 10 lines · Philippe Mathieu-Daudé
Rename Submission Queue flags with 'Sq' to differentiate submission queue flags from command queue flags, and introduce Completion Queue flag definitions.
Reviewed-by Eric Auger <[email protected]>Tested-by Eric Auger <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/block/nvme.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
Quoted 2 lines
I mentioned more possible cleanups in the previous revision, but they are not a blocker:
Your cleanups haven't been ignored, simply postponed :)
Quoted 3 lines
Reviewed-by Stefan Hajnoczi <[email protected]>
Thanks!
PATCH v2 13/25 block/nvme: Use definitions instead of magic values in add_io_queue()
In reply to Philippe Mathieu-DaudéReplace magic values by definitions, and simplifiy since the number of queues will never reach 64K.
--- block/nvme.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
block/nvme.c +5 -4
@@ -652,6 +652,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp)NvmeCmd cmd;unsigned queue_size =NVME_QUEUE_SIZE ; +assert (n <=UINT16_MAX ); q =nvme_create_queue_pair (s,bdrv_get_aio_context (bs), n, queue_size, errp);if (!q) {
@@ -660,8 +661,8 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) cmd = (NvmeCmd ) { .opcode =NVME_ADM_CMD_CREATE_CQ , .dptr.prp1 =cpu_to_le64 (q->cq.iova), - .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | (n &0xFFFF )), - .cdw11 =cpu_to_le32 (0x3 ), + .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | n), + .cdw11 =cpu_to_le32 (NVME_CQ_IEN |NVME_CQ_PC ), };if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) {error_setg (errp,"Failed to create CQ io queue [%u]" , n);
@@ -670,8 +671,8 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) cmd = (NvmeCmd ) { .opcode =NVME_ADM_CMD_CREATE_SQ , .dptr.prp1 =cpu_to_le64 (q->sq.iova), - .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | (n &0xFFFF )), - .cdw11 =cpu_to_le32 (0x1 | (n <<16 )), + .cdw10 =cpu_to_le32 (((queue_size -1 ) <<16 ) | n), + .cdw11 =cpu_to_le32 (NVME_SQ_PC | (n <<16 )), };if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) {error_setg (errp,"Failed to create SQ io queue [%u]" , n);
Signature · 1 line
2.26.2
PATCH v2 14/25 block/nvme: Correctly initialize Admin Queue Attributes
In reply to Philippe Mathieu-DaudéFrom the specification chapter 3.1.8 "AQA - Admin Queue Attributes" the Admin Submission Queue Size field is a 0’s based value:
Admin Submission Queue Size (ASQS):
Defines the size of the Admin Submission Queue in entries. Enabling a controller while this field is cleared to 00h produces undefined results. The minimum size of the Admin Submission Queue is two entries. The maximum size of the Admin Submission Queue is 4096 entries.
This is a 0’s based value.
This bug has never been hit because the device initialization uses a single command synchronously :)
--- block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block/nvme.c +3 -3
@@ -789,9 +789,9 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, goto out; } s->queue_count =1 ; -QEMU_BUILD_BUG_ON (NVME_QUEUE_SIZE &0xF000 ); - regs->aqa =cpu_to_le32 ((NVME_QUEUE_SIZE <<AQA_ACQS_SHIFT ) | - (NVME_QUEUE_SIZE <<AQA_ASQS_SHIFT )); +QEMU_BUILD_BUG_ON ((NVME_QUEUE_SIZE -1 ) &0xF000 ); + regs->aqa =cpu_to_le32 (((NVME_QUEUE_SIZE -1 ) <<AQA_ACQS_SHIFT ) | + ((NVME_QUEUE_SIZE -1 ) <<AQA_ASQS_SHIFT )); regs->asq =cpu_to_le64 (s->queues[INDEX_ADMIN ]->sq.iova); regs->acq =cpu_to_le64 (s->queues[INDEX_ADMIN ]->cq.iova);
Signature · 1 line
2.26.2
PATCH v2 15/25 block/nvme: Simplify ADMIN queue access
In reply to Philippe Mathieu-DaudéWe don't need to dereference from BDRVNVMeState each time. Use a NVMeQueuePair pointer on the admin queue. The nvme_init() becomes easier to review, matching the style of nvme_add_io_queue().
--- block/nvme.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
block/nvme.c +6 -6
@@ -700,6 +700,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, Error **errp) {BDRVNVMeState *s = bs->opaque; +NVMeQueuePair *q;AioContext *aio_context =bdrv_get_aio_context (bs);int ret;uint64_t cap;
@@ -781,19 +782,18 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace,/* Set up admin queue. */ s->queues = g_new(NVMeQueuePair *, 1); - s->queues[INDEX_ADMIN ] =nvme_create_queue_pair (s, aio_context,0 , -NVME_QUEUE_SIZE , - errp); -if (!s->queues[INDEX_ADMIN ]) { + q =nvme_create_queue_pair (s, aio_context,0 ,NVME_QUEUE_SIZE , errp); +if (!q) { ret = -EINVAL ; goto out; } + s->queues[INDEX_ADMIN ] = q; s->queue_count =1 ;QEMU_BUILD_BUG_ON ((NVME_QUEUE_SIZE -1 ) &0xF000 ); regs->aqa =cpu_to_le32 (((NVME_QUEUE_SIZE -1 ) <<AQA_ACQS_SHIFT ) | ((NVME_QUEUE_SIZE -1 ) <<AQA_ASQS_SHIFT )); - regs->asq =cpu_to_le64 (s->queues[INDEX_ADMIN ]->sq.iova); - regs->acq =cpu_to_le64 (s->queues[INDEX_ADMIN ]->cq.iova); + regs->asq =cpu_to_le64 (q->sq.iova); + regs->acq =cpu_to_le64 (q->cq.iova);/* After setting up all control registers we can enable device now. */ regs->cc = cpu_to_le32((ctz32(NVME_CQ_ENTRY_BYTES) << CC_IOCQES_SHIFT) |
Signature · 1 line
2.26.2
PATCH v2 16/25 block/nvme: Simplify nvme_cmd_sync()
In reply to Philippe Mathieu-DaudéAs all commands use the ADMIN queue, it is pointless to pass it as argument each time. Remove the argument, and rename the function as nvme_admin_cmd_sync() to make this new behavior clearer.
--- block/nvme.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
block/nvme.c +10 -9
@@ -481,16 +481,17 @@ static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,qemu_mutex_unlock (&q->lock); } -static void nvme_cmd_sync_cb (void *opaque,int ret) +static void nvme_admin_cmd_sync_cb (void *opaque,int ret) {int *pret = opaque; *pret = ret;aio_wait_kick (); } -static int nvme_cmd_sync (BlockDriverState *bs,NVMeQueuePair *q, -NvmeCmd *cmd) +static int nvme_admin_cmd_sync (BlockDriverState *bs,NvmeCmd *cmd) { +BDRVNVMeState *s = bs->opaque; +NVMeQueuePair *q = s->queues[INDEX_ADMIN ];AioContext *aio_context =bdrv_get_aio_context (bs);NVMeRequest *req;int ret = -EINPROGRESS ;
@@ -498,7 +499,7 @@ static int nvme_cmd_sync(BlockDriverState *bs, NVMeQueuePair *q,if (!req) {return -EBUSY ; } -nvme_submit_command (q, req, cmd, nvme_cmd_sync_cb, &ret); +nvme_submit_command (q, req, cmd, nvme_admin_cmd_sync_cb, &ret);AIO_WAIT_WHILE (aio_context, ret == -EINPROGRESS );return ret;
@@ -535,7 +536,7 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp)memset (id,0 ,sizeof (*id)); cmd.dptr.prp1 =cpu_to_le64 (iova); -if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) { +if (nvme_admin_cmd_sync (bs, &cmd)) {error_setg (errp,"Failed to identify controller" ); goto out; }
@@ -558,7 +559,7 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp)memset (id,0 ,sizeof (*id)); cmd.cdw10 =0 ; cmd.nsid =cpu_to_le32 (namespace); -if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) { +if (nvme_admin_cmd_sync (bs, &cmd)) {error_setg (errp,"Failed to identify namespace" ); goto out; }
@@ -664,7 +665,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n), .cdw11 = cpu_to_le32(NVME_CQ_IEN | NVME_CQ_PC), }; -if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) { +if (nvme_admin_cmd_sync (bs, &cmd)) {error_setg (errp,"Failed to create CQ io queue [%u]" , n); goto out_error; }
@@ -674,7 +675,7 @@ static bool nvme_add_io_queue(BlockDriverState *bs, Error **errp) .cdw10 = cpu_to_le32(((queue_size - 1) << 16) | n), .cdw11 = cpu_to_le32(NVME_SQ_PC | (n << 16)), }; -if (nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd)) { +if (nvme_admin_cmd_sync (bs, &cmd)) {error_setg (errp,"Failed to create SQ io queue [%u]" , n); goto out_error; }
@@ -887,7 +888,7 @@ static int nvme_enable_disable_write_cache(BlockDriverState *bs, bool enable, .cdw11 = cpu_to_le32(enable ? 0x01 : 0x00), }; - ret =nvme_cmd_sync (bs, s->queues[INDEX_ADMIN ], &cmd); + ret =nvme_admin_cmd_sync (bs, &cmd);if (ret) {error_setg (errp,"Failed to configure NVMe write cache" ); }
Signature · 1 line
2.26.2
Re: [PATCH-for-5.2 v2 16/25] block/nvme: Simplify nvme_cmd_sync()
Quoted 11 lines · Philippe Mathieu-Daudé
As all commands use the ADMIN queue, it is pointless to pass it as argument each time. Remove the argument, and rename the function as
nvme_admin_cmd_sync()to make this new behavior clearer.Reviewed-by Eric Auger <[email protected]>Tested-by Eric Auger <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nvme.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
PATCH v2 17/25 block/nvme: Set request_alignment at initialization
In reply to Philippe Mathieu-DaudéCommit bdd6a90a9e5 ("block: Add VFIO based NVMe driver") sets the request_alignment in nvme_refresh_limits(). For consistency, also set it during initialization.
--- block/nvme.c | 1 + 1 file changed, 1 insertion(+)
block/nvme.c +1 -0
@@ -758,6 +758,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, s->page_size =MAX (4096 ,1 <<NVME_CAP_MPSMIN (cap)); s->doorbell_scale = (4 <<NVME_CAP_DSTRD (cap)) /sizeof (uint32_t ); bs->bl.opt_mem_alignment = s->page_size; + bs->bl.request_alignment = s->page_size; timeout_ms =MIN (500 *NVME_CAP_TO (cap),30000 );/* Reset device to get a clean state. */
Signature · 1 line
2.26.2
PATCH v2 18/25 block/nvme: Correct minimum device page size
In reply to Philippe Mathieu-DaudéWhile trying to simplify the code using a macro, we forgot the 12-bit shift... Correct that.
--- block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/nvme.c +1 -1
@@ -755,7 +755,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, goto out; } - s->page_size =MAX (4096 ,1 <<NVME_CAP_MPSMIN (cap)); + s->page_size =1u << (12 +NVME_CAP_MPSMIN (cap)); s->doorbell_scale = (4 <<NVME_CAP_DSTRD (cap)) /sizeof (uint32_t ); bs->bl.opt_mem_alignment = s->page_size; bs->bl.request_alignment = s->page_size;
Signature · 1 line
2.26.2
PATCH v2 19/25 block/nvme: Change size and alignment of IDENTIFY response buffer
In reply to Philippe Mathieu-DaudéFrom: Eric Auger <[email protected]>
In preparation of 64kB host page support, let's change the size and alignment of the IDENTIFY command response buffer so that the VFIO DMA MAP succeeds. We align on the host page size.
--- block/nvme.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
block/nvme.c +5 -4
@@ -522,19 +522,20 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp) .opcode = NVME_ADM_CMD_IDENTIFY, .cdw10 = cpu_to_le32(0x1), }; +size_t id_size =QEMU_ALIGN_UP (sizeof (*id), qemu_real_host_page_size); - id =qemu_try_memalign (s->page_size,sizeof (*id)); + id =qemu_try_memalign (qemu_real_host_page_size, id_size);if (!id) {error_setg (errp,"Cannot allocate buffer for identify response" ); goto out; } - r =qemu_vfio_dma_map (s->vfio, id,sizeof (*id), true, &iova); + r =qemu_vfio_dma_map (s->vfio, id, id_size, true, &iova);if (r) {error_setg (errp,"Cannot map buffer for DMA" ); goto out; } -memset (id,0 ,sizeof (*id)); +memset (id,0 , id_size); cmd.dptr.prp1 =cpu_to_le64 (iova);if (nvme_admin_cmd_sync (bs, &cmd)) {error_setg (errp,"Failed to identify controller" );
@@ -556,7 +557,7 @@ static bool nvme_identify(BlockDriverState *bs, int namespace, Error **errp) s->supports_write_zeroes = !!(oncs &NVME_ONCS_WRITE_ZEROES ); s->supports_discard = !!(oncs &NVME_ONCS_DSM ); -memset (id,0 ,sizeof (*id)); +memset (id,0 , id_size); cmd.cdw10 =0 ; cmd.nsid =cpu_to_le32 (namespace);if (nvme_admin_cmd_sync (bs, &cmd)) {
Signature · 1 line
2.26.2
PATCH v2 20/25 block/nvme: Change size and alignment of queue
In reply to Philippe Mathieu-DaudéFrom: Eric Auger <[email protected]>
In preparation of 64kB host page support, let's change the size and alignment of the queue so that the VFIO DMA MAP succeeds. We align on the host page size.
--- block/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/nvme.c +2 -2
@@ -167,9 +167,9 @@ static bool nvme_init_queue(BDRVNVMeState *s, NVMeQueue *q,size_t bytes;int r; - bytes =ROUND_UP (nentries * entry_bytes, s->page_size); + bytes =ROUND_UP (nentries * entry_bytes, qemu_real_host_page_size); q->head = q->tail =0 ; - q->queue =qemu_try_memalign (s->page_size, bytes); + q->queue =qemu_try_memalign (qemu_real_host_page_size, bytes);if (!q->queue) {error_setg (errp,"Cannot allocate queue" );return false;
Signature · 1 line
2.26.2
PATCH v2 21/25 block/nvme: Change size and alignment of prp_list_pages
In reply to Philippe Mathieu-DaudéFrom: Eric Auger <[email protected]>
In preparation of 64kB host page support, let's change the size and alignment of the prp_list_pages so that the VFIO DMA MAP succeeds with 64kB host page size. We align on the host page size.
--- block/nvme.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
block/nvme.c +6 -5
@@ -215,6 +215,7 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s,int i, r;NVMeQueuePair *q;uint64_t prp_list_iova; +size_t bytes; q =g_try_new0 (NVMeQueuePair,1 );if (!q) {
@@ -222,19 +223,19 @@ static NVMeQueuePair *nvme_create_queue_pair(BDRVNVMeState *s, }trace_nvme_create_queue_pair (idx, q, size, aio_context,event_notifier_get_fd (s->irq_notifier)); - q->prp_list_pages =qemu_try_memalign (s->page_size, - s->page_size *NVME_NUM_REQS ); + bytes =QEMU_ALIGN_UP (s->page_size *NVME_NUM_REQS , + qemu_real_host_page_size); + q->prp_list_pages =qemu_try_memalign (qemu_real_host_page_size, bytes);if (!q->prp_list_pages) { goto fail; } -memset (q->prp_list_pages,0 , s->page_size *NVME_NUM_REQS ); +memset (q->prp_list_pages,0 , bytes);qemu_mutex_init (&q->lock); q->s = s; q->index = idx;qemu_co_queue_init (&q->free_req_queue); q->completion_bh =aio_bh_new (aio_context, nvme_process_completion_bh, q); - r =qemu_vfio_dma_map (s->vfio, q->prp_list_pages, - s->page_size *NVME_NUM_REQS , + r =qemu_vfio_dma_map (s->vfio, q->prp_list_pages, bytes, false, &prp_list_iova);if (r) { goto fail;
Signature · 1 line
2.26.2
PATCH v2 22/25 block/nvme: Align iov's va and size on host page size
In reply to Philippe Mathieu-DaudéFrom: Eric Auger <[email protected]>
Make sure iov's va and size are properly aligned on the host page size.
--- block/nvme.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
block/nvme.c +8 -6
@@ -1015,11 +1015,12 @@ static coroutine_fn int nvme_cmd_map_qiov(BlockDriverState *bs, NvmeCmd *cmd,for (i =0 ; i < qiov->niov; ++i) {bool retry = true;uint64_t iova; +size_t len =QEMU_ALIGN_UP (qiov->iov[i].iov_len, + qemu_real_host_page_size); try_map: r =qemu_vfio_dma_map (s->vfio, qiov->iov[i].iov_base, - qiov->iov[i].iov_len, - true, &iova); + len, true, &iova);if (r == -ENOMEM && retry) { retry = false;trace_nvme_dma_flush_queue_wait (s);
@@ -1163,8 +1164,9 @@ static inline bool nvme_qiov_aligned(BlockDriverState *bs,BDRVNVMeState *s = bs->opaque;for (i =0 ; i < qiov->niov; ++i) { -if (!QEMU_PTR_IS_ALIGNED (qiov->iov[i].iov_base, s->page_size) || - !QEMU_IS_ALIGNED (qiov->iov[i].iov_len, s->page_size)) { +if (!QEMU_PTR_IS_ALIGNED (qiov->iov[i].iov_base, + qemu_real_host_page_size) || + !QEMU_IS_ALIGNED (qiov->iov[i].iov_len, qemu_real_host_page_size)) {trace_nvme_qiov_unaligned (qiov, i, qiov->iov[i].iov_base, qiov->iov[i].iov_len, s->page_size);return false;
@@ -1180,7 +1182,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t offset, uint64_t bytes,int r;uint8_t *buf =NULL ;QEMUIOVector local_qiov; - +size_t len =QEMU_ALIGN_UP (bytes, qemu_real_host_page_size);assert (QEMU_IS_ALIGNED (offset, s->page_size));assert (QEMU_IS_ALIGNED (bytes, s->page_size));assert (bytes <= s->max_transfer);
@@ -1190,7 +1192,7 @@ static int nvme_co_prw(BlockDriverState *bs, uint64_t offset, uint64_t bytes, } s->stats.unaligned_accesses++;trace_nvme_prw_buffered (s, offset, bytes, qiov->niov, is_write); - buf =qemu_try_memalign (s->page_size, bytes); + buf =qemu_try_memalign (qemu_real_host_page_size, len);if (!buf) {return -ENOMEM ;
Signature · 1 line
2.26.2
PATCH v2 23/25 block/nvme: Fix use of write-only doorbells page on Aarch64 arch
In reply to Philippe Mathieu-Daudéqemu_vfio_pci_map_bar() calls mmap(), and mmap(2) states:
'offset' must be a multiple of the page size as returned
by sysconf(_SC_PAGE_SIZE).
In commit f68453237b9 we started to use an offset of 4K which broke this contract on Aarch64 arch.
Fix by mapping at offset 0, and and accessing doorbells at offset=4K.
--- block/nvme.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
block/nvme.c +7 -4
@@ -94,6 +94,7 @@ typedef struct {struct BDRVNVMeState {AioContext *aio_context;QEMUVFIOState *vfio; +void *bar0_wo_map;/* Memory mapped registers */ volatile struct {uint32_t sq_tail;
@@ -777,8 +778,10 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace, } } - s->doorbells =qemu_vfio_pci_map_bar (s->vfio,0 ,sizeof (NvmeBar), -NVME_DOORBELL_SIZE ,PROT_WRITE , errp); + s->bar0_wo_map =qemu_vfio_pci_map_bar (s->vfio,0 ,0 , +sizeof (NvmeBar) +NVME_DOORBELL_SIZE , +PROT_WRITE , errp); + s->doorbells = (void *)((uintptr_t )s->bar0_wo_map +sizeof (NvmeBar));if (!s->doorbells) { ret = -EINVAL ; goto out;
@@ -910,8 +913,8 @@ static void nvme_close(BlockDriverState *bs) &s->irq_notifier[MSIX_SHARED_IRQ_IDX ], false, NULL, NULL);event_notifier_cleanup (&s->irq_notifier[MSIX_SHARED_IRQ_IDX ]); -qemu_vfio_pci_unmap_bar (s->vfio,0 , (void *)s->doorbells, -sizeof (NvmeBar),NVME_DOORBELL_SIZE ); +qemu_vfio_pci_unmap_bar (s->vfio,0 , s->bar0_wo_map, +0 ,sizeof (NvmeBar) +NVME_DOORBELL_SIZE );qemu_vfio_close (s->vfio);g_free (s->device);
Signature · 1 line
2.26.2
PATCH v2 24/25 block/nvme: Fix nvme_submit_command() on big-endian host
In reply to Philippe Mathieu-DaudéThe Completion Queue Command Identifier is a 16-bit value, so nvme_submit_command() is unlikely to work on big-endian hosts, as the relevant bits are truncated.
Fix by using the correct byte-swap function.
--- block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/nvme.c +1 -1
@@ -469,7 +469,7 @@ static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,assert (!req->cb); req->cb = cb; req->opaque = opaque; - cmd->cid =cpu_to_le32 (req->cid); + cmd->cid =cpu_to_le16 (req->cid);trace_nvme_submit_command (q->s, q->index, req->cid);nvme_trace_command (cmd);
Signature · 1 line
2.26.2
Re: [PATCH-for-5.2 v2 24/25] block/nvme: Fix nvme_submit_command() on big-endian host
Quoted 11 lines · Philippe Mathieu-Daudé
The Completion Queue Command Identifier is a 16-bit value, so
nvme_submit_command()is unlikely to work on big-endian hosts, as the relevant bits are truncated.
Fix by using the correct byte-swap function.Fixes bdd6a90a9e5 ("block: Add VFIO based NVMe driver")Reported-by Keith Busch <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v2 25/25 block/nvme: Simplify Completion Queue Command Identifier field use
In reply to Philippe Mathieu-DaudéThe "Completion Queue Entry: DW 2" describes it as:
This identifier is assigned by host software when the command is submitted to the Submission
As the is just an opaque cookie, it is pointless to byte-swap it.
--- block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
block/nvme.c +3 -3
@@ -344,7 +344,7 @@ static inline int nvme_translate_error(const NvmeCqe *c)trace_nvme_error (le32_to_cpu (c->result),le16_to_cpu (c->sq_head),le16_to_cpu (c->sq_id), -le16_to_cpu (c->cid), + c->cid,le16_to_cpu (status)); }switch (status) {
@@ -401,7 +401,7 @@ static bool nvme_process_completion(NVMeQueuePair *q)if (!q->cq.head) { q->cq_phase = !q->cq_phase; } - cid =le16_to_cpu (c->cid); + cid = c->cid;if (cid ==0 || cid >NVME_QUEUE_SIZE ) {warn_report ("NVMe: Unexpected CID in completion queue: %" PRIu32", " "queue size: %u" , cid,NVME_QUEUE_SIZE );
@@ -469,7 +469,7 @@ static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,assert (!req->cb); req->cb = cb; req->opaque = opaque; - cmd->cid =cpu_to_le16 (req->cid); + cmd->cid = req->cid;trace_nvme_submit_command (q->s, q->index, req->cid);nvme_trace_command (cmd);
Signature · 1 line
2.26.2
Re: [PATCH-for-6.0 v2 25/25] block/nvme: Simplify Completion Queue Command Identifier field use
Quoted 36 lines · Philippe Mathieu-Daudé
The "Completion Queue Entry: DW 2" describes it as:
This identifier is assigned by host software when the command is submitted to the Submission
As the is just an opaque cookie, it is pointless to byte-swap it.
Suggested-by Keith Busch <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)block/nvme.c +2
-2@@ -344,7 +344,7 @@ static inline int nvme_translate_error(const NvmeCqe *c)trace_nvme_error (le32_to_cpu (c->result),le16_to_cpu (c->sq_head),le16_to_cpu (c->sq_id), -le16_to_cpu (c->cid), + c->cid,le16_to_cpu (status)); }switch (status) {@@ -401,7 +401,7 @@ static bool nvme_process_completion(NVMeQueuePair *q)if (!q->cq.head) { q->cq_phase = !q->cq_phase; } - cid =le16_to_cpu (c->cid); + cid = c->cid;if (cid ==0 || cid >NVME_QUEUE_SIZE ) {warn_report ("NVMe: Unexpected CID in completion queue: %" PRIu32", " "queue size: %u" , cid,NVME_QUEUE_SIZE );
block/nvme.c static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req, · line 475
Quoted 8 lines
block/nvme.c +1
-1@@ -469,7 +469,7 @@ static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,assert (!req->cb); req->cb = cb; req->opaque = opaque; - cmd->cid =cpu_to_le16 (req->cid); + cmd->cid = req->cid;trace_nvme_submit_command (q->s, q->index, req->cid);nvme_trace_command (cmd);
Eliminating the byteswap is safe but this patch makes the code confusing, as I mentioned previously.
Please use a comment or macro to mark this field native endian. It's not obvious to the reader that we can skip the byteswap here.
Otherwise it will confuse readers into adding the byteswap back, not using byteswapping in other places where it is needed, etc.
Thanks,
Stefan
Re: [PATCH-for-6.0 v2 25/25] block/nvme: Simplify Completion Queue Command Identifier field use
Quoted 49 lines · Stefan Hajnoczi
Quoted 36 lines · Philippe Mathieu-Daudé
The "Completion Queue Entry: DW 2" describes it as:
This identifier is assigned by host software when the command is submitted to the Submission
As the is just an opaque cookie, it is pointless to byte-swap it.
Suggested-by Keith Busch <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)block/nvme.c +2
-2@@ -344,7 +344,7 @@ static inline int nvme_translate_error(const NvmeCqe *c)trace_nvme_error (le32_to_cpu (c->result),le16_to_cpu (c->sq_head),le16_to_cpu (c->sq_id), -le16_to_cpu (c->cid), + c->cid,le16_to_cpu (status)); }switch (status) {@@ -401,7 +401,7 @@ static bool nvme_process_completion(NVMeQueuePair *q)if (!q->cq.head) { q->cq_phase = !q->cq_phase; } - cid =le16_to_cpu (c->cid); + cid = c->cid;if (cid ==0 || cid >NVME_QUEUE_SIZE ) {warn_report ("NVMe: Unexpected CID in completion queue: %" PRIu32", " "queue size: %u" , cid,NVME_QUEUE_SIZE );block/nvme.c static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req, · line 475
Quoted 8 lines
block/nvme.c +1
-1@@ -469,7 +469,7 @@ static void nvme_submit_command(NVMeQueuePair *q, NVMeRequest *req,assert (!req->cb); req->cb = cb; req->opaque = opaque; - cmd->cid =cpu_to_le16 (req->cid); + cmd->cid = req->cid;trace_nvme_submit_command (q->s, q->index, req->cid);nvme_trace_command (cmd);Eliminating the byteswap is safe but this patch makes the code confusing, as I mentioned previously.
Quoted 5 lines
Please use a comment or macro to mark this field native endian. It's not obvious to the reader that we can skip the byteswap here.
Otherwise it will confuse readers into adding the byteswap back, not using byteswapping in other places where it is needed, etc.
OK. (This patch is for 6.0 anyway, I included because it was following the previous patch in its previous version).
Quoted 4 lines
Thanks,
Stefan
Stefan Hajnoczi
AppliedQuoted 41 lines · Philippe Mathieu-Daudé
Add a bit of tracing, clean around to finally fix few bugs. In particular, restore NVMe on Aarch64 host.
Since v1:
- addressed Stefan and Eric review comments
- dropped unnecessary patches
- added BE fix reported by KeithPatches missing review: #10, #24, #25
Supersedes: <[email protected]>
Eric Auger (4):
block/nvme: Change size and alignment of IDENTIFY response buffer block/nvme: Change size and alignment of queue block/nvme: Change size and alignment ofprp_list_pagesblock/nvme: Align iov's va and size on host page sizePhilippe Mathieu-Daudé (21):
MAINTAINERS: Cover 'block/nvme.h' file
block/nvme: Use hex format to display offset in trace events block/nvme: Report warning withwarn_report()
block/nvme: Trace controller capabilities
block/nvme: Tracenvme_poll_queue()per queue
block/nvme: Improvenvme_free_req_queue_wait()trace information block/nvme: Trace queue pair creation/deletion
block/nvme: Move definitions before structure declarations block/nvme: Use unsigned integer for queue counter/size block/nvme: Makenvme_identify()return boolean indicating error block/nvme: Makenvme_init_queue()return boolean indicating error block/nvme: Introduce Completion Queue definitions block/nvme: Use definitions instead of magic values inadd_io_queue()block/nvme: Correctly initialize Admin Queue Attributes block/nvme: Simplify ADMIN queue access
block/nvme: Simplifynvme_cmd_sync()
block/nvme: Setrequest_alignmentat initialization block/nvme: Correct minimum device page size
block/nvme: Fix use of write-only doorbells page on Aarch64 arch block/nvme: Fixnvme_submit_command()on big-endian host block/nvme: Simplify Completion Queue Command Identifier field use
Quoted 10 lines
include/block/nvme.h | 18 ++-- block/nvme.c | 213 ++++++++++++++++++++++++------------------- MAINTAINERS | 2 + block/trace-events | 30 +++--- 4 files changed, 150 insertions(+), 113 deletions(-)Signature · 1 line
2.26.2
Thanks, applied the 5.2 patches to my block tree:
https://gitlab.com/stefanha/qemu/commits/block
Stefan