mi: Add Identify function for secondary controller list

This change adds a helper for the Identify command, retrieving the
secondary controller list. We add a simple test too.

Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au>

diff --git a/src/nvme/mi.h b/src/nvme/mi.h
index d48f9f6a083302c751224a44f07731cef016f2bb..2ec3e97f40036543cc0c7ee4c82165c66f292887 100644 (file)
--- a/src/nvme/mi.h
+++ b/src/nvme/mi.h
@@ -1230,6 +1230,46 @@ static inline int nvme_mi_admin_identify_active_ns_list(nvme_mi_ctrl_t ctrl,
        return nvme_mi_admin_identify(ctrl, &args);
 }
 
+/**
+ * nvme_mi_admin_identify_secondary_ctrl_list() - Perform an Admin identify for
+ * a secondary controller list.
+ * @ctrl: Controller to process identify command
+ * @nsid: Namespace ID to specify list start
+ * @cntid: Controller ID to specify list start
+ * @list: List data to populate
+ *
+ * Perform an Identify command, for the secondary controllers associated with
+ * the current primary controller. Only entries with IDs greater than or
+ * equal to @cntid are returned.
+ *
+ * Will return an error if the length of the response data (from the
+ * controller) is not a full &NVME_IDENTIFY_DATA_SIZE, so @list will be
+ * be fully populated on success.
+ *
+ * Return: 0 on success, non-zero on failure
+ *
+ * See: &struct nvme_secondary_ctrl_list
+ */
+static inline int nvme_mi_admin_identify_secondary_ctrl_list(nvme_mi_ctrl_t ctrl,
+                                                            __u32 nsid,
+                                                            __u16 cntid,
+                                                            struct nvme_secondary_ctrl_list *list)
+{
+       struct nvme_identify_args args = {
+               .result = NULL,
+               .data = list,
+               .args_size = sizeof(args),
+               .cns = NVME_IDENTIFY_CNS_SECONDARY_CTRL_LIST,
+               .csi = NVME_CSI_NVM,
+               .nsid = nsid,
+               .cntid = cntid,
+               .cns_specific_id = NVME_CNSSPECID_NONE,
+               .uuidx = NVME_UUID_NONE,
+       };
+
+       return nvme_mi_admin_identify(ctrl, &args);
+}
+
 /**
  * nvme_mi_admin_get_log() - Retrieve log page data from controller
  * @ctrl: Controller to query

diff --git a/test/mi.c b/test/mi.c
index 01a53467c75e529288afe3bf501d2e9a09be475e..bee35135498e05e9bf10b5eed69987ba3eac7c47 100644 (file)
--- a/test/mi.c
+++ b/test/mi.c
@@ -1170,6 +1170,52 @@ static void test_admin_id_nsid_ctrl_list(struct nvme_mi_ep *ep)
        assert(!rc);
 }
 
+static int test_admin_id_secondary_ctrl_list_cb(struct nvme_mi_ep *ep,
+                                               struct nvme_mi_req *req,
+                                               struct nvme_mi_resp *resp,
+                                               void *data)
+{
+       __u16 cns, ctrlid;
+       __u32 nsid;
+       __u8 *hdr;
+
+       hdr = (__u8 *)req->hdr;
+       assert(hdr[4] == nvme_admin_identify);
+
+       assert(req->data_len == 0);
+
+       cns = hdr[45] << 8 | hdr[44];
+       assert(cns == NVME_IDENTIFY_CNS_SECONDARY_CTRL_LIST);
+
+       nsid = hdr[11] << 24 | hdr[10] << 16 | hdr[9] << 8 | hdr[8];
+       assert(nsid == 0x01020304);
+
+       ctrlid = hdr[47] << 8 | hdr[46];
+       assert(ctrlid == 5);
+
+       resp->data_len = sizeof(struct nvme_secondary_ctrl_list);
+       test_transport_resp_calc_mic(resp);
+
+       return 0;
+}
+
+static void test_admin_id_secondary_ctrl_list(struct nvme_mi_ep *ep)
+{
+       struct nvme_secondary_ctrl_list list;
+       nvme_mi_ctrl_t ctrl;
+       int rc;
+
+       test_set_transport_callback(ep, test_admin_id_secondary_ctrl_list_cb,
+                                   NULL);
+
+       ctrl = nvme_mi_init_ctrl(ep, 5);
+       assert(ctrl);
+
+       rc = nvme_mi_admin_identify_secondary_ctrl_list(ctrl, 0x01020304,
+                                                       5, &list);
+       assert(!rc);
+}
+
 static int test_admin_ns_mgmt_cb(struct nvme_mi_ep *ep,
                                 struct nvme_mi_req *req,
                                 struct nvme_mi_resp *resp,
@@ -1522,6 +1568,7 @@ struct test {
        DEFINE_TEST(admin_id_alloc_ns),
        DEFINE_TEST(admin_id_active_ns),
        DEFINE_TEST(admin_id_nsid_ctrl_list),
+       DEFINE_TEST(admin_id_secondary_ctrl_list),
        DEFINE_TEST(admin_ns_mgmt_create),
        DEFINE_TEST(admin_ns_mgmt_delete),
        DEFINE_TEST(admin_ns_attach),