openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: Eric 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: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Jacob Pan 2020-09-25 09:32:45 -07:00 committed by Joerg Roedel
parent 8d3bb3b8cb
commit 23cc3493b5
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/iommu/iommu.c
View File

@ -1961,35 +1961,35 @@ int iommu_attach_device(struct iommu_domain *domain, struct device *dev)
} }
EXPORT_SYMBOL_GPL(iommu_attach_device); 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) struct iommu_cache_invalidate_info *inv_info)
{ {
if (unlikely(!domain->ops->cache_invalidate)) if (unlikely(!domain->ops->cache_invalidate))
return -ENODEV; return -ENODEV;
return domain->ops->cache_invalidate(domain, dev, inv_info); 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) struct device *dev, struct iommu_gpasid_bind_data *data)
{ {
if (unlikely(!domain->ops->sva_bind_gpasid)) if (unlikely(!domain->ops->sva_bind_gpasid))
return -ENODEV; return -ENODEV;
return domain->ops->sva_bind_gpasid(domain, dev, data); 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) ioasid_t pasid)
{ {
if (unlikely(!domain->ops->sva_unbind_gpasid)) if (unlikely(!domain->ops->sva_unbind_gpasid))
return -ENODEV; return -ENODEV;
return domain->ops->sva_unbind_gpasid(dev, pasid); 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, static void __iommu_detach_device(struct iommu_domain *domain,
struct device *dev) struct device *dev)

37
include/linux/iommu.h
View File

@ -424,13 +424,13 @@ extern int iommu_attach_device(struct iommu_domain *domain,
struct device *dev); struct device *dev);
extern void iommu_detach_device(struct iommu_domain *domain, extern void iommu_detach_device(struct iommu_domain *domain,
struct device *dev); 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 device *dev,
struct iommu_cache_invalidate_info *inv_info); 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); 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); struct device *dev, ioasid_t pasid);
extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev); extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev);
extern struct iommu_domain *iommu_get_dma_domain(struct device *dev); extern struct iommu_domain *iommu_get_dma_domain(struct device *dev);
extern int iommu_map(struct iommu_domain *domain, unsigned long iova, extern int iommu_map(struct iommu_domain *domain, unsigned long iova,
@ -1032,21 +1032,22 @@ static inline int iommu_sva_get_pasid(struct iommu_sva *handle)
return IOMMU_PASID_INVALID; return IOMMU_PASID_INVALID;
} }
static inline int static inline int iommu_uapi_cache_invalidate(struct iommu_domain *domain,
iommu_cache_invalidate(struct iommu_domain *domain, struct device *dev,
struct device *dev, struct iommu_cache_invalidate_info *inv_info)
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)
{ {
return -ENODEV; return -ENODEV;
} }
static inline int iommu_sva_unbind_gpasid(struct iommu_domain *domain, static inline int iommu_uapi_sva_bind_gpasid(struct iommu_domain *domain,
struct device *dev, int pasid) struct device *dev,
struct iommu_gpasid_bind_data *data)
{
return -ENODEV;
}
static inline int iommu_uapi_sva_unbind_gpasid(struct iommu_domain *domain,
struct device *dev, int pasid)
{ {
return -ENODEV; return -ENODEV;
} }