mi: Add support for multiple csi buffers

These are used to send up to two concurrent requests over MI
to the endpoint.

Signed-off-by: Chuck Horkin <[email protected]>

Author: chorkin

examples/mi-mctp.c

@@ -17,11 +17,13 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
+#include <pthread.h>
 
 #include <libnvme-mi.h>
 
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
+#include <bits/pthreadtypes.h>
 
 static void show_port_pcie(struct nvme_mi_read_port_info *port)
 {
@@ -375,7 +377,7 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 {
 	struct nvme_get_log_args args = { 0 };
 	struct nvme_mi_ctrl *ctrl;
-	uint8_t buf[512];
+	uint8_t buf[4096];
 	uint16_t ctrl_id;
 	int rc, tmp;
 
@@ -421,6 +423,13 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 	return 0;
 }
 
+struct thread_struct {
+	nvme_mi_ep_t ep;
+	int argc;
+	char **argv;
+	int rc;
+};
+
 int do_admin_raw(nvme_mi_ep_t ep, int argc, char **argv)
 {
 	struct nvme_mi_admin_req_hdr req;
@@ -513,6 +522,14 @@ int do_admin_raw(nvme_mi_ep_t ep, int argc, char **argv)
 	return 0;
 }
 
+void *csi_thread_helper(void *context)
+{
+	struct thread_struct *s = (struct thread_struct *) context;
+
+	s->rc = do_get_log_page(s->ep, s->argc, s->argv);
+	return NULL;
+}
+
 static struct {
 	uint8_t id;
 	const char *name;
@@ -729,9 +746,61 @@ enum action {
 	ACTION_CONFIG_GET,
 	ACTION_CONFIG_SET,
 	ACTION_CONTROL_PRIMITIVE,
+	ACTION_CSI_TEST,
 };
 
-static int do_action_endpoint(enum action action, nvme_mi_ep_t ep, int argc, char** argv)
+int do_csi_test(nvme_root_t root, nvme_mi_ep_t ep,
+		int net, __u8 eid, int argc, char **argv)
+{
+	int rc = 0;
+	nvme_mi_ep_t ep2 = nvme_mi_open_mctp(root, net, eid);
+
+	if (!ep2)
+		errx(EXIT_FAILURE, "can't open MCTP endpoint %d:%d", net, eid);
+
+	pthread_t thread;
+
+	set_csi(ep, 0);//Not necessary, but to be explicit
+	set_csi(ep2, 1);
+	struct thread_struct s;
+
+	s.ep = ep2;
+	s.argc = argc;
+	s.argv = argv;
+
+	// Create a new thread to run my_function
+	if (pthread_create(&thread, NULL, csi_thread_helper, &s)) {
+		fprintf(stderr, "Error creating thread\n");
+		return 1;
+	}
+
+	rc = do_get_log_page(ep, argc, argv);
+
+	// Main thread continues to do other work
+	printf("Main thread finished\n");
+
+	// Wait for the created thread to finish
+	if (pthread_join(thread, NULL)) {
+		fprintf(stderr, "Error joining thread\n");
+		return 2;
+	}
+
+	printf("Second thread finished with rc=%d\n", s.rc);
+
+	if (rc)
+		return rc;
+	if (s.rc)
+		return s.rc;
+	return 0;
+}
+
+static int do_action_endpoint(enum action action,
+				nvme_root_t root,
+				int net,
+				uint8_t eid,
+				nvme_mi_ep_t ep,
+				int argc,
+				char **argv)
 {
 	int rc;
 
@@ -763,6 +832,9 @@ static int do_action_endpoint(enum action action, nvme_mi_ep_t ep, int argc, cha
 	case ACTION_CONTROL_PRIMITIVE:
 		rc = do_control_primitive(ep, argc, argv);
 		break;
+	case ACTION_CSI_TEST:
+		rc = do_csi_test(root, ep, net, eid, argc, argv);
+		break;
 	default:
 		/* This shouldn't be possible, as we should be covering all
 		 * of the enum action options above. Hoever, keep the compilers
@@ -810,6 +882,7 @@ int main(int argc, char **argv)
 			"  get-config [port]\n"
 			"  set-config <port> <type> <val>\n"
 			"  control-primitive [action(abort|pause|resume|get-state|replay)]\n"
+			"  csi-test\n"
 			"\n"
 			"  'dbus' target will query D-Bus for known MCTP endpoints\n"
 			);
@@ -833,6 +906,8 @@ int main(int argc, char **argv)
 			action = ACTION_GET_LOG_PAGE;
 		} else if (!strcmp(action_str, "admin")) {
 			action = ACTION_ADMIN_RAW;
+		} else if (!strcmp(action_str, "csi-test")) {
+			action = ACTION_CSI_TEST;
 		} else if (!strcmp(action_str, "security-info")) {
 			action = ACTION_SECURITY_INFO;
 		} else if (!strcmp(action_str, "get-config")) {
@@ -859,7 +934,7 @@ int main(int argc, char **argv)
 		nvme_mi_for_each_endpoint(root, ep) {
 			char *desc = nvme_mi_endpoint_desc(ep);
 			printf("%s\n", desc);
-			rc = do_action_endpoint(action, ep, argc, argv);
+			rc = do_action_endpoint(action, root, net, eid, ep, argc, argv);
 			printf("---\n");
 			free(desc);
 		}
@@ -872,7 +947,7 @@ int main(int argc, char **argv)
 		ep = nvme_mi_open_mctp(root, net, eid);
 		if (!ep)
 			errx(EXIT_FAILURE, "can't open MCTP endpoint %d:%d", net, eid);
-		rc = do_action_endpoint(action, ep, argc, argv);
+		rc = do_action_endpoint(action, root, net, eid, ep, argc, argv);
 		nvme_mi_close(ep);
 		nvme_mi_free_root(root);
 	}

src/libnvme-mi.map

@@ -1,3 +1,8 @@
+LIBNVME_MI_1_14 {
+	global:
+		set_csi;
+};
+
 LIBNVME_MI_1_12 {
 	global:
 		nvme_mi_mi_xfer;

src/nvme/mi-mctp.c

@@ -337,7 +337,6 @@ static int nvme_mi_mctp_submit(struct nvme_mi_ep *ep,
 
 	rc = -1;
 	len = ops.recvmsg(mctp->sd, &resp_msg, MSG_DONTWAIT);
-
 	if (len < 0) {
 		errno_save = errno;
 		nvme_msg(ep->root, LOG_ERR,

src/nvme/mi.c

@@ -505,6 +505,11 @@ int nvme_mi_submit(nvme_mi_ep_t ep, struct nvme_mi_req *req,
 	return 0;
 }
 
+void set_csi(nvme_mi_ep_t ep, uint8_t csi)
+{
+	ep->csi = csi & 0b1;
+}
+
 static void nvme_mi_admin_init_req(struct nvme_mi_req *req,
 				   struct nvme_mi_admin_req_hdr *hdr,
 				   __u16 ctrl_id, __u8 opcode)
@@ -676,7 +681,9 @@ int nvme_mi_admin_xfer(nvme_mi_ctrl_t ctrl,
 
 	admin_req->hdr.type = NVME_MI_MSGTYPE_NVME;
 	admin_req->hdr.nmp = (NVME_MI_ROR_REQ << 7) |
-				(NVME_MI_MT_ADMIN << 3);
+				(NVME_MI_MT_ADMIN << 3) | 
+				(ctrl->ep->csi & 1);
+
 	admin_req->ctrl_id = cpu_to_le16(ctrl->id);
 	memset(&req, 0, sizeof(req));
 	req.hdr = &admin_req->hdr;
@@ -929,6 +936,7 @@ static int __nvme_mi_admin_get_log(nvme_mi_ctrl_t ctrl,
 	ndw = (len >> 2) - 1;
 
 	nvme_mi_admin_init_req(&req, &req_hdr, ctrl->id, nvme_admin_get_log_page);
+	req_hdr.hdr.nmp |= (ctrl->ep->csi & 1);
 	req_hdr.cdw1 = cpu_to_le32(args->nsid);
 	req_hdr.cdw10 = cpu_to_le32((ndw & 0xffff) << 16 |
 				    ((!final || args->rae) ? 1 : 0) << 15 |

src/nvme/mi.h

@@ -478,6 +478,8 @@ struct nvme_mi_ep;
  */
 typedef struct nvme_mi_ep * nvme_mi_ep_t;
 
+void set_csi(nvme_mi_ep_t ep, uint8_t csi);
+
 /**
  * nvme_mi_first_endpoint - Start endpoint iterator
  * @m: &nvme_root_t object

src/nvme/private.h

@@ -265,6 +265,8 @@ struct nvme_mi_ep {
 	unsigned int mprt_max;
 	unsigned long quirks;
 
+	__u8 csi;
+
 	/* inter-command delay, for NVME_QUIRK_MIN_INTER_COMMAND_TIME */
 	unsigned int inter_command_us;
 	struct timespec last_resp_time;