From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
qemu-block@nongnu.org, "Laurent Vivier" <lvivier@redhat.com>,
"Maxim Levitsky" <mlevitsk@redhat.com>,
"Keith Busch" <keith.busch@intel.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH 5/6] block/nvme: Align block pages queue to host page size
Date: Mon, 4 May 2020 11:46:40 +0200 [thread overview]
Message-ID: <20200504094641.4963-6-philmd@redhat.com> (raw)
In-Reply-To: <20200504094641.4963-1-philmd@redhat.com>
In nvme_create_queue_pair() we create a page list using
qemu_blockalign(), then map it with qemu_vfio_dma_map():
q->prp_list_pages = qemu_blockalign0(bs, s->page_size * NVME_QUEUE_SIZE);
r = qemu_vfio_dma_map(s->vfio, q->prp_list_pages,
s->page_size * NVME_QUEUE_SIZE, ...);
With:
s->page_size = MAX(4096, 1 << (12 + ((cap >> 48) & 0xF)));
The qemu_vfio_dma_map() documentation says "The caller need
to make sure the area is aligned to page size". While we use
multiple s->page_size as alignment, it might be not sufficient
on some hosts. Use the qemu_real_host_page_size value to be
sure the host alignment is respected.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Cc: Cédric Le Goater <clg@kaod.org>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Laurent Vivier <lvivier@redhat.com>
---
block/nvme.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/nvme.c b/block/nvme.c
index 7b7c0cc5d6..bde0d28b39 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -627,7 +627,7 @@ static int nvme_init(BlockDriverState *bs, const char *device, int namespace,
s->page_size = MAX(4096, 1 << (12 + ((cap >> 48) & 0xF)));
s->doorbell_scale = (4 << (((cap >> 32) & 0xF))) / sizeof(uint32_t);
- bs->bl.opt_mem_alignment = s->page_size;
+ bs->bl.opt_mem_alignment = MAX(qemu_real_host_page_size, s->page_size);
timeout_ms = MIN(500 * ((cap >> 24) & 0xFF), 30000);
/* Reset device to get a clean state. */
--
2.21.3
next prev parent reply other threads:[~2020-05-04 9:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 9:46 [PATCH 0/6] block/nvme: Align block pages queue to host page size Philippe Mathieu-Daudé
2020-05-04 9:46 ` [PATCH 1/6] qemu/osdep: Document qemu_memalign() and friends Philippe Mathieu-Daudé
2020-05-07 8:58 ` Stefan Hajnoczi
2020-05-04 9:46 ` [PATCH 2/6] qemu/bitmap: Document bitmap_new() returned pointer Philippe Mathieu-Daudé
2020-05-07 8:58 ` Stefan Hajnoczi
2020-05-04 9:46 ` [PATCH 3/6] sysemu/block-backend: Document blk_read()/blk_pwrite() Philippe Mathieu-Daudé
2020-05-07 8:56 ` Stefan Hajnoczi
2020-05-04 9:46 ` [PATCH 4/6] block/block: Document BlockSizes fields Philippe Mathieu-Daudé
2020-05-07 8:58 ` Stefan Hajnoczi
2020-05-04 9:46 ` Philippe Mathieu-Daudé [this message]
2020-05-05 0:34 ` [PATCH 5/6] block/nvme: Align block pages queue to host page size David Gibson
2020-05-05 8:00 ` Laurent Vivier
2020-05-05 8:23 ` Laurent Vivier
2020-05-05 9:48 ` Philippe Mathieu-Daudé
2020-05-05 15:51 ` Philippe Mathieu-Daudé
2020-05-04 9:46 ` [RFC PATCH 6/6] hw/block/nvme: Make device target agnostic Philippe Mathieu-Daudé
2020-05-04 15:36 ` Philippe Mathieu-Daudé
2020-05-07 10:04 ` Stefan Hajnoczi
2020-05-07 16:24 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200504094641.4963-6-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=fam@euphon.net \
--cc=keith.busch@intel.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=mlevitsk@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).