Add support for SVA domain allocation and provide an SVA-specific
iommu_domain_ops.

Signed-off-by: Lu Baolu <baolu...@linux.intel.com>
---
 include/linux/intel-iommu.h |  5 ++++
 drivers/iommu/intel/iommu.c |  2 ++
 drivers/iommu/intel/svm.c   | 48 +++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)

diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index 72e5d7900e71..2397c2007cda 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -744,6 +744,7 @@ void intel_svm_unbind(struct iommu_sva *handle);
 u32 intel_svm_get_pasid(struct iommu_sva *handle);
 int intel_svm_page_response(struct device *dev, struct iommu_fault_event *evt,
                            struct iommu_page_response *msg);
+struct iommu_domain *intel_svm_domain_alloc(void);
 
 struct intel_svm_dev {
        struct list_head list;
@@ -769,6 +770,10 @@ struct intel_svm {
 };
 #else
 static inline void intel_svm_check(struct intel_iommu *iommu) {}
+static inline struct iommu_domain *intel_svm_domain_alloc(void)
+{
+       return NULL;
+}
 #endif
 
 #ifdef CONFIG_INTEL_IOMMU_DEBUGFS
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 99643f897f26..10b1e9dcbd98 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4343,6 +4343,8 @@ static struct iommu_domain 
*intel_iommu_domain_alloc(unsigned type)
                return domain;
        case IOMMU_DOMAIN_IDENTITY:
                return &si_domain->domain;
+       case IOMMU_DOMAIN_SVA:
+               return intel_svm_domain_alloc();
        default:
                return NULL;
        }
diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
index 574ddddaa33a..641ab0491ada 100644
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -931,3 +931,51 @@ int intel_svm_page_response(struct device *dev,
        mutex_unlock(&pasid_mutex);
        return ret;
 }
+
+static int intel_svm_attach_dev_pasid(struct iommu_domain *domain,
+                                     struct device *dev, ioasid_t pasid)
+{
+       struct device_domain_info *info = dev_iommu_priv_get(dev);
+       struct intel_iommu *iommu = info->iommu;
+       struct mm_struct *mm = domain->mm;
+       struct iommu_sva *sva;
+       int ret = 0;
+
+       mutex_lock(&pasid_mutex);
+       sva = intel_svm_bind_mm(iommu, dev, mm);
+       if (IS_ERR(sva))
+               ret = PTR_ERR(sva);
+       mutex_unlock(&pasid_mutex);
+
+       return ret;
+}
+
+static void intel_svm_detach_dev_pasid(struct iommu_domain *domain,
+                                      struct device *dev, ioasid_t pasid)
+{
+       mutex_lock(&pasid_mutex);
+       intel_svm_unbind_mm(dev, pasid);
+       mutex_unlock(&pasid_mutex);
+}
+
+static void intel_svm_domain_free(struct iommu_domain *domain)
+{
+       kfree(domain);
+}
+
+static const struct iommu_domain_ops intel_svm_domain_ops = {
+       .attach_dev_pasid       = intel_svm_attach_dev_pasid,
+       .detach_dev_pasid       = intel_svm_detach_dev_pasid,
+       .free                   = intel_svm_domain_free,
+};
+
+struct iommu_domain *intel_svm_domain_alloc(void)
+{
+       struct iommu_domain *domain;
+
+       domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+       if (domain)
+               domain->ops = &intel_svm_domain_ops;
+
+       return domain;
+}
-- 
2.25.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to