On 14/02/2025 12:57 pm, Charan Teja Kalla wrote:
Thanks a lot for posting these patches, Robin.
On 2/14/2025 5:18 AM, Robin Murphy wrote:
drivers/iommu/iommu.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 870c3cdbd0f6..2486f6d6ef68 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -3097,6 +3097,11 @@ int iommu_device_use_default_domain(struct device *dev)
return 0;
mutex_lock(&group->mutex);
+ /* We may race against bus_iommu_probe() finalising groups here */
+ if (!group->default_domain) {
+ ret = -EPROBE_DEFER;
+ goto unlock_out;
+ }
We just hit the issue again even after picking up this patch, though
very hard to reproduce, on 6.6 LTS.
After code inspection, it seems the issue is that - default domain is
setup in the bus_iommu_probe() before hitting of this replay.
A:async client probe in platform_dma_configure(), B:bus_iommu_probe() :-
1) A: sets up iommu_fwspec under iommu_probe_device_lock.
2) B: Sets the dev->iommu_group under iommu_probe_device_lock. Domain
setup is deferred.
3) A: Returns with out allocating the default domain, as
dev->iommu_group is set, whose checks are also made under the same
'iommu_probe_device_lock'. __This miss setting of the valid dev->dma_ops__.
4) B: Sets up the group->default_domain under group->mutex.
5) A: iommu_device_use_default_domain(): Relies on this
group->default_domain, under the same mutex, to decide if need to go for
replay, which is skipped. This is skipping the setting up of valid
dma_ops and that's an issue.
But I don't think that the same issue exists on 6.13 because of your
patch, b67483b3c44e ("iommu/dma: Centralise iommu_setup_dma_ops()").
bus_iommu_probe():
list_for_each_entry_safe(group, next, &group_list, entry) {
mutex_lock(&group->mutex);
for_each_group_device(group, gdev)
iommu_setup_dma_ops(gdev->dev);
mutex_unlock(&group->mutex);
}
This makes the step4 above force to use the valid dma_iommu api, thus I
see no issue when there is no probe deferral.
So, I think we are good with this patch on 6.13.
Now coming back to 6.6 LTS, any ideas you have here, please?
Thanks for the analysis once again! I've not looked closely at 6.6 yet,
but if we're all happy this looks like the right fix for mainline then
I'll start having a look at the backport as soon as I can (so much for
hoping it would be simple...)
Cheers,
Robin.
if (group->owner_cnt) {
if (group->domain != group->default_domain || group->owner ||
!xa_empty(&group->pasid_array)) {
Thanks,
Charan
