From patchwork Fri Nov 17 13:18:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 166175 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp520820vqn; Fri, 17 Nov 2023 05:18:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnrehmVKUvaSyq2u5sydRFqwPzsjsUCrOxPhdoMkTEIZkmqUHnwsJDr0RuEnwK5covye0z X-Received: by 2002:a05:6a21:186:b0:133:d17d:193a with SMTP id le6-20020a056a21018600b00133d17d193amr26457105pzb.59.1700227117772; Fri, 17 Nov 2023 05:18:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700227117; cv=none; d=google.com; s=arc-20160816; b=qPVhgq99CQ8y1IvjYhFxigAdUfcN/uN915Yi7KCovUJrltHE0lPuyn/bbeVyM9ZkUB CUbxANk2ayG0m8bgmYzaOYy6/gdPQOcoTC0KSip3srNfd/yV1BKsD8FygRfmyDzGwsUt aqNhwvFf4fy4mGI0kxQQ0WJ2IMGLVSR34eYM43MPiC5cAYNoJ4VgTgJ1eOYJJircbQNl vx0NalUKCTUULBfiQM9UpQMUVJOZ1f2hQvKRoRkC51LRfo4zOK9gtGkbbSdOxlMfvgd/ 8Hd5GB1moHKdXwW5vgO87lDWOKGGI6in5oWEniWD21KTElIhY9SSdsGLmlRi0VE7vxsH fUfw== 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=IXT9W/zo5hQQUcTxuhVSynqf2/FQy4tJ3daL7yumRE8=; fh=gm0A6EtasJwovXfz1TpeYfkY+4H0EN5E4rSCpite+Dk=; b=SHnC6Nd4NCu4gbzcqc8XSA7y4FFrckfz56sRdycgviH9W/i3ksT2Drlw0GfGvb5xcR VAR5E82b1mo1iSs0O6Tfrbct46BYM26m37yXe+hBngulVNDSzMG89L8p3wI9XCmfamZK NsyevYRg+ceMqoVqMFduYDjjRgpl9vPuSoUBi94o7nSQpN0idgs6Q1gazqp5An4zeCsB k/aF9RqACTKdPyDTm0wC7BoIekIBDV0RsV768G/iZM2V5UI/9o+SbaIQQ6QfKiqnjwaW 0MOX7y+loVKM+KYfqwAYvBD+PxkJwoCVZxgK+8pcAbyPWB928CDtn+u47y050o3mvWHJ iFAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=U9k8tKY8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b19-20020a63d313000000b005ac8d44bad4si1846155pgg.592.2023.11.17.05.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 05:18:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=U9k8tKY8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id DA80C82A38E7; Fri, 17 Nov 2023 05:18:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346059AbjKQNS3 (ORCPT + 30 others); Fri, 17 Nov 2023 08:18:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346042AbjKQNSY (ORCPT ); Fri, 17 Nov 2023 08:18:24 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B868D56; Fri, 17 Nov 2023 05:18:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700227101; x=1731763101; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6LVGn0mZeI5bm1P07fZ8QF7siZDHe/ViBKX49RL5h8E=; b=U9k8tKY8KIUfz2veGNkiwWLFsy5mLSjFXh6NNRUVIQAuv1XbMAJRMILR ycKA2NqDGv0EU/zsOnRbyklYJOVSpQHHKRrmpIC3iu9+anU33RNmJ9VxM KeBm/cojdjM+wBVSrm5XYkxg7SaQHrKd7QZAfkQfq4D2bZOmJVmcxEZ6t xRaNVDvK+He8wX4tpbzsnYl9ENVPy+ZKEv3Ti5O48rzIOsEG2+PPIPPCN tvOZenIC8q2tm2eMo/VudcwCvuu6/MbtQrnUFqmuwHgK2CLyK/62JX14R oksJ5ziC9M3Opo9L4Dk4Y7x+0Lg8CorN8+HdZmWva6bWwBFreLlZ2TSaq g==; X-IronPort-AV: E=McAfee;i="6600,9927,10896"; a="381685601" X-IronPort-AV: E=Sophos;i="6.04,206,1695711600"; d="scan'208";a="381685601" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2023 05:18:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10896"; a="794831202" X-IronPort-AV: E=Sophos;i="6.04,206,1695711600"; d="scan'208";a="794831202" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by orsmga008.jf.intel.com with ESMTP; 17 Nov 2023 05:18:19 -0800 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, yan.y.zhao@intel.com Subject: [PATCH v7 2/3] iommu/vt-d: Make iotlb flush helpers to be extern Date: Fri, 17 Nov 2023 05:18:15 -0800 Message-Id: <20231117131816.24359-3-yi.l.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231117131816.24359-1-yi.l.liu@intel.com> References: <20231117131816.24359-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, T_SCC_BODY_TEXT_LINE,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 (snail.vger.email [0.0.0.0]); Fri, 17 Nov 2023 05:18:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782817350481369724 X-GMAIL-MSGID: 1782817350481369724 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 3531b956556c..074b728a3e93 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1512,10 +1512,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); @@ -1588,7 +1588,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 65d37a138c75..4b779d5f7215 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -891,6 +891,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);