[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <468CF4B655888074+20250723120423.37924-1-bbaa@bbaa.fun>
Date: Wed, 23 Jul 2025 20:04:23 +0800
From: Ban ZuoXiang <bbaa@...a.fun>
To: stable@...r.kernel.org
Cc: iommu@...ts.linux.dev,
baolu.lu@...ux.intel.com,
gregkh@...uxfoundation.org,
linux-kernel@...r.kernel.org,
Ban ZuoXiang <bbaa@...a.fun>
Subject: [PATCH] iommu/vt-d: Fix misplaced domain_attached assignment
Commit fb5873b779dd ("iommu/vt-d: Restore context entry setup order
for aliased devices") was incorrectly backported: the domain_attached
assignment was mistakenly placed in device_set_dirty_tracking()
instead of original identity_domain_attach_dev().
Fix this by moving the assignment to the correct function as in the
original commit.
Fixes: fb5873b779dd ("iommu/vt-d: Restore context entry setup order for aliased devices")
Closes: https://lore.kernel.org/linux-iommu/721D44AF820A4FEB+722679cb-2226-4287-8835-9251ad69a1ac@bbaa.fun/
Cc: stable@...r.kernel.org
Reported-by: Ban ZuoXiang <bbaa@...a.fun>
Signed-off-by: Ban ZuoXiang <bbaa@...a.fun>
---
drivers/iommu/intel/iommu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 56e9f125cda9..af4e6c1e55db 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4414,9 +4414,6 @@ static int device_set_dirty_tracking(struct list_head *devices, bool enable)
break;
}
- if (!ret)
- info->domain_attached = true;
-
return ret;
}
@@ -4600,6 +4597,9 @@ static int identity_domain_attach_dev(struct iommu_domain *domain, struct device
ret = device_setup_pass_through(dev);
}
+ if (!ret)
+ info->domain_attached = true;
+
return ret;
}
--
2.50.1
Powered by blists - more mailing lists