Skip to contentSkip to conversation

iommu/vt-d: Misc fixes on scalable mode

PATCH Superseded Liu Yi L 4 participants 12 messages Dec 29, 2020 – Jan 7, 2021

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Liu Yi L

author
#0 lore raw

v3 cover iommu/vt-d: Misc fixes on scalable mode

Hi Baolu, Joerg, Will,

This patchset aims to fix a bug regards to native SVM usage, and also several bugs around subdevice (attached to device via auxiliary manner) tracking and ineffective device_tlb flush.

v2 -> v3:
- Address comments from Baolu Lu against v2
- Rebased to 5.11-rc1
v2: https://lore.kernel.org/linux-iommu/[email protected]/

v1 -> v2:
- Use a more recent Fix tag in "iommu/vt-d: Move intel_iommu info from struct intel_svm to struct intel_svm_dev"
- Refined the "iommu/vt-d: Track device aux-attach with subdevice_domain_info"
- Rename "iommu/vt-d: A fix to iommu_flush_dev_iotlb() for aux-domain" to be
"iommu/vt-d: Fix ineffective devTLB invalidation for subdevices"
- Refined the commit messages
v1: https://lore.kernel.org/linux-iommu/[email protected]/

Liu Yi L (3):
iommu/vt-d: Move intel_iommu info from struct intel_svm to struct
intel_svm_dev
iommu/vt-d: Track device aux-attach with subdevice_domain_info iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

 drivers/iommu/intel/iommu.c | 148 ++++++++++++++++++++++++++----------
 drivers/iommu/intel/svm.c   |   9 ++-
 include/linux/intel-iommu.h |  18 +++--
 3 files changed, 125 insertions(+), 50 deletions(-)
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
author
#1 lore raw

PATCH v3 1/3 iommu/vt-d: Move intel_iommu info from struct intel_svm to struct intel_svm_dev

Current struct intel_svm has a field to record the struct intel_iommu pointer for a PASID bind. And struct intel_svm will be shared by all the devices bind to the same process. The devices may be behind different DMAR units. As the iommu driver code uses the intel_iommu pointer stored in intel_svm struct to do cache invalidations, it may only flush the cache on a single DMAR unit, for others, the cache invalidation is missed.

As intel_svm struct already has a device list, this patch just moves the intel_iommu pointer to be a field of intel_svm_dev struct.

Fixes 1c4f88b7f1f92 ("iommu/vt-d: Shared virtual address in scalable mode")
Cc Lu Baolu <[email protected]>
Cc Jacob Pan <[email protected]>
Cc Raj Ashok <[email protected]>
Cc David Woodhouse <[email protected]>
---
 drivers/iommu/intel/svm.c   | 9 +++++----
 include/linux/intel-iommu.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/intel/svm.c +5 -4
index 4fa248b98031..69566695d032 100644
@@ -142,7 +142,7 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d
 	}
 	desc.qw2 = 0;
 	desc.qw3 = 0;
-	qi_submit_sync(svm->iommu, &desc, 1, 0);
+	qi_submit_sync(sdev->iommu, &desc, 1, 0);
 
 	if (sdev->dev_iotlb) {
 		desc.qw0 = QI_DEV_EIOTLB_PASID(svm->pasid) |
@@ -166,7 +166,7 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d
 		}
 		desc.qw2 = 0;
 		desc.qw3 = 0;
-		qi_submit_sync(svm->iommu, &desc, 1, 0);
+		qi_submit_sync(sdev->iommu, &desc, 1, 0);
 	}
 }
 
@@ -211,7 +211,7 @@ static void intel_mm_release(struct mmu_notifier *mn, struct mm_struct *mm)
 	 */
 	rcu_read_lock();
 	list_for_each_entry_rcu(sdev, &svm->devs, list)
-		intel_pasid_tear_down_entry(svm->iommu, sdev->dev,
+		intel_pasid_tear_down_entry(sdev->iommu, sdev->dev,
 					    svm->pasid, true);
 	rcu_read_unlock();
 
@@ -363,6 +363,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,
 	}
 	sdev->dev = dev;
 	sdev->sid = PCI_DEVID(info->bus, info->devfn);
+	sdev->iommu = iommu;
 
 	/* Only count users if device has aux domains */
 	if (iommu_dev_feature_enabled(dev, IOMMU_DEV_FEAT_AUX))
@@ -546,6 +547,7 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,
 		goto out;
 	}
 	sdev->dev = dev;
+	sdev->iommu = iommu;
 
 	ret = intel_iommu_enable_pasid(iommu, dev);
 	if (ret) {
@@ -575,7 +577,6 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,
 			kfree(sdev);
 			goto out;
 		}
-		svm->iommu = iommu;
 
 		if (pasid_max > intel_pasid_max_id)
 			pasid_max = intel_pasid_max_id;
include/linux/intel-iommu.h +1 -1
index d956987ed032..94522685a0d9 100644
@@ -758,6 +758,7 @@ struct intel_svm_dev {
 	struct list_head list;
 	struct rcu_head rcu;
 	struct device *dev;
+	struct intel_iommu *iommu;
 	struct svm_dev_ops *ops;
 	struct iommu_sva sva;
 	u32 pasid;
@@ -771,7 +772,6 @@ struct intel_svm {
 	struct mmu_notifier notifier;
 	struct mm_struct *mm;
 
-	struct intel_iommu *iommu;
 	unsigned int flags;
 	u32 pasid;
 	int gpasid; /* In case that guest PASID is different from host PASID */
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
maintainer Acked-by on v3 1/3
#2 lore raw

Re: [PATCH v3 1/3] iommu/vt-d: Move intel_iommu info from struct intel_svm to struct intel_svm_dev

Hi Yi,

Quoted 10 lines · Liu Yi L

Current struct intel_svm has a field to record the struct intel_iommu pointer for a PASID bind. And struct intel_svm will be shared by all the devices bind to the same process. The devices may be behind different DMAR units. As the iommu driver code uses the intel_iommu pointer stored in intel_svm struct to do cache invalidations, it may only flush the cache on a single DMAR unit, for others, the cache invalidation is missed.

As intel_svm struct already has a device list, this patch just moves the intel_iommu pointer to be a field of intel_svm_dev struct.

Quoted 10 lines
Fixes 1c4f88b7f1f92 ("iommu/vt-d: Shared virtual address in scalable mode")
Cc Lu Baolu <[email protected]>
Cc Jacob Pan <[email protected]>
Cc Raj Ashok <[email protected]>
Cc David Woodhouse <[email protected]>

This fix looks good to me. Thanks!

Best regards,
baolu

Quoted 74 lines
---
  drivers/iommu/intel/svm.c   | 9 +++++----
  include/linux/intel-iommu.h | 2 +-
  2 files changed, 6 insertions(+), 5 deletions(-)
drivers/iommu/intel/svm.c +5 -4
index 4fa248b98031..69566695d032 100644
@@ -142,7 +142,7 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d
  	}
  	desc.qw2 = 0;
  	desc.qw3 = 0;
-	qi_submit_sync(svm->iommu, &desc, 1, 0);
+	qi_submit_sync(sdev->iommu, &desc, 1, 0);
 
  	if (sdev->dev_iotlb) {
  		desc.qw0 = QI_DEV_EIOTLB_PASID(svm->pasid) |
@@ -166,7 +166,7 @@ static void intel_flush_svm_range_dev (struct intel_svm *svm, struct intel_svm_d
  		}
  		desc.qw2 = 0;
  		desc.qw3 = 0;
-		qi_submit_sync(svm->iommu, &desc, 1, 0);
+		qi_submit_sync(sdev->iommu, &desc, 1, 0);
  	}
  }
 
