MI: reinstate init_ep and crc32 functions for use in test

Ideally, we would be using the actual implementation of
nvme_mi_init_ep() and nvme_mi_crc32_update for our tests, rather than
open-coding it in the test init.

This change exports nvme_mi_init_ep and nvme_mi_crc32_update from
libnvme-mi.so, but both remain excluded from the headers, as they are
only intended for use in the transport API. This means we can call them
from the tests, but keep somewhat-internal.

We put this into a specific _TEST section of the version script, to keep
separate from the public symbols, and add a comment to suit.

This prevents us from diverging the endpoint init process in our
testcases.

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

diff --git a/src/libnvme-mi.map b/src/libnvme-mi.map
index cad72afdf0a5effb22a486bbe30db0bd946f56d8..83c7e5f069a29df9c9473ecb7af354052974a295 100644 (file)
--- a/src/libnvme-mi.map
+++ b/src/libnvme-mi.map
@@ -19,3 +19,11 @@ LIBNVME_MI_1_1 {
        local:
                *;
 };
+# API exported only for libnvme-mi internal test functions. These should
+# not be used other than through the in-tree tests, and cannot be considered
+# at all stable.
+LIBNVME_MI_TEST {
+       global:
+               nvme_mi_init_ep;
+               nvme_mi_crc32_update;
+};

diff --git a/test/mi.c b/test/mi.c
index 0165211bafd9c75c159439b183ddc34bff879fa7..077f89b8210dec01b1626d412a76a0d9d2531615 100644 (file)
--- a/test/mi.c
+++ b/test/mi.c
@@ -30,18 +30,6 @@ struct test_transport_data {
 
 static const int test_transport_magic = 0x74657374;
 
-static __u32 crc32_update(__u32 crc, void *data, size_t len)
-{
-       int i;
-
-       while (len--) {
-               crc ^= *(unsigned char *)(data++);
-               for (i = 0; i < 8; i++)
-                       crc = (crc >> 1) ^ ((crc & 1) ? 0x82F63B78 : 0);
-       }
-       return crc;
-}
-
 static int test_transport_submit(struct nvme_mi_ep *ep,
                                 struct nvme_mi_req *req,
                                 struct nvme_mi_resp *resp)
@@ -70,11 +58,11 @@ static void test_transport_close(struct nvme_mi_ep *ep)
 /* internal test helper to generate correct response crc */
 static void test_transport_resp_calc_mic(struct nvme_mi_resp *resp)
 {
-       extern __u32 crc32_update(__u32 crc, void *data, size_t len);
+       extern __u32 nvme_mi_crc32_update(__u32 crc, void *data, size_t len);
        __u32 crc = 0xffffffff;
 
-       crc = crc32_update(crc, resp->hdr, resp->hdr_len);
-       crc = crc32_update(crc, resp->data, resp->data_len);
+       crc = nvme_mi_crc32_update(crc, resp->hdr, resp->hdr_len);
+       crc = nvme_mi_crc32_update(crc, resp->data, resp->data_len);
 
        resp->mic = ~crc;
 }
@@ -101,9 +89,8 @@ nvme_mi_ep_t nvme_mi_open_test(nvme_root_t root)
        struct test_transport_data *tpd;
        struct nvme_mi_ep *ep;
 
-       ep = malloc(sizeof(*ep));
+       ep = nvme_mi_init_ep(root);
        assert(ep);
-       ep->root = root;
 
        tpd = malloc(sizeof(*tpd));
        assert(tpd);