[PATCH v2 02/13] iommufd/fault: Move iommufd_fault_iopf_handler() to header

[Nicolin Chen]

The new vIRQ object will need a similar function for drivers to report the
vIOMMU related interrupts. Split the common part out to a smaller helper,
and place it in the header so that CONFIG_IOMMUFD_DRIVER_CORE can include
that in the driver.c file for drivers to use.

Then keep iommufd_fault_iopf_handler() in the header too, since it's quite
simple after all.

Signed-off-by: Nicolin Chen <nicol...@nvidia.com>
---
 drivers/iommu/iommufd/iommufd_private.h | 20 +++++++++++++++++++-
 drivers/iommu/iommufd/fault.c           | 17 -----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/drivers/iommu/iommufd/iommufd_private.h 
b/drivers/iommu/iommufd/iommufd_private.h
index b6d706cf2c66..8b378705ee71 100644
--- a/drivers/iommu/iommufd/iommufd_private.h
+++ b/drivers/iommu/iommufd/iommufd_private.h
@@ -451,6 +451,17 @@ struct iommufd_fault {
        struct wait_queue_head wait_queue;
 };
 
+static inline int iommufd_fault_notify(struct iommufd_fault *fault,
+                                      struct list_head *new_fault)
+{
+       mutex_lock(&fault->mutex);
+       list_add_tail(new_fault, &fault->deliver);
+       mutex_unlock(&fault->mutex);
+
+       wake_up_interruptible(&fault->wait_queue);
+       return 0;
+}
+
 struct iommufd_attach_handle {
        struct iommu_attach_handle handle;
        struct iommufd_device *idev;
@@ -469,7 +480,14 @@ iommufd_get_fault(struct iommufd_ucmd *ucmd, u32 id)
 
 int iommufd_fault_alloc(struct iommufd_ucmd *ucmd);
 void iommufd_fault_destroy(struct iommufd_object *obj);
-int iommufd_fault_iopf_handler(struct iopf_group *group);
+
+static inline int iommufd_fault_iopf_handler(struct iopf_group *group)
+{
+       struct iommufd_hw_pagetable *hwpt =
+               group->attach_handle->domain->fault_data;
+
+       return iommufd_fault_notify(hwpt->fault, &group->node);
+}
 
 int iommufd_fault_domain_attach_dev(struct iommufd_hw_pagetable *hwpt,
                                    struct iommufd_device *idev);
diff --git a/drivers/iommu/iommufd/fault.c b/drivers/iommu/iommufd/fault.c
index 87c811b9c0d0..5694b04a48bd 100644
--- a/drivers/iommu/iommufd/fault.c
+++ b/drivers/iommu/iommufd/fault.c
@@ -433,20 +433,3 @@ int iommufd_fault_alloc(struct iommufd_ucmd *ucmd)
 
        return rc;
 }
-
-int iommufd_fault_iopf_handler(struct iopf_group *group)
-{
-       struct iommufd_hw_pagetable *hwpt;
-       struct iommufd_fault *fault;
-
-       hwpt = group->attach_handle->domain->fault_data;
-       fault = hwpt->fault;
-
-       mutex_lock(&fault->mutex);
-       list_add_tail(&group->node, &fault->deliver);
-       mutex_unlock(&fault->mutex);
-
-       wake_up_interruptible(&fault->wait_queue);
-
-       return 0;
-}
-- 
2.43.0