From: jsmart2021@gmail.com (James Smart)
Subject: [PATCH rfc v2 02/10] nvme-cli: support persistent connections to a discovery controller
Date: Thu, 11 Jul 2019 17:31:32 -0700 [thread overview]
Message-ID: <20190712003140.16221-3-jsmart2021@gmail.com> (raw)
In-Reply-To: <20190712003140.16221-1-jsmart2021@gmail.com>
From: Sagi Grimberg <sagi@grimberg.me>
Simply don't destroy the discovery controller after getting the
log pages. Note that persistent connection to a discovery subsystem
require to pass in a non-zero kato value, so if not provided we
simply use a default of 30 seconds kato.
Example:
nvme connect-all ... --persistent
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
Reviewed-by: James Smart <jsmart2021 at gmail.com>
Reviewed-by: Hannes Reinecke <hare at suse.com>
Reviewed-by: Max Gurtovoy <maxg at mellanox.com>
Reviewed-by: Minwoo Im <minwoo.im.dev at gmail.com>
---
fabrics.c | 15 ++++++++++++---
fabrics.h | 2 ++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/fabrics.c b/fabrics.c
index 5757aaf..75dedf8 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -66,6 +66,7 @@ static struct config {
int disable_sqflow;
int hdr_digest;
int data_digest;
+ bool persistent;
} cfg = { NULL };
#define BUF_SIZE 4096
@@ -872,9 +873,11 @@ static int do_discover(char *argstr, bool connect)
return -errno;
ret = nvmf_get_log_page_discovery(dev_name, &log, &numrec, &status);
free(dev_name);
- err = remove_ctrl(instance);
- if (err)
- return err;
+ if (!cfg.persistent) {
+ err = remove_ctrl(instance);
+ if (err)
+ return err;
+ }
switch (ret) {
case DISC_OK:
@@ -957,6 +960,9 @@ static int discover_from_conf_file(const char *desc, char *argstr,
if (err)
continue;
+ if (cfg.persistent && !cfg.keep_alive_tmo)
+ cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
+
err = build_options(argstr, BUF_SIZE);
if (err) {
ret = err;
@@ -999,6 +1005,7 @@ int discover(const char *desc, int argc, char **argv, bool connect)
{"nr-write-queues", 'W', "LIST", CFG_INT, &cfg.nr_write_queues, required_argument, "number of write queues to use (default 0)" },
{"nr-poll-queues", 'P', "LIST", CFG_INT, &cfg.nr_poll_queues, required_argument, "number of poll queues to use (default 0)" },
{"queue-size", 'Q', "LIST", CFG_INT, &cfg.queue_size, required_argument, "number of io queue elements to use (default 128)" },
+ {"persistent", 'p', "LIST", CFG_NONE, &cfg.persistent, no_argument, "persistent discovery connection" },
{NULL},
};
@@ -1013,6 +1020,8 @@ int discover(const char *desc, int argc, char **argv, bool connect)
ret = discover_from_conf_file(desc, argstr,
command_line_options, connect);
} else {
+ if (cfg.persistent && !cfg.keep_alive_tmo)
+ cfg.keep_alive_tmo = NVMF_DEF_DISC_TMO;
ret = build_options(argstr, BUF_SIZE);
if (ret)
goto out;
diff --git a/fabrics.h b/fabrics.h
index 988f3ef..7c1664b 100644
--- a/fabrics.h
+++ b/fabrics.h
@@ -1,6 +1,8 @@
#ifndef _DISCOVER_H
#define _DISCOVER_H
+#define NVMF_DEF_DISC_TMO 30
+
extern int discover(const char *desc, int argc, char **argv, bool connect);
extern int connect(const char *desc, int argc, char **argv);
extern int disconnect(const char *desc, int argc, char **argv);
--
2.13.7
next prev parent reply other threads:[~2019-07-12 0:31 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 0:31 [PATCH rfc v2 00/10] nvme-cli: nvmf auto-connect scripts James Smart
2019-07-12 0:31 ` [PATCH rfc v2 01/10] nvme-cli: ignore arguments that pass in "none" James Smart
2019-07-12 0:31 ` James Smart [this message]
2019-07-12 0:31 ` [PATCH rfc v2 03/10] nvme-cli: allow discover to address discovery controller by persistent name James Smart
2019-07-12 1:34 ` Minwoo Im
2019-07-12 12:41 ` Hannes Reinecke
2019-07-12 16:37 ` Sagi Grimberg
2019-07-12 0:31 ` [PATCH rfc v2 04/10] nvme-cli: Refactor to create a get_nvme_ctrl_info routine James Smart
2019-07-12 0:50 ` Sagi Grimberg
2019-07-12 6:20 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 05/10] nvme-cli: extend ctrl_list_item for connect attributes James Smart
2019-07-12 0:47 ` Sagi Grimberg
2019-07-16 0:11 ` James Smart
2019-07-16 1:13 ` Sagi Grimberg
2019-07-12 6:24 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 06/10] nvme-cli: Add routine to compare ctrl_list_item to connect args James Smart
2019-07-12 0:49 ` Sagi Grimberg
2019-07-12 6:25 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 07/10] nvme-cli: Add routine to search for controller with specific attributes James Smart
2019-07-12 0:50 ` Sagi Grimberg
2019-07-12 6:28 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 08/10] nvme-cli: Expand --device argument processing James Smart
2019-07-12 0:51 ` Sagi Grimberg
2019-07-12 14:10 ` Hannes Reinecke
2019-07-12 0:31 ` [PATCH rfc v2 09/10] nvme-cli: add --quiet option James Smart
2019-07-12 17:35 ` Sagi Grimberg
2019-07-14 14:49 ` James Smart
2019-07-15 23:34 ` James Smart
2019-07-12 0:31 ` [PATCH rfc v2 10/10] nvme-cli: nvmf auto-connect scripts James Smart
2019-07-12 0:42 ` Sagi Grimberg
2019-07-12 17:26 ` Sagi Grimberg
2019-07-14 14:47 ` James Smart
2019-07-15 17:20 ` Sagi Grimberg
2019-07-12 17:55 ` Sagi Grimberg
2019-07-14 14:49 ` James Smart
2019-07-12 17:58 ` Sagi Grimberg
2019-07-14 14:57 ` James Smart
2019-07-15 17:21 ` Sagi Grimberg
2019-07-15 19:04 ` James Smart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190712003140.16221-3-jsmart2021@gmail.com \
--to=jsmart2021@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox