fabrics: retire libnvme_fabrics_config from public API

Retire struct libnvme_fabrics_config from the public API and replace it
with an anonymous struct accessed via getter/setters. This makes it
possible to extend the API without breaking the ABI.

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

Author: igaw

fabrics.c

@@ -297,28 +297,31 @@ static void cb_parser_cleanup(struct libnvmf_context *fctx, void *user_data)
 static int set_fabrics_options(struct libnvmf_context *fctx,
 		struct nvmf_args *fa)
 {
-	struct libnvme_fabrics_config fcfg;
-
-	fcfg.queue_size = fa->queue_size;
-	fcfg.nr_io_queues = fa->nr_io_queues;
-	fcfg.reconnect_delay = fa->reconnect_delay;
-	fcfg.ctrl_loss_tmo = fa->ctrl_loss_tmo;
-	fcfg.fast_io_fail_tmo = fa->fast_io_fail_tmo;
-	fcfg.keep_alive_tmo = fa->keep_alive_tmo;
-	fcfg.nr_write_queues = fa->nr_write_queues;
-	fcfg.nr_poll_queues = fa->nr_poll_queues;
-	fcfg.tos = fa->tos;
-	fcfg.keyring_id = fa->keyring_id;
-	fcfg.tls_key_id = fa->tls_key_id;
-	fcfg.tls_configured_key_id = fa->tls_configured_key_id;
-	fcfg.duplicate_connect = fa->duplicate_connect;
-	fcfg.disable_sqflow = fa->disable_sqflow;
-	fcfg.hdr_digest = fa->hdr_digest;
-	fcfg.data_digest = fa->data_digest;
-	fcfg.tls = fa->tls;
-	fcfg.concat = fa->concat;
-
-	return libnvmf_context_set_fabrics_config(fctx, &fcfg);
+	struct libnvme_fabrics_config *fcfg;
+
+	fcfg = libnvmf_context_get_fabrics_config(fctx);
+	if (!fcfg)
+		return -EINVAL;
+
+	libnvme_fabrics_config_set_nr_io_queues(fcfg, fa->nr_io_queues);
+	libnvme_fabrics_config_set_reconnect_delay(fcfg, fa->reconnect_delay);
+	libnvme_fabrics_config_set_ctrl_loss_tmo(fcfg, fa->ctrl_loss_tmo);
+	libnvme_fabrics_config_set_fast_io_fail_tmo(fcfg, fa->fast_io_fail_tmo);
+	libnvme_fabrics_config_set_keep_alive_tmo(fcfg, fa->keep_alive_tmo);
+	libnvme_fabrics_config_set_nr_write_queues(fcfg, fa->nr_write_queues);
+	libnvme_fabrics_config_set_nr_poll_queues(fcfg, fa->nr_poll_queues);
+	libnvme_fabrics_config_set_tos(fcfg, fa->tos);
+	libnvme_fabrics_config_set_keyring_id(fcfg, fa->keyring_id);
+	libnvme_fabrics_config_set_tls_key_id(fcfg, fa->tls_key_id);
+	libnvme_fabrics_config_set_tls_configured_key_id(fcfg, fa->tls_configured_key_id);
+	libnvme_fabrics_config_set_duplicate_connect(fcfg, fa->duplicate_connect);
+	libnvme_fabrics_config_set_disable_sqflow(fcfg, fa->disable_sqflow);
+	libnvme_fabrics_config_set_hdr_digest(fcfg, fa->hdr_digest);
+	libnvme_fabrics_config_set_data_digest(fcfg, fa->data_digest);
+	libnvme_fabrics_config_set_tls(fcfg, fa->tls);
+	libnvme_fabrics_config_set_concat(fcfg, fa->concat);
+
+	return 0;
 }
 
 static int cb_parser_next_line(struct libnvmf_context *fctx, void *user_data)

libnvme/libnvme/nvme.i

@@ -443,23 +443,18 @@ struct libnvme_ns {
 %rename(set_connection)     libnvmf_context::fctx_set_connection;
 %rename(set_persistent)     libnvmf_context::fctx_set_persistent;
 %rename(set_device)         libnvmf_context::fctx_set_device;
-%rename(set_fabrics_config) libnvmf_context::fctx_set_fabrics_config;
 
 struct libnvmf_context {};
 
 %extend libnvmf_context {
 	libnvmf_context(struct libnvme_global_ctx *ctx) {
 		struct libnvmf_context *fctx;
-		struct libnvme_fabrics_config cfg = {};
 		int err;
 
 		err = libnvmf_context_create(ctx, NULL, NULL, NULL, NULL, &fctx);
 		if (err)
 			return NULL;
 
-		libnvmf_default_config(&cfg);
-		libnvmf_context_set_fabrics_config(fctx, &cfg);
-
 		return fctx;
 	}
 	~libnvmf_context() {

libnvme/src/accessors.ld

@@ -10,145 +10,181 @@
 
 LIBNVME_ACCESSORS_3 {
 	global:
-		libnvme_path_get_name;
-		libnvme_path_set_name;
-		libnvme_path_get_sysfs_dir;
-		libnvme_path_set_sysfs_dir;
-		libnvme_path_get_ana_state;
-		libnvme_path_set_ana_state;
-		libnvme_path_get_numa_nodes;
-		libnvme_path_set_numa_nodes;
-		libnvme_path_get_grpid;
-		libnvme_path_set_grpid;
-		libnvme_ns_get_nsid;
-		libnvme_ns_set_nsid;
-		libnvme_ns_get_name;
-		libnvme_ns_set_name;
-		libnvme_ns_get_sysfs_dir;
-		libnvme_ns_set_sysfs_dir;
-		libnvme_ns_get_lba_shift;
-		libnvme_ns_set_lba_shift;
-		libnvme_ns_get_lba_size;
-		libnvme_ns_set_lba_size;
-		libnvme_ns_get_meta_size;
-		libnvme_ns_set_meta_size;
-		libnvme_ns_get_lba_count;
-		libnvme_ns_set_lba_count;
-		libnvme_ns_get_lba_util;
-		libnvme_ns_set_lba_util;
-		libnvme_ctrl_get_name;
-		libnvme_ctrl_get_sysfs_dir;
+		libnvme_ctrl_get_cntlid;
+		libnvme_ctrl_get_cntrltype;
+		libnvme_ctrl_get_dctype;
+		libnvme_ctrl_get_dhchap_ctrl_key;
+		libnvme_ctrl_get_dhchap_host_key;
+		libnvme_ctrl_get_discovered;
+		libnvme_ctrl_get_discovery_ctrl;
 		libnvme_ctrl_get_firmware;
+		libnvme_ctrl_get_host_iface;
+		libnvme_ctrl_get_host_traddr;
+		libnvme_ctrl_get_keyring;
 		libnvme_ctrl_get_model;
+		libnvme_ctrl_get_name;
 		libnvme_ctrl_get_numa_node;
+		libnvme_ctrl_get_persistent;
+		libnvme_ctrl_get_phy_slot;
 		libnvme_ctrl_get_queue_count;
 		libnvme_ctrl_get_serial;
 		libnvme_ctrl_get_sqsize;
-		libnvme_ctrl_get_transport;
 		libnvme_ctrl_get_subsysnqn;
+		libnvme_ctrl_get_sysfs_dir;
+		libnvme_ctrl_get_tls_key;
+		libnvme_ctrl_get_tls_key_identity;
 		libnvme_ctrl_get_traddr;
+		libnvme_ctrl_get_transport;
 		libnvme_ctrl_get_trsvcid;
-		libnvme_ctrl_get_dhchap_host_key;
-		libnvme_ctrl_set_dhchap_host_key;
-		libnvme_ctrl_get_dhchap_ctrl_key;
+		libnvme_ctrl_get_unique_discovery_ctrl;
 		libnvme_ctrl_set_dhchap_ctrl_key;
-		libnvme_ctrl_get_keyring;
+		libnvme_ctrl_set_dhchap_host_key;
+		libnvme_ctrl_set_discovered;
+		libnvme_ctrl_set_discovery_ctrl;
 		libnvme_ctrl_set_keyring;
-		libnvme_ctrl_get_tls_key_identity;
-		libnvme_ctrl_set_tls_key_identity;
-		libnvme_ctrl_get_tls_key;
+		libnvme_ctrl_set_persistent;
 		libnvme_ctrl_set_tls_key;
-		libnvme_ctrl_get_cntrltype;
-		libnvme_ctrl_get_cntlid;
-		libnvme_ctrl_get_dctype;
-		libnvme_ctrl_get_phy_slot;
-		libnvme_ctrl_get_host_traddr;
-		libnvme_ctrl_get_host_iface;
-		libnvme_ctrl_get_discovery_ctrl;
-		libnvme_ctrl_set_discovery_ctrl;
-		libnvme_ctrl_get_unique_discovery_ctrl;
+		libnvme_ctrl_set_tls_key_identity;
 		libnvme_ctrl_set_unique_discovery_ctrl;
-		libnvme_ctrl_get_discovered;
-		libnvme_ctrl_set_discovered;
-		libnvme_ctrl_get_persistent;
-		libnvme_ctrl_set_persistent;
-		libnvme_subsystem_get_name;
-		libnvme_subsystem_get_sysfs_dir;
-		libnvme_subsystem_get_subsysnqn;
-		libnvme_subsystem_get_model;
-		libnvme_subsystem_get_serial;
-		libnvme_subsystem_get_firmware;
-		libnvme_subsystem_get_subsystype;
-		libnvme_subsystem_get_application;
-		libnvme_subsystem_set_application;
-		libnvme_subsystem_get_iopolicy;
-		libnvme_subsystem_set_iopolicy;
-		libnvme_host_get_hostnqn;
-		libnvme_host_get_hostid;
-		libnvme_host_get_dhchap_host_key;
-		libnvme_host_set_dhchap_host_key;
-		libnvme_host_get_hostsymname;
-		libnvme_host_set_hostsymname;
-		libnvme_host_get_pdc_enabled_valid;
-		libnvme_host_set_pdc_enabled_valid;
 		libnvme_fabric_options_get_cntlid;
-		libnvme_fabric_options_set_cntlid;
 		libnvme_fabric_options_get_concat;
-		libnvme_fabric_options_set_concat;
 		libnvme_fabric_options_get_ctrl_loss_tmo;
-		libnvme_fabric_options_set_ctrl_loss_tmo;
 		libnvme_fabric_options_get_data_digest;
-		libnvme_fabric_options_set_data_digest;
 		libnvme_fabric_options_get_dhchap_ctrl_secret;
-		libnvme_fabric_options_set_dhchap_ctrl_secret;
 		libnvme_fabric_options_get_dhchap_secret;
-		libnvme_fabric_options_set_dhchap_secret;
 		libnvme_fabric_options_get_disable_sqflow;
-		libnvme_fabric_options_set_disable_sqflow;
 		libnvme_fabric_options_get_discovery;
-		libnvme_fabric_options_set_discovery;
 		libnvme_fabric_options_get_duplicate_connect;
-		libnvme_fabric_options_set_duplicate_connect;
 		libnvme_fabric_options_get_fast_io_fail_tmo;
-		libnvme_fabric_options_set_fast_io_fail_tmo;
 		libnvme_fabric_options_get_hdr_digest;
-		libnvme_fabric_options_set_hdr_digest;
 		libnvme_fabric_options_get_host_iface;
-		libnvme_fabric_options_set_host_iface;
 		libnvme_fabric_options_get_host_traddr;
-		libnvme_fabric_options_set_host_traddr;
 		libnvme_fabric_options_get_hostid;
-		libnvme_fabric_options_set_hostid;
 		libnvme_fabric_options_get_hostnqn;
-		libnvme_fabric_options_set_hostnqn;
 		libnvme_fabric_options_get_instance;
-		libnvme_fabric_options_set_instance;
 		libnvme_fabric_options_get_keep_alive_tmo;
-		libnvme_fabric_options_set_keep_alive_tmo;
 		libnvme_fabric_options_get_keyring;
-		libnvme_fabric_options_set_keyring;
 		libnvme_fabric_options_get_nqn;
-		libnvme_fabric_options_set_nqn;
 		libnvme_fabric_options_get_nr_io_queues;
-		libnvme_fabric_options_set_nr_io_queues;
 		libnvme_fabric_options_get_nr_poll_queues;
-		libnvme_fabric_options_set_nr_poll_queues;
 		libnvme_fabric_options_get_nr_write_queues;
-		libnvme_fabric_options_set_nr_write_queues;
 		libnvme_fabric_options_get_queue_size;
-		libnvme_fabric_options_set_queue_size;
 		libnvme_fabric_options_get_reconnect_delay;
-		libnvme_fabric_options_set_reconnect_delay;
 		libnvme_fabric_options_get_tls;
-		libnvme_fabric_options_set_tls;
 		libnvme_fabric_options_get_tls_key;
-		libnvme_fabric_options_set_tls_key;
 		libnvme_fabric_options_get_tos;
-		libnvme_fabric_options_set_tos;
 		libnvme_fabric_options_get_traddr;
-		libnvme_fabric_options_set_traddr;
 		libnvme_fabric_options_get_transport;
-		libnvme_fabric_options_set_transport;
 		libnvme_fabric_options_get_trsvcid;
+		libnvme_fabric_options_set_cntlid;
+		libnvme_fabric_options_set_concat;
+		libnvme_fabric_options_set_ctrl_loss_tmo;
+		libnvme_fabric_options_set_data_digest;
+		libnvme_fabric_options_set_dhchap_ctrl_secret;
+		libnvme_fabric_options_set_dhchap_secret;
+		libnvme_fabric_options_set_disable_sqflow;
+		libnvme_fabric_options_set_discovery;
+		libnvme_fabric_options_set_duplicate_connect;
+		libnvme_fabric_options_set_fast_io_fail_tmo;
+		libnvme_fabric_options_set_hdr_digest;
+		libnvme_fabric_options_set_host_iface;
+		libnvme_fabric_options_set_host_traddr;
+		libnvme_fabric_options_set_hostid;
+		libnvme_fabric_options_set_hostnqn;
+		libnvme_fabric_options_set_instance;
+		libnvme_fabric_options_set_keep_alive_tmo;
+		libnvme_fabric_options_set_keyring;
+		libnvme_fabric_options_set_nqn;
+		libnvme_fabric_options_set_nr_io_queues;
+		libnvme_fabric_options_set_nr_poll_queues;
+		libnvme_fabric_options_set_nr_write_queues;
+		libnvme_fabric_options_set_queue_size;
+		libnvme_fabric_options_set_reconnect_delay;
+		libnvme_fabric_options_set_tls;
+		libnvme_fabric_options_set_tls_key;
+		libnvme_fabric_options_set_tos;
+		libnvme_fabric_options_set_traddr;
+		libnvme_fabric_options_set_transport;
 		libnvme_fabric_options_set_trsvcid;
+		libnvme_fabrics_config_get_concat;
+		libnvme_fabrics_config_get_ctrl_loss_tmo;
+		libnvme_fabrics_config_get_data_digest;
+		libnvme_fabrics_config_get_disable_sqflow;
+		libnvme_fabrics_config_get_duplicate_connect;
+		libnvme_fabrics_config_get_fast_io_fail_tmo;
+		libnvme_fabrics_config_get_hdr_digest;
+		libnvme_fabrics_config_get_keep_alive_tmo;
+		libnvme_fabrics_config_get_keyring_id;
+		libnvme_fabrics_config_get_nr_io_queues;
+		libnvme_fabrics_config_get_nr_poll_queues;
+		libnvme_fabrics_config_get_nr_write_queues;
+		libnvme_fabrics_config_get_queue_size;
+		libnvme_fabrics_config_get_reconnect_delay;
+		libnvme_fabrics_config_get_tls;
+		libnvme_fabrics_config_get_tls_configured_key_id;
+		libnvme_fabrics_config_get_tls_key_id;
+		libnvme_fabrics_config_get_tos;
+		libnvme_fabrics_config_set_concat;
+		libnvme_fabrics_config_set_ctrl_loss_tmo;
+		libnvme_fabrics_config_set_data_digest;
+		libnvme_fabrics_config_set_disable_sqflow;
+		libnvme_fabrics_config_set_duplicate_connect;
+		libnvme_fabrics_config_set_fast_io_fail_tmo;
+		libnvme_fabrics_config_set_hdr_digest;
+		libnvme_fabrics_config_set_keep_alive_tmo;
+		libnvme_fabrics_config_set_keyring_id;
+		libnvme_fabrics_config_set_nr_io_queues;
+		libnvme_fabrics_config_set_nr_poll_queues;
+		libnvme_fabrics_config_set_nr_write_queues;
+		libnvme_fabrics_config_set_queue_size;
+		libnvme_fabrics_config_set_reconnect_delay;
+		libnvme_fabrics_config_set_tls;
+		libnvme_fabrics_config_set_tls_configured_key_id;
+		libnvme_fabrics_config_set_tls_key_id;
+		libnvme_fabrics_config_set_tos;
+		libnvme_host_get_dhchap_host_key;
+		libnvme_host_get_hostid;
+		libnvme_host_get_hostnqn;
+		libnvme_host_get_hostsymname;
+		libnvme_host_get_pdc_enabled_valid;
+		libnvme_host_set_dhchap_host_key;
+		libnvme_host_set_hostsymname;
+		libnvme_host_set_pdc_enabled_valid;
+		libnvme_ns_get_lba_count;
+		libnvme_ns_get_lba_shift;
+		libnvme_ns_get_lba_size;
+		libnvme_ns_get_lba_util;
+		libnvme_ns_get_meta_size;
+		libnvme_ns_get_name;
+		libnvme_ns_get_nsid;
+		libnvme_ns_get_sysfs_dir;
+		libnvme_ns_set_lba_count;
+		libnvme_ns_set_lba_shift;
+		libnvme_ns_set_lba_size;
+		libnvme_ns_set_lba_util;
+		libnvme_ns_set_meta_size;
+		libnvme_ns_set_name;
+		libnvme_ns_set_nsid;
+		libnvme_ns_set_sysfs_dir;
+		libnvme_path_get_ana_state;
+		libnvme_path_get_grpid;
+		libnvme_path_get_name;
+		libnvme_path_get_numa_nodes;
+		libnvme_path_get_sysfs_dir;
+		libnvme_path_set_ana_state;
+		libnvme_path_set_grpid;
+		libnvme_path_set_name;
+		libnvme_path_set_numa_nodes;
+		libnvme_path_set_sysfs_dir;
+		libnvme_subsystem_get_application;
+		libnvme_subsystem_get_firmware;
+		libnvme_subsystem_get_iopolicy;
+		libnvme_subsystem_get_model;
+		libnvme_subsystem_get_name;
+		libnvme_subsystem_get_serial;
+		libnvme_subsystem_get_subsysnqn;
+		libnvme_subsystem_get_subsystype;
+		libnvme_subsystem_get_sysfs_dir;
+		libnvme_subsystem_set_application;
+		libnvme_subsystem_set_iopolicy;
 };

libnvme/src/libnvmf.ld

@@ -11,6 +11,7 @@ LIBNVMF_3 {
 		libnvmf_connect_ctrl;
 		libnvmf_context_create;
 		libnvmf_context_free;
+		libnvmf_context_get_fabrics_config;
 		libnvmf_context_set_connection;
 		libnvmf_context_set_crypto;
 		libnvmf_context_set_device;
@@ -20,8 +21,7 @@ LIBNVMF_3 {
 		libnvmf_context_set_hostnqn;
 		libnvmf_context_set_persistent;
 		libnvmf_create_ctrl;
-		libnvmf_ctrl_get_config;
-		libnvmf_default_config;
+		libnvmf_ctrl_get_fabrics_config;
 		libnvmf_disconnect_ctrl;
 		libnvmf_discovery;
 		libnvmf_discovery_args_create;
@@ -44,7 +44,6 @@ LIBNVMF_3 {
 		libnvmf_subtype_str;
 		libnvmf_treq_str;
 		libnvmf_trtype_str;
-		libnvmf_update_config;
 	local:
 		*;
 };

libnvme/src/nvme/accessors-fabrics.c

@@ -48,7 +48,8 @@ __public void libnvmf_discovery_args_set_lsp(
 	p->lsp = lsp;
 }
 
-__public __u8 libnvmf_discovery_args_get_lsp(const struct libnvmf_discovery_args *p)
+__public __u8 libnvmf_discovery_args_get_lsp(
+		const struct libnvmf_discovery_args *p)
 {
 	return p->lsp;
 }