Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4037754ybg; Fri, 25 Oct 2019 12:25:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtg1A5n6r44aVVG1mVfRZk6dxdODsL206iZkLLsgBTC6BZnoeF00CYoIwRtzr+jzELOT9C X-Received: by 2002:a17:906:14cc:: with SMTP id y12mr3159661ejc.279.1572031515955; Fri, 25 Oct 2019 12:25:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572031515; cv=none; d=google.com; s=arc-20160816; b=OyiYaenYsya0kHCe2ZojsDGk+BYhNZ5Rtz537nkAbDnJHyVFfSOKFto7mzxHxJj9MO MdzhVCZvX5ystneRpmkdY30GIQGdg9KXdFHqScb86c5o2pRPqHiuo1QyPb/wEmLizIwj uGSvsPdmK94G57IgKoCq/qqbBF5b+99Jy56+T/GNFMJySufwpHfcpoRqPkF9vU2Qvl6z izI2+LljXp+wIcUsULrt98WemPPnNq+sL/QWGWNwQKQg1dhhnM2qcYv7leqaD/SNl6OS /SWWKSk1CEyFGw/iRekl5DoEdmJRtqDuL0m1BC9bbTSAHzakyD9lVRVThfeIsLGuoFnp jDBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :dlp-reaction:dlp-version:dlp-product:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from; bh=inAyMYrCyiIbvf9tn5xuP8+EfNONXe1uxvMP2mJq25g=; b=SlIooErxmPC62mE+JpSQrfilC0cWZlFPV3/5CACnhq/Y8sCEC/tmP6Bp7+iwdwlLmI /2lmxYdfIrr2VOg3LZ22dYetgLlRUaYfZiaXydO+LTAWArhmrF63j6ukDhVSDfhkDBCS ATPK+RDTfMz5KoHKOU/0tYn71ZFkCim9FbGJjKYR38oAJsENLzISb81RG7ENItRHRjke BRQuR+3/8IX0bWsY8nz7Bk3G/nBo9fhBUwWBm2aKzm4ESPmrVbPhOS6wpeaJjw+WQhvK tGd5Ryu3jZPRQJCI2nDTFQiy3E42CvUVCL+xXWWGuURmiiRmwodUsNMnHwiK2rvgg4By uj+A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g4si1895985edb.41.2019.10.25.12.24.52; Fri, 25 Oct 2019 12:25:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405091AbfJYGkN convert rfc822-to-8bit (ORCPT + 99 others); Fri, 25 Oct 2019 02:40:13 -0400 Received: from mga11.intel.com ([192.55.52.93]:7617 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388287AbfJYGkM (ORCPT ); Fri, 25 Oct 2019 02:40:12 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 23:40:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,227,1569308400"; d="scan'208";a="228796143" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga002.fm.intel.com with ESMTP; 24 Oct 2019 23:40:12 -0700 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 23:40:11 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 24 Oct 2019 23:40:11 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.166]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.165]) with mapi id 14.03.0439.000; Fri, 25 Oct 2019 14:40:10 +0800 From: "Tian, Kevin" To: Jacob Pan , Lu Baolu CC: "iommu@lists.linux-foundation.org" , LKML , Joerg Roedel , "David Woodhouse" , Alex Williamson , Jean-Philippe Brucker , "Liu, Yi L" , "Raj, Ashok" , Christoph Hellwig , "Jonathan Cameron" , Eric Auger Subject: RE: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID Thread-Topic: [PATCH v7 03/11] iommu/vt-d: Add custom allocator for IOASID Thread-Index: AQHViqRVDFt/7gHf3E+EfuPtxXQ8nKdqHQYAgAAk/YCAAKNMUA== Date: Fri, 25 Oct 2019 06:40:09 +0000 Message-ID: References: <1571946904-86776-1-git-send-email-jacob.jun.pan@linux.intel.com> <1571946904-86776-4-git-send-email-jacob.jun.pan@linux.intel.com> <20191024214311.43d76a5c@jacob-builder> In-Reply-To: <20191024214311.43d76a5c@jacob-builder> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTEzODgyNTMtYmI3OS00ODYwLWIwMjctNWI3YzA3YWQ3MzhkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoibFYrRmhiMDV1RmtrSHU2eUE0elFTMlJmYUNRcVVkTjNVQ2hkVlNGWEt5ZnoyN0hKQ3g2RzJcL1ZPY093ZHhIMUoifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > From: Jacob Pan [mailto:jacob.jun.pan@linux.intel.com] > Sent: Friday, October 25, 2019 12:43 PM > > Hi Baolu, > > Thanks for the review. please see my comments inline. > > On Fri, 25 Oct 2019 10:30:48 +0800 > Lu Baolu wrote: > > > Hi Jacob, > > > > On 10/25/19 3:54 AM, Jacob Pan wrote: > > > When VT-d driver runs in the guest, PASID allocation must be > > > performed via virtual command interface. This patch registers a > > > custom IOASID allocator which takes precedence over the default > > > XArray based allocator. The resulting IOASID allocation will always > > > come from the host. This ensures that PASID namespace is system- > > > wide. > > > > > > Signed-off-by: Lu Baolu > > > Signed-off-by: Liu, Yi L > > > Signed-off-by: Jacob Pan > > > --- > > > drivers/iommu/Kconfig | 1 + > > > drivers/iommu/intel-iommu.c | 67 > > > +++++++++++++++++++++++++++++++++++++++++++++ > > > include/linux/intel-iommu.h | 2 ++ 3 files changed, 70 > > > insertions(+) > > > > > > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig > > > index fd50ddffffbf..961fe5795a90 100644 > > > --- a/drivers/iommu/Kconfig > > > +++ b/drivers/iommu/Kconfig > > > @@ -211,6 +211,7 @@ config INTEL_IOMMU_SVM > > > bool "Support for Shared Virtual Memory with Intel IOMMU" > > > depends on INTEL_IOMMU && X86 > > > select PCI_PASID > > > + select IOASID > > > select MMU_NOTIFIER > > > help > > > Shared Virtual Memory (SVM) provides a facility for > > > devices diff --git a/drivers/iommu/intel-iommu.c > > > b/drivers/iommu/intel-iommu.c index 3f974919d3bd..ced1d89ef977 > > > 100644 --- a/drivers/iommu/intel-iommu.c > > > +++ b/drivers/iommu/intel-iommu.c > > > @@ -1706,6 +1706,9 @@ static void free_dmar_iommu(struct > > > intel_iommu *iommu) if (ecap_prs(iommu->ecap)) > > > intel_svm_finish_prq(iommu); > > > } > > > + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) > > > + > > > ioasid_unregister_allocator(&iommu->pasid_allocator); > > > > Since scalable mode is disabled if pasid allocator failed to register, > > add sm_support(iommu) check here will be better. > > > I was thinking to be symmetric with register call, checking for the > same conditions. Also, I like your advice below to only disable SVA > instead of scalable mode. > > > + > > > #endif > > > } > > > > > > @@ -4910,6 +4913,44 @@ static int __init > > > probe_acpi_namespace_devices(void) return 0; > > > } > > > > > > +#ifdef CONFIG_INTEL_IOMMU_SVM > > > +static ioasid_t intel_ioasid_alloc(ioasid_t min, ioasid_t max, > > > void *data) +{ > > > + struct intel_iommu *iommu = data; > > > + ioasid_t ioasid; > > > + > > > + /* > > > + * VT-d virtual command interface always uses the full 20 > > > bit > > > + * PASID range. Host can partition guest PASID range based > > > on > > > + * policies but it is out of guest's control. > > > + */ > > > + if (min < PASID_MIN || max > intel_pasid_max_id) > > > + return INVALID_IOASID; > > > + > > > + if (vcmd_alloc_pasid(iommu, &ioasid)) > > > + return INVALID_IOASID; > > > + > > > + return ioasid; > > > +} > > > + > > > +static void intel_ioasid_free(ioasid_t ioasid, void *data) > > > +{ > > > + struct intel_iommu *iommu = data; > > > + > > > + if (!iommu) > > > + return; > > > + /* > > > + * Sanity check the ioasid owner is done at upper layer, > > > e.g. VFIO > > > + * We can only free the PASID when all the devices are > > > unbond. > > > + */ > > > + if (ioasid_find(NULL, ioasid, NULL)) { > > > + pr_alert("Cannot free active IOASID %d\n", ioasid); > > > + return; > > > + } > > > + vcmd_free_pasid(iommu, ioasid); > > > +} > > > +#endif > > > + > > > int __init intel_iommu_init(void) > > > { > > > int ret = -ENODEV; > > > @@ -5020,6 +5061,32 @@ int __init intel_iommu_init(void) > > > "%s", iommu->name); > > > iommu_device_set_ops(&iommu->iommu, > > > &intel_iommu_ops); iommu_device_register(&iommu->iommu); > > > +#ifdef CONFIG_INTEL_IOMMU_SVM > > > + if (ecap_vcs(iommu->ecap) && > > > vccap_pasid(iommu->vccap)) { > > > + pr_info("Register custom PASID > > > allocator\n"); > > > + /* > > > + * Register a custom ASID allocator if we > > > are running > > > + * in a guest, the purpose is to have a > > > system wide PASID > > > + * namespace among all PASID users. > > > + * There can be multiple vIOMMUs in each > > > guest but only > > > + * one allocator is active. All vIOMMU > > > allocators will > > > + * eventually be calling the same host > > > allocator. > > > + */ > > > + iommu->pasid_allocator.alloc = > > > intel_ioasid_alloc; > > > + iommu->pasid_allocator.free = > > > intel_ioasid_free; > > > + iommu->pasid_allocator.pdata = (void > > > *)iommu; > > > + ret = > > > ioasid_register_allocator(&iommu->pasid_allocator); > > > + if (ret) { > > > + pr_warn("Custom PASID allocator > > > registeration failed\n"); > > > + /* > > > + * Disable scalable mode on this > > > IOMMU if there > > > + * is no custom allocator. Mixing > > > SM capable vIOMMU > > > + * and non-SM vIOMMU are not > > > supported. > > > + */ > > > + intel_iommu_sm = 0; > > > > It's insufficient to disable scalable mode by only clearing > > intel_iommu_sm. The DMA_RTADDR_SMT bit in root entry has already > been > > set. Probably, you need to > > > > for each iommu > > clear DMA_RTADDR_SMT in root entry > > > > Alternatively, since vSVA is the only customer of this custom PASID > > allocator, is it possible to only disable SVA here? > > > Yeah, I think disable SVA is better. We can still do gIOVA in SM. I > guess we need to introduce a flag for sva_enabled. I'm not sure whether tying above logic to SVA is the right approach. If vcmd interface doesn't work, the whole SM mode doesn't make sense which is based on PASID-granular protection (SVA is only one usage atop). If the only remaining usage of SM is to map gIOVA using reserved PASID#0, then why not disabling SM and just fallback to legacy mode? Based on that I prefer to disabling the SM mode completely (better through an interface), and move the logic out of CONFIG_INTEL_ IOMMU_SVM > > > + } > > > + } > > > +#endif > > > } > > > > > > bus_set_iommu(&pci_bus_type, &intel_iommu_ops); > > > diff --git a/include/linux/intel-iommu.h > > > b/include/linux/intel-iommu.h index 1d4b8dcdc5d8..c624733cb2e6 > > > 100644 --- a/include/linux/intel-iommu.h > > > +++ b/include/linux/intel-iommu.h > > > @@ -19,6 +19,7 @@ > > > #include > > > #include > > > #include > > > +#include > > > > > > #include > > > #include > > > @@ -546,6 +547,7 @@ struct intel_iommu { > > > #ifdef CONFIG_INTEL_IOMMU_SVM > > > struct page_req_dsc *prq; > > > unsigned char prq_name[16]; /* Name for PRQ interrupt > > > */ > > > + struct ioasid_allocator_ops pasid_allocator; /* Custom > > > allocator for PASIDs */ #endif > > > struct q_inval *qi; /* Queued invalidation > > > info */ u32 *iommu_state; /* Store iommu states between suspend and > > > resume.*/ > > > > Best regards, > > baolu > > [Jacob Pan]