[PATCH 06/17] iommufd/hw_pagetable: Use domain_alloc_user op for domain allocation

Yi Liu
2023-02-09T04:35:02Z

This converts iommufd to use iommu_domain_alloc_user() for iommu_domain
creation.

Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/iommu/iommufd/hw_pagetable.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/iommu/iommufd/hw_pagetable.c b/drivers/iommu/iommufd/hw_pagetable.c
index 43d473989a06..08d963ee38c7 100644
--- a/drivers/iommu/iommufd/hw_pagetable.c
+++ b/drivers/iommu/iommufd/hw_pagetable.c
@@ -30,6 +30,7 @@ struct iommufd_hw_pagetable *
iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
struct device *dev)
{
+ const struct iommu_ops *ops;
struct iommufd_hw_pagetable *hwpt;
int rc;

@@ -37,7 +38,13 @@ iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
if (IS_ERR(hwpt))
return hwpt;

- hwpt->domain = iommu_domain_alloc(dev->bus);
+ ops = dev_iommu_ops(dev);
+ if (!ops || !ops->domain_alloc_user) {
+ rc = -EOPNOTSUPP;
+ goto out_abort;
+ }
+
+ hwpt->domain = ops->domain_alloc_user(dev, NULL, NULL);
if (!hwpt->domain) {
rc = -ENOMEM;
goto out_abort;
--
2.34.1