linux.git/drivers/iommu/generic_pt, branch master

Merge branches 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 'rockchip', 'verisilicon', 'riscv', 'intel/vt-d', 'amd/amd-vi' and 'core' into next

2026-06-12T12:57:23+00:00

iommu_pt: add kunit config for 32-bit VA (amdv1_cfg_1)

2026-05-19T08:49:03+00:00

Add test coverage for small VAs (32‑bit) starting at level 2 by enabling
the AMDv1 KUnit configuration. This limits level expansion because the
starting level can accommodate only the maximum virtual address requested.

Reviewed-by: Jason Gunthorpe 
Signed-off-by: Ankit Soni 
Reviewed-by: Vasant Hegde 
Signed-off-by: Joerg Roedel

iommu_pt: support small VA for AMDv1

2026-05-19T08:49:03+00:00

When hardware/VM request a small VA limit, the generic page-table code
clears PT_FEAT_DYNAMIC_TOP. This later causes domain initialization to
fail with -EOPNOTSUPP.

Remove the clearing so init succeeds when the VA fits in the starting
level and no top-level growth is needed.

Signed-off-by: Ankit Soni 
Reviewed-by: Vasant Hegde 
Reviewed-by: Jason Gunthorpe 
Signed-off-by: Joerg Roedel

iommu_pt: Fix pgsize_bitmap calculation in get_info for smaller vasz's

2026-05-19T08:49:02+00:00

To properly enforce the domain VA limit, clamp pgsize_bitmap using the
requested max_vasz_lg2 in get_info().
Apply the same VA limit as get_info() in the kunit possible_sizes test so
assertions stay consistent with the domain bitmap.

Suggested-by: Jason Gunthorpe 
Signed-off-by: Ankit Soni 
Reviewed-by: Jason Gunthorpe 
Signed-off-by: Joerg Roedel

iommu/riscv: Enable PT_FEAT_DETAILED_GATHER and pass gather to iotlb_inval

2026-05-19T08:48:08+00:00

RISC-V can use the information from PT_FEAT_DETAILED_GATHER to
compute the best stride to generate the single TLB invalidations.

Pass the gather down to the lower functions and create a full-range
gather for the flush-all callback.

Reviewed-by: Tomasz Jeznach 
Signed-off-by: Jason Gunthorpe 
Tested-by: Andrew Jones 
Signed-off-by: Joerg Roedel

iommupt: Add PT_FEAT_DETAILED_GATHER

2026-05-19T08:45:38+00:00

Generating the ARM SMMUv3 and RISC-V invalidation commands optimally
requires some additional details from iommupt:

- leaf_levels_bitmap is used to compute the ARM Range Invalidation
  Table Top Level hint

- leaf_levels_bitmap is also used to compute the stride when
  generating single invalidations to invalidate once per leaf

- table_levels_bitmap also computes the ARM TTL for future cases when
  there are no leaves

Put these under a feature since only two drivers need to calculate
them.

This is also useful for the coming kunit iotlb invalidation test to
know more about what invalidation is happening.

Signed-off-by: Jason Gunthorpe 
Reviewed-by: Pranjal Shrivastava 
Tested-by: Andrew Jones 
Signed-off-by: Joerg Roedel

iommupt: Add struct iommupt_pending_gather

2026-05-19T08:45:38+00:00

Add a struct to keep track of all the things that are pending to be
merged into the gather. The way gather merging works, the pending
range is checked against the current gather, and the current gather
can be flushed before the pending things are added.

Thus, if new things have to be recorded in the gather they need to be
kept in the pending struct until after the gather is optionally
flushed.

The next patch adds new items to the gather and the pending struct.

Signed-off-by: Jason Gunthorpe 
Reviewed-by: Pranjal Shrivastava 
Tested-by: Andrew Jones 
Signed-off-by: Joerg Roedel

iommupt: Fixup build warning by using BIT_ULL() for RISCVPT_NC/IO

2026-05-15T05:33:17+00:00

Fix build warning on 32-bit configurations by using BIT_ULL() for
RISCVPT_NC and RISCVPT_IO.

Fixes: 6c21eb174c6c ("iommupt: Encode IOMMU_MMIO/IOMMU_CACHE via RISC-V Svpbmt bits")
Reported-by: kernel test robot 
Closes: https://lore.kernel.org/oe-kbuild-all/202605121350.wZxB51k0-lkp@intel.com/
Signed-off-by: Fangyu Yu 
Reviewed-by: Jason Gunthorpe 
Signed-off-by: Joerg Roedel

iommupt: Fix the end_index calculation in __map_range_leaf()

2026-05-15T05:29:16+00:00

Sashiko noticed a mismatch of units in this math: num_leaves is
actually the number of leaf *entries* (so a 16-item contiguous leaf
is one num_leaves), while index is in items. The mismatch in maths
causes __map_range_leaf() to exit early instead of efficiently
filling a larger range of contiguous PTEs.

The early exit is caught by the functions above and then
__map_range_leaf() is re-invoked, so there is no functional issue.

Correct the misuse of units by adjusting num_leaves with the leaf
size and avoid the performance cost of looping externally.

There are also some mismatched types for num_leaves; simplify
things to remove the duplicated calculations.

Fixes: d6c65b0fd621 ("iommupt: Avoid rewalking during map")
Signed-off-by: Jason Gunthorpe 
Reviewed-by: Samiullah Khawaja 
Reviewd-by: Pranjal Shrivastava 
Tested-by: Josua Mayer 
Signed-off-by: Joerg Roedel

iommupt: Check for missing PAGE_SIZE in the pgsize_bitmap

2026-05-15T05:29:16+00:00

Sashiko pointed out that the driver could drop PAGE_SIZE from the
pgsize_bitmap. That is technically allowed but nothing does it, and
such an iommu_domain would not be used with the DMA API today.

Still, it is against the design and it is trivial to fix up. Lift
the PT_WARN_ON to the if branch and just skip the fast path.

Fixes: dcd6a011a8d5 ("iommupt: Add map_pages op")
Signed-off-by: Jason Gunthorpe 
Reviewed-by: Pranjal Shrivastava 
Reviewed-by: Samiullah Khawaja 
Tested-by: Josua Mayer 
Signed-off-by: Joerg Roedel