Skip to contentSkip to conversation

vfio/type1: Add vfio_group_domain()

PATCH Superseded Lu Baolu 3 participants 5 messages Nov 26, 2020 – Dec 1, 2020

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Lu Baolu

author
#0 lore raw

PATCH v2 1/1 vfio/type1: Add vfio_group_domain()

Add the API for getting the domain from a vfio group. This could be used by the physical device drivers which rely on the vfio/mdev framework for mediated device user level access. The typical use case like below:

	unsigned int pasid;
	struct vfio_group *vfio_group;
	struct iommu_domain *iommu_domain;
	struct device *dev = mdev_dev(mdev);
	struct device *iommu_device = mdev_get_iommu_device(dev);

	if (!iommu_device ||
	    !iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX))
		return -EINVAL;

	vfio_group = vfio_group_get_external_user_from_dev(dev);(dev);
	if (IS_ERR_OR_NULL(vfio_group))
		return -EFAULT;

	iommu_domain = vfio_group_domain(vfio_group);
	if (IS_ERR_OR_NULL(iommu_domain)) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	pasid = iommu_aux_get_pasid(iommu_domain, iommu_device);
	if (pasid < 0) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	/* Program device context with pasid value. */
	...
---
 drivers/vfio/vfio.c             | 18 ++++++++++++++++++
 drivers/vfio/vfio_iommu_type1.c | 23 +++++++++++++++++++++++
 include/linux/vfio.h            |  3 +++
 3 files changed, 44 insertions(+)

Change log:
- v1: https://lore.kernel.org/linux-iommu/[email protected]/
- Changed according to comments @ https://lore.kernel.org/linux-iommu/[email protected]/

drivers/vfio/vfio.c +18 -0
index 2151bc7f87ab..62c652111c88 100644
@@ -2331,6 +2331,24 @@ int vfio_unregister_notifier(struct device *dev, enum vfio_notify_type type,
 }
 EXPORT_SYMBOL(vfio_unregister_notifier);
 
+struct iommu_domain *vfio_group_domain(struct vfio_group *group)
+{
+	struct vfio_container *container;
+	struct vfio_iommu_driver *driver;
+
+	if (!group)
+		return ERR_PTR(-EINVAL);
+
+	container = group->container;
+	driver = container->iommu_driver;
+	if (likely(driver && driver->ops->group_domain))
+		return driver->ops->group_domain(container->iommu_data,
+						 group->iommu_group);
+	else
+		return ERR_PTR(-ENOTTY);
+}
+EXPORT_SYMBOL(vfio_group_domain);
+
 /**
  * Module/class support
  */
drivers/vfio/vfio_iommu_type1.c +23 -0
index 67e827638995..783f18f21b95 100644
@@ -2980,6 +2980,28 @@ static int vfio_iommu_type1_dma_rw(void *iommu_data, dma_addr_t user_iova,
 	return ret;
 }
 
+static void *vfio_iommu_type1_group_domain(void *iommu_data,
+					   struct iommu_group *iommu_group)
+{
+	struct vfio_iommu *iommu = iommu_data;
+	struct iommu_domain *domain = NULL;
+	struct vfio_domain *d;
+
+	if (!iommu || !iommu_group)
+		return ERR_PTR(-EINVAL);
+
+	mutex_lock(&iommu->lock);
+	list_for_each_entry(d, &iommu->domain_list, next) {
+		if (find_iommu_group(d, iommu_group)) {
+			domain = d->domain;
+			break;
+		}
+	}
+	mutex_unlock(&iommu->lock);
+
+	return domain;
+}
+
 static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
 	.name			= "vfio-iommu-type1",
 	.owner			= THIS_MODULE,
@@ -2993,6 +3015,7 @@ static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
 	.register_notifier	= vfio_iommu_type1_register_notifier,
 	.unregister_notifier	= vfio_iommu_type1_unregister_notifier,
 	.dma_rw			= vfio_iommu_type1_dma_rw,
+	.group_domain		= vfio_iommu_type1_group_domain,
 };
 
 static int __init vfio_iommu_type1_init(void)
include/linux/vfio.h +3 -0
index 38d3c6a8dc7e..a0613a6f21cc 100644
@@ -90,6 +90,7 @@ struct vfio_iommu_driver_ops {
 					       struct notifier_block *nb);
 	int		(*dma_rw)(void *iommu_data, dma_addr_t user_iova,
 				  void *data, size_t count, bool write);
+	void		*(*group_domain)(void *iommu_data, struct iommu_group *group);
 };
 
 extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
@@ -126,6 +127,8 @@ extern int vfio_group_unpin_pages(struct vfio_group *group,
 extern int vfio_dma_rw(struct vfio_group *group, dma_addr_t user_iova,
 		       void *data, size_t len, bool write);
 
+extern struct iommu_domain *vfio_group_domain(struct vfio_group *group);
+
 /* each type has independent events */
 enum vfio_notify_type {
 	VFIO_IOMMU_NOTIFY = 0,
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
#1 lore raw
Quoted 4 lines · Lu Baolu

Add the API for getting the domain from a vfio group. This could be used by the physical device drivers which rely on the vfio/mdev framework for mediated device user level access. The typical use case like below:

Quoted 11 lines
	unsigned int pasid;
	struct vfio_group *vfio_group;
	struct iommu_domain *iommu_domain;
	struct device *dev = mdev_dev(mdev);
	struct device *iommu_device = mdev_get_iommu_device(dev);

	if (!iommu_device ||
	    !iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX))
		return -EINVAL;

	vfio_group = vfio_group_get_external_user_from_dev(dev);(dev);

duplicate (dev); 😊other parts looks good to me. perhaps, you can also describe that the release function of a sub-device fd should also call vfio_group_put_external_user() to release its reference on the vfio_group.

Regards,
Yi Liu

Quoted 124 lines
	if (IS_ERR_OR_NULL(vfio_group))
		return -EFAULT;

	iommu_domain = vfio_group_domain(vfio_group);
	if (IS_ERR_OR_NULL(iommu_domain)) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	pasid = iommu_aux_get_pasid(iommu_domain, iommu_device);
	if (pasid < 0) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	/* Program device context with pasid value. */
	...
---
 drivers/vfio/vfio.c             | 18 ++++++++++++++++++
 drivers/vfio/vfio_iommu_type1.c | 23 +++++++++++++++++++++++
 include/linux/vfio.h            |  3 +++
 3 files changed, 44 insertions(+)

Change log:
- v1: https://lore.kernel.org/linux-iommu/[email protected]/
- Changed according to comments @ https://lore.kernel.org/linux-iommu/[email protected]/

drivers/vfio/vfio.c +18 -0
index 2151bc7f87ab..62c652111c88 100644
@@ -2331,6 +2331,24 @@ int vfio_unregister_notifier(struct device *dev,
 enum vfio_notify_type type,
 }
 EXPORT_SYMBOL(vfio_unregister_notifier);
 
+struct iommu_domain *vfio_group_domain(struct vfio_group *group)
+{
+	struct vfio_container *container;
+	struct vfio_iommu_driver *driver;
+
+	if (!group)
+		return ERR_PTR(-EINVAL);
+
+	container = group->container;
+	driver = container->iommu_driver;
+	if (likely(driver && driver->ops->group_domain))
+		return driver->ops->group_domain(container->iommu_data,
+						 group->iommu_group);
+	else
+		return ERR_PTR(-ENOTTY);
+}
+EXPORT_SYMBOL(vfio_group_domain);
+
 /**
  * Module/class support

*/

drivers/vfio/vfio_iommu_type1.c +22 -0
index 67e827638995..783f18f21b95 100644
@@ -2980,6 +2980,28 @@ static int vfio_iommu_type1_dma_rw(void *iommu_data,
 dma_addr_t user_iova,
 	return ret;
 }
 
+static void *vfio_iommu_type1_group_domain(void *iommu_data,
+					   struct iommu_group *iommu_group)
+{
+	struct vfio_iommu *iommu = iommu_data;
+	struct iommu_domain *domain = NULL;
+	struct vfio_domain *d;
+
+	if (!iommu || !iommu_group)
+		return ERR_PTR(-EINVAL);
+
+	mutex_lock(&iommu->lock);
+	list_for_each_entry(d, &iommu->domain_list, next) {
+		if (find_iommu_group(d, iommu_group)) {
+			domain = d->domain;
+			break;
+		}
+	}
+	mutex_unlock(&iommu->lock);
+
+	return domain;
+}
+
 static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
 	.name			= "vfio-iommu-type1",
drivers/vfio/vfio_iommu_type1.c +1 -0
 	.owner			= THIS_MODULE,
@@ -2993,6 +3015,7 @@ static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
 	.register_notifier	= vfio_iommu_type1_register_notifier,
 	.unregister_notifier	= vfio_iommu_type1_unregister_notifier,
 	.dma_rw			= vfio_iommu_type1_dma_rw,
+	.group_domain		= vfio_iommu_type1_group_domain,
 };
 
 static int __init vfio_iommu_type1_init(void)
