Fix kabi change caused by reverting patches

virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I61SPO
CVE: NA

--------------------------------

In order to be consistent with the vSVA technical route of the open
source community, it is necessary to revert related patches and
bugfixes. In the meantime, some necessary steps need to be taken to
avoid kabi change.
Signed-off-by: NKunkun Jiang <jiangkunkun@huawei.com>
Reviewed-by: NKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

include/linux/iommu.h

@@ -345,6 +345,11 @@ struct iommu_ops {
 
 	int (*def_domain_type)(struct device *dev);
 
+	KABI_DEPRECATE_FN(int, bind_guest_msi, struct iommu_domain *domain,
+			  dma_addr_t giova, phys_addr_t gpa, size_t size)
+	KABI_DEPRECATE_FN(void, unbind_guest_msi, struct iommu_domain *domain,
+			  dma_addr_t giova)
+
 	int (*dev_get_config)(struct device *dev, int type, void *data);
 	int (*dev_set_config)(struct device *dev, int type, void *data);
 

include/uapi/linux/iommu.h

@@ -373,20 +373,21 @@ struct iommu_pasid_smmuv3 {
  * @smmuv3: table information when @format is %IOMMU_PASID_FORMAT_SMMUV3
  */
 struct iommu_pasid_table_config {
+	__u32	argsz;
 #define PASID_TABLE_CFG_VERSION_1 1
 	__u32	version;
+	__u64	base_ptr;
 #define IOMMU_PASID_FORMAT_SMMUV3	1
 	__u32	format;
-	__u64	base_ptr;
 	__u8	pasid_bits;
 #define IOMMU_PASID_CONFIG_TRANSLATE	1
 #define IOMMU_PASID_CONFIG_BYPASS	2
 #define IOMMU_PASID_CONFIG_ABORT	3
 	__u8	config;
-	__u8    padding[6];
+	__u8    padding[2];
 	union {
 		struct iommu_pasid_smmuv3 smmuv3;
-	};
+	} vendor_data;
 };
 
 #endif /* _UAPI_IOMMU_H */