iommu: set group default domain before creating direct mappings
Subsystems (2)
PATCH 1/1 iommu: set group default domain before creating direct mappings
iommu_group_create_direct_mappings uses group->default_domain, but right after it is called, request_default_domain_for_dev calls iommu_domain_free for the default domain, and sets the group default domain to a different domain. Move the iommu_group_create_direct_mappings call to after the group default domain is set, so the direct mappings get associated with that domain.
--- drivers/iommu/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/iommu.c +2 -2
@@ -2282,13 +2282,13 @@ request_default_domain_for_dev(struct device *dev, unsigned long type) goto out; } -iommu_group_create_direct_mappings (group, dev); -/* Make the domain the default for this group */ if (group->default_domain)iommu_domain_free (group->default_domain); group->default_domain = domain; +iommu_group_create_direct_mappings (group, dev); +dev_info (dev,"Using iommu %s mapping\n" , type ==IOMMU_DOMAIN_DMA ?"dma" :"direct" );
Signature · 1 line
2.24.0
Hi,
Quoted 9 lines · Jerry Snitselaar
iommu_group_create_direct_mappingsusesgroup->default_domain, but right after it is called,request_default_domain_for_devcallsiommu_domain_freefor the default domain, and sets the group default domain to a different domain. Move theiommu_group_create_direct_mappingscall to after the group default domain is set, so the direct mappings get associated with that domain.Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>
This fix looks good to me.
Best regards,
baolu
Quoted 29 lines
Fixes 7423e01741dd ("iommu: Add API to request DMA domain for device")Signed-off-by Jerry Snitselaar <[email protected]>--- drivers/iommu/iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/iommu/iommu.c +2
-2@@ -2282,13 +2282,13 @@ request_default_domain_for_dev(struct device *dev, unsigned long type) goto out; } -iommu_group_create_direct_mappings (group, dev); -/* Make the domain the default for this group */ if (group->default_domain)iommu_domain_free (group->default_domain); group->default_domain = domain; +iommu_group_create_direct_mappings (group, dev); +dev_info (dev,"Using iommu %s mapping\n" , type ==IOMMU_DOMAIN_DMA ?"dma" :"direct" );
Joerg Roedel
AppliedQuoted 8 lines · Lu Baolu
Quoted 7 lines · Jerry Snitselaar
iommu_group_create_direct_mappingsusesgroup->default_domain, but right after it is called,request_default_domain_for_devcallsiommu_domain_freefor the default domain, and sets the group default domain to a different domain. Move theiommu_group_create_direct_mappingscall to after the group default domain is set, so the direct mappings get associated with that domain.
Quoted 6 lines
Quoted 2 lines
Cc Joerg Roedel <[email protected]>Cc Lu Baolu <[email protected]>This fix looks good to me.
Reviewed-by Lu Baolu <[email protected]>
Applied, thanks.