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_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 B4BD3C282DD for ; Thu, 9 Jan 2020 14:48:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 631E320673 for ; Thu, 9 Jan 2020 14:48:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 631E320673 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EF1F08E001A; Thu, 9 Jan 2020 09:48:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EA1CA8E0017; Thu, 9 Jan 2020 09:48:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D923B8E001A; Thu, 9 Jan 2020 09:48:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0190.hostedemail.com [216.40.44.190]) by kanga.kvack.org (Postfix) with ESMTP id BFE338E0017 for ; Thu, 9 Jan 2020 09:48:24 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 8DC494DC7 for ; Thu, 9 Jan 2020 14:48:24 +0000 (UTC) X-FDA: 76358376528.23.stop64_2c3da9d26de58 X-HE-Tag: stop64_2c3da9d26de58 X-Filterd-Recvd-Size: 10580 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Thu, 9 Jan 2020 14:48:23 +0000 (UTC) Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 009Eg2fq096176 for ; Thu, 9 Jan 2020 09:48:22 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2xe4qjm1xr-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 09 Jan 2020 09:48:22 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 9 Jan 2020 14:48:18 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 9 Jan 2020 14:48:11 -0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 009Em93M37421252 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 Jan 2020 14:48:09 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7305EA404D; Thu, 9 Jan 2020 14:48:09 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5228DA4051; Thu, 9 Jan 2020 14:48:08 +0000 (GMT) Received: from bali.tlslab.ibm.com (unknown [9.101.4.17]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 9 Jan 2020 14:48:08 +0000 (GMT) Subject: Re: [PATCH v2 06/27] ocxl: Tally up the LPC memory on a link & allow it to be mapped To: "Alastair D'Silva" , alastair@d-silva.org Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Andrew Donnellan , Arnd Bergmann , Greg Kroah-Hartman , Dan Williams , Vishal Verma , Dave Jiang , Keith Busch , Ira Weiny , Andrew Morton , Mauro Carvalho Chehab , "David S. Miller" , Rob Herring , Anton Blanchard , Krzysztof Kozlowski , Mahesh Salgaonkar , Madhavan Srinivasan , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Anju T Sudhakar , Hari Bathini , Thomas Gleixner , Greg Kurz , Nicholas Piggin , Masahiro Yamada , Alexey Kardashevskiy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-nvdimm@lists.01.org, linux-mm@kvack.org References: <20191203034655.51561-1-alastair@au1.ibm.com> <20191203034655.51561-7-alastair@au1.ibm.com> From: Frederic Barrat Date: Thu, 9 Jan 2020 15:48:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20191203034655.51561-7-alastair@au1.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US X-TM-AS-GCONF: 00 x-cbid: 20010914-0012-0000-0000-0000037BF294 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20010914-0013-0000-0000-000021B81440 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-01-09_02:2020-01-09,2020-01-09 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 mlxlogscore=999 impostorscore=0 adultscore=0 lowpriorityscore=0 spamscore=0 phishscore=0 bulkscore=0 priorityscore=1501 suspectscore=2 clxscore=1015 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-2001090129 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Le 03/12/2019 =C3=A0 04:46, Alastair D'Silva a =C3=A9crit=C2=A0: > From: Alastair D'Silva >=20 > Tally up the LPC memory on an OpenCAPI link & allow it to be mapped >=20 > Signed-off-by: Alastair D'Silva > --- > drivers/misc/ocxl/core.c | 10 ++++++ > drivers/misc/ocxl/link.c | 60 ++++++++++++++++++++++++++++++= + > drivers/misc/ocxl/ocxl_internal.h | 33 +++++++++++++++++ > 3 files changed, 103 insertions(+) >=20 > diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c > index b7a09b21ab36..2531c6cf19a0 100644 > --- a/drivers/misc/ocxl/core.c > +++ b/drivers/misc/ocxl/core.c > @@ -230,8 +230,18 @@ static int configure_afu(struct ocxl_afu *afu, u8 = afu_idx, struct pci_dev *dev) > if (rc) > goto err_free_pasid; > =20 > + if (afu->config.lpc_mem_size || afu->config.special_purpose_mem_size)= { > + rc =3D ocxl_link_add_lpc_mem(afu->fn->link, afu->config.lpc_mem_offs= et, > + afu->config.lpc_mem_size + > + afu->config.special_purpose_mem_size); > + if (rc) > + goto err_free_mmio; > + } > + > return 0; > =20 > +err_free_mmio: > + unmap_mmio_areas(afu); > err_free_pasid: > reclaim_afu_pasid(afu); > err_free_actag: > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index 58d111afd9f6..d8503f0dc6ec 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -84,6 +84,11 @@ struct ocxl_link { > int dev; > atomic_t irq_available; > struct spa *spa; > + struct mutex lpc_mem_lock; > + u64 lpc_mem_sz; /* Total amount of LPC memory presented on the link *= / > + u64 lpc_mem; > + int lpc_consumers; > + > void *platform_data; > }; > static struct list_head links_list =3D LIST_HEAD_INIT(links_list); > @@ -396,6 +401,8 @@ static int alloc_link(struct pci_dev *dev, int PE_m= ask, struct ocxl_link **out_l > if (rc) > goto err_spa; > =20 > + mutex_init(&link->lpc_mem_lock); > + > /* platform specific hook */ > rc =3D pnv_ocxl_spa_setup(dev, link->spa->spa_mem, PE_mask, > &link->platform_data); > @@ -711,3 +718,56 @@ void ocxl_link_free_irq(void *link_handle, int hw_= irq) > atomic_inc(&link->irq_available); > } > EXPORT_SYMBOL_GPL(ocxl_link_free_irq); > + > +int ocxl_link_add_lpc_mem(void *link_handle, u64 offset, u64 size) > +{ > + struct ocxl_link *link =3D (struct ocxl_link *) link_handle; > + > + // Check for overflow > + if (offset > (offset + size)) > + return -EINVAL; > + > + mutex_lock(&link->lpc_mem_lock); > + link->lpc_mem_sz =3D max(link->lpc_mem_sz, offset + size); > + > + mutex_unlock(&link->lpc_mem_lock); > + > + return 0; > +} > + > +u64 ocxl_link_lpc_map(void *link_handle, struct pci_dev *pdev) > +{ > + struct ocxl_link *link =3D (struct ocxl_link *) link_handle; > + u64 lpc_mem; > + > + mutex_lock(&link->lpc_mem_lock); > + if (link->lpc_mem) { > + lpc_mem =3D link->lpc_mem; > + > + link->lpc_consumers++; > + mutex_unlock(&link->lpc_mem_lock); > + return lpc_mem; > + } > + > + link->lpc_mem =3D pnv_ocxl_platform_lpc_setup(pdev, link->lpc_mem_sz)= ; > + if (link->lpc_mem) > + link->lpc_consumers++; So if we fail to setup the lpc access in opal, we don't increment=20 link->lpc_consumers and we shouldn't call ocxl_link_lpc_release(). Is=20 that always true? Risk is to trigger the warning in=20 ocxl_link_lpc_release(). So maybe we should check link->lpc_mem first in=20 ocxl_link_lpc_release() and exit early if no memory is mapped. It would=20 probably avoid hitting the WARN on an error path for example. Fred > + lpc_mem =3D link->lpc_mem; > + mutex_unlock(&link->lpc_mem_lock); > + > + return lpc_mem; > +} > + > +void ocxl_link_lpc_release(void *link_handle, struct pci_dev *pdev) > +{ > + struct ocxl_link *link =3D (struct ocxl_link *) link_handle; > + > + mutex_lock(&link->lpc_mem_lock); > + WARN_ON(--link->lpc_consumers < 0); > + if (link->lpc_consumers =3D=3D 0) { > + pnv_ocxl_platform_lpc_release(pdev); > + link->lpc_mem =3D 0; > + } > + > + mutex_unlock(&link->lpc_mem_lock); > +} > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl= _internal.h > index 97415afd79f3..20b417e00949 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -141,4 +141,37 @@ int ocxl_irq_offset_to_id(struct ocxl_context *ctx= , u64 offset); > u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id); > void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > =20 > +/** > + * ocxl_link_add_lpc_mem() - Increment the amount of memory required b= y an OpenCAPI link > + * > + * @link_handle: The OpenCAPI link handle > + * @offset: The offset of the memory to add > + * @size: The amount of memory to increment by > + * > + * Return 0 on success, negative on overflow > + */ > +int ocxl_link_add_lpc_mem(void *link_handle, u64 offset, u64 size); > + > +/** > + * ocxl_link_lpc_map() - Map the LPC memory for an OpenCAPI device > + * > + * Since LPC memory belongs to a link, the whole LPC memory available > + * on the link bust be mapped in order to make it accessible to a devi= ce. > + * > + * @link_handle: The OpenCAPI link handle > + * @pdev: A device that is on the link > + */ > +u64 ocxl_link_lpc_map(void *link_handle, struct pci_dev *pdev); > + > +/** > + * ocxl_link_lpc_release() - Release the LPC memory device for an Open= CAPI device > + * > + * Offlines LPC memory on an OpenCAPI link for a device. If this is th= e > + * last device on the link to release the memory, unmap it from the li= nk. > + * > + * @link_handle: The OpenCAPI link handle > + * @pdev: A device that is on the link > + */ > +void ocxl_link_lpc_release(void *link_handle, struct pci_dev *pdev); > + > #endif /* _OCXL_INTERNAL_H_ */ >=20