include/linux/vfio.h +3 -1
index 38d3c6a8dc7e..a0613a6f21cc 100644
@@ -90,6 +90,7 @@ struct vfio_iommu_driver_ops {
 					       struct notifier_block *nb);
 	int		(*dma_rw)(void *iommu_data, dma_addr_t user_iova,
 				  void *data, size_t count, bool write);
+	void		*(*group_domain)(void *iommu_data, struct iommu_group *group);
 };
 
 extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
@@ -126,6 +127,8 @@ extern int vfio_group_unpin_pages(struct vfio_group *group,
 extern int vfio_dma_rw(struct vfio_group *group, dma_addr_t user_iova,
 		       void *data, size_t len, bool write);
 
+extern struct iommu_domain *vfio_group_domain(struct vfio_group *group);
+
 /* each type has independent events */
 enum vfio_notify_type {
 	VFIO_IOMMU_NOTIFY = 0,
--

2.25.1

author
#2 lore raw

Hi Yi,

Quoted 11 lines · Yi L
Quoted 10 lines · Lu Baolu

Add the API for getting the domain from a vfio group. This could be used by the physical device drivers which rely on the vfio/mdev framework for mediated device user level access. The typical use case like below:

	unsigned int pasid;
	struct vfio_group *vfio_group;
	struct iommu_domain *iommu_domain;
	struct device *dev = mdev_dev(mdev);
	struct device *iommu_device = mdev_get_iommu_device(dev);
Quoted 7 lines
Quoted 5 lines
	if (!iommu_device ||
	    !iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX))
		return -EINVAL;

	vfio_group = vfio_group_get_external_user_from_dev(dev);(dev);

duplicate (dev); 😊other parts looks good to me. perhaps, you can also

Will fix this typo. Thanks!

Quoted 2 lines

describe that the release function of a sub-device fd should also call vfio_group_put_external_user() to release its reference on the vfio_group.

This is just a sample code. The callers are free to decide when to get and release the vfio_group.

Quoted 3 lines

Regards,
Yi Liu

Best regards,
baolu

Quoted 126 lines
Quoted 125 lines
	if (IS_ERR_OR_NULL(vfio_group))
		return -EFAULT;

	iommu_domain = vfio_group_domain(vfio_group);
	if (IS_ERR_OR_NULL(iommu_domain)) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	pasid = iommu_aux_get_pasid(iommu_domain, iommu_device);
	if (pasid < 0) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	/* Program device context with pasid value. */
	...
---
  drivers/vfio/vfio.c             | 18 ++++++++++++++++++
  drivers/vfio/vfio_iommu_type1.c | 23 +++++++++++++++++++++++
  include/linux/vfio.h            |  3 +++
  3 files changed, 44 insertions(+)

Change log:
- v1: https://lore.kernel.org/linux-iommu/[email protected]/
- Changed according to comments @ https://lore.kernel.org/linux-iommu/[email protected]/

drivers/vfio/vfio.c +18 -0
index 2151bc7f87ab..62c652111c88 100644
@@ -2331,6 +2331,24 @@ int vfio_unregister_notifier(struct device *dev,
 enum vfio_notify_type type,
  }
  EXPORT_SYMBOL(vfio_unregister_notifier);
 
+struct iommu_domain *vfio_group_domain(struct vfio_group *group)
+{
+	struct vfio_container *container;
+	struct vfio_iommu_driver *driver;
+
+	if (!group)
+		return ERR_PTR(-EINVAL);
+
+	container = group->container;
+	driver = container->iommu_driver;
+	if (likely(driver && driver->ops->group_domain))
+		return driver->ops->group_domain(container->iommu_data,
+						 group->iommu_group);
+	else
+		return ERR_PTR(-ENOTTY);
+}
+EXPORT_SYMBOL(vfio_group_domain);
+
  /**
   * Module/class support
   */
drivers/vfio/vfio_iommu_type1.c +22 -0
index 67e827638995..783f18f21b95 100644
@@ -2980,6 +2980,28 @@ static int vfio_iommu_type1_dma_rw(void *iommu_data,
 dma_addr_t user_iova,
  	return ret;
  }
 
+static void *vfio_iommu_type1_group_domain(void *iommu_data,
+					   struct iommu_group *iommu_group)
+{
+	struct vfio_iommu *iommu = iommu_data;
+	struct iommu_domain *domain = NULL;
+	struct vfio_domain *d;
+
+	if (!iommu || !iommu_group)
+		return ERR_PTR(-EINVAL);
+
+	mutex_lock(&iommu->lock);
+	list_for_each_entry(d, &iommu->domain_list, next) {
+		if (find_iommu_group(d, iommu_group)) {
+			domain = d->domain;
+			break;
+		}
+	}
+	mutex_unlock(&iommu->lock);
+
+	return domain;
+}
+
  static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
  	.name			= "vfio-iommu-type1",

.owner = THIS_MODULE,

drivers/vfio/vfio_iommu_type1.c +1 -0
@@ -2993,6 +3015,7 @@ static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
  	.register_notifier	= vfio_iommu_type1_register_notifier,
  	.unregister_notifier	= vfio_iommu_type1_unregister_notifier,
  	.dma_rw			= vfio_iommu_type1_dma_rw,
+	.group_domain		= vfio_iommu_type1_group_domain,
  };
 
  static int __init vfio_iommu_type1_init(void)
