iommu: Consolidate IOVA allocator code

In order to share the IOVA allocator with other architectures, break
the unnecssary dependency on the Intel IOMMU driver and move the
remaining IOVA internals to iova.c

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 40dfbc0444c0eaccdeca8cebfcd5f567e3d84ae4..e758d8ed8fb5568930e002cd8e13476000b0b5ac 100644 (file)
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -485,7 +485,6 @@ __setup("intel_iommu=", intel_iommu_setup);
 
 static struct kmem_cache *iommu_domain_cache;
 static struct kmem_cache *iommu_devinfo_cache;
 
 static struct kmem_cache *iommu_domain_cache;
 static struct kmem_cache *iommu_devinfo_cache;

-static struct kmem_cache *iommu_iova_cache;

 
 static inline void *alloc_pgtable_page(int node)
 {
 
 static inline void *alloc_pgtable_page(int node)
 {


@@ -523,16 +522,6 @@ static inline void free_devinfo_mem(void *vaddr)
        kmem_cache_free(iommu_devinfo_cache, vaddr);
 }
 
        kmem_cache_free(iommu_devinfo_cache, vaddr);
 }
 

-struct iova *alloc_iova_mem(void)
-{
-       return kmem_cache_alloc(iommu_iova_cache, GFP_ATOMIC);
-}
-
-void free_iova_mem(struct iova *iova)
-{
-       kmem_cache_free(iommu_iova_cache, iova);
-}
-

 static inline int domain_type_is_vm(struct dmar_domain *domain)
 {
        return domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE;
 static inline int domain_type_is_vm(struct dmar_domain *domain)
 {
        return domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE;


@@ -3427,23 +3416,6 @@ static inline int iommu_devinfo_cache_init(void)
        return ret;
 }
 
        return ret;
 }
 

-static inline int iommu_iova_cache_init(void)
-{
-       int ret = 0;
-
-       iommu_iova_cache = kmem_cache_create("iommu_iova",
-                                        sizeof(struct iova),
-                                        0,
-                                        SLAB_HWCACHE_ALIGN,
-                                        NULL);
-       if (!iommu_iova_cache) {
-               printk(KERN_ERR "Couldn't create iova cache\n");
-               ret = -ENOMEM;
-       }
-
-       return ret;
-}
-

 static int __init iommu_init_mempool(void)
 {
        int ret;
 static int __init iommu_init_mempool(void)
 {
        int ret;


@@ -3461,7 +3433,7 @@ static int __init iommu_init_mempool(void)
 
        kmem_cache_destroy(iommu_domain_cache);
 domain_error:
 
        kmem_cache_destroy(iommu_domain_cache);
 domain_error:

-       kmem_cache_destroy(iommu_iova_cache);
+       iommu_iova_cache_destroy();

 
        return -ENOMEM;
 }
 
        return -ENOMEM;
 }


@@ -3470,8 +3442,7 @@ static void __init iommu_exit_mempool(void)
 {
        kmem_cache_destroy(iommu_devinfo_cache);
        kmem_cache_destroy(iommu_domain_cache);
 {
        kmem_cache_destroy(iommu_devinfo_cache);
        kmem_cache_destroy(iommu_domain_cache);

-       kmem_cache_destroy(iommu_iova_cache);
-
+       iommu_iova_cache_destroy();

 }
 
 static void quirk_ioat_snb_local_iommu(struct pci_dev *pdev)
 }
 
 static void quirk_ioat_snb_local_iommu(struct pci_dev *pdev)

diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
index f6b17e6af2fb261f84eafd974d652a76716dcb95..520b8c8ae0c4df19e3fb28813e1d657b95c4c708 100644 (file)
--- a/drivers/iommu/iova.c
+++ b/drivers/iommu/iova.c
@@ -18,6 +18,41 @@
  */
 
 #include <linux/iova.h>
  */
 
 #include <linux/iova.h>

+#include <linux/slab.h>
+
+static struct kmem_cache *iommu_iova_cache;
+
+int iommu_iova_cache_init(void)
+{
+       int ret = 0;
+
+       iommu_iova_cache = kmem_cache_create("iommu_iova",
+                                        sizeof(struct iova),
+                                        0,
+                                        SLAB_HWCACHE_ALIGN,
+                                        NULL);
+       if (!iommu_iova_cache) {
+               pr_err("Couldn't create iova cache\n");
+               ret = -ENOMEM;
+       }
+
+       return ret;
+}
+
+void iommu_iova_cache_destroy(void)
+{
+       kmem_cache_destroy(iommu_iova_cache);
+}
+
+struct iova *alloc_iova_mem(void)
+{
+       return kmem_cache_alloc(iommu_iova_cache, GFP_ATOMIC);
+}
+
+void free_iova_mem(struct iova *iova)
+{
+       kmem_cache_free(iommu_iova_cache, iova);
+}

 
 void
 init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit)
 
 void
 init_iova_domain(struct iova_domain *iovad, unsigned long pfn_32bit)

diff --git a/include/linux/iova.h b/include/linux/iova.h
index 19e81d5ccb6dd8acd80aa92f4b4432e272fa9a2f..ad0507c61cc7cce36aa7b76fc860e063d9a753c9 100644 (file)
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -39,6 +39,9 @@ static inline unsigned long iova_size(struct iova *iova)
        return iova->pfn_hi - iova->pfn_lo + 1;
 }
 
        return iova->pfn_hi - iova->pfn_lo + 1;
 }
 

+int iommu_iova_cache_init(void);
+void iommu_iova_cache_destroy(void);
+

 struct iova *alloc_iova_mem(void);
 void free_iova_mem(struct iova *iova);
 void free_iova(struct iova_domain *iovad, unsigned long pfn);
 struct iova *alloc_iova_mem(void);
 void free_iova_mem(struct iova *iova);
 void free_iova(struct iova_domain *iovad, unsigned long pfn);