iommufd: Apply obvious cosmetic fixes

Run clang-format but exclude those not so obvious ones, which leaves us:
 - Align indentations
 - Add missing spaces
 - Remove unnecessary spaces
 - Remove unnecessary line wrappings

Link: https://patch.msgid.link/r/9132e1ab45690ab1959c66bbb51ac5536a635388.1749882255.git.nicolinc@nvidia.com
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c
index 86244403b5320e163af3d6491a4aa674582628e0..ed0dc539d490de1e4e8f5a748598e523362e347a 100644 (file)
--- a/drivers/iommu/iommufd/device.c
+++ b/drivers/iommu/iommufd/device.c
@@ -485,8 +485,7 @@ iommufd_device_get_attach_handle(struct iommufd_device *idev, ioasid_t pasid)
 
        lockdep_assert_held(&idev->igroup->lock);
 
-       handle =
-               iommu_attach_handle_get(idev->igroup->group, pasid, 0);
+       handle = iommu_attach_handle_get(idev->igroup->group, pasid, 0);
        if (IS_ERR(handle))
                return NULL;
        return to_iommufd_handle(handle);

diff --git a/drivers/iommu/iommufd/hw_pagetable.c b/drivers/iommu/iommufd/hw_pagetable.c
index 487779470261a75f201e1c826cfcb8151f5ec9e3..8565a6f596b23811412c18a0cd885ae73ce0f5d6 100644 (file)
--- a/drivers/iommu/iommufd/hw_pagetable.c
+++ b/drivers/iommu/iommufd/hw_pagetable.c
@@ -309,10 +309,8 @@ iommufd_viommu_alloc_hwpt_nested(struct iommufd_viommu *viommu, u32 flags,
        refcount_inc(&viommu->obj.users);
        hwpt_nested->parent = viommu->hwpt;
 
-       hwpt->domain =
-               viommu->ops->alloc_domain_nested(viommu,
-                               flags & ~IOMMU_HWPT_FAULT_ID_VALID,
-                               user_data);
+       hwpt->domain = viommu->ops->alloc_domain_nested(
+               viommu, flags & ~IOMMU_HWPT_FAULT_ID_VALID, user_data);
        if (IS_ERR(hwpt->domain)) {
                rc = PTR_ERR(hwpt->domain);
                hwpt->domain = NULL;

diff --git a/drivers/iommu/iommufd/io_pagetable.c b/drivers/iommu/iommufd/io_pagetable.c
index 8a790e597e12532c2f79d64ddab1cc8c228cb439..13d010f19ed19efbbc32f768041e73d87302524f 100644 (file)
--- a/drivers/iommu/iommufd/io_pagetable.c
+++ b/drivers/iommu/iommufd/io_pagetable.c
@@ -1410,8 +1410,7 @@ out_unlock:
 }
 
 void iopt_remove_access(struct io_pagetable *iopt,
-                       struct iommufd_access *access,
-                       u32 iopt_access_list_id)
+                       struct iommufd_access *access, u32 iopt_access_list_id)
 {
        down_write(&iopt->domains_rwsem);
        down_write(&iopt->iova_rwsem);

diff --git a/drivers/iommu/iommufd/io_pagetable.h b/drivers/iommu/iommufd/io_pagetable.h
index 10c928a9a4633254c4cabecb7626df0c3383a56c..c115a51d93846a8a2007c1a3d2011c1585684117 100644 (file)
--- a/drivers/iommu/iommufd/io_pagetable.h
+++ b/drivers/iommu/iommufd/io_pagetable.h
@@ -240,7 +240,7 @@ int iopt_area_add_access(struct iopt_area *area, unsigned long start,
                         unsigned long last, struct page **out_pages,
                         unsigned int flags);
 void iopt_area_remove_access(struct iopt_area *area, unsigned long start,
-                           unsigned long last);
+                            unsigned long last);
 int iopt_pages_rw_access(struct iopt_pages *pages, unsigned long start_byte,
                         void *data, unsigned long length, unsigned int flags);
 

