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.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 76ECCFA372C for ; Fri, 8 Nov 2019 11:30:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3DFB920869 for ; Fri, 8 Nov 2019 11:30:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XFwvW3vO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731963AbfKHLar (ORCPT ); Fri, 8 Nov 2019 06:30:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22478 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727591AbfKHLaq (ORCPT ); Fri, 8 Nov 2019 06:30:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573212644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0TXAidM7cQyun2sKAe+IfCYkeyFZgA7wy+fzvFWONM4=; b=XFwvW3vOCIfA6ryoWSX7WpD7PFaGz/6NYkGNQe00VtS5eoil4EBGQJwmcnVFcFfth9HYdB vksLsYfcxeXiNr6qB22soey1kiZvYPkFhb8XJ6aIroLlRuYcfxGZxoUf34cYonagqNA3pl ZuaRWYFsZNLyhkVGG1yJ4RuSBRc8CV4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-KuEhJzJtM1q8l2yDl9Laiw-1; Fri, 08 Nov 2019 06:30:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 486DD477; Fri, 8 Nov 2019 11:30:39 +0000 (UTC) Received: from [10.36.116.54] (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7314608B3; Fri, 8 Nov 2019 11:30:32 +0000 (UTC) Subject: Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID To: Jacob Pan , iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , Alex Williamson , Jean-Philippe Brucker Cc: Yi Liu , "Tian, Kevin" , Raj Ashok , Christoph Hellwig , Lu Baolu , Jonathan Cameron References: <1571946904-86776-1-git-send-email-jacob.jun.pan@linux.intel.com> <1571946904-86776-5-git-send-email-jacob.jun.pan@linux.intel.com> From: Auger Eric Message-ID: Date: Fri, 8 Nov 2019 12:30:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <1571946904-86776-5-git-send-email-jacob.jun.pan@linux.intel.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: KuEhJzJtM1q8l2yDl9Laiw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jacob, On 10/24/19 9:54 PM, Jacob Pan wrote: > Make use of generic IOASID code to manage PASID allocation, > free, and lookup. Replace Intel specific code. >=20 > Signed-off-by: Jacob Pan > --- > drivers/iommu/intel-iommu.c | 12 ++++++------ > drivers/iommu/intel-pasid.c | 36 ------------------------------------ > drivers/iommu/intel-svm.c | 39 +++++++++++++++++++++++---------------- > 3 files changed, 29 insertions(+), 58 deletions(-) >=20 > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index ced1d89ef977..2ea09b988a23 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_dom= ain *domain, > =09domain->auxd_refcnt--; > =20 > =09if (!domain->auxd_refcnt && domain->default_pasid > 0) > -=09=09intel_pasid_free_id(domain->default_pasid); > +=09=09ioasid_free(domain->default_pasid); > } > =20 > static int aux_domain_add_dev(struct dmar_domain *domain, > @@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain = *domain, > =09if (domain->default_pasid <=3D 0) { > =09=09int pasid; > =20 > -=09=09pasid =3D intel_pasid_alloc_id(domain, PASID_MIN, > -=09=09=09=09=09 pci_max_pasids(to_pci_dev(dev)), > -=09=09=09=09=09 GFP_KERNEL); > -=09=09if (pasid <=3D 0) { > +=09=09/* No private data needed for the default pasid */ > +=09=09pasid =3D ioasid_alloc(NULL, PASID_MIN, pci_max_pasids(to_pci_dev(= dev)) - 1, > +=09=09=09=09NULL); > +=09=09if (pasid =3D=3D INVALID_IOASID) { > =09=09=09pr_err("Can't allocate default pasid\n"); > =09=09=09return -ENODEV; > =09=09} > @@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *d= omain, > =09spin_unlock(&iommu->lock); > =09spin_unlock_irqrestore(&device_domain_lock, flags); > =09if (!domain->auxd_refcnt && domain->default_pasid > 0) > -=09=09intel_pasid_free_id(domain->default_pasid); > +=09=09ioasid_free(domain->default_pasid); > =20 > =09return ret; > } > diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel-pasid.c > index d81e857d2b25..e79d680fe300 100644 > --- a/drivers/iommu/intel-pasid.c > +++ b/drivers/iommu/intel-pasid.c > @@ -26,42 +26,6 @@ > */ > static DEFINE_SPINLOCK(pasid_lock); > u32 intel_pasid_max_id =3D PASID_MAX; > -static DEFINE_IDR(pasid_idr); > - > -int intel_pasid_alloc_id(void *ptr, int start, int end, gfp_t gfp) > -{ > -=09int ret, min, max; > - > -=09min =3D max_t(int, start, PASID_MIN); > -=09max =3D min_t(int, end, intel_pasid_max_id); > - > -=09WARN_ON(in_interrupt()); > -=09idr_preload(gfp); > -=09spin_lock(&pasid_lock); > -=09ret =3D idr_alloc(&pasid_idr, ptr, min, max, GFP_ATOMIC); > -=09spin_unlock(&pasid_lock); > -=09idr_preload_end(); > - > -=09return ret; > -} > - > -void intel_pasid_free_id(int pasid) > -{ > -=09spin_lock(&pasid_lock); > -=09idr_remove(&pasid_idr, pasid); > -=09spin_unlock(&pasid_lock); > -} > - > -void *intel_pasid_lookup_id(int pasid) > -{ > -=09void *p; > - > -=09spin_lock(&pasid_lock); > -=09p =3D idr_find(&pasid_idr, pasid); > -=09spin_unlock(&pasid_lock); > - > -=09return p; > -} > =20 > int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int *pasid) > { > diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c > index 9b159132405d..a9a7f85a09bc 100644 > --- a/drivers/iommu/intel-svm.c > +++ b/drivers/iommu/intel-svm.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > =20 > #include "intel-pasid.h" > @@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int *pasi= d, int flags, struct svm_dev_ > =09=09if (pasid_max > intel_pasid_max_id) > =09=09=09pasid_max =3D intel_pasid_max_id; > =20 > -=09=09/* Do not use PASID 0 in caching mode (virtualised IOMMU) */ > -=09=09ret =3D intel_pasid_alloc_id(svm, > -=09=09=09=09=09 !!cap_caching_mode(iommu->cap), > -=09=09=09=09=09 pasid_max - 1, GFP_KERNEL); > -=09=09if (ret < 0) { > +=09=09/* Do not use PASID 0, reserved for RID to PASID */ > +=09=09svm->pasid =3D ioasid_alloc(NULL, PASID_MIN, > +=09=09=09=09=09pasid_max - 1, svm); pasid_max -1 is inclusive. whereas max param in intel_pasid_alloc_id() is exclusive right? If you fixed an issue, you can mention it in the commit message. > +=09=09if (svm->pasid =3D=3D INVALID_IOASID) { > =09=09=09kfree(svm);> =09=09=09kfree(sdev); > +=09=09=09ret =3D ENOSPC; -ENOSPC. Nit: in 2/11 vcmd_alloc_pasid returned -ENOMEM > =09=09=09goto out; > =09=09} > -=09=09svm->pasid =3D ret; > =09=09svm->notifier.ops =3D &intel_mmuops; > =09=09svm->mm =3D mm; > =09=09svm->flags =3D flags; > @@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid,= int flags, struct svm_dev_ > =09=09if (mm) { > =09=09=09ret =3D mmu_notifier_register(&svm->notifier, mm); > =09=09=09if (ret) { > -=09=09=09=09intel_pasid_free_id(svm->pasid); > +=09=09=09=09ioasid_free(svm->pasid); > =09=09=09=09kfree(svm); > =09=09=09=09kfree(sdev); > =09=09=09=09goto out; > @@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid,= int flags, struct svm_dev_ > =09=09if (ret) { > =09=09=09if (mm) > =09=09=09=09mmu_notifier_unregister(&svm->notifier, mm); > -=09=09=09intel_pasid_free_id(svm->pasid); > +=09=09=09ioasid_free(svm->pasid); > =09=09=09kfree(svm); > =09=09=09kfree(sdev); > =09=09=09goto out; > @@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasi= d) > =09if (!iommu) > =09=09goto out; > =20 > -=09svm =3D intel_pasid_lookup_id(pasid); > +=09svm =3D ioasid_find(NULL, pasid, NULL); > +=09if (IS_ERR(svm)) { > +=09=09ret =3D PTR_ERR(svm); > +=09=09goto out; > +=09} > + > =09if (!svm) > =09=09goto out; > =20 > @@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid= ) > =09=09=09=09kfree_rcu(sdev, rcu); > =20 > =09=09=09=09if (list_empty(&svm->devs)) { > -=09=09=09=09=09intel_pasid_free_id(svm->pasid); > +=09=09=09=09=09/* Clear private data so that free pass check */> +=09=09= =09=09=09ioasid_set_data(svm->pasid, NULL); I don't get the above comment. Why is it needed? > +=09=09=09=09=09ioasid_free(svm->pasid); > =09=09=09=09=09if (svm->mm) > =09=09=09=09=09=09mmu_notifier_unregister(&svm->notifier, svm->mm); > =20 > @@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, in= t pasid) > =09if (!iommu) > =09=09goto out; > =20 > -=09svm =3D intel_pasid_lookup_id(pasid); > -=09if (!svm) > +=09svm =3D ioasid_find(NULL, pasid, NULL); > +=09if (IS_ERR(svm)) { > +=09=09ret =3D PTR_ERR(svm); > =09=09goto out; > - > +=09} > =09/* init_mm is used in this case */ > =09if (!svm->mm) > =09=09ret =3D 1; > @@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *= d) > =20 > =09=09if (!svm || svm->pasid !=3D req->pasid) { > =09=09=09rcu_read_lock(); > -=09=09=09svm =3D intel_pasid_lookup_id(req->pasid); > +=09=09=09svm =3D ioasid_find(NULL, req->pasid, NULL); > =09=09=09/* It *can't* go away, because the driver is not permitted > =09=09=09 * to unbind the mm while any page faults are outstanding. > =09=09=09 * So we only need RCU to protect the internal idr code. */ > =09=09=09rcu_read_unlock(); > - > -=09=09=09if (!svm) { > +=09=09=09if (IS_ERR(svm) || !svm) { > =09=09=09=09pr_err("%s: Page request for invalid PASID %d: %08llx %08llx= \n", > =09=09=09=09 iommu->name, req->pasid, ((unsigned long long *)req)[= 0], > =09=09=09=09 ((unsigned long long *)req)[1]); >=20 Thanks Eric 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.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 ABF13FC6194 for ; Fri, 8 Nov 2019 11:32:08 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (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 7841120869 for ; Fri, 8 Nov 2019 11:32:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XFwvW3vO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7841120869 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 5A48A1417; Fri, 8 Nov 2019 11:30:48 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 1E5A01416 for ; Fri, 8 Nov 2019 11:30:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 0AC4DEC for ; Fri, 8 Nov 2019 11:30:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573212644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0TXAidM7cQyun2sKAe+IfCYkeyFZgA7wy+fzvFWONM4=; b=XFwvW3vOCIfA6ryoWSX7WpD7PFaGz/6NYkGNQe00VtS5eoil4EBGQJwmcnVFcFfth9HYdB vksLsYfcxeXiNr6qB22soey1kiZvYPkFhb8XJ6aIroLlRuYcfxGZxoUf34cYonagqNA3pl ZuaRWYFsZNLyhkVGG1yJ4RuSBRc8CV4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-KuEhJzJtM1q8l2yDl9Laiw-1; Fri, 08 Nov 2019 06:30:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 486DD477; Fri, 8 Nov 2019 11:30:39 +0000 (UTC) Received: from [10.36.116.54] (ovpn-116-54.ams2.redhat.com [10.36.116.54]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C7314608B3; Fri, 8 Nov 2019 11:30:32 +0000 (UTC) Subject: Re: [PATCH v7 04/11] iommu/vt-d: Replace Intel specific PASID allocator with IOASID To: Jacob Pan , iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , Alex Williamson , Jean-Philippe Brucker References: <1571946904-86776-1-git-send-email-jacob.jun.pan@linux.intel.com> <1571946904-86776-5-git-send-email-jacob.jun.pan@linux.intel.com> From: Auger Eric Message-ID: Date: Fri, 8 Nov 2019 12:30:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <1571946904-86776-5-git-send-email-jacob.jun.pan@linux.intel.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: KuEhJzJtM1q8l2yDl9Laiw-1 X-Mimecast-Spam-Score: 0 Cc: "Tian, Kevin" , Raj Ashok , Jonathan Cameron X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 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 Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Hi Jacob, On 10/24/19 9:54 PM, Jacob Pan wrote: > Make use of generic IOASID code to manage PASID allocation, > free, and lookup. Replace Intel specific code. > > Signed-off-by: Jacob Pan > --- > drivers/iommu/intel-iommu.c | 12 ++++++------ > drivers/iommu/intel-pasid.c | 36 ------------------------------------ > drivers/iommu/intel-svm.c | 39 +++++++++++++++++++++++---------------- > 3 files changed, 29 insertions(+), 58 deletions(-) > > diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c > index ced1d89ef977..2ea09b988a23 100644 > --- a/drivers/iommu/intel-iommu.c > +++ b/drivers/iommu/intel-iommu.c > @@ -5311,7 +5311,7 @@ static void auxiliary_unlink_device(struct dmar_domain *domain, > domain->auxd_refcnt--; > > if (!domain->auxd_refcnt && domain->default_pasid > 0) > - intel_pasid_free_id(domain->default_pasid); > + ioasid_free(domain->default_pasid); > } > > static int aux_domain_add_dev(struct dmar_domain *domain, > @@ -5329,10 +5329,10 @@ static int aux_domain_add_dev(struct dmar_domain *domain, > if (domain->default_pasid <= 0) { > int pasid; > > - pasid = intel_pasid_alloc_id(domain, PASID_MIN, > - pci_max_pasids(to_pci_dev(dev)), > - GFP_KERNEL); > - if (pasid <= 0) { > + /* No private data needed for the default pasid */ > + pasid = ioasid_alloc(NULL, PASID_MIN, pci_max_pasids(to_pci_dev(dev)) - 1, > + NULL); > + if (pasid == INVALID_IOASID) { > pr_err("Can't allocate default pasid\n"); > return -ENODEV; > } > @@ -5368,7 +5368,7 @@ static int aux_domain_add_dev(struct dmar_domain *domain, > spin_unlock(&iommu->lock); > spin_unlock_irqrestore(&device_domain_lock, flags); > if (!domain->auxd_refcnt && domain->default_pasid > 0) > - intel_pasid_free_id(domain->default_pasid); > + ioasid_free(domain->default_pasid); > > return ret; > } > diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel-pasid.c > index d81e857d2b25..e79d680fe300 100644 > --- a/drivers/iommu/intel-pasid.c > +++ b/drivers/iommu/intel-pasid.c > @@ -26,42 +26,6 @@ > */ > static DEFINE_SPINLOCK(pasid_lock); > u32 intel_pasid_max_id = PASID_MAX; > -static DEFINE_IDR(pasid_idr); > - > -int intel_pasid_alloc_id(void *ptr, int start, int end, gfp_t gfp) > -{ > - int ret, min, max; > - > - min = max_t(int, start, PASID_MIN); > - max = min_t(int, end, intel_pasid_max_id); > - > - WARN_ON(in_interrupt()); > - idr_preload(gfp); > - spin_lock(&pasid_lock); > - ret = idr_alloc(&pasid_idr, ptr, min, max, GFP_ATOMIC); > - spin_unlock(&pasid_lock); > - idr_preload_end(); > - > - return ret; > -} > - > -void intel_pasid_free_id(int pasid) > -{ > - spin_lock(&pasid_lock); > - idr_remove(&pasid_idr, pasid); > - spin_unlock(&pasid_lock); > -} > - > -void *intel_pasid_lookup_id(int pasid) > -{ > - void *p; > - > - spin_lock(&pasid_lock); > - p = idr_find(&pasid_idr, pasid); > - spin_unlock(&pasid_lock); > - > - return p; > -} > > int vcmd_alloc_pasid(struct intel_iommu *iommu, unsigned int *pasid) > { > diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c > index 9b159132405d..a9a7f85a09bc 100644 > --- a/drivers/iommu/intel-svm.c > +++ b/drivers/iommu/intel-svm.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > > #include "intel-pasid.h" > @@ -318,16 +319,15 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ > if (pasid_max > intel_pasid_max_id) > pasid_max = intel_pasid_max_id; > > - /* Do not use PASID 0 in caching mode (virtualised IOMMU) */ > - ret = intel_pasid_alloc_id(svm, > - !!cap_caching_mode(iommu->cap), > - pasid_max - 1, GFP_KERNEL); > - if (ret < 0) { > + /* Do not use PASID 0, reserved for RID to PASID */ > + svm->pasid = ioasid_alloc(NULL, PASID_MIN, > + pasid_max - 1, svm); pasid_max -1 is inclusive. whereas max param in intel_pasid_alloc_id() is exclusive right? If you fixed an issue, you can mention it in the commit message. > + if (svm->pasid == INVALID_IOASID) { > kfree(svm);> kfree(sdev); > + ret = ENOSPC; -ENOSPC. Nit: in 2/11 vcmd_alloc_pasid returned -ENOMEM > goto out; > } > - svm->pasid = ret; > svm->notifier.ops = &intel_mmuops; > svm->mm = mm; > svm->flags = flags; > @@ -337,7 +337,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ > if (mm) { > ret = mmu_notifier_register(&svm->notifier, mm); > if (ret) { > - intel_pasid_free_id(svm->pasid); > + ioasid_free(svm->pasid); > kfree(svm); > kfree(sdev); > goto out; > @@ -353,7 +353,7 @@ int intel_svm_bind_mm(struct device *dev, int *pasid, int flags, struct svm_dev_ > if (ret) { > if (mm) > mmu_notifier_unregister(&svm->notifier, mm); > - intel_pasid_free_id(svm->pasid); > + ioasid_free(svm->pasid); > kfree(svm); > kfree(sdev); > goto out; > @@ -401,7 +401,12 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) > if (!iommu) > goto out; > > - svm = intel_pasid_lookup_id(pasid); > + svm = ioasid_find(NULL, pasid, NULL); > + if (IS_ERR(svm)) { > + ret = PTR_ERR(svm); > + goto out; > + } > + > if (!svm) > goto out; > > @@ -423,7 +428,9 @@ int intel_svm_unbind_mm(struct device *dev, int pasid) > kfree_rcu(sdev, rcu); > > if (list_empty(&svm->devs)) { > - intel_pasid_free_id(svm->pasid); > + /* Clear private data so that free pass check */> + ioasid_set_data(svm->pasid, NULL); I don't get the above comment. Why is it needed? > + ioasid_free(svm->pasid); > if (svm->mm) > mmu_notifier_unregister(&svm->notifier, svm->mm); > > @@ -458,10 +465,11 @@ int intel_svm_is_pasid_valid(struct device *dev, int pasid) > if (!iommu) > goto out; > > - svm = intel_pasid_lookup_id(pasid); > - if (!svm) > + svm = ioasid_find(NULL, pasid, NULL); > + if (IS_ERR(svm)) { > + ret = PTR_ERR(svm); > goto out; > - > + } > /* init_mm is used in this case */ > if (!svm->mm) > ret = 1; > @@ -568,13 +576,12 @@ static irqreturn_t prq_event_thread(int irq, void *d) > > if (!svm || svm->pasid != req->pasid) { > rcu_read_lock(); > - svm = intel_pasid_lookup_id(req->pasid); > + svm = ioasid_find(NULL, req->pasid, NULL); > /* It *can't* go away, because the driver is not permitted > * to unbind the mm while any page faults are outstanding. > * So we only need RCU to protect the internal idr code. */ > rcu_read_unlock(); > - > - if (!svm) { > + if (IS_ERR(svm) || !svm) { > pr_err("%s: Page request for invalid PASID %d: %08llx %08llx\n", > iommu->name, req->pasid, ((unsigned long long *)req)[0], > ((unsigned long long *)req)[1]); > Thanks Eric _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu