On Tue, Jun 04, 2024 at 09:51:14AM +0800, Lu Baolu wrote:
> Replace iommu_domain_alloc() with iommu_user_domain_alloc().
>
> Signed-off-by: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx>
> ---
> drivers/iommu/iommufd/hw_pagetable.c | 20 +++++---------------
> 1 file changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/iommu/iommufd/hw_pagetable.c b/drivers/iommu/iommufd/hw_pagetable.c
> index 33d142f8057d..ada05fccb36a 100644
> --- a/drivers/iommu/iommufd/hw_pagetable.c
> +++ b/drivers/iommu/iommufd/hw_pagetable.c
> @@ -127,21 +127,11 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
> hwpt_paging->ioas = ioas;
> hwpt_paging->nest_parent = flags & IOMMU_HWPT_ALLOC_NEST_PARENT;
>
> - if (ops->domain_alloc_user) {
> - hwpt->domain = ops->domain_alloc_user(idev->dev, flags, NULL,
> - user_data);
^^^^^^^^^^^^
> - if (IS_ERR(hwpt->domain)) {
> - rc = PTR_ERR(hwpt->domain);
> - hwpt->domain = NULL;
> - goto out_abort;
> - }
> - hwpt->domain->owner = ops;
> - } else {
> - hwpt->domain = iommu_domain_alloc(idev->dev->bus);
> - if (!hwpt->domain) {
> - rc = -ENOMEM;
> - goto out_abort;
> - }
> + hwpt->domain = iommu_user_domain_alloc(idev->dev, flags);
> + if (IS_ERR(hwpt->domain)) {
Where did the user_data go???
If you are going to wrapper the op function then all the args need to
be provided.
I'm not sure there is value in having vfio and vdpa call this
variation since they won't pass a user_data or flags?
Do you imagine there will ever be a difference between what
domain_alloc_user(dev, 0, NULL, NULL) returns from
domain_alloc_paging(dev) ?
That seems like questionable driver behavior to me.
Jason
