]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
intel-iommu: Fix enabling snooping feature by mistake
authorSheng Yang <sheng@linux.intel.com>
Thu, 6 Aug 2009 05:31:56 +0000 (13:31 +0800)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 6 Aug 2009 10:35:50 +0000 (11:35 +0100)
Two defects work together result in KVM device passthrough randomly can't
work:
1. iommu_snooping is not initialized to zero when vm_iommu_init() called.
So it is possible to get a random value.
2. One line added by commit 2c2e2c38("IOMMU Identity Mapping Support")
change the code path, let it bypass domain_update_iommu_cap(), as well as
missing the increment of domain iommu reference count.

The latter is also likely to cause a leak of domains on repeated VMM
assignment and deassignment.

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/pci/intel-iommu.c

index af7ff9b5aed888589f0bf82f59b1de656a549acc..2314ad7ee5fef4544ab2159cd7e253ed6e1d3889 100644 (file)
@@ -1505,7 +1505,6 @@ static int domain_context_mapping_one(struct dmar_domain *domain, int segment,
                        }
 
                        set_bit(num, iommu->domain_ids);
-                       set_bit(iommu->seq_id, &domain->iommu_bmp);
                        iommu->domains[num] = domain;
                        id = num;
                }
@@ -3409,6 +3408,7 @@ static int md_domain_init(struct dmar_domain *domain, int guest_width)
 
        domain->iommu_count = 0;
        domain->iommu_coherency = 0;
+       domain->iommu_snooping = 0;
        domain->max_addr = 0;
 
        /* always allocate the top pgd */