From patchwork Tue Oct 24 15:14:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 157595 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2021704vqx; Tue, 24 Oct 2023 08:28:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHv3u7CRig9MvOwN3PEuUeZOKmd4o5etkVlCiq1rWByLvs4VUZDcCA4zvYruV2aFUu3DSuZ X-Received: by 2002:a05:6a21:7906:b0:175:59b5:5a61 with SMTP id bg6-20020a056a21790600b0017559b55a61mr2720906pzc.60.1698161301645; Tue, 24 Oct 2023 08:28:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698161301; cv=none; d=google.com; s=arc-20160816; b=NJPEQcu0ku5VQTcMTsALpUMghNqPP1t+5+lVybyoh9Umrxi0NpDadW3FysgCWpojPf CuE7nuqrzrDz6zZl2F0GcOldCQcEEsEX4MbaoHFnEN0mt9dZtNtX2JSgbM1bxbsyYc73 mlOwq7xIt4GGYatqsD8JFBqIIL1dmE2N2Z3ww38Eu0kL+gteh2xJBh0G82GAN+L3QEZW HhORyHTxlTEkUhckFcU5KyhxrWzeTelBFBqwaw+7jx3HmuvpF0XJpaHf8o22v8Es4LdB giWNr7d4H1fbUeXbM7db9LQRbfkSZ6cJ4s4+Mah/HCXFAxvYmBSX77T5jMENSGKxtl0t aO5g== 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=l4Gq2Fe2/woFoRpKme2PEbsqz/YYYShE7F2bnoXMt5Y=; fh=ncJBVmsnOSqrX1O37yfYEzicwaA2e7ARxnsU7aiysyE=; b=u4GGQW7v6FBVu2BGnBdZqYmwcfC3xdaUGeYWup7CLg3mdjrJMsxltXj/N12Bx8KElZ OL4qA30twYo+pyYCzXFm8p3cZisjxk0pX9Am/s7Fj346wPYgtzS43hIanEgMfYUe8gfR K+a2pSBkYZHRRB4OY+p4CWxHhGLtH7NEYX9rpQ0yHh5QSxO+u+puVO3bcqW4viizAYml xMWjGQ6uhspyMaxFUrj7Rj5+TJ2FYvNMOZSMZWwxSdRoTHbar4hGRG9RSK0tqPJOZHAO O9BGQp2YRwr6sMF1MoDROdgnD3kyBoVXqXxlFz/Bpym+sHC4Wezdt+VKt6P5319GGEsX bHHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TfNxncsi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id cw10-20020a056a00450a00b00690f22edc20si8478208pfb.333.2023.10.24.08.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 08:28:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TfNxncsi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id B604C80C5CB6; Tue, 24 Oct 2023 08:28:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234846AbjJXP1c (ORCPT + 27 others); Tue, 24 Oct 2023 11:27:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234893AbjJXP1D (ORCPT ); Tue, 24 Oct 2023 11:27:03 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E34F2699; Tue, 24 Oct 2023 08:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698161151; x=1729697151; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yaXPXgiHPft1t+FfYx+gcc9MnjEET03QhJxsh9MS9DU=; b=TfNxncsiPQGawNwwvRp6vU0YMdU2d0et4x7RhQnWuY/6YnI00BF0JgS+ TMS36MLXIwYqKD3BZmMnGMFatZzjSTM7x1xHV8qV0VoTNVHZKWFTJMvf8 chun5fBr79PN1KvbL3o8CkCZZ5gj3O5qlH3gfDQrAsgKWJJE7KlyRwTeV w9VELrZcJ1s3c5mFWMkRAmdgyDehFaJ6L8LRjttaQAZguc8fNYG41UoE4 oRVZ28iogysKFUjVXgJ5dTJy15ZiRbgGa2V1mX4O9xexALstUWtCbKHog 0GKNB1g3WEIDdxX8X0jjYO99TiP/2VYdXAk6kIV33T6+rlWXaHHBkWPbZ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10873"; a="418212168" X-IronPort-AV: E=Sophos;i="6.03,248,1694761200"; d="scan'208";a="418212168" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2023 08:14:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10873"; a="1005688921" X-IronPort-AV: E=Sophos;i="6.03,248,1694761200"; d="scan'208";a="1005688921" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga006.fm.intel.com with ESMTP; 24 Oct 2023 08:14:16 -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 Subject: [PATCH v7 5/8] iommu/vt-d: Make domain attach helpers to be extern Date: Tue, 24 Oct 2023 08:14:09 -0700 Message-Id: <20231024151412.50046-6-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231024151412.50046-1-yi.l.liu@intel.com> References: <20231024151412.50046-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 pete.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 (pete.vger.email [0.0.0.0]); Tue, 24 Oct 2023 08:28:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780651185055390320 X-GMAIL-MSGID: 1780651185055390320 This makes the helpers visible to nested.c. Suggested-by: Lu Baolu Reviewed-by: Kevin Tian Reviewed-by: Lu Baolu Signed-off-by: Yi Liu --- 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 cb64759b3d95..292baa64188b 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); @@ -561,7 +560,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); @@ -1779,8 +1778,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; @@ -1829,8 +1827,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; @@ -3975,7 +3972,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; @@ -4128,8 +4125,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 43108424f315..d5aaaedf2094 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -878,6 +878,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);