From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 406XVF5gPxzF1yy for ; Fri, 23 Mar 2018 03:40:53 +1100 (AEDT) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w2MGdr5k114445 for ; Thu, 22 Mar 2018 12:40:51 -0400 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gvf88u942-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Thu, 22 Mar 2018 12:40:50 -0400 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Mar 2018 16:40:48 -0000 Subject: Re: [PATCH v2 12/38] cxlflash: Use IDR to manage adapter contexts To: Uma Krishnan , linux-scsi@vger.kernel.org, James Bottomley , "Martin K. Petersen" , "Matthew R. Ochs" , "Manoj N. Kumar" Cc: linuxppc-dev@lists.ozlabs.org, Andrew Donnellan , Christophe Lombard References: <1519683513-16731-1-git-send-email-ukrishn@linux.vnet.ibm.com> <1519683712-17186-1-git-send-email-ukrishn@linux.vnet.ibm.com> From: Frederic Barrat Date: Thu, 22 Mar 2018 17:40:44 +0100 MIME-Version: 1.0 In-Reply-To: <1519683712-17186-1-git-send-email-ukrishn@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Message-Id: List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Le 26/02/2018 à 23:21, Uma Krishnan a écrit : > A range of PASIDs are used as identifiers for the adapter contexts. These > contexts may be destroyed and created randomly. Use an IDR to keep track > of contexts that are in use and assign a unique identifier to new ones. > > Signed-off-by: Uma Krishnan > Acked-by: Matthew R. Ochs > --- > drivers/scsi/cxlflash/ocxl_hw.c | 20 ++++++++++++++++++-- > drivers/scsi/cxlflash/ocxl_hw.h | 2 ++ > 2 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/cxlflash/ocxl_hw.c b/drivers/scsi/cxlflash/ocxl_hw.c > index d75b873..6472210 100644 > --- a/drivers/scsi/cxlflash/ocxl_hw.c > +++ b/drivers/scsi/cxlflash/ocxl_hw.c > @@ -12,6 +12,8 @@ > * 2 of the License, or (at your option) any later version. > */ > > +#include > + > #include > > #include "backend.h" > @@ -60,14 +62,25 @@ static void *ocxlflash_dev_context_init(struct pci_dev *pdev, void *afu_cookie) > if (unlikely(!ctx)) { > dev_err(dev, "%s: Context allocation failed\n", __func__); > rc = -ENOMEM; > - goto err; > + goto err1; > + } > + > + idr_preload(GFP_KERNEL); > + rc = idr_alloc(&afu->idr, ctx, 0, afu->max_pasid, GFP_NOWAIT); > + idr_preload_end(); I believe we can call idr_alloc(... GFP_KERNEL) directly in that context now. > + if (unlikely(rc < 0)) { > + dev_err(dev, "%s: idr_alloc failed rc=%d\n", __func__, rc); > + goto err2; > } > > + ctx->pe = rc; > ctx->master = false; > ctx->hw_afu = afu; > out: > return ctx; > -err: > +err2: > + kfree(ctx); > +err1: > ctx = ERR_PTR(rc); > goto out; > } > @@ -86,6 +99,7 @@ static int ocxlflash_release_context(void *ctx_cookie) > if (!ctx) > goto out; > > + idr_remove(&ctx->hw_afu->idr, ctx->pe); > kfree(ctx); > out: > return rc; > @@ -103,6 +117,7 @@ static void ocxlflash_destroy_afu(void *afu_cookie) > return; > > ocxlflash_release_context(afu->ocxl_ctx); > + idr_destroy(&afu->idr); > kfree(afu); > } > > @@ -237,6 +252,7 @@ static void *ocxlflash_create_afu(struct pci_dev *pdev) > goto err1; > } > > + idr_init(&afu->idr); You initialize the IDR too late. ocxlflash_dev_context_init() was called just above and allocated a PE. Fred > afu->ocxl_ctx = ctx; > out: > return afu; > diff --git a/drivers/scsi/cxlflash/ocxl_hw.h b/drivers/scsi/cxlflash/ocxl_hw.h > index de43c04..0381682 100644 > --- a/drivers/scsi/cxlflash/ocxl_hw.h > +++ b/drivers/scsi/cxlflash/ocxl_hw.h > @@ -26,10 +26,12 @@ struct ocxl_hw_afu { > int afu_actag_base; /* AFU acTag base */ > int afu_actag_enabled; /* AFU acTag number enabled */ > > + struct idr idr; /* IDR to manage contexts */ > int max_pasid; /* Maximum number of contexts */ > }; > > struct ocxlflash_context { > struct ocxl_hw_afu *hw_afu; /* HW AFU back pointer */ > bool master; /* Whether this is a master context */ > + int pe; /* Process element */ > }; >