[PATCH v2 2/7] iommufd: Pass in idev to iopt_table_enforce_dev_resv_regions

Nicolin Chen
2025-10-15T00:31:19Z

The per-device sw_msi window, defined by sw_msi_start and a size, is from
the IOMMU driver where a static IOMMU_RESV_SW_MSI region is defined.

But soon user space will be allowed to configure the sw_msi window, via a
new SET_OPTION uAPI.

On the other hand, the iopt_table_enforce_dev_resv_regions() will need to
access the sw_msi_start and sw_msi_size stored in the idev struct.

So, pass in idev pointer instead to prepare for the new uAPI.

Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/iommufd/iommufd_private.h | 2 +-
drivers/iommu/iommufd/device.c | 5 ++---
drivers/iommu/iommufd/io_pagetable.c | 3 ++-
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h
index 73e5cddad24e9..cc758610b9f7c 100644
--- a/drivers/iommu/iommufd/iommufd_private.h
+++ b/drivers/iommu/iommufd/iommufd_private.h
@@ -132,7 +132,7 @@ int iopt_table_add_domain(struct io_pagetable *iopt,
void iopt_table_remove_domain(struct io_pagetable *iopt,
struct iommu_domain *domain);
int iopt_table_enforce_dev_resv_regions(struct io_pagetable *iopt,
- struct device *dev,
+ struct iommufd_device *idev,
phys_addr_t *sw_msi_start);
int iopt_set_allow_iova(struct io_pagetable *iopt,
struct rb_root_cached *allowed_iova);
diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c
index ea7ed32bbaede..2a816533dc10e 100644
--- a/drivers/iommu/iommufd/device.c
+++ b/drivers/iommu/iommufd/device.c
@@ -418,8 +418,7 @@ iommufd_device_attach_reserved_iova(struct iommufd_device *idev,

lockdep_assert_held(&igroup->lock);

- rc = iopt_table_enforce_dev_resv_regions(&hwpt_paging->ioas->iopt,
- idev->dev,
+ rc = iopt_table_enforce_dev_resv_regions(&hwpt_paging->ioas->iopt, idev,
&idev->sw_msi_start);
if (rc)
return rc;
@@ -762,7 +761,7 @@ iommufd_device_do_replace_reserved_iova(struct iommufd_device *idev,
if (!old_hwpt_paging || hwpt_paging->ioas != old_hwpt_paging->ioas) {
xa_for_each(&attach->device_array, index, cur) {
rc = iopt_table_enforce_dev_resv_regions(
- &hwpt_paging->ioas->iopt, cur->dev, NULL);
+ &hwpt_paging->ioas->iopt, cur, NULL);
if (rc)
goto err_unresv;
}
diff --git a/drivers/iommu/iommufd/io_pagetable.c b/drivers/iommu/iommufd/io_pagetable.c
index c0360c450880b..dee0aa3e7cb4a 100644
--- a/drivers/iommu/iommufd/io_pagetable.c
+++ b/drivers/iommu/iommufd/io_pagetable.c
@@ -1440,9 +1440,10 @@ void iopt_remove_access(struct io_pagetable *iopt,

/* Narrow the valid_iova_itree to include reserved ranges from a device. */
int iopt_table_enforce_dev_resv_regions(struct io_pagetable *iopt,
- struct device *dev,
+ struct iommufd_device *idev,
phys_addr_t *sw_msi_start)
{
+ struct device *dev = idev->dev;
struct iommu_resv_region *resv;
LIST_HEAD(resv_regions);
unsigned int num_hw_msi = 0;
--
2.43.0