lkml.org 
[lkml]   [2012]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 87/94] intel-iommu: Add device info into list before doing context mapping
    3.3-stable review patch.  If anyone has any objections, please let me know.

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

    From: David Woodhouse <dwmw2@infradead.org>

    commit e2ad23d04c1304431ab5176c89b7b476ded2d995 upstream.

    Add device info into list before doing context mapping, because device
    info will be used by iommu_enable_dev_iotlb(). Without it, ATS won't get
    enabled as it should be.

    ATS, while a dubious decision from a security point of view, can be very
    important for performance.

    Signed-off-by: Xudong Hao <xudong.hao@intel.com>
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Acked-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iommu/intel-iommu.c | 17 +++++++++++------
    1 file changed, 11 insertions(+), 6 deletions(-)

    --- a/drivers/iommu/intel-iommu.c
    +++ b/drivers/iommu/intel-iommu.c
    @@ -2280,12 +2280,6 @@ static int domain_add_dev_info(struct dm
    if (!info)
    return -ENOMEM;

    - ret = domain_context_mapping(domain, pdev, translation);
    - if (ret) {
    - free_devinfo_mem(info);
    - return ret;
    - }
    -
    info->segment = pci_domain_nr(pdev->bus);
    info->bus = pdev->bus->number;
    info->devfn = pdev->devfn;
    @@ -2298,6 +2292,17 @@ static int domain_add_dev_info(struct dm
    pdev->dev.archdata.iommu = info;
    spin_unlock_irqrestore(&device_domain_lock, flags);

    + ret = domain_context_mapping(domain, pdev, translation);
    + if (ret) {
    + spin_lock_irqsave(&device_domain_lock, flags);
    + list_del(&info->link);
    + list_del(&info->global);
    + pdev->dev.archdata.iommu = NULL;
    + spin_unlock_irqrestore(&device_domain_lock, flags);
    + free_devinfo_mem(info);
    + return ret;
    + }
    +
    return 0;
    }




    \
     
     \ /
      Last update: 2012-05-27 04:42    [W:3.483 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site