From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 829ACC2D0E8 for ; Wed, 25 Mar 2020 23:11:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63F2A2073E for ; Wed, 25 Mar 2020 23:11:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727612AbgCYXLZ (ORCPT ); Wed, 25 Mar 2020 19:11:25 -0400 Received: from mga03.intel.com ([134.134.136.65]:3368 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727389AbgCYXLZ (ORCPT ); Wed, 25 Mar 2020 19:11:25 -0400 IronPort-SDR: 6aoRAb0jTn4x8wO/VF/yC8D0cDOCxX06NqXVmd0syCY5ZWmcNpNe2PBsmePL5TCw471KGBp4ad 5AjWfENmIeEg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 16:11:24 -0700 IronPort-SDR: cG6G9YYUY/6fnfQdw6vs5f/KoIe33IafXZ914Y+tHIbu33Mb1CLBqNqSjQeCnVtXQjjiYcWLVr Ls8xP2suSyYA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,306,1580803200"; d="scan'208";a="236083693" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga007.jf.intel.com with ESMTP; 25 Mar 2020 16:11:24 -0700 From: Jacob Pan To: Joerg Roedel , Alex Williamson , "Lu Baolu" , iommu@lists.linux-foundation.org, LKML , David Woodhouse , Jean-Philippe Brucker Cc: "Yi Liu" , "Tian, Kevin" , Raj Ashok , Eric Auger , Jacob Pan Subject: [PATCH v2 2/3] iommu/uapi: Use unified UAPI version Date: Wed, 25 Mar 2020 16:17:06 -0700 Message-Id: <1585178227-17061-3-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585178227-17061-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1585178227-17061-1-git-send-email-jacob.jun.pan@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Jacob Pan --- 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