From patchwork Thu Sep 21 07:54:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 143036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp5234071vqi; Thu, 21 Sep 2023 17:36:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESraHEbrhEcY33+TYPI8/JfaR9n5fSSehjdCd689xjuO7MnzKjTSdLubwXhbNjsNemArBq X-Received: by 2002:a05:6a20:2594:b0:14d:e075:fc5d with SMTP id k20-20020a056a20259400b0014de075fc5dmr6387855pzd.40.1695343007870; Thu, 21 Sep 2023 17:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695343007; cv=none; d=google.com; s=arc-20160816; b=sdawIlrsGQjCOng47CYYlxrwT3xw0PfQOe3NF6sxT/KyaCU2KxJAIz06poyA9Qtbft LHX/RDGelN6aNl93N+KlBXL9jHFiEPgLtlSZiyoSZ5hiLXCqkTt2XeUYC0zBd1VnLuy8 EKkLCouyrs0a9AbvqQNNG0GsMxboQl0KnpjgDl/YEZ2YNhRvtYQ7L4Dus6GtXVr6n16B ZpUL1+n9KAo+btlk82tLhP6V4NdEAcctLsn6LMg/suFHTj2ElV27jU0VP7mYtLPO+hZs YB6lPudQISdxxhRch8rzSLW/D7I+XWTq2n3oTpigjQ/RjvJK+E72UMMpFLGZzML+jxRo 622w== 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=k47QArb9ysZyNqR/XxMEOfRW1qk0ixTpvptWQD+9Kp0=; fh=ncJBVmsnOSqrX1O37yfYEzicwaA2e7ARxnsU7aiysyE=; b=zLx4x+ockjrHvs5xsMjLun5mYqu8Jceeyyp7SwavlGsPK80706t3A2j1wc/xYRrwdr 5WfGod5PAJTtv9D7iBxebNAKD1pHatOzf1ZzAkcmvWf+qKGq1FIqwADgjC90C/Qs43XH lO1ghb/ZoyHM62GsiZ8hiPojiNj0PRbp09B629VwqlPeRit91ToEglZRHky6fDNulH3z 18KaXQdGfFQmbUmHyGVB0ujWoWfkzg7p+PpQzhrbZrBsxOP1/Ovw36h1uYZLJTYR8Vgl N+zaraRA8zr46r4DLFWlhQtjRMioG9326A5XVOJk15jGM/tb0xzW/2PavBXP5wyctSPm iofg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XVON4yOg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id u16-20020a170902e81000b001b9e82a6beesi2762380plg.548.2023.09.21.17.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Sep 2023 17:36:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XVON4yOg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 7FE04840FE37; Thu, 21 Sep 2023 10:29:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230247AbjIUR30 (ORCPT + 29 others); Thu, 21 Sep 2023 13:29:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230251AbjIUR2o (ORCPT ); Thu, 21 Sep 2023 13:28:44 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55695AD25; Thu, 21 Sep 2023 10:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695316280; x=1726852280; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cxZTRu44xkZvSgweNgQ/ax7l1RyCji4jcedyDtK8Vag=; b=XVON4yOg04xCNnkdgBFkWMeci+MqVoSO6VSmPOUxgf+qdoJKSgTZBKpf 731eLZwmO1IABgPBwORUH6NkuErTzFZWagfjhlM6ioDiDsQsleAa6eayD P2+rsgeUousP1BLPqdZJjCHKRasQooszd604jI4jfM8+sO4m7GBAIXnVJ BUQpfc6n9PKvCbz1SNWfWDLF7H8rfJ+9SC6SCfimOLvFQ8KwKvqUaDoLz Rw74R5IFxabZfA0qx1mi39TB/fBb/pim9B8TN5tdpsdZBvYwueyPAy9cH Nf3BFgXWUjDmbQ0mI0JclQet+AHMj4BONJzhRcgG+NdROVKNUUrCQzDe2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10839"; a="370764470" X-IronPort-AV: E=Sophos;i="6.03,164,1694761200"; d="scan'208";a="370764470" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2023 00:54:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10839"; a="812523171" X-IronPort-AV: E=Sophos;i="6.03,164,1694761200"; d="scan'208";a="812523171" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga008.fm.intel.com with ESMTP; 21 Sep 2023 00:54:52 -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 v5 08/11] iommu/vt-d: Make iotlb flush helpers to be extern Date: Thu, 21 Sep 2023 00:54:28 -0700 Message-Id: <20230921075431.125239-9-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230921075431.125239-1-yi.l.liu@intel.com> References: <20230921075431.125239-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, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Thu, 21 Sep 2023 10:29:52 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777695989933314313 X-GMAIL-MSGID: 1777695989933314313 This makes the helpers visible to nested.c. Reviewed-by: Kevin Tian Signed-off-by: Yi Liu --- drivers/iommu/intel/iommu.c | 10 +++++----- drivers/iommu/intel/iommu.h | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 7b75f407c623..c93c91ed4ee2 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1511,10 +1511,10 @@ static void domain_flush_pasid_iotlb(struct intel_iommu *iommu, spin_unlock_irqrestore(&domain->lock, flags); } -static void iommu_flush_iotlb_psi(struct intel_iommu *iommu, - struct dmar_domain *domain, - unsigned long pfn, unsigned int pages, - int ih, int map) +void iommu_flush_iotlb_psi(struct intel_iommu *iommu, + struct dmar_domain *domain, + unsigned long pfn, unsigned int pages, + int ih, int map) { unsigned int aligned_pages = __roundup_pow_of_two(pages); unsigned int mask = ilog2(aligned_pages); @@ -1587,7 +1587,7 @@ static inline void __mapping_notify_one(struct intel_iommu *iommu, iommu_flush_write_buffer(iommu); } -static void intel_flush_iotlb_all(struct iommu_domain *domain) +void intel_flush_iotlb_all(struct iommu_domain *domain) { struct dmar_domain *dmar_domain = to_dmar_domain(domain); struct iommu_domain_info *info; diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 411cde769787..ac23b9d22d20 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -865,6 +865,12 @@ 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); +void iommu_flush_iotlb_psi(struct intel_iommu *iommu, + struct dmar_domain *domain, + unsigned long pfn, unsigned int pages, + int ih, int map); +void intel_flush_iotlb_all(struct iommu_domain *domain); + int dmar_ir_support(void);