lkml.org 
[lkml]   [2011]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[13/55] intel-iommu: Unlink domain from iommu
    2.6.38-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Alex Williamson <alex.williamson@redhat.com>

    commit a97590e56d0d58e1dd262353f7cbd84e81d8e600 upstream.

    When we remove a device, we unlink the iommu from the domain, but
    we never do the reverse unlinking of the domain from the iommu.
    This means that we never clear iommu->domain_ids, eventually leading
    to resource exhaustion if we repeatedly bind and unbind a device
    to a driver. Also free empty domains to avoid a resource leak.

    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
    Acked-by: Donald Dutile <ddutile@redhat.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/pci/intel-iommu.c | 13 ++++++++++++-
    1 file changed, 12 insertions(+), 1 deletion(-)

    --- a/drivers/pci/intel-iommu.c
    +++ b/drivers/pci/intel-iommu.c
    @@ -3260,9 +3260,15 @@ static int device_notifier(struct notifi
    if (!domain)
    return 0;

    - if (action == BUS_NOTIFY_UNBOUND_DRIVER && !iommu_pass_through)
    + if (action == BUS_NOTIFY_UNBOUND_DRIVER && !iommu_pass_through) {
    domain_remove_one_dev_info(domain, pdev);

    + if (!(domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE) &&
    + !(domain->flags & DOMAIN_FLAG_STATIC_IDENTITY) &&
    + list_empty(&domain->devices))
    + domain_exit(domain);
    + }
    +
    return 0;
    }

    @@ -3411,6 +3417,11 @@ static void domain_remove_one_dev_info(s
    domain->iommu_count--;
    domain_update_iommu_cap(domain);
    spin_unlock_irqrestore(&domain->iommu_lock, tmp_flags);
    +
    + spin_lock_irqsave(&iommu->lock, tmp_flags);
    + clear_bit(domain->id, iommu->domain_ids);
    + iommu->domains[domain->id] = NULL;
    + spin_unlock_irqrestore(&iommu->lock, tmp_flags);
    }

    spin_unlock_irqrestore(&device_domain_lock, flags);



    \
     
     \ /
      Last update: 2011-04-29 21:11    [W:0.021 / U:1.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site