ocp: add ocp_get_log_simple() to set UUID index

The index is required by the OCP specification.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/plugins/ocp/ocp-nvme.c b/plugins/ocp/ocp-nvme.c
index 8acaa17402988458eaac1b564c433798b908a514..360d53268aee634c9d283289c0707fecd1752ec4 100644 (file)
--- a/plugins/ocp/ocp-nvme.c
+++ b/plugins/ocp/ocp-nvme.c
@@ -219,8 +219,8 @@ static int get_c3_log_page(struct nvme_dev *dev, char *format)
        }
        memset(data, 0, sizeof(__u8) * C3_LATENCY_MON_LOG_BUF_LEN);
 
-       ret = nvme_get_log_simple(dev_fd(dev), C3_LATENCY_MON_OPCODE,
-               C3_LATENCY_MON_LOG_BUF_LEN, data);
+       ret = ocp_get_log_simple(dev, C3_LATENCY_MON_OPCODE, C3_LATENCY_MON_LOG_BUF_LEN,
+                                data);
 
        if (strcmp(format, "json"))
                fprintf(stderr, "NVMe Status:%s(%x)\n", nvme_status_to_string(ret, false), ret);
@@ -1286,8 +1286,8 @@ static int get_c9_log_page_data(struct nvme_dev *dev, int print_data, int save_b
        }
        memset(header_data, 0, sizeof(__u8) * C9_TELEMETRY_STR_LOG_LEN);
 
-       ret = nvme_get_log_simple(dev_fd(dev), C9_TELEMETRY_STRING_LOG_ENABLE_OPCODE,
-                                 C9_TELEMETRY_STR_LOG_LEN, header_data);
+       ret = ocp_get_log_simple(dev, C9_TELEMETRY_STRING_LOG_ENABLE_OPCODE,
+                                C9_TELEMETRY_STR_LOG_LEN, header_data);
 
        if (!ret) {
                log_data = (struct telemetry_str_log_format *)header_data;
@@ -1329,8 +1329,8 @@ static int get_c9_log_page_data(struct nvme_dev *dev, int print_data, int save_b
                }
                memset(pC9_string_buffer, 0, sizeof(__u8) * total_log_page_sz);
 
-               ret = nvme_get_log_simple(dev_fd(dev), C9_TELEMETRY_STRING_LOG_ENABLE_OPCODE,
-                                         total_log_page_sz, pC9_string_buffer);
+               ret = ocp_get_log_simple(dev, C9_TELEMETRY_STRING_LOG_ENABLE_OPCODE,
+                                        total_log_page_sz, pC9_string_buffer);
        } else {
                fprintf(stderr, "ERROR : OCP : Unable to read C9 data.\n");
        }
@@ -1601,8 +1601,7 @@ static int get_c5_log_page(struct nvme_dev *dev, char *format)
        }
        memset(data, 0, sizeof(__u8) * C5_UNSUPPORTED_REQS_LEN);
 
-       ret = nvme_get_log_simple(dev_fd(dev), C5_UNSUPPORTED_REQS_OPCODE,
-                                 C5_UNSUPPORTED_REQS_LEN, data);
+       ret = ocp_get_log_simple(dev, C5_UNSUPPORTED_REQS_OPCODE, C5_UNSUPPORTED_REQS_LEN, data);
        if (!ret) {
                log_data = (struct unsupported_requirement_log *)data;
 
@@ -1707,7 +1706,8 @@ static int get_c1_log_page(struct nvme_dev *dev, char *format)
        }
        memset(data, 0, sizeof(__u8) * C1_ERROR_RECOVERY_LOG_BUF_LEN);
 
-       ret = nvme_get_log_simple(dev_fd(dev), C1_ERROR_RECOVERY_OPCODE, C1_ERROR_RECOVERY_LOG_BUF_LEN, data);
+       ret = ocp_get_log_simple(dev, C1_ERROR_RECOVERY_OPCODE, C1_ERROR_RECOVERY_LOG_BUF_LEN,
+                                data);
 
        if (!ret) {
                log_data = (struct ocp_error_recovery_log_page *)data;
@@ -1810,7 +1810,7 @@ static int get_c4_log_page(struct nvme_dev *dev, char *format)
        }
        memset(data, 0, sizeof(__u8) * C4_DEV_CAP_REQ_LEN);
 
-       ret = nvme_get_log_simple(dev_fd(dev), C4_DEV_CAP_REQ_OPCODE, C4_DEV_CAP_REQ_LEN, data);
+       ret = ocp_get_log_simple(dev, C4_DEV_CAP_REQ_OPCODE, C4_DEV_CAP_REQ_LEN, data);
 
        if (!ret) {
                log_data = (struct ocp_device_capabilities_log_page *)data;
@@ -2541,8 +2541,7 @@ static int get_c7_log_page(struct nvme_dev *dev, char *format)
        }
        memset(data, 0, sizeof(__u8) * C7_TCG_CONFIGURATION_LEN);
 
-       ret = nvme_get_log_simple(dev_fd(dev), C7_TCG_CONFIGURATION_OPCODE,
-                                 C7_TCG_CONFIGURATION_LEN, data);
+       ret = ocp_get_log_simple(dev, C7_TCG_CONFIGURATION_OPCODE, C7_TCG_CONFIGURATION_LEN, data);
        if (!ret) {
                log_data = (struct tcg_configuration_log *)data;
 

diff --git a/plugins/ocp/ocp-utils.c b/plugins/ocp/ocp-utils.c
index 8a1462e706d398a82c8af7b1c3798078b76f531f..d492bdbf8556889899ff863a23b5fb9894332fb8 100644 (file)
--- a/plugins/ocp/ocp-utils.c
+++ b/plugins/ocp/ocp-utils.c
@@ -37,3 +37,23 @@ int ocp_get_uuid_index(struct nvme_dev *dev, __u8 *index)
 
        return ocp_find_uuid_index(&uuid_list, index);
 }
+
+int ocp_get_log_simple(struct nvme_dev *dev, enum nvme_cmd_get_log_lid lid, __u32 len, void *log)
+{
+       int fd = dev_fd(dev);
+       struct nvme_get_log_args args = {
+               .log = log,
+               .args_size = sizeof(args),
+               .fd = fd,
+               .timeout = NVME_DEFAULT_IOCTL_TIMEOUT,
+               .lid = lid,
+               .len = len,
+               .nsid = NVME_NSID_ALL,
+               .lsi = NVME_LOG_LSI_NONE,
+               .lsp = NVME_LOG_LSP_NONE,
+       };
+
+       ocp_get_uuid_index(dev, &args.uuidx);
+
+       return nvme_get_log_page(fd, NVME_LOG_PAGE_PDU_SIZE, &args);
+}

diff --git a/plugins/ocp/ocp-utils.h b/plugins/ocp/ocp-utils.h
index 1512db87d7a532875159159975fd355c8e4f6f67..4370b624e43604112451f033d757d90e2a223102 100644 (file)
--- a/plugins/ocp/ocp-utils.h
+++ b/plugins/ocp/ocp-utils.h
@@ -30,3 +30,5 @@ int ocp_get_uuid_index(struct nvme_dev *dev, __u8 *index);
  * Return: Zero if nvme device has UUID list log page, Negative POSIX error code otherwise.
  */
 int ocp_find_uuid_index(struct nvme_id_uuid_list *uuid_list, __u8 *index);
+
+int ocp_get_log_simple(struct nvme_dev *dev, enum nvme_cmd_get_log_lid lid, __u32 len, void *log);