Commit 89d63875 authored by Yi Liu's avatar Yi Liu Committed by Jason Gunthorpe

iommufd: Flow user flags for domain allocation to domain_alloc_user()

Extends iommufd_hw_pagetable_alloc() to accept user flags, the uAPI will
provide the flags.

Link: https://lore.kernel.org/r/20230928071528.26258-4-yi.l.liu@intel.comReviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 7975b722
...@@ -540,7 +540,7 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev, ...@@ -540,7 +540,7 @@ iommufd_device_auto_get_domain(struct iommufd_device *idev,
} }
hwpt = iommufd_hw_pagetable_alloc(idev->ictx, ioas, idev, hwpt = iommufd_hw_pagetable_alloc(idev->ictx, ioas, idev,
immediate_attach); 0, immediate_attach);
if (IS_ERR(hwpt)) { if (IS_ERR(hwpt)) {
destroy_hwpt = ERR_CAST(hwpt); destroy_hwpt = ERR_CAST(hwpt);
goto out_unlock; goto out_unlock;
......
...@@ -61,6 +61,7 @@ int iommufd_hw_pagetable_enforce_cc(struct iommufd_hw_pagetable *hwpt) ...@@ -61,6 +61,7 @@ int iommufd_hw_pagetable_enforce_cc(struct iommufd_hw_pagetable *hwpt)
* @ictx: iommufd context * @ictx: iommufd context
* @ioas: IOAS to associate the domain with * @ioas: IOAS to associate the domain with
* @idev: Device to get an iommu_domain for * @idev: Device to get an iommu_domain for
* @flags: Flags from userspace
* @immediate_attach: True if idev should be attached to the hwpt * @immediate_attach: True if idev should be attached to the hwpt
* *
* Allocate a new iommu_domain and return it as a hw_pagetable. The HWPT * Allocate a new iommu_domain and return it as a hw_pagetable. The HWPT
...@@ -73,7 +74,8 @@ int iommufd_hw_pagetable_enforce_cc(struct iommufd_hw_pagetable *hwpt) ...@@ -73,7 +74,8 @@ int iommufd_hw_pagetable_enforce_cc(struct iommufd_hw_pagetable *hwpt)
*/ */
struct iommufd_hw_pagetable * struct iommufd_hw_pagetable *
iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
struct iommufd_device *idev, bool immediate_attach) struct iommufd_device *idev, u32 flags,
bool immediate_attach)
{ {
const struct iommu_ops *ops = dev_iommu_ops(idev->dev); const struct iommu_ops *ops = dev_iommu_ops(idev->dev);
struct iommufd_hw_pagetable *hwpt; struct iommufd_hw_pagetable *hwpt;
...@@ -91,7 +93,7 @@ iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, ...@@ -91,7 +93,7 @@ iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
hwpt->ioas = ioas; hwpt->ioas = ioas;
if (ops->domain_alloc_user) { if (ops->domain_alloc_user) {
hwpt->domain = ops->domain_alloc_user(idev->dev, 0); hwpt->domain = ops->domain_alloc_user(idev->dev, flags);
if (IS_ERR(hwpt->domain)) { if (IS_ERR(hwpt->domain)) {
rc = PTR_ERR(hwpt->domain); rc = PTR_ERR(hwpt->domain);
hwpt->domain = NULL; hwpt->domain = NULL;
...@@ -166,7 +168,8 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd) ...@@ -166,7 +168,8 @@ int iommufd_hwpt_alloc(struct iommufd_ucmd *ucmd)
} }
mutex_lock(&ioas->mutex); mutex_lock(&ioas->mutex);
hwpt = iommufd_hw_pagetable_alloc(ucmd->ictx, ioas, idev, false); hwpt = iommufd_hw_pagetable_alloc(ucmd->ictx, ioas,
idev, cmd->flags, false);
if (IS_ERR(hwpt)) { if (IS_ERR(hwpt)) {
rc = PTR_ERR(hwpt); rc = PTR_ERR(hwpt);
goto out_unlock; goto out_unlock;
......
...@@ -242,7 +242,8 @@ struct iommufd_hw_pagetable { ...@@ -242,7 +242,8 @@ struct iommufd_hw_pagetable {
struct iommufd_hw_pagetable * struct iommufd_hw_pagetable *
iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas, iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
struct iommufd_device *idev, bool immediate_attach); struct iommufd_device *idev, u32 flags,
bool immediate_attach);
int iommufd_hw_pagetable_enforce_cc(struct iommufd_hw_pagetable *hwpt); int iommufd_hw_pagetable_enforce_cc(struct iommufd_hw_pagetable *hwpt);
int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt, int iommufd_hw_pagetable_attach(struct iommufd_hw_pagetable *hwpt,
struct iommufd_device *idev); struct iommufd_device *idev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment