From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754734AbeEAJYa convert rfc822-to-8bit (ORCPT ); Tue, 1 May 2018 05:24:30 -0400 Received: from mga12.intel.com ([192.55.52.136]:12510 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754052AbeEAJY1 (ORCPT ); Tue, 1 May 2018 05:24:27 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,350,1520924400"; d="scan'208";a="55010537" From: "Liu, Yi L" To: Lu Baolu , David Woodhouse , Joerg Roedel CC: "Raj, Ashok" , "Kumar, Sanjay K" , "Pan, Jacob jun" , "Tian, Kevin" , "Sun, Yi Y" , "iommu@lists.linux-foundation.org" , "linux-kernel@vger.kernel.org" , Jacob Pan Subject: RE: [PATCH 9/9] iommu/vt-d: Clean up PASID talbe management for SVM Thread-Topic: [PATCH 9/9] iommu/vt-d: Clean up PASID talbe management for SVM Thread-Index: AQHT1fnzYklKHUBAl0+19jGtNryDR6QaqCLg Date: Tue, 1 May 2018 09:24:24 +0000 Message-ID: References: <1523934202-21669-1-git-send-email-baolu.lu@linux.intel.com> <1523934202-21669-10-git-send-email-baolu.lu@linux.intel.com> In-Reply-To: <1523934202-21669-10-git-send-email-baolu.lu@linux.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiY2Q5NDMxYWItYTk1Ni00Nzk1LTgxYmYtMjc4ZTVjYzZkZTRjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjIuNS4xOCIsIlRydXN0ZWRMYWJlbEhhc2giOiJvRXlzaitzU1BuNFlObTIzRXlJOVROZExxRENSdjVUTnUyNEFQbHIyUkViT09EZE1rYkVWUWlvUndHM3FxK3VkIn0= 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > From: Lu Baolu [mailto:baolu.lu@linux.intel.com] > Sent: Tuesday, April 17, 2018 11:03 AM > > The previous per iommu pasid table alloc/free interfaces > are no longer used. Clean up the driver by removing it. I think this patch major cleans intel_svm_alloc_pasid_tables and intel_svm_free_pasid_tables. Actually, only PASID State table allocation is remained in these two functions. Since PASID Table is modified to be per-iommu domain. How about the PASID State Table? Should it also be per-iommu domain? Thanks, Yi Liu > Cc: Ashok Raj > Cc: Jacob Pan > Cc: Kevin Tian > Cc: Liu Yi L > Signed-off-by: Lu Baolu > --- > drivers/iommu/intel-iommu.c | 6 +++--- > drivers/iommu/intel-svm.c | 17 ++--------------- > include/linux/intel-iommu.h | 5 ++--- > 3 files changed, 7 insertions(+), 21 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index 5fe7f91..5acb90d 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -1736,7 +1736,7 @@ static void free_dmar_iommu(struct intel_iommu *iommu) > if (pasid_enabled(iommu)) { > if (ecap_prs(iommu->ecap)) > intel_svm_finish_prq(iommu); > - intel_svm_free_pasid_tables(iommu); > + intel_svm_exit(iommu); > } > #endif > } > @@ -3291,7 +3291,7 @@ static int __init init_dmars(void) > hw_pass_through = 0; > #ifdef CONFIG_INTEL_IOMMU_SVM > if (pasid_enabled(iommu)) > - intel_svm_alloc_pasid_tables(iommu); > + intel_svm_init(iommu); > #endif > } > > @@ -4268,7 +4268,7 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru) > > #ifdef CONFIG_INTEL_IOMMU_SVM > if (pasid_enabled(iommu)) > - intel_svm_alloc_pasid_tables(iommu); > + intel_svm_init(iommu); > #endif > > if (dmaru->ignored) { > diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c > index 3b14819..38cae65 100644 > --- a/drivers/iommu/intel-svm.c > +++ b/drivers/iommu/intel-svm.c > @@ -34,7 +34,7 @@ > > static irqreturn_t prq_event_thread(int irq, void *d); > > -int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu) > +int intel_svm_init(struct intel_iommu *iommu) > { > struct page *pages; > int order; > @@ -59,15 +59,6 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu) > iommu->pasid_max = 0x20000; > > order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max); > - pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); > - if (!pages) { > - pr_warn("IOMMU: %s: Failed to allocate PASID table\n", > - iommu->name); > - return -ENOMEM; > - } > - iommu->pasid_table = page_address(pages); > - pr_info("%s: Allocated order %d PASID table.\n", iommu->name, order); > - > if (ecap_dis(iommu->ecap)) { > /* Just making it explicit... */ > BUILD_BUG_ON(sizeof(struct pasid_entry) != sizeof(struct > pasid_state_entry)); > @@ -82,14 +73,10 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu > *iommu) > return 0; > } > > -int intel_svm_free_pasid_tables(struct intel_iommu *iommu) > +int intel_svm_exit(struct intel_iommu *iommu) > { > int order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max); > > - if (iommu->pasid_table) { > - free_pages((unsigned long)iommu->pasid_table, order); > - iommu->pasid_table = NULL; > - } > if (iommu->pasid_state_table) { > free_pages((unsigned long)iommu->pasid_state_table, order); > iommu->pasid_state_table = NULL; > diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h > index 08e5811..44c7613 100644 > --- a/include/linux/intel-iommu.h > +++ b/include/linux/intel-iommu.h > @@ -470,7 +470,6 @@ struct intel_iommu { > * devices away to userspace processes (e.g. for DPDK) and don't > * want to trust that userspace will use *only* the PASID it was > * told to. But while it's all driver-arbitrated, we're fine. */ > - struct pasid_entry *pasid_table; > struct pasid_state_entry *pasid_state_table; > struct page_req_dsc *prq; > unsigned char prq_name[16]; /* Name for PRQ interrupt */ > @@ -539,8 +538,8 @@ void free_pgtable_page(void *vaddr); > struct intel_iommu *domain_get_iommu(struct dmar_domain *domain); > > #ifdef CONFIG_INTEL_IOMMU_SVM > -extern int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu); > -extern int intel_svm_free_pasid_tables(struct intel_iommu *iommu); > +int intel_svm_init(struct intel_iommu *iommu); > +int intel_svm_exit(struct intel_iommu *iommu); > extern int intel_svm_enable_prq(struct intel_iommu *iommu); > extern int intel_svm_finish_prq(struct intel_iommu *iommu); > > -- > 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Liu, Yi L" Subject: RE: [PATCH 9/9] iommu/vt-d: Clean up PASID talbe management for SVM Date: Tue, 1 May 2018 09:24:24 +0000 Message-ID: References: <1523934202-21669-1-git-send-email-baolu.lu@linux.intel.com> <1523934202-21669-10-git-send-email-baolu.lu@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1523934202-21669-10-git-send-email-baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Lu Baolu , David Woodhouse , Joerg Roedel Cc: "Raj, Ashok" , "Kumar, Sanjay K" , "iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "Sun, Yi Y" , "Pan, Jacob jun" List-Id: iommu@lists.linux-foundation.org > From: Lu Baolu [mailto:baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org] > Sent: Tuesday, April 17, 2018 11:03 AM > > The previous per iommu pasid table alloc/free interfaces > are no longer used. Clean up the driver by removing it. I think this patch major cleans intel_svm_alloc_pasid_tables and intel_svm_free_pasid_tables. Actually, only PASID State table allocation is remained in these two functions. Since PASID Table is modified to be per-iommu domain. How about the PASID State Table? Should it also be per-iommu domain? Thanks, Yi Liu > Cc: Ashok Raj > Cc: Jacob Pan > Cc: Kevin Tian > Cc: Liu Yi L > Signed-off-by: Lu Baolu > --- > drivers/iommu/intel-iommu.c | 6 +++--- > drivers/iommu/intel-svm.c | 17 ++--------------- > include/linux/intel-iommu.h | 5 ++--- > 3 files changed, 7 insertions(+), 21 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index 5fe7f91..5acb90d 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -1736,7 +1736,7 @@ static void free_dmar_iommu(struct intel_iommu *iommu) > if (pasid_enabled(iommu)) { > if (ecap_prs(iommu->ecap)) > intel_svm_finish_prq(iommu); > - intel_svm_free_pasid_tables(iommu); > + intel_svm_exit(iommu); > } > #endif > } > @@ -3291,7 +3291,7 @@ static int __init init_dmars(void) > hw_pass_through = 0; > #ifdef CONFIG_INTEL_IOMMU_SVM > if (pasid_enabled(iommu)) > - intel_svm_alloc_pasid_tables(iommu); > + intel_svm_init(iommu); > #endif > } > > @@ -4268,7 +4268,7 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru) > > #ifdef CONFIG_INTEL_IOMMU_SVM > if (pasid_enabled(iommu)) > - intel_svm_alloc_pasid_tables(iommu); > + intel_svm_init(iommu); > #endif > > if (dmaru->ignored) { > diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c > index 3b14819..38cae65 100644 > --- a/drivers/iommu/intel-svm.c > +++ b/drivers/iommu/intel-svm.c > @@ -34,7 +34,7 @@ > > static irqreturn_t prq_event_thread(int irq, void *d); > > -int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu) > +int intel_svm_init(struct intel_iommu *iommu) > { > struct page *pages; > int order; > @@ -59,15 +59,6 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu) > iommu->pasid_max = 0x20000; > > order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max); > - pages = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); > - if (!pages) { > - pr_warn("IOMMU: %s: Failed to allocate PASID table\n", > - iommu->name); > - return -ENOMEM; > - } > - iommu->pasid_table = page_address(pages); > - pr_info("%s: Allocated order %d PASID table.\n", iommu->name, order); > - > if (ecap_dis(iommu->ecap)) { > /* Just making it explicit... */ > BUILD_BUG_ON(sizeof(struct pasid_entry) != sizeof(struct > pasid_state_entry)); > @@ -82,14 +73,10 @@ int intel_svm_alloc_pasid_tables(struct intel_iommu > *iommu) > return 0; > } > > -int intel_svm_free_pasid_tables(struct intel_iommu *iommu) > +int intel_svm_exit(struct intel_iommu *iommu) > { > int order = get_order(sizeof(struct pasid_entry) * iommu->pasid_max); > > - if (iommu->pasid_table) { > - free_pages((unsigned long)iommu->pasid_table, order); > - iommu->pasid_table = NULL; > - } > if (iommu->pasid_state_table) { > free_pages((unsigned long)iommu->pasid_state_table, order); > iommu->pasid_state_table = NULL; > diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h > index 08e5811..44c7613 100644 > --- a/include/linux/intel-iommu.h > +++ b/include/linux/intel-iommu.h > @@ -470,7 +470,6 @@ struct intel_iommu { > * devices away to userspace processes (e.g. for DPDK) and don't > * want to trust that userspace will use *only* the PASID it was > * told to. But while it's all driver-arbitrated, we're fine. */ > - struct pasid_entry *pasid_table; > struct pasid_state_entry *pasid_state_table; > struct page_req_dsc *prq; > unsigned char prq_name[16]; /* Name for PRQ interrupt */ > @@ -539,8 +538,8 @@ void free_pgtable_page(void *vaddr); > struct intel_iommu *domain_get_iommu(struct dmar_domain *domain); > > #ifdef CONFIG_INTEL_IOMMU_SVM > -extern int intel_svm_alloc_pasid_tables(struct intel_iommu *iommu); > -extern int intel_svm_free_pasid_tables(struct intel_iommu *iommu); > +int intel_svm_init(struct intel_iommu *iommu); > +int intel_svm_exit(struct intel_iommu *iommu); > extern int intel_svm_enable_prq(struct intel_iommu *iommu); > extern int intel_svm_finish_prq(struct intel_iommu *iommu); > > -- > 2.7.4