@@ -211,7 +211,7 @@ static void intel_mm_release(struct mmu_notifier *mn, struct mm_struct *mm)
  	 */
  	rcu_read_lock();
  	list_for_each_entry_rcu(sdev, &svm->devs, list)
-		intel_pasid_tear_down_entry(svm->iommu, sdev->dev,
+		intel_pasid_tear_down_entry(sdev->iommu, sdev->dev,
  					    svm->pasid, true);
  	rcu_read_unlock();
 
@@ -363,6 +363,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,
  	}
  	sdev->dev = dev;
  	sdev->sid = PCI_DEVID(info->bus, info->devfn);
+	sdev->iommu = iommu;
 
  	/* Only count users if device has aux domains */
  	if (iommu_dev_feature_enabled(dev, IOMMU_DEV_FEAT_AUX))
@@ -546,6 +547,7 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,
  		goto out;
  	}
  	sdev->dev = dev;
+	sdev->iommu = iommu;
 
  	ret = intel_iommu_enable_pasid(iommu, dev);
  	if (ret) {
@@ -575,7 +577,6 @@ intel_svm_bind_mm(struct device *dev, unsigned int flags,
  			kfree(sdev);
  			goto out;
  		}
-		svm->iommu = iommu;
 
  		if (pasid_max > intel_pasid_max_id)
  			pasid_max = intel_pasid_max_id;
include/linux/intel-iommu.h +1 -0
index d956987ed032..94522685a0d9 100644
@@ -758,6 +758,7 @@ struct intel_svm_dev {
  	struct list_head list;
  	struct rcu_head rcu;
  	struct device *dev;
+	struct intel_iommu *iommu;
  	struct svm_dev_ops *ops;
  	struct iommu_sva sva;
  	u32 pasid;

include/linux/intel-iommu.h struct intel_svm { · line 777

Quoted 7 lines
include/linux/intel-iommu.h +0 -1
@@ -771,7 +772,6 @@ struct intel_svm {
  	struct mmu_notifier notifier;
  	struct mm_struct *mm;
 
-	struct intel_iommu *iommu;
  	unsigned int flags;
  	u32 pasid;
  	int gpasid; /* In case that guest PASID is different from host PASID */

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

author
#3 lore raw

PATCH v3 2/3 iommu/vt-d: Track device aux-attach with subdevice_domain_info

In reply to Liu Yi L

In the existing code, loop all devices attached to a domain does not include sub-devices attached via iommu_aux_attach_device().

This was found by when I'm working on the belwo patch, There is no device in the domain->devices list, thus unable to get the cap and ecap of iommu unit. But this domain actually has subdevice which is attached via aux-manner. But it is tracked by domain. This patch is going to fix it.

https://lore.kernel.org/kvm/[email protected]/

And this fix goes beyond the patch above, such sub-device tracking is necessary for other cases. For example, flushing device_iotlb for a domain which has sub-devices attached by auxiliary manner.

---
 drivers/iommu/intel/iommu.c | 95 +++++++++++++++++++++++++++----------
 include/linux/intel-iommu.h | 16 +++++--
 2 files changed, 82 insertions(+), 29 deletions(-)
drivers/iommu/intel/iommu.c +71 -24
index 788119c5b021..d7720a836268 100644
@@ -1877,6 +1877,7 @@ static struct dmar_domain *alloc_domain(int flags)
 		domain->flags |= DOMAIN_FLAG_USE_FIRST_LEVEL;
 	domain->has_iotlb_device = false;
 	INIT_LIST_HEAD(&domain->devices);
+	INIT_LIST_HEAD(&domain->subdevices);
 
 	return domain;
 }
@@ -2547,7 +2548,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
 	info->iommu = iommu;
 	info->pasid_table = NULL;
 	info->auxd_enabled = 0;
-	INIT_LIST_HEAD(&info->auxiliary_domains);
+	INIT_LIST_HEAD(&info->subdevices);
 
 	if (dev && dev_is_pci(dev)) {
 		struct pci_dev *pdev = to_pci_dev(info->dev);
@@ -4475,33 +4476,61 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
 			domain->type == IOMMU_DOMAIN_UNMANAGED;
 }
 
-static void auxiliary_link_device(struct dmar_domain *domain,
-				  struct device *dev)
+static inline struct subdev_domain_info *
+lookup_subdev_info(struct dmar_domain *domain, struct device *dev)
+{
+	struct subdev_domain_info *sinfo;
+
+	if (!list_empty(&domain->subdevices)) {
+		list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+			if (sinfo->pdev == dev)
+				return sinfo;
+		}
+	}
+
+	return NULL;
+}
+
+static int auxiliary_link_device(struct dmar_domain *domain,
+				 struct device *dev)
 {
 	struct device_domain_info *info = get_domain_info(dev);
+	struct subdev_domain_info *sinfo = lookup_subdev_info(domain, dev);
 
 	assert_spin_locked(&device_domain_lock);
 	if (WARN_ON(!info))
-		return;
+		return -EINVAL;
+
+	if (!sinfo) {
+		sinfo = kzalloc(sizeof(*sinfo), GFP_ATOMIC);
+		sinfo->domain = domain;
+		sinfo->pdev = dev;
+		list_add(&sinfo->link_phys, &info->subdevices);
+		list_add(&sinfo->link_domain, &domain->subdevices);
+	}
 
-	domain->auxd_refcnt++;
-	list_add(&domain->auxd, &info->auxiliary_domains);
+	return ++sinfo->users;
 }
 
-static void auxiliary_unlink_device(struct dmar_domain *domain,
-				    struct device *dev)
+static int auxiliary_unlink_device(struct dmar_domain *domain,
+				   struct device *dev)
 {
 	struct device_domain_info *info = get_domain_info(dev);
+	struct subdev_domain_info *sinfo = lookup_subdev_info(domain, dev);
+	int ret;
 
 	assert_spin_locked(&device_domain_lock);
-	if (WARN_ON(!info))
-		return;
+	if (WARN_ON(!info || !sinfo || sinfo->users <= 0))
+		return -EINVAL;
 
-	list_del(&domain->auxd);
-	domain->auxd_refcnt--;
+	ret = --sinfo->users;
+	if (!ret) {
+		list_del(&sinfo->link_phys);
+		list_del(&sinfo->link_domain);
+		kfree(sinfo);
+	}
 
-	if (!domain->auxd_refcnt && domain->default_pasid > 0)
-		ioasid_put(domain->default_pasid);
+	return ret;
 }
 
 static int aux_domain_add_dev(struct dmar_domain *domain,
@@ -4530,6 +4559,19 @@ static int aux_domain_add_dev(struct dmar_domain *domain,
 	}
 
 	spin_lock_irqsave(&device_domain_lock, flags);
+	ret = auxiliary_link_device(domain, dev);
+	if (ret <= 0)
+		goto link_failed;
+
+	/*
+	 * Subdevices from the same physical device can be attached to the
+	 * same domain. For such cases, only the first subdevice attachment
+	 * needs to go through the full steps in this function. So if ret >
+	 * 1, just goto out.
+	 */
+	if (ret > 1)
+		goto out;
+
 	/*
 	 * iommu->lock must be held to attach domain to iommu and setup the
 	 * pasid entry for second level translation.
@@ -4548,10 +4590,9 @@ static int aux_domain_add_dev(struct dmar_domain *domain,
 						     domain->default_pasid);
 	if (ret)
 		goto table_failed;
-	spin_unlock(&iommu->lock);
-
-	auxiliary_link_device(domain, dev);
 
+	spin_unlock(&iommu->lock);
+out:
 	spin_unlock_irqrestore(&device_domain_lock, flags);
 
 	return 0;
@@ -4560,8 +4601,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain,
 	domain_detach_iommu(domain, iommu);
 attach_failed:
 	spin_unlock(&iommu->lock);
+	auxiliary_unlink_device(domain, dev);
+link_failed:
 	spin_unlock_irqrestore(&device_domain_lock, flags);
-	if (!domain->auxd_refcnt && domain->default_pasid > 0)
+	if (list_empty(&domain->subdevices) && domain->default_pasid > 0)
 		ioasid_put(domain->default_pasid);
 
 	return ret;
@@ -4581,14 +4624,18 @@ static void aux_domain_remove_dev(struct dmar_domain *domain,
 	info = get_domain_info(dev);
 	iommu = info->iommu;
 
-	auxiliary_unlink_device(domain, dev);
-
-	spin_lock(&iommu->lock);
-	intel_pasid_tear_down_entry(iommu, dev, domain->default_pasid, false);
-	domain_detach_iommu(domain, iommu);
-	spin_unlock(&iommu->lock);
+	if (!auxiliary_unlink_device(domain, dev)) {
+		spin_lock(&iommu->lock);
+		intel_pasid_tear_down_entry(iommu, dev,
+					    domain->default_pasid, false);
+		domain_detach_iommu(domain, iommu);
+		spin_unlock(&iommu->lock);
+	}
 
 	spin_unlock_irqrestore(&device_domain_lock, flags);
+
+	if (list_empty(&domain->subdevices) && domain->default_pasid > 0)
+		ioasid_put(domain->default_pasid);
 }
 
 static int prepare_domain_attach_device(struct iommu_domain *domain,
include/linux/intel-iommu.h +11 -5
index 94522685a0d9..09c6a0bf3892 100644
@@ -533,11 +533,10 @@ struct dmar_domain {
 					/* Domain ids per IOMMU. Use u16 since
 					 * domain ids are 16 bit wide according
 					 * to VT-d spec, section 9.3 */
-	unsigned int	auxd_refcnt;	/* Refcount of auxiliary attaching */
 
 	bool has_iotlb_device;
 	struct list_head devices;	/* all devices' list */
-	struct list_head auxd;		/* link to device's auxiliary list */
+	struct list_head subdevices;	/* all subdevices' list */
 	struct iova_domain iovad;	/* iova's that belong to this domain */
 
 	struct dma_pte	*pgd;		/* virtual address */
@@ -610,14 +609,21 @@ struct intel_iommu {
 	struct dmar_drhd_unit *drhd;
 };
 
+/* Per subdevice private data */
+struct subdev_domain_info {
+	struct list_head link_phys;	/* link to phys device siblings */
+	struct list_head link_domain;	/* link to domain siblings */
+	struct device *pdev;		/* physical device derived from */
+	struct dmar_domain *domain;	/* aux-domain */
+	int users;			/* user count */
+};
+
 /* PCI domain-device relationship */
 struct device_domain_info {
 	struct list_head link;	/* link to domain siblings */
 	struct list_head global; /* link to global list */
 	struct list_head table;	/* link to pasid table */
-	struct list_head auxiliary_domains; /* auxiliary domains
-					     * attached to this device
-					     */
+	struct list_head subdevices; /* subdevices sibling */
 	u32 segment;		/* PCI segment number */
 	u8 bus;			/* PCI bus number */
 	u8 devfn;		/* PCI devfn number */
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
maintainer Acked-by on v3 2/3
#4 lore raw

Re: [PATCH v3 2/3] iommu/vt-d: Track device aux-attach with subdevice_domain_info

Hi Yi,

Quoted 4 lines · Liu Yi L

In the existing code, loop all devices attached to a domain does not include sub-devices attached via iommu_aux_attach_device().

This was found by when I'm working on the belwo patch, There is no

                                            ^^^^^

below

Quoted 7 lines

device in the domain->devices list, thus unable to get the cap and ecap of iommu unit. But this domain actually has subdevice which is attached via aux-manner. But it is tracked by domain. This patch is going to fix it.

https://lore.kernel.org/kvm/[email protected]/

Quoted 7 lines

And this fix goes beyond the patch above, such sub-device tracking is necessary for other cases. For example, flushing device_iotlb for a domain which has sub-devices attached by auxiliary manner.

Others look good to me.

Fixes 67b8e02b5e761 ("iommu/vt-d: Aux-domain specific domain attach/detach")

Best regards,
baolu

Quoted 204 lines
---
  drivers/iommu/intel/iommu.c | 95 +++++++++++++++++++++++++++----------
  include/linux/intel-iommu.h | 16 +++++--
  2 files changed, 82 insertions(+), 29 deletions(-)
drivers/iommu/intel/iommu.c +71 -24
index 788119c5b021..d7720a836268 100644
@@ -1877,6 +1877,7 @@ static struct dmar_domain *alloc_domain(int flags)
  		domain->flags |= DOMAIN_FLAG_USE_FIRST_LEVEL;
  	domain->has_iotlb_device = false;
  	INIT_LIST_HEAD(&domain->devices);
+	INIT_LIST_HEAD(&domain->subdevices);
 
  	return domain;
  }
@@ -2547,7 +2548,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu,
  	info->iommu = iommu;
  	info->pasid_table = NULL;
  	info->auxd_enabled = 0;
-	INIT_LIST_HEAD(&info->auxiliary_domains);
+	INIT_LIST_HEAD(&info->subdevices);
 
  	if (dev && dev_is_pci(dev)) {
  		struct pci_dev *pdev = to_pci_dev(info->dev);
@@ -4475,33 +4476,61 @@ is_aux_domain(struct device *dev, struct iommu_domain *domain)
  			domain->type == IOMMU_DOMAIN_UNMANAGED;
  }
 
-static void auxiliary_link_device(struct dmar_domain *domain,
-				  struct device *dev)
+static inline struct subdev_domain_info *
+lookup_subdev_info(struct dmar_domain *domain, struct device *dev)
+{
+	struct subdev_domain_info *sinfo;
+
+	if (!list_empty(&domain->subdevices)) {
+		list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+			if (sinfo->pdev == dev)
+				return sinfo;
+		}
+	}
+
+	return NULL;
+}
+
+static int auxiliary_link_device(struct dmar_domain *domain,
+				 struct device *dev)
  {
  	struct device_domain_info *info = get_domain_info(dev);
+	struct subdev_domain_info *sinfo = lookup_subdev_info(domain, dev);
 
  	assert_spin_locked(&device_domain_lock);
  	if (WARN_ON(!info))
-		return;
+		return -EINVAL;
+
+	if (!sinfo) {
+		sinfo = kzalloc(sizeof(*sinfo), GFP_ATOMIC);
+		sinfo->domain = domain;
+		sinfo->pdev = dev;
+		list_add(&sinfo->link_phys, &info->subdevices);
+		list_add(&sinfo->link_domain, &domain->subdevices);
+	}
 
-	domain->auxd_refcnt++;
-	list_add(&domain->auxd, &info->auxiliary_domains);
+	return ++sinfo->users;
  }
 
-static void auxiliary_unlink_device(struct dmar_domain *domain,
-				    struct device *dev)
+static int auxiliary_unlink_device(struct dmar_domain *domain,
+				   struct device *dev)
  {
  	struct device_domain_info *info = get_domain_info(dev);
+	struct subdev_domain_info *sinfo = lookup_subdev_info(domain, dev);
+	int ret;
 
  	assert_spin_locked(&device_domain_lock);
-	if (WARN_ON(!info))
-		return;
+	if (WARN_ON(!info || !sinfo || sinfo->users <= 0))
+		return -EINVAL;
 
-	list_del(&domain->auxd);
-	domain->auxd_refcnt--;
+	ret = --sinfo->users;
+	if (!ret) {
+		list_del(&sinfo->link_phys);
+		list_del(&sinfo->link_domain);
+		kfree(sinfo);
+	}
 
-	if (!domain->auxd_refcnt && domain->default_pasid > 0)
-		ioasid_put(domain->default_pasid);
+	return ret;
  }
 
  static int aux_domain_add_dev(struct dmar_domain *domain,
@@ -4530,6 +4559,19 @@ static int aux_domain_add_dev(struct dmar_domain *domain,
  	}
 
  	spin_lock_irqsave(&device_domain_lock, flags);
+	ret = auxiliary_link_device(domain, dev);
+	if (ret <= 0)
+		goto link_failed;
+
+	/*
+	 * Subdevices from the same physical device can be attached to the
+	 * same domain. For such cases, only the first subdevice attachment
+	 * needs to go through the full steps in this function. So if ret >
+	 * 1, just goto out.
+	 */
+	if (ret > 1)
+		goto out;
+
  	/*
  	 * iommu->lock must be held to attach domain to iommu and setup the
  	 * pasid entry for second level translation.
@@ -4548,10 +4590,9 @@ static int aux_domain_add_dev(struct dmar_domain *domain,
  						     domain->default_pasid);
  	if (ret)
  		goto table_failed;
-	spin_unlock(&iommu->lock);
-
-	auxiliary_link_device(domain, dev);
 
+	spin_unlock(&iommu->lock);
+out:
  	spin_unlock_irqrestore(&device_domain_lock, flags);
 
  	return 0;
@@ -4560,8 +4601,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain,
  	domain_detach_iommu(domain, iommu);
  attach_failed:
  	spin_unlock(&iommu->lock);
+	auxiliary_unlink_device(domain, dev);
+link_failed:
  	spin_unlock_irqrestore(&device_domain_lock, flags);
-	if (!domain->auxd_refcnt && domain->default_pasid > 0)
+	if (list_empty(&domain->subdevices) && domain->default_pasid > 0)
  		ioasid_put(domain->default_pasid);
 
  	return ret;
@@ -4581,14 +4624,18 @@ static void aux_domain_remove_dev(struct dmar_domain *domain,
  	info = get_domain_info(dev);
  	iommu = info->iommu;
 
-	auxiliary_unlink_device(domain, dev);
-
-	spin_lock(&iommu->lock);
-	intel_pasid_tear_down_entry(iommu, dev, domain->default_pasid, false);
-	domain_detach_iommu(domain, iommu);
-	spin_unlock(&iommu->lock);
+	if (!auxiliary_unlink_device(domain, dev)) {
+		spin_lock(&iommu->lock);
+		intel_pasid_tear_down_entry(iommu, dev,
+					    domain->default_pasid, false);
+		domain_detach_iommu(domain, iommu);
+		spin_unlock(&iommu->lock);
+	}
 
  	spin_unlock_irqrestore(&device_domain_lock, flags);
+
+	if (list_empty(&domain->subdevices) && domain->default_pasid > 0)
+		ioasid_put(domain->default_pasid);
  }
 
  static int prepare_domain_attach_device(struct iommu_domain *domain,
include/linux/intel-iommu.h +10 -2
index 94522685a0d9..09c6a0bf3892 100644
@@ -533,11 +533,10 @@ struct dmar_domain {
  					/* Domain ids per IOMMU. Use u16 since
  					 * domain ids are 16 bit wide according
  					 * to VT-d spec, section 9.3 */
-	unsigned int	auxd_refcnt;	/* Refcount of auxiliary attaching */
 
  	bool has_iotlb_device;
  	struct list_head devices;	/* all devices' list */
-	struct list_head auxd;		/* link to device's auxiliary list */
+	struct list_head subdevices;	/* all subdevices' list */
  	struct iova_domain iovad;	/* iova's that belong to this domain */
 
  	struct dma_pte	*pgd;		/* virtual address */
@@ -610,14 +609,21 @@ struct intel_iommu {
  	struct dmar_drhd_unit *drhd;
  };
 
+/* Per subdevice private data */
+struct subdev_domain_info {
+	struct list_head link_phys;	/* link to phys device siblings */
+	struct list_head link_domain;	/* link to domain siblings */
+	struct device *pdev;		/* physical device derived from */
+	struct dmar_domain *domain;	/* aux-domain */
+	int users;			/* user count */
+};
+
  /* PCI domain-device relationship */
  struct device_domain_info {

include/linux/intel-iommu.h struct intel_iommu { · line 629

Quoted 10 lines
include/linux/intel-iommu.h +1 -3
  	struct list_head link;	/* link to domain siblings */
  	struct list_head global; /* link to global list */
  	struct list_head table;	/* link to pasid table */
-	struct list_head auxiliary_domains; /* auxiliary domains
-					     * attached to this device
-					     */
+	struct list_head subdevices; /* subdevices sibling */
  	u32 segment;		/* PCI segment number */
  	u8 bus;			/* PCI bus number */
  	u8 devfn;		/* PCI devfn number */

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

author
#5 lore raw

RE: [PATCH v3 2/3] iommu/vt-d: Track device aux-attach with subdevice_domain_info

Hi Baolu,

Quoted 5 lines

From: Lu Baolu <[email protected]>
Sent: Tuesday, December 29, 2020 4:38 PM

Hi Yi,

Quoted 7 lines
Quoted 4 lines · Liu Yi L

In the existing code, loop all devices attached to a domain does not include sub-devices attached via iommu_aux_attach_device().

This was found by when I'm working on the belwo patch, There is no

                                             ^^^^^

below

nice catch. 😉

Quoted 16 lines
Quoted 6 lines

device in the domain->devices list, thus unable to get the cap and ecap of iommu unit. But this domain actually has subdevice which is attached via aux-manner. But it is tracked by domain. This patch is going to fix it.

https://lore.kernel.org/kvm/1599734733-6431-17-git-send-email-

[email protected]/

Quoted 8 lines

And this fix goes beyond the patch above, such sub-device tracking is necessary for other cases. For example, flushing device_iotlb for a domain which has sub-devices attached by auxiliary manner.

Quoted 5 lines

Others look good to me.

Fixes 67b8e02b5e761 ("iommu/vt-d: Aux-domain specific domain

attach/detach")

thanks,

Regards,
Yi Liu

Quoted 226 lines

Best regards,
baolu

Quoted 2 lines
---
  drivers/iommu/intel/iommu.c | 95 +++++++++++++++++++++++++++--------

--

drivers/iommu/intel/iommu.c static struct dmar_domain *alloc_domain(int

Quoted 8 lines
  include/linux/intel-iommu.h | 16 +++++--
  2 files changed, 82 insertions(+), 29 deletions(-)
drivers/iommu/intel/iommu.c +0 -0
index 788119c5b021..d7720a836268 100644
@@ -1877,6 +1877,7 @@ static struct dmar_domain *alloc_domain(int

flags)

drivers/iommu/intel/iommu.c static struct dmar_domain

Quoted 8 lines
drivers/iommu/intel/iommu.c +1 -0
  		domain->flags |= DOMAIN_FLAG_USE_FIRST_LEVEL;
  	domain->has_iotlb_device = false;
  	INIT_LIST_HEAD(&domain->devices);
+	INIT_LIST_HEAD(&domain->subdevices);
 
  	return domain;
  }
@@ -2547,7 +2548,7 @@ static struct dmar_domain

*dmar_insert_one_dev_info(struct intel_iommu *iommu,

drivers/iommu/intel/iommu.c is_aux_domain(struct device *dev, struct

Quoted 9 lines
drivers/iommu/intel/iommu.c +1 -1
  	info->iommu = iommu;
  	info->pasid_table = NULL;
  	info->auxd_enabled = 0;
-	INIT_LIST_HEAD(&info->auxiliary_domains);
+	INIT_LIST_HEAD(&info->subdevices);
 
  	if (dev && dev_is_pci(dev)) {
  		struct pci_dev *pdev = to_pci_dev(info->dev);
@@ -4475,33 +4476,61 @@ is_aux_domain(struct device *dev, struct

iommu_domain *domain)

drivers/iommu/intel/iommu.c is_aux_domain(struct device *dev, struct iommu_domain *domain)

Quoted 12 lines
drivers/iommu/intel/iommu.c +7 -2
  			domain->type == IOMMU_DOMAIN_UNMANAGED;
  }
 
-static void auxiliary_link_device(struct dmar_domain *domain,
-				  struct device *dev)
+static inline struct subdev_domain_info *
+lookup_subdev_info(struct dmar_domain *domain, struct device *dev)
+{
+	struct subdev_domain_info *sinfo;
+
+	if (!list_empty(&domain->subdevices)) {
+		list_for_each_entry(sinfo, &domain->subdevices,

link_domain) {

drivers/iommu/intel/iommu.c is_aux_domain(struct device *dev, struct iommu_domain *domain)

Quoted 13 lines
drivers/iommu/intel/iommu.c +11 -0
+			if (sinfo->pdev == dev)
+				return sinfo;
+		}
+	}
+
+	return NULL;
+}
+
+static int auxiliary_link_device(struct dmar_domain *domain,
+				 struct device *dev)
  {
  	struct device_domain_info *info = get_domain_info(dev);
+	struct subdev_domain_info *sinfo = lookup_subdev_info(domain,

dev);

Quoted 16 lines
drivers/iommu/intel/iommu.c +9 -3
  	assert_spin_locked(&device_domain_lock);
  	if (WARN_ON(!info))
-		return;
+		return -EINVAL;
+
+	if (!sinfo) {
+		sinfo = kzalloc(sizeof(*sinfo), GFP_ATOMIC);
+		sinfo->domain = domain;
+		sinfo->pdev = dev;
+		list_add(&sinfo->link_phys, &info->subdevices);
+		list_add(&sinfo->link_domain, &domain->subdevices);
+	}
 
-	domain->auxd_refcnt++;
-	list_add(&domain->auxd, &info->auxiliary_domains);

drivers/iommu/intel/iommu.c is_aux_domain(struct device *dev, struct iommu_domain *domain)

Quoted 10 lines
drivers/iommu/intel/iommu.c +4 -2
+	return ++sinfo->users;
  }
 
-static void auxiliary_unlink_device(struct dmar_domain *domain,
-				    struct device *dev)
+static int auxiliary_unlink_device(struct dmar_domain *domain,
+				   struct device *dev)
  {
  	struct device_domain_info *info = get_domain_info(dev);
+	struct subdev_domain_info *sinfo = lookup_subdev_info(domain,

dev);

drivers/iommu/intel/iommu.c static int aux_domain_add_dev(struct

Quoted 24 lines
drivers/iommu/intel/iommu.c +10 -6
+	int ret;
 
  	assert_spin_locked(&device_domain_lock);
-	if (WARN_ON(!info))
-		return;
+	if (WARN_ON(!info || !sinfo || sinfo->users <= 0))
+		return -EINVAL;
 
-	list_del(&domain->auxd);
-	domain->auxd_refcnt--;
+	ret = --sinfo->users;
+	if (!ret) {
+		list_del(&sinfo->link_phys);
+		list_del(&sinfo->link_domain);
+		kfree(sinfo);
+	}
 
-	if (!domain->auxd_refcnt && domain->default_pasid > 0)
-		ioasid_put(domain->default_pasid);
+	return ret;
  }
 
  static int aux_domain_add_dev(struct dmar_domain *domain,
@@ -4530,6 +4559,19 @@ static int aux_domain_add_dev(struct

dmar_domain *domain,

Quoted 8 lines
drivers/iommu/intel/iommu.c +5 -0
  	}
 
  	spin_lock_irqsave(&device_domain_lock, flags);
+	ret = auxiliary_link_device(domain, dev);
+	if (ret <= 0)
+		goto link_failed;
+
+	/*

drivers/iommu/intel/iommu.c static int aux_domain_add_dev(struct dmar_domain *domain,

Quoted 10 lines
drivers/iommu/intel/iommu.c +8 -0
+	 * Subdevices from the same physical device can be attached to the
+	 * same domain. For such cases, only the first subdevice attachment
+	 * needs to go through the full steps in this function. So if ret >
+	 * 1, just goto out.
+	 */
+	if (ret > 1)
+		goto out;
+
  	/*
  	 * iommu->lock must be held to attach domain to iommu and setup

the

drivers/iommu/intel/iommu.c static int aux_domain_add_dev(struct

Quoted 2 lines
drivers/iommu/intel/iommu.c +0 -0
  	 * pasid entry for second level translation.
@@ -4548,10 +4590,9 @@ static int aux_domain_add_dev(struct

dmar_domain *domain,

drivers/iommu/intel/iommu.c static int aux_domain_add_dev(struct

Quoted 13 lines
drivers/iommu/intel/iommu.c +2 -3
  						     domain->default_pasid);
  	if (ret)
  		goto table_failed;
-	spin_unlock(&iommu->lock);
-
-	auxiliary_link_device(domain, dev);
 
+	spin_unlock(&iommu->lock);
+out:
  	spin_unlock_irqrestore(&device_domain_lock, flags);
 
  	return 0;
@@ -4560,8 +4601,10 @@ static int aux_domain_add_dev(struct

dmar_domain *domain,

drivers/iommu/intel/iommu.c static void aux_domain_remove_dev(struct

Quoted 12 lines
drivers/iommu/intel/iommu.c +3 -1
  	domain_detach_iommu(domain, iommu);
  attach_failed:
  	spin_unlock(&iommu->lock);
+	auxiliary_unlink_device(domain, dev);
+link_failed:
  	spin_unlock_irqrestore(&device_domain_lock, flags);
-	if (!domain->auxd_refcnt && domain->default_pasid > 0)
+	if (list_empty(&domain->subdevices) && domain->default_pasid > 0)
  		ioasid_put(domain->default_pasid);
 
  	return ret;
@@ -4581,14 +4624,18 @@ static void aux_domain_remove_dev(struct

dmar_domain *domain,

drivers/iommu/intel/iommu.c static void aux_domain_remove_dev(struct dmar_domain *domain,

Quoted 7 lines
drivers/iommu/intel/iommu.c +0 -4
  	info = get_domain_info(dev);
  	iommu = info->iommu;
 
-	auxiliary_unlink_device(domain, dev);
-
-	spin_lock(&iommu->lock);
-	intel_pasid_tear_down_entry(iommu, dev, domain->default_pasid,

false);

Quoted 7 lines
drivers/iommu/intel/iommu.c +5 -2
-	domain_detach_iommu(domain, iommu);
-	spin_unlock(&iommu->lock);
+	if (!auxiliary_unlink_device(domain, dev)) {
+		spin_lock(&iommu->lock);
+		intel_pasid_tear_down_entry(iommu, dev,
+					    domain->default_pasid, false);
+		domain_detach_iommu(domain, iommu);

drivers/iommu/intel/iommu.c static void aux_domain_remove_dev(struct dmar_domain *domain,

Quoted 10 lines
drivers/iommu/intel/iommu.c +5 -0
+		spin_unlock(&iommu->lock);
+	}
 
  	spin_unlock_irqrestore(&device_domain_lock, flags);
+
+	if (list_empty(&domain->subdevices) && domain->default_pasid > 0)
+		ioasid_put(domain->default_pasid);
  }
 
  static int prepare_domain_attach_device(struct iommu_domain

*domain,

include/linux/intel-iommu.h struct dmar_domain { · line 533

Quoted 6 lines
include/linux/intel-iommu.h +0 -0
index 94522685a0d9..09c6a0bf3892 100644
@@ -533,11 +533,10 @@ struct dmar_domain {
  					/* Domain ids per IOMMU. Use u16

since

include/linux/intel-iommu.h struct dmar_domain { · line 534

Quoted 1 line
include/linux/intel-iommu.h +0 -0
  					 * domain ids are 16 bit wide

according

include/linux/intel-iommu.h struct dmar_domain {

Quoted 8 lines
include/linux/intel-iommu.h +1 -2
  					 * to VT-d spec, section 9.3 */
-	unsigned int	auxd_refcnt;	/* Refcount of auxiliary attaching */
 
  	bool has_iotlb_device;
  	struct list_head devices;	/* all devices' list */
-	struct list_head auxd;		/* link to device's auxiliary list */
+	struct list_head subdevices;	/* all subdevices' list */
  	struct iova_domain iovad;	/* iova's that belong to this domain

*/

Quoted 20 lines
include/linux/intel-iommu.h +9 -0
  	struct dma_pte	*pgd;		/* virtual address */
@@ -610,14 +609,21 @@ struct intel_iommu {
  	struct dmar_drhd_unit *drhd;
  };
 
+/* Per subdevice private data */
+struct subdev_domain_info {
+	struct list_head link_phys;	/* link to phys device siblings */
+	struct list_head link_domain;	/* link to domain siblings */
+	struct device *pdev;		/* physical device derived from */
+	struct dmar_domain *domain;	/* aux-domain */
+	int users;			/* user count */
+};
+
  /* PCI domain-device relationship */
  struct device_domain_info {
  	struct list_head link;	/* link to domain siblings */
  	struct list_head global; /* link to global list */
  	struct list_head table;	/* link to pasid table */
Quoted 8 lines

include/linux/intel-iommu.h struct intel_iommu { · line 629

Quoted 8 lines
include/linux/intel-iommu.h +1 -3
-	struct list_head auxiliary_domains; /* auxiliary domains
-					     * attached to this device
-					     */
+	struct list_head subdevices; /* subdevices sibling */
  	u32 segment;		/* PCI segment number */
  	u8 bus;			/* PCI bus number */
  	u8 devfn;		/* PCI devfn number */

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

author
#6 lore raw

PATCH v3 3/3 iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

In reply to Liu Yi L

iommu_flush_dev_iotlb() is called to invalidate caches on device. It only loops the devices which are full-attached to the domain. For sub-devices, this is ineffective. This results in invalid caching entries left on the device. Fix it by adding loop for subdevices as well. Also, the domain-> has_iotlb_device needs to be updated when attaching to subdevices.

Fixes 67b8e02b5e761 ("iommu/vt-d: Aux-domain specific domain attach/detach")
---
 drivers/iommu/intel/iommu.c | 53 ++++++++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 16 deletions(-)
drivers/iommu/intel/iommu.c +37 -16
index d7720a836268..d48a60b61ba6 100644
@@ -719,6 +719,8 @@ static int domain_update_device_node(struct dmar_domain *domain)
 	return nid;
 }
 
+static void domain_update_iotlb(struct dmar_domain *domain);
+
 /* Some capabilities may be different across iommus */
 static void domain_update_iommu_cap(struct dmar_domain *domain)
 {
@@ -744,6 +746,8 @@ static void domain_update_iommu_cap(struct dmar_domain *domain)
 		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw - 1);
 	else
 		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw);
+
+	domain_update_iotlb(domain);
 }
 
 struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,
@@ -1464,17 +1468,22 @@ static void domain_update_iotlb(struct dmar_domain *domain)
 
 	assert_spin_locked(&device_domain_lock);
 
-	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) {
+	list_for_each_entry(info, &domain->devices, link)
+		if (info && info->ats_enabled) {
 			has_iotlb_device = true;
 			break;
 		}
+
+	if (!has_iotlb_device) {
+		struct subdev_domain_info *sinfo;
+
+		list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+			info = get_domain_info(sinfo->pdev);
+			if (info && info->ats_enabled) {
+				has_iotlb_device = true;
+				break;
+			}
+		}
 	}
 
 	domain->has_iotlb_device = has_iotlb_device;
@@ -1555,25 +1564,37 @@ static void iommu_disable_dev_iotlb(struct device_domain_info *info)
 #endif
 }
 
+static void __iommu_flush_dev_iotlb(struct device_domain_info *info,
+				    u64 addr, unsigned int mask)
+{
+	u16 sid, qdep;
+
+	if (!info || !info->ats_enabled)
+		return;
+
+	sid = info->bus << 8 | info->devfn;
+	qdep = info->ats_qdep;
+	qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
+			   qdep, addr, mask);
+}
+
 static void iommu_flush_dev_iotlb(struct dmar_domain *domain,
 				  u64 addr, unsigned mask)
 {
-	u16 sid, qdep;
 	unsigned long flags;
 	struct device_domain_info *info;
+	struct subdev_domain_info *sinfo;
 
 	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)
-			continue;
+	list_for_each_entry(info, &domain->devices, link)
+		__iommu_flush_dev_iotlb(info, addr, mask);
 
-		sid = info->bus << 8 | info->devfn;
-		qdep = info->ats_qdep;
-		qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
-				qdep, addr, mask);
+	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+		__iommu_flush_dev_iotlb(get_domain_info(sinfo->pdev),
+					addr, mask);
 	}
 	spin_unlock_irqrestore(&device_domain_lock, flags);
 }
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
maintainer Acked-by on v3 3/3
#7 lore raw

Re: [PATCH v3 3/3] iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

Hi Yi,

Quoted 99 lines · Liu Yi L

iommu_flush_dev_iotlb() is called to invalidate caches on device. It only loops the devices which are full-attached to the domain. For sub-devices, this is ineffective. This results in invalid caching entries left on the device. Fix it by adding loop for subdevices as well. Also, the domain-> has_iotlb_device needs to be updated when attaching to subdevices.

Fixes 67b8e02b5e761 ("iommu/vt-d: Aux-domain specific domain attach/detach")
---
  drivers/iommu/intel/iommu.c | 53 ++++++++++++++++++++++++++-----------
  1 file changed, 37 insertions(+), 16 deletions(-)
drivers/iommu/intel/iommu.c +33 -12
index d7720a836268..d48a60b61ba6 100644
@@ -719,6 +719,8 @@ static int domain_update_device_node(struct dmar_domain *domain)
  	return nid;
  }
 
+static void domain_update_iotlb(struct dmar_domain *domain);
+
  /* Some capabilities may be different across iommus */
  static void domain_update_iommu_cap(struct dmar_domain *domain)
  {
@@ -744,6 +746,8 @@ static void domain_update_iommu_cap(struct dmar_domain *domain)
  		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw - 1);
  	else
  		domain->domain.geometry.aperture_end = __DOMAIN_MAX_ADDR(domain->gaw);
+
+	domain_update_iotlb(domain);
  }
 
  struct context_entry *iommu_context_addr(struct intel_iommu *iommu, u8 bus,
@@ -1464,17 +1468,22 @@ static void domain_update_iotlb(struct dmar_domain *domain)
 
  	assert_spin_locked(&device_domain_lock);
 
-	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) {
+	list_for_each_entry(info, &domain->devices, link)
+		if (info && info->ats_enabled) {
  			has_iotlb_device = true;
  			break;
  		}
+
+	if (!has_iotlb_device) {
+		struct subdev_domain_info *sinfo;
+
+		list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+			info = get_domain_info(sinfo->pdev);
+			if (info && info->ats_enabled) {
+				has_iotlb_device = true;
+				break;
+			}
+		}
  	}
 
  	domain->has_iotlb_device = has_iotlb_device;
@@ -1555,25 +1564,37 @@ static void iommu_disable_dev_iotlb(struct device_domain_info *info)
  #endif
  }
 
