Rework nvme_zns_append

examples/discover-loop.c

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  * Copyright (c) 2020 Western Digital Corporation or its affiliates.
  *
  * Authors: Keith Busch <[email protected]>
  */
 
-/**
+/*
  * discover-loop: Use fabrics commands to discover any loop targets and print
  * those records. You must have at least one configured nvme loop target on the
  * system (no existing connection required). The output will look more
@@ -59,22 +59,24 @@ int main()
 
 	nvmf_default_config(&cfg);
 
-	r = nvme_scan(NULL);
-	h = nvme_default_host(r);
-	if (!h) {
+	ret = nvme_scan(NULL, &r);
+	if (ret)
+		return ret;
+	ret = nvme_default_host(r, &h);
+	if (ret) {
 		fprintf(stderr, "Failed to allocated memory\n");
-		return ENOMEM;
+		return ret;
 	}
-	c = nvme_create_ctrl(r, NVME_DISC_SUBSYS_NAME, "loop",
-			     NULL, NULL, NULL, NULL);
-	if (!c) {
+	ret = nvme_create_ctrl(r, NVME_DISC_SUBSYS_NAME, "loop",
+			       NULL, NULL, NULL, NULL, &c);
+	if (ret) {
 		fprintf(stderr, "Failed to allocate memory\n");
 		return ENOMEM;
 	}
 	ret = nvmf_add_ctrl(h, c, &cfg);
-	if (ret < 0) {
+	if (ret) {
 		fprintf(stderr, "no controller found\n");
-		return errno;
+		return ret;
 	}
 
 	ret = nvmf_get_discovery_log(c, &log, 4);

examples/display-columnar.c

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  * Copyright (c) 2020 Western Digital Corporation or its affiliates.
  *
  * Authors: Keith Busch <[email protected]>
  */
 
-/**
+/*
  * display-columnar: Scans the nvme topology, prints each record type in a
  * column format for easy visual scanning.
  */
@@ -24,8 +24,7 @@ int main()
 	nvme_path_t p;
 	nvme_ns_t n;
 
-	r = nvme_scan(NULL);
-	if (!r)
+	if (nvme_scan(NULL, &r))
 		return -1;
 
 

examples/display-tree.c

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  * Copyright (c) 2020 Western Digital Corporation or its affiliates.
  *
  * Authors: Keith Busch <[email protected]>
  */
 
-/**
+/*
  * display-tree: Scans the nvme topology, prints as an ascii tree with some
  * selected attributes for each component.
  */
@@ -23,8 +23,7 @@ int main()
 	nvme_path_t p, _p;
 	nvme_ns_t n, _n;
 
-	r = nvme_scan(NULL);
-	if (!r)
+	if (nvme_scan(NULL, &r))
 		return -1;
 
 	printf(".\n");

examples/mi-conf.c

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  * Copyright (c) 2022 Code Construct Pty Ltd.
  *
  * Authors: Jeremy Kerr <[email protected]>
  */
 
-/**
+/*
  * mi-conf: query a device for optimal MTU and set for both the local MCTP
  * route (through dbus to mctpd) and the device itself (through NVMe-MI
  * configuration commands)

examples/mi-mctp-ae.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  */
 
-/**
+/*
  * mi-mctp-ae: open a MI connection over MCTP, supporting asynchronous event messages
  */
 
@@ -131,7 +131,7 @@ int main(int argc, char **argv)
 	}
 
 	rc = nvme_mi_aem_enable(ep, &aem_config, &data);
-	if (rc && errno == EOPNOTSUPP)
+	if (rc == EOPNOTSUPP)
 		errx(EXIT_FAILURE, "MCTP Peer-Bind is required for AEM");
 	else if (rc)
 		err(EXIT_FAILURE, "Can't enable aem:%d", rc);

examples/mi-mctp-csi-test.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  */
 
-/**
+/*
  * mi-mctp-csi-test: open a MI connection over MCTP, and send two commands
  * in parallel with different CSI buffers
  */
