iommu: Cleanup iopf data structure definitions

struct iommu_fault_page_request and struct iommu_page_response are not
part of uAPI anymore. Convert them to data structures for kAPI.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Tested-by: Yan Zhao <yan.y.zhao@intel.com>
Tested-by: Longfang Liu <liulongfang@huawei.com>
Link: https://lore.kernel.org/r/20240212012227.119381-5-baolu.lu@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/io-pgfault.c b/drivers/iommu/io-pgfault.c
index e5b8b9110c132aa88444e52fd75585aba1945bab..24b5545352ae79b7d2603a4a5716a4ef55f9dc18 100644 (file)
--- a/drivers/iommu/io-pgfault.c
+++ b/drivers/iommu/io-pgfault.c
@@ -56,7 +56,6 @@ static int iopf_complete_group(struct device *dev, struct iopf_fault *iopf,
                               enum iommu_page_response_code status)
 {
        struct iommu_page_response resp = {
-               .version                = IOMMU_PAGE_RESP_VERSION_1,
                .pasid                  = iopf->fault.prm.pasid,
                .grpid                  = iopf->fault.prm.grpid,
                .code                   = status,

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index d14413916f93a01626e850aa72ee0c919c1f72bd..6a4d9bc0641da31bf2f4716bab81571b16b375b3 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1494,10 +1494,6 @@ int iommu_page_response(struct device *dev,
        if (!param || !param->fault_param)
                return -EINVAL;
 
-       if (msg->version != IOMMU_PAGE_RESP_VERSION_1 ||
-           msg->flags & ~IOMMU_PAGE_RESP_PASID_VALID)
-               return -EINVAL;
-
        /* Only send response if there is a fault report pending */
        mutex_lock(&param->fault_param->lock);
        if (list_empty(&param->fault_param->faults)) {

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index c960c4fae3bc4a098ff41c05edc257bfff6440cc..829bcb5a8e23f06a2c7217d76e5449d87fdce851 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -71,12 +71,12 @@ struct iommu_fault_page_request {
 #define IOMMU_FAULT_PAGE_REQUEST_LAST_PAGE     (1 << 1)
 #define IOMMU_FAULT_PAGE_REQUEST_PRIV_DATA     (1 << 2)
 #define IOMMU_FAULT_PAGE_RESPONSE_NEEDS_PASID  (1 << 3)
-       __u32   flags;
-       __u32   pasid;
-       __u32   grpid;
-       __u32   perm;
-       __u64   addr;
-       __u64   private_data[2];
+       u32     flags;
+       u32     pasid;
+       u32     grpid;
+       u32     perm;
+       u64     addr;
+       u64     private_data[2];
 };
 
 /**
@@ -85,7 +85,7 @@ struct iommu_fault_page_request {
  * @prm: Page Request message, when @type is %IOMMU_FAULT_PAGE_REQ
  */
 struct iommu_fault {
-       __u32   type;
+       u32 type;
        struct iommu_fault_page_request prm;
 };
 
@@ -106,8 +106,6 @@ enum iommu_page_response_code {
 
 /**
  * struct iommu_page_response - Generic page response information
- * @argsz: User filled size of this data
- * @version: API version of this structure
  * @flags: encodes whether the corresponding fields are valid
  *         (IOMMU_FAULT_PAGE_RESPONSE_* values)
  * @pasid: Process Address Space ID
@@ -115,14 +113,11 @@ enum iommu_page_response_code {
  * @code: response code from &enum iommu_page_response_code
  */
 struct iommu_page_response {
-       __u32   argsz;
-#define IOMMU_PAGE_RESP_VERSION_1      1
-       __u32   version;
 #define IOMMU_PAGE_RESP_PASID_VALID    (1 << 0)
-       __u32   flags;
-       __u32   pasid;
-       __u32   grpid;
-       __u32   code;
+       u32     flags;
+       u32     pasid;
+       u32     grpid;
+       u32     code;
 };