fabrics: replace fabrics options with fabrics context

Retire the libnvme_fabrics_options type from the public API as any
modification is breaking ABI. The libnvmf_context has been introduced as
replacement, with an extendable getter/setter API.

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

Author: igaw

libnvme/examples/discover-loop.c

@@ -53,38 +53,41 @@ int main()
 {
 	struct nvmf_discovery_log *log = NULL;
 	struct libnvme_global_ctx *ctx;
+	struct libnvmf_context *fctx;
 	libnvme_host_t h;
 	libnvme_ctrl_t c;
 	int ret;
-	struct libnvme_fabrics_config cfg;
 	struct libnvmf_discovery_args *args;
 
-	libnvmf_default_config(&cfg);
-
 	ctx = libnvme_create_global_ctx(stdout, LIBNVME_DEFAULT_LOGLEVEL);
 	if (!ctx)
 		return 1;
 
+	ret = libnvmf_context_create(ctx, NULL, NULL, NULL, NULL, &fctx);
+	if (ret)
+		goto free_ctx;
+
 	ret = libnvme_scan_topology(ctx, NULL, NULL);
-	if (ret) {
-		libnvme_free_global_ctx(ctx);
-		return 1;
-	}
+	if (ret)
+		goto free_fctx;
+
 	ret = libnvme_get_host(ctx, NULL, NULL, &h);
 	if (ret) {
 		fprintf(stderr, "Failed to allocated memory\n");
-		return 1;
+		goto free_fctx;
 	}
+
 	ret = libnvme_create_ctrl(ctx, NVME_DISC_SUBSYS_NAME, "loop",
 			       NULL, NULL, NULL, NULL, &c);
 	if (ret) {
 		fprintf(stderr, "Failed to allocate memory\n");
-		return 1;
+		goto free_fctx;
 	}
-	ret = libnvmf_add_ctrl(h, c, &cfg);
+
+	ret = libnvmf_add_ctrl(h, c, fctx);
 	if (ret) {
 		fprintf(stderr, "no controller found\n");
-		return 1;
+		goto free_fctx;
 	}
 
 	ret = libnvmf_discovery_args_create(&args);
@@ -102,7 +105,11 @@ int main()
 	else
 		print_discover_log(log);
 
+free_fctx:
+	libnvmf_context_free(fctx);
+free_ctx:
 	libnvme_free_global_ctx(ctx);
 	free(log);
-	return 0;
+
+	return ret ? 1 : 0;
 }

libnvme/libnvme/nvme.i

@@ -769,16 +769,15 @@ struct libnvmf_context {};
 		     struct libnvmf_context *fctx = NULL) {
 		int ret;
 		const char *dev;
-		const struct libnvme_fabrics_config *cfg = fctx ? &fctx->cfg : NULL;
 
 		dev = libnvme_ctrl_get_name($self);
-		if (dev && !(cfg && cfg->duplicate_connect)) {
+		if (dev && !(fctx && fctx->cfg.duplicate_connect)) {
 			connect_err = -ENVME_CONNECT_ALREADY;
 			return;
 		}
 
 		Py_BEGIN_ALLOW_THREADS  /* Release Python GIL */
-		    ret = libnvmf_add_ctrl(h, $self, cfg);
+		ret = libnvmf_add_ctrl(h, $self, fctx);
 		Py_END_ALLOW_THREADS    /* Reacquire Python GIL */
 
 		if (ret) {

libnvme/src/nvme/fabrics.c

@@ -1063,15 +1063,15 @@ static const char *lookup_context(struct libnvme_global_ctx *ctx, libnvme_ctrl_t
 }
 
 __public int libnvmf_add_ctrl(libnvme_host_t h, libnvme_ctrl_t c,
-		  const struct libnvme_fabrics_config *cfg)
+		  const struct libnvmf_context *fctx)
 {
 	libnvme_subsystem_t s;
 	const char *root_app, *app;
 	__cleanup_free char *argstr = NULL;
 	int ret;
 
 	/* highest prio have configs from command line */
-	merge_config(c, cfg);
+	merge_config(c, &fctx->cfg);
 
 	/* apply configuration from config file (JSON) */
 	s = libnvme_lookup_subsystem(h, NULL, libnvme_ctrl_get_subsysnqn(c));
@@ -1297,7 +1297,7 @@ static int nvmf_connect_disc_entry(libnvme_host_t h,
 	/* update tls or concat */
 	nvmf_update_tls_concat(e, c, h);
 
-	ret = libnvmf_add_ctrl(h, c, &fctx->cfg);
+	ret = libnvmf_add_ctrl(h, c, fctx);
 	if (!ret) {
 		*cp = c;
 		return 0;
@@ -1308,7 +1308,7 @@ static int nvmf_connect_disc_entry(libnvme_host_t h,
 		libnvme_msg(h->ctx, LIBNVME_LOG_INFO, "failed to connect controller, "
 			 "retry with disabling SQ flow control\n");
 		c->cfg.disable_sqflow = false;
-		ret = libnvmf_add_ctrl(h, c, &fctx->cfg);
+		ret = libnvmf_add_ctrl(h, c, fctx);
 		if (!ret) {
 			*cp = c;
 			return 0;
@@ -2165,7 +2165,7 @@ static int libnvme_add_ctrl(struct libnvmf_context *fctx,
 	int err;
 
 retry:
-	err = libnvmf_add_ctrl(h, c, &fctx->cfg);
+	err = libnvmf_add_ctrl(h, c, fctx);
 	if (!err)
 		return 0;
 	if (fctx->decide_retry(fctx, err, fctx->user_data))
@@ -2663,7 +2663,7 @@ static int nbft_connect(struct libnvme_global_ctx *ctx,
 	/* Update tls or concat */
 	nvmf_update_tls_concat(e, c, h);
 
-	ret = libnvmf_add_ctrl(h, c, &fctx->cfg);
+	ret = libnvmf_add_ctrl(h, c, fctx);
 
 	/* Resume logging */
 	if (ss && ss->unavailable && saved_log_level < 1)

libnvme/src/nvme/fabrics.h

@@ -23,6 +23,14 @@
 /* default to 600 seconds of reconnect attempts before giving up */
 #define NVMF_DEF_CTRL_LOSS_TMO		600
 
+/*
+ * struct libnvmf_context - Opaque context for fabrics operations
+ *
+ * Used to manage state and configuration for fabrics discovery and connect
+ * operations.
+ */
+struct libnvmf_context;
+
 /**
  * struct libnvme_fabrics_config - Defines all linux nvme fabrics initiator options
  * @queue_size:		Number of IO queue entries
@@ -210,7 +218,7 @@ void libnvmf_update_config(libnvme_ctrl_t c,
  * libnvmf_add_ctrl() - Connect a controller and update topology
  * @h:		Host to which the controller should be attached
  * @c:		Controller to be connected
- * @cfg:	Default configuration for the controller
+ * @fctx:	Fabrics context
  *
  * Issues a 'connect' command to the NVMe-oF controller and inserts @c
  * into the topology using @h as parent.
@@ -219,7 +227,7 @@ void libnvmf_update_config(libnvme_ctrl_t c,
  * Return: 0 on success, or an error code on failure.
  */
 int libnvmf_add_ctrl(libnvme_host_t h, libnvme_ctrl_t c,
-		  const struct libnvme_fabrics_config *cfg);
+		  const struct libnvmf_context *fctx);
 
 /**
  * libnvmf_connect_ctrl() - Connect a controller
@@ -339,13 +347,6 @@ void libnvmf_free_uri(struct libnvme_fabrics_uri *uri);
  */
 const char *libnvmf_get_default_trsvcid(const char *transport,
 		bool discovery_ctrl);
-/*
- * struct libnvmf_context - Opaque context for fabrics operations
- *
- * Used to manage state and configuration for fabrics discovery and connect
- * operations.
- */
-struct libnvmf_context;
 
 /**
  * libnvmf_context_create() - Create a new fabrics context for discovery/connect