Messages in this thread Patch in this message | | | From | Jacob Pan <> | Subject | [PATCH v2 2/3] iommu/uapi: Use unified UAPI version | Date | Wed, 25 Mar 2020 16:17:06 -0700 |
| |
Reuse UAPI version for each UAPI data structure. This is to avoid supporting multiple version combinations, simplify support model as we bump up the versions.
Signed-off-by: Liu Yi L <yi.l.liu@intel.com> Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com> --- drivers/iommu/intel-iommu.c | 3 ++- drivers/iommu/intel-svm.c | 2 +- drivers/iommu/iommu.c | 3 ++- include/uapi/linux/iommu.h | 9 +++------ 4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index c1c0b0fb93c3..0304f7626a38 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -5779,8 +5779,9 @@ static int intel_iommu_sva_invalidate(struct iommu_domain *domain, int ret = 0; u64 size = 0; + /* Support current or older UAPI versions */ if (!inv_info || !dmar_domain || - inv_info->version != IOMMU_CACHE_INVALIDATE_INFO_VERSION_1) + inv_info->version > IOMMU_UAPI_VERSION) return -EINVAL; if (!dev || !dev_is_pci(dev)) diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index 47c0deb5ae56..67ac95eb5e33 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c @@ -239,7 +239,7 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, if (WARN_ON(!iommu) || !data) return -EINVAL; - if (data->version != IOMMU_GPASID_BIND_VERSION_1 || + if (data->version > IOMMU_UAPI_VERSION || data->format != IOMMU_PASID_FORMAT_INTEL_VTD) return -EINVAL; diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 3e3528436e0b..c476b58e0ffb 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1113,7 +1113,8 @@ int iommu_page_response(struct device *dev, if (!param || !param->fault_param) return -EINVAL; - if (msg->version != IOMMU_PAGE_RESP_VERSION_1 || + /* Support current or older UAPI versions */ + if (msg->version > IOMMU_UAPI_VERSION || msg->flags & ~IOMMU_PAGE_RESP_PASID_VALID) return -EINVAL; diff --git a/include/uapi/linux/iommu.h b/include/uapi/linux/iommu.h index 25dba9198d7f..e9532c747dbd 100644 --- a/include/uapi/linux/iommu.h +++ b/include/uapi/linux/iommu.h @@ -188,7 +188,7 @@ enum iommu_page_response_code { /** * struct iommu_page_response - Generic page response information - * @version: API version of this structure + * @version: IOMMU_UAPI_VERSION * @flags: encodes whether the corresponding fields are valid * (IOMMU_FAULT_PAGE_RESPONSE_* values) * @pasid: Process Address Space ID @@ -196,7 +196,6 @@ enum iommu_page_response_code { * @code: response code from &enum iommu_page_response_code */ struct iommu_page_response { -#define IOMMU_PAGE_RESP_VERSION_1 1 __u32 version; #define IOMMU_PAGE_RESP_PASID_VALID (1 << 0) __u32 flags; @@ -271,7 +270,7 @@ struct iommu_inv_pasid_info { /** * struct iommu_cache_invalidate_info - First level/stage invalidation * information - * @version: API version of this structure + * @version: IOMMU_UAPI_VERSION * @cache: bitfield that allows to select which caches to invalidate * @granularity: defines the lowest granularity used for the invalidation: * domain > PASID > addr @@ -299,7 +298,6 @@ struct iommu_inv_pasid_info { * must support the used granularity. */ struct iommu_cache_invalidate_info { -#define IOMMU_CACHE_INVALIDATE_INFO_VERSION_1 1 __u32 version; /* IOMMU paging structure cache */ #define IOMMU_CACHE_INV_TYPE_IOTLB (1 << 0) /* IOMMU IOTLB */ @@ -343,7 +341,7 @@ struct iommu_gpasid_bind_data_vtd { IOMMU_SVA_VTD_GPASID_PWT) /** * struct iommu_gpasid_bind_data - Information about device and guest PASID binding - * @version: Version of this data structure + * @version: IOMMU_UAPI_VERSION * @format: PASID table entry format * @flags: Additional information on guest bind request * @gpgd: Guest page directory base of the guest mm to bind @@ -360,7 +358,6 @@ struct iommu_gpasid_bind_data_vtd { * PASID to host PASID based on this bind data. */ struct iommu_gpasid_bind_data { -#define IOMMU_GPASID_BIND_VERSION_1 1 __u32 version; #define IOMMU_PASID_FORMAT_INTEL_VTD 1 __u32 format; -- 2.7.4
| |