Patch "iommu/vt-d: Fix VM domain ID leak" has been added to the 4.1-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iommu/vt-d: Fix VM domain ID leak
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iommu-vt-d-fix-vm-domain-id-leak.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
46ebb7af7b93792de65e124e1ab8b89a108a41f2Mon Sep 17 00:00:00 2001
From: Alex Williamson <[email protected]>
Date: Tue, 14 Jul 2015 14:48:53 -0600
Subject: iommu/vt-d: Fix VM domain ID leak
From: Alex Williamson <[email protected]>
commit 46ebb7af7b93792de65e124e1ab8b89a108a41f2 upstream.
This continues the attempt to fix commit fb170fb4c548 ("iommu/vt-d:
Introduce helper functions to make code symmetric for readability"). The previous attempt in commit 71684406905f ("iommu/vt-d: Detach domain *only* from attached iommus") overlooked the fact that dmar_domain.iommu_bmp gets cleared for VM domains when devices are detached:
intel_iommu_detach_device
domain_remove_one_dev_info
domain_detach_iommu
The domain is detached from the iommu, but the iommu is still attached to the domain, for whatever reason. Thus when we get to domain_exit(), we can't rely on iommu_bmp for VM domains to find the active iommus, we must check them all. Without that, the corresponding bit in intel_iommu.domain_ids doesn't get cleared and repeated VM domain creation and destruction will run out of domain IDs. Meanwhile we still can't call iommu_detach_domain() on arbitrary non-VM domains or we risk clearing in-use domain IDs, as 71684406905f attempted to address.
It's tempting to modify iommu_detach_domain() to test the domain iommu_bmp, but the call ordering from domain_remove_one_dev_info() prevents it being able to work as fb170fb4c548 seems to have intended. Caching of unused VM domains on the iommu object seems to be the root of the problem, but this code is far too fragile for that kind of rework to be proposed for stable, so we simply revert this chunk to its state prior to fb170fb4c548.
code symmetric for readability")
iommus")
--- drivers/iommu/intel-iommu.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/iommu/intel-iommu.c +6 -3
@@ -1756,8 +1756,9 @@ static int domain_init(struct dmar_domaistatic void domain_exit (struct dmar_domain *domain) { +struct dmar_drhd_unit *drhd; +struct intel_iommu *iommu;struct page *freelist =NULL ; -int i;/* Domain 0 is reserved, so dont process it */ if (!domain)
@@ -1777,8 +1778,10 @@ static void domain_exit(struct dmar_doma/* clear attached or cached domains */ rcu_read_lock (); -for_each_set_bit (i, domain->iommu_bmp, g_num_of_iommus) -iommu_detach_domain (domain, g_iommus[i]); +for_each_active_iommu (iommu, drhd) +if (domain_type_is_vm (domain) || +test_bit (iommu->seq_id, domain->iommu_bmp)) +iommu_detach_domain (domain, iommu);rcu_read_unlock ();dma_free_pagelist (freelist);
Patches currently in stable-queue which might be from [email protected] are
queue-4.1/iommu-vt-d-fix-vm-domain-id-leak.patch