[PATCH RFTv1 1/3] iommu/arm-smmu-v3: Drain in-flight fault handlers
From: Nicolin Chen <hidden>
Date: 2026-03-03 20:13:51
Also in:
linux-iommu, lkml
Subsystem:
arm smmu drivers, iommu subsystem, the rest · Maintainers:
Will Deacon, Joerg Roedel, Linus Torvalds
From: Malak Marrid <redacted> When a device is switching away from a domain, either through a detach or a replace operation, it must drain its IOPF queue that only contains the page requests for the old domain. Co-developed-by: Barak Biber <redacted> Signed-off-by: Barak Biber <redacted> Co-developed-by: Stefan Kaestle <redacted> Signed-off-by: Stefan Kaestle <redacted> Signed-off-by: Malak Marrid <redacted> Signed-off-by: Nicolin Chen <redacted> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
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 4d00d796f0783..2176ee8bec767 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c@@ -2843,6 +2843,12 @@ static int arm_smmu_enable_iopf(struct arm_smmu_master *master, if (master->iopf_refcount) { master->iopf_refcount++; master_domain->using_iopf = true; + /* + * If the device is already on the IOPF queue (domain replace), + * drain in-flight fault handlers so nothing will hold the old + * domain when the core switches the attach handle. + */ + iopf_queue_flush_dev(master->dev); return 0; }
@@ -2866,8 +2872,11 @@ static void arm_smmu_disable_iopf(struct arm_smmu_master *master, return; master->iopf_refcount--; - if (master->iopf_refcount == 0) + if (master->iopf_refcount == 0) { + /* Drain in-flight fault handlers before removing device */ + iopf_queue_flush_dev(master->dev); iopf_queue_remove_device(master->smmu->evtq.iopf, master->dev); + } } static void arm_smmu_remove_master_domain(struct arm_smmu_master *master,
--
2.43.0