Skip to content

Commit 358f817

Browse files
committed
Merge: iommu/arm-smmu-v3: Fix pgsize_bit for sva domains
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6889 JIRA: https://issues.redhat.com/browse/RHEL-92493 ## Summary of Changes UBSan caught a bug with IOMMU SVA domains, where the reported exponent value in __arm_smmu_tlb_inv_range() was >= 64. __arm_smmu_tlb_inv_range() uses the domain's pgsize_bitmap to compute the number of pages to invalidate and the invalidation range. Currently arm_smmu_sva_domain_alloc() does not setup the iommu domain's pgsize_bitmap. This leads to __ffs() on the value returning 64 and that leads to undefined behaviour w.r.t. shift operations. Fix this by initializing the iommu_domain's pgsize_bitmap to PAGE_SIZE. Effectively the code needs to use the smallest page size for invalidation. Signed-off-by: Marcin Juszkiewicz <[email protected]> Approved-by: Mark Langsdorf <[email protected]> Approved-by: Jerry Snitselaar <[email protected]> Approved-by: Donald Dutile <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents 64b0f63 + 53db1ef commit 358f817

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,12 @@ struct iommu_domain *arm_smmu_sva_domain_alloc(struct device *dev,
411411
return ERR_CAST(smmu_domain);
412412
smmu_domain->domain.type = IOMMU_DOMAIN_SVA;
413413
smmu_domain->domain.ops = &arm_smmu_sva_domain_ops;
414+
415+
/*
416+
* Choose page_size as the leaf page size for invalidation when
417+
* ARM_SMMU_FEAT_RANGE_INV is present
418+
*/
419+
smmu_domain->domain.pgsize_bitmap = PAGE_SIZE;
414420
smmu_domain->smmu = smmu;
415421

416422
ret = xa_alloc(&arm_smmu_asid_xa, &asid, smmu_domain,

0 commit comments

Comments
 (0)