Skip to content

Commit d360211

Browse files
snitsjoergroedel
authored andcommitted
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. Cc: Joerg Roedel <jroedel@suse.de> Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: iommu@lists.linux-foundation.org Cc: stable@vger.kernel.org Fixes: 7423e01 ("iommu: Add API to request DMA domain for device") Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com> Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
1 parent 75d1838 commit d360211

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/iommu/iommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,13 +2282,13 @@ request_default_domain_for_dev(struct device *dev, unsigned long type)
22822282
goto out;
22832283
}
22842284

2285-
iommu_group_create_direct_mappings(group, dev);
2286-
22872285
/* Make the domain the default for this group */
22882286
if (group->default_domain)
22892287
iommu_domain_free(group->default_domain);
22902288
group->default_domain = domain;
22912289

2290+
iommu_group_create_direct_mappings(group, dev);
2291+
22922292
dev_info(dev, "Using iommu %s mapping\n",
22932293
type == IOMMU_DOMAIN_DMA ? "dma" : "direct");
22942294

0 commit comments

Comments
 (0)