| Message ID | 1580300216-86172-10-git-send-email-yi.l.liu@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | intel_iommu: expose Shared Virtual Addressing to VMs | expand |
On Wed, Jan 29, 2020 at 04:16:40AM -0800, Liu, Yi L wrote: > From: Liu Yi L <yi.l.liu@intel.com> > > VFIO needs to check VFIO_TYPE1_NESTING_IOMMU > support with Kernel before further using it. > e.g. requires to check IOMMU UAPI version. > > 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: Yi Sun <yi.y.sun@linux.intel.com> > --- > hw/vfio/common.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 0cc7ff5..a5e70b1 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -1157,12 +1157,21 @@ static void vfio_put_address_space(VFIOAddressSpace *space) > static int vfio_get_iommu_type(VFIOContainer *container, > 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, version; > > for (i = 0; i < ARRAY_SIZE(iommu_types); i++) { > if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu_types[i])) { > + if (iommu_types[i] == VFIO_TYPE1_NESTING_IOMMU) { > + version = ioctl(container->fd, > + VFIO_NESTING_GET_IOMMU_UAPI_VERSION); > + if (version < IOMMU_UAPI_VERSION) { > + printf("IOMMU UAPI incompatible for nesting\n"); There should have better alternatives than printf()... Maybe warn_report()? > + continue; > + } > + } > return iommu_types[i]; > } > } > @@ -1278,6 +1287,7 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as, > } > > switch (container->iommu_type) { > + case VFIO_TYPE1_NESTING_IOMMU: > case VFIO_TYPE1v2_IOMMU: > case VFIO_TYPE1_IOMMU: > { > -- > 2.7.4 >
> From: Peter Xu <peterx@redhat.com> > Sent: Wednesday, February 12, 2020 3:08 AM > Subject: Re: [RFC v3 09/25] vfio: check VFIO_TYPE1_NESTING_IOMMU support > > On Wed, Jan 29, 2020 at 04:16:40AM -0800, Liu, Yi L wrote: > > From: Liu Yi L <yi.l.liu@intel.com> > > > > VFIO needs to check VFIO_TYPE1_NESTING_IOMMU support with Kernel > > before further using it. > > e.g. requires to check IOMMU UAPI version. > > > > 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: Yi Sun <yi.y.sun@linux.intel.com> > > --- > > hw/vfio/common.c | 14 ++++++++++++-- > > 1 file changed, 12 insertions(+), 2 deletions(-) > > > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c index > > 0cc7ff5..a5e70b1 100644 > > --- a/hw/vfio/common.c > > +++ b/hw/vfio/common.c > > @@ -1157,12 +1157,21 @@ static void > > vfio_put_address_space(VFIOAddressSpace *space) static int > vfio_get_iommu_type(VFIOContainer *container, > > 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, version; > > > > for (i = 0; i < ARRAY_SIZE(iommu_types); i++) { > > if (ioctl(container->fd, VFIO_CHECK_EXTENSION, > > iommu_types[i])) { > > + if (iommu_types[i] == VFIO_TYPE1_NESTING_IOMMU) { > > + version = ioctl(container->fd, > > + VFIO_NESTING_GET_IOMMU_UAPI_VERSION); > > + if (version < IOMMU_UAPI_VERSION) { > > + printf("IOMMU UAPI incompatible for nesting\n"); > > There should have better alternatives than printf()... Maybe warn_report()? Got it. thanks.
diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 0cc7ff5..a5e70b1 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -1157,12 +1157,21 @@ static void vfio_put_address_space(VFIOAddressSpace *space) static int vfio_get_iommu_type(VFIOContainer *container, 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, version; for (i = 0; i < ARRAY_SIZE(iommu_types); i++) { if (ioctl(container->fd, VFIO_CHECK_EXTENSION, iommu_types[i])) { + if (iommu_types[i] == VFIO_TYPE1_NESTING_IOMMU) { + version = ioctl(container->fd, + VFIO_NESTING_GET_IOMMU_UAPI_VERSION); + if (version < IOMMU_UAPI_VERSION) { + printf("IOMMU UAPI incompatible for nesting\n"); + continue; + } + } return iommu_types[i]; } } @@ -1278,6 +1287,7 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as, } switch (container->iommu_type) { + case VFIO_TYPE1_NESTING_IOMMU: case VFIO_TYPE1v2_IOMMU: case VFIO_TYPE1_IOMMU: {