From patchwork Mon Jul 24 11:13:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 124869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1735302vqg; Mon, 24 Jul 2023 04:34:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlHTOaSdcKrJkjb8C/qG2xCnyg197Ti2k5JTp1SRlJ/E7cZkBeYmxQhVL6mt6MBCVnhcKhhU X-Received: by 2002:a05:6358:e490:b0:12b:ed77:8b66 with SMTP id by16-20020a056358e49000b0012bed778b66mr4158768rwb.7.1690198487795; Mon, 24 Jul 2023 04:34:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690198487; cv=none; d=google.com; s=arc-20160816; b=S6M8PbDLXItPJe5YSAm886SiSf9Skna2UtKlCfzsq3Dxx0ASOD4RfgIT8Jzqr8Vm00 w+T6PV+DjNP4IyL2OuvljCtfjL1AHnyNdFn3wD+dnsXjM1ndK8aayBLyTF1beoLsp3We ex3AFioBJYF41MI6zS04elqr3t26hmLZyFwiT1EZWHUXWEioj+ViQYv5N2HiXs2ScEjW fG6n0Jc/bzq/ZOAHY4gWhhXU5cZVvRfeISBqr/qrVr2027ILaiBpMUF5ISfp6Di7927k O1CFk1EsKqy1Qm91ZIatBwcQ5mZO83JUDZMZpoHtOgU4YwtrLpTU5JZQjddJW1RhET8b 8f/g== 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=k1Juy008yrLTxHF2H+dtrtRsxTCtrxhTMQU9iwtnkIE=; fh=FgSO3Yf8GJrxPhnjwhWYMDk27nKOfjScS5mWKw6NdLA=; b=nsO++1SEPzwYRl0ZElDi5VtDLxVKWfTGamLWN+eNMqZQnwZAbq+9TBT11cX0SMLOsK j9fiXEoNwZvn0aF0yBAx6jcJrP6Ix9ic0KKRMpOZzglBq1RZaRjImS1EjtG4sTNisLzG wwQ7JzUKzNPtMbA+jyN6W0v8CEsYjnwUEmqsDa5RxDpc0ePkDIifwi6+HJTuwm83njIL c44UEv4VRGp8AcUICYUwHV+y5mk7XDsRYCA8/e8jluWB3jyfHHZWBAy8XTioB2sCl1EJ Atqn6ZkKqewdrtPErcPMnMpa/mnHolCkRlxUOKuBbMCa9+KEaPbgMCv+hdFuJolP5piJ vTmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JSve0SaL; 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 w185-20020a6382c2000000b005401008809bsi8525268pgd.752.2023.07.24.04.34.34; Mon, 24 Jul 2023 04:34:47 -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=JSve0SaL; 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 S231784AbjGXLN4 (ORCPT + 99 others); Mon, 24 Jul 2023 07:13:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231185AbjGXLNm (ORCPT ); Mon, 24 Jul 2023 07:13:42 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E019FF; Mon, 24 Jul 2023 04:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1690197221; x=1721733221; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Awxbn6Nb7Hh0WikNMPmajyyTS2f1aHlBucIYmHph8sc=; b=JSve0SaLZK97NUTDJRY9o5q1vGEWiU8J/D9tHuAoujZdYbRdqTqg7QO9 Q+RQjiN9RPqKrzyiq3A/GFKw8FHBriOrxHOyOP+rvS1Pcs/UfFaxIh4/D oTKYwzbZIy6c7cW6L07tLt6s+ZurCx/JccTTuwVKnKTfcYt7NWqOqaZiT pggQaonngS0f/Oqd1jvLh1M/JMxMwq7M/vBLIMxnpGs8ef5fqSOmHUEGk 59/ttQ94HIHVEtiZCe/PaSzodGDTUtvpBucT8cMBHP3CRNnwxbX2MecnE eGmNqeIkvUlsPrOO4gBp2FDG8hTKjtEcjzjH+VdhQ2GD/vOAM6jLZj3Jx A==; X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="347014948" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="347014948" 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:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10780"; a="839415498" X-IronPort-AV: E=Sophos;i="6.01,228,1684825200"; d="scan'208";a="839415498" Received: from 984fee00a4c6.jf.intel.com ([10.165.58.231]) by fmsmga002.fm.intel.com with ESMTP; 24 Jul 2023 04:13:40 -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, Jacob Pan Subject: [PATCH v4 03/12] iommu/vt-d: Add helper for nested domain allocation Date: Mon, 24 Jul 2023 04:13:25 -0700 Message-Id: <20230724111335.107427-4-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: 1772301569795626814 X-GMAIL-MSGID: 1772301569795626814 From: Lu Baolu This adds helper for accepting user parameters and allocate a nested domain. Signed-off-by: Jacob Pan Signed-off-by: Lu Baolu Signed-off-by: Yi Liu Reviewed-by: Kevin Tian --- drivers/iommu/intel/Makefile | 2 +- drivers/iommu/intel/iommu.h | 2 ++ drivers/iommu/intel/nested.c | 47 ++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 drivers/iommu/intel/nested.c diff --git a/drivers/iommu/intel/Makefile b/drivers/iommu/intel/Makefile index 7af3b8a4f2a0..5dabf081a779 100644 --- a/drivers/iommu/intel/Makefile +++ b/drivers/iommu/intel/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_DMAR_TABLE) += dmar.o -obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o +obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o nested.o obj-$(CONFIG_DMAR_TABLE) += trace.o cap_audit.o obj-$(CONFIG_DMAR_PERF) += perf.o obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h index 565e6ae54d32..b3edad7359c9 100644 --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -858,6 +858,8 @@ void *alloc_pgtable_page(int node, gfp_t gfp); void free_pgtable_page(void *vaddr); void iommu_flush_write_buffer(struct intel_iommu *iommu); struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devfn); +struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *s2_domain, + const union iommu_domain_user_data *user_data); #ifdef CONFIG_INTEL_IOMMU_SVM void intel_svm_check(struct intel_iommu *iommu); diff --git a/drivers/iommu/intel/nested.c b/drivers/iommu/intel/nested.c new file mode 100644 index 000000000000..80a64ba87d46 --- /dev/null +++ b/drivers/iommu/intel/nested.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * nested.c - nested mode translation support + * + * Copyright (C) 2023 Intel Corporation + * + * Author: Lu Baolu + * Jacob Pan + */ + +#define pr_fmt(fmt) "DMAR: " fmt + +#include + +#include "iommu.h" + +static void intel_nested_domain_free(struct iommu_domain *domain) +{ + kfree(to_dmar_domain(domain)); +} + +static const struct iommu_domain_ops intel_nested_domain_ops = { + .free = intel_nested_domain_free, +}; + +struct iommu_domain *intel_nested_domain_alloc(struct iommu_domain *s2_domain, + const union iommu_domain_user_data *user_data) +{ + const struct iommu_hwpt_vtd_s1 *vtd = (struct iommu_hwpt_vtd_s1 *)user_data; + struct dmar_domain *domain; + + domain = kzalloc(sizeof(*domain), GFP_KERNEL_ACCOUNT); + if (!domain) + return NULL; + + domain->use_first_level = true; + domain->s2_domain = to_dmar_domain(s2_domain); + domain->s1_pgtbl = vtd->pgtbl_addr; + domain->s1_cfg = *vtd; + domain->domain.ops = &intel_nested_domain_ops; + domain->domain.type = IOMMU_DOMAIN_NESTED; + INIT_LIST_HEAD(&domain->devices); + spin_lock_init(&domain->lock); + xa_init(&domain->iommu_array); + + return &domain->domain; +}