diff options
author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2017-03-24 17:44:06 +1100 |
---|---|---|
committer | Alex Williamson <alex.williamson@redhat.com> | 2017-04-11 13:38:46 -0600 |
commit | 1282ba7fc28dbc66c3f0e4aaafaaa228361d1ae5 (patch) | |
tree | b5e3008a8b5b2a3abc4216ede9192b1430d66e5c /drivers/vfio/vfio_iommu_spapr_tce.c | |
parent | 39da7c509acff13fc8cb12ec1bb20337c988ed36 (diff) | |
download | op-kernel-dev-1282ba7fc28dbc66c3f0e4aaafaaa228361d1ae5.zip op-kernel-dev-1282ba7fc28dbc66c3f0e4aaafaaa228361d1ae5.tar.gz |
vfio/powerpc/spapr_tce: Enforce IOMMU type compatibility check
The existing SPAPR TCE driver advertises both VFIO_SPAPR_TCE_IOMMU and
VFIO_SPAPR_TCE_v2_IOMMU types to the userspace and the userspace usually
picks the v2.
Normally the userspace would create a container, attach an IOMMU group
to it and only then set the IOMMU type (which would normally be v2).
However a specific IOMMU group may not support v2, in other words
it may not implement set_window/unset_window/take_ownership/
release_ownership and such a group should not be attached to
a v2 container.
This adds extra checks that a new group can do what the selected IOMMU
type suggests. The userspace can then test the return value from
ioctl(VFIO_SET_IOMMU, VFIO_SPAPR_TCE_v2_IOMMU) and try
VFIO_SPAPR_TCE_IOMMU.
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio/vfio_iommu_spapr_tce.c')
-rw-r--r-- | drivers/vfio/vfio_iommu_spapr_tce.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c index cf3de91..a7d8115 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -1335,8 +1335,16 @@ static int tce_iommu_attach_group(void *iommu_data, if (!table_group->ops || !table_group->ops->take_ownership || !table_group->ops->release_ownership) { + if (container->v2) { + ret = -EPERM; + goto unlock_exit; + } ret = tce_iommu_take_ownership(container, table_group); } else { + if (!container->v2) { + ret = -EPERM; + goto unlock_exit; + } ret = tce_iommu_take_ownership_ddw(container, table_group); if (!tce_groups_attached(container) && !container->tables[0]) container->def_window_pending = true; |