@@ -56,7 +56,7 @@ void hexdump(const unsigned char *buf, int len)
 
 int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 {
-	struct nvme_get_log_args args = { 0 };
+	enum nvme_cmd_get_log_lid lid;
 	struct nvme_link *link;
 	uint8_t buf[4096];
 	uint16_t ctrl_id;
@@ -75,15 +75,11 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 
 	ctrl_id = tmp & 0xffff;
 
-	args.args_size = sizeof(args);
-	args.log = buf;
-	args.len = sizeof(buf);
-
 	if (argc > 2) {
 		tmp = atoi(argv[2]);
-		args.lid = tmp & 0xff;
+		lid = tmp & 0xff;
 	} else {
-		args.lid = 0x1;
+		lid = 0x1;
 	}
 
 	link = nvme_mi_init_link(ep, ctrl_id);
@@ -92,14 +88,18 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 		return -1;
 	}
 
-	rc = nvme_mi_admin_get_log(link, &args);
+	rc = nvme_get_log(link, NVME_NSID_NONE, false, NVME_LOG_LSP_NONE,
+		lid, NVME_LOG_LSI_NONE, NVME_CSI_NVM,
+		false, NVME_UUID_NONE,
+		0, buf, sizeof(buf),
+		sizeof(buf), NULL);
 	if (rc) {
 		warn("can't perform Get Log page command");
 		return -1;
 	}
 
-	printf("Get log page (log id = 0x%02x) data:\n", args.lid);
-	hexdump(buf, args.len);
+	printf("Get log page (log id = 0x%02x) data:\n", lid);
+	hexdump(buf, sizeof(buf));
 
 	return 0;
 }

examples/mi-mctp.c

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  * Copyright (c) 2021 Code Construct Pty Ltd.
  *
  * Authors: Jeremy Kerr <[email protected]>
  */
 
-/**
+/*
  * mi-mctp: open a MI connection over MCTP, and query controller info
  */
 
