fabrics: move connect/disconnect to fabrics API

The connect and disconnect functions belong to the fabrics API. Move
them there. While at it, also move libnvme_ctrl_get_config to the
fabrics.h header, since it returns the fabrics configuration.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

fabrics.c

@@ -773,7 +773,7 @@ static void nvmf_disconnect_nqn(struct libnvme_global_ctx *ctx, char *nqn)
 				if (strcmp(libnvme_subsystem_get_subsysnqn(s), p))
 					continue;
 				libnvme_subsystem_for_each_ctrl(s, c) {
-					if (!libnvme_disconnect_ctrl(c))
+					if (!libnvmf_disconnect_ctrl(c))
 						i++;
 				}
 			}
@@ -856,7 +856,7 @@ int fabrics_disconnect(const char *desc, int argc, char **argv)
 					"Did not find device %s\n", p);
 				return -ENODEV;
 			}
-			ret = libnvme_disconnect_ctrl(c);
+			ret = libnvmf_disconnect_ctrl(c);
 			if (ret)
 				fprintf(stderr,
 					"Failed to disconnect %s: %s\n",
@@ -922,7 +922,7 @@ int fabrics_disconnect_all(const char *desc, int argc, char **argv)
 				else if (!strcmp(libnvme_ctrl_get_transport(c),
 						 "pcie"))
 					continue;
-				if (libnvme_disconnect_ctrl(c))
+				if (libnvmf_disconnect_ctrl(c))
 					fprintf(stderr,
 						"failed to disconnect %s\n",
 						libnvme_ctrl_get_name(c));

libnvme/examples/discover-loop.c

@@ -77,7 +77,7 @@ int main()
 		goto free_fctx;
 	}
 
