iommu/amd: Convert to use per PCI segment rlookup_table

Then, remove the global amd_iommu_rlookup_table and rlookup_table_size.

Co-developed-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
Link: https://lore.kernel.org/r/20220706113825.25582-21-vasant.hegde@amd.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd/amd_iommu_types.h b/drivers/iommu/amd/amd_iommu_types.h
index 67feb847fc13f4d51817e342c889766ea513ca94..d932c90329e42ee115c13b595e63bb9128f4ba0a 100644 (file)
--- a/drivers/iommu/amd/amd_iommu_types.h
+++ b/drivers/iommu/amd/amd_iommu_types.h
@@ -846,11 +846,6 @@ extern struct dev_table_entry *amd_iommu_dev_table;
  */
 extern u16 *amd_iommu_alias_table;
 
-/*
- * Reverse lookup table to find the IOMMU which translates a specific device.
- */
-extern struct amd_iommu **amd_iommu_rlookup_table;
-
 /* size of the dma_ops aperture as power of 2 */
 extern unsigned amd_iommu_aperture_order;
 

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index a60bb6c5a6da8816b43e16172f6097573e21611a..d7dce20dca43188cd5c38f12825fddc20f3cdafc 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -200,12 +200,6 @@ struct dev_table_entry *amd_iommu_dev_table;
  */
 u16 *amd_iommu_alias_table;
 
-/*
- * The rlookup table is used to find the IOMMU which is responsible
- * for a specific device. It is also indexed by the PCI device id.
- */
-struct amd_iommu **amd_iommu_rlookup_table;
-
 /*
  * AMD IOMMU allows up to 2^16 different protection domains. This is a bitmap
  * to know which ones are already in use.
@@ -214,7 +208,6 @@ unsigned long *amd_iommu_pd_alloc_bitmap;
 
 static u32 dev_table_size;     /* size of the device table */
 static u32 alias_table_size;   /* size of the alias table */
-static u32 rlookup_table_size; /* size if the rlookup table */
 
 enum iommu_init_state {
        IOMMU_START_STATE,
@@ -1144,7 +1137,7 @@ void amd_iommu_apply_erratum_63(u16 devid)
 /* Writes the specific IOMMU for a device into the rlookup table */
 static void __init set_iommu_for_device(struct amd_iommu *iommu, u16 devid)
 {
-       amd_iommu_rlookup_table[devid] = iommu;
+       iommu->pci_seg->rlookup_table[devid] = iommu;
 }
 
 /*
@@ -1826,7 +1819,7 @@ static int __init init_iommu_one(struct amd_iommu *iommu, struct ivhd_header *h,
         * Make sure IOMMU is not considered to translate itself. The IVRS
         * table tells us so, but this is a lie!
         */
-       amd_iommu_rlookup_table[iommu->devid] = NULL;
+       pci_seg->rlookup_table[iommu->devid] = NULL;
 
        return 0;
 }
@@ -2786,10 +2779,6 @@ static void __init free_iommu_resources(void)
        kmem_cache_destroy(amd_iommu_irq_cache);
        amd_iommu_irq_cache = NULL;
 
-       free_pages((unsigned long)amd_iommu_rlookup_table,
-                  get_order(rlookup_table_size));
-       amd_iommu_rlookup_table = NULL;
-
        free_pages((unsigned long)amd_iommu_alias_table,
                   get_order(alias_table_size));
        amd_iommu_alias_table = NULL;
@@ -2928,7 +2917,6 @@ static int __init early_amd_iommu_init(void)
 
        dev_table_size     = tbl_size(DEV_TABLE_ENTRY_SIZE);
        alias_table_size   = tbl_size(ALIAS_TABLE_ENTRY_SIZE);
-       rlookup_table_size = tbl_size(RLOOKUP_TABLE_ENTRY_SIZE);
 
        /* Device table - directly used by all IOMMUs */
        ret = -ENOMEM;
@@ -2947,13 +2935,6 @@ static int __init early_amd_iommu_init(void)
        if (amd_iommu_alias_table == NULL)
                goto out;
 
-       /* IOMMU rlookup table - find the IOMMU for a specific device */
-       amd_iommu_rlookup_table = (void *)__get_free_pages(
-                       GFP_KERNEL | __GFP_ZERO,
-                       get_order(rlookup_table_size));
-       if (amd_iommu_rlookup_table == NULL)
-               goto out;
-
        amd_iommu_pd_alloc_bitmap = (void *)__get_free_pages(
                                            GFP_KERNEL | __GFP_ZERO,
                                            get_order(MAX_DOMAIN_ID/8));

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 5ee1af9a0a54cbf6937dff1b87c6e13e8c934c5b..6e0cd9c4f57c38882e3a174051631d0b6944a71b 100644 (file)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -287,10 +287,9 @@ static void setup_aliases(struct amd_iommu *iommu, struct device *dev)
        clone_aliases(iommu, dev);
 }
 
-static struct iommu_dev_data *find_dev_data(u16 devid)
+static struct iommu_dev_data *find_dev_data(struct amd_iommu *iommu, u16 devid)
 {
        struct iommu_dev_data *dev_data;
-       struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
 
        dev_data = search_dev_data(iommu, devid);
 
@@ -388,7 +387,7 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)
        if (devid < 0)
                return devid;
 
-       dev_data = find_dev_data(devid);
+       dev_data = find_dev_data(iommu, devid);
        if (!dev_data)
                return -ENOMEM;
 
@@ -403,9 +402,6 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)
         */
        if ((iommu_default_passthrough() || !amd_iommu_force_isolation) &&
            dev_is_pci(dev) && pci_iommuv2_capable(to_pci_dev(dev))) {
-               struct amd_iommu *iommu;
-
-               iommu = amd_iommu_rlookup_table[dev_data->devid];
                dev_data->iommu_v2 = iommu->is_iommu_v2;
        }
 
@@ -416,13 +412,15 @@ static int iommu_init_device(struct amd_iommu *iommu, struct device *dev)
 
 static void iommu_ignore_device(struct amd_iommu *iommu, struct device *dev)
 {
+       struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg;
        int devid;
 
        devid = get_device_id(dev);
        if (devid < 0)
                return;
 
-       amd_iommu_rlookup_table[devid] = NULL;
+
+       pci_seg->rlookup_table[devid] = NULL;
        memset(&amd_iommu_dev_table[devid], 0, sizeof(struct dev_table_entry));
 
        setup_aliases(iommu, dev);
@@ -2749,8 +2747,9 @@ static struct irq_remap_table *get_irq_table(struct amd_iommu *iommu, u16 devid)
        struct irq_remap_table *table;
        struct amd_iommu_pci_seg *pci_seg = iommu->pci_seg;
 
-       if (WARN_ONCE(!amd_iommu_rlookup_table[devid],
-                     "%s: no iommu for devid %x\n", __func__, devid))
+       if (WARN_ONCE(!pci_seg->rlookup_table[devid],
+                     "%s: no iommu for devid %x:%x\n",
+                     __func__, pci_seg->id, devid))
                return NULL;
 
        table = pci_seg->irq_lookup_table[devid];
@@ -2809,7 +2808,7 @@ static int set_remap_table_entry_alias(struct pci_dev *pdev, u16 alias,
        pci_seg->irq_lookup_table[alias] = table;
        set_dte_irq_entry(alias, table);
 
-       iommu_flush_dte(amd_iommu_rlookup_table[alias], alias);
+       iommu_flush_dte(pci_seg->rlookup_table[alias], alias);
 
        return 0;
 }