Commit d5376472 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

iommu: Rename ops->domain_alloc_user() to domain_alloc_paging_flags() 

Now that the main domain allocating path is calling this function it
doesn't make sense to leave it named _user. Change the name to
alloc_paging_flags() to mirror the new iommu_paging_domain_alloc_flags()
function.

A driver should implement only one of ops->domain_alloc_paging() or
ops->domain_alloc_paging_flags(). The former is a simpler interface with
less boiler plate that the majority of drivers use. The latter is for
drivers with a greater feature set (PASID, multiple page table support,
advanced iommufd support, nesting, etc). Additional patches will be needed
to achieve this.

Link: https://patch.msgid.link/r/2-v1-c252ebdeb57b+329-iommu_paging_flags_jgg@nvidia.com


Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 64214c2b

drivers/iommu/amd/iommu.c

+4 −5
Original line number Diff line number Diff line
@@ -2407,8 +2407,7 @@ static struct iommu_domain *amd_iommu_domain_alloc(unsigned int type) 
}



static struct iommu_domain *

amd_iommu_domain_alloc_user(struct device *dev, u32 flags,

			    struct iommu_domain *parent,

amd_iommu_domain_alloc_paging_flags(struct device *dev, u32 flags,

				    const struct iommu_user_data *user_data)



{
@@ -2420,7 +2419,7 @@ amd_iommu_domain_alloc_user(struct device *dev, u32 flags, 
	if (dev)

		iommu = get_amd_iommu_from_dev(dev);



	if ((flags & ~supported_flags) || parent || user_data)

	if ((flags & ~supported_flags) || user_data)

		return ERR_PTR(-EOPNOTSUPP);



	/* Allocate domain with v2 page table if IOMMU supports PASID. */
@@ -2884,7 +2883,7 @@ const struct iommu_ops amd_iommu_ops = { 
	.release_domain = &release_domain,

	.identity_domain = &identity_domain.domain,

	.domain_alloc = amd_iommu_domain_alloc,

	.domain_alloc_user = amd_iommu_domain_alloc_user,

	.domain_alloc_paging_flags = amd_iommu_domain_alloc_paging_flags,

	.domain_alloc_sva = amd_iommu_domain_alloc_sva,

	.probe_device = amd_iommu_probe_device,

	.release_device = amd_iommu_release_device,

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+4 −5
Original line number Diff line number Diff line
@@ -3132,8 +3132,7 @@ static struct iommu_domain arm_smmu_blocked_domain = { 
};



static struct iommu_domain *

arm_smmu_domain_alloc_user(struct device *dev, u32 flags,

			   struct iommu_domain *parent,

arm_smmu_domain_alloc_paging_flags(struct device *dev, u32 flags,

				   const struct iommu_user_data *user_data)

{

	struct arm_smmu_master *master = dev_iommu_priv_get(dev);
@@ -3145,7 +3144,7 @@ arm_smmu_domain_alloc_user(struct device *dev, u32 flags, 


	if (flags & ~PAGING_FLAGS)

		return ERR_PTR(-EOPNOTSUPP);

	if (parent || user_data)

	if (user_data)

		return ERR_PTR(-EOPNOTSUPP);



	if (flags & IOMMU_HWPT_ALLOC_PASID)
@@ -3546,7 +3545,7 @@ static struct iommu_ops arm_smmu_ops = { 
	.hw_info		= arm_smmu_hw_info,

	.domain_alloc_paging    = arm_smmu_domain_alloc_paging,

	.domain_alloc_sva       = arm_smmu_sva_domain_alloc,

	.domain_alloc_user	= arm_smmu_domain_alloc_user,

	.domain_alloc_paging_flags = arm_smmu_domain_alloc_paging_flags,

	.probe_device		= arm_smmu_probe_device,

	.release_device		= arm_smmu_release_device,

	.device_group		= arm_smmu_device_group,

drivers/iommu/intel/iommu.c

+3 −7
Original line number Diff line number Diff line
@@ -3328,8 +3328,7 @@ static struct dmar_domain *paging_domain_alloc(struct device *dev, bool first_st 
}



static struct iommu_domain *

intel_iommu_domain_alloc_user(struct device *dev, u32 flags,

			      struct iommu_domain *parent,

intel_iommu_domain_alloc_paging_flags(struct device *dev, u32 flags,

				      const struct iommu_user_data *user_data)

{

	struct device_domain_info *info = dev_iommu_priv_get(dev);
@@ -3340,9 +3339,6 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags, 
	struct iommu_domain *domain;

	bool first_stage;



	if (parent)

		return ERR_PTR(-EOPNOTSUPP);



	if (flags &

	    (~(IOMMU_HWPT_ALLOC_NEST_PARENT | IOMMU_HWPT_ALLOC_DIRTY_TRACKING

	       | IOMMU_HWPT_FAULT_ID_VALID)))
@@ -4468,7 +4464,7 @@ const struct iommu_ops intel_iommu_ops = { 
	.identity_domain	= &identity_domain,

	.capable		= intel_iommu_capable,

	.hw_info		= intel_iommu_hw_info,

	.domain_alloc_user	= intel_iommu_domain_alloc_user,

	.domain_alloc_paging_flags = intel_iommu_domain_alloc_paging_flags,

	.domain_alloc_sva	= intel_svm_domain_alloc,

	.domain_alloc_paging	= intel_iommu_domain_alloc_paging,

	.domain_alloc_nested	= intel_iommu_domain_alloc_nested,

drivers/iommu/iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -1987,8 +1987,8 @@ __iommu_paging_domain_alloc_flags(struct device *dev, unsigned int type, 


	if (ops->domain_alloc_paging && !flags)

		domain = ops->domain_alloc_paging(dev);

	else if (ops->domain_alloc_user)

		domain = ops->domain_alloc_user(dev, flags, NULL, NULL);

	else if (ops->domain_alloc_paging_flags)

		domain = ops->domain_alloc_paging_flags(dev, flags, NULL);

	else if (ops->domain_alloc && !flags)

		domain = ops->domain_alloc(IOMMU_DOMAIN_UNMANAGED);

	else

drivers/iommu/iommufd/hw_pagetable.c

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ iommufd_hwpt_paging_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, 


	lockdep_assert_held(&ioas->mutex);



	if ((flags || user_data) && !ops->domain_alloc_user)

	if ((flags || user_data) && !ops->domain_alloc_paging_flags)

		return ERR_PTR(-EOPNOTSUPP);

	if (flags & ~valid_flags)

		return ERR_PTR(-EOPNOTSUPP);
@@ -139,8 +139,8 @@ 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,

	if (ops->domain_alloc_paging_flags) {

		hwpt->domain = ops->domain_alloc_paging_flags(idev->dev, flags,

							      user_data);

		if (IS_ERR(hwpt->domain)) {

			rc = PTR_ERR(hwpt->domain);