fabrics: add _id postfix to TLS keys in libnvme_fabrics_options

There are two types of keys used: one is the string representation and
the other is the actual key ID used by the kernel. Add a postfix to
the kernel types so it is clear which is being used.

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

Author: igaw

fabrics.c

@@ -136,7 +136,7 @@ struct nvmf_args {
 		OPT_INT("ctrl-loss-tmo",      'l', &c.ctrl_loss_tmo,      nvmf_ctrl_loss_tmo),   \
 		OPT_INT("fast_io_fail_tmo",   'F', &c.fast_io_fail_tmo,   nvmf_fast_io_fail_tmo),\
 		OPT_INT("tos",                'T', &c.tos,                nvmf_tos),             \
-		OPT_INT("tls_key",              0, &c.tls_key,            nvmf_tls_key_legacy),  \
+		OPT_INT("tls_key",              0, &c.tls_key_id,         nvmf_tls_key_legacy),  \
 		OPT_FLAG("duplicate-connect", 'D', &c.duplicate_connect,  nvmf_dup_connect),     \
 		OPT_FLAG("disable-sqflow",      0, &c.disable_sqflow,     nvmf_disable_sqflow),  \
 		OPT_FLAG("hdr-digest",        'g', &c.hdr_digest,         nvmf_hdr_digest),      \

libnvme/src/nvme/fabrics.c

@@ -272,9 +272,9 @@ __public int libnvmf_context_set_fabrics_config(struct libnvmf_context *fctx,
 	fctx->cfg.nr_write_queues = cfg->nr_write_queues;
 	fctx->cfg.nr_poll_queues = cfg->nr_poll_queues;
 	fctx->cfg.tos = cfg->tos;
-	fctx->cfg.keyring = cfg->keyring;
-	fctx->cfg.tls_key = cfg->tls_key;
-	fctx->cfg.tls_configured_key = cfg->tls_configured_key;
+	fctx->cfg.keyring_id = cfg->keyring_id;
+	fctx->cfg.tls_key_id = cfg->tls_key_id;
+	fctx->cfg.tls_configured_key_id = cfg->tls_configured_key_id;
 	fctx->cfg.duplicate_connect = cfg->duplicate_connect;
 	fctx->cfg.disable_sqflow = cfg->disable_sqflow;
 	fctx->cfg.hdr_digest = cfg->hdr_digest;
@@ -432,8 +432,8 @@ static void merge_config(libnvme_ctrl_t c,
 			  NVMF_DEF_CTRL_LOSS_TMO);
 	MERGE_CFG_OPTION(ctrl_cfg, cfg, fast_io_fail_tmo, 0);
 	MERGE_CFG_OPTION(ctrl_cfg, cfg, tos, -1);
-	MERGE_CFG_OPTION(ctrl_cfg, cfg, keyring, 0);
-	MERGE_CFG_OPTION(ctrl_cfg, cfg, tls_key, 0);
+	MERGE_CFG_OPTION(ctrl_cfg, cfg, keyring_id, 0);
+	MERGE_CFG_OPTION(ctrl_cfg, cfg, tls_key_id, 0);
 	MERGE_CFG_OPTION(ctrl_cfg, cfg, duplicate_connect, false);
 	MERGE_CFG_OPTION(ctrl_cfg, cfg, disable_sqflow, false);
 	MERGE_CFG_OPTION(ctrl_cfg, cfg, hdr_digest, false);
@@ -458,8 +458,8 @@ __public void libnvmf_update_config(libnvme_ctrl_t c, const struct libnvme_fabri
 			  NVMF_DEF_CTRL_LOSS_TMO);
 	UPDATE_CFG_OPTION(ctrl_cfg, cfg, fast_io_fail_tmo, 0);
 	UPDATE_CFG_OPTION(ctrl_cfg, cfg, tos, -1);
-	UPDATE_CFG_OPTION(ctrl_cfg, cfg, keyring, 0);
-	UPDATE_CFG_OPTION(ctrl_cfg, cfg, tls_key, 0);
+	UPDATE_CFG_OPTION(ctrl_cfg, cfg, keyring_id , 0);
+	UPDATE_CFG_OPTION(ctrl_cfg, cfg, tls_key_id, 0);
 	UPDATE_CFG_OPTION(ctrl_cfg, cfg, duplicate_connect, false);
 	UPDATE_CFG_OPTION(ctrl_cfg, cfg, disable_sqflow, false);
 	UPDATE_CFG_OPTION(ctrl_cfg, cfg, hdr_digest, false);
@@ -817,10 +817,10 @@ static int build_options(libnvme_host_t h, libnvme_ctrl_t c, char **argstr)
 			return ret;
 
 		if (key_id == 0) {
-			if (cfg->tls_configured_key)
-				key_id = cfg->tls_configured_key;
+			if (cfg->tls_configured_key_id)
+				key_id = cfg->tls_configured_key_id;
 			else
-				key_id = cfg->tls_key;
+				key_id = cfg->tls_key_id;
 		}
 	}
 
@@ -2042,7 +2042,7 @@ static void nvme_parse_tls_args(const char *keyring, const char *tls_key,
 		long id = strtol(keyring, &endptr, 0);
 
 		if (endptr != keyring)
-			cfg->keyring = id;
+			cfg->keyring_id = id;
 		else
 			libnvme_ctrl_set_keyring(c, keyring);
 	}
@@ -2055,7 +2055,7 @@ static void nvme_parse_tls_args(const char *keyring, const char *tls_key,
 		long id = strtol(tls_key, &endptr, 0);
 
 		if (endptr != tls_key)
-			cfg->tls_key = id;
+			cfg->tls_key_id = id;
 		else
 			libnvme_ctrl_set_tls_key(c, tls_key);
 	}

libnvme/src/nvme/fabrics.h

@@ -42,9 +42,9 @@ struct libnvmf_context;
  * @nr_write_queues:	Number of queues to use for exclusively for writing
  * @nr_poll_queues:	Number of queues to reserve for polling completions
  * @tos:		Type of service
- * @keyring:		Keyring to store and lookup keys
- * @tls_key:		TLS PSK for the connection
- * @tls_configured_key: TLS PSK for connect command for the connection
+ * @keyring_id:		Keyring to store and lookup keys
+ * @tls_key_id:		TLS PSK for the connection
+ * @tls_configured_key_id: TLS PSK for connect command for the connection
  * @duplicate_connect:	Allow multiple connections to the same target
  * @disable_sqflow:	Disable controller sq flow control
  * @hdr_digest:		Generate/verify header digest (TCP)
@@ -62,9 +62,9 @@ struct libnvme_fabrics_config {
 	int nr_write_queues;
 	int nr_poll_queues;
 	int tos;
-	long keyring;
-	long tls_key;
-	long tls_configured_key;
+	long keyring_id;
+	long tls_key_id;
+	long tls_configured_key_id;
 
 	bool duplicate_connect;
 	bool disable_sqflow;

libnvme/src/nvme/linux.c

@@ -1388,7 +1388,7 @@ int __libnvme_import_keys_from_config(libnvme_host_t h, libnvme_ctrl_t c,
 		if (ret)
 			return ret;
 	} else
-		kr_id = c->cfg.keyring;
+		kr_id = c->cfg.keyring_id;
 
 	/*
 	 * Fallback to the default keyring. Note this will also add the

libnvme/src/nvme/tree.c

@@ -1702,7 +1702,7 @@ static void libnvme_read_sysfs_tls(struct libnvme_global_ctx *ctx,
 	/* the sysfs entry is not prefixing the id but it's in hex */
 	key_id = strtol(key, &endptr, 16);
 	if (endptr != key)
-		c->cfg.tls_key = key_id;
+		c->cfg.tls_key_id = key_id;
 
 	free(key);
 
@@ -1713,7 +1713,7 @@ static void libnvme_read_sysfs_tls(struct libnvme_global_ctx *ctx,
 	/* the sysfs entry is not prefixing the id but it's in hex */
 	key_id = strtol(key, &endptr, 16);
 	if (endptr != key)
-		c->cfg.tls_configured_key = key_id;
+		c->cfg.tls_configured_key_id = key_id;
 
 	free(key);
 }