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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 E7468C4363D for ; Thu, 24 Sep 2020 19:22:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B172623899 for ; Thu, 24 Sep 2020 19:22:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="q4qlrJKS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728783AbgIXTWl (ORCPT ); Thu, 24 Sep 2020 15:22:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728773AbgIXTWk (ORCPT ); Thu, 24 Sep 2020 15:22:40 -0400 Received: from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com [IPv6:2607:f8b0:4864:20::1041]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 931A3C0613D3; Thu, 24 Sep 2020 12:22:40 -0700 (PDT) Received: by mail-pj1-x1041.google.com with SMTP id q4so282311pjh.5; Thu, 24 Sep 2020 12:22:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hFUA2EodpJe3a9+C7aWrHwYTMpFRcWcG5EO2y8L7QQ4=; b=q4qlrJKSBvKQ5y7ypuPGCLfmz1oEgVicS+2y7ZQNsHdABjg0cffy3LOrxtscih684+ mZoFVdgB4qyTw1260eVnuPFAapfaIq6seZ4CkhN3RSVOI8qU19FESn05ShwQfNc/DmwO QmtIhoaiJZkjaxUWRl87cLroObqyaZjhextSrLA/NgIu1neddA+LsoeCC/FCD0XShHgb DoSZURPRe7K8sApOsWIg5B+Zhmy2jPsETsitFVY7qbviNgThZL/r9YS5WD3qL5FNk7yZ wYiCVnr7ZSWOOL9hzMOTiF7tt7ynuvOlfI3r+u8CexhNSulNCpPvYPZ+zLm0onxaL4j6 yB0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hFUA2EodpJe3a9+C7aWrHwYTMpFRcWcG5EO2y8L7QQ4=; b=QzyuX5/JBpk34T6bbRS73IMkPS5q2DS06yLKg+UBsIJSHzb4SATUEQOcmiidyTRxSh QRmUpY76rYwAeQ2C9iI9wgTfyAHOpLgkutDuvYbDhHkCcQWwls1FvWpTyUGpuSlEt276 a+MBEhmFSf7+k6Fh/FMfJreYfhSJJQ1NvcYZKMKdAxzUkE8OWJMc6XjSdrgmhws0k+5t oe5+S74LILXFLQz3B3o/U/fFmXMDIodEQOhm9tM4p+Xa2EbdgPAeCtUgY2BXrbYCIDuh S2oGX39j8fvD3JeEGZBHQeN7Eq3NqcuI4+l1oRH/hGptmAc/CvkJYhd4s66KmrG/HEhe WuEA== X-Gm-Message-State: AOAM532Zp9/f5iXnnaP6WMsYKA4nV3OKuSKh1J4iJmxXlFlQ0Y/ETBGE 8eHEkzsFmt8s8+zuhweBKE4= X-Google-Smtp-Source: ABdhPJxdPc8B899pY5H/1k0KRSUxQSKNnVQc4GXozbwWwXkRJQ6Hqpge4rKpj6X4S2dlY2N3jc9EdQ== X-Received: by 2002:a17:90a:e017:: with SMTP id u23mr411887pjy.3.1600975360063; Thu, 24 Sep 2020 12:22:40 -0700 (PDT) Received: from jacob-builder.jf.intel.com (jfdmzpr04-ext.jf.intel.com. [134.134.137.73]) by smtp.gmail.com with ESMTPSA id o15sm140918pgi.74.2020.09.24.12.22.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2020 12:22:39 -0700 (PDT) From: Jacob Pan X-Google-Original-From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , Alex Williamson , "Lu Baolu" , David Woodhouse , Jonathan Corbet Cc: linux-api@vger.kernel.org, Jean-Philippe Brucker , Eric Auger , Jacob Pan , Yi Liu , "Tian, Kevin" , Raj Ashok , Wu Hao , Yi Sun , Randy Dunlap Subject: [PATCH v11 2/6] iommu/uapi: Add argsz for user filled data Date: Thu, 24 Sep 2020 12:24:16 -0700 Message-Id: <1600975460-64521-3-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1600975460-64521-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1600975460-64521-1-git-send-email-jacob.jun.pan@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org As IOMMU UAPI gets extended, user data size may increase. To support backward compatibiliy, this patch introduces a size field to each UAPI data structures. It is *always* the responsibility for the user to fill in the correct size. Padding fields are adjusted to ensure 8 byte alignment. Specific scenarios for user data handling are documented in: Documentation/userspace-api/iommu.rst As there is no current users of the API, struct version is not incremented. Reviewed-by: Eric Auger Signed-off-by: Liu Yi L Signed-off-by: Jacob Pan --- include/uapi/linux/iommu.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/iommu.h b/include/uapi/linux/iommu.h index c2b2caf9ed41..b42acc8fe007 100644 --- a/include/uapi/linux/iommu.h +++ b/include/uapi/linux/iommu.h @@ -139,6 +139,7 @@ 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) @@ -147,6 +148,7 @@ 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) @@ -222,6 +224,7 @@ struct iommu_inv_pasid_info { /** * struct iommu_cache_invalidate_info - First level/stage invalidation * information + * @argsz: User filled size of this data * @version: API version of this structure * @cache: bitfield that allows to select which caches to invalidate * @granularity: defines the lowest granularity used for the invalidation: @@ -250,6 +253,7 @@ struct iommu_inv_pasid_info { * must support the used granularity. */ struct iommu_cache_invalidate_info { + __u32 argsz; #define IOMMU_CACHE_INVALIDATE_INFO_VERSION_1 1 __u32 version; /* IOMMU paging structure cache */ @@ -259,7 +263,7 @@ struct iommu_cache_invalidate_info { #define IOMMU_CACHE_INV_TYPE_NR (3) __u8 cache; __u8 granularity; - __u8 padding[2]; + __u8 padding[6]; union { struct iommu_inv_pasid_info pasid_info; struct iommu_inv_addr_info addr_info; @@ -296,6 +300,7 @@ struct iommu_gpasid_bind_data_vtd { /** * struct iommu_gpasid_bind_data - Information about device and guest PASID binding + * @argsz: User filled size of this data * @version: Version of this data structure * @format: PASID table entry format * @flags: Additional information on guest bind request @@ -313,17 +318,18 @@ struct iommu_gpasid_bind_data_vtd { * PASID to host PASID based on this bind data. */ struct iommu_gpasid_bind_data { + __u32 argsz; #define IOMMU_GPASID_BIND_VERSION_1 1 __u32 version; #define IOMMU_PASID_FORMAT_INTEL_VTD 1 __u32 format; + __u32 addr_width; #define IOMMU_SVA_GPASID_VAL (1 << 0) /* guest PASID valid */ __u64 flags; __u64 gpgd; __u64 hpasid; __u64 gpasid; - __u32 addr_width; - __u8 padding[12]; + __u8 padding[8]; /* Vendor specific data */ union { struct iommu_gpasid_bind_data_vtd vtd; -- 2.7.4