diff options
| author |  Lu Baolu <baolu.lu@linux.intel.com>
| 2021-11-08 14:13:49 +0800 |
|---|---|---|
| committer |  Joerg Roedel <jroedel@suse.de>
| 2021-12-06 12:39:05 +0100 |
| commit | 556f99ac886635e8da15528995f06d1d7028cfca (patch) | |
| tree | 9c47d16894d5d3136c1323d65762f1c537d95212 /drivers/iommu | |
| parent | iommu: Log iova range in map/unmap trace events (diff) | |
| download | linux-556f99ac886635e8da15528995f06d1d7028cfca.tar.gz linux-556f99ac886635e8da15528995f06d1d7028cfca.tar.bz2 linux-556f99ac886635e8da15528995f06d1d7028cfca.zip | |
iommu: Extend mutex lock scope in iommu_probe_device()
Extend the scope of holding group->mutex so that it can cover the default
domain check/attachment and direct mappings of reserved regions.
Cc: Ashish Mhetre <amhetre@nvidia.com>
Fixes: 211ff31b3d33b ("iommu: Fix race condition during default domain allocation")
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20211108061349.1985579-1-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index dd7863e453a5..8b86406b7162 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -288,11 +288,11 @@ int iommu_probe_device(struct device *dev) */ mutex_lock(&group->mutex); iommu_alloc_default_domain(group, dev); - mutex_unlock(&group->mutex); if (group->default_domain) { ret = __iommu_attach_device(group->default_domain, dev); if (ret) { + mutex_unlock(&group->mutex); iommu_group_put(group); goto err_release; } @@ -300,6 +300,7 @@ int iommu_probe_device(struct device *dev) iommu_create_device_direct_mappings(group, dev); + mutex_unlock(&group->mutex); iommu_group_put(group); if (ops->probe_finalize) |