Daniel Wagner [Thu, 24 Mar 2022 18:27:01 +0000 (19:27 +0100)]
fabrics: Introduce force flag to overwrite persistence logic
The persistence flag will be overwritten by the built in logic. Allow
the user to overwrite this by providing a force command line option.
While at it make the 'discover_from_config_file' path behave as the
'nvmf_discover' path. The idea here is that whenever a matching
persistent discovery controller is present just use this one. Only
create a new discovery controller when none matching found or
we are asked to do so via --force.
Daniel Wagner [Tue, 29 Mar 2022 10:02:43 +0000 (12:02 +0200)]
argconfig: Rename CFG_NONE to CFG_FLAG
CFG_NONE is used to for OPT_FLAG. All other OPT_ macros have the
matching CFG_ enum. Let's rename CFG_NONE to CFG_FLAG to match and
make it consistent.
Daniel Wagner [Mon, 28 Mar 2022 18:24:21 +0000 (20:24 +0200)]
argconfig: Do not use default value loading by getopt_long_only
getopt_long_only() is able to load the default values directly. Though
the type has to be 'int'. If the target type of argument not 'int'
getopt_long_only will overwrite adjacent memory location.
Reduce the complexity by not using this feature.
Instead use the type bool because libnvme uses bool in 'struct
nvme_fabrics_config'.
Hannes Reinecke [Tue, 29 Mar 2022 08:57:04 +0000 (10:57 +0200)]
nvme: use filter for 'list-subsys <devname>'
When a device name is specified for 'nvme list-subsys' we should
be printing out only those parts of the tree which relate to the
specified device name, not the entire tree.
Fix this by passing the appropriate json array type for smdevices.
Also include a couple of minor changes as well - add a newline to
the end of the json output, and then free the json root device.
Signed-off-by: Martin George <marting@netapp.com> Tested-by: Clayton Skaggs <claytons@netapp.com>
Daniel Wagner [Thu, 17 Mar 2022 13:22:55 +0000 (14:22 +0100)]
nvme: Print full device path
Restore nvme-cli 1.x behavior to print the full path to the device
file. We assume that the devtmpfs is mounted under /dev which is the
case for any systemd based distro and a de-facto standard.
But SPDK users see their device populated under /dev/spdk have their
device file appear. So instead blindly prefix /dev do a stat to check
if the file exist.
If our educated guesses fail, don't add the full path. This should be
really a corner case and as long no one complains don't overengineer.
Minwoo Im [Thu, 18 Nov 2021 13:20:12 +0000 (22:20 +0900)]
nvme-print: print generic device in list command
Generic namespace device is one of I/O paths that needs to be listed up
in the `nvme list` command along with the blkdev. Print it out in the
simple list command.
Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
Hannes Reinecke [Wed, 16 Mar 2022 14:32:06 +0000 (15:32 +0100)]
fabrics: check for discovery controller instead of subsystem NQN
Unique discovery subsystems have a unique subsystem NQN, to we cannot
check for the standard discovery NQN when checking for persistent
discovery controllers, but rather have to check if the subsystem is a
discovery subsystem.
Daniel Wagner [Wed, 16 Mar 2022 10:47:46 +0000 (11:47 +0100)]
nvmf-autoconnect: Add option to specify path to systemctl
Many distros have adapted the usr merge and hence systemctl is install
in /usr/bin. Instead just hard coding the new path, let's introduce a
new build option to allow specifying the path to the systemclt
binary.
Note, the scripts also have hard coded paths to /bin/sh or
/bin/echo. None of these paths are covered by POSIX but in practice
all distros have those as symlinks when the usr merge have been
implemented. Let's address these issues when the pop up.
Daniel Wagner [Tue, 15 Mar 2022 18:25:22 +0000 (19:25 +0100)]
fabrics: Honor sysconfdir for hostnqn and hostid files
When sysconfdir is set during build the hostnqn and hostid file should
be installed under this path. Replace the hard coded path and also
update the documentation.
Daniel Wagner [Tue, 15 Mar 2022 18:08:25 +0000 (19:08 +0100)]
build: Copy include adoc files to build dir
asciidoctor wants all file to live under one common directory root,
thus we can't provide a search path for the include files. Copy
include files to the build dir.
Tomas Bzatek [Tue, 15 Mar 2022 15:01:54 +0000 (16:01 +0100)]
plugins/memblaze: Code style fixes
clang complains, purely cosmetic change:
../plugins/memblaze/memblaze-nvme.c:1119:2: warning: misleading indentation; statement is not part of the previous 'if' [-Wmisleading-indentation]
return err;
^
../plugins/memblaze/memblaze-nvme.c:1102:7: note: previous statement is here
} else if (err > 0)
^
Tomas Bzatek [Tue, 15 Mar 2022 14:50:42 +0000 (15:50 +0100)]
plugins/wdc: Fix a use-after-free
../plugins/wdc/wdc-nvme.c: In function ‘get_dev_mgment_cbs_data’:
../plugins/wdc/wdc-nvme.c:1714:31: warning: pointer ‘hdr_ptr’ used after ‘free’ [-Wuse-after-free]
1714 | data = calloc(le32_to_cpu(hdr_ptr->length), sizeof(__u8));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
../plugins/wdc/wdc-nvme.c:1713:17: note: call to ‘free’ here
1713 | free(data);
| ^~~~~~~~~~
Tomas Bzatek [Mon, 14 Mar 2022 17:15:20 +0000 (18:15 +0100)]
connect: Set errno to zero on nvmf_add_ctrl() success
The libnvme's nvmf_add_ctrl() might return zero (success) while
having errno set to a non-zero value due to lots of calls inside.
And since nvmf_connect() returns errno primarily, make sure
it's zeroed on success.
See related https://github.com/linux-nvme/libnvme/pull/292
Daniel Wagner [Fri, 11 Mar 2022 16:46:46 +0000 (17:46 +0100)]
nvme: constify variable in list_subsys
The compiler complains with
../nvme.c: In function ‘list_subsys’:
../nvme.c:2478:19: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
2478 | n = strrchr(devicename, 'n');
| ^
devicename is of type 'const char *' so the returning pointer is of
the same type. Thus constify the n variable.
Daniel Wagner [Fri, 11 Mar 2022 16:30:08 +0000 (17:30 +0100)]
build: Enable docs build in update docs script
Commit 59263bbcd3e4 ("build: Use boolean type for docs-build default")
introduced a command line option to enable docs build. Let's enable
this in the update docs script.
Hannes Reinecke [Fri, 11 Mar 2022 08:16:09 +0000 (09:16 +0100)]
nvme: print out ANA state for 'list-subsys'
Commit 00aeb92 ("nvme-list-subsys: Add device name argument
and print out ANA state") was not properly ported to libnvme/nvme-cli.
So port the missing bits.
Daniel Wagner [Tue, 8 Mar 2022 14:32:25 +0000 (15:32 +0100)]
nvme: Explicit initialize all command line options
Sort the command line options like the appear on the command line.
Also tabilize and initialize all command options. The consistent
aligment of the options makes the reviewing simpler.
projects / users / sagi / nvme-cli.git / log