Re: [PATCH] iommu: amd: Set page size bitmap during V2 domain allocation

From: Joerg Roedel
Date: Thu Apr 13 2023 - 05:55:20 EST


On Tue, Apr 04, 2023 at 12:27:42AM -0700, Jerry Snitselaar wrote:
> 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 <vasant.hegde@xxxxxxx>
> Cc: Suravee Suthikulpanit <suravee.suthikulpanit@xxxxxxx>
> Cc: Robin Murphy <robin.murphy@xxxxxxx>
> Cc: Will Deacon <will@xxxxxxxxxx>
> Cc: Joerg Roedel <joro@xxxxxxxxxx>
> Fixes: 4db6c41f0946 ("iommu/amd: Add support for using AMD IOMMU v2 page table for DMA-API")
> Signed-off-by: Jerry Snitselaar <jsnitsel@xxxxxxxxxx>
> ---
> drivers/iommu/amd/iommu.c | 6 ++----
> drivers/iommu/iommu.c | 9 +++++++--
> 2 files changed, 9 insertions(+), 6 deletions(-)

Applied, thanks.