When the last bond to an IOMMU is removed, the entries cached for the address space it used must be invalidated. Nested and second-stage bonds are identified by GSCID, first-stage paging bonds by PSCID. Signed-off-by: Gong Shuai --- drivers/iommu/riscv/iommu.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/riscv/iommu.c b/drivers/iommu/riscv/iommu.c index e8d894f3e760..a106105bd31b 100644 --- a/drivers/iommu/riscv/iommu.c +++ b/drivers/iommu/riscv/iommu.c @@ -934,6 +934,7 @@ static void riscv_iommu_bond_unlink(struct riscv_iommu_domain *domain, struct riscv_iommu_device *iommu = dev_to_iommu(dev); struct riscv_iommu_bond *bond, *found = NULL; struct riscv_iommu_command cmd; + int gscid = 0; int count = 0; if (!domain) @@ -948,18 +949,27 @@ static void riscv_iommu_bond_unlink(struct riscv_iommu_domain *domain, else if (dev_to_iommu(bond->dev) == iommu) count++; } - if (found) + if (found) { + gscid = found->gscid; list_del_rcu(&found->list); + } spin_unlock(&domain->lock); kfree_rcu(found, rcu); /* - * If this was the last bond between this domain and the IOMMU - * invalidate all cached entries for domain's PSCID. + * If this was the last bond between this domain and the IOMMU, + * invalidate all cached entries for the address space used by that + * bond. Nested and second-stage bonds are identified by GSCID, + * first-stage paging bonds by PSCID. */ if (!count) { - riscv_iommu_cmd_inval_vma(&cmd); - riscv_iommu_cmd_inval_set_pscid(&cmd, domain->pscid); + if (gscid) { + riscv_iommu_cmd_inval_gvma(&cmd); + riscv_iommu_cmd_inval_set_gscid(&cmd, gscid); + } else { + riscv_iommu_cmd_inval_vma(&cmd); + riscv_iommu_cmd_inval_set_pscid(&cmd, domain->pscid); + } riscv_iommu_cmd_send(iommu, &cmd); riscv_iommu_cmd_sync(iommu, RISCV_IOMMU_IOTINVAL_TIMEOUT); -- 2.53.0