+static void __iommu_flush_dev_iotlb(struct device_domain_info *info,
+				    u64 addr, unsigned int mask)
+{
+	u16 sid, qdep;
+
+	if (!info || !info->ats_enabled)
+		return;
+
+	sid = info->bus << 8 | info->devfn;
+	qdep = info->ats_qdep;
+	qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
+			   qdep, addr, mask);
+}
+
  static void iommu_flush_dev_iotlb(struct dmar_domain *domain,
  				  u64 addr, unsigned mask)
  {
-	u16 sid, qdep;
  	unsigned long flags;
  	struct device_domain_info *info;
+	struct subdev_domain_info *sinfo;
 
  	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)
-			continue;
+	list_for_each_entry(info, &domain->devices, link)

drivers/iommu/intel/iommu.c static void iommu_disable_dev_iotlb(struct device_domain_info *info) · line 1598

Quoted 10 lines
drivers/iommu/intel/iommu.c +4 -4
+		__iommu_flush_dev_iotlb(info, addr, mask);
 
-		sid = info->bus << 8 | info->devfn;
-		qdep = info->ats_qdep;
-		qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
-				qdep, addr, mask);
+	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+		__iommu_flush_dev_iotlb(get_domain_info(sinfo->pdev),
+					addr, mask);
  	}

