* [PATCH v2] intel-iommu: Add device info into list before doing context mapping
@ 2011-12-22 9:17 Hao, Xudong
2012-03-23 2:54 ` Hao, Xudong
0 siblings, 1 reply; 3+ messages in thread
From: Hao, Xudong @ 2011-12-22 9:17 UTC (permalink / raw)
To: Chris Wright; +Cc: dwmw2, iommu, linux-kernel, Zhang, Xiantao, kvm
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@intel.com>
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Acked-by: Chris Wright <chrisw@sous-sol.org>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH v2] intel-iommu: Add device info into list before doing context mapping
2011-12-22 9:17 [PATCH v2] intel-iommu: Add device info into list before doing context mapping Hao, Xudong
@ 2012-03-23 2:54 ` Hao, Xudong
2012-05-24 12:46 ` David Woodhouse
0 siblings, 1 reply; 3+ messages in thread
From: Hao, Xudong @ 2012-03-23 2:54 UTC (permalink / raw)
To: dwmw2, Chris Wright; +Cc: iommu, linux-kernel, Zhang, Xiantao, kvm
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@vger.kernel.org [mailto:kvm-owner@vger.kernel.org] On
> Behalf Of Hao, Xudong
> Sent: Thursday, December 22, 2011 5:18 PM
> To: Chris Wright
> Cc: dwmw2@infradead.org; iommu@lists.linux-foundation.org;
> linux-kernel@vger.kernel.org; Zhang, Xiantao; kvm@vger.kernel.org
> 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@intel.com>
> Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
> Acked-by: Chris Wright <chrisw@sous-sol.org>
> ---
> 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@vger.kernel.org More majordomo info at
> http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH v2] intel-iommu: Add device info into list before doing context mapping
2012-03-23 2:54 ` Hao, Xudong
@ 2012-05-24 12:46 ` David Woodhouse
0 siblings, 0 replies; 3+ messages in thread
From: David Woodhouse @ 2012-05-24 12:46 UTC (permalink / raw)
To: Hao, Xudong; +Cc: Chris Wright, iommu, linux-kernel, Zhang, Xiantao, kvm
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
On Fri, 2012-03-23 at 02:54 +0000, Hao, Xudong wrote:
> Any other comments for this patch? Or can you check-in it in your
> iommu tree?
Apologies for the delayed response. I've just forwarded this to Linus.
--
dwmw2
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 6171 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-24 12:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-22 9:17 [PATCH v2] intel-iommu: Add device info into list before doing context mapping Hao, Xudong
2012-03-23 2:54 ` Hao, Xudong
2012-05-24 12:46 ` David Woodhouse
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.