diff options
| author | Joerg Roedel | 2015-07-23 18:37:13 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2015-08-12 16:23:37 +0200 |
| commit | f303e50766298feac17c8715e29ecd14b2c12680 (patch) | |
| tree | 1b4c3dcff85a489251f17e04c2fb4dbc125f70f1 /drivers/iommu/intel-iommu.c | |
| parent | iommu/vt-d: Only insert alias dev_info if there is an alias (diff) | |
| download | kernel-qcow2-linux-f303e50766298feac17c8715e29ecd14b2c12680.tar.gz kernel-qcow2-linux-f303e50766298feac17c8715e29ecd14b2c12680.tar.xz kernel-qcow2-linux-f303e50766298feac17c8715e29ecd14b2c12680.zip | |
iommu/vt-d: Avoid duplicate device_domain_info structures
When a 'struct device_domain_info' is created as an alias
for another device, this struct will not be re-used when the
real device is encountered. Fix that to avoid duplicate
device_domain_info structures being added.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 6e61b3eb47e8..8834765e90c6 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -2270,12 +2270,16 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, spin_lock_irqsave(&device_domain_lock, flags); if (dev) found = find_domain(dev); - else { + + if (!found) { struct device_domain_info *info2; info2 = dmar_search_domain_by_dev_info(iommu->segment, bus, devfn); - if (info2) - found = info2->domain; + if (info2) { + found = info2->domain; + info2->dev = dev; + } } + if (found) { spin_unlock_irqrestore(&device_domain_lock, flags); free_devinfo_mem(info); |