[HACK. will fix in v2]
There are two options to impelement vfio type1v2 mapping semantics in
/dev/iommu.
One is to duplicate the related code from vfio as the starting point,
and then merge with vfio type1 at a later time. However vfio_iommu_type1.c
has over 3000LOC with ~80% related to dma management logic, including:
- the dma map/unmap metadata management
- page pinning, and related accounting
- iova range reporting
- dirty bitmap retrieving
- dynamic vaddr update, etc.
Not sure whether duplicating such amount of code in the transition phase
is acceptable.
The alternative is to consolidate type1v2 logic in /dev/iommu immediately,
which requires converting vfio_iommu_type1 to be a shim driver. The upside
is no code duplication and it is anyway the long-term goal even with the
first approach. The downside is that more effort is required for the
'initial' skeleton thus all new iommu features will be blocked for a longer
time. Main task is to figure out how to handle the remaining 20% code (tied
with group) in vfio_iommu_type1 with device-centric model in iommufd (with
group managed by iommu core). It also implies that no-snoop DMA must be
handled now with extra work on reworked kvm-vfio contract. and also need
to support external page pinning as required by sw mdev.
Due to limited time, we choose a hacky approach in this RFC by directly
calling vfio_iommu_type1 functions in iommufd and raising this open for
discussion. This should not impact the review on other key aspects of the
new framework. Once we reach consensus, we'll follow it to do a clean
implementation 'in' next version.
Signed-off-by: Liu Yi L <yi.l.liu@xxxxxxxxx>
---
drivers/vfio/vfio_iommu_type1.c | 199 +++++++++++++++++++++++++++++++-
include/linux/vfio.h | 13 +++
2 files changed, 206 insertions(+), 6 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 0b4f7c174c7a..c1c6bc803d94 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -115,6 +115,7 @@ struct vfio_iommu_group {
struct list_head next;
bool mdev_group; /* An mdev group */
bool pinned_page_dirty_scope;
+ int attach_cnt;
};
struct vfio_iova {
@@ -2240,6 +2241,135 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu,
list_splice_tail(iova_copy, iova);
}
+/* HACK: called by /dev/iommu core to init group to vfio_iommu_type1 */
+int vfio_iommu_add_group(struct vfio_iommu *iommu,
+ struct iommu_group *iommu_group,
+ struct iommu_domain *iommu_domain)
+{
+ struct vfio_iommu_group *group;
+ struct vfio_domain *domain = NULL;
+ struct bus_type *bus = NULL;
+ int ret = 0;
+ bool resv_msi, msi_remap;
+ phys_addr_t resv_msi_base = 0;
+ struct iommu_domain_geometry *geo;
+ LIST_HEAD(iova_copy);
+ LIST_HEAD(group_resv_regions);
+
+ /* Determine bus_type */
+ ret = iommu_group_for_each_dev(iommu_group, &bus, vfio_bus_type);
+ if (ret)
+ return ret;
+
+ mutex_lock(&iommu->lock);
+
+ /* Check for duplicates */
+ group = vfio_iommu_find_iommu_group(iommu, iommu_group);
+ if (group) {
+ group->attach_cnt++;
+ mutex_unlock(&iommu->lock);
+ return 0;
+ }
+
+ /* Get aperture info */
+ geo = &iommu_domain->geometry;
+ if (vfio_iommu_aper_conflict(iommu, geo->aperture_start,
+ geo->aperture_end)) {
+ ret = -EINVAL;
+ goto out_free;
+ }
+
+ ret = iommu_get_group_resv_regions(iommu_group, &group_resv_regions);
+ if (ret)
+ goto out_free;
+
+ if (vfio_iommu_resv_conflict(iommu, &group_resv_regions)) {
+ ret = -EINVAL;
+ goto out_free;
+ }
+
+ /*
+ * We don't want to work on the original iova list as the list
+ * gets modified and in case of failure we have to retain the
+ * original list. Get a copy here.
+ */
+ ret = vfio_iommu_iova_get_copy(iommu, &iova_copy);
+ if (ret)
+ goto out_free;
+
+ ret = vfio_iommu_aper_resize(&iova_copy, geo->aperture_start,
+ geo->aperture_end);
+ if (ret)
+ goto out_free;
+
+ ret = vfio_iommu_resv_exclude(&iova_copy, &group_resv_regions);
+ if (ret)
+ goto out_free;
+
+ resv_msi = vfio_iommu_has_sw_msi(&group_resv_regions, &resv_msi_base);
+
+ msi_remap = irq_domain_check_msi_remap() ||
+ iommu_capable(bus, IOMMU_CAP_INTR_REMAP);
+
+ if (!allow_unsafe_interrupts && !msi_remap) {
+ pr_warn("%s: No interrupt remapping support. Use the module param \"allow_unsafe_interrupts\" to enable VFIO IOMMU support on this platform\n",
+ __func__);
+ ret = -EPERM;
+ goto out_free;
+ }
+
+ if (resv_msi) {
+ ret = iommu_get_msi_cookie(iommu_domain, resv_msi_base);
+ if (ret && ret != -ENODEV)
+ goto out_free;
+ }
+
+ group = kzalloc(sizeof(*group), GFP_KERNEL);
+ if (!group) {
+ ret = -ENOMEM;
+ goto out_free;
+ }
+
+ group->iommu_group = iommu_group;
+
+ if (!list_empty(&iommu->domain_list)) {
+ domain = list_first_entry(&iommu->domain_list,
+ struct vfio_domain, next);
+ } else {
+ domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+ if (!domain) {
+ kfree(group);
+ ret = -ENOMEM;
+ goto out_free;
+ }
+ domain->domain = iommu_domain;
+ INIT_LIST_HEAD(&domain->group_list);
+ list_add(&domain->next, &iommu->domain_list);
+ }
+
+ list_add(&group->next, &domain->group_list);
+
+ vfio_test_domain_fgsp(domain);
+
+ vfio_update_pgsize_bitmap(iommu);
+
+ /* Delete the old one and insert new iova list */
+ vfio_iommu_iova_insert_copy(iommu, &iova_copy);
+
+ group->attach_cnt = 1;
+ mutex_unlock(&iommu->lock);
+ vfio_iommu_resv_free(&group_resv_regions);
+
+ return 0;
+
+out_free:
+ vfio_iommu_iova_free(&iova_copy);
+ vfio_iommu_resv_free(&group_resv_regions);
+ mutex_unlock(&iommu->lock);
+ return ret;
+}
+EXPORT_SYMBOL_GPL(vfio_iommu_add_group);
+
static int vfio_iommu_type1_attach_group(void *iommu_data,
struct iommu_group *iommu_group)
{
@@ -2557,6 +2687,59 @@ static int vfio_iommu_resv_refresh(struct vfio_iommu *iommu,
return ret;
}
+/* HACK: called by /dev/iommu core to remove group to vfio_iommu_type1 */
+void vfio_iommu_remove_group(struct vfio_iommu *iommu,
+ struct iommu_group *iommu_group)
+{
+ struct vfio_iommu_group *group;
+ struct vfio_domain *domain = NULL;
+ LIST_HEAD(iova_copy);
+
+ mutex_lock(&iommu->lock);
+ domain = list_first_entry(&iommu->domain_list,
+ struct vfio_domain, next);
+ group = find_iommu_group(domain, iommu_group);
+ if (!group) {
+ mutex_unlock(&iommu->lock);
+ return;
+ }
+
+ if (!--group->attach_cnt) {
+ mutex_unlock(&iommu->lock);
+ return;
+ }
+
+ /*
+ * Get a copy of iova list. This will be used to update
+ * and to replace the current one later. Please note that
+ * we will leave the original list as it is if update fails.
+ */
+ vfio_iommu_iova_get_copy(iommu, &iova_copy);
+
+ list_del(&group->next);
+ kfree(group);
+ /*
+ * Group ownership provides privilege, if the device list is
+ * empty, the domain goes away.
+ */
+ if (list_empty(&domain->group_list)) {
+ WARN_ON(iommu->notifier.head);
+ vfio_iommu_unmap_unpin_all(iommu);
+ list_del(&domain->next);
+ kfree(domain);
+ vfio_iommu_aper_expand(iommu, &iova_copy);
+ vfio_update_pgsize_bitmap(iommu);
+ }
+
+ if (!vfio_iommu_resv_refresh(iommu, &iova_copy))
+ vfio_iommu_iova_insert_copy(iommu, &iova_copy);
+ else
+ vfio_iommu_iova_free(&iova_copy);
+
+ mutex_unlock(&iommu->lock);
+}
+EXPORT_SYMBOL_GPL(vfio_iommu_remove_group);
+
static void vfio_iommu_type1_detach_group(void *iommu_data,
struct iommu_group *iommu_group)
{
@@ -2647,7 +2830,7 @@ static void vfio_iommu_type1_detach_group(void *iommu_data,
mutex_unlock(&iommu->lock);
}
-static void *vfio_iommu_type1_open(unsigned long arg)
+void *vfio_iommu_type1_open(unsigned long arg)
{
struct vfio_iommu *iommu;
@@ -2680,6 +2863,7 @@ static void *vfio_iommu_type1_open(unsigned long arg)
return iommu;
}
+EXPORT_SYMBOL_GPL(vfio_iommu_type1_open);
static void vfio_release_domain(struct vfio_domain *domain, bool external)
{
@@ -2697,7 +2881,7 @@ static void vfio_release_domain(struct vfio_domain *domain, bool external)
iommu_domain_free(domain->domain);
}
-static void vfio_iommu_type1_release(void *iommu_data)
+void vfio_iommu_type1_release(void *iommu_data)
{
struct vfio_iommu *iommu = iommu_data;
struct vfio_domain *domain, *domain_tmp;
@@ -2720,6 +2904,7 @@ static void vfio_iommu_type1_release(void *iommu_data)
kfree(iommu);
}
+EXPORT_SYMBOL_GPL(vfio_iommu_type1_release);
static int vfio_domains_have_iommu_cache(struct vfio_iommu *iommu)
{
@@ -2913,8 +3098,8 @@ static int vfio_iommu_type1_get_info(struct vfio_iommu *iommu,
-EFAULT : 0;
}
-static int vfio_iommu_type1_map_dma(struct vfio_iommu *iommu,
- unsigned long arg)
+int vfio_iommu_type1_map_dma(struct vfio_iommu *iommu,
+ unsigned long arg)
{
struct vfio_iommu_type1_dma_map map;
unsigned long minsz;
@@ -2931,9 +3116,10 @@ static int vfio_iommu_type1_map_dma(struct vfio_iommu *iommu,
return vfio_dma_do_map(iommu, &map);
}
+EXPORT_SYMBOL_GPL(vfio_iommu_type1_map_dma);
-static int vfio_iommu_type1_unmap_dma(struct vfio_iommu *iommu,
- unsigned long arg)
+int vfio_iommu_type1_unmap_dma(struct vfio_iommu *iommu,
+ unsigned long arg)
{
struct vfio_iommu_type1_dma_unmap unmap;
struct vfio_bitmap bitmap = { 0 };
@@ -2984,6 +3170,7 @@ static int vfio_iommu_type1_unmap_dma(struct vfio_iommu *iommu,
return copy_to_user((void __user *)arg, &unmap, minsz) ?
-EFAULT : 0;
}
+EXPORT_SYMBOL_GPL(vfio_iommu_type1_unmap_dma);
static int vfio_iommu_type1_dirty_pages(struct vfio_iommu *iommu,
unsigned long arg)
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index fd0629acb948..d904ee5a68cc 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -158,6 +158,19 @@ extern int vfio_dma_rw(struct vfio_group *group, dma_addr_t user_iova,
extern struct iommu_domain *vfio_group_iommu_domain(struct vfio_group *group);
+struct vfio_iommu;
+extern void *vfio_iommu_type1_open(unsigned long arg);
+extern void vfio_iommu_type1_release(void *iommu_data);
+extern int vfio_iommu_add_group(struct vfio_iommu *iommu,
+ struct iommu_group *iommu_group,
+ struct iommu_domain *iommu_domain);
+extern void vfio_iommu_remove_group(struct vfio_iommu *iommu,
+ struct iommu_group *iommu_group);
+extern int vfio_iommu_type1_unmap_dma(struct vfio_iommu *iommu,
+ unsigned long arg);
+extern int vfio_iommu_type1_map_dma(struct vfio_iommu *iommu,
+ unsigned long arg);
+
/* each type has independent events */
enum vfio_notify_type {
VFIO_IOMMU_NOTIFY = 0,
--
2.25.1
