[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v6 06/25] vfio: pass nesting iommu requirement into vfio_get_group(
From: |
Liu Yi L |
Subject: |
[RFC v6 06/25] vfio: pass nesting iommu requirement into vfio_get_group() |
Date: |
Thu, 11 Jun 2020 05:54:05 -0700 |
This patch passes the nesting requirement into vfio_get_group() to
indicate whether VFIO_TYPE1_NESTING_IOMMU is required.
Cc: Kevin Tian <kevin.tian@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Eric Auger <eric.auger@redhat.com>
Cc: Yi Sun <yi.y.sun@linux.intel.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Liu Yi L <yi.l.liu@intel.com>
---
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 2 +-
hw/vfio/common.c | 3 ++-
hw/vfio/pci.c | 9 ++++++++-
hw/vfio/platform.c | 2 +-
include/hw/vfio/vfio-common.h | 3 ++-
6 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index 95564c1..933b118 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -82,7 +82,7 @@ static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev,
Error **errp)
g_free(group_path);
- return vfio_get_group(groupid, &address_space_memory, errp);
+ return vfio_get_group(groupid, &address_space_memory, false, errp);
}
static void vfio_ap_realize(DeviceState *dev, Error **errp)
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index 6340618..45a5b94 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -464,7 +464,7 @@ static VFIOGroup *vfio_ccw_get_group(S390CCWDevice *cdev,
Error **errp)
return NULL;
}
- return vfio_get_group(groupid, &address_space_memory, errp);
+ return vfio_get_group(groupid, &address_space_memory, false, errp);
}
static void vfio_ccw_realize(DeviceState *dev, Error **errp)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 0b3593b..89c6a25 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1453,7 +1453,8 @@ static void vfio_disconnect_container(VFIOGroup *group)
}
}
-VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp)
+VFIOGroup *vfio_get_group(int groupid, AddressSpace *as,
+ bool want_nested, Error **errp)
{
VFIOGroup *group;
char path[32];
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 342dd6b..d758d7f 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -2724,6 +2724,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
int groupid;
int i, ret;
bool is_mdev;
+ bool want_nested;
if (!vdev->vbasedev.sysfsdev) {
if (!(~vdev->host.domain || ~vdev->host.bus ||
@@ -2782,7 +2783,13 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
trace_vfio_realize(vdev->vbasedev.name, groupid);
- group = vfio_get_group(groupid, pci_device_iommu_address_space(pdev),
errp);
+ if (pci_device_get_iommu_attr(pdev,
+ IOMMU_WANT_NESTING, &want_nested)) {
+ want_nested = false;
+ }
+
+ group = vfio_get_group(groupid, pci_device_iommu_address_space(pdev),
+ want_nested, errp);
if (!group) {
goto error;
}
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index ac2cefc..7ad7702 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -580,7 +580,7 @@ static int vfio_base_device_init(VFIODevice *vbasedev,
Error **errp)
trace_vfio_platform_base_device_init(vbasedev->name, groupid);
- group = vfio_get_group(groupid, &address_space_memory, errp);
+ group = vfio_get_group(groupid, &address_space_memory, false, errp);
if (!group) {
return -ENOENT;
}
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index fd56420..a77d0ed 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -174,7 +174,8 @@ void vfio_region_mmaps_set_enabled(VFIORegion *region, bool
enabled);
void vfio_region_exit(VFIORegion *region);
void vfio_region_finalize(VFIORegion *region);
void vfio_reset_handler(void *opaque);
-VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp);
+VFIOGroup *vfio_get_group(int groupid, AddressSpace *as,
+ bool want_nested, Error **errp);
void vfio_put_group(VFIOGroup *group);
int vfio_get_device(VFIOGroup *group, const char *name,
VFIODevice *vbasedev, Error **errp);
--
2.7.4
- [RFC v6 00/25] intel_iommu: expose Shared Virtual Addressing to VMs, Liu Yi L, 2020/06/11
- [RFC v6 06/25] vfio: pass nesting iommu requirement into vfio_get_group(),
Liu Yi L <=
- [RFC v6 19/25] intel_iommu: replay pasid binds after context cache invalidation, Liu Yi L, 2020/06/11
- [RFC v6 07/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support, Liu Yi L, 2020/06/11
- [RFC v6 01/25] scripts/update-linux-headers: Import iommu.h, Liu Yi L, 2020/06/11
- [RFC v6 08/25] hw/iommu: introduce HostIOMMUContext, Liu Yi L, 2020/06/11
- [RFC v6 12/25] vfio: init HostIOMMUContext per-container, Liu Yi L, 2020/06/11
- [RFC v6 02/25] header file update VFIO/IOMMU vSVA APIs kernel 5.7-rc4, Liu Yi L, 2020/06/11
- [RFC v6 14/25] intel_iommu: process PASID cache invalidation, Liu Yi L, 2020/06/11
- [RFC v6 20/25] intel_iommu: do not pass down pasid bind for PASID #0, Liu Yi L, 2020/06/11
- [RFC v6 15/25] intel_iommu: add PASID cache management infrastructure, Liu Yi L, 2020/06/11
- [RFC v6 03/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, Liu Yi L, 2020/06/11