iommu: avoid dev iotlb logic in intel-iommu for domains with no dev iotlbs
PATCH 5/7 iommu: avoid dev iotlb logic in intel-iommu for domains with no dev iotlbs
From: Omer Peleg <omer-FrESSTt7Abv7r6psnUbsSmZHpeb/A1Y/@public.gmane.org>
This patch avoids taking the device_domain_lock in iommu_flush_dev_iotlb() for domains with no dev iotlb devices.
[mad-FrESSTt7Abv7r6psnUbsSmZHpeb/A1Y/@public.gmane.org: rebased and reworded the commit message]
--- drivers/iommu/intel-iommu.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/iommu/intel-iommu.c +31 -0
@@ -391,6 +391,7 @@ struct dmar_domain {* to VT-d spec, section 9.3 */ struct list_head devices;/* all devices' list */ +bool has_iotlb_device;struct iova_domain iovad;/* iova's that belong to this domain */ struct dma_pte *pgd;/* virtual address */
@@ -1463,6 +1464,30 @@ iommu_support_dev_iotlb (struct dmar_domain *domain, struct intel_iommu *iommu,return NULL ; } +static void domain_update_iotlb (struct dmar_domain *domain) +{ +struct device_domain_info *info; +bool has_iotlb_device = false; +unsigned long flags; + +spin_lock_irqsave (&device_domain_lock, flags); +list_for_each_entry (info, &domain->devices, link) { +struct pci_dev *pdev; + +if (!info->dev || !dev_is_pci (info->dev)) +continue ; + + pdev =to_pci_dev (info->dev); +if (pdev->ats_enabled) { + has_iotlb_device = true; +break ; + } + } + + domain->has_iotlb_device = has_iotlb_device; +spin_unlock_irqrestore (&device_domain_lock, flags); +} +static void iommu_enable_dev_iotlb (struct device_domain_info *info) {struct pci_dev *pdev;
@@ -1486,6 +1511,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info)#endif if (info->ats_supported && !pci_enable_ats (pdev,VTD_PAGE_SHIFT )) { info->ats_enabled =1 ; +domain_update_iotlb (info); info->ats_qdep =pci_ats_queue_depth (pdev); } }
@@ -1502,6 +1528,7 @@ static void iommu_disable_dev_iotlb(struct device_domain_info *info)if (info->ats_enabled) {pci_disable_ats (pdev); info->ats_enabled =0 ; +domain_update_iotlb (info); }#ifdef CONFIG_INTEL_IOMMU_SVM if (info->pri_enabled) {
@@ -1522,6 +1549,9 @@ static void iommu_flush_dev_iotlb(struct dmar_domain *domain,unsigned long flags;struct device_domain_info *info; +if (!domain->has_iotlb_device) +return ; +spin_lock_irqsave (&device_domain_lock, flags);list_for_each_entry (info, &domain->devices, link) {if (!info->ats_enabled)
@@ -1739,6 +1769,7 @@ static struct dmar_domain *alloc_domain(int flags)memset (domain,0 ,sizeof (*domain)); domain->nid =-1 ; domain->flags = flags; + domain->has_iotlb_device = false;INIT_LIST_HEAD (&domain->devices);return domain;
Signature · 1 line
1.9.1
A message that is not in the archive (sent off-list or not yet received): 20151228161703.GA27900-FrESSTt7Abv7r6psnUbsSmZHpeb/A1Y/@public.gmane.org
Benjamin Serebrin via iommu
Reviewed-by Ben SerebrinReviewed-by Ben Serebrin <[email protected]>
Looks good!
Quoted 92 lines · Adam Morrison
From: Omer Peleg <omer-FrESSTt7Abv7r6psnUbsSmZHpeb/A1Y/@public.gmane.org>
This patch avoids taking the
device_domain_lockiniommu_flush_dev_iotlb()for domains with no dev iotlb devices.[mad-FrESSTt7Abv7r6psnUbsSmZHpeb/A1Y/@public.gmane.org: rebased and reworded the commit message]--- drivers/iommu/intel-iommu.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)drivers/iommu/intel-iommu.c +31
-1@@ -391,6 +391,7 @@ struct dmar_domain {* to VT-d spec, section 9.3 */ struct list_head devices;/* all devices' list */ +bool has_iotlb_device;struct iova_domain iovad;/* iova's that belong to this domain */ struct dma_pte *pgd;/* virtual address */ @@ -1463,6 +1464,30 @@ iommu_support_dev_iotlb (struct dmar_domain *domain, struct intel_iommu *iommu,return NULL ; } +static void domain_update_iotlb (struct dmar_domain *domain) +{ +struct device_domain_info *info; +bool has_iotlb_device = false; +unsigned long flags; + +spin_lock_irqsave (&device_domain_lock, flags); +list_for_each_entry (info, &domain->devices, link) { +struct pci_dev *pdev; + +if (!info->dev || !dev_is_pci (info->dev)) +continue ; + + pdev =to_pci_dev (info->dev); +if (pdev->ats_enabled) { + has_iotlb_device = true; +break ; + } + } + + domain->has_iotlb_device = has_iotlb_device; +spin_unlock_irqrestore (&device_domain_lock, flags); +} +static void iommu_enable_dev_iotlb (struct device_domain_info *info) {struct pci_dev *pdev;@@ -1486,6 +1511,7 @@ static void iommu_enable_dev_iotlb(struct device_domain_info *info)#endif if (info->ats_supported && !pci_enable_ats (pdev,VTD_PAGE_SHIFT )) { info->ats_enabled =1 ; +domain_update_iotlb (info); info->ats_qdep =pci_ats_queue_depth (pdev); } }@@ -1502,6 +1528,7 @@ static void iommu_disable_dev_iotlb(struct device_domain_info *info)if (info->ats_enabled) {pci_disable_ats (pdev); info->ats_enabled =0 ; +domain_update_iotlb (info); }#ifdef CONFIG_INTEL_IOMMU_SVM if (info->pri_enabled) {@@ -1522,6 +1549,9 @@ static void iommu_flush_dev_iotlb(struct dmar_domain *domain,unsigned long flags;struct device_domain_info *info; +if (!domain->has_iotlb_device) +return ; +spin_lock_irqsave (&device_domain_lock, flags);list_for_each_entry (info, &domain->devices, link) {if (!info->ats_enabled)@@ -1739,6 +1769,7 @@ static struct dmar_domain *alloc_domain(int flags)memset (domain,0 ,sizeof (*domain)); domain->nid =-1 ; domain->flags = flags; + domain->has_iotlb_device = false;INIT_LIST_HEAD (&domain->devices);return domain; --1.9.1