From: Frederic Barrat <fbarrat@linux.ibm.com>
To: "Alastair D'Silva" <alastair@au1.ibm.com>, alastair@d-silva.org
Cc: "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
"Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
"Paul Mackerras" <paulus@samba.org>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Andrew Donnellan" <ajd@linux.ibm.com>,
"Arnd Bergmann" <arnd@arndb.de>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Mauro Carvalho Chehab" <mchehab+samsung@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
"Rob Herring" <robh@kernel.org>,
"Anton Blanchard" <anton@ozlabs.org>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Mahesh Salgaonkar" <mahesh@linux.vnet.ibm.com>,
"Madhavan Srinivasan" <maddy@linux.vnet.ibm.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Anju T Sudhakar" <anju@linux.vnet.ibm.com>,
"Hari Bathini" <hbathini@linux.ibm.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Greg Kurz" <groug@kaod.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Masahiro Yamada" <yamada.masahiro@socionext.com>,
"Alexey Kardashevskiy" <aik@ozlabs.ru>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 06/27] ocxl: Tally up the LPC memory on a link & allow it to be mapped
Date: Tue, 25 Feb 2020 17:30:52 +0100 [thread overview]
Message-ID: <4c8f704b-5607-5ca0-c00e-01e412117f6b@linux.ibm.com> (raw)
In-Reply-To: <20200221032720.33893-7-alastair@au1.ibm.com>
Le 21/02/2020 à 04:26, Alastair D'Silva a écrit :
> From: Alastair D'Silva <alastair@d-silva.org>
>
> Tally up the LPC memory on an OpenCAPI link & allow it to be mapped
>
> Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
> ---
> drivers/misc/ocxl/core.c | 10 ++++++
> drivers/misc/ocxl/link.c | 53 +++++++++++++++++++++++++++++++
> drivers/misc/ocxl/ocxl_internal.h | 33 +++++++++++++++++++
> 3 files changed, 96 insertions(+)
>
> 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;
>
> + if (afu->config.lpc_mem_size || afu->config.special_purpose_mem_size) {
> + rc = ocxl_link_add_lpc_mem(afu->fn->link, afu->config.lpc_mem_offset,
> + afu->config.lpc_mem_size +
> + afu->config.special_purpose_mem_size);
> + if (rc)
> + goto err_free_mmio;
> + }
> +
> return 0;
>
> +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..1e039cc5ebe5 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; /* protects lpc_mem & lpc_mem_sz */
> + 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 = LIST_HEAD_INIT(links_list);
> @@ -396,6 +401,8 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_l
> if (rc)
> goto err_spa;
>
> + mutex_init(&link->lpc_mem_lock);
> +
> /* platform specific hook */
> rc = pnv_ocxl_spa_setup(dev, link->spa->spa_mem, PE_mask,
> &link->platform_data);
> @@ -711,3 +718,49 @@ 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 = (struct ocxl_link *) link_handle;
> +
> + // Check for overflow
> + if (offset > (offset + size))
> + return -EINVAL;
> +
> + mutex_lock(&link->lpc_mem_lock);
> + link->lpc_mem_sz = 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 = (struct ocxl_link *) link_handle;
> +
> + mutex_lock(&link->lpc_mem_lock);
> +
> + if(!link->lpc_mem)
> + link->lpc_mem = pnv_ocxl_platform_lpc_setup(pdev, link->lpc_mem_sz);
> +
> + if(link->lpc_mem)
> + link->lpc_consumers++;
> + mutex_unlock(&link->lpc_mem_lock);
> +
> + return link->lpc_mem;
> +}
> +
> +void ocxl_link_lpc_release(void *link_handle, struct pci_dev *pdev)
> +{
> + struct ocxl_link *link = (struct ocxl_link *) link_handle;
> +
> + mutex_lock(&link->lpc_mem_lock);
> + WARN_ON(--link->lpc_consumers < 0);
Here, we always decrement the lpc_consumers count. However, it was only
incremented if the mapping was setup correctly in opal.
We could arguably claim that ocxl_link_lpc_release() should only be
called if ocxl_link_lpc_map() succeeded, but it would make error path
handling easier if we only decrement the lpc_consumers count if
link->lpc_mem is set. So that we can just call ocxl_link_lpc_release()
in error paths without having to worry about triggering the WARN_ON message.
Fred
> + if (link->lpc_consumers == 0) {
> + pnv_ocxl_platform_lpc_release(pdev);
> + link->lpc_mem = 0;
> + }
> +
> + mutex_unlock(&link->lpc_mem_lock);
> +}
> diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h
> index 198e4e4bc51d..d0c8c4838f42 100644
> --- a/drivers/misc/ocxl/ocxl_internal.h
> +++ b/drivers/misc/ocxl/ocxl_internal.h
> @@ -142,4 +142,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);
>
> +/**
> + * ocxl_link_add_lpc_mem() - Increment the amount of memory required by 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
> + *
> + * Returns 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 must be mapped in order to make it accessible to a device.
> + * @link_handle: The OpenCAPI link handle
> + * @pdev: A device that is on the link
> + *
> + * Returns the address of the mapped LPC memory, or 0 on error
> + */
> +u64 ocxl_link_lpc_map(void *link_handle, struct pci_dev *pdev);
> +
> +/**
> + * ocxl_link_lpc_release() - Release the LPC memory device for an OpenCAPI device
> + *
> + * Offlines LPC memory on an OpenCAPI link for a device. If this is the
> + * last device on the link to release the memory, unmap it from the link.
> + *
> + * @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_ */
>
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2020-02-25 16:31 UTC|newest]
Thread overview: 130+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 3:26 [PATCH v3 00/27] Add support for OpenCAPI Persistent Memory devices Alastair D'Silva
2020-02-21 3:26 ` [PATCH v3 01/27] powerpc: Add OPAL calls for LPC memory alloc/release Alastair D'Silva
2020-02-24 5:49 ` Andrew Donnellan
2020-02-24 5:50 ` Alastair D'Silva
2020-02-21 3:26 ` [PATCH v3 02/27] mm/memory_hotplug: Allow check_hotplug_memory_addressable to be called from drivers Alastair D'Silva
2020-02-21 7:03 ` Andrew Donnellan
2020-02-21 3:26 ` [PATCH v3 03/27] powerpc: Map & release OpenCAPI LPC memory Alastair D'Silva
2020-02-24 2:51 ` Andrew Donnellan
2020-02-24 5:49 ` Andrew Donnellan
2020-02-25 10:02 ` Frederic Barrat
2020-02-26 0:19 ` Alastair D'Silva
2020-03-03 6:10 ` Andrew Donnellan
2020-03-04 5:33 ` Alastair D'Silva
2020-02-21 3:26 ` [PATCH v3 04/27] ocxl: Remove unnecessary externs Alastair D'Silva
2020-02-21 6:06 ` Andrew Donnellan
2020-02-25 13:23 ` Frederic Barrat
2020-02-26 8:14 ` Baoquan He
2020-02-26 8:26 ` Alastair D'Silva
2020-02-26 9:01 ` Greg Kurz
2020-02-26 14:15 ` 'Baoquan He'
2020-02-26 14:20 ` Greg Kurz
2020-02-26 14:54 ` 'Baoquan He'
2020-02-21 3:26 ` [PATCH v3 05/27] ocxl: Address kernel doc errors & warnings Alastair D'Silva
2020-02-24 2:11 ` Andrew Donnellan
2020-02-21 3:26 ` [PATCH v3 06/27] ocxl: Tally up the LPC memory on a link & allow it to be mapped Alastair D'Silva
2020-02-24 5:25 ` Andrew Donnellan
2020-02-24 5:36 ` Alastair D'Silva
2020-02-25 16:30 ` Frederic Barrat [this message]
2020-02-26 0:29 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 07/27] ocxl: Add functions to map/unmap LPC memory Alastair D'Silva
2020-02-24 6:02 ` Andrew Donnellan
2020-02-24 6:08 ` Alastair D'Silva
2020-02-25 17:01 ` Frederic Barrat
2020-02-21 3:27 ` [PATCH v3 08/27] ocxl: Emit a log message showing how much LPC memory was detected Alastair D'Silva
2020-02-24 6:06 ` Andrew Donnellan
2020-02-24 6:10 ` Alastair D'Silva
2020-02-24 6:13 ` Andrew Donnellan
2020-02-25 17:03 ` Frederic Barrat
2020-02-21 3:27 ` [PATCH v3 09/27] ocxl: Save the device serial number in ocxl_fn Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 10/27] powerpc: Add driver for OpenCAPI Persistent Memory Alastair D'Silva
2020-02-26 5:07 ` Andrew Donnellan
2020-02-26 5:49 ` Alastair D'Silva
2020-02-27 20:44 ` Frederic Barrat
2020-02-28 0:54 ` Alastair D'Silva
2020-02-28 18:32 ` Frederic Barrat
2020-02-21 3:27 ` [PATCH v3 11/27] powerpc: Enable the OpenCAPI Persistent Memory driver for powernv_defconfig Alastair D'Silva
2020-02-25 3:01 ` Andrew Donnellan
2020-02-21 3:27 ` [PATCH v3 12/27] powerpc/powernv/pmem: Add register addresses & status values to the header Alastair D'Silva
2020-02-27 5:08 ` Andrew Donnellan
2020-02-27 5:16 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 13/27] powerpc/powernv/pmem: Read the capability registers & wait for device ready Alastair D'Silva
2020-02-27 3:54 ` Andrew Donnellan
2020-02-27 3:58 ` Alastair D'Silva
2020-03-02 17:51 ` Frederic Barrat
2020-03-04 4:15 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 14/27] powerpc/powernv/pmem: Add support for Admin commands Alastair D'Silva
2020-02-27 8:22 ` Andrew Donnellan
2020-02-27 8:27 ` Andrew Donnellan
2020-02-27 23:54 ` Alastair D'Silva
2020-02-27 23:51 ` Alastair D'Silva
2020-02-27 17:01 ` Dan Williams
2020-02-27 23:57 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 15/27] powerpc/powernv/pmem: Add support for near storage commands Alastair D'Silva
2020-02-27 8:30 ` Andrew Donnellan
2020-02-27 23:56 ` Alastair D'Silva
2020-02-27 17:02 ` Dan Williams
2020-03-02 17:58 ` Frederic Barrat
2020-03-02 18:42 ` Dan Williams
2020-03-04 4:42 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 16/27] powerpc/powernv/pmem: Register a character device for userspace to interact with Alastair D'Silva
2020-03-02 5:34 ` Andrew Donnellan
2020-03-02 6:05 ` Alastair D'Silva
2020-03-03 9:28 ` Frederic Barrat
2020-03-05 3:38 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 17/27] powerpc/powernv/pmem: Implement the Read Error Log command Alastair D'Silva
2020-03-03 10:36 ` Frederic Barrat
2020-03-05 4:31 ` Alastair D'Silva
2020-03-05 9:33 ` Frederic Barrat
2020-03-04 5:58 ` Andrew Donnellan
2020-02-21 3:27 ` [PATCH v3 18/27] powerpc/powernv/pmem: Add controller dump IOCTLs Alastair D'Silva
2020-03-03 18:04 ` Frederic Barrat
2020-03-05 23:37 ` Alastair D'Silva
2020-03-04 6:53 ` Andrew Donnellan
2020-03-06 3:34 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 19/27] powerpc/powernv/pmem: Add an IOCTL to report controller statistics Alastair D'Silva
2020-03-04 9:25 ` Frederic Barrat
2020-03-12 0:15 ` Alastair D'Silva
2020-03-05 0:46 ` Andrew Donnellan
2020-03-12 4:47 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 20/27] powerpc/powernv/pmem: Forward events to userspace Alastair D'Silva
2020-03-03 7:02 ` Andrew Donnellan
2020-03-04 5:48 ` Alastair D'Silva
2020-03-04 11:00 ` Frederic Barrat
2020-03-11 3:32 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 21/27] powerpc/powernv/pmem: Add an IOCTL to request controller health & perf data Alastair D'Silva
2020-02-28 6:12 ` Andrew Donnellan
2020-03-02 5:40 ` Alastair D'Silva
2020-03-04 11:06 ` Frederic Barrat
2020-03-11 3:38 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 22/27] powerpc/powernv/pmem: Implement the heartbeat command Alastair D'Silva
2020-02-28 6:20 ` Andrew Donnellan
2020-03-04 14:25 ` Frederic Barrat
2020-02-21 3:27 ` [PATCH v3 23/27] powerpc/powernv/pmem: Add debug IOCTLs Alastair D'Silva
2020-03-04 15:21 ` Frederic Barrat
2020-03-12 4:24 ` Alastair D'Silva
2020-03-05 3:11 ` Andrew Donnellan
2020-03-12 4:58 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 24/27] powerpc/powernv/pmem: Expose SMART data via ndctl Alastair D'Silva
2020-03-04 15:40 ` Frederic Barrat
2020-03-05 3:36 ` Andrew Donnellan
2020-03-12 23:14 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 25/27] powerpc/powernv/pmem: Expose the serial number in sysfs Alastair D'Silva
2020-02-28 6:25 ` Andrew Donnellan
2020-02-28 7:15 ` Greg Kroah-Hartman
2020-03-01 23:42 ` Alastair D'Silva
2020-03-02 5:38 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 26/27] powerpc/powernv/pmem: Expose the firmware version " Alastair D'Silva
2020-03-02 7:35 ` Andrew Donnellan
2020-03-04 4:11 ` Alastair D'Silva
2020-02-21 3:27 ` [PATCH v3 27/27] MAINTAINERS: Add myself & nvdimm/ocxl to ocxl Alastair D'Silva
2020-02-21 5:35 ` Andrew Donnellan
2020-02-21 16:21 ` [PATCH v3 00/27] Add support for OpenCAPI Persistent Memory devices Dan Williams
2020-02-21 16:24 ` Dan Williams
2020-02-24 4:34 ` Alastair D'Silva
2020-02-24 4:37 ` Matthew Wilcox
2020-02-24 4:42 ` Alastair D'Silva
2020-02-24 6:51 ` Oliver O'Halloran
2020-02-26 0:13 ` Alastair D'Silva
2020-02-26 0:32 ` Dan Williams
2020-02-26 0:35 ` Alastair D'Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4c8f704b-5607-5ca0-c00e-01e412117f6b@linux.ibm.com \
--to=fbarrat@linux.ibm.com \
--cc=aik@ozlabs.ru \
--cc=ajd@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=alastair@au1.ibm.com \
--cc=alastair@d-silva.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=anju@linux.vnet.ibm.com \
--cc=anton@ozlabs.org \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=clg@kaod.org \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=groug@kaod.org \
--cc=hbathini@linux.ibm.com \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maddy@linux.vnet.ibm.com \
--cc=mahesh@linux.vnet.ibm.com \
--cc=mchehab+samsung@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
--cc=robh@kernel.org \
--cc=tglx@linutronix.de \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).