iommu/amd: Set page size bitmap during V2 domain allocation

With the addition of the V2 page table support, the domain page size
bitmap needs to be set prior to iommu core setting up direct mappings
for reserved regions. When reserved regions are mapped, if this is not
done, it will be looking at the V1 page size bitmap when determining
the page size to use in iommu_pgsize(). When it gets into the actual
amd mapping code, a check of see if the page size is supported can
fail, because at that point it is checking it against the V2 page size
bitmap which only supports 4K, 2M, and 1G.

Add a check to __iommu_domain_alloc() to not override the
bitmap if it was already set by the iommu ops domain_alloc() code path.

Cc: Vasant Hegde <[email protected]>
Cc: Suravee Suthikulpanit <[email protected]>
Cc: Robin Murphy <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Joerg Roedel <[email protected]>
Fixes: 4db6c41f0946 ("iommu/amd: Add support for using AMD IOMMU v2 page table for DMA-API")
Signed-off-by: Jerry Snitselaar <[email protected]>
Reviewed-by: Vasant Hegde <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Joerg Roedel <[email protected]>

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 5a505ba5467e133599f4daf25df459d5bdfe75e6..167da5b1a5e319356ba109b1a28dc8d9ed0f911a 100644 (file)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -1666,10 +1666,6 @@ static void do_attach(struct iommu_dev_data *dev_data,
        domain->dev_iommu[iommu->index] += 1;
        domain->dev_cnt                 += 1;
 
-       /* Override supported page sizes */
-       if (domain->flags & PD_GIOV_MASK)
-               domain->domain.pgsize_bitmap = AMD_IOMMU_PGSIZES_V2;
-
        /* Update device table */
        set_dte_entry(iommu, dev_data->devid, domain,
                      ats, dev_data->iommu_v2);
@@ -2048,6 +2044,8 @@ static int protection_domain_init_v2(struct protection_domain *domain)
 
        domain->flags |= PD_GIOV_MASK;
 
+       domain->domain.pgsize_bitmap = AMD_IOMMU_PGSIZES_V2;
+
        if (domain_enable_v2(domain, 1)) {
                domain_id_free(domain->id);
                return -ENOMEM;

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 10db680acaed5a35e443ca8bee5652fa5ffcd16e..256a38371120e397cd750605df08b9b60d94b075 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1964,8 +1964,13 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,
                return NULL;
 
        domain->type = type;
-       /* Assume all sizes by default; the driver may override this later */
-       domain->pgsize_bitmap = bus->iommu_ops->pgsize_bitmap;
+       /*
+        * If not already set, assume all sizes by default; the driver
+        * may override this later
+        */
+       if (!domain->pgsize_bitmap)
+               domain->pgsize_bitmap = bus->iommu_ops->pgsize_bitmap;
+
        if (!domain->ops)
                domain->ops = bus->iommu_ops->default_domain_ops;