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, "Max Reitz" <mreitz@redhat.com>,
"Keith Busch" <kbusch@kernel.org>,
"Eric Auger" <eric.auger@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Klaus Jensen" <its@irrelevant.dk>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH-for-5.2 v2 22/25] block/nvme: Align iov's va and size on host page size
Date: Thu, 29 Oct 2020 10:33:03 +0100 [thread overview]
Message-ID: <20201029093306.1063879-23-philmd@redhat.com> (raw)
In-Reply-To: <20201029093306.1063879-1-philmd@redhat.com>
From: Eric Auger <eric.auger@redhat.com>
Make sure iov's va and size are properly aligned on the
host page size.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index e807dd56dfe..f1e2fd34cdf 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -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;
--
2.26.2
next prev parent reply other threads:[~2020-10-29 9:46 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 9:32 [PATCH-for-5.2 v2 00/25] block/nvme: Fix Aarch64 or big-endian hosts Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 01/25] MAINTAINERS: Cover 'block/nvme.h' file Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 02/25] block/nvme: Use hex format to display offset in trace events Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 03/25] block/nvme: Report warning with warn_report() Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 04/25] block/nvme: Trace controller capabilities Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 05/25] block/nvme: Trace nvme_poll_queue() per queue Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 06/25] block/nvme: Improve nvme_free_req_queue_wait() trace information Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 07/25] block/nvme: Trace queue pair creation/deletion Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 08/25] block/nvme: Move definitions before structure declarations Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 09/25] block/nvme: Use unsigned integer for queue counter/size Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 10/25] block/nvme: Make nvme_identify() return boolean indicating error Philippe Mathieu-Daudé
2020-10-30 14:03 ` Stefan Hajnoczi
2020-10-29 9:32 ` [PATCH-for-5.2 v2 11/25] block/nvme: Make nvme_init_queue() " Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 12/25] block/nvme: Introduce Completion Queue definitions Philippe Mathieu-Daudé
2020-10-30 14:03 ` Stefan Hajnoczi
2020-10-30 14:52 ` Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 13/25] block/nvme: Use definitions instead of magic values in add_io_queue() Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 14/25] block/nvme: Correctly initialize Admin Queue Attributes Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 15/25] block/nvme: Simplify ADMIN queue access Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 16/25] block/nvme: Simplify nvme_cmd_sync() Philippe Mathieu-Daudé
2020-10-30 14:25 ` Stefan Hajnoczi
2020-10-29 9:32 ` [PATCH-for-5.2 v2 17/25] block/nvme: Set request_alignment at initialization Philippe Mathieu-Daudé
2020-10-29 9:32 ` [PATCH-for-5.2 v2 18/25] block/nvme: Correct minimum device page size Philippe Mathieu-Daudé
2020-10-29 9:33 ` [PATCH-for-5.2 v2 19/25] block/nvme: Change size and alignment of IDENTIFY response buffer Philippe Mathieu-Daudé
2020-10-29 9:33 ` [PATCH-for-5.2 v2 20/25] block/nvme: Change size and alignment of queue Philippe Mathieu-Daudé
2020-10-29 9:33 ` [PATCH-for-5.2 v2 21/25] block/nvme: Change size and alignment of prp_list_pages Philippe Mathieu-Daudé
2020-10-29 9:33 ` Philippe Mathieu-Daudé [this message]
2020-10-29 9:33 ` [PATCH-for-5.2 v2 23/25] block/nvme: Fix use of write-only doorbells page on Aarch64 arch Philippe Mathieu-Daudé
2020-10-29 9:33 ` [PATCH-for-5.2 v2 24/25] block/nvme: Fix nvme_submit_command() on big-endian host Philippe Mathieu-Daudé
2020-10-30 13:57 ` Stefan Hajnoczi
2020-10-29 9:33 ` [PATCH-for-6.0 v2 25/25] block/nvme: Simplify Completion Queue Command Identifier field use Philippe Mathieu-Daudé
2020-10-30 14:00 ` Stefan Hajnoczi
2020-10-30 14:53 ` Philippe Mathieu-Daudé
2020-11-03 17:14 ` [PATCH-for-5.2 v2 00/25] block/nvme: Fix Aarch64 or big-endian hosts Stefan Hajnoczi
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=20201029093306.1063879-23-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=eric.auger@redhat.com \
--cc=fam@euphon.net \
--cc=its@irrelevant.dk \
--cc=kbusch@kernel.org \
--cc=kwolf@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).