lkml.org 
[lkml]   [2020]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 23/25] nvdimm/ocxl: Expose SMART data via ndctl
    Date
    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 <alastair@d-silva.org>
    ---
    drivers/nvdimm/ocxl/main.c | 113 +++++++++++++++++++++++++++++++++
    drivers/nvdimm/ocxl/ocxlpmem.h | 18 ++++++
    include/uapi/linux/ndctl.h | 1 +
    3 files changed, 132 insertions(+)

    diff --git a/drivers/nvdimm/ocxl/main.c b/drivers/nvdimm/ocxl/main.c
    index 2811bf7efbab..92b4389e8cbb 100644
    --- a/drivers/nvdimm/ocxl/main.c
    +++ b/drivers/nvdimm/ocxl/main.c
    @@ -82,6 +82,114 @@ 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 '%2s'\n",
    + (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_execute(ocxlpmem, ADMIN_COMMAND_SMART);
    + 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 + offsetof(struct nd_ocxl_smart, attribs);
    +
    + length = min(length, (u32)(pkg->nd_size_out -
    + offsetof(struct nd_ocxl_smart, attribs))); // 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;
    +
    +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:
    + return ndctl_smart(ocxlpmem, pkg);
    + 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)
    @@ -90,6 +198,10 @@ static int ndctl(struct nvdimm_bus_descriptor *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;
    @@ -173,6 +285,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/drivers/nvdimm/ocxl/ocxlpmem.h b/drivers/nvdimm/ocxl/ocxlpmem.h
    index c8794e7775ec..ebaf11692c09 100644
    --- a/drivers/nvdimm/ocxl/ocxlpmem.h
    +++ b/drivers/nvdimm/ocxl/ocxlpmem.h
    @@ -6,6 +6,7 @@
    #include <misc/ocxl.h>
    #include <linux/libnvdimm.h>
    #include <linux/mm.h>
    +#include <linux/ndctl.h>

    #define LABEL_AREA_SIZE BIT_ULL(PA_SECTION_SHIFT)
    #define DEFAULT_TIMEOUT 100
    @@ -101,6 +102,23 @@ struct command_metadata {
    u8 op_code;
    };

    +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
    \
     
     \ /
      Last update: 2020-03-31 11:00    [W:4.300 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site