diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-05-11 07:42:09 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2023-05-23 09:15:55 +0300 |
| commit | dfddd54dc77c4519ee3c94e7462b1c035c69a031 (patch) | |
| tree | 66a1edc7cfdaafb2877e548b1288f96626bffcfa /drivers/iommu/iommu.c | |
| parent | 152431e4fe7f1aac8aa6cc57bfe58d2d2596be4d (diff) | |
| download | linux-dfddd54dc77c4519ee3c94e7462b1c035c69a031.tar.xz | |
iommu: Remove the assignment of group->domain during default domain alloc
group->domain should only be set once all the device's drivers have
had their ops->attach_dev() called. iommu_group_alloc_default_domain()
doesn't do this, so it shouldn't set the value.
The previous patches organized things so that each caller of
iommu_group_alloc_default_domain() follows up with calling
__iommu_group_set_domain_internal() that does set the group->domain.
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/11-v5-1b99ae392328+44574-iommu_err_unwind_jgg@nvidia.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/iommu.c')
| -rw-r--r-- | drivers/iommu/iommu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 6b39f756c020..2041e3e028de 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -435,7 +435,6 @@ int iommu_probe_device(struct device *dev) * checked. */ iommu_alloc_default_domain(group, dev); - group->domain = NULL; if (group->default_domain) { iommu_create_device_direct_mappings(group, dev); ret = __iommu_group_set_domain(group, @@ -1664,8 +1663,6 @@ static int iommu_group_alloc_default_domain(const struct bus_type *bus, return -ENOMEM; group->default_domain = dom; - if (!group->domain) - group->domain = dom; return 0; } @@ -1869,7 +1866,6 @@ int bus_iommu_probe(const struct bus_type *bus) iommu_group_create_direct_mappings(group); - group->domain = NULL; ret = __iommu_group_set_domain(group, group->default_domain); mutex_unlock(&group->mutex); |