Commit 23cc3493 authored by Jacob Pan's avatar Jacob Pan Committed by Joerg Roedel
Browse files

iommu/uapi: Rename uapi functions 



User APIs such as iommu_sva_unbind_gpasid() may also be used by the
kernel. Since we introduced user pointer to the UAPI functions,
in-kernel callers cannot share the same APIs. In-kernel callers are also
trusted, there is no need to validate the data.

We plan to have two flavors of the same API functions, one called
through ioctls, carrying a user pointer and one called directly with
valid IOMMU UAPI structs. To differentiate both, let's rename existing
functions with an iommu_uapi_ prefix.

Suggested-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Link: https://lore.kernel.org/r/1601051567-54787-5-git-send-email-jacob.jun.pan@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 8d3bb3b8

drivers/iommu/iommu.c

+9 −9
Original line number Diff line number Diff line
@@ -1961,7 +1961,7 @@ out_unlock: 
}

EXPORT_SYMBOL_GPL(iommu_attach_device);



int iommu_cache_invalidate(struct iommu_domain *domain, struct device *dev,

int iommu_uapi_cache_invalidate(struct iommu_domain *domain, struct device *dev,

				struct iommu_cache_invalidate_info *inv_info)

{

	if (unlikely(!domain->ops->cache_invalidate))
@@ -1969,9 +1969,9 @@ int iommu_cache_invalidate(struct iommu_domain *domain, struct device *dev, 


	return domain->ops->cache_invalidate(domain, dev, inv_info);

}

EXPORT_SYMBOL_GPL(iommu_cache_invalidate);

EXPORT_SYMBOL_GPL(iommu_uapi_cache_invalidate);



int iommu_sva_bind_gpasid(struct iommu_domain *domain,

int iommu_uapi_sva_bind_gpasid(struct iommu_domain *domain,

			       struct device *dev, struct iommu_gpasid_bind_data *data)

{

	if (unlikely(!domain->ops->sva_bind_gpasid))
@@ -1979,9 +1979,9 @@ int iommu_sva_bind_gpasid(struct iommu_domain *domain, 


	return domain->ops->sva_bind_gpasid(domain, dev, data);

}

EXPORT_SYMBOL_GPL(iommu_sva_bind_gpasid);

EXPORT_SYMBOL_GPL(iommu_uapi_sva_bind_gpasid);



int iommu_sva_unbind_gpasid(struct iommu_domain *domain, struct device *dev,

int iommu_uapi_sva_unbind_gpasid(struct iommu_domain *domain, struct device *dev,

				 ioasid_t pasid)

{

	if (unlikely(!domain->ops->sva_unbind_gpasid))
@@ -1989,7 +1989,7 @@ int iommu_sva_unbind_gpasid(struct iommu_domain *domain, struct device *dev, 


	return domain->ops->sva_unbind_gpasid(dev, pasid);

}

EXPORT_SYMBOL_GPL(iommu_sva_unbind_gpasid);

EXPORT_SYMBOL_GPL(iommu_uapi_sva_unbind_gpasid);



static void __iommu_detach_device(struct iommu_domain *domain,

				  struct device *dev)

include/linux/iommu.h

+16 −15
Original line number Diff line number Diff line
@@ -424,12 +424,12 @@ extern int iommu_attach_device(struct iommu_domain *domain, 
			       struct device *dev);

extern void iommu_detach_device(struct iommu_domain *domain,

				struct device *dev);

extern int iommu_cache_invalidate(struct iommu_domain *domain,

extern int iommu_uapi_cache_invalidate(struct iommu_domain *domain,

				       struct device *dev,

				       struct iommu_cache_invalidate_info *inv_info);

extern int iommu_sva_bind_gpasid(struct iommu_domain *domain,

extern int iommu_uapi_sva_bind_gpasid(struct iommu_domain *domain,

				      struct device *dev, struct iommu_gpasid_bind_data *data);

extern int iommu_sva_unbind_gpasid(struct iommu_domain *domain,

extern int iommu_uapi_sva_unbind_gpasid(struct iommu_domain *domain,

					struct device *dev, ioasid_t pasid);

extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev);

extern struct iommu_domain *iommu_get_dma_domain(struct device *dev);
@@ -1032,20 +1032,21 @@ static inline int iommu_sva_get_pasid(struct iommu_sva *handle) 
	return IOMMU_PASID_INVALID;

}



static inline int

iommu_cache_invalidate(struct iommu_domain *domain,

static inline int iommu_uapi_cache_invalidate(struct iommu_domain *domain,

					      struct device *dev,

					      struct iommu_cache_invalidate_info *inv_info)

{

	return -ENODEV;

}

static inline int iommu_sva_bind_gpasid(struct iommu_domain *domain,

				struct device *dev, struct iommu_gpasid_bind_data *data)



static inline int iommu_uapi_sva_bind_gpasid(struct iommu_domain *domain,

					     struct device *dev,

					     struct iommu_gpasid_bind_data *data)

{

	return -ENODEV;

}



static inline int iommu_sva_unbind_gpasid(struct iommu_domain *domain,

static inline int iommu_uapi_sva_unbind_gpasid(struct iommu_domain *domain,

					       struct device *dev, int pasid)

{

	return -ENODEV;

CRA Git | Maintained and supported by SUSTech CRA and CCSE