From patchwork Mon Jul 24 10:59:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 124799 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1720439vqg; Mon, 24 Jul 2023 04:07:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlFV3COVHB7r8fvqT7VWlI2l86zkaAdiq/ifsRnCoVCrubtEQFwYl2lo42TivGfsMoDRq+cx X-Received: by 2002:a05:6512:15a8:b0:4fd:faf0:6591 with SMTP id bp40-20020a05651215a800b004fdfaf06591mr1076575lfb.10.1690196820500; Mon, 24 Jul 2023 04:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690196820; cv=none; d=google.com; s=arc-20160816; b=PqCh/ieqWx2/5hX/vIvsu1b1IbYBTtcen+Xm+3I8l/BKM7PvCSJBCPfYMVF/nsTwYa 2STfF7r0KHViKWxdvtZ5dmDj9Q2LPswQH3Lm6uFGS43M8a0KaW/nQnc7U+8KIlUyva37 XW40627R9qEzJjR9GNkZ+l4rNF7s9Ff7gGMVsNxyQtvKdtAaASy+NIOYm5hsxbl6/5T/ vq6gm8XNXzfMu7EirVAUySZvXZLBUh2U6wGFEZjP2nkFKGoGR6PcUAwbtjJHUQsiX10k qLNxU1NFINSKDZmdaL+5DvYWv3hasB6qnx4qIBy1JZ5Eh8hv5c1Exvmlemn43HVES73u KuuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CDsuqG2ZhAB0lHkv68+rCVRRKEJhl8sTyIkOySnUbK0=; fh=25kVo4cotgMzE250R6E3K5ES7E7C2JawiavlW0h5mKU=; b=xo/tIAZmAkrw1Link0fYYf6cTa3Asuw3/j3Cr6FUDuX1DOcxBGH3Vi+PYLAV7P2Kpj +qKmVQJ4f4nIP8//7x36vaVx0IgWr4HwuLCjZJC8WKxriSHpd9+uWiDx/G2VnXf4DUUB SOYefbSZEzuyHczX4ctxXZgULq7Xz5BtNxjZ0OK7bVzXpqBCKMA6srppdePhkAKI5d88 SDnUiWcBPsL/twJ9oYuBJIW67cefgCfMXRLdeLmHVVGsv4B5/gzPfxvB58KBQsYrvEVE n85rpOl+EFwbk6h7EruUxE08dnC/fLjfO48tZtYSPtofkU72nSykwoljNXraoIHMJW9T hd3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Haq5k38q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bt16-20020a170906b15000b00988796c2019si6504758ejb.591.2023.07.24.04.06.16; Mon, 24 Jul 2023 04:07:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Haq5k38q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233290AbjGXK7u (ORCPT + 99 others); Mon, 24 Jul 2023 06:59:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233272AbjGXK7n (ORCPT ); Mon, 24 Jul 2023 06:59:43 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4C59187; Mon, 24 Jul 2023 03:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690196380; x=1721732380; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FmV1cSHGwjqcdyH4/YjGjjiaeF0uPb8tHeku/Oi1wN8=; b=Haq5k38qn5wR+CG4ZYNmKnQQdmnlS+ME81yhJlHjB+MW0N4+mskilhuD 7Y8hj0lSVKvROfCg1KDTcrb/yJIICfeumF3fhFrYsz+RpoXwE40a1bZpN Dbd1dEAQTi1I5xx7WKFxNetWy7GwMoEpumhvxjbUrikSPea7xyIDmL/cY qlp/XxkCJERPzjc8S7unuAit7TLVT0BeAFXGIYsq35oLJvqfWpv6NymaX HX5dWJmFb9g0pX4ekUCz/yOBbmhnKcxSls77tcnoA+g5Vvd6hiRYZo8dA 0bAyfhU2hw/nOwMQuFttLSTK5HfKU5qSkkaOvVPzkbiMVO2dNWmBhyQDx w==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347012214" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347012214" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 03:59:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="839409012" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="839409012" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2023 03:59:38 -0700 From: Yi Liu To: joro@8bytes.org, alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, robin.murphy@arm.com, baolu.lu@linux.intel.com Cc: cohuck@redhat.com, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com, jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com, lulu@redhat.com, suravee.suthikulpanit@amd.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, zhenzhong.duan@intel.com Subject: [PATCH v4 1/4] iommu: Move dev_iommu_ops() to private header Date: Mon, 24 Jul 2023 03:59:33 -0700 Message-Id: <20230724105936.107042-2-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724105936.107042-1-yi.l.liu@intel.com> References: <20230724105936.107042-1-yi.l.liu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772299821154630452 X-GMAIL-MSGID: 1772299821154630452 dev_iommu_ops() is essentially only used in iommu subsystem, so move to a private header to avoid being abused by other drivers. Suggested-by: Jason Gunthorpe Reviewed-by: Kevin Tian Reviewed-by: Lu Baolu Signed-off-by: Yi Liu Reviewed-by: Jason Gunthorpe --- drivers/iommu/iommu-priv.h | 11 +++++++++++ include/linux/iommu.h | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/iommu/iommu-priv.h b/drivers/iommu/iommu-priv.h index 7c8011bfd153..a6e694f59f64 100644 --- a/drivers/iommu/iommu-priv.h +++ b/drivers/iommu/iommu-priv.h @@ -4,6 +4,17 @@ #include +static inline const struct iommu_ops *dev_iommu_ops(struct device *dev) +{ + /* + * Assume that valid ops must be installed if iommu_probe_device() + * has succeeded. The device ops are essentially for internal use + * within the IOMMU subsystem itself, so we should be able to trust + * ourselves not to misuse the helper. + */ + return dev->iommu->iommu_dev->ops; +} + int iommu_group_replace_domain(struct iommu_group *group, struct iommu_domain *new_domain); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index d31642596675..e0245aa82b75 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -450,17 +450,6 @@ static inline void iommu_iotlb_gather_init(struct iommu_iotlb_gather *gather) }; } -static inline const struct iommu_ops *dev_iommu_ops(struct device *dev) -{ - /* - * Assume that valid ops must be installed if iommu_probe_device() - * has succeeded. The device ops are essentially for internal use - * within the IOMMU subsystem itself, so we should be able to trust - * ourselves not to misuse the helper. - */ - return dev->iommu->iommu_dev->ops; -} - extern int bus_iommu_probe(const struct bus_type *bus); extern bool iommu_present(const struct bus_type *bus); extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap); From patchwork Mon Jul 24 10:59:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 124854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1732362vqg; Mon, 24 Jul 2023 04:29:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlHA/T5q3Q3URdwBw9k57S9w8wVd2GcMvaXH9izLFgUo1/VT8tXg81hjQbYAL8aROPwg8913 X-Received: by 2002:a17:90b:3502:b0:263:d6a6:f37c with SMTP id ls2-20020a17090b350200b00263d6a6f37cmr9056336pjb.16.1690198186317; Mon, 24 Jul 2023 04:29:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690198186; cv=none; d=google.com; s=arc-20160816; b=0ZaXRjM94gLyQro6dekvIzyO9GiMMD36A+K6brsNbG28aUbCGrJdomPLMQqDTj2Y0V tXk8YCmIMKy57WU0zzGhEjjpTVbSDJ7MVDMMuPzAiNaYnsJmizNdkWsnw4znNw2qSo71 SahCiMUBFnVRwbLX78+Q8OwB4gcH7YWfCGk2CWPCJDJ/Jb3evkIcXLytF73cQK+BA2yW GpxvpeRbeiOCxpeIdZQKz/GQlXHIJwG15tehEbIPzXQ1Vw1kKnlLzQRwYTcdX7rfxnrI 2MiDlheYC2RL2twArM065iu4aDAi6qL54QV+MBHp/x4sX+XVwp11aeUVqUgZzmy1ChQ7 YWrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6B9Tm2MFXvxzSWLdVfhHqlKT58ct5yf24W+n3fnettQ=; fh=25kVo4cotgMzE250R6E3K5ES7E7C2JawiavlW0h5mKU=; b=Yuz7+getubVz8CF8d3IfwSzUYUBo+PKo82pe+Q19NRC1H/2qxDa1DNhFbl/V6D7w0R MN5lbTt68v5u0w1jrk6egvwh5luDTqoz2PpLdqyGpXHuCjpWNEquIA9kylW8cTHWilSm /yfevZxUqhYSJXGWyV1hLmXa29OkY4R/DyHtMbDZt5ZOULOVKA8BVximCl/sYxof2Nh9 xqxRO/bGeaVD41u6NbW5aeHhFuLQsuqYwFl4GdmdGRYT4Aobgv4oipT9nxHrsX0FFAAT 1EmS0ud/Q/8iSLjeR+vUCi6RwIJAg2KzQxJ76O6RrWn3UD2pFgPtQ7nEOasYAqHCeTr3 8e1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=W+7EJVTO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w64-20020a638243000000b00542d3727da9si9184803pgd.464.2023.07.24.04.29.34; Mon, 24 Jul 2023 04:29:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=W+7EJVTO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231922AbjGXLAP (ORCPT + 99 others); Mon, 24 Jul 2023 07:00:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233281AbjGXLAM (ORCPT ); Mon, 24 Jul 2023 07:00:12 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AA7BE65; Mon, 24 Jul 2023 03:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690196394; x=1721732394; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4sa+xq3Q9e41JXFT2qIhbuD5DTnjShAP6BzvAmrGcDM=; b=W+7EJVTOobD47VNvL25JkZaxeuCHN8OyRqPJs0YIqV2MyevCsAQfPfrt GZ/+PKvIUbZHa8vfpEewSL+k9j26FrESHkGRJY6IKrb0V/pujtZCUiUbP LL7QBQSW85yHO7Zm9lj8ZCF0FB2O6Qtw/AZRW+ZCZZanf/61g/qDpOqBB nNYIXpMPUg6xeIS5Ul3eTXuoS+L04JpMlcwtWyq+MfuxVIG9G5Yh+kqwq DNZBzSW0fy5dlCC6mO7gz7n3SS0fhEiAsJqZBMexMf3tq/OzlI6djeMCv iWz102C1uIWpVWp+c2UPQ+viW9gjiTVUBBY91YFIlIc4ejjOQRKOrrXmz g==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347012264" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347012264" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 03:59:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="839409046" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="839409046" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2023 03:59:39 -0700 From: Yi Liu To: joro@8bytes.org, alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, robin.murphy@arm.com, baolu.lu@linux.intel.com Cc: cohuck@redhat.com, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com, jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com, lulu@redhat.com, suravee.suthikulpanit@amd.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, zhenzhong.duan@intel.com Subject: [PATCH v4 2/4] iommu: Add new iommu op to get iommu hardware information Date: Mon, 24 Jul 2023 03:59:34 -0700 Message-Id: <20230724105936.107042-3-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724105936.107042-1-yi.l.liu@intel.com> References: <20230724105936.107042-1-yi.l.liu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772301253369664829 X-GMAIL-MSGID: 1772301253369664829 From: Lu Baolu Introduce a new iommu op to get the IOMMU hardware capabilities for iommufd. This information will be used by any vIOMMU driver which is owned by userspace. This op chooses to make the special parameters opaque to the core. This suits the current usage model where accessing any of the IOMMU device special parameters does require a userspace driver that matches the kernel driver. If a need for common parameters, implemented similarly by several drivers, arises then there's room in the design to grow a generic parameter set as well. No wrapper API is added as it is supposed to be used by iommufd only. Different IOMMU hardware would have different hardware information. So the information reported differs as well. To let the external user understand the difference. enum iommu_hw_info_type is defined. For the iommu drivers that are capable to report hardware information, it should have a unique iommu_hw_info_type. The iommu_hw_info_type is stored in struct iommu_ops. For the driver doesn't report hardware information, just use IOMMU_HW_INFO_TYPE_NONE. Signed-off-by: Lu Baolu Co-developed-by: Nicolin Chen Signed-off-by: Nicolin Chen Signed-off-by: Yi Liu --- include/linux/iommu.h | 16 ++++++++++++++++ include/uapi/linux/iommufd.h | 8 ++++++++ 2 files changed, 24 insertions(+) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index e0245aa82b75..4199e13b34e6 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -14,6 +14,7 @@ #include #include #include +#include #define IOMMU_READ (1 << 0) #define IOMMU_WRITE (1 << 1) @@ -228,6 +229,11 @@ struct iommu_iotlb_gather { /** * struct iommu_ops - iommu ops and capabilities * @capable: check capability + * @hw_info: IOMMU hardware information. The type of the returned data is + * marked by @hw_info_type. The data buffer returned by this op + * is allocated in the IOMMU driver and the caller should free it + * after use. Return the data buffer if success, or ERR_PTR on + * failure. * @domain_alloc: allocate iommu domain * @probe_device: Add device to iommu driver handling * @release_device: Remove device from iommu driver handling @@ -252,11 +258,20 @@ struct iommu_iotlb_gather { * @remove_dev_pasid: Remove any translation configurations of a specific * pasid, so that any DMA transactions with this pasid * will be blocked by the hardware. + * @hw_info_type: One of enum iommu_hw_info_type defined in + * include/uapi/linux/iommufd.h. It is used to tag the type + * of data returned by .hw_info callback. The drivers that + * support .hw_info callback should define a unique type + * in include/uapi/linux/iommufd.h. For the drivers that do + * not implement .hw_info callback, this field is + * IOMMU_HW_INFO_TYPE_NONE which is 0. Hence, such drivers + * do not need to care this field. * @pgsize_bitmap: bitmap of all possible supported page sizes * @owner: Driver module providing these ops */ struct iommu_ops { bool (*capable)(struct device *dev, enum iommu_cap); + void *(*hw_info)(struct device *dev, u32 *length); /* Domain allocation and freeing by the iommu driver */ struct iommu_domain *(*domain_alloc)(unsigned iommu_domain_type); @@ -285,6 +300,7 @@ struct iommu_ops { void (*remove_dev_pasid)(struct device *dev, ioasid_t pasid); const struct iommu_domain_ops *default_domain_ops; + enum iommu_hw_info_type hw_info_type; unsigned long pgsize_bitmap; struct module *owner; }; diff --git a/include/uapi/linux/iommufd.h b/include/uapi/linux/iommufd.h index 8245c01adca6..1f616b0f8ae0 100644 --- a/include/uapi/linux/iommufd.h +++ b/include/uapi/linux/iommufd.h @@ -370,4 +370,12 @@ struct iommu_hwpt_alloc { __u32 __reserved; }; #define IOMMU_HWPT_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_ALLOC) + +/** + * enum iommu_hw_info_type - IOMMU Hardware Info Types + * @IOMMU_HW_INFO_TYPE_NONE: Used by the drivers that does not report hardware info + */ +enum iommu_hw_info_type { + IOMMU_HW_INFO_TYPE_NONE, +}; #endif From patchwork Mon Jul 24 10:59:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 124829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1725498vqg; Mon, 24 Jul 2023 04:16:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlHmuG9V/MY2sGgjqCQyanppEIzJVrRWh1BvIMREqZygjJaEktFS7ZYNqqBVyUoFuoPe7iBW X-Received: by 2002:a05:6402:51c6:b0:51e:5e3d:cb92 with SMTP id r6-20020a05640251c600b0051e5e3dcb92mr15864625edd.16.1690197373788; Mon, 24 Jul 2023 04:16:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690197373; cv=none; d=google.com; s=arc-20160816; b=xYo9fUP/wDA32hts2/WyeXzvLCPBkhOAXKd+A9Y/KelgIPK0821Ha6BWSmRBe8NYcD iyTzRI2zCmZXcNrPGy/nMrgYwmSFvof4Wp9IQrw9ONaecPPYJk4P4TM2pKXJAthuFX72 y4J6qp6B+4lvQEBNdLtT9k5PDMYNvmR7UzV9A2fB59AtCqWIndxhVdZ9S40iVIcgxohE PL+o3jqwL13KXuQzcWzagc96oT1fA00s9ynISpIiu4WyuDmAiCIYE2+KykDdOwVRxoYl vp83udLtbhI5kMQWIoaj73LPv3eqLgWGpmF7VIGwrL/hJSKW4Dpw+7dbBrj/VC4KbjOa e5tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=v9DZ8DRPdqR5NkpnhFIk6G2wUQ0BdJIASAbSTtqK0Y4=; fh=25kVo4cotgMzE250R6E3K5ES7E7C2JawiavlW0h5mKU=; b=0UNl9bZHA7TVXEg2iaDScflchj+xPKXoRcLIS6DvKbIKw/VNsYJKL9Q0biamMJQPlo TNGxEkmBhUNR1/GWa0UOwRJorHBGsc7X7kAliH3GWNuRpz4lU7SlB3TR5WlgPJVUOxo/ 64yY4pzx2RchKM8MmibulSJIKsIaLKrt/R4yB80Fhqjzd2NAY34WBLqqdWBpYMz1dVEP E1WC4v4whq1f1ZhMFI/Zt9QV+wgluGxEAdA/aVDjuu/NsbFzFPPNlYPfj1uQs5HI1fID TG8SvsS85T8UpdNeroKnZIJsssRYkdJOmp/utQl0G83JEXWmZlvQdRSuQMwOqkJ8IykL 3Jaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mdu2ucBr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s2-20020aa7c542000000b0051e28cead02si6082702edr.337.2023.07.24.04.15.48; Mon, 24 Jul 2023 04:16:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mdu2ucBr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233302AbjGXLAS (ORCPT + 99 others); Mon, 24 Jul 2023 07:00:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233265AbjGXLAI (ORCPT ); Mon, 24 Jul 2023 07:00:08 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CA4E10DF; Mon, 24 Jul 2023 03:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690196393; x=1721732393; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xYkMSW5qD0YHa2R7bbKOsw7d8LA6llKISx1RD7rwZpI=; b=mdu2ucBrATUz6QPGjh0QU3dy7jKF/D31UoNmoOifBK3+EtkjMGrsjcAU INdwXaye/Dk46NytdrG+cKL2qlN4r6X/ZGUvsQUUH/2zuXkdC4M7nqHQi N0Ok0MiI+XOBKiywyEiB/OYvgPcx/3T1yfQa2UwPbv8O5vME8cdDtw4Qh pGD48LbHPg4yR5esnJnZbxyJaDQAntUznAD19uLtZvpDOPB3LG3pqLymY 79g76AwO2txkQKm+FtsjhBiCpx6KVNZDs2wNH7PijF8sm1K2A/80Eryhg NT7MNI5/o6FGNtJq+tS4JafAXGZQObFPce1nN8zjJcqcb9DGsbEwYEoI9 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347012274" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347012274" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 03:59:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="839409094" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="839409094" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2023 03:59:43 -0700 From: Yi Liu To: joro@8bytes.org, alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, robin.murphy@arm.com, baolu.lu@linux.intel.com Cc: cohuck@redhat.com, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com, jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com, lulu@redhat.com, suravee.suthikulpanit@amd.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, zhenzhong.duan@intel.com Subject: [PATCH v4 3/4] iommufd: Add IOMMU_GET_HW_INFO Date: Mon, 24 Jul 2023 03:59:35 -0700 Message-Id: <20230724105936.107042-4-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724105936.107042-1-yi.l.liu@intel.com> References: <20230724105936.107042-1-yi.l.liu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772300401200475687 X-GMAIL-MSGID: 1772300401200475687 Under nested IOMMU translation, userspace owns the stage-1 translation table (e.g. the stage-1 page table of Intel VT-d or the context table of ARM SMMUv3, and etc.). Stage-1 translation tables are vendor specific, and need to be compatiable with the underlying IOMMU hardware. Hence, userspace should know the IOMMU hardware capability before creating and configuring the stage-1 translation table to kernel. This adds IOMMU_GET_HW_INFO ioctl to query the IOMMU hardware information for a given device. The returned data is vendor specific, userspace needs to decode it with the structure mapped by the @out_data_type field. As only physical devices have IOMMU hardware, so this will return error if the given device is not a physical device. Co-developed-by: Nicolin Chen Signed-off-by: Nicolin Chen Signed-off-by: Yi Liu --- drivers/iommu/iommufd/main.c | 76 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/iommufd.h | 36 +++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/drivers/iommu/iommufd/main.c b/drivers/iommu/iommufd/main.c index 94c498b8fdf6..bd3efc1d8509 100644 --- a/drivers/iommu/iommufd/main.c +++ b/drivers/iommu/iommufd/main.c @@ -17,6 +17,7 @@ #include #include #include +#include "../iommu-priv.h" #include "io_pagetable.h" #include "iommufd_private.h" @@ -177,6 +178,78 @@ static int iommufd_destroy(struct iommufd_ucmd *ucmd) return 0; } +static int iommufd_zero_fill_user(u64 ptr, int bytes) +{ + int index = 0; + + for (; index < bytes; index++) { + if (put_user(0, (uint8_t __user *)u64_to_user_ptr(ptr + index))) + return -EFAULT; + } + return 0; +} + +static int iommufd_get_hw_info(struct iommufd_ucmd *ucmd) +{ + struct iommu_hw_info *cmd = ucmd->cmd; + unsigned int length = 0, data_len; + struct iommufd_device *idev; + const struct iommu_ops *ops; + void *data = NULL; + int rc = 0; + + if (cmd->flags || cmd->__reserved || !cmd->data_len) + return -EOPNOTSUPP; + + idev = iommufd_get_device(ucmd, cmd->dev_id); + if (IS_ERR(idev)) + return PTR_ERR(idev); + + ops = dev_iommu_ops(idev->dev); + if (!ops->hw_info) + goto done; + + /* driver has hw_info callback should have a unique hw_info_type */ + if (WARN_ON_ONCE(ops->hw_info_type == IOMMU_HW_INFO_TYPE_NONE)) { + pr_warn_ratelimited("iommu driver set an invalid type\n"); + rc = -ENODEV; + goto out_err; + } + + data = ops->hw_info(idev->dev, &data_len); + if (IS_ERR(data)) { + rc = PTR_ERR(data); + goto out_err; + } + + length = min(cmd->data_len, data_len); + if (copy_to_user(u64_to_user_ptr(cmd->data_ptr), data, length)) { + rc = -EFAULT; + goto out_err; + } + +done: + /* + * Zero the trailing bytes if the user buffer is bigger than the + * data size kernel actually has. + */ + if (length < cmd->data_len) { + rc = iommufd_zero_fill_user(cmd->data_ptr + length, + cmd->data_len - length); + if (rc) + goto out_err; + } + + cmd->data_len = length; + cmd->out_data_type = ops->hw_info_type; + rc = iommufd_ucmd_respond(ucmd, sizeof(*cmd)); + +out_err: + kfree(data); + iommufd_put_object(&idev->obj); + return rc; +} + static int iommufd_fops_open(struct inode *inode, struct file *filp) { struct iommufd_ctx *ictx; @@ -265,6 +338,7 @@ static int iommufd_option(struct iommufd_ucmd *ucmd) union ucmd_buffer { struct iommu_destroy destroy; + struct iommu_hw_info info; struct iommu_hwpt_alloc hwpt; struct iommu_ioas_alloc alloc; struct iommu_ioas_allow_iovas allow_iovas; @@ -297,6 +371,8 @@ struct iommufd_ioctl_op { } static const struct iommufd_ioctl_op iommufd_ioctl_ops[] = { IOCTL_OP(IOMMU_DESTROY, iommufd_destroy, struct iommu_destroy, id), + IOCTL_OP(IOMMU_GET_HW_INFO, iommufd_get_hw_info, struct iommu_hw_info, + __reserved), IOCTL_OP(IOMMU_HWPT_ALLOC, iommufd_hwpt_alloc, struct iommu_hwpt_alloc, __reserved), IOCTL_OP(IOMMU_IOAS_ALLOC, iommufd_ioas_alloc_ioctl, diff --git a/include/uapi/linux/iommufd.h b/include/uapi/linux/iommufd.h index 1f616b0f8ae0..4295362e7b44 100644 --- a/include/uapi/linux/iommufd.h +++ b/include/uapi/linux/iommufd.h @@ -46,6 +46,7 @@ enum { IOMMUFD_CMD_OPTION, IOMMUFD_CMD_VFIO_IOAS, IOMMUFD_CMD_HWPT_ALLOC, + IOMMUFD_CMD_GET_HW_INFO, }; /** @@ -378,4 +379,39 @@ struct iommu_hwpt_alloc { enum iommu_hw_info_type { IOMMU_HW_INFO_TYPE_NONE, }; + +/** + * struct iommu_hw_info - ioctl(IOMMU_GET_HW_INFO) + * @size: sizeof(struct iommu_hw_info) + * @flags: Must be 0 + * @dev_id: The device bound to the iommufd + * @data_len: Input the length of the user buffer in bytes. Output the length + * of data filled in the user buffer. + * @data_ptr: Pointer to the user buffer + * @out_data_type: Output the iommu hardware info type as defined in the enum + * iommu_hw_info_type. + * @__reserved: Must be 0 + * + * Query the hardware information from an iommu behind a given device that has + * been bound to iommufd. @data_len is the size of the buffer, which captures an + * iommu type specific input data and a filled output data. Trailing bytes will + * be zeroed if the user buffer is larger than the data kernel has. + * + * The type specific data would be used to sync capabilities between the virtual + * IOMMU and the hardware IOMMU, e.g. a nested translation setup needs to check + * the hardware information, so the guest stage-1 page table will be compatible. + * + * The @out_data_type will be filled if the ioctl succeeds. It would be used to + * decode the data filled in the buffer pointed by @data_ptr. + */ +struct iommu_hw_info { + __u32 size; + __u32 flags; + __u32 dev_id; + __u32 data_len; + __aligned_u64 data_ptr; + __u32 out_data_type; + __u32 __reserved; +}; +#define IOMMU_GET_HW_INFO _IO(IOMMUFD_TYPE, IOMMUFD_CMD_GET_HW_INFO) #endif From patchwork Mon Jul 24 10:59:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 124828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1725471vqg; Mon, 24 Jul 2023 04:16:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlFR2/TP6mhBUUcRHxUq6CL+VoqaxcwrVV7MRqvY5t/razDIDfpeUm3WOzdRXqXeiqIffuK8 X-Received: by 2002:aa7:c2c4:0:b0:51d:9dd1:29d0 with SMTP id m4-20020aa7c2c4000000b0051d9dd129d0mr9219088edp.23.1690197369982; Mon, 24 Jul 2023 04:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690197369; cv=none; d=google.com; s=arc-20160816; b=VD8D7RVm7NEn7N26xtlI/ENgx+NPusvln27QyTvynLWS6dYyTxlPWZeHS0fxVFeZ4G 5p9OKoW2VBVPOo5UqT2S2h5MmYLSQJYlxgFi3u3Anok7UK76HlOL+QdNmHVnQkBGQ5Yz csUTjP0ZKGOve4y0L9lWmCOiUTFcvIatGadcBAvUXzYIh3zKReaPAu1P0vy93upji2zd 0CURXgNmC2opHNHWVucTSnurbfVXQhsRIKzrO2Iu9jTpWAwyiHHqu/3wlCooDO+0lB8i +sxfimheiInYeaH8Hb+Ng5XKIhT1nA1Kt4wHeBkbhqIPi2kSSsCyHTqe+N1dfwLItWeh biFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qyPDrLU3If5WmNRdeBO5jYKxyYZbGAd5FAMqWX31DKY=; fh=25kVo4cotgMzE250R6E3K5ES7E7C2JawiavlW0h5mKU=; b=AeVKLZzDdKcXGEcwE6WFmW3mHe8BL+ZcFswqZSNuuNCTuCiW5DCAec2kcSnIMB8nBy myxa1JNFPTJADh94uSBwfK/ocdjLY+UWAj2SmwF7Q0Mv7g2KGS/mjxyZn+yIW2L/vQ8u 8cLAcZc8VnMGFViUJZzHrSpCPLpA7mno8AQlS1Soit7+1Htbb9z2L5iIZ/g1RWWZDymx E/Tgck82ZKZRiHLjmHb/wOHwC3tHZHWq5duNixr8p9g3u0Yd1+A5IFYyVVxqCqEEA0AV 7tJ3A2LKYfSM+Q+yD3n9WFIhJqSmpY0/9lijSOc0Or3Z2v5r6kqinUvVmzJoMppWfo6r J3cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="T6yy8G//"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p13-20020a05640210cd00b005221fa80fd8si2686221edu.617.2023.07.24.04.15.43; Mon, 24 Jul 2023 04:16:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="T6yy8G//"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233304AbjGXLAv (ORCPT + 99 others); Mon, 24 Jul 2023 07:00:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233298AbjGXLAs (ORCPT ); Mon, 24 Jul 2023 07:00:48 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCC3E10E0; Mon, 24 Jul 2023 04:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690196421; x=1721732421; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lYtRvULoCnmHMuniuUeiJdk/Hoz+sv7WeK/x8+TbZUk=; b=T6yy8G//KVB6+oQFp4//LodErEB2HA28+nXZpX1JhAfQvG5w4UwjOxHU 4Tvd6GqtPp7dBMbtnUGBYWv0d7SBZeK1F6M4VB8P1NWxsQda0oSzauiJn eVDk1B/9aWMBQ46nSUXpQOi86Fj15fC7dSIPW66emlEcjPtDgjjfKYPhl UI0DGNKMAvWZh91TtgheqXhxRvkrFpnItwihY+AdhlDFub1R7yFoFfG7w W8/djQaxL0EUYmbTv9XDCxbjGAS23pgMoHp9vEjoMmGN2CIky2vnvTGW1 VmGt5LODj5/feUMupnPJGfj5fGjm1dYuSFbeZk2wpdjDmcWRAQfbOeVbg g==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347012292" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347012292" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jul 2023 03:59:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="839409096" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="839409096" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2023 03:59:44 -0700 From: Yi Liu To: joro@8bytes.org, alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com, robin.murphy@arm.com, baolu.lu@linux.intel.com Cc: cohuck@redhat.com, eric.auger@redhat.com, nicolinc@nvidia.com, kvm@vger.kernel.org, mjrosato@linux.ibm.com, chao.p.peng@linux.intel.com, yi.l.liu@intel.com, yi.y.sun@linux.intel.com, peterx@redhat.com, jasowang@redhat.com, shameerali.kolothum.thodi@huawei.com, lulu@redhat.com, suravee.suthikulpanit@amd.com, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, zhenzhong.duan@intel.com Subject: [PATCH v4 4/4] iommufd/selftest: Add coverage for IOMMU_GET_HW_INFO ioctl Date: Mon, 24 Jul 2023 03:59:36 -0700 Message-Id: <20230724105936.107042-5-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724105936.107042-1-yi.l.liu@intel.com> References: <20230724105936.107042-1-yi.l.liu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772300397811404341 X-GMAIL-MSGID: 1772300397811404341 From: Nicolin Chen Add a mock_domain_hw_info function and an iommu_test_hw_info data structure. This allows to test the IOMMU_GET_HW_INFO ioctl passing the test_reg value for the mock_dev. Signed-off-by: Nicolin Chen Signed-off-by: Yi Liu --- drivers/iommu/iommufd/device.c | 1 + drivers/iommu/iommufd/iommufd_test.h | 9 +++++++ drivers/iommu/iommufd/selftest.c | 16 ++++++++++++ tools/testing/selftests/iommu/iommufd.c | 17 +++++++++++- tools/testing/selftests/iommu/iommufd_utils.h | 26 +++++++++++++++++++ 5 files changed, 68 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c index 1015d6c42e2b..0deb2a2ec01a 100644 --- a/drivers/iommu/iommufd/device.c +++ b/drivers/iommu/iommufd/device.c @@ -8,6 +8,7 @@ #include "io_pagetable.h" #include "iommufd_private.h" +#include "iommufd_test.h" static bool allow_unsafe_interrupts; module_param(allow_unsafe_interrupts, bool, S_IRUGO | S_IWUSR); diff --git a/drivers/iommu/iommufd/iommufd_test.h b/drivers/iommu/iommufd/iommufd_test.h index 258de2253b61..3f3644375bf1 100644 --- a/drivers/iommu/iommufd/iommufd_test.h +++ b/drivers/iommu/iommufd/iommufd_test.h @@ -100,4 +100,13 @@ struct iommu_test_cmd { }; #define IOMMU_TEST_CMD _IO(IOMMUFD_TYPE, IOMMUFD_CMD_BASE + 32) +/* Mock structs for IOMMU_DEVICE_GET_HW_INFO ioctl */ +#define IOMMU_HW_INFO_TYPE_SELFTEST 0xfeedbeef +#define IOMMU_HW_INFO_SELFTEST_REGVAL 0xdeadbeef + +struct iommu_test_hw_info { + __u32 flags; + __u32 test_reg; +}; + #endif diff --git a/drivers/iommu/iommufd/selftest.c b/drivers/iommu/iommufd/selftest.c index bb2cd54ca7b6..af7459e211ad 100644 --- a/drivers/iommu/iommufd/selftest.c +++ b/drivers/iommu/iommufd/selftest.c @@ -128,6 +128,20 @@ static struct iommu_domain mock_blocking_domain = { .ops = &mock_blocking_ops, }; +static void *mock_domain_hw_info(struct device *dev, u32 *length) +{ + struct iommu_test_hw_info *info; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) + return ERR_PTR(-ENOMEM); + + info->test_reg = IOMMU_HW_INFO_SELFTEST_REGVAL; + *length = sizeof(*info); + + return info; +} + static struct iommu_domain *mock_domain_alloc(unsigned int iommu_domain_type) { struct mock_iommu_domain *mock; @@ -279,6 +293,8 @@ static void mock_domain_set_plaform_dma_ops(struct device *dev) static const struct iommu_ops mock_ops = { .owner = THIS_MODULE, .pgsize_bitmap = MOCK_IO_PAGE_SIZE, + .hw_info_type = IOMMU_HW_INFO_TYPE_SELFTEST, + .hw_info = mock_domain_hw_info, .domain_alloc = mock_domain_alloc, .capable = mock_domain_capable, .set_platform_dma_ops = mock_domain_set_plaform_dma_ops, diff --git a/tools/testing/selftests/iommu/iommufd.c b/tools/testing/selftests/iommu/iommufd.c index 8acd0af37aa5..6b075a68b928 100644 --- a/tools/testing/selftests/iommu/iommufd.c +++ b/tools/testing/selftests/iommu/iommufd.c @@ -113,6 +113,7 @@ TEST_F(iommufd, cmd_length) } TEST_LENGTH(iommu_destroy, IOMMU_DESTROY); + TEST_LENGTH(iommu_hw_info, IOMMU_GET_HW_INFO); TEST_LENGTH(iommu_ioas_alloc, IOMMU_IOAS_ALLOC); TEST_LENGTH(iommu_ioas_iova_ranges, IOMMU_IOAS_IOVA_RANGES); TEST_LENGTH(iommu_ioas_allow_iovas, IOMMU_IOAS_ALLOW_IOVAS); @@ -185,6 +186,7 @@ FIXTURE(iommufd_ioas) uint32_t ioas_id; uint32_t stdev_id; uint32_t hwpt_id; + uint32_t device_id; uint64_t base_iova; }; @@ -211,7 +213,7 @@ FIXTURE_SETUP(iommufd_ioas) for (i = 0; i != variant->mock_domains; i++) { test_cmd_mock_domain(self->ioas_id, &self->stdev_id, - &self->hwpt_id, NULL); + &self->hwpt_id, &self->device_id); self->base_iova = MOCK_APERTURE_START; } } @@ -290,6 +292,19 @@ TEST_F(iommufd_ioas, ioas_area_auto_destroy) } } +TEST_F(iommufd_ioas, get_hw_info) +{ + struct iommu_test_hw_info info; + + if (self->device_id) { + test_cmd_get_hw_info(self->device_id, sizeof(info), &info); + assert(info.test_reg == IOMMU_HW_INFO_SELFTEST_REGVAL); + } else { + test_err_get_hw_info(ENOENT, self->device_id, + sizeof(info), &info); + } +} + TEST_F(iommufd_ioas, area) { int i; diff --git a/tools/testing/selftests/iommu/iommufd_utils.h b/tools/testing/selftests/iommu/iommufd_utils.h index 70353e68e599..f13df84f6b42 100644 --- a/tools/testing/selftests/iommu/iommufd_utils.h +++ b/tools/testing/selftests/iommu/iommufd_utils.h @@ -348,3 +348,29 @@ static void teardown_iommufd(int fd, struct __test_metadata *_metadata) }) #endif + +static int _test_cmd_get_hw_info(int fd, __u32 device_id, + __u32 data_len, void *data) +{ + struct iommu_hw_info cmd = { + .size = sizeof(cmd), + .dev_id = device_id, + .data_len = data_len, + .data_ptr = (uint64_t)data, + }; + int ret; + + ret = ioctl(fd, IOMMU_GET_HW_INFO, &cmd); + if (ret) + return ret; + return 0; +} + +#define test_cmd_get_hw_info(device_id, data_len, data) \ + ASSERT_EQ(0, _test_cmd_get_hw_info(self->fd, device_id, \ + data_len, data)) + +#define test_err_get_hw_info(_errno, device_id, data_len, data) \ + EXPECT_ERRNO(_errno, \ + _test_cmd_get_hw_info(self->fd, device_id, \ + data_len, data))