RE: [PATCH v2] intel-iommu: Add device info into list before doingcontext mapping

[Hao, Xudong]

Hi, David

Any other comments for this patch? Or can you check-in it in your iommu tree?

Thanks,
-Xudong

> -----Original Message-----
> From: kvm-owner@xxxxxxxxxxxxxxx [mailto:kvm-owner@xxxxxxxxxxxxxxx] On
> Behalf Of Hao, Xudong
> Sent: Thursday, December 22, 2011 5:18 PM
> To: Chris Wright
> Cc: dwmw2@xxxxxxxxxxxxx; iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx;
> linux-kernel@xxxxxxxxxxxxxxx; Zhang, Xiantao; kvm@xxxxxxxxxxxxxxx
> Subject: [PATCH v2] intel-iommu: Add device info into list before doing context
> mapping
> 
> Add device info into list before do context mapping, because device info will be
> used by iommu_enable_dev_iotlb function, in this function, pci_enable_ats
> would not be called without this patch.
> 
> Signed-off-by: Xudong Hao <xudong.hao@xxxxxxxxx>
> Signed-off-by: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
> Acked-by: Chris Wright <chrisw@xxxxxxxxxxxx>
> ---
>  drivers/iommu/intel-iommu.c |   17 +++++++++++------
>  1 files changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index
> bdc447f..ccf347f 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -2267,12 +2267,6 @@ static int domain_add_dev_info(struct
> dmar_domain *domain,
>  	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;
> @@ -2285,6 +2279,17 @@ static int domain_add_dev_info(struct
> dmar_domain *domain,
>  	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;
>  }
> 
> --
> 1.6.0.rc1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a
> message to majordomo@xxxxxxxxxxxxxxx More majordomo info at
> http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/