From patchwork Mon Jul 24 11:13:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 124848 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1727706vqg; Mon, 24 Jul 2023 04:20:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlHmJ+QIWM95GxndBT1TOoU2Fk5FiDfBGsOReYPnMC8wTivh2xf/zh2y/90RA4Zx2PLKvzAh X-Received: by 2002:a05:6a00:a23:b0:686:626d:71e with SMTP id p35-20020a056a000a2300b00686626d071emr12425997pfh.2.1690197618868; Mon, 24 Jul 2023 04:20:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690197618; cv=none; d=google.com; s=arc-20160816; b=IKcPEErHFBbJDprd9Bsz7nwOTe1qYanAJT7kv32bcQH78UtjXKlr4GZmuheErKGNf/ nBsXTtYMbqXk7CaDI4VXVXASBYPtRW+SgLgQy+ZRX1v8KoQHmJ0dNVVEhmWDqvTNtuyt TGv1QbVIuh55W/rAaOxF3mK/DRaY6nmt99RYlPZO0MTH/UY8Qy2ZNbgp1vV6mgthq3tx 5Q+ntGmoiV+80WDzXhYbiZ4FrXs5sTs79myX7eiJpQl2YOgg0m6+btX9sON+y/kkTf5a ddLv71b3/9oRhZCk51gqQ8jACmvY9/SDQJ3qIKuK2ZUgaysG+1+z1waB5R8wixXWZzey mHAA== 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=Jwzat8sa1L/j+TE9kDx5YC8Pm2zZJAmAJB8LljVczUI=; fh=25kVo4cotgMzE250R6E3K5ES7E7C2JawiavlW0h5mKU=; b=aSoL/PBzQyNO138DeF9uzjEx7k5nelpkm69HsFqeRmVpQYMXXKaLb/65h/W3RvVtKC NozUjZufeY7rnx2hqD5FKhAbVVaNNJynshQb0ypQLGNcCgY2ocqzwI3p0NoM9fJI1XaC KNRUCWcN32NXbpgcZ68xk8uFnX7hRFiZx1la9SaNXzoQaeB4mzzmoCYou7JUMwTGFKYy uiFjKKHB8HlZkkdtEnGCy3ZooJLW6AYEOPsv6h1/oEtWOp/PYX45gqveyWwVK5IlojSG s8zp/bvVXFTqNVizaikhDrDTWWhgnq3yxxBxlCf8oB2P84NnVeQJO5wEK1lAwLd6FxP/ bLlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SajLg6JK; 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 u15-20020a056a00158f00b006862f5ac976si9275931pfk.379.2023.07.24.04.20.05; Mon, 24 Jul 2023 04:20:18 -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=SajLg6JK; 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 S231782AbjGXLOL (ORCPT + 99 others); Mon, 24 Jul 2023 07:14:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbjGXLNp (ORCPT ); Mon, 24 Jul 2023 07:13:45 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93E3412E; Mon, 24 Jul 2023 04:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690197224; x=1721733224; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=puXjGB8tAoJeLLeVqT8elCVekEmJH6XthqJE2eCLzC4=; b=SajLg6JK8On9VYYCsHXkNJKZeF+lAhzzedmTVa3o9UgTjrOOeQ6iWQ8R GTq2fM6KMWm/S/lYqAJnwSUHYhk7EXODDO8rHlLCbBrYcljYxJw3p/XkF PaZsHgRWv7uzYOs/i3VYK1wqqZ8Hg/177oNZ2BbLBs8NzrDvhInmwvYW4 RQr8GiGPZOBoAtwG8YwPLtpPOkDXMQuGhPlQpVr0tk1b8DLkn8sxJmXyK nW4OQ+io4RVeklax5ks+ZfeHjSYrEWO71gxGqD3+iR2v5xrzubMvZqUPl zPPN5d5ogujM0nA8AwYazfyNdQVKRkhf/hwrQRBOcs9AecztmaIRsJJFp g==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347014973" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347014973" 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 04:13:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="839415514" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="839415514" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2023 04:13:42 -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 05/12] iommu/vt-d: Make domain attach helpers to be extern Date: Mon, 24 Jul 2023 04:13:27 -0700 Message-Id: <20230724111335.107427-6-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724111335.107427-1-yi.l.liu@intel.com> References: <20230724111335.107427-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: 1772300658334071881 X-GMAIL-MSGID: 1772300658334071881 This makes the helpers visible to nested.c. Suggested-by: Lu Baolu Signed-off-by: Yi Liu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.c | 17 +++++++---------- drivers/iommu/intel/iommu.h | 8 ++++++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 5c8c5cdc36cf..289e8c2417ad 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -277,7 +277,6 @@ static LIST_HEAD(dmar_satc_units); #define for_each_rmrr_units(rmrr) \ list_for_each_entry(rmrr, &dmar_rmrr_units, list) -static void device_block_translation(struct device *dev); static void intel_iommu_domain_free(struct iommu_domain *domain); int dmar_disabled = !IS_ENABLED(CONFIG_INTEL_IOMMU_DEFAULT_ON); @@ -555,7 +554,7 @@ static unsigned long domain_super_pgsize_bitmap(struct dmar_domain *domain) } /* Some capabilities may be different across iommus */ -static void domain_update_iommu_cap(struct dmar_domain *domain) +void domain_update_iommu_cap(struct dmar_domain *domain) { domain_update_iommu_coherency(domain); domain->iommu_superpage = domain_update_iommu_superpage(domain, NULL); @@ -1732,8 +1731,7 @@ static struct dmar_domain *alloc_domain(unsigned int type) return domain; } -static int domain_attach_iommu(struct dmar_domain *domain, - struct intel_iommu *iommu) +int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu) { struct iommu_domain_info *info, *curr; unsigned long ndomains; @@ -1782,8 +1780,7 @@ static int domain_attach_iommu(struct dmar_domain *domain, return ret; } -static void domain_detach_iommu(struct dmar_domain *domain, - struct intel_iommu *iommu) +void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu) { struct iommu_domain_info *info; @@ -3987,7 +3984,7 @@ static void dmar_remove_one_dev_info(struct device *dev) * all DMA requests without PASID from the device are blocked. If the page * table has been set, clean up the data structures. */ -static void device_block_translation(struct device *dev) +void device_block_translation(struct device *dev) { struct device_domain_info *info = dev_iommu_priv_get(dev); struct intel_iommu *iommu = info->iommu; @@ -4093,8 +4090,8 @@ static void intel_iommu_domain_free(struct iommu_domain *domain) domain_exit(to_dmar_domain(domain)); } -static int prepare_domain_attach_device(struct iommu_domain *domain, - struct device *dev) +int prepare_domain_attach_device(struct iommu_domain *domain, + struct device *dev) { struct dmar_domain *dmar_domain = to_dmar_domain(domain); struct intel_iommu *iommu; @@ -4334,7 +4331,7 @@ static void domain_set_force_snooping(struct dmar_domain *domain) PASID_RID2PASID); } -static bool intel_iommu_enforce_cache_coherency(struct iommu_domain *domain) +bool intel_iommu_enforce_cache_coherency(struct iommu_domain *domain) { struct dmar_domain *dmar_domain = to_dmar_domain(domain); unsigned long flags; diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index b3edad7359c9..4b12166a9c3f 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -852,6 +852,14 @@ int qi_submit_sync(struct intel_iommu *iommu, struct qi_desc *desc, */ #define QI_OPT_WAIT_DRAIN BIT(0) +int domain_attach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu); +void domain_detach_iommu(struct dmar_domain *domain, struct intel_iommu *iommu); +void device_block_translation(struct device *dev); +int prepare_domain_attach_device(struct iommu_domain *domain, + struct device *dev); +bool intel_iommu_enforce_cache_coherency(struct iommu_domain *domain); +void domain_update_iommu_cap(struct dmar_domain *domain); + int dmar_ir_support(void); void *alloc_pgtable_page(int node, gfp_t gfp);