[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [RFC v5 2/8] hw: vfio: common: vfio_get_iommu_type1_info
From: |
Eric Auger |
Subject: |
[Qemu-arm] [RFC v5 2/8] hw: vfio: common: vfio_get_iommu_type1_info |
Date: |
Mon, 17 Oct 2016 19:38:24 +0000 |
Introduce vfio_get_iommu_type1_info helper that allows to handle
variable size vfio_iommu_type1_info allocation with capability
chain support.
Besides, fixes a checkpatch warning on vfio_host_win_add's call.
Signed-off-by: Eric Auger <address@hidden>
---
hw/vfio/common.c | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 29188a1..4f4014e 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -900,6 +900,27 @@ static void vfio_put_address_space(VFIOAddressSpace *space)
}
}
+static int vfio_get_iommu_type1_info(int fd,
+ struct vfio_iommu_type1_info **pinfo)
+{
+ size_t argsz = sizeof(struct vfio_iommu_type1_info);
+
+ *pinfo = g_malloc0(argsz);
+retry:
+ (*pinfo)->argsz = argsz;
+
+ if (ioctl(fd, VFIO_IOMMU_GET_INFO, *pinfo)) {
+ return -errno;
+ }
+ if ((*pinfo)->argsz > argsz) {
+ argsz = (*pinfo)->argsz;
+ *pinfo = g_realloc(*pinfo, argsz);
+ goto retry;
+ }
+ return 0;
+}
+
+
static int vfio_connect_container(VFIOGroup *group, AddressSpace *as)
{
VFIOContainer *container;
@@ -937,7 +958,7 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1_IOMMU) ||
ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1v2_IOMMU)) {
bool v2 = !!ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_TYPE1v2_IOMMU);
- struct vfio_iommu_type1_info info;
+ struct vfio_iommu_type1_info *pinfo;
ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd);
if (ret) {
@@ -961,14 +982,14 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
* existing Type1 IOMMUs generally support any IOVA we're
* going to actually try in practice.
*/
- info.argsz = sizeof(info);
- ret = ioctl(fd, VFIO_IOMMU_GET_INFO, &info);
+ vfio_get_iommu_type1_info(fd, &pinfo);
/* Ignore errors */
- if (ret || !(info.flags & VFIO_IOMMU_INFO_PGSIZES)) {
+ if (ret || !(pinfo->flags & VFIO_IOMMU_INFO_PGSIZES)) {
/* Assume 4k IOVA page size */
- info.iova_pgsizes = 4096;
+ pinfo->iova_pgsizes = 4096;
}
- vfio_host_win_add(container, 0, (hwaddr)-1, info.iova_pgsizes);
+ vfio_host_win_add(container, 0, (hwaddr)(-1), pinfo->iova_pgsizes);
+ g_free(pinfo);
} else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU) ||
ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_v2_IOMMU)) {
struct vfio_iommu_spapr_tce_info info;
--
1.9.1
- [Qemu-arm] [RFC v5 0/8] KVM PCI/MSI passthrough with mach-virt, Eric Auger, 2016/10/17
- [Qemu-arm] [RFC v5 1/8] linux-headers: Partial update for MSI IOVA handling, Eric Auger, 2016/10/17
- [Qemu-arm] [RFC v5 2/8] hw: vfio: common: vfio_get_iommu_type1_info,
Eric Auger <=
- [Qemu-arm] [RFC v5 3/8] memory: Add reserved_iova region type, Eric Auger, 2016/10/17
- [Qemu-arm] [RFC v5 4/8] memory: memory_region_find_by_name, Eric Auger, 2016/10/17
- [Qemu-arm] [RFC v5 5/8] hw: platform-bus: Enable to map any memory region onto the platform-bus, Eric Auger, 2016/10/17
- [Qemu-arm] [RFC v5 6/8] hw: platform-bus: Add platform bus stub, Eric Auger, 2016/10/17
- [Qemu-arm] [RFC v5 7/8] hw: vfio: common: vfio_prepare_msi_mapping, Eric Auger, 2016/10/17
- [Qemu-arm] [RFC v5 8/8] hw: vfio: common: Adapt vfio_listeners for reserved_iova region, Eric Auger, 2016/10/17
- Re: [Qemu-arm] [Qemu-devel] [RFC v5 0/8] KVM PCI/MSI passthrough with mach-virt, no-reply, 2016/10/17