Nit:

	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
		info = get_domain_info(sinfo->pdev);
		__iommu_flush_dev_iotlb(info, addr, mask);
	}

Others look good to me.

Best regards,
baolu

drivers/iommu/intel/iommu.c static void iommu_disable_dev_iotlb(struct device_domain_info *info) · line 1600

Quoted 3 lines
drivers/iommu/intel/iommu.c +0 -0
  	spin_unlock_irqrestore(&device_domain_lock, flags);
  }

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

author
#8 lore raw

RE: [PATCH v3 3/3] iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

Hi Baolu,

Quoted 127 lines

From: Lu Baolu <[email protected]>
Sent: Tuesday, December 29, 2020 4:42 PM

Hi Yi,

Quoted 7 lines · Liu Yi L

iommu_flush_dev_iotlb() is called to invalidate caches on device. It only loops the devices which are full-attached to the domain. For sub-devices, this is ineffective. This results in invalid caching entries left on the device. Fix it by adding loop for subdevices as well. Also, the domain-> has_iotlb_device needs to be updated when attaching to subdevices.

Fixes 67b8e02b5e761 ("iommu/vt-d: Aux-domain specific domain

attach/detach")

Quoted 3 lines
---
  drivers/iommu/intel/iommu.c | 53 ++++++++++++++++++++++++++---------

--

drivers/iommu/intel/iommu.c static int domain_update_device_node(struct

Quoted 7 lines
  1 file changed, 37 insertions(+), 16 deletions(-)
drivers/iommu/intel/iommu.c +0 -0
index d7720a836268..d48a60b61ba6 100644
@@ -719,6 +719,8 @@ static int domain_update_device_node(struct

dmar_domain *domain)

drivers/iommu/intel/iommu.c static void domain_update_iommu_cap(struct

Quoted 9 lines
drivers/iommu/intel/iommu.c +2 -0
  	return nid;
  }
 
+static void domain_update_iotlb(struct dmar_domain *domain);
+
  /* Some capabilities may be different across iommus */
  static void domain_update_iommu_cap(struct dmar_domain *domain)
  {
@@ -744,6 +746,8 @@ static void domain_update_iommu_cap(struct

dmar_domain *domain)

drivers/iommu/intel/iommu.c static void domain_update_iommu_cap(struct · line 746

Quoted 1 line
drivers/iommu/intel/iommu.c +0 -0
  		domain->domain.geometry.aperture_end =

__DOMAIN_MAX_ADDR(domain->gaw - 1);

drivers/iommu/intel/iommu.c static void domain_update_iommu_cap(struct · line 748

Quoted 2 lines
drivers/iommu/intel/iommu.c +0 -0
  	else
  		domain->domain.geometry.aperture_end =

__DOMAIN_MAX_ADDR(domain->gaw);

drivers/iommu/intel/iommu.c static void domain_update_iommu_cap(struct dmar_domain *domain)

Quoted 5 lines
drivers/iommu/intel/iommu.c +2 -0
+
+	domain_update_iotlb(domain);
  }
 
  struct context_entry *iommu_context_addr(struct intel_iommu *iommu,

u8 bus,

drivers/iommu/intel/iommu.c static void domain_update_iotlb(struct

Quoted 1 line
drivers/iommu/intel/iommu.c +0 -0
@@ -1464,17 +1468,22 @@ static void domain_update_iotlb(struct

dmar_domain *domain)

Quoted 11 lines
drivers/iommu/intel/iommu.c +0 -8
  	assert_spin_locked(&device_domain_lock);
 
-	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) {

drivers/iommu/intel/iommu.c static void domain_update_iotlb(struct dmar_domain *domain)

Quoted 10 lines
drivers/iommu/intel/iommu.c +7 -0
+	list_for_each_entry(info, &domain->devices, link)
+		if (info && info->ats_enabled) {
  			has_iotlb_device = true;
  			break;
  		}
+
+	if (!has_iotlb_device) {
+		struct subdev_domain_info *sinfo;
+
+		list_for_each_entry(sinfo, &domain->subdevices,

link_domain) {

drivers/iommu/intel/iommu.c static void iommu_disable_dev_iotlb(struct

Quoted 10 lines
drivers/iommu/intel/iommu.c +6 -0
+			info = get_domain_info(sinfo->pdev);
+			if (info && info->ats_enabled) {
+				has_iotlb_device = true;
+				break;
+			}
+		}
  	}
 
  	domain->has_iotlb_device = has_iotlb_device;
@@ -1555,25 +1564,37 @@ static void iommu_disable_dev_iotlb(struct

device_domain_info *info)

Quoted 33 lines
drivers/iommu/intel/iommu.c +16 -4
  #endif
  }
 
+static void __iommu_flush_dev_iotlb(struct device_domain_info *info,
+				    u64 addr, unsigned int mask)
+{
+	u16 sid, qdep;
+
+	if (!info || !info->ats_enabled)
+		return;
+
+	sid = info->bus << 8 | info->devfn;
+	qdep = info->ats_qdep;
+	qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
+			   qdep, addr, mask);
+}
+
  static void iommu_flush_dev_iotlb(struct dmar_domain *domain,
  				  u64 addr, unsigned mask)
  {
-	u16 sid, qdep;
  	unsigned long flags;
  	struct device_domain_info *info;
+	struct subdev_domain_info *sinfo;
 
  	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)
-			continue;
+	list_for_each_entry(info, &domain->devices, link)

drivers/iommu/intel/iommu.c static void iommu_disable_dev_iotlb(struct device_domain_info *info) · line 1598

Quoted 10 lines
drivers/iommu/intel/iommu.c +4 -4
+		__iommu_flush_dev_iotlb(info, addr, mask);
 
-		sid = info->bus << 8 | info->devfn;
-		qdep = info->ats_qdep;
-		qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
-				qdep, addr, mask);
+	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+		__iommu_flush_dev_iotlb(get_domain_info(sinfo->pdev),
+					addr, mask);
  	}

Nit:

Quoted 4 lines
	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
		info = get_domain_info(sinfo->pdev);
		__iommu_flush_dev_iotlb(info, addr, mask);
	}

you are right. this should be better.

Quoted 6 lines

Others look good to me.

Best regards,
baolu

Regards,
Yi Liu

Quoted 3 lines

drivers/iommu/intel/iommu.c static void iommu_disable_dev_iotlb(struct device_domain_info *info) · line 1600

Quoted 3 lines
drivers/iommu/intel/iommu.c +0 -0
  	spin_unlock_irqrestore(&device_domain_lock, flags);
  }

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

maintainer
#9 lore raw

Re: [PATCH v3 3/3] iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

Quoted 47 lines · Yi L
Quoted 42 lines
Quoted 30 lines
drivers/iommu/intel/iommu.c +16 -4
+static void __iommu_flush_dev_iotlb(struct device_domain_info *info,
+				    u64 addr, unsigned int mask)
+{
+	u16 sid, qdep;
+
+	if (!info || !info->ats_enabled)
+		return;
+
+	sid = info->bus << 8 | info->devfn;
+	qdep = info->ats_qdep;
+	qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
+			   qdep, addr, mask);
+}
+
  static void iommu_flush_dev_iotlb(struct dmar_domain *domain,
  				  u64 addr, unsigned mask)
  {
-	u16 sid, qdep;
  	unsigned long flags;
  	struct device_domain_info *info;
+	struct subdev_domain_info *sinfo;
 
  	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)
