iommu/amd: Remove domain_alloc()

IOMMU drivers should not be sensitive to the domain type, a paging domain
should be created based only on the flags passed in, the same for all
callers.

AMD was using the domain_alloc() path to force VFIO into a v1 domain type,
because v1 gives higher performance. However now that
IOMMU_HWPT_ALLOC_PASID is present, and a NULL device is not possible,
domain_alloc_paging_flags() will do the right thing for VFIO.

When invoked from VFIO flags will be 0 and the amd_iommu_pgtable type of
domain will be selected. This is v1 by default unless the kernel command
line has overridden it to v2.

If the admin is forcing v2 assume they know what they are doing so force
it everywhere, including for VFIO.

Reviewed-by: Vasant Hegde <vasant.hegde@amd.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/2-v2-9776c53c2966+1c7-amd_paging_flags_jgg@nvidia.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index e652990440c631c0e109bb5da67ea55d8196971c..8e9a0445e86f77275b0cdee2b1408cfc0abb59f1 100644 (file)
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2565,25 +2565,6 @@ static struct iommu_domain *do_iommu_domain_alloc(unsigned int type,
        return &domain->domain;
 }
 
-static struct iommu_domain *amd_iommu_domain_alloc(unsigned int type)
-{
-       struct iommu_domain *domain;
-       int pgtable = amd_iommu_pgtable;
-
-       /*
-        * Force IOMMU v1 page table when allocating
-        * domain for pass-through devices.
-        */
-       if (type == IOMMU_DOMAIN_UNMANAGED)
-               pgtable = AMD_IOMMU_V1;
-
-       domain = do_iommu_domain_alloc(type, NULL, 0, pgtable);
-       if (IS_ERR(domain))
-               return NULL;
-
-       return domain;
-}
-
 static struct iommu_domain *
 amd_iommu_domain_alloc_paging_flags(struct device *dev, u32 flags,
                                    const struct iommu_user_data *user_data)
@@ -3059,7 +3040,6 @@ const struct iommu_ops amd_iommu_ops = {
        .blocked_domain = &blocked_domain,
        .release_domain = &release_domain,
        .identity_domain = &identity_domain.domain,
-       .domain_alloc = amd_iommu_domain_alloc,
        .domain_alloc_paging_flags = amd_iommu_domain_alloc_paging_flags,
        .domain_alloc_sva = amd_iommu_domain_alloc_sva,
        .probe_device = amd_iommu_probe_device,