From: mwilck@suse.com
To: Sagi Grimberg <sagi@grimberg.me>, Hannes Reinecke <hare@suse.de>,
Keith Busch <kbusch@kernel.org>
Cc: Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
linux-nvme@lists.infradead.org,
Enzo Matsumiya <ematsumiya@suse.de>
Subject: [PATCH 01/10] nvme-discover: lookup existing persistent controllers
Date: Sat, 6 Mar 2021 01:36:15 +0100 [thread overview]
Message-ID: <20210306003624.21102-2-mwilck@suse.com> (raw)
In-Reply-To: <20210306003624.21102-1-mwilck@suse.com>
From: Hannes Reinecke <hare@suse.de>
If persistent controller connections are present they should be
preferred even if no --device option is given on the commandline.
To avoid selecting a temporary non-persistent controller the
'kato' attribute is checked; any controller which does not have
this attribute or for which the attribute is '0' will be skipped.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin Wilck <mwilck@suse.com>
---
fabrics.c | 50 ++++++++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/fabrics.c b/fabrics.c
index f84c45b..14899cc 100644
--- a/fabrics.c
+++ b/fabrics.c
@@ -320,6 +320,27 @@ static bool ctrl_matches_connectargs(char *name, struct connect_args *args)
cargs.trsvcid = parse_conn_arg(addr, ' ', conarg_trsvcid);
cargs.host_traddr = parse_conn_arg(addr, ' ', conarg_host_traddr);
+ if (!strcmp(cargs.subsysnqn, NVME_DISC_SUBSYS_NAME)) {
+ char *kato_str = nvme_get_ctrl_attr(path, "kato"), *p;
+ unsigned int kato = 0;
+
+ /*
+ * When looking up discovery controllers we have to skip
+ * any non-persistent controllers (ie those with a zero
+ * kato value). Otherwise the controller will vanish from
+ * underneath us as they are owned by another program.
+ *
+ * The 'kato' attribute might not be present; assume a
+ * non-persistent controller for these installations.
+ */
+ if (kato_str) {
+ kato = strtoul(kato_str, &p, 0);
+ if (p == kato_str)
+ kato = 0;
+ }
+ if (kato == 0)
+ return found;
+ }
if (!strcmp(cargs.subsysnqn, args->subsysnqn) &&
!strcmp(cargs.transport, args->transport) &&
(!strcmp(cargs.traddr, args->traddr) ||
@@ -1345,30 +1366,15 @@ static int do_discover(char *argstr, bool connect, enum nvme_print_flags flags)
char *dev_name;
int instance, numrec = 0, ret, err;
int status = 0;
+ struct connect_args *cargs;
- if (cfg.device) {
- struct connect_args *cargs;
+ cargs = extract_connect_args(argstr);
+ if (!cargs)
+ return -ENOMEM;
- cargs = extract_connect_args(argstr);
- if (!cargs)
- return -ENOMEM;
-
- /*
- * if the cfg.device passed in matches the connect args
- * cfg.device is left as-is
- * else if there exists a controller that matches the
- * connect args
- * cfg.device is the matching ctrl name
- * else if no ctrl matches the connect args
- * cfg.device is set to null. This will attempt to
- * create a new ctrl.
- * endif
- */
- if (!ctrl_matches_connectargs(cfg.device, cargs))
- cfg.device = find_ctrl_with_connectargs(cargs);
-
- free_connect_args(cargs);
- }
+ if (!cfg.device || !ctrl_matches_connectargs(cfg.device, cargs))
+ cfg.device = find_ctrl_with_connectargs(cargs);
+ free_connect_args(cargs);
if (!cfg.device) {
instance = add_ctrl(argstr);
--
2.29.2
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-03-06 0:37 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-06 0:36 [PATCH 00/10] Some minor fixes/additions for nvme-cli mwilck
2021-03-06 0:36 ` mwilck [this message]
2021-03-15 17:38 ` [PATCH 01/10] nvme-discover: lookup existing persistent controllers Sagi Grimberg
2021-03-15 17:43 ` Martin Wilck
2021-03-16 9:36 ` Hannes Reinecke
2021-03-06 0:36 ` [PATCH 02/10] nvme-discover: assume device given on command line is persistent mwilck
2021-03-15 17:41 ` Sagi Grimberg
2021-03-15 17:51 ` Martin Wilck
2021-03-06 0:36 ` [PATCH 03/10] do_discover: free cfg.device when resetting it mwilck
2021-03-06 0:36 ` [PATCH 04/10] nvme-connect-all(1): fix documentation for --quiet/-S mwilck
2021-03-08 7:12 ` Chaitanya Kulkarni
2021-03-15 17:44 ` Sagi Grimberg
2021-03-06 0:36 ` [PATCH 05/10] nvme: add some simplifying macros for __attribute__((cleanup())) mwilck
2021-03-08 7:10 ` Chaitanya Kulkarni
2021-03-15 17:44 ` Sagi Grimberg
2021-03-06 0:36 ` [PATCH 06/10] nvme-cli: add generic logging functionality mwilck
2021-03-08 7:15 ` Chaitanya Kulkarni
2021-03-08 7:17 ` Chaitanya Kulkarni
2021-03-15 17:45 ` Sagi Grimberg
2021-03-16 8:14 ` Martin Wilck
2021-03-06 0:36 ` [PATCH 07/10] nvme: convert some function arguments from "char *" to "const char *" mwilck
2021-03-08 7:13 ` Chaitanya Kulkarni
2021-03-15 17:46 ` Sagi Grimberg
2021-03-06 0:36 ` [PATCH 08/10] fabrics: use "const char *" in struct config mwilck
2021-03-08 7:08 ` Chaitanya Kulkarni
2021-03-15 17:46 ` Sagi Grimberg
2021-03-06 0:36 ` [PATCH 09/10] fabrics: fix some memory leaks mwilck
2021-03-08 7:13 ` Chaitanya Kulkarni
2021-03-15 17:46 ` Sagi Grimberg
2021-03-06 0:36 ` [PATCH 10/10] fabrics: fix invalid memory access in discover_from_conf_file() mwilck
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=20210306003624.21102-2-mwilck@suse.com \
--to=mwilck@suse.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=ematsumiya@suse.de \
--cc=hare@suse.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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;
as well as URLs for NNTP newsgroup(s).