From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5251C282DD for ; Thu, 9 Jan 2020 22:01:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF12A2075D for ; Thu, 9 Jan 2020 22:01:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729245AbgAIWB1 (ORCPT ); Thu, 9 Jan 2020 17:01:27 -0500 Received: from mga18.intel.com ([134.134.136.126]:65401 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729194AbgAIWB0 (ORCPT ); Thu, 9 Jan 2020 17:01:26 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2020 14:01:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,414,1571727600"; d="scan'208";a="371424636" Received: from jacob-builder.jf.intel.com (HELO jacob-builder) ([10.7.199.155]) by orsmga004.jf.intel.com with ESMTP; 09 Jan 2020 14:01:25 -0800 Date: Thu, 9 Jan 2020 14:06:29 -0800 From: Jacob Pan To: Lu Baolu Cc: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , "Tian, Kevin" , Raj Ashok , Yi Liu , Eric Auger , jacob.jun.pan@linux.intel.com Subject: Re: [PATCH v8 08/10] iommu/vt-d: Add custom allocator for IOASID Message-ID: <20200109140629.0e15c3f3@jacob-builder> In-Reply-To: <9c9c818c-ccb1-544d-2041-cf7017c4d898@linux.intel.com> References: <1576524252-79116-1-git-send-email-jacob.jun.pan@linux.intel.com> <1576524252-79116-9-git-send-email-jacob.jun.pan@linux.intel.com> <9c9c818c-ccb1-544d-2041-cf7017c4d898@linux.intel.com> Organization: OTC X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 18 Dec 2019 12:10:55 +0800 Lu Baolu wrote: > Hi, > > On 12/17/19 3:24 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/intel-iommu.c | 75 > > +++++++++++++++++++++++++++++++++++++++++++++ > > include/linux/intel-iommu.h | 2 ++ 2 files changed, 77 > > insertions(+) > > > > diff --git a/drivers/iommu/intel-iommu.c > > b/drivers/iommu/intel-iommu.c index e90102c7540d..b0c0bb6f740e > > 100644 --- a/drivers/iommu/intel-iommu.c > > +++ b/drivers/iommu/intel-iommu.c > > @@ -1700,6 +1700,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); + > > #endif > > } > > > > @@ -3181,6 +3184,75 @@ static int copy_translation_tables(struct > > intel_iommu *iommu) return ret; > > } > > > > +#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; > > + > > Check !iommu just like the free api? > sounds good, will return INVALID_IOASID if NULL. > > + /* > > + * 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 > > unbound. > > + */ > > + if (ioasid_find(NULL, ioasid, NULL)) { > > + pr_alert("Cannot free active IOASID %d\n", ioasid); > > + return; > > + } > > + vcmd_free_pasid(iommu, ioasid); > > +} > > + > > +static void register_pasid_allocator(struct intel_iommu *iommu) > > +{ > > + if (!intel_iommu_sm) { > > Use sm_supported(iommu) instead. > sounds good, seems we could separate the sm code more cleanly in the future to avoid all these checks. > > + pr_warn("VT-d scalable mode not enabled\n"); > > + return; > > + } > > + > > + /* > > + * Register a custom PASID allocator if we are running in > > a guest, > > + * guest PASID must be obtained via virtual command > > interface. > > + * 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. > > + */ > > + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) { > > + pr_info("Register custom PASID allocator\n"); > > + iommu->pasid_allocator.alloc = intel_ioasid_alloc; > > + iommu->pasid_allocator.free = intel_ioasid_free; > > + iommu->pasid_allocator.pdata = (void *)iommu; > > + if > > (!ioasid_register_allocator(&iommu->pasid_allocator)) { > > + pr_warn("Custom PASID allocator failed, > > scalable mode disabled\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; > > + } > > + } > > +} > > +#endif > > + > > static int __init init_dmars(void) > > { > > struct dmar_drhd_unit *drhd; > > @@ -3298,6 +3370,9 @@ static int __init init_dmars(void) > > */ > > for_each_active_iommu(iommu, drhd) { > > iommu_flush_write_buffer(iommu); > > +#ifdef CONFIG_INTEL_IOMMU_SVM > > + register_pasid_allocator(iommu); > > +#endif > > iommu_set_root_entry(iommu); > > iommu->flush.flush_context(iommu, 0, 0, 0, > > DMA_CCMD_GLOBAL_INVL); iommu->flush.flush_iotlb(iommu, 0, 0, 0, > > DMA_TLB_GLOBAL_FLUSH); diff --git a/include/linux/intel-iommu.h > > b/include/linux/intel-iommu.h index 1e11560b0e59..8c30b23bd838 > > 100644 --- a/include/linux/intel-iommu.h > > +++ b/include/linux/intel-iommu.h > > @@ -19,6 +19,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > #include > > @@ -557,6 +558,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] From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8BCDC33CA3 for ; Thu, 9 Jan 2020 22:01:31 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 353BE20838 for ; Thu, 9 Jan 2020 22:01:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 353BE20838 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E6B5E8841A; Thu, 9 Jan 2020 22:01:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7H53FqxHbUIF; Thu, 9 Jan 2020 22:01:29 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id A5E8D88026; Thu, 9 Jan 2020 22:01:29 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 79099C1796; Thu, 9 Jan 2020 22:01:29 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id B6B30C0881 for ; Thu, 9 Jan 2020 22:01:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AD41B86E59 for ; Thu, 9 Jan 2020 22:01:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fXGH9kztB5p1 for ; Thu, 9 Jan 2020 22:01:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8F5E786E0A for ; Thu, 9 Jan 2020 22:01:26 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2020 14:01:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,414,1571727600"; d="scan'208";a="371424636" Received: from jacob-builder.jf.intel.com (HELO jacob-builder) ([10.7.199.155]) by orsmga004.jf.intel.com with ESMTP; 09 Jan 2020 14:01:25 -0800 Date: Thu, 9 Jan 2020 14:06:29 -0800 From: Jacob Pan To: Lu Baolu Subject: Re: [PATCH v8 08/10] iommu/vt-d: Add custom allocator for IOASID Message-ID: <20200109140629.0e15c3f3@jacob-builder> In-Reply-To: <9c9c818c-ccb1-544d-2041-cf7017c4d898@linux.intel.com> References: <1576524252-79116-1-git-send-email-jacob.jun.pan@linux.intel.com> <1576524252-79116-9-git-send-email-jacob.jun.pan@linux.intel.com> <9c9c818c-ccb1-544d-2041-cf7017c4d898@linux.intel.com> Organization: OTC X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Cc: "Tian, Kevin" , Raj Ashok , LKML , iommu@lists.linux-foundation.org, David Woodhouse X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Wed, 18 Dec 2019 12:10:55 +0800 Lu Baolu wrote: > Hi, > > On 12/17/19 3:24 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/intel-iommu.c | 75 > > +++++++++++++++++++++++++++++++++++++++++++++ > > include/linux/intel-iommu.h | 2 ++ 2 files changed, 77 > > insertions(+) > > > > diff --git a/drivers/iommu/intel-iommu.c > > b/drivers/iommu/intel-iommu.c index e90102c7540d..b0c0bb6f740e > > 100644 --- a/drivers/iommu/intel-iommu.c > > +++ b/drivers/iommu/intel-iommu.c > > @@ -1700,6 +1700,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); + > > #endif > > } > > > > @@ -3181,6 +3184,75 @@ static int copy_translation_tables(struct > > intel_iommu *iommu) return ret; > > } > > > > +#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; > > + > > Check !iommu just like the free api? > sounds good, will return INVALID_IOASID if NULL. > > + /* > > + * 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 > > unbound. > > + */ > > + if (ioasid_find(NULL, ioasid, NULL)) { > > + pr_alert("Cannot free active IOASID %d\n", ioasid); > > + return; > > + } > > + vcmd_free_pasid(iommu, ioasid); > > +} > > + > > +static void register_pasid_allocator(struct intel_iommu *iommu) > > +{ > > + if (!intel_iommu_sm) { > > Use sm_supported(iommu) instead. > sounds good, seems we could separate the sm code more cleanly in the future to avoid all these checks. > > + pr_warn("VT-d scalable mode not enabled\n"); > > + return; > > + } > > + > > + /* > > + * Register a custom PASID allocator if we are running in > > a guest, > > + * guest PASID must be obtained via virtual command > > interface. > > + * 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. > > + */ > > + if (ecap_vcs(iommu->ecap) && vccap_pasid(iommu->vccap)) { > > + pr_info("Register custom PASID allocator\n"); > > + iommu->pasid_allocator.alloc = intel_ioasid_alloc; > > + iommu->pasid_allocator.free = intel_ioasid_free; > > + iommu->pasid_allocator.pdata = (void *)iommu; > > + if > > (!ioasid_register_allocator(&iommu->pasid_allocator)) { > > + pr_warn("Custom PASID allocator failed, > > scalable mode disabled\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; > > + } > > + } > > +} > > +#endif > > + > > static int __init init_dmars(void) > > { > > struct dmar_drhd_unit *drhd; > > @@ -3298,6 +3370,9 @@ static int __init init_dmars(void) > > */ > > for_each_active_iommu(iommu, drhd) { > > iommu_flush_write_buffer(iommu); > > +#ifdef CONFIG_INTEL_IOMMU_SVM > > + register_pasid_allocator(iommu); > > +#endif > > iommu_set_root_entry(iommu); > > iommu->flush.flush_context(iommu, 0, 0, 0, > > DMA_CCMD_GLOBAL_INVL); iommu->flush.flush_iotlb(iommu, 0, 0, 0, > > DMA_TLB_GLOBAL_FLUSH); diff --git a/include/linux/intel-iommu.h > > b/include/linux/intel-iommu.h index 1e11560b0e59..8c30b23bd838 > > 100644 --- a/include/linux/intel-iommu.h > > +++ b/include/linux/intel-iommu.h > > @@ -19,6 +19,7 @@ > > #include > > #include > > #include > > +#include > > > > #include > > #include > > @@ -557,6 +558,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] _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu