[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/33] block/nvme: Align iov's va and size on host page size
From: |
Stefan Hajnoczi |
Subject: |
[PULL 24/33] block/nvme: Align iov's va and size on host page size |
Date: |
Wed, 4 Nov 2020 15:18:19 +0000 |
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>
Message-id: 20201029093306.1063879-23-philmd@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
---
block/nvme.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index e807dd56df..f1e2fd34cd 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.28.0
- [PULL 14/33] block/nvme: Introduce Completion Queue definitions, (continued)
- [PULL 14/33] block/nvme: Introduce Completion Queue definitions, Stefan Hajnoczi, 2020/11/04
- [PULL 15/33] block/nvme: Use definitions instead of magic values in add_io_queue(), Stefan Hajnoczi, 2020/11/04
- [PULL 16/33] block/nvme: Correctly initialize Admin Queue Attributes, Stefan Hajnoczi, 2020/11/04
- [PULL 17/33] block/nvme: Simplify ADMIN queue access, Stefan Hajnoczi, 2020/11/04
- [PULL 18/33] block/nvme: Simplify nvme_cmd_sync(), Stefan Hajnoczi, 2020/11/04
- [PULL 19/33] block/nvme: Set request_alignment at initialization, Stefan Hajnoczi, 2020/11/04
- [PULL 20/33] block/nvme: Correct minimum device page size, Stefan Hajnoczi, 2020/11/04
- [PULL 22/33] block/nvme: Change size and alignment of queue, Stefan Hajnoczi, 2020/11/04
- [PULL 21/33] block/nvme: Change size and alignment of IDENTIFY response buffer, Stefan Hajnoczi, 2020/11/04
- [PULL 23/33] block/nvme: Change size and alignment of prp_list_pages, Stefan Hajnoczi, 2020/11/04
- [PULL 24/33] block/nvme: Align iov's va and size on host page size,
Stefan Hajnoczi <=
- [PULL 26/33] block/nvme: Fix nvme_submit_command() on big-endian host, Stefan Hajnoczi, 2020/11/04
- [PULL 25/33] block/nvme: Fix use of write-only doorbells page on Aarch64 arch, Stefan Hajnoczi, 2020/11/04
- [PULL 27/33] util/vfio-helpers: Improve reporting unsupported IOMMU type, Stefan Hajnoczi, 2020/11/04
- [PULL 29/33] util/vfio-helpers: Trace PCI BAR region info, Stefan Hajnoczi, 2020/11/04
- [PULL 28/33] util/vfio-helpers: Trace PCI I/O config accesses, Stefan Hajnoczi, 2020/11/04
- [PULL 31/33] util/vfio-helpers: Improve DMA trace events, Stefan Hajnoczi, 2020/11/04
- [PULL 30/33] util/vfio-helpers: Trace where BARs are mapped, Stefan Hajnoczi, 2020/11/04
- [PULL 32/33] util/vfio-helpers: Convert vfio_dump_mapping to trace events, Stefan Hajnoczi, 2020/11/04
- [PULL 33/33] util/vfio-helpers: Assert offset is aligned to page size, Stefan Hajnoczi, 2020/11/04
- Re: [PULL 00/33] Block patches, Peter Maydell, 2020/11/04