[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/16] util/vfio-helpers: Report error when IOMMU page size is no
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/16] util/vfio-helpers: Report error when IOMMU page size is not supported |
Date: |
Tue, 20 Oct 2020 19:24:16 +0200 |
This driver uses the host page size to align its memory regions,
but this size is not always compatible with the IOMMU. Add a
check if the size matches, and bails out providing a hint what
is the minimum page size the driver should use.
Suggested-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
util/vfio-helpers.c | 28 ++++++++++++++++++++++++++--
util/trace-events | 1 +
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index a2b084c69c1..bce2cdb2f3c 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -11,6 +11,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include <sys/ioctl.h>
#include <linux/vfio.h>
#include "qapi/error.h"
@@ -273,7 +274,7 @@ static void collect_usable_iova_ranges(QEMUVFIOState *s,
void *buf)
}
static int qemu_vfio_init_pci(QEMUVFIOState *s, const char *device,
- Error **errp)
+ size_t *requested_page_size, Error **errp)
{
int ret;
int i;
@@ -284,6 +285,8 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const char
*device,
struct vfio_device_info device_info = { .argsz = sizeof(device_info) };
char *group_file = NULL;
+ assert(requested_page_size && is_power_of_2(*requested_page_size));
+
s->usable_iova_ranges = NULL;
/* Create a new container */
@@ -358,6 +361,27 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const char
*device,
ret = -errno;
goto fail;
}
+ if (!(iommu_info->flags & VFIO_IOMMU_INFO_PGSIZES)) {
+ error_setg(errp, "Failed to get IOMMU page size info");
+ ret = -EINVAL;
+ goto fail;
+ }
+ trace_qemu_vfio_iommu_iova_pgsizes(iommu_info->iova_pgsizes);
+ if (!(iommu_info->iova_pgsizes & *requested_page_size)) {
+ g_autofree char *req_page_size_str = size_to_str(*requested_page_size);
+ g_autofree char *min_page_size_str = NULL;
+ uint64_t pgsizes_masked;
+
+ pgsizes_masked = MAKE_64BIT_MASK(0, ctz64(*requested_page_size));
+ *requested_page_size = 1U << ctz64(iommu_info->iova_pgsizes
+ & ~pgsizes_masked);
+ min_page_size_str = size_to_str(*requested_page_size);
+ error_setg(errp, "Unsupported IOMMU page size: %s", req_page_size_str);
+ error_append_hint(errp, "Minimum IOMMU page size: %s\n",
+ min_page_size_str);
+ ret = -EINVAL;
+ goto fail;
+ }
/*
* if the kernel does not report usable IOVA regions, choose
@@ -500,7 +524,7 @@ QEMUVFIOState *qemu_vfio_open_pci(const char *device,
size_t *min_page_size,
int r;
QEMUVFIOState *s = g_new0(QEMUVFIOState, 1);
- r = qemu_vfio_init_pci(s, device, errp);
+ r = qemu_vfio_init_pci(s, device, min_page_size, errp);
if (r) {
g_free(s);
return NULL;
diff --git a/util/trace-events b/util/trace-events
index 24c31803b01..19f03f14a33 100644
--- a/util/trace-events
+++ b/util/trace-events
@@ -85,3 +85,4 @@ qemu_vfio_new_mapping(void *s, void *host, size_t size, int
index, uint64_t iova
qemu_vfio_do_mapping(void *s, void *host, size_t size, uint64_t iova) "s %p
host %p size 0x%zx iova 0x%"PRIx64
qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t
*iova) "s %p host %p size 0x%zx temporary %d iova %p"
qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p"
+qemu_vfio_iommu_iova_pgsizes(uint64_t iova_pgsizes) "iommu page size bitmask:
0x%08"PRIx64
--
2.26.2
- [PATCH 00/16] util/vfio-helpers: Allow using multiple MSIX IRQs, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 01/16] block/nvme: Correct minimum device page size, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 02/16] util/vfio-helpers: Improve reporting unsupported IOMMU type, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 03/16] util/vfio-helpers: Pass minimum page size to qemu_vfio_open_pci(), Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 04/16] util/vfio-helpers: Report error when IOMMU page size is not supported,
Philippe Mathieu-Daudé <=
- [PATCH 05/16] util/vfio-helpers: Trace PCI I/O config accesses, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 06/16] util/vfio-helpers: Trace PCI BAR region info, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 07/16] util/vfio-helpers: Trace where BARs are mapped, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 08/16] util/vfio-helpers: Improve DMA trace events, Philippe Mathieu-Daudé, 2020/10/20
- [PATCH 09/16] util/vfio-helpers: Convert vfio_dump_mapping to trace events, Philippe Mathieu-Daudé, 2020/10/20