include/linux/vfio.h +3 -1
index 38d3c6a8dc7e..a0613a6f21cc 100644
@@ -90,6 +90,7 @@ struct vfio_iommu_driver_ops {
  					       struct notifier_block *nb);
  	int		(*dma_rw)(void *iommu_data, dma_addr_t user_iova,
  				  void *data, size_t count, bool write);
+	void		*(*group_domain)(void *iommu_data, struct iommu_group *group);
  };
 
  extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
@@ -126,6 +127,8 @@ extern int vfio_group_unpin_pages(struct vfio_group *group,
  extern int vfio_dma_rw(struct vfio_group *group, dma_addr_t user_iova,
  		       void *data, size_t len, bool write);
 
+extern struct iommu_domain *vfio_group_domain(struct vfio_group *group);
+
  /* each type has independent events */
  enum vfio_notify_type {
  	VFIO_IOMMU_NOTIFY = 0,
--

2.25.1

#3 lore raw
In reply to Lu Baolu
Quoted 59 lines · On Thu, 26 Nov 2020 09:27:26 +0800 Lu Baolu <[email protected]> wrote:

Add the API for getting the domain from a vfio group. This could be used by the physical device drivers which rely on the vfio/mdev framework for mediated device user level access. The typical use case like below:

	unsigned int pasid;
	struct vfio_group *vfio_group;
	struct iommu_domain *iommu_domain;
	struct device *dev = mdev_dev(mdev);
	struct device *iommu_device = mdev_get_iommu_device(dev);

	if (!iommu_device ||
	    !iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX))
		return -EINVAL;

	vfio_group = vfio_group_get_external_user_from_dev(dev);(dev);
	if (IS_ERR_OR_NULL(vfio_group))
		return -EFAULT;

	iommu_domain = vfio_group_domain(vfio_group);
	if (IS_ERR_OR_NULL(iommu_domain)) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	pasid = iommu_aux_get_pasid(iommu_domain, iommu_device);
	if (pasid < 0) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	/* Program device context with pasid value. */
	...
---
 drivers/vfio/vfio.c             | 18 ++++++++++++++++++
 drivers/vfio/vfio_iommu_type1.c | 23 +++++++++++++++++++++++
 include/linux/vfio.h            |  3 +++
 3 files changed, 44 insertions(+)

Change log:
- v1: https://lore.kernel.org/linux-iommu/[email protected]/
- Changed according to comments @ https://lore.kernel.org/linux-iommu/[email protected]/

drivers/vfio/vfio.c +7 -0
index 2151bc7f87ab..62c652111c88 100644
@@ -2331,6 +2331,24 @@ int vfio_unregister_notifier(struct device *dev, enum vfio_notify_type type,
 }
 EXPORT_SYMBOL(vfio_unregister_notifier);
 
+struct iommu_domain *vfio_group_domain(struct vfio_group *group)
+{
+	struct vfio_container *container;
+	struct vfio_iommu_driver *driver;
+
+	if (!group)
+		return ERR_PTR(-EINVAL);

drivers/vfio/vfio.c int vfio_unregister_notifier(struct device *dev, enum vfio_notify_type type, · line 2350

Quoted 10 lines
drivers/vfio/vfio.c +10 -0
+
+	container = group->container;
+	driver = container->iommu_driver;
+	if (likely(driver && driver->ops->group_domain))
+		return driver->ops->group_domain(container->iommu_data,
+						 group->iommu_group);
+	else
+		return ERR_PTR(-ENOTTY);
+}
+EXPORT_SYMBOL(vfio_group_domain);

_GPL? I don't see that there's a way for a driver to get the vfio_group pointer that's not already _GPL.

Quoted 23 lines
drivers/vfio/vfio.c +1 -0
+
 /**
  * Module/class support
  */
drivers/vfio/vfio_iommu_type1.c +11 -0
index 67e827638995..783f18f21b95 100644
@@ -2980,6 +2980,28 @@ static int vfio_iommu_type1_dma_rw(void *iommu_data, dma_addr_t user_iova,
 	return ret;
 }
 
+static void *vfio_iommu_type1_group_domain(void *iommu_data,
+					   struct iommu_group *iommu_group)
+{
+	struct vfio_iommu *iommu = iommu_data;
+	struct iommu_domain *domain = NULL;
+	struct vfio_domain *d;
+
+	if (!iommu || !iommu_group)
+		return ERR_PTR(-EINVAL);
+
+	mutex_lock(&iommu->lock);

drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_dma_rw(void *iommu_data, dma_addr_t user_iova, · line 3003

Quoted 10 lines
drivers/vfio/vfio_iommu_type1.c +10 -0
+	list_for_each_entry(d, &iommu->domain_list, next) {
+		if (find_iommu_group(d, iommu_group)) {
+			domain = d->domain;
+			break;
+		}
+	}
+	mutex_unlock(&iommu->lock);
+
+	return domain;
+}

Why does this return void* rather than struct iommu_domain*, and why does the error case return an ERR_PTR but the not-found case returns NULL? Thanks,

Alex

Quoted 25 lines
drivers/vfio/vfio_iommu_type1.c +2 -0
+
 static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
 	.name			= "vfio-iommu-type1",
 	.owner			= THIS_MODULE,
@@ -2993,6 +3015,7 @@ static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
 	.register_notifier	= vfio_iommu_type1_register_notifier,
 	.unregister_notifier	= vfio_iommu_type1_unregister_notifier,
 	.dma_rw			= vfio_iommu_type1_dma_rw,
+	.group_domain		= vfio_iommu_type1_group_domain,
 };
 
 static int __init vfio_iommu_type1_init(void)
include/linux/vfio.h +1 -0
index 38d3c6a8dc7e..a0613a6f21cc 100644
@@ -90,6 +90,7 @@ struct vfio_iommu_driver_ops {
 					       struct notifier_block *nb);
 	int		(*dma_rw)(void *iommu_data, dma_addr_t user_iova,
 				  void *data, size_t count, bool write);
+	void		*(*group_domain)(void *iommu_data, struct iommu_group *group);
 };
 
 extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);