diff --git a/drivers/iommu/iommufd/iommufd_private.h b/drivers/iommu/iommufd/iommufd_private.h
index 9ccc83341f3215e9c7fda7d50669de9601c31755..190ceb5dada342f16b9939c48885fd072cd12dc4 100644 (file)
--- a/drivers/iommu/iommufd/iommufd_private.h
+++ b/drivers/iommu/iommufd/iommufd_private.h
@@ -266,8 +266,7 @@ struct iommufd_ioas {
 static inline struct iommufd_ioas *iommufd_get_ioas(struct iommufd_ctx *ictx,
                                                    u32 id)
 {
-       return container_of(iommufd_get_object(ictx, id,
-                                              IOMMUFD_OBJ_IOAS),
+       return container_of(iommufd_get_object(ictx, id, IOMMUFD_OBJ_IOAS),
                            struct iommufd_ioas, obj);
 }
 
@@ -452,8 +451,7 @@ struct iommufd_access {
 
 int iopt_add_access(struct io_pagetable *iopt, struct iommufd_access *access);
 void iopt_remove_access(struct io_pagetable *iopt,
-                       struct iommufd_access *access,
-                       u32 iopt_access_list_id);
+                       struct iommufd_access *access, u32 iopt_access_list_id);
 void iommufd_access_destroy_object(struct iommufd_object *obj);
 
 struct iommufd_eventq {

diff --git a/drivers/iommu/iommufd/iova_bitmap.c b/drivers/iommu/iommufd/iova_bitmap.c
index 39a86a4a1d3af4a8944a8bc731884948d2bf2b1a..4514575818fc0704acf3adfd9558ffbdd5a731e7 100644 (file)
--- a/drivers/iommu/iommufd/iova_bitmap.c
+++ b/drivers/iommu/iommufd/iova_bitmap.c
@@ -407,7 +407,6 @@ void iova_bitmap_set(struct iova_bitmap *bitmap,
 
 update_indexes:
        if (unlikely(!iova_bitmap_mapped_range(mapped, iova, length))) {
-
                /*
                 * The attempt to advance the base index to @iova
                 * may fail if it's out of bounds, or pinning the pages

diff --git a/drivers/iommu/iommufd/main.c b/drivers/iommu/iommufd/main.c
index 3df468f64e7d9edb56c69d8ac15cb045e2ca04a7..347c56ef44d835f6c5af30e2e391509e7d0d86f1 100644 (file)
--- a/drivers/iommu/iommufd/main.c
+++ b/drivers/iommu/iommufd/main.c
@@ -102,9 +102,8 @@ static int iommufd_object_dec_wait_shortterm(struct iommufd_ctx *ictx,
                return 0;
 
        if (wait_event_timeout(ictx->destroy_wait,
-                               refcount_read(&to_destroy->shortterm_users) ==
-                                       0,
-                               msecs_to_jiffies(60000)))
+                              refcount_read(&to_destroy->shortterm_users) == 0,
+                              msecs_to_jiffies(60000)))
                return 0;
 
        pr_crit("Time out waiting for iommufd object to become free\n");
@@ -539,7 +538,6 @@ static struct miscdevice iommu_misc_dev = {
        .mode = 0660,
 };
 
-
 static struct miscdevice vfio_misc_dev = {
        .minor = VFIO_MINOR,
        .name = "vfio",

diff --git a/drivers/iommu/iommufd/pages.c b/drivers/iommu/iommufd/pages.c
index 3427749bc5ce1b24d426f1b73b5efaba17930e8b..cbdde642d2af8d5c792f2a562f51287f1fb4d3d4 100644 (file)
--- a/drivers/iommu/iommufd/pages.c
+++ b/drivers/iommu/iommufd/pages.c
@@ -1287,8 +1287,7 @@ static int pfn_reader_first(struct pfn_reader *pfns, struct iopt_pages *pages,
 }
 
 static struct iopt_pages *iopt_alloc_pages(unsigned long start_byte,
-                                          unsigned long length,
-                                          bool writable)
+                                          unsigned long length, bool writable)
 {
        struct iopt_pages *pages;
 
@@ -1328,7 +1327,7 @@ struct iopt_pages *iopt_alloc_user_pages(void __user *uptr,
        struct iopt_pages *pages;
        unsigned long end;
        void __user *uptr_down =
-               (void __user *) ALIGN_DOWN((uintptr_t)uptr, PAGE_SIZE);
+               (void __user *)ALIGN_DOWN((uintptr_t)uptr, PAGE_SIZE);
 
        if (check_add_overflow((unsigned long)uptr, length, &end))
                return ERR_PTR(-EOVERFLOW);
@@ -2111,8 +2110,8 @@ iopt_pages_get_exact_access(struct iopt_pages *pages, unsigned long index,
  * This should be undone through a matching call to iopt_area_remove_access()
  */
 int iopt_area_add_access(struct iopt_area *area, unsigned long start_index,
-                         unsigned long last_index, struct page **out_pages,
-                         unsigned int flags)
+                        unsigned long last_index, struct page **out_pages,
+                        unsigned int flags)
 {
        struct iopt_pages *pages = area->pages;
        struct iopt_pages_access *access;

diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c
index 6bd0abf9a641e29819f49b049b937025aae06589..4d5dca8027b1b8d32891e7c0cb2c628b4e82ffda 100644 (file)
--- a/drivers/iommu/iommufd/selftest.c
+++ b/drivers/iommu/iommufd/selftest.c
@@ -1216,9 +1216,8 @@ static int iommufd_test_md_check_refs(struct iommufd_ucmd *ucmd,
        return 0;
 }
 
-static int iommufd_test_md_check_iotlb(struct iommufd_ucmd *ucmd,
-                                      u32 mockpt_id, unsigned int iotlb_id,
-                                      u32 iotlb)
+static int iommufd_test_md_check_iotlb(struct iommufd_ucmd *ucmd, u32 mockpt_id,
+                                      unsigned int iotlb_id, u32 iotlb)
 {
        struct mock_iommu_domain_nested *mock_nested;
        struct iommufd_hw_pagetable *hwpt;
@@ -1491,7 +1490,7 @@ static int iommufd_test_access_pages(struct iommufd_ucmd *ucmd,
        int rc;
 
        /* Prevent syzkaller from triggering a WARN_ON in kvzalloc() */
-       if (length > 16*1024*1024)
+       if (length > 16 * 1024 * 1024)
                return -ENOMEM;
 
        if (flags & ~(MOCK_FLAGS_ACCESS_WRITE | MOCK_FLAGS_ACCESS_SYZ))
@@ -1508,7 +1507,7 @@ static int iommufd_test_access_pages(struct iommufd_ucmd *ucmd,
 
        if (flags & MOCK_FLAGS_ACCESS_SYZ)
                iova = iommufd_test_syz_conv_iova(staccess->access,
-                                       &cmd->access_pages.iova);
+                                                 &cmd->access_pages.iova);
 
        npages = (ALIGN(iova + length, PAGE_SIZE) -
                  ALIGN_DOWN(iova, PAGE_SIZE)) /
@@ -1584,7 +1583,7 @@ static int iommufd_test_access_rw(struct iommufd_ucmd *ucmd,
        int rc;
 
        /* Prevent syzkaller from triggering a WARN_ON in kvzalloc() */
-       if (length > 16*1024*1024)
+       if (length > 16 * 1024 * 1024)
                return -ENOMEM;
 
        if (flags & ~(MOCK_ACCESS_RW_WRITE | MOCK_ACCESS_RW_SLOW_PATH |
@@ -1610,7 +1609,7 @@ static int iommufd_test_access_rw(struct iommufd_ucmd *ucmd,
 
        if (flags & MOCK_FLAGS_ACCESS_SYZ)
                iova = iommufd_test_syz_conv_iova(staccess->access,
-                               &cmd->access_rw.iova);
+                                                 &cmd->access_rw.iova);
 
        rc = iommufd_access_rw(staccess->access, iova, tmp, length, flags);
        if (rc)
@@ -1665,7 +1664,7 @@ static int iommufd_test_dirty(struct iommufd_ucmd *ucmd, unsigned int mockpt_id,
                goto out_put;
        }
 
-       if (copy_from_user(tmp, uptr,DIV_ROUND_UP(max, BITS_PER_BYTE))) {
+       if (copy_from_user(tmp, uptr, DIV_ROUND_UP(max, BITS_PER_BYTE))) {
                rc = -EFAULT;
                goto out_free;
        }
@@ -1701,7 +1700,7 @@ out_put:
 static int iommufd_test_trigger_iopf(struct iommufd_ucmd *ucmd,
                                     struct iommu_test_cmd *cmd)
 {
-       struct iopf_fault event = { };
+       struct iopf_fault event = {};
        struct iommufd_device *idev;
 
        idev = iommufd_get_device(ucmd, cmd->trigger_iopf.dev_id);
@@ -1832,8 +1831,7 @@ static int iommufd_test_pasid_attach(struct iommufd_ucmd *ucmd,
 
        rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd));
        if (rc)
-               iommufd_device_detach(sobj->idev.idev,
-                                     cmd->pasid_attach.pasid);
+               iommufd_device_detach(sobj->idev.idev, cmd->pasid_attach.pasid);
 
 out_sobj:
        iommufd_put_object(ucmd->ictx, &sobj->obj);
@@ -2004,8 +2002,8 @@ int __init iommufd_test_init(void)
                goto err_bus;
 
        rc = iommu_device_register_bus(&mock_iommu.iommu_dev, &mock_ops,
-                                 &iommufd_mock_bus_type.bus,
-                                 &iommufd_mock_bus_type.nb);
+                                      &iommufd_mock_bus_type.bus,
+                                      &iommufd_mock_bus_type.nb);
        if (rc)
                goto err_sysfs;
 

diff --git a/include/linux/iommufd.h b/include/linux/iommufd.h
index 34b6e6ca4bfa0f5350bec09c14f7f107d05d18de..498c9a76850652f1f2d6828ab98bbe37785d0d64 100644 (file)
--- a/include/linux/iommufd.h
+++ b/include/linux/iommufd.h
@@ -171,8 +171,9 @@ static inline void iommufd_access_unpin_pages(struct iommufd_access *access,
 {
 }
 
-static inline int iommufd_access_rw(struct iommufd_access *access, unsigned long iova,
-                     void *data, size_t len, unsigned int flags)
+static inline int iommufd_access_rw(struct iommufd_access *access,
+                                   unsigned long iova, void *data, size_t len,
+                                   unsigned int flags)
 {
        return -EOPNOTSUPP;
 }