lkml.org 
[lkml]   [2023]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 03/10] iommufd: Rename IOMMUFD_OBJ_HW_PAGETABLE to IOMMUFD_OBJ_HWPT_PAGING
    Date
    From: Jason Gunthorpe <jgg@nvidia.com>

    To add a new IOMMUFD_OBJ_HWPT_NESTED, rename the HWPT object to confine
    it to PAGING hwpts/domains. The following patch will separate the hwpt
    structure as well.

    Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
    Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
    Signed-off-by: Yi Liu <yi.l.liu@intel.com>
    ---
    drivers/iommu/iommufd/device.c | 10 +++++-----
    drivers/iommu/iommufd/hw_pagetable.c | 2 +-
    drivers/iommu/iommufd/iommufd_private.h | 4 ++--
    drivers/iommu/iommufd/main.c | 2 +-
    drivers/iommu/iommufd/selftest.c | 2 +-
    5 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c
    index 0a8867487508..449b64e6ef53 100644
    --- a/drivers/iommu/iommufd/device.c
    +++ b/drivers/iommu/iommufd/device.c
    @@ -563,7 +563,7 @@ static int iommufd_device_change_pt(struct iommufd_device *idev, u32 *pt_id,
    return PTR_ERR(pt_obj);

    switch (pt_obj->type) {
    - case IOMMUFD_OBJ_HW_PAGETABLE: {
    + case IOMMUFD_OBJ_HWPT_PAGING: {
    struct iommufd_hw_pagetable *hwpt =
    container_of(pt_obj, struct iommufd_hw_pagetable, obj);

    @@ -601,8 +601,8 @@ static int iommufd_device_change_pt(struct iommufd_device *idev, u32 *pt_id,
    /**
    * iommufd_device_attach - Connect a device to an iommu_domain
    * @idev: device to attach
    - * @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HW_PAGETABLE
    - * Output the IOMMUFD_OBJ_HW_PAGETABLE ID
    + * @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HWPT_PAGING
    + * Output the IOMMUFD_OBJ_HWPT_PAGING ID
    *
    * This connects the device to an iommu_domain, either automatically or manually
    * selected. Once this completes the device could do DMA.
    @@ -630,8 +630,8 @@ EXPORT_SYMBOL_NS_GPL(iommufd_device_attach, IOMMUFD);
    /**
    * iommufd_device_replace - Change the device's iommu_domain
    * @idev: device to change
    - * @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HW_PAGETABLE
    - * Output the IOMMUFD_OBJ_HW_PAGETABLE ID
    + * @pt_id: Input a IOMMUFD_OBJ_IOAS, or IOMMUFD_OBJ_HWPT_PAGING
    + * Output the IOMMUFD_OBJ_HWPT_PAGING ID
    *
    * This is the same as::
    *
    diff --git a/drivers/iommu/iommufd/hw_pagetable.c b/drivers/iommu/iommufd/hw_pagetable.c
    index 97b84d681e09..1c13c3b6368c 100644
    --- a/drivers/iommu/iommufd/hw_pagetable.c
    +++ b/drivers/iommu/iommufd/hw_pagetable.c
    @@ -86,7 +86,7 @@ iommufd_hw_pagetable_alloc(struct iommufd_ctx *ictx, struct iommufd_ioas *ioas,
    if (flags && !ops->domain_alloc_user)
    return ERR_PTR(-EOPNOTSUPP);

    - hwpt = iommufd_object_alloc(ictx, hwpt, IOMMUFD_OBJ_HW_PAGETABLE);
    + hwpt = iommufd_object_alloc(ictx, hwpt, IOMMUFD_OBJ_HWPT_PAGING);
    if (IS_ERR(hwpt))
    return hwpt;

    diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h
    index 43410fd53157..70bebad63a74 100644
    --- a/drivers/iommu/iommufd/iommufd_private.h
    +++ b/drivers/iommu/iommufd/iommufd_private.h
    @@ -123,7 +123,7 @@ enum iommufd_object_type {
    IOMMUFD_OBJ_NONE,
    IOMMUFD_OBJ_ANY = IOMMUFD_OBJ_NONE,
    IOMMUFD_OBJ_DEVICE,
    - IOMMUFD_OBJ_HW_PAGETABLE,
    + IOMMUFD_OBJ_HWPT_PAGING,
    IOMMUFD_OBJ_IOAS,
    IOMMUFD_OBJ_ACCESS,
    #ifdef CONFIG_IOMMUFD_TEST
    @@ -256,7 +256,7 @@ static inline struct iommufd_hw_pagetable *
    iommufd_get_hwpt(struct iommufd_ucmd *ucmd, u32 id)
    {
    return container_of(iommufd_get_object(ucmd->ictx, id,
    - IOMMUFD_OBJ_HW_PAGETABLE),
    + IOMMUFD_OBJ_HWPT_PAGING),
    struct iommufd_hw_pagetable, obj);
    }
    int iommufd_hwpt_set_dirty_tracking(struct iommufd_ucmd *ucmd);
    diff --git a/drivers/iommu/iommufd/main.c b/drivers/iommu/iommufd/main.c
    index d50f42a730aa..46198e8948d6 100644
    --- a/drivers/iommu/iommufd/main.c
    +++ b/drivers/iommu/iommufd/main.c
    @@ -488,7 +488,7 @@ static const struct iommufd_object_ops iommufd_object_ops[] = {
    [IOMMUFD_OBJ_IOAS] = {
    .destroy = iommufd_ioas_destroy,
    },
    - [IOMMUFD_OBJ_HW_PAGETABLE] = {
    + [IOMMUFD_OBJ_HWPT_PAGING] = {
    .destroy = iommufd_hw_pagetable_destroy,
    .abort = iommufd_hw_pagetable_abort,
    },
    diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
    index a01a38332dc1..d71007234896 100644
    --- a/drivers/iommu/iommufd/selftest.c
    +++ b/drivers/iommu/iommufd/selftest.c
    @@ -442,7 +442,7 @@ get_md_pagetable(struct iommufd_ucmd *ucmd, u32 mockpt_id,
    struct iommufd_object *obj;

    obj = iommufd_get_object(ucmd->ictx, mockpt_id,
    - IOMMUFD_OBJ_HW_PAGETABLE);
    + IOMMUFD_OBJ_HWPT_PAGING);
    if (IS_ERR(obj))
    return ERR_CAST(obj);
    hwpt = container_of(obj, struct iommufd_hw_pagetable, obj);
    --
    2.34.1
    \
     
     \ /
      Last update: 2023-10-24 17:11    [W:6.223 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site