From patchwork Fri Oct 20 09:32:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 155930 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp932170vqb; Fri, 20 Oct 2023 02:33:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH3xixfKdkQxElFy0Q47XI4DqYzTkZDUq9bzJubpsRMgMP5sKxlXGF5wQhFugtFSlxSEuJf X-Received: by 2002:a17:90a:4d:b0:27d:76e2:ab18 with SMTP id 13-20020a17090a004d00b0027d76e2ab18mr1449713pjb.9.1697794415250; Fri, 20 Oct 2023 02:33:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697794415; cv=none; d=google.com; s=arc-20160816; b=dYh8DUOk+V67uAnNanX8oVAGpXoZCEfOqo9d3h1wb8NUzPZJY7vs4fFU4dre1GsrVs sNlGyHUpoF4906D0rnsVP0O77e1ZeSqwHJSMJerkmNjIsr/L5a8ZV9KXUtfbdz0j4UZ/ v8XL2qo4vl3nbAszg/jr10dB6qjrp1FohbqgfV1G6DSPhQRTV6G5pftVjAOWENu3TxCg 4+by/KZ/MywsG17mzhYzgNzDUlZjG7cGTDjikcYqiA+8i9Pes2rRNYwyczXKSaYnM+I9 /xfmON5/5/Ic0nR3NUzFga7ZnTOwtC4jxsb+gE9lar/PSb3dD54Gn4tr597g7xP1SuMt lqUQ== 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=lURTMBZJbTtTrXFmMC/EBBIoEfvhN8dYrqlyQ22r/Uk=; fh=AYfEg8UxxCZNlRHxnJWvHuqsheVQzM8ymhb/+J0VVdk=; b=maie9il+HRLrGXekXX6thYNTltsHyj0LtsCmHVWI9N31XlxPUi7hG+HI1yfKNsA28f MZZS/g5aCJbHusEB28srP2kaiv4zJ+Fssey+6y59MbRc8/uPMfqp9qBL2vf1f8QmUCYy B8AOwMNJaMA4KI93hWVZ4MjBv5U/4cW2hxs65CPceBXuh2cdic7sOr+Nh8rQvsNfB9Ws 3l3S+tvShVNSx+p19yLqUmq+zt3x42t7LYHVTbQsWpBhsA2ZP6vB+A5N5IYHWq0YSdx3 j8WYl54ztPXV80DhzCLT6ur/0I1dvZ5v4njFAlAPXOWyvgOVxa6RSw79QFGBOnASoICx AiqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Dc4z6UaX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id y11-20020a17090a8b0b00b00276c22ca6a4si4007816pjn.147.2023.10.20.02.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 02:33:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Dc4z6UaX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id C60998050915; Fri, 20 Oct 2023 02:33:32 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376822AbjJTJdV (ORCPT + 25 others); Fri, 20 Oct 2023 05:33:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376708AbjJTJc7 (ORCPT ); Fri, 20 Oct 2023 05:32:59 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 868BED55; Fri, 20 Oct 2023 02:32: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=1697794374; x=1729330374; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ib1IMmuWc4reT62H1wiulcc7gMI+m46FXf0FSrS+Cos=; b=Dc4z6UaXI8oaeVQBnI/cSI7NbEZyXoCRmb4FZr0+qrUQxq1eyljZIhsO gVj21uhxqNQHmj03dKAl50BWq8m5HpuEcJKGDdKAheN02vxHofCft1so5 B2+6KU4pv+Cnyd6sVj2Gs44WHNgaJz/+Cwj1Z8HA1Qlc4VEgd/HFalCcJ Ly18nTgKG9kWesvDURfQdaDcM8ECtOmOduC5qEvBw7Z97+a/JAAWz6XA2 sM0GGVlOBPSfP0jc9HNKEgaHVp4dtSioLfQm5jVoUl+05hDuXNjpPJCl4 5T2zb3nKbpNPlPykERMhxmPHrkW8BaW3cnNYCo9SAVxhQuiUplsV4ynw/ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450691725" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450691725" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 02:32:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="733906305" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="733906305" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by orsmga006.jf.intel.com with ESMTP; 20 Oct 2023 02:32:53 -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, joao.m.martins@oracle.com, xin.zeng@intel.com Subject: [PATCH v6 5/8] iommu/vt-d: Make domain attach helpers to be extern Date: Fri, 20 Oct 2023 02:32:43 -0700 Message-Id: <20231020093246.17015-6-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231020093246.17015-1-yi.l.liu@intel.com> References: <20231020093246.17015-1-yi.l.liu@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Fri, 20 Oct 2023 02:33:32 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780266476800405811 X-GMAIL-MSGID: 1780266476800405811 This makes the helpers visible to nested.c. Suggested-by: Lu Baolu Reviewed-by: Kevin Tian Signed-off-by: Yi Liu Reviewed-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 15 ++++++--------- drivers/iommu/intel/iommu.h | 7 +++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 8d78149e793e..b47025fbdea4 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -282,7 +282,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); @@ -560,7 +559,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); @@ -1778,8 +1777,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; @@ -1828,8 +1826,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; @@ -3974,7 +3971,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; @@ -4109,8 +4106,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; diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index ff55184456dd..b4560983b8b9 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -860,6 +860,13 @@ 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); +void domain_update_iommu_cap(struct dmar_domain *domain); + int dmar_ir_support(void); void *alloc_pgtable_page(int node, gfp_t gfp);