[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v10 07/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support
From: |
Liu Yi L |
Subject: |
[RFC v10 07/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support |
Date: |
Thu, 10 Sep 2020 03:56:20 -0700 |
VFIO needs to check VFIO_TYPE1_NESTING_IOMMU support with Kernel before
further using it. e.g. requires to check IOMMU UAPI support.
Referred patch from Eric Auger: https://patchwork.kernel.org/patch/11040499/
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>
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
---
hw/vfio/common.c | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 80d7a00..af91eca 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1151,30 +1151,44 @@ static void vfio_put_address_space(VFIOAddressSpace
*space)
}
/*
- * vfio_get_iommu_type - selects the richest iommu_type (v2 first)
+ * vfio_get_iommu_type - selects the richest iommu_type (NESTING first)
*/
static int vfio_get_iommu_type(VFIOContainer *container,
+ bool want_nested,
Error **errp)
{
- int iommu_types[] = { VFIO_TYPE1v2_IOMMU, VFIO_TYPE1_IOMMU,
+ int iommu_types[] = { VFIO_TYPE1_NESTING_IOMMU,
+ VFIO_TYPE1v2_IOMMU, VFIO_TYPE1_IOMMU,
VFIO_SPAPR_TCE_v2_IOMMU, VFIO_SPAPR_TCE_IOMMU };
- int i;
+ int i, ret = -EINVAL;
for (i = 0; i < ARRAY_SIZE(iommu_types); i++) {
if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu_types[i])) {
- return iommu_types[i];
+ if (iommu_types[i] == VFIO_TYPE1_NESTING_IOMMU) {
+ if (!want_nested) {
+ continue;
+ }
+ }
+ ret = iommu_types[i];
+ break;
}
}
- error_setg(errp, "No available IOMMU models");
- return -EINVAL;
+
+ if (ret < 0) {
+ error_setg(errp, "No available IOMMU models");
+ } else if (want_nested && ret != VFIO_TYPE1_NESTING_IOMMU) {
+ error_setg(errp, "Nested mode requested but not supported");
+ ret = -EINVAL;
+ }
+ return ret;
}
static int vfio_init_container(VFIOContainer *container, int group_fd,
- Error **errp)
+ bool want_nested, Error **errp)
{
int iommu_type, ret;
- iommu_type = vfio_get_iommu_type(container, errp);
+ iommu_type = vfio_get_iommu_type(container, want_nested, errp);
if (iommu_type < 0) {
return iommu_type;
}
@@ -1205,7 +1219,7 @@ static int vfio_init_container(VFIOContainer *container,
int group_fd,
}
static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
- Error **errp)
+ bool want_nested, Error **errp)
{
VFIOContainer *container;
int ret, fd;
@@ -1276,12 +1290,13 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as,
QLIST_INIT(&container->giommu_list);
QLIST_INIT(&container->hostwin_list);
- ret = vfio_init_container(container, group->fd, errp);
+ ret = vfio_init_container(container, group->fd, want_nested, errp);
if (ret) {
goto free_container_exit;
}
switch (container->iommu_type) {
+ case VFIO_TYPE1_NESTING_IOMMU:
case VFIO_TYPE1v2_IOMMU:
case VFIO_TYPE1_IOMMU:
{
@@ -1502,7 +1517,7 @@ VFIOGroup *vfio_get_group(int groupid, AddressSpace *as,
group->groupid = groupid;
QLIST_INIT(&group->device_list);
- if (vfio_connect_container(group, as, errp)) {
+ if (vfio_connect_container(group, as, want_nested, errp)) {
error_prepend(errp, "failed to setup container for group %d: ",
groupid);
goto close_fd_exit;
--
2.7.4
- [RFC v10 00/25] intel_iommu: expose Shared Virtual Addressing to VMs, Liu Yi L, 2020/09/10
- [RFC v10 19/25] intel_iommu: replay pasid binds after context cache invalidation, Liu Yi L, 2020/09/10
- [RFC v10 22/25] intel_iommu: process PASID-based iotlb invalidation, Liu Yi L, 2020/09/10
- [RFC v10 01/25] scripts/update-linux-headers: Import iommu.h, Liu Yi L, 2020/09/10
- [RFC v10 02/25] header file update VFIO/IOMMU vSVA APIs kernel 5.9-rc2, Liu Yi L, 2020/09/10
- [RFC v10 04/25] hw/pci: introduce pci_device_get_iommu_attr(), Liu Yi L, 2020/09/10
- [RFC v10 03/25] hw/pci: modify pci_setup_iommu() to set PCIIOMMUOps, Liu Yi L, 2020/09/10
- [RFC v10 07/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support,
Liu Yi L <=
- [RFC v10 05/25] intel_iommu: add get_iommu_attr() callback, Liu Yi L, 2020/09/10
- [RFC v10 06/25] vfio: pass nesting requirement into vfio_get_group(), Liu Yi L, 2020/09/10
- [RFC v10 08/25] hw/iommu: introduce HostIOMMUContext, Liu Yi L, 2020/09/10
- [RFC v10 10/25] intel_iommu: add set/unset_iommu_context callback, Liu Yi L, 2020/09/10
- [RFC v10 09/25] hw/pci: introduce pci_device_set/unset_iommu_context(), Liu Yi L, 2020/09/10
- [RFC v10 12/25] vfio: init HostIOMMUContext per-container, Liu Yi L, 2020/09/10
- [RFC v10 11/25] vfio/common: provide PASID alloc/free hooks, Liu Yi L, 2020/09/10
- [RFC v10 13/25] intel_iommu: add virtual command capability support, Liu Yi L, 2020/09/10
- [RFC v10 14/25] intel_iommu: process PASID cache invalidation, Liu Yi L, 2020/09/10
- [RFC v10 16/25] vfio: add bind stage-1 page table support, Liu Yi L, 2020/09/10