[PATCH v2 3/3] iommu: Move pasid array from group to device

Lu Baolu
2023-08-14T01:21:33Z

The PASID (Process Address Space ID) feature is a device feature that
allows a device driver to manage the PASID value and attach or detach
its domain to the pasid. The pasid array, which is used to store the
domain of each pasid, is currently stored in iommu group struct, but
it would be more natural to move it to the device so that the device
drivers don't need to understand the internal iommu group concept.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
include/linux/iommu.h | 2 ++
drivers/iommu/iommu.c | 80 +++++++++++++++----------------------------
2 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 411ce9b998dc..76c960741449 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -412,6 +412,7 @@ struct iommu_fault_param {
* @iopf_param: I/O Page Fault queue and data
* @fwspec: IOMMU fwspec data
* @iommu_dev: IOMMU device this device is linked to
+ * @pasid_array: pasid-indexed array of domains attached to pasid
* @priv: IOMMU Driver private data
* @max_pasids: number of PASIDs this device can consume
* @attach_deferred: the dma domain attachment is deferred
@@ -427,6 +428,7 @@ struct dev_iommu {
struct iopf_device_param *iopf_param;
struct iommu_fwspec *fwspec;
struct iommu_device *iommu_dev;
+ struct xarray pasid_array;
void *priv;
u32 max_pasids;
u32 attach_deferred:1;
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index d4a06a37ce39..35cccfb5c24a 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -51,7 +51,6 @@ struct iommu_group {
struct kobject kobj;
struct kobject *devices_kobj;
struct list_head devices;
- struct xarray pasid_array;
struct mutex mutex;
void *iommu_data;
void (*iommu_data_release)(void *iommu_data);
@@ -310,6 +309,7 @@ static struct dev_iommu *dev_iommu_get(struct device *dev)
return NULL;

mutex_init(&param->lock);
+ xa_init(&param->pasid_array);
dev->iommu = param;
return param;
}
@@ -919,7 +919,6 @@ struct iommu_group *iommu_group_alloc(void)
mutex_init(&group->mutex);
INIT_LIST_HEAD(&group->devices);
INIT_LIST_HEAD(&group->entry);
- xa_init(&group->pasid_array);

ret = ida_alloc(&iommu_group_ida, GFP_KERNEL);
if (ret < 0) {
@@ -3135,9 +3134,15 @@ static bool iommu_is_default_domain(struct iommu_group *group)
*/
static bool assert_pasid_dma_ownership(struct iommu_group *group)
{
+ struct group_device *device;
+
lockdep_assert_held(&group->mutex);
+ for_each_group_device(group, device) {
+ if (WARN_ON(!xa_empty(&device->dev->iommu->pasid_array)))
+ return false;
+ }

- return !WARN_ON(!xa_empty(&group->pasid_array));
+ return true;
}

/**
@@ -3371,33 +3376,6 @@ bool iommu_group_dma_owner_claimed(struct iommu_group *group)
}
EXPORT_SYMBOL_GPL(iommu_group_dma_owner_claimed);

-static int __iommu_set_group_pasid(struct iommu_domain *domain,
- struct iommu_group *group, ioasid_t pasid)
-{
- struct group_device *device;
- int ret = 0;
-
- for_each_group_device(group, device) {
- ret = domain->ops->set_dev_pasid(domain, device->dev, pasid);
- if (ret)
- break;
- }
-
- return ret;
-}
-
-static void __iommu_remove_group_pasid(struct iommu_group *group,
- ioasid_t pasid)
-{
- struct group_device *device;
- const struct iommu_ops *ops;
-
- for_each_group_device(group, device) {
- ops = dev_iommu_ops(device->dev);
- ops->remove_dev_pasid(device->dev, pasid);
- }
-}
-
/*
* iommu_attach_device_pasid() - Attach a domain to pasid of device
* @domain: the iommu domain.
@@ -3411,6 +3389,7 @@ int iommu_attach_device_pasid(struct iommu_domain *domain,
{
/* Caller must be a probed driver on dev */
struct iommu_group *group = dev->iommu_group;
+ struct dev_iommu *param = dev->iommu;
void *curr;
int ret;

@@ -3422,23 +3401,23 @@ int iommu_attach_device_pasid(struct iommu_domain *domain,

mutex_lock(&group->mutex);
if (list_count_nodes(&group->devices) != 1) {
- ret = -EINVAL;
- goto out_unlock;
+ mutex_unlock(&group->mutex);
+ return -EINVAL;
}
+ mutex_unlock(&group->mutex);

- curr = xa_cmpxchg(&group->pasid_array, pasid, NULL, domain, GFP_KERNEL);
+ mutex_lock(&param->lock);
+ curr = xa_cmpxchg(&param->pasid_array, pasid, NULL, domain, GFP_KERNEL);
if (curr) {
ret = xa_err(curr) ? : -EBUSY;
goto out_unlock;
}

- ret = __iommu_set_group_pasid(domain, group, pasid);
- if (ret) {
- __iommu_remove_group_pasid(group, pasid);
- xa_erase(&group->pasid_array, pasid);
- }
+ ret = domain->ops->set_dev_pasid(domain, dev, pasid);
+ if (ret)
+ xa_erase(&param->pasid_array, pasid);
out_unlock:
- mutex_unlock(&group->mutex);
+ mutex_unlock(&param->lock);
return ret;
}
EXPORT_SYMBOL_GPL(iommu_attach_device_pasid);
@@ -3455,13 +3434,13 @@ EXPORT_SYMBOL_GPL(iommu_attach_device_pasid);
void iommu_detach_device_pasid(struct iommu_domain *domain, struct device *dev,
ioasid_t pasid)
{
- /* Caller must be a probed driver on dev */
- struct iommu_group *group = dev->iommu_group;
+ const struct iommu_ops *ops = dev_iommu_ops(dev);
+ struct dev_iommu *param = dev->iommu;

- mutex_lock(&group->mutex);
- __iommu_remove_group_pasid(group, pasid);
- WARN_ON(xa_erase(&group->pasid_array, pasid) != domain);
- mutex_unlock(&group->mutex);
+ mutex_lock(&param->lock);
+ ops->remove_dev_pasid(dev, pasid);
+ WARN_ON(xa_erase(&param->pasid_array, pasid) != domain);
+ mutex_unlock(&param->lock);
}
EXPORT_SYMBOL_GPL(iommu_detach_device_pasid);

@@ -3483,18 +3462,13 @@ struct iommu_domain *iommu_get_domain_for_dev_pasid(struct device *dev,
ioasid_t pasid,
unsigned int type)
{
- /* Caller must be a probed driver on dev */
- struct iommu_group *group = dev->iommu_group;
struct iommu_domain *domain;

- if (!group)
- return NULL;
-
- xa_lock(&group->pasid_array);
- domain = xa_load(&group->pasid_array, pasid);
+ xa_lock(&dev->iommu->pasid_array);
+ domain = xa_load(&dev->iommu->pasid_array, pasid);
if (type && domain && domain->type != type)
domain = ERR_PTR(-EBUSY);
- xa_unlock(&group->pasid_array);
+ xa_unlock(&dev->iommu->pasid_array);

return domain;
}
--
2.34.1