-			continue;
+	list_for_each_entry(info, &domain->devices, link)

drivers/iommu/intel/iommu.c static void iommu_disable_dev_iotlb(struct device_domain_info *info) · line 1598

Quoted 10 lines
drivers/iommu/intel/iommu.c +4 -4
+		__iommu_flush_dev_iotlb(info, addr, mask);
 
-		sid = info->bus << 8 | info->devfn;
-		qdep = info->ats_qdep;
-		qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
-				qdep, addr, mask);
+	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+		__iommu_flush_dev_iotlb(get_domain_info(sinfo->pdev),
+					addr, mask);
  	}

Nit:

Quoted 4 lines
	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
		info = get_domain_info(sinfo->pdev);
		__iommu_flush_dev_iotlb(info, addr, mask);
	}
Quoted 1 line

you are right. this should be better.

Please can you post a v4, with Lu's acks and the issue reported by Dan fixed too?

Thanks,

Will
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

author
#10 lore raw

RE: [PATCH v3 3/3] iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

Hi Will,

Quoted 52 lines

From: Will Deacon <[email protected]>
Sent: Wednesday, January 6, 2021 1:24 AM

Quoted 1 line · Yi L
Quoted 1 line
Quoted 1 line

+static void __iommu_flush_dev_iotlb(struct device_domain_info

*info,

Quoted 46 lines
Quoted 45 lines
Quoted 29 lines
drivers/iommu/intel/iommu.c +15 -4
+				    u64 addr, unsigned int mask)
+{
+	u16 sid, qdep;
+
+	if (!info || !info->ats_enabled)
+		return;
+
+	sid = info->bus << 8 | info->devfn;
+	qdep = info->ats_qdep;
+	qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
+			   qdep, addr, mask);
+}
+
  static void iommu_flush_dev_iotlb(struct dmar_domain *domain,
  				  u64 addr, unsigned mask)
  {
-	u16 sid, qdep;
  	unsigned long flags;
  	struct device_domain_info *info;
+	struct subdev_domain_info *sinfo;
 
  	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)