include/linux/vfio.h extern int vfio_group_unpin_pages(struct vfio_group *group, · line 134

Quoted 8 lines
include/linux/vfio.h +2 -0
@@ -126,6 +127,8 @@ extern int vfio_group_unpin_pages(struct vfio_group *group,
 extern int vfio_dma_rw(struct vfio_group *group, dma_addr_t user_iova,
 		       void *data, size_t len, bool write);
 
+extern struct iommu_domain *vfio_group_domain(struct vfio_group *group);
+
 /* each type has independent events */
 enum vfio_notify_type {
 	VFIO_IOMMU_NOTIFY = 0,

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

author
#4 lore raw

Hi Alex,

Thanks a lot for your review comments.

Quoted 68 lines · Alex Williamson
Quoted 65 lines · On Thu, 26 Nov 2020 09:27:26 +0800 Lu Baolu <[email protected]> wrote:

Add the API for getting the domain from a vfio group. This could be used by the physical device drivers which rely on the vfio/mdev framework for mediated device user level access. The typical use case like below:

	unsigned int pasid;
	struct vfio_group *vfio_group;
	struct iommu_domain *iommu_domain;
	struct device *dev = mdev_dev(mdev);
	struct device *iommu_device = mdev_get_iommu_device(dev);

	if (!iommu_device ||
	    !iommu_dev_feature_enabled(iommu_device, IOMMU_DEV_FEAT_AUX))
		return -EINVAL;

	vfio_group = vfio_group_get_external_user_from_dev(dev);(dev);
	if (IS_ERR_OR_NULL(vfio_group))
		return -EFAULT;

	iommu_domain = vfio_group_domain(vfio_group);
	if (IS_ERR_OR_NULL(iommu_domain)) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	pasid = iommu_aux_get_pasid(iommu_domain, iommu_device);
	if (pasid < 0) {
		vfio_group_put_external_user(vfio_group);
		return -EFAULT;
	}

	/* Program device context with pasid value. */
	...
---
  drivers/vfio/vfio.c             | 18 ++++++++++++++++++
  drivers/vfio/vfio_iommu_type1.c | 23 +++++++++++++++++++++++
  include/linux/vfio.h            |  3 +++
  3 files changed, 44 insertions(+)

Change log:
- v1: https://lore.kernel.org/linux-iommu/[email protected]/
- Changed according to comments @ https://lore.kernel.org/linux-iommu/[email protected]/

drivers/vfio/vfio.c +13 -0
index 2151bc7f87ab..62c652111c88 100644
@@ -2331,6 +2331,24 @@ int vfio_unregister_notifier(struct device *dev, enum vfio_notify_type type,
  }
  EXPORT_SYMBOL(vfio_unregister_notifier);
 
+struct iommu_domain *vfio_group_domain(struct vfio_group *group)
+{
+	struct vfio_container *container;
+	struct vfio_iommu_driver *driver;
+
+	if (!group)
+		return ERR_PTR(-EINVAL);
+
+	container = group->container;
+	driver = container->iommu_driver;
+	if (likely(driver && driver->ops->group_domain))
+		return driver->ops->group_domain(container->iommu_data,
+						 group->iommu_group);
Quoted 9 lines

drivers/vfio/vfio.c int vfio_unregister_notifier(struct device *dev, enum vfio_notify_type type, · line 2350

Quoted 4 lines
drivers/vfio/vfio.c +4 -0
+	else
+		return ERR_PTR(-ENOTTY);
+}
+EXPORT_SYMBOL(vfio_group_domain);

_GPL? I don't see that there's a way for a driver to get the vfio_group pointer that's not already _GPL.

It should be _GPL. Will fix it.

Quoted 31 lines
Quoted 31 lines
drivers/vfio/vfio.c +1 -0
+
  /**
   * Module/class support
   */
drivers/vfio/vfio_iommu_type1.c +18 -0
index 67e827638995..783f18f21b95 100644
@@ -2980,6 +2980,28 @@ static int vfio_iommu_type1_dma_rw(void *iommu_data, dma_addr_t user_iova,
  	return ret;
  }
 
+static void *vfio_iommu_type1_group_domain(void *iommu_data,
+					   struct iommu_group *iommu_group)
+{
+	struct vfio_iommu *iommu = iommu_data;
+	struct iommu_domain *domain = NULL;
+	struct vfio_domain *d;
+
+	if (!iommu || !iommu_group)
+		return ERR_PTR(-EINVAL);
+
+	mutex_lock(&iommu->lock);
+	list_for_each_entry(d, &iommu->domain_list, next) {
+		if (find_iommu_group(d, iommu_group)) {
+			domain = d->domain;
+			break;
+		}
+	}
+	mutex_unlock(&iommu->lock);
Quoted 8 lines

drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_dma_rw(void *iommu_data, dma_addr_t user_iova, · line 3003

Quoted 3 lines
drivers/vfio/vfio_iommu_type1.c +3 -0
+
+	return domain;
+}

Why does this return void* rather than struct iommu_domain*, and why does the error case return an ERR_PTR but the not-found case returns NULL?

I will change it to return iommu_domain* and return an error number for the not-found case.

Best regards,
baolu

Quoted 33 lines

Thanks,

Alex

Quoted 28 lines
drivers/vfio/vfio_iommu_type1.c +2 -0
+
  static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
  	.name			= "vfio-iommu-type1",
  	.owner			= THIS_MODULE,
@@ -2993,6 +3015,7 @@ static const struct vfio_iommu_driver_ops vfio_iommu_driver_ops_type1 = {
  	.register_notifier	= vfio_iommu_type1_register_notifier,
  	.unregister_notifier	= vfio_iommu_type1_unregister_notifier,
  	.dma_rw			= vfio_iommu_type1_dma_rw,
+	.group_domain		= vfio_iommu_type1_group_domain,
  };
 
  static int __init vfio_iommu_type1_init(void)
include/linux/vfio.h +1 -0
index 38d3c6a8dc7e..a0613a6f21cc 100644
@@ -90,6 +90,7 @@ struct vfio_iommu_driver_ops {
  					       struct notifier_block *nb);
  	int		(*dma_rw)(void *iommu_data, dma_addr_t user_iova,
  				  void *data, size_t count, bool write);
+	void		*(*group_domain)(void *iommu_data, struct iommu_group *group);
  };
 
  extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
@@ -126,6 +127,8 @@ extern int vfio_group_unpin_pages(struct vfio_group *group,
  extern int vfio_dma_rw(struct vfio_group *group, dma_addr_t user_iova,
  		       void *data, size_t len, bool write);
 
Quoted 6 lines

include/linux/vfio.h extern int vfio_group_unpin_pages(struct vfio_group *group, · line 134

Quoted 5 lines
include/linux/vfio.h +2 -0
+extern struct iommu_domain *vfio_group_domain(struct vfio_group *group);
+
  /* each type has independent events */
  enum vfio_notify_type {
  	VFIO_IOMMU_NOTIFY = 0,

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