-	ret = libnvme_create_ctrl(ctx, NVME_DISC_SUBSYS_NAME, "loop",
+	ret = libnvmf_create_ctrl(ctx, NVME_DISC_SUBSYS_NAME, "loop",
 			       NULL, NULL, NULL, NULL, &c);
 	if (ret) {
 		fprintf(stderr, "Failed to allocate memory\n");
@@ -97,7 +97,7 @@ int main()
 		libnvmf_discovery_args_free(args);
 	}
 
-	libnvme_disconnect_ctrl(c);
+	libnvmf_disconnect_ctrl(c);
 	libnvme_free_ctrl(c);
 
 	if (ret)

libnvme/libnvme/nvme.i

@@ -744,7 +744,7 @@ struct libnvmf_context {};
 		  const char *host_iface = NULL,
 		  const char *trsvcid = NULL) {
 		struct libnvme_ctrl *c;
-		if (libnvme_create_ctrl(ctx, subsysnqn, transport, traddr,
+		if (libnvmf_create_ctrl(ctx, subsysnqn, transport, traddr,
 					host_traddr, host_iface, trsvcid, &c))
 			return NULL;
 		return c;
@@ -757,7 +757,7 @@ struct libnvmf_context {};
 	}
 	struct libnvme_ctrl* __exit__(PyObject *type, PyObject *value, PyObject *traceback) {
 		if (libnvme_ctrl_get_name($self))
-			libnvme_disconnect_ctrl($self);
+			libnvmf_disconnect_ctrl($self);
 		return $self;
 	}
 
@@ -801,7 +801,7 @@ struct libnvmf_context {};
 			return;
 		}
 		Py_BEGIN_ALLOW_THREADS  /* Release Python GIL */
-		ret = libnvme_disconnect_ctrl($self);
+		ret = libnvmf_disconnect_ctrl($self);
 		Py_END_ALLOW_THREADS    /* Reacquire Python GIL */
 		if (ret < 0)
 			connect_err = 2;

libnvme/src/libnvme.ld

@@ -4,12 +4,10 @@ LIBNVME_3 {
 	global:
 		libnvme_clear_etdas;
 		libnvme_close;
-		libnvme_create_ctrl;
 		libnvme_create_global_ctx;
 		libnvme_create_raw_secret;
 		libnvme_ctrl_first_ns;
 		libnvme_ctrl_first_path;
-		libnvme_ctrl_get_config;
 		libnvme_ctrl_get_phy_slot;
 		libnvme_ctrl_get_src_addr;
 		libnvme_ctrl_get_state;
@@ -22,7 +20,6 @@ LIBNVME_3 {
 		libnvme_ctrl_next_path;
 		libnvme_ctrl_release_transport_handle;
 		libnvme_describe_key_serial;
-		libnvme_disconnect_ctrl;
 		libnvme_dump_config;
 		libnvme_dump_tree;
 		libnvme_errno_to_string;

libnvme/src/libnvmf.ld

@@ -19,17 +19,20 @@ LIBNVMF_3 {
 		libnvmf_context_set_fabrics_config;
 		libnvmf_context_set_hostnqn;
 		libnvmf_context_set_persistent;
+		libnvmf_create_ctrl;
+		libnvmf_ctrl_get_config;
 		libnvmf_default_config;
+		libnvmf_disconnect_ctrl;
 		libnvmf_discovery;
+		libnvmf_discovery_args_create;
+		libnvmf_discovery_args_free;
 		libnvmf_discovery_config_file;
 		libnvmf_discovery_config_json;
 		libnvmf_discovery_nbft;
 		libnvmf_eflags_str;
 		libnvmf_exat_ptr_next;
 		libnvmf_free_uri;
 		libnvmf_get_default_trsvcid;
-		libnvmf_discovery_args_create;
-		libnvmf_discovery_args_free;
 		libnvmf_get_discovery_log;
 		libnvmf_is_registration_supported;
 		libnvmf_nbft_free;

libnvme/src/nvme/fabrics.c

@@ -378,6 +378,12 @@ __public int libnvmf_context_set_device(struct libnvmf_context *fctx, const char
 	return 0;
 }
 
+__public struct libnvme_fabrics_config *libnvmf_ctrl_get_config(
+		libnvme_ctrl_t c)
+{
+	return &c->cfg;
+}
+
 /*
  * Derived from Linux's supported options (the opt_tokens table)
  * when the mechanism to report supported options was added (f18ee3d988157).
@@ -414,7 +420,7 @@ static const struct libnvme_fabric_options default_supported_options = {
 static void merge_config(libnvme_ctrl_t c,
 		const struct libnvme_fabrics_config *cfg)
 {
-	struct libnvme_fabrics_config *ctrl_cfg = libnvme_ctrl_get_config(c);
+	struct libnvme_fabrics_config *ctrl_cfg = libnvmf_ctrl_get_config(c);
 
 	MERGE_CFG_OPTION(ctrl_cfg, cfg, nr_io_queues, 0);
 	MERGE_CFG_OPTION(ctrl_cfg, cfg, nr_write_queues, 0);
@@ -440,7 +446,7 @@ static void merge_config(libnvme_ctrl_t c,
 	if ((n)->o != d) (c)->o = (n)->o
 __public void libnvmf_update_config(libnvme_ctrl_t c, const struct libnvme_fabrics_config *cfg)
 {
-	struct libnvme_fabrics_config *ctrl_cfg = libnvme_ctrl_get_config(c);
+	struct libnvme_fabrics_config *ctrl_cfg = libnvmf_ctrl_get_config(c);
 
 	UPDATE_CFG_OPTION(ctrl_cfg, cfg, nr_io_queues, 0);
 	UPDATE_CFG_OPTION(ctrl_cfg, cfg, nr_write_queues, 0);
@@ -749,7 +755,7 @@ bool traddr_is_hostname(struct libnvme_global_ctx *ctx,
 
 static int build_options(libnvme_host_t h, libnvme_ctrl_t c, char **argstr)
 {
-	struct libnvme_fabrics_config *cfg = libnvme_ctrl_get_config(c);
+	struct libnvme_fabrics_config *cfg = libnvmf_ctrl_get_config(c);
 	const char *transport = libnvme_ctrl_get_transport(c);
 	const char *hostnqn, *hostid, *hostkey, *ctrlkey = NULL;
 	bool discover = false, discovery_nqn = false;
@@ -1062,6 +1068,24 @@ static const char *lookup_context(struct libnvme_global_ctx *ctx, libnvme_ctrl_t
 	return NULL;
 }
 
+__public int libnvmf_create_ctrl(struct libnvme_global_ctx *ctx,
+		const char *subsysnqn, const char *transport,
+		const char *traddr, const char *host_traddr,
+		const char *host_iface, const char *trsvcid,
+		libnvme_ctrl_t *cp)
+{
+	struct libnvmf_context fctx = {
+		.transport = transport,
+		.traddr = traddr,
+		.host_traddr = host_traddr,
+		.host_iface = host_iface,
+		.trsvcid = trsvcid,
+		.subsysnqn = subsysnqn,
+	};
+
+	return _libnvme_create_ctrl(ctx, &fctx, cp);
+}
+
 __public int libnvmf_add_ctrl(libnvme_host_t h, libnvme_ctrl_t c,
 		  const struct libnvmf_context *fctx)
 {
@@ -1090,7 +1114,7 @@ __public int libnvmf_add_ctrl(libnvme_host_t h, libnvme_ctrl_t c,
 		if (fc) {
 			const char *key;
 
-			merge_config(c, libnvme_ctrl_get_config(fc));
+			merge_config(c, libnvmf_ctrl_get_config(fc));
 			/*
 			 * An authentication key might already been set
 			 * in @cfg, so ensure to update @c with the correct
@@ -1174,6 +1198,24 @@ __public int libnvmf_connect_ctrl(libnvme_ctrl_t c)
 	return 0;
 }
 
+__public int libnvmf_disconnect_ctrl(libnvme_ctrl_t c)
+{
+	struct libnvme_global_ctx *ctx = c->s && c->s->h ? c->s->h->ctx : NULL;
+	int ret;
+
+	ret = libnvme_set_attr(libnvme_ctrl_get_sysfs_dir(c),
+			    "delete_controller", "1");
+	if (ret < 0) {
+		libnvme_msg(ctx, LIBNVME_LOG_ERR,
+			"%s: failed to disconnect, error %d\n", c->name, errno);
+		return ret;
+	}
+	libnvme_msg(ctx, LIBNVME_LOG_INFO, "%s: %s disconnected\n",
+		c->name, c->subsysnqn);
+	nvme_deconfigure_ctrl(c);
+	return 0;
+}
+
 static void nvmf_update_tls_concat(struct nvmf_disc_log_entry *e,
 		libnvme_ctrl_t c, libnvme_host_t h)
 {
@@ -2117,7 +2159,7 @@ static int _nvmf_discovery(struct libnvme_global_ctx *ctx,
 				_nvmf_discovery(ctx, &nfctx, true, child);
 
 			if (child && disconnect) {
-				libnvme_disconnect_ctrl(child);
+				libnvmf_disconnect_ctrl(child);
 				libnvme_free_ctrl(child);
 			}
 		} else if (err == -ENVME_CONNECT_ALREADY) {
@@ -2242,7 +2284,7 @@ static int nvmf_create_discovery_ctrl(struct libnvme_global_ctx *ctx,
 		libnvme_msg(ctx, LIBNVME_LOG_ERR,
 			 "failed to identify controller, error %s\n",
 			 libnvme_strerror(-ret));
-		libnvme_disconnect_ctrl(c);
+		libnvmf_disconnect_ctrl(c);
 		libnvme_free_ctrl(c);
 		return ret;
 	}
@@ -2256,7 +2298,7 @@ static int nvmf_create_discovery_ctrl(struct libnvme_global_ctx *ctx,
 	 * The subsysnqn is not the well-known name. Prefer the unique
 	 * subsysnqn over the well-known one.
 	 */
-	libnvme_disconnect_ctrl(c);
+	libnvmf_disconnect_ctrl(c);
 	libnvme_free_ctrl(c);
 
 	fctx->subsysnqn = id->subnqn;
@@ -2337,7 +2379,7 @@ int _discovery_config_json(struct libnvme_global_ctx *ctx,
 
 	_nvmf_discovery(ctx, &nfctx, connect, cn);
 	if (!(fctx->persistent || is_persistent_discovery_ctrl(h, cn)))
-		ret = libnvme_disconnect_ctrl(cn);
+		ret = libnvmf_disconnect_ctrl(cn);
 	libnvme_free_ctrl(cn);
 
 	return ret;
@@ -2491,7 +2533,7 @@ __public int libnvmf_discovery_config_file(struct libnvme_global_ctx *ctx,
 		_nvmf_discovery(ctx, &nfctx, connect, c);
 		if (!(nfctx.persistent ||
 		      is_persistent_discovery_ctrl(h, c)))
-			err = libnvme_disconnect_ctrl(c);
+			err = libnvmf_disconnect_ctrl(c);
 		libnvme_free_ctrl(c);
 	} while (!err);
 
@@ -2746,7 +2788,7 @@ static int nbft_discovery(struct libnvme_global_ctx *ctx,
 			if (ret)
 				continue;
 			nbft_discovery(ctx, &nfctx, dd, h, child);
-			libnvme_disconnect_ctrl(child);
+			libnvmf_disconnect_ctrl(child);
 			libnvme_free_ctrl(child);
 		} else {
 			ret = nbft_connect(ctx, &nfctx, h, e, NULL);
@@ -2988,7 +3030,7 @@ __public int libnvmf_discovery_nbft(struct libnvme_global_ctx *ctx,
 
 			rr = nbft_discovery(ctx, &nfctx, *dd, h, c);
 			if (!persistent)
-				libnvme_disconnect_ctrl(c);
+				libnvmf_disconnect_ctrl(c);
 			libnvme_free_ctrl(c);
 			if (rr == -ENOMEM) {
 				ret = rr;
@@ -3090,7 +3132,7 @@ __public int libnvmf_discovery(struct libnvme_global_ctx *ctx, struct libnvmf_co
 
 	ret = _nvmf_discovery(ctx, fctx, connect, c);
 	if (!(fctx->persistent || is_persistent_discovery_ctrl(h, c)))
-		libnvme_disconnect_ctrl(c);
+		libnvmf_disconnect_ctrl(c);
 	libnvme_free_ctrl(c);
 
 	return ret;

libnvme/src/nvme/fabrics.h

@@ -505,6 +505,14 @@ int libnvmf_context_set_persistent(struct libnvmf_context *fctx, bool persistent
  */
 int libnvmf_context_set_device(struct libnvmf_context *fctx, const char *device);
 
+/**
+ * libnvmf_ctrl_get_config() - Fabrics configuration of a controller
+ * @c:	Controller instance
+ *
+ * Return: Fabrics configuration of @c
+ */
+struct libnvme_fabrics_config *libnvmf_ctrl_get_config(libnvme_ctrl_t c);
+
 /**
  * libnvmf_discovery() - Perform fabrics discovery
  * @ctx: Global context
@@ -561,6 +569,27 @@ int libnvmf_discovery_config_file(struct libnvme_global_ctx *ctx,
 int libnvmf_discovery_nbft(struct libnvme_global_ctx *ctx,
 		struct libnvmf_context *fctx, bool connect, char *nbft_path);
 
+/**
+ * libnvmf_create_ctrl() - Allocate an unconnected NVMe controller
+ * @ctx:		struct libnvme_global_ctx object
+ * @subsysnqn:		Subsystem NQN
+ * @transport:		Transport type
+ * @traddr:		Transport address
+ * @host_traddr:	Host transport address
+ * @host_iface:		Host interface name
+ * @trsvcid:		Transport service ID
+ * @c:			@libnvme_ctrl_t object to return
+ *
+ * Creates an unconnected controller to be used for libnvme_add_ctrl().
+ *
+ * Return: 0 on success or negative error code otherwise
+ */
+int libnvmf_create_ctrl(struct libnvme_global_ctx *ctx,
+		     const char *subsysnqn, const char *transport,
+		     const char *traddr, const char *host_traddr,
+		     const char *host_iface, const char *trsvcid,
+		     libnvme_ctrl_t *c);
+
 /**
  * libnvmf_connect() - Connect to fabrics subsystem
  * @ctx: Global context
@@ -570,7 +599,18 @@ int libnvmf_discovery_nbft(struct libnvme_global_ctx *ctx,
  *
  * Return: 0 on success, or a negative error code on failure.
  */
-int libnvmf_connect(struct libnvme_global_ctx *ctx, struct libnvmf_context *fctx);
+int libnvmf_connect(struct libnvme_global_ctx *ctx,
+		struct libnvmf_context *fctx);
+
+/**
+ * libnvmf_disconnect_ctrl() - Disconnect a controller
+ * @c:	Controller instance
+ *
+ * Issues a 'disconnect' fabrics command to @c
+ *
+ * Return: 0 on success, -1 on failure.
+ */
+int libnvmf_disconnect_ctrl(libnvme_ctrl_t c);
 
 /**
  * libnvmf_connect_config_json() - Connect using JSON config

libnvme/src/nvme/json.c

@@ -26,7 +26,7 @@
 static void json_update_attributes(libnvme_ctrl_t c,
 				   struct json_object *ctrl_obj)
 {
-	struct libnvme_fabrics_config *cfg = libnvme_ctrl_get_config(c);
+	struct libnvme_fabrics_config *cfg = libnvmf_ctrl_get_config(c);
 
 	json_object_object_foreach(ctrl_obj, key_str, val_obj) {
 		JSON_UPDATE_INT_OPTION(cfg, key_str,
@@ -275,7 +275,7 @@ int json_read_config(struct libnvme_global_ctx *ctx, const char *config_file)
 
 static void json_update_port(struct json_object *ctrl_array, libnvme_ctrl_t c)
 {
-	struct libnvme_fabrics_config *cfg = libnvme_ctrl_get_config(c);
+	struct libnvme_fabrics_config *cfg = libnvmf_ctrl_get_config(c);
 	struct json_object *port_obj = json_object_new_object();
 	const char *transport, *value;
 
@@ -443,7 +443,7 @@ int json_update_config(struct libnvme_global_ctx *ctx, int fd)
 
 static void json_dump_ctrl(struct json_object *ctrl_array, libnvme_ctrl_t c)
 {
-	struct libnvme_fabrics_config *cfg = libnvme_ctrl_get_config(c);
+	struct libnvme_fabrics_config *cfg = libnvmf_ctrl_get_config(c);
 	struct json_object *ctrl_obj = json_object_new_object();
 	const char *name, *transport, *value;
 

libnvme/src/nvme/private.h

@@ -332,6 +332,8 @@ void *__libnvme_alloc(size_t len);
 
 void *__libnvme_realloc(void *p, size_t len);
 
+void nvme_deconfigure_ctrl(libnvme_ctrl_t c);
+
 libnvme_host_t libnvme_lookup_host(struct libnvme_global_ctx *ctx,
 		const char *hostnqn, const char *hostid);
 libnvme_subsystem_t libnvme_lookup_subsystem(struct libnvme_host *h,