-			continue;
+	list_for_each_entry(info, &domain->devices, link)

drivers/iommu/intel/iommu.c static void iommu_disable_dev_iotlb(struct device_domain_info *info) · line 1598

Quoted 10 lines
drivers/iommu/intel/iommu.c +4 -4
+		__iommu_flush_dev_iotlb(info, addr, mask);
 
-		sid = info->bus << 8 | info->devfn;
-		qdep = info->ats_qdep;
-		qi_flush_dev_iotlb(info->iommu, sid, info->pfsid,
-				qdep, addr, mask);
+	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
+		__iommu_flush_dev_iotlb(get_domain_info(sinfo->pdev),
+					addr, mask);
  	}

Nit:

	list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
		info = get_domain_info(sinfo->pdev);
		__iommu_flush_dev_iotlb(info, addr, mask);
	}
Quoted 4 lines
Quoted 1 line

you are right. this should be better.

Please can you post a v4, with Lu's acks and the issue reported by Dan fixed too?

sure, will send out later.

Regards,
Yi Liu

Quoted 3 lines

Thanks,

Will

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

#11 lore raw

Re: [PATCH v3 3/3] iommu/vt-d: Fix ineffective devTLB invalidation for subdevices

In reply to Liu Yi L

Hi Liu,

url:    https://github.com/0day-ci/linux/commits/Liu-Yi-L/iommu-vt-d-Misc-fixes-on-scalable-mode/20201229-113203
base:    5c8fe583cce542aa0b84adc939ce85293de36e5e
config: i386-randconfig-m021-20201229 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0

If you fix the issue, kindly add following tag as appropriate

New smatch warnings:
drivers/iommu/intel/iommu.c:1471 domain_update_iotlb() error: we previously assumed 'info' could be null (see line 1472)

Old smatch warnings:
drivers/iommu/intel/iommu.c:920 device_to_iommu() error: we previously assumed 'pdev' could be null (see line 893) drivers/iommu/intel/iommu.c:3764 intel_iommu_add() warn: should '(1 << sp)' be a 64 bit type?

vim +/info +1471 drivers/iommu/intel/iommu.c

0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1464  static void domain_update_iotlb(struct dmar_domain *domain)
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1465  {
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1466  	struct device_domain_info *info;
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1467  	bool has_iotlb_device = false;
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1468  
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1469  	assert_spin_locked(&device_domain_lock);
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1470  
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29 @1471  	list_for_each_entry(info, &domain->devices, link)
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29 @1472  		if (info && info->ats_enabled) {
                                                                                            ^^^^

"info" is the list iterator so it can't ever be NULL. Just delete the NULL check.

1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1473  			has_iotlb_device = true;
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1474  			break;
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1475  		}
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1476  
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1477  	if (!has_iotlb_device) {
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1478  		struct subdev_domain_info *sinfo;
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1479  
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1480  		list_for_each_entry(sinfo, &domain->subdevices, link_domain) {
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1481  			info = get_domain_info(sinfo->pdev);
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1482  			if (info && info->ats_enabled) {
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1483  				has_iotlb_device = true;
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1484  				break;
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1485  			}
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1486  		}
1aaf68f8927fb5c drivers/iommu/intel/iommu.c Liu Yi L   2020-12-29  1487  	}
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1488  
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1489  	domain->has_iotlb_device = has_iotlb_device;
0824c5920b16fe1 drivers/iommu/intel-iommu.c Omer Peleg 2016-04-20  1490  }

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org