Messages in this thread Patch in this message | | | Date | Fri, 18 Aug 2023 02:16:28 +0800 | Subject | [RFC PATCH v1 6/8] iommu/arm-smmu-v3: Free VMID when uninstalling domain from SMMU | From | Michael Shavit <> |
| |
This will allow installing a domain onto multiple smmu devices.
Signed-off-by: Michael Shavit <mshavit@google.com> ---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 208fec5fba462..7f88b2b19cbe5 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -2112,7 +2112,6 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type) static void arm_smmu_domain_free(struct iommu_domain *domain) { struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - struct arm_smmu_device *smmu = smmu_domain->smmu; free_io_pgtable_ops(smmu_domain->pgtbl_ops); @@ -2122,10 +2121,6 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) mutex_lock(&arm_smmu_asid_lock); arm_smmu_free_asid(&smmu_domain->cd); mutex_unlock(&arm_smmu_asid_lock); - } else { - struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; - if (cfg->vmid) - ida_free(&smmu->vmid_map, cfg->vmid); } kfree(smmu_domain); @@ -2484,6 +2479,14 @@ static void arm_smmu_installed_smmus_remove_device( continue; list_del(&master->list); if (list_empty(&installed_smmu->devices)) { + if (smmu_domain->stage == ARM_SMMU_DOMAIN_S2) { + struct arm_smmu_s2_cfg *cfg = + &smmu_domain->s2_cfg; + + if (cfg->vmid) + ida_free(&smmu->vmid_map, + cfg->vmid); + } list_del(&installed_smmu->list); kfree(installed_smmu); } -- 2.42.0.rc1.204.g551eb34607-goog
| |