@@ -178,7 +178,6 @@ static const char *__copy_id_str(const void *field, size_t size,
 
 int do_identify(nvme_mi_ep_t ep, int argc, char **argv)
 {
-	struct nvme_identify_args id_args = { 0 };
 	struct nvme_link *link;
 	struct nvme_id_ctrl id;
 	uint16_t ctrl_id;
@@ -207,23 +206,19 @@ int do_identify(nvme_mi_ep_t ep, int argc, char **argv)
 		return -1;
 	}
 
-	id_args.data = &id;
-	id_args.args_size = sizeof(id_args);
-	id_args.cns = NVME_IDENTIFY_CNS_CTRL;
-	id_args.nsid = NVME_NSID_NONE;
-	id_args.cntid = 0;
-	id_args.csi = NVME_CSI_NVM;
-
 	/* for this example code, we can either do a full or partial identify;
 	 * since we're only printing the fields before the 'rab' member,
 	 * these will be equivalent, aside from the size of the MI
 	 * response.
 	 */
 	if (partial) {
-		rc = nvme_mi_admin_identify_partial(link, &id_args, 0,
-					    offsetof(struct nvme_id_ctrl, rab));
+		rc = nvme_identify_partial(link, NVME_NSID_NONE, 0, NVME_IDENTIFY_CNS_CTRL,
+					   NVME_CSI_NVM, 0, 0, &id,
+					   offsetof(struct nvme_id_ctrl, rab),
+					   NULL);
 	} else {
-		rc = nvme_mi_admin_identify(link, &id_args);
+		rc = nvme_identify(link, NVME_NSID_NONE, 0, NVME_IDENTIFY_CNS_CTRL,
+				   NVME_CSI_NVM, 0, 0, &id, NULL);
 	}
 
 	if (rc) {
@@ -373,7 +368,7 @@ void hexdump(const unsigned char *buf, int len)
 
 int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 {
-	struct nvme_get_log_args args = { 0 };
+	enum nvme_cmd_get_log_lid lid;
 	struct nvme_link *link;
 	uint8_t buf[512];
 	uint16_t ctrl_id;
@@ -392,15 +387,11 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 
 	ctrl_id = tmp & 0xffff;
 
-	args.args_size = sizeof(args);
-	args.log = buf;
-	args.len = sizeof(buf);
-
 	if (argc > 2) {
 		tmp = atoi(argv[2]);
-		args.lid = tmp & 0xff;
+		lid = tmp & 0xff;
 	} else {
-		args.lid = 0x1;
+		lid = 0x1;
 	}
 
 	link = nvme_mi_init_link(ep, ctrl_id);
@@ -409,14 +400,18 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
 		return -1;
 	}
 
-	rc = nvme_mi_admin_get_log(link, &args);
+	rc = nvme_get_log(link, NVME_NSID_NONE, false, NVME_LOG_LSP_NONE,
+		lid, NVME_LOG_LSI_NONE, NVME_CSI_NVM,
+		false, NVME_UUID_NONE,
+		0, buf, sizeof(buf),
+		sizeof(buf), NULL);
 	if (rc) {
 		warn("can't perform Get Log page command");
 		return -1;
 	}
 
-	printf("Get log page (log id = 0x%02x) data:\n", args.lid);
-	hexdump(buf, args.len);
+	printf("Get log page (log id = 0x%02x) data:\n", lid);
+	hexdump(buf, sizeof(buf));
 
 	return 0;
 }
@@ -542,7 +537,6 @@ static const char *sec_proto_description(uint8_t id)
 
 int do_security_info(nvme_mi_ep_t ep, int argc, char **argv)
 {
-	struct nvme_security_receive_args args = { 0 };
 	nvme_link_t link;
 	int i, rc, n_proto;
 	unsigned long tmp;
@@ -552,6 +546,9 @@ int do_security_info(nvme_mi_ep_t ep, int argc, char **argv)
 		uint16_t	len;
 		uint8_t		protocols[256];
 	} proto_info;
+	/* protocol 0x00, spsp 0x0000: retrieve supported protocols */
+	void *data = &proto_info;
+	__u32 data_len = sizeof(proto_info);
 
 	if (argc != 2) {
 		fprintf(stderr, "no controller ID specified\n");
@@ -572,27 +569,21 @@ int do_security_info(nvme_mi_ep_t ep, int argc, char **argv)
 		return -1;
 	}
 
-	/* protocol 0x00, spsp 0x0000: retrieve supported protocols */
-	args.args_size = sizeof(args);
-	args.data = &proto_info;
-	args.data_len = sizeof(proto_info);
-
-	rc = nvme_mi_admin_security_recv(link, &args);
+	rc = nvme_security_receive(link, 0, 0, 0, 0, 0, 0, data, data_len, NULL);
 	if (rc) {
 		warnx("can't perform Security Receive command: rc %d", rc);
 		return -1;
 	}
 
-	if (args.data_len < 6) {
-		warnx("Short response in security receive command (%d bytes)",
-		      args.data_len);
+	if (data_len < 6) {
+		warnx("Short response in security receive command (%d bytes)", data_len);
 		return -1;
 	}
 
 	n_proto = be16_to_cpu(proto_info.len);
-	if (args.data_len < 6 + n_proto) {
-		warnx("Short response in security receive command (%d bytes), "
-		      "for %d protocols", args.data_len, n_proto);
+	if (data_len < 6 + n_proto) {
+		warnx("Short response in security receive command (%d bytes), for %d protocols",
+		      data_len, n_proto);
 		return -1;
 	}
 

examples/telemetry-listen.c

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
-/**
+/*
  * This file is part of libnvme.
  * Copyright (c) 2020 Western Digital Corporation or its affiliates.
  *
  * Authors: Keith Busch <[email protected]>
  */
 
-/**
+/*
  * Open all nvme controller's uevent and listen for changes. If NVME_AEN event
  * is observed with controller telemetry data, read the log and save it to a
  * file in /var/log/ with the device's unique name and epoch timestamp.
@@ -134,8 +134,7 @@ int main()
 	nvme_host_t h;
 	nvme_root_t r;
 
-	r = nvme_scan(NULL);
-	if (!r)
+	if (nvme_scan(NULL, &r))
 		return EXIT_FAILURE;
 
 	nvme_for_each_host(r, h)