From: Alastair D'Silva <[email protected]>
This patch retrieves proprietary formatted SMART data and makes it
available via ndctl. A later contribution will be made to ndctl to
parse this data.
Signed-off-by: Alastair D'Silva <[email protected]>
---
arch/powerpc/platforms/powernv/pmem/ocxl.c | 128 ++++++++++++++++++
.../platforms/powernv/pmem/ocxl_internal.h | 18 +++
include/uapi/linux/ndctl.h | 1 +
3 files changed, 147 insertions(+)
diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl.c b/arch/powerpc/platforms/powernv/pmem/ocxl.c
index d4ce5e9e0521..5cd1b6d78dd6 100644
--- a/arch/powerpc/platforms/powernv/pmem/ocxl.c
+++ b/arch/powerpc/platforms/powernv/pmem/ocxl.c
@@ -81,6 +81,129 @@ static int ndctl_config_size(struct nd_cmd_get_config_size *command)
return 0;
}
+/**
+ * smart_header_parse() - Parse the first 64 bits of the SMART admin command response
+ * @ocxlpmem: the device metadata
+ * @length: out, returns the number of bytes in the response (excluding the 64 bit header)
+ */
+static int smart_header_parse(struct ocxlpmem *ocxlpmem, u32 *length)
+{
+ int rc;
+ u64 val;
+
+ u16 data_identifier;
+ u32 data_length;
+
+ rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
+ ocxlpmem->admin_command.data_offset,
+ OCXL_LITTLE_ENDIAN, &val);
+ if (rc)
+ return rc;
+
+ data_identifier = val >> 48;
+ data_length = val & 0xFFFFFFFF;
+
+ if (data_identifier != 0x534D) { // 'SM'
+ dev_err(&ocxlpmem->dev,
+ "Bad data identifier for smart data, expected 'SM', got '%-.*s'\n",
+ 2, (char *)&data_identifier);
+ return -EINVAL;
+ }
+
+ *length = data_length;
+ return 0;
+}
+
+static int ndctl_smart(struct ocxlpmem *ocxlpmem, struct nd_cmd_pkg *pkg)
+{
+ u32 length, i;
+ struct nd_ocxl_smart *out;
+ int rc;
+
+ mutex_lock(&ocxlpmem->admin_command.lock);
+
+ rc = admin_command_request(ocxlpmem, ADMIN_COMMAND_SMART);
+ if (rc)
+ goto out;
+
+ rc = admin_command_execute(ocxlpmem);
+ if (rc)
+ goto out;
+
+ rc = admin_command_complete_timeout(ocxlpmem, ADMIN_COMMAND_SMART);
+ if (rc < 0) {
+ dev_err(&ocxlpmem->dev, "SMART timeout\n");
+ goto out;
+ }
+
+ rc = admin_response(ocxlpmem);
+ if (rc < 0)
+ goto out;
+ if (rc != STATUS_SUCCESS) {
+ warn_status(ocxlpmem, "Unexpected status from SMART", rc);
+ goto out;
+ }
+
+ rc = smart_header_parse(ocxlpmem, &length);
+ if (rc)
+ goto out;
+
+ pkg->nd_fw_size = length;
+
+ length = min(length, pkg->nd_size_out); // bytes
+ out = (struct nd_ocxl_smart *)pkg->nd_payload;
+ // Each SMART attribute is 2 * 64 bits
+ out->count = length / (2 * sizeof(u64)); // attributes
+
+ for (i = 0; i < length; i += sizeof(u64)) {
+ rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
+ ocxlpmem->admin_command.data_offset + sizeof(u64) + i,
+ OCXL_LITTLE_ENDIAN,
+ &out->attribs[i/sizeof(u64)]);
+ if (rc)
+ goto out;
+ }
+
+ rc = admin_response_handled(ocxlpmem);
+ if (rc)
+ goto out;
+
+ rc = 0;
+ goto out;
+
+out:
+ mutex_unlock(&ocxlpmem->admin_command.lock);
+ return rc;
+}
+
+static int ndctl_call(struct ocxlpmem *ocxlpmem, void *buf, unsigned int buf_len)
+{
+ struct nd_cmd_pkg *pkg = buf;
+
+ if (buf_len < sizeof(struct nd_cmd_pkg)) {
+ dev_err(&ocxlpmem->dev, "Invalid ND_CALL size=%u\n", buf_len);
+ return -EINVAL;
+ }
+
+ if (pkg->nd_family != NVDIMM_FAMILY_OCXL) {
+ dev_err(&ocxlpmem->dev, "Invalid ND_CALL family=0x%llx\n", pkg->nd_family);
+ return -EINVAL;
+ }
+
+ switch (pkg->nd_command) {
+ case ND_CMD_OCXL_SMART:
+ ndctl_smart(ocxlpmem, pkg);
+ break;
+
+ default:
+ dev_err(&ocxlpmem->dev, "Invalid ND_CALL command=0x%llx\n", pkg->nd_command);
+ return -EINVAL;
+ }
+
+
+ return 0;
+}
+
static int ndctl(struct nvdimm_bus_descriptor *nd_desc,
struct nvdimm *nvdimm,
unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc)
@@ -88,6 +211,10 @@ static int ndctl(struct nvdimm_bus_descriptor *nd_desc,
struct ocxlpmem *ocxlpmem = container_of(nd_desc, struct ocxlpmem, bus_desc);
switch (cmd) {
+ case ND_CMD_CALL:
+ *cmd_rc = ndctl_call(ocxlpmem, buf, buf_len);
+ return 0;
+
case ND_CMD_GET_CONFIG_SIZE:
*cmd_rc = ndctl_config_size(buf);
return 0;
@@ -171,6 +298,7 @@ static int register_lpc_mem(struct ocxlpmem *ocxlpmem)
set_bit(ND_CMD_GET_CONFIG_SIZE, &nvdimm_cmd_mask);
set_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm_cmd_mask);
set_bit(ND_CMD_SET_CONFIG_DATA, &nvdimm_cmd_mask);
+ set_bit(ND_CMD_CALL, &nvdimm_cmd_mask);
set_bit(NDD_ALIASING, &nvdimm_flags);
diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
index 927690f4888f..0eb7a35d24ae 100644
--- a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
+++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
@@ -7,6 +7,7 @@
#include <linux/libnvdimm.h>
#include <uapi/nvdimm/ocxl-pmem.h>
#include <linux/mm.h>
+#include <linux/ndctl.h>
#define LABEL_AREA_SIZE (1UL << PA_SECTION_SHIFT)
#define DEFAULT_TIMEOUT 100
@@ -98,6 +99,23 @@ struct ocxlpmem_function0 {
struct ocxl_fn *ocxl_fn;
};
+struct nd_ocxl_smart {
+ __u8 count;
+ __u8 reserved[7];
+ __u64 attribs[0];
+} __packed;
+
+struct nd_pkg_ocxl {
+ struct nd_cmd_pkg gen;
+ union {
+ struct nd_ocxl_smart smart;
+ };
+};
+
+enum nd_cmd_ocxl {
+ ND_CMD_OCXL_SMART = 1,
+};
+
struct ocxlpmem {
struct device dev;
struct pci_dev *pdev;
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index de5d90212409..2885052e7f40 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -244,6 +244,7 @@ struct nd_cmd_pkg {
#define NVDIMM_FAMILY_HPE2 2
#define NVDIMM_FAMILY_MSFT 3
#define NVDIMM_FAMILY_HYPERV 4
+#define NVDIMM_FAMILY_OCXL 6
#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\
struct nd_cmd_pkg)
--
2.24.1
Le 21/02/2020 à 04:27, Alastair D'Silva a écrit :
> From: Alastair D'Silva <[email protected]>
>
> This patch retrieves proprietary formatted SMART data and makes it
> available via ndctl. A later contribution will be made to ndctl to
> parse this data.
>
> Signed-off-by: Alastair D'Silva <[email protected]>
> ---
Nothing new to add compared to previous patches with similarities.
Fred
> arch/powerpc/platforms/powernv/pmem/ocxl.c | 128 ++++++++++++++++++
> .../platforms/powernv/pmem/ocxl_internal.h | 18 +++
> include/uapi/linux/ndctl.h | 1 +
> 3 files changed, 147 insertions(+)
>
> diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl.c b/arch/powerpc/platforms/powernv/pmem/ocxl.c
> index d4ce5e9e0521..5cd1b6d78dd6 100644
> --- a/arch/powerpc/platforms/powernv/pmem/ocxl.c
> +++ b/arch/powerpc/platforms/powernv/pmem/ocxl.c
> @@ -81,6 +81,129 @@ static int ndctl_config_size(struct nd_cmd_get_config_size *command)
> return 0;
> }
>
> +/**
> + * smart_header_parse() - Parse the first 64 bits of the SMART admin command response
> + * @ocxlpmem: the device metadata
> + * @length: out, returns the number of bytes in the response (excluding the 64 bit header)
> + */
> +static int smart_header_parse(struct ocxlpmem *ocxlpmem, u32 *length)
> +{
> + int rc;
> + u64 val;
> +
> + u16 data_identifier;
> + u32 data_length;
> +
> + rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
> + ocxlpmem->admin_command.data_offset,
> + OCXL_LITTLE_ENDIAN, &val);
> + if (rc)
> + return rc;
> +
> + data_identifier = val >> 48;
> + data_length = val & 0xFFFFFFFF;
> +
> + if (data_identifier != 0x534D) { // 'SM'
> + dev_err(&ocxlpmem->dev,
> + "Bad data identifier for smart data, expected 'SM', got '%-.*s'\n",
> + 2, (char *)&data_identifier);
> + return -EINVAL;
> + }
> +
> + *length = data_length;
> + return 0;
> +}
> +
> +static int ndctl_smart(struct ocxlpmem *ocxlpmem, struct nd_cmd_pkg *pkg)
> +{
> + u32 length, i;
> + struct nd_ocxl_smart *out;
> + int rc;
> +
> + mutex_lock(&ocxlpmem->admin_command.lock);
> +
> + rc = admin_command_request(ocxlpmem, ADMIN_COMMAND_SMART);
> + if (rc)
> + goto out;
> +
> + rc = admin_command_execute(ocxlpmem);
> + if (rc)
> + goto out;
> +
> + rc = admin_command_complete_timeout(ocxlpmem, ADMIN_COMMAND_SMART);
> + if (rc < 0) {
> + dev_err(&ocxlpmem->dev, "SMART timeout\n");
> + goto out;
> + }
> +
> + rc = admin_response(ocxlpmem);
> + if (rc < 0)
> + goto out;
> + if (rc != STATUS_SUCCESS) {
> + warn_status(ocxlpmem, "Unexpected status from SMART", rc);
> + goto out;
> + }
> +
> + rc = smart_header_parse(ocxlpmem, &length);
> + if (rc)
> + goto out;
> +
> + pkg->nd_fw_size = length;
> +
> + length = min(length, pkg->nd_size_out); // bytes
> + out = (struct nd_ocxl_smart *)pkg->nd_payload;
> + // Each SMART attribute is 2 * 64 bits
> + out->count = length / (2 * sizeof(u64)); // attributes
> +
> + for (i = 0; i < length; i += sizeof(u64)) {
> + rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
> + ocxlpmem->admin_command.data_offset + sizeof(u64) + i,
> + OCXL_LITTLE_ENDIAN,
> + &out->attribs[i/sizeof(u64)]);
> + if (rc)
> + goto out;
> + }
> +
> + rc = admin_response_handled(ocxlpmem);
> + if (rc)
> + goto out;
> +
> + rc = 0;
> + goto out;
> +
> +out:
> + mutex_unlock(&ocxlpmem->admin_command.lock);
> + return rc;
> +}
> +
> +static int ndctl_call(struct ocxlpmem *ocxlpmem, void *buf, unsigned int buf_len)
> +{
> + struct nd_cmd_pkg *pkg = buf;
> +
> + if (buf_len < sizeof(struct nd_cmd_pkg)) {
> + dev_err(&ocxlpmem->dev, "Invalid ND_CALL size=%u\n", buf_len);
> + return -EINVAL;
> + }
> +
> + if (pkg->nd_family != NVDIMM_FAMILY_OCXL) {
> + dev_err(&ocxlpmem->dev, "Invalid ND_CALL family=0x%llx\n", pkg->nd_family);
> + return -EINVAL;
> + }
> +
> + switch (pkg->nd_command) {
> + case ND_CMD_OCXL_SMART:
> + ndctl_smart(ocxlpmem, pkg);
> + break;
> +
> + default:
> + dev_err(&ocxlpmem->dev, "Invalid ND_CALL command=0x%llx\n", pkg->nd_command);
> + return -EINVAL;
> + }
> +
> +
> + return 0;
> +}
> +
> static int ndctl(struct nvdimm_bus_descriptor *nd_desc,
> struct nvdimm *nvdimm,
> unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc)
> @@ -88,6 +211,10 @@ static int ndctl(struct nvdimm_bus_descriptor *nd_desc,
> struct ocxlpmem *ocxlpmem = container_of(nd_desc, struct ocxlpmem, bus_desc);
>
> switch (cmd) {
> + case ND_CMD_CALL:
> + *cmd_rc = ndctl_call(ocxlpmem, buf, buf_len);
> + return 0;
> +
> case ND_CMD_GET_CONFIG_SIZE:
> *cmd_rc = ndctl_config_size(buf);
> return 0;
> @@ -171,6 +298,7 @@ static int register_lpc_mem(struct ocxlpmem *ocxlpmem)
> set_bit(ND_CMD_GET_CONFIG_SIZE, &nvdimm_cmd_mask);
> set_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm_cmd_mask);
> set_bit(ND_CMD_SET_CONFIG_DATA, &nvdimm_cmd_mask);
> + set_bit(ND_CMD_CALL, &nvdimm_cmd_mask);
>
> set_bit(NDD_ALIASING, &nvdimm_flags);
>
> diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> index 927690f4888f..0eb7a35d24ae 100644
> --- a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> +++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> @@ -7,6 +7,7 @@
> #include <linux/libnvdimm.h>
> #include <uapi/nvdimm/ocxl-pmem.h>
> #include <linux/mm.h>
> +#include <linux/ndctl.h>
>
> #define LABEL_AREA_SIZE (1UL << PA_SECTION_SHIFT)
> #define DEFAULT_TIMEOUT 100
> @@ -98,6 +99,23 @@ struct ocxlpmem_function0 {
> struct ocxl_fn *ocxl_fn;
> };
>
> +struct nd_ocxl_smart {
> + __u8 count;
> + __u8 reserved[7];
> + __u64 attribs[0];
> +} __packed;
> +
> +struct nd_pkg_ocxl {
> + struct nd_cmd_pkg gen;
> + union {
> + struct nd_ocxl_smart smart;
> + };
> +};
> +
> +enum nd_cmd_ocxl {
> + ND_CMD_OCXL_SMART = 1,
> +};
> +
> struct ocxlpmem {
> struct device dev;
> struct pci_dev *pdev;
> diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
> index de5d90212409..2885052e7f40 100644
> --- a/include/uapi/linux/ndctl.h
> +++ b/include/uapi/linux/ndctl.h
> @@ -244,6 +244,7 @@ struct nd_cmd_pkg {
> #define NVDIMM_FAMILY_HPE2 2
> #define NVDIMM_FAMILY_MSFT 3
> #define NVDIMM_FAMILY_HYPERV 4
> +#define NVDIMM_FAMILY_OCXL 6
>
> #define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\
> struct nd_cmd_pkg)
>
On 21/2/20 2:27 pm, Alastair D'Silva wrote:
> +static int ndctl_smart(struct ocxlpmem *ocxlpmem, struct nd_cmd_pkg *pkg)
> +{
> + u32 length, i;
> + struct nd_ocxl_smart *out;
> + int rc;
> +
> + mutex_lock(&ocxlpmem->admin_command.lock);
> +
> + rc = admin_command_request(ocxlpmem, ADMIN_COMMAND_SMART);
> + if (rc)
> + goto out;
> +
> + rc = admin_command_execute(ocxlpmem);
> + if (rc)
> + goto out;
> +
> + rc = admin_command_complete_timeout(ocxlpmem, ADMIN_COMMAND_SMART);
> + if (rc < 0) {
> + dev_err(&ocxlpmem->dev, "SMART timeout\n");
> + goto out;
> + }
> +
> + rc = admin_response(ocxlpmem);
> + if (rc < 0)
> + goto out;
> + if (rc != STATUS_SUCCESS) {
> + warn_status(ocxlpmem, "Unexpected status from SMART", rc);
> + goto out;
> + }
> +
> + rc = smart_header_parse(ocxlpmem, &length);
> + if (rc)
> + goto out;
> +
> + pkg->nd_fw_size = length;
> +
> + length = min(length, pkg->nd_size_out); // bytes
> + out = (struct nd_ocxl_smart *)pkg->nd_payload;
> + // Each SMART attribute is 2 * 64 bits
> + out->count = length / (2 * sizeof(u64)); // attributes
From what I can tell - 8 bytes of nd_ocxl_smart are taken up for the
count + reserved bytes, so this is going to potentially overrun the user
buffer.
> +
> + for (i = 0; i < length; i += sizeof(u64)) {
It might be neater to make i count up by 1 and then multiply by
sizeof(u64) later.
> + rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
> + ocxlpmem->admin_command.data_offset + sizeof(u64) + i,
+ 0x08 rather than + sizeof(u64) for consistency.
> + OCXL_LITTLE_ENDIAN,
> + &out->attribs[i/sizeof(u64)]);
> + if (rc)
> + goto out;
> + }
> +
> + rc = admin_response_handled(ocxlpmem);
> + if (rc)
> + goto out;
> +
> + rc = 0;
> + goto out;
> +
> +out:
> + mutex_unlock(&ocxlpmem->admin_command.lock);
> + return rc;
> +}
> +
> +static int ndctl_call(struct ocxlpmem *ocxlpmem, void *buf, unsigned int buf_len)
> +{
> + struct nd_cmd_pkg *pkg = buf;
> +
> + if (buf_len < sizeof(struct nd_cmd_pkg)) {
> + dev_err(&ocxlpmem->dev, "Invalid ND_CALL size=%u\n", buf_len);
> + return -EINVAL;
> + }
> +
> + if (pkg->nd_family != NVDIMM_FAMILY_OCXL) {
> + dev_err(&ocxlpmem->dev, "Invalid ND_CALL family=0x%llx\n", pkg->nd_family);
> + return -EINVAL;
> + }
> +
> + switch (pkg->nd_command) {
> + case ND_CMD_OCXL_SMART:
> + ndctl_smart(ocxlpmem, pkg);
Did you intend to dispose of the return code here?
> + break;
> +
> + default:
> + dev_err(&ocxlpmem->dev, "Invalid ND_CALL command=0x%llx\n", pkg->nd_command);
> + return -EINVAL;
> + }
> +
> +
> + return 0;
> +}
> +
> static int ndctl(struct nvdimm_bus_descriptor *nd_desc,
> struct nvdimm *nvdimm,
> unsigned int cmd, void *buf, unsigned int buf_len, int *cmd_rc)
> @@ -88,6 +211,10 @@ static int ndctl(struct nvdimm_bus_descriptor *nd_desc,
> struct ocxlpmem *ocxlpmem = container_of(nd_desc, struct ocxlpmem, bus_desc);
>
> switch (cmd) {
> + case ND_CMD_CALL:
> + *cmd_rc = ndctl_call(ocxlpmem, buf, buf_len);
> + return 0;
> +
> case ND_CMD_GET_CONFIG_SIZE:
> *cmd_rc = ndctl_config_size(buf);
> return 0;
> @@ -171,6 +298,7 @@ static int register_lpc_mem(struct ocxlpmem *ocxlpmem)
> set_bit(ND_CMD_GET_CONFIG_SIZE, &nvdimm_cmd_mask);
> set_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm_cmd_mask);
> set_bit(ND_CMD_SET_CONFIG_DATA, &nvdimm_cmd_mask);
> + set_bit(ND_CMD_CALL, &nvdimm_cmd_mask);
>
> set_bit(NDD_ALIASING, &nvdimm_flags);
>
> diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> index 927690f4888f..0eb7a35d24ae 100644
> --- a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> +++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> @@ -7,6 +7,7 @@
> #include <linux/libnvdimm.h>
> #include <uapi/nvdimm/ocxl-pmem.h>
> #include <linux/mm.h>
> +#include <linux/ndctl.h>
>
> #define LABEL_AREA_SIZE (1UL << PA_SECTION_SHIFT)
> #define DEFAULT_TIMEOUT 100
> @@ -98,6 +99,23 @@ struct ocxlpmem_function0 {
> struct ocxl_fn *ocxl_fn;
> };
>
> +struct nd_ocxl_smart {
> + __u8 count;
> + __u8 reserved[7];
> + __u64 attribs[0];
> +} __packed;
> +
> +struct nd_pkg_ocxl {
> + struct nd_cmd_pkg gen;
> + union {
> + struct nd_ocxl_smart smart;
> + };
> +};
> +
> +enum nd_cmd_ocxl {
> + ND_CMD_OCXL_SMART = 1,
> +};
> +
> struct ocxlpmem {
> struct device dev;
> struct pci_dev *pdev;
> diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
> index de5d90212409..2885052e7f40 100644
> --- a/include/uapi/linux/ndctl.h
> +++ b/include/uapi/linux/ndctl.h
> @@ -244,6 +244,7 @@ struct nd_cmd_pkg {
> #define NVDIMM_FAMILY_HPE2 2
> #define NVDIMM_FAMILY_MSFT 3
> #define NVDIMM_FAMILY_HYPERV 4
> +#define NVDIMM_FAMILY_OCXL 6
>
> #define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\
> struct nd_cmd_pkg)
>
--
Andrew Donnellan OzLabs, ADL Canberra
[email protected] IBM Australia Limited
On Thu, 2020-03-05 at 14:36 +1100, Andrew Donnellan wrote:
> On 21/2/20 2:27 pm, Alastair D'Silva wrote:
> > +static int ndctl_smart(struct ocxlpmem *ocxlpmem, struct
> > nd_cmd_pkg *pkg)
> > +{
> > + u32 length, i;
> > + struct nd_ocxl_smart *out;
> > + int rc;
> > +
> > + mutex_lock(&ocxlpmem->admin_command.lock);
> > +
> > + rc = admin_command_request(ocxlpmem, ADMIN_COMMAND_SMART);
> > + if (rc)
> > + goto out;
> > +
> > + rc = admin_command_execute(ocxlpmem);
> > + if (rc)
> > + goto out;
> > +
> > + rc = admin_command_complete_timeout(ocxlpmem,
> > ADMIN_COMMAND_SMART);
> > + if (rc < 0) {
> > + dev_err(&ocxlpmem->dev, "SMART timeout\n");
> > + goto out;
> > + }
> > +
> > + rc = admin_response(ocxlpmem);
> > + if (rc < 0)
> > + goto out;
> > + if (rc != STATUS_SUCCESS) {
> > + warn_status(ocxlpmem, "Unexpected status from SMART",
> > rc);
> > + goto out;
> > + }
> > +
> > + rc = smart_header_parse(ocxlpmem, &length);
> > + if (rc)
> > + goto out;
> > +
> > + pkg->nd_fw_size = length;
> > +
> > + length = min(length, pkg->nd_size_out); // bytes
> > + out = (struct nd_ocxl_smart *)pkg->nd_payload;
> > + // Each SMART attribute is 2 * 64 bits
> > + out->count = length / (2 * sizeof(u64)); // attributes
>
> From what I can tell - 8 bytes of nd_ocxl_smart are taken up for
> the
> count + reserved bytes, so this is going to potentially overrun the
> user
> buffer.
Ok
>
> > +
> > + for (i = 0; i < length; i += sizeof(u64)) {
>
> It might be neater to make i count up by 1 and then multiply by
> sizeof(u64) later.
>
I tried, it doesn't make much difference to the complexity, and makes
it less clear that we are stepping in 64bit chunks.
> > + rc = ocxl_global_mmio_read64(ocxlpmem->ocxl_afu,
> > + ocxlpmem-
> > >admin_command.data_offset + sizeof(u64) + i,
>
> + 0x08 rather than + sizeof(u64) for consistency.
>
We use sizeof(u64) in the rest of this function.
> > + OCXL_LITTLE_ENDIAN,
> > + &out-
> > >attribs[i/sizeof(u64)]);
> > + if (rc)
> > + goto out;
> > + }
> > +
> > + rc = admin_response_handled(ocxlpmem);
> > + if (rc)
> > + goto out;
> > +
> > + rc = 0;
> > + goto out;
> > +
> > +out:
> > + mutex_unlock(&ocxlpmem->admin_command.lock);
> > + return rc;
> > +}
> > +
> > +static int ndctl_call(struct ocxlpmem *ocxlpmem, void *buf,
> > unsigned int buf_len)
> > +{
> > + struct nd_cmd_pkg *pkg = buf;
> > +
> > + if (buf_len < sizeof(struct nd_cmd_pkg)) {
> > + dev_err(&ocxlpmem->dev, "Invalid ND_CALL size=%u\n",
> > buf_len);
> > + return -EINVAL;
> > + }
> > +
> > + if (pkg->nd_family != NVDIMM_FAMILY_OCXL) {
> > + dev_err(&ocxlpmem->dev, "Invalid ND_CALL
> > family=0x%llx\n", pkg->nd_family);
> > + return -EINVAL;
> > + }
> > +
> > + switch (pkg->nd_command) {
> > + case ND_CMD_OCXL_SMART:
> > + ndctl_smart(ocxlpmem, pkg);
>
> Did you intend to dispose of the return code here?
Whoops.
>
> > + break;
> > +
> > + default:
> > + dev_err(&ocxlpmem->dev, "Invalid ND_CALL
> > command=0x%llx\n", pkg->nd_command);
> > + return -EINVAL;
> > + }
> > +
> > +
> > + return 0;
> > +}
> > +
> > static int ndctl(struct nvdimm_bus_descriptor *nd_desc,
> > struct nvdimm *nvdimm,
> > unsigned int cmd, void *buf, unsigned int buf_len, int
> > *cmd_rc)
> > @@ -88,6 +211,10 @@ static int ndctl(struct nvdimm_bus_descriptor
> > *nd_desc,
> > struct ocxlpmem *ocxlpmem = container_of(nd_desc, struct
> > ocxlpmem, bus_desc);
> >
> > switch (cmd) {
> > + case ND_CMD_CALL:
> > + *cmd_rc = ndctl_call(ocxlpmem, buf, buf_len);
> > + return 0;
> > +
> > case ND_CMD_GET_CONFIG_SIZE:
> > *cmd_rc = ndctl_config_size(buf);
> > return 0;
> > @@ -171,6 +298,7 @@ static int register_lpc_mem(struct ocxlpmem
> > *ocxlpmem)
> > set_bit(ND_CMD_GET_CONFIG_SIZE, &nvdimm_cmd_mask);
> > set_bit(ND_CMD_GET_CONFIG_DATA, &nvdimm_cmd_mask);
> > set_bit(ND_CMD_SET_CONFIG_DATA, &nvdimm_cmd_mask);
> > + set_bit(ND_CMD_CALL, &nvdimm_cmd_mask);
> >
> > set_bit(NDD_ALIASING, &nvdimm_flags);
> >
> > diff --git a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> > b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> > index 927690f4888f..0eb7a35d24ae 100644
> > --- a/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> > +++ b/arch/powerpc/platforms/powernv/pmem/ocxl_internal.h
> > @@ -7,6 +7,7 @@
> > #include <linux/libnvdimm.h>
> > #include <uapi/nvdimm/ocxl-pmem.h>
> > #include <linux/mm.h>
> > +#include <linux/ndctl.h>
> >
> > #define LABEL_AREA_SIZE (1UL << PA_SECTION_SHIFT)
> > #define DEFAULT_TIMEOUT 100
> > @@ -98,6 +99,23 @@ struct ocxlpmem_function0 {
> > struct ocxl_fn *ocxl_fn;
> > };
> >
> > +struct nd_ocxl_smart {
> > + __u8 count;
> > + __u8 reserved[7];
> > + __u64 attribs[0];
> > +} __packed;
> > +
> > +struct nd_pkg_ocxl {
> > + struct nd_cmd_pkg gen;
> > + union {
> > + struct nd_ocxl_smart smart;
> > + };
> > +};
> > +
> > +enum nd_cmd_ocxl {
> > + ND_CMD_OCXL_SMART = 1,
> > +};
> > +
> > struct ocxlpmem {
> > struct device dev;
> > struct pci_dev *pdev;
> > diff --git a/include/uapi/linux/ndctl.h
> > b/include/uapi/linux/ndctl.h
> > index de5d90212409..2885052e7f40 100644
> > --- a/include/uapi/linux/ndctl.h
> > +++ b/include/uapi/linux/ndctl.h
> > @@ -244,6 +244,7 @@ struct nd_cmd_pkg {
> > #define NVDIMM_FAMILY_HPE2 2
> > #define NVDIMM_FAMILY_MSFT 3
> > #define NVDIMM_FAMILY_HYPERV 4
> > +#define NVDIMM_FAMILY_OCXL 6
> >
> > #define ND_IOCTL_CALL _IOWR(ND_IOCTL,
> > ND_CMD_CALL,\
> > struct nd_cmd_pkg)
> >
--
Alastair D'Silva
Open Source Developer
Linux Technology Centre, IBM Australia
mob: 0423 762 819