| Message ID | 1442495357-26547-5-git-send-email-david@gibson.dropbear.id.au |
|---|---|
| State | New |
| Headers | show |
On 17/09/15 15:09, David Gibson wrote: > Depending on the host IOMMU type we determine and record the available page > sizes for IOMMU translation. We'll need this for other validation in > future patches. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/vfio/common.c | 13 +++++++++++++ > include/hw/vfio/vfio-common.h | 1 + > 2 files changed, 14 insertions(+) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index c37f1a1..daaac48 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -680,6 +680,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; > > ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd); > if (ret) { > @@ -705,6 +706,15 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) > */ > container->iommu_data.min_iova = 0; > container->iommu_data.max_iova = (hwaddr)-1; > + > + /* Assume just 4K IOVA page size */ > + container->iommu_data.iova_pgsizes = 0x1000; > + info.argsz = sizeof(info); > + ret = ioctl(fd, VFIO_IOMMU_GET_INFO, &info); > + /* Ignore errors */ > + if ((ret == 0) && (info.flags & VFIO_IOMMU_INFO_PGSIZES)) { > + container->iommu_data.iova_pgsizes = info.iova_pgsizes; > + } > } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { > struct vfio_iommu_spapr_tce_info info; > > @@ -748,6 +758,9 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) > container->iommu_data.min_iova = info.dma32_window_start; > container->iommu_data.max_iova = container->iommu_data.min_iova > + info.dma32_window_size - 1; > + > + /* Assume just 4K IOVA pages for now */ > + container->iommu_data.iova_pgsizes = 0x1000; > } else { > error_report("vfio: No available IOMMU models"); > ret = -EINVAL; > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 88ec213..c09db6d 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -77,6 +77,7 @@ typedef struct VFIOContainer { > * that in future > */ > hwaddr min_iova, max_iova; > + uint64_t iova_pgsizes; > } iommu_data; > QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; > QLIST_HEAD(, VFIOGroup) group_list; Reviewed-by: Thomas Huth <thuth@redhat.com>
On 17/09/2015 15:09, David Gibson wrote: > Depending on the host IOMMU type we determine and record the available page > sizes for IOMMU translation. We'll need this for other validation in > future patches. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/vfio/common.c | 13 +++++++++++++ > include/hw/vfio/vfio-common.h | 1 + > 2 files changed, 14 insertions(+) > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index c37f1a1..daaac48 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -680,6 +680,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; > > ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd); > if (ret) { > @@ -705,6 +706,15 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) > */ > container->iommu_data.min_iova = 0; > container->iommu_data.max_iova = (hwaddr)-1; > + > + /* Assume just 4K IOVA page size */ > + container->iommu_data.iova_pgsizes = 0x1000; > + info.argsz = sizeof(info); > + ret = ioctl(fd, VFIO_IOMMU_GET_INFO, &info); > + /* Ignore errors */ > + if ((ret == 0) && (info.flags & VFIO_IOMMU_INFO_PGSIZES)) { > + container->iommu_data.iova_pgsizes = info.iova_pgsizes; > + } > } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { > struct vfio_iommu_spapr_tce_info info; > > @@ -748,6 +758,9 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) > container->iommu_data.min_iova = info.dma32_window_start; > container->iommu_data.max_iova = container->iommu_data.min_iova > + info.dma32_window_size - 1; > + > + /* Assume just 4K IOVA pages for now */ > + container->iommu_data.iova_pgsizes = 0x1000; > } else { > error_report("vfio: No available IOMMU models"); > ret = -EINVAL; > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 88ec213..c09db6d 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -77,6 +77,7 @@ typedef struct VFIOContainer { > * that in future > */ > hwaddr min_iova, max_iova; > + uint64_t iova_pgsizes; > } iommu_data; > QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; > QLIST_HEAD(, VFIOGroup) group_list; > Reviewed-by: Laurent Vivier <lvivier@redhat.com>
diff --git a/hw/vfio/common.c b/hw/vfio/common.c index c37f1a1..daaac48 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -680,6 +680,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; ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd); if (ret) { @@ -705,6 +706,15 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) */ container->iommu_data.min_iova = 0; container->iommu_data.max_iova = (hwaddr)-1; + + /* Assume just 4K IOVA page size */ + container->iommu_data.iova_pgsizes = 0x1000; + info.argsz = sizeof(info); + ret = ioctl(fd, VFIO_IOMMU_GET_INFO, &info); + /* Ignore errors */ + if ((ret == 0) && (info.flags & VFIO_IOMMU_INFO_PGSIZES)) { + container->iommu_data.iova_pgsizes = info.iova_pgsizes; + } } else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) { struct vfio_iommu_spapr_tce_info info; @@ -748,6 +758,9 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as) container->iommu_data.min_iova = info.dma32_window_start; container->iommu_data.max_iova = container->iommu_data.min_iova + info.dma32_window_size - 1; + + /* Assume just 4K IOVA pages for now */ + container->iommu_data.iova_pgsizes = 0x1000; } else { error_report("vfio: No available IOMMU models"); ret = -EINVAL; diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 88ec213..c09db6d 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -77,6 +77,7 @@ typedef struct VFIOContainer { * that in future */ hwaddr min_iova, max_iova; + uint64_t iova_pgsizes; } iommu_data; QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; QLIST_HEAD(, VFIOGroup) group_list;
Depending on the host IOMMU type we determine and record the available page sizes for IOMMU translation. We'll need this for other validation in future patches. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/vfio/common.c | 13 +++++++++++++ include/hw/vfio/vfio-common.h | 1 + 2 files changed, 14 insertions(+)