From: "Alastair D'Silva" <alastair@au1.ibm.com>
To: 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>,
"Frederic Barrat" <fbarrat@linux.ibm.com>,
"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.r>
Subject: [PATCH v3 18/27] powerpc/powernv/pmem: Add controller dump IOCTLs
Date: Fri, 21 Feb 2020 14:27:11 +1100 [thread overview]
Message-ID: <20200221032720.33893-19-alastair@au1.ibm.com> (raw)
In-Reply-To: <20200221032720.33893-1-alastair@au1.ibm.com>
From: Alastair D'Silva <alastair@d-silva.org>
This patch adds IOCTLs to allow userspace to request & fetch dumps
of the internal controller state.
This is useful during debugging or when a fatal error on the controller
has occurred.
Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
arch/powerpc/platforms/powernv/pmem/ocxl.c | 132 +++++++++++++++++++++
include/uapi/nvdimm/ocxl-pmem.h | 15 +++
2 files changed, 147 insertions(+)
diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl.c b/arch/powerpc/platforms/powernv/pmem/ocxl.c
index 2b64504f9129..2cabafe1fc58 100644
--- a/arch/powerpc/platforms/powernv/pmem/ocxl.c
+++ b/arch/powerpc/platforms/powernv/pmem/ocxl.c
@@ -640,6 +640,124 @@ static int ioctl_error_log(struct ocxlpmem *ocxlpmem,
return 0;
}
+static int ioctl_controller_dump_data(struct ocxlpmem *ocxlpmem,
+ struct ioctl_ocxl_pmem_controller_dump_data __user *uarg)
+{
+ struct ioctl_ocxl_pmem_controller_dump_data args;
+ u16 i;
+ u64 val;
+ int rc;
+
+ if (copy_from_user(&args, uarg, sizeof(args)))
+ return -EFAULT;
+
+ if (args.buf_size % 8)
+ return -EINVAL;
+
+ if (args.buf_size > ocxlpmem->admin_command.data_size)
+ return -EINVAL;
+
+ mutex_lock(&ocxlpmem->admin_command.lock);
+
+ rc = admin_command_request(ocxlpmem, ADMIN_COMMAND_CONTROLLER_DUMP);
+ if (rc)
+ goto out;
+
+ val = ((u64)args.offset) << 32;
+ val |= args.buf_size;
+ rc = ocxl_global_mmio_write64(ocxlpmem->ocxl_afu,
+ ocxlpmem->admin_command.request_offset + 0x08,
+ OCXL_LITTLE_ENDIAN, val);
+ if (rc)
+ goto out;
+
+ rc = admin_command_execute(ocxlpmem);
+ if (rc)
+ goto out;
+
+ rc = admin_command_complete_timeout(ocxlpmem,
+ ADMIN_COMMAND_CONTROLLER_DUMP);
+ if (rc < 0) {
+ dev_warn(&ocxlpmem->dev, "Controller dump timed out\n");
+ goto out;
+ }
+
+ rc = admin_response(ocxlpmem);
+ if (rc < 0)
+ goto out;
+ if (rc != STATUS_SUCCESS) {
+ warn_status(ocxlpmem,
+ "Unexpected status from retrieve error log",
+ rc);
+ goto out;
+ }
+
+ for (i = 0; i < args.buf_size; i += 8) {
+ u64 val;
+
+ rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
+ ocxlpmem->admin_command.data_offset + i,
+ OCXL_HOST_ENDIAN, &val);
+ if (rc)
+ goto out;
+
+ if (copy_to_user(&args.buf[i], &val, sizeof(u64))) {
+ rc = -EFAULT;
+ goto out;
+ }
+ }
+
+ if (copy_to_user(uarg, &args, sizeof(args))) {
+ rc = -EFAULT;
+ goto out;
+ }
+
+ rc = admin_response_handled(ocxlpmem);
+ if (rc)
+ goto out;
+
+out:
+ mutex_unlock(&ocxlpmem->admin_command.lock);
+ return rc;
+}
+
+int request_controller_dump(struct ocxlpmem *ocxlpmem)
+{
+ int rc;
+ u64 busy = 1;
+
+ rc = ocxl_global_mmio_set64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_CHIC,
+ OCXL_LITTLE_ENDIAN,
+ GLOBAL_MMIO_CHI_CDA);
+
+
+ rc = ocxl_global_mmio_set64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_HCI,
+ OCXL_LITTLE_ENDIAN,
+ GLOBAL_MMIO_HCI_CONTROLLER_DUMP);
+ if (rc)
+ return rc;
+
+ while (busy) {
+ rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
+ GLOBAL_MMIO_HCI,
+ OCXL_LITTLE_ENDIAN, &busy);
+ if (rc)
+ return rc;
+
+ busy &= GLOBAL_MMIO_HCI_CONTROLLER_DUMP;
+ cond_resched();
+ }
+
+ return 0;
+}
+
+static int ioctl_controller_dump_complete(struct ocxlpmem *ocxlpmem)
+{
+ return ocxl_global_mmio_set64(ocxlpmem->ocxl_afu, GLOBAL_MMIO_HCI,
+ OCXL_LITTLE_ENDIAN,
+ GLOBAL_MMIO_HCI_CONTROLLER_DUMP_COLLECTED);
+}
+
static long file_ioctl(struct file *file, unsigned int cmd, unsigned long args)
{
struct ocxlpmem *ocxlpmem = file->private_data;
@@ -650,7 +768,21 @@ static long file_ioctl(struct file *file, unsigned int cmd, unsigned long args)
rc = ioctl_error_log(ocxlpmem,
(struct ioctl_ocxl_pmem_error_log __user *)args);
break;
+
+ case IOCTL_OCXL_PMEM_CONTROLLER_DUMP:
+ rc = request_controller_dump(ocxlpmem);
+ break;
+
+ case IOCTL_OCXL_PMEM_CONTROLLER_DUMP_DATA:
+ rc = ioctl_controller_dump_data(ocxlpmem,
+ (struct ioctl_ocxl_pmem_controller_dump_data __user *)args);
+ break;
+
+ case IOCTL_OCXL_PMEM_CONTROLLER_DUMP_COMPLETE:
+ rc = ioctl_controller_dump_complete(ocxlpmem);
+ break;
}
+
return rc;
}
diff --git a/include/uapi/nvdimm/ocxl-pmem.h b/include/uapi/nvdimm/ocxl-pmem.h
index b10f8ac0c20f..d4d8512d03f7 100644
--- a/include/uapi/nvdimm/ocxl-pmem.h
+++ b/include/uapi/nvdimm/ocxl-pmem.h
@@ -38,9 +38,24 @@ struct ioctl_ocxl_pmem_error_log {
__u8 *buf; /* pointer to output buffer */
};
+struct ioctl_ocxl_pmem_controller_dump_data {
+ __u8 *buf; /* pointer to output buffer */
+ __u16 buf_size; /* in/out, buffer size provided/required.
+ * If required is greater than provided, the buffer
+ * will be truncated to the amount provided. If its
+ * less, then only the required bytes will be populated.
+ * If it is 0, then there is no more dump data available.
+ */
+ __u32 offset; /* in, Offset within the dump */
+ __u64 reserved[8];
+};
+
/* ioctl numbers */
#define OCXL_PMEM_MAGIC 0x5C
/* SCM devices */
#define IOCTL_OCXL_PMEM_ERROR_LOG _IOWR(OCXL_PMEM_MAGIC, 0x01, struct ioctl_ocxl_pmem_error_log)
+#define IOCTL_OCXL_PMEM_CONTROLLER_DUMP _IO(OCXL_PMEM_MAGIC, 0x02)
+#define IOCTL_OCXL_PMEM_CONTROLLER_DUMP_DATA _IOWR(OCXL_PMEM_MAGIC, 0x03, struct ioctl_ocxl_pmem_controller_dump_data)
+#define IOCTL_OCXL_PMEM_CONTROLLER_DUMP_COMPLETE _IO(OCXL_PMEM_MAGIC, 0x04)
#endif /* _UAPI_OCXL_SCM_H */
--
2.24.1
_______________________________________________
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-21 3:28 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
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 ` Alastair D'Silva [this message]
2020-03-03 18:04 ` [PATCH v3 18/27] powerpc/powernv/pmem: Add controller dump IOCTLs 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=20200221032720.33893-19-alastair@au1.ibm.com \
--to=alastair@au1.ibm.com \
--cc=aik@ozlabs.r \
--cc=ajd@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--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=fbarrat@linux.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=groug@kaod.org \
--cc=hbathini@linux.ibm.com \
--cc=krzk@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).