From: Martin George <marting@netapp.com>
Date: Wed, 3 Mar 2021 06:19:19 +0000 (+0530)
Subject: fabrics: ensure zero kato for non-persistent controllers
X-Git-Tag: v1.14~55
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a67d001330ae1c407aa4f8491436bb2d0128d47f;p=users%2Fsagi%2Fnvme-cli.git

fabrics: ensure zero kato for non-persistent controllers

Add a helper function that sets the default kato value for the
discovery controllers. Along with ensuring a non-zero kato value
(i.e. NVMF_DEF_DISC_TMO) is passed to a persistent discovery
controller, it also ensures a zero kato value is passed to a
non-persistent discovery controller, as mandated by the NVMe spec.

Signed-off-by: Martin George <marting@netapp.com>
---

diff --git a/fabrics.c b/fabrics.c
index b9485c5b..f84c45b5 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -974,6 +974,16 @@ static int build_options(char *argstr, int max_len, bool discover)
 	return 0;
 }
 
+static void set_discovery_kato(struct config *cfg)
+{
+	/* Set kato to NVMF_DEF_DISC_TMO for persistent controllers */
+	if (cfg->persistent && !cfg->keep_alive_tmo)
+		cfg->keep_alive_tmo = NVMF_DEF_DISC_TMO;
+	/* Set kato to zero for non-persistent controllers */
+	else if (!cfg->persistent && (cfg->keep_alive_tmo > 0))
+		cfg->keep_alive_tmo = 0;
+}
+
 static void discovery_trsvcid(struct config *cfg)
 {
 	if (!strcmp(cfg->transport, "tcp")) {
@@ -1469,8 +1479,7 @@ static int discover_from_conf_file(const char *desc, char *argstr,
 		err = flags = validate_output_format(cfg.output_format);
 		if (err < 0)
 			goto free_and_continue;
-		if (cfg.persistent && !cfg.keep_alive_tmo)
-			cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
+		set_discovery_kato(&cfg);
 
 		if (traddr_is_hostname(&cfg)) {
 			ret = hostname2traddr(&cfg);
@@ -1549,8 +1558,7 @@ int fabrics_discover(const char *desc, int argc, char **argv, bool connect)
 	if (!cfg.transport && !cfg.traddr) {
 		ret = discover_from_conf_file(desc, argstr, opts, connect);
 	} else {
-		if (cfg.persistent && !cfg.keep_alive_tmo)
-			cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
+		set_discovery_kato(&cfg);
 
 		if (traddr_is_hostname(&cfg)) {
 			ret = hostname2traddr(&cfg);