Skip to contentSkip to conversation

fabrics: ensure zero kato for non-persistent controllers

PATCH In review Martin George 2 participants 2 messages Feb 24, 2021 – Mar 1, 2021 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 fabrics: ensure zero kato for non-persistent controllers

Add a helper function that sets the default kato value for the 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 is passed to a non-persistent discovery controller.

---
 fabrics.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
fabrics.c +12 -4
index e38657e..c780040 100644
@@ -918,6 +918,16 @@ static int build_options(char *argstr, int max_len, bool discover)
 	return 0;
 }
 
+static void set_kato(struct config *cfg)
+{
+	/* Set kato to NVMF_DEF_DISC_TMO for persistent discovery controllers */
+	if (cfg->persistent && !cfg->keep_alive_tmo)
+		cfg->keep_alive_tmo = NVMF_DEF_DISC_TMO;
+	/* Set kato to zero for non-persistent discovery 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")) {
@@ -1401,8 +1411,7 @@ static int discover_from_conf_file(const char *desc, char *argstr,
 		if (err)
 			goto free_and_continue;
 
-		if (cfg.persistent && !cfg.keep_alive_tmo)
-			cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
+		set_kato(&cfg);
 
 		if (traddr_is_hostname(&cfg)) {
 			ret = hostname2traddr(&cfg);
@@ -1476,8 +1485,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_kato(&cfg);
 
 		if (traddr_is_hostname(&cfg)) {
 			ret = hostname2traddr(&cfg);
Signature · 7 lines
2.30.0


_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
#1 lore raw

Ping?

Quoted 58 lines

Add a helper function that sets the default kato value for the 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 is passed to a non-persistent discovery controller.

---
 fabrics.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
fabrics.c +3 -0
index e38657e..c780040 100644
@@ -918,6 +918,16 @@ static int build_options(char *argstr, int
 max_len, bool discover)
        return 0;
 }
 
+static void set_kato(struct config *cfg)
+{
+       /* Set kato to NVMF_DEF_DISC_TMO for persistent discovery

controllers */

fabrics.c +3 -0
+       if (cfg->persistent && !cfg->keep_alive_tmo)
+               cfg->keep_alive_tmo = NVMF_DEF_DISC_TMO;
+       /* Set kato to zero for non-persistent discovery controllers

*/

fabrics.c +5 -2
+       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")) {
@@ -1401,8 +1411,7 @@ static int discover_from_conf_file(const char
 *desc, char *argstr,
                if (err)
                        goto free_and_continue;
 
-               if (cfg.persistent && !cfg.keep_alive_tmo)
-                       cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
+               set_kato(&cfg);
 
                if (traddr_is_hostname(&cfg)) {
                        ret = hostname2traddr(&cfg);
fabrics.c +1 -2
@@ -1476,8 +1485,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_kato(&cfg);
 
                if (traddr_is_hostname(&cfg)) {
                        ret = hostname2traddr(&cfg);
Quoted 3 lines

--
2.30.0

_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme