iommu/io-pgtable-arm: Remove split on unmap behavior

A minority of page table implementations (arm_lpae, armv7) are unique in
how they handle partial unmap of large IOPTEs.

Other implementations will unmap the large IOPTE and return it's
length. For example if a 2M IOPTE is present and the first 4K is requested
to be unmapped then unmap will remove the whole 2M and report 2M as the
result.

arm_lpae instead replaces the IOPTE with a table of smaller IOPTEs, unmaps
the 4K and returns 4k. This is actually an illegal/non-hitless operation
on at least SMMUv3 because of the BBM level 0 rules.

Will says this was done to support VFIO, but upon deeper analysis this was
never strictly necessary:

 https://lore.kernel.org/all/20241024134411.GA6956@nvidia.com/

In summary, historical VFIO supported the AMD behavior of unmapping the
whole large IOPTE and returning the size, even if asked to unmap a
portion. The driver would see this as a request to split a large IOPTE.
Modern VFIO always unmaps entire large IOPTEs (except on AMD) and drivers
don't see an IOPTE split.

Given it doesn't work fully correctly on SMMUv3 and relying on ARM unique
behavior would create portability problems across IOMMU drivers, retire
this functionality.

Outside the iommu users, this will potentially effect io_pgtable users of
ARM_32_LPAE_S1, ARM_32_LPAE_S2, ARM_64_LPAE_S1, ARM_64_LPAE_S2, and
ARM_MALI_LPAE formats.

Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/1-v3-b3a5b5937f56+7bb-arm_no_split_jgg@nvidia.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
index 40c1cd079f8e1286defcf2ea8557292e6c956652..d045a76dbfdc80564e988695cbdea55dc08f2385 100644 (file)
--- a/drivers/iommu/io-pgtable-arm.c
+++ b/drivers/iommu/io-pgtable-arm.c
@@ -581,66 +581,6 @@ static void arm_lpae_free_pgtable(struct io_pgtable *iop)
        kfree(data);
 }
 
-static size_t arm_lpae_split_blk_unmap(struct arm_lpae_io_pgtable *data,
-                                      struct iommu_iotlb_gather *gather,
-                                      unsigned long iova, size_t size,
-                                      arm_lpae_iopte blk_pte, int lvl,
-                                      arm_lpae_iopte *ptep, size_t pgcount)
-{
-       struct io_pgtable_cfg *cfg = &data->iop.cfg;
-       arm_lpae_iopte pte, *tablep;
-       phys_addr_t blk_paddr;
-       size_t tablesz = ARM_LPAE_GRANULE(data);
-       size_t split_sz = ARM_LPAE_BLOCK_SIZE(lvl, data);
-       int ptes_per_table = ARM_LPAE_PTES_PER_TABLE(data);
-       int i, unmap_idx_start = -1, num_entries = 0, max_entries;
-
-       if (WARN_ON(lvl == ARM_LPAE_MAX_LEVELS))
-               return 0;
-
-       tablep = __arm_lpae_alloc_pages(tablesz, GFP_ATOMIC, cfg, data->iop.cookie);
-       if (!tablep)
-               return 0; /* Bytes unmapped */
-
-       if (size == split_sz) {
-               unmap_idx_start = ARM_LPAE_LVL_IDX(iova, lvl, data);
-               max_entries = arm_lpae_max_entries(unmap_idx_start, data);
-               num_entries = min_t(int, pgcount, max_entries);
-       }
-
-       blk_paddr = iopte_to_paddr(blk_pte, data);
-       pte = iopte_prot(blk_pte);
-
-       for (i = 0; i < ptes_per_table; i++, blk_paddr += split_sz) {
-               /* Unmap! */
-               if (i >= unmap_idx_start && i < (unmap_idx_start + num_entries))
-                       continue;
-
-               __arm_lpae_init_pte(data, blk_paddr, pte, lvl, 1, &tablep[i]);
-       }
-
-       pte = arm_lpae_install_table(tablep, ptep, blk_pte, data);
-       if (pte != blk_pte) {
-               __arm_lpae_free_pages(tablep, tablesz, cfg, data->iop.cookie);
-               /*
-                * We may race against someone unmapping another part of this
-                * block, but anything else is invalid. We can't misinterpret
-                * a page entry here since we're never at the last level.
-                */
-               if (iopte_type(pte) != ARM_LPAE_PTE_TYPE_TABLE)
-                       return 0;
-
-               tablep = iopte_deref(pte, data);
-       } else if (unmap_idx_start >= 0) {
-               for (i = 0; i < num_entries; i++)
-                       io_pgtable_tlb_add_page(&data->iop, gather, iova + i * size, size);
-
-               return num_entries * size;
-       }
-
-       return __arm_lpae_unmap(data, gather, iova, size, pgcount, lvl, tablep);
-}
-
 static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
                               struct iommu_iotlb_gather *gather,
                               unsigned long iova, size_t size, size_t pgcount,
@@ -690,12 +630,8 @@ static size_t __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
 
                return i * size;
        } else if (iopte_leaf(pte, lvl, iop->fmt)) {
-               /*
-                * Insert a table at the next level to map the old region,
-                * minus the part we want to unmap
-                */
-               return arm_lpae_split_blk_unmap(data, gather, iova, size, pte,
-                                               lvl + 1, ptep, pgcount);
+               WARN_ONCE(true, "Unmap of a partial large IOPTE is not allowed");
+               return 0;
        }
 
        /* Keep on walkin' */
@@ -1359,19 +1295,6 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
                        iova += SZ_1G;
                }
 
-               /* Partial unmap */
-               size = 1UL << __ffs(cfg->pgsize_bitmap);
-               if (ops->unmap_pages(ops, SZ_1G + size, size, 1, NULL) != size)
-                       return __FAIL(ops, i);
-
-               /* Remap of partial unmap */
-               if (ops->map_pages(ops, SZ_1G + size, size, size, 1,
-                                  IOMMU_READ, GFP_KERNEL, &mapped))
-                       return __FAIL(ops, i);
-
-               if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
-                       return __FAIL(ops, i);
-
                /* Full unmap */
                iova = 0;
                for_each_set_bit(j, &cfg->pgsize_bitmap, BITS_PER_LONG) {