diff -Nru nvme-cli-1.12/common.h nvme-cli-1.14/common.h
--- nvme-cli-1.12/common.h 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/common.h 2021-04-20 19:51:42.000000000 +0000
@@ -9,4 +9,7 @@
#define min(x, y) ((x) > (y) ? (y) : (x))
#define max(x, y) ((x) > (y) ? (x) : (y))
+#define __stringify_1(x...) #x
+#define __stringify(x...) __stringify_1(x)
+
#endif
diff -Nru nvme-cli-1.12/completions/bash-nvme-completion.sh nvme-cli-1.14/completions/bash-nvme-completion.sh
--- nvme-cli-1.12/completions/bash-nvme-completion.sh 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/completions/bash-nvme-completion.sh 2021-04-20 19:51:42.000000000 +0000
@@ -2,16 +2,17 @@
# (unfortunately, bash won't let me add descriptions to cmds)
# Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015
-_cmds="list id-ctrl id-ns list-ns create-ns delete-ns \
- attach-ns detach-ns list-ctrl get-ns-id get-log \
- fw-log smart-log smart-log-add error-log \
- get-feature set-feature format fw-activate \
+_cmds="list id-ctrl id-ns list-ns id-iocs nvm-id-ctrl create-ns delete-ns \
+ attach-ns detach-ns list-ctrl get-ns-id get-log persistent-event-log \
+ pred-lat-event-agg-log fw-log smart-log smart-log-add error-log \
+ predictable-lat-log get-feature set-feature format fw-activate \
fw-download admin-passthru io-passthru security-send \
security-recv resv-acquire resv-register resv-release \
resv-report dsm flush compare read write write-zeroes \
- write-uncor reset subsystem-reset show-regs discover \
+ write-uncor copy reset subsystem-reset show-regs discover \
connect-all connect disconnect version help \
- intel lnvm memblaze list-subsys"
+ intel lnvm memblaze list-subsys endurance-event-agg-log \
+ lba-status-log resv-notif-log"
nvme_list_opts () {
local opts=""
@@ -44,11 +45,17 @@
--force -f --output-format= -o"
;;
"list-ns")
- opts+=" --namespace-id= -n --al -a"
+ opts+=" --namespace-id= -n --al -a --csi= -y"
+ ;;
+ "id-iocs")
+ opts+=" --controller-id= -c"
+ ;;
+ "nvm-id-ctrl")
+ opts+=" --output-format= -o"
;;
"create-ns")
opts+=" --nsze= -s --ncap= -c --flbas= -f \
- --dps= -d --nmic= -n"
+ --dps= -d --nmic= -n --csi= -y"
;;
"delete-ns")
opts+=" -namespace-id= -n"
@@ -68,6 +75,18 @@
opts+=" --log-id= -i --log-len= -l --namespace-id= -n \
--raw-binary= -b"
;;
+ "persistent-event-log")
+ opts+=" --action= -a --log-len= -l \
+ --raw-binary -b --output-format= -o"
+ ;;
+ "pred-lat-event-agg-log")
+ opts+=" --log-entries= -e --rae -r \
+ --raw-binary -b --output-format= -o"
+ ;;
+ "predictable-lat-log")
+ opts+=" --nvmset-id= -i --raw-binary -b \
+ --output-format= -o"
+ ;;
"fw-log")
opts+=" --raw-binary -b --output-format= -o"
;;
@@ -82,6 +101,16 @@
opts+=" --namespace-id= -n --raw-binary -b --log-entries= -e \
--output-format= -o"
;;
+ "endurance-event-agg-log")
+ opts+=" --log-entries= -e --rae -r \
+ --raw-binary -b --output-format= -o"
+ ;;
+ "lba-status-log")
+ opts+=" --rae -r --output-format= -o"
+ ;;
+ "resv-notif-log")
+ opts+=" --output-format= -o"
+ ;;
"get-feature")
opts+=" --namespace-id= -n --feature-id= -f --sel= -s \
--data-len= -l --cdw11= --raw-binary -b \
@@ -145,6 +174,15 @@
opts+=" --namespace-id= -n --ctx-attrs= -a --blocks= -b\
-slbs= -s --ad -d --idw -w --idr -r --cdw11= -c"
;;
+ "copy")
+ opts+=" --sdlba= -d --blocks= -b --slbs= -s \
+ --limited-retry -l --force-unit-access -f \
+ --prinfow= -p --prinfor= -P \
+ --ref-tag= -r --expected-ref-tag= -R \
+ --app-tag= -a --expected-app-tag= -A \
+ --app-tag-mask= -m --expected-app-tag-mask= -M \
+ --dir-type= -T --dir-spec= -S --format= -F"
+ ;;
"flush")
opts+=" --namespace-id= -n"
;;
diff -Nru nvme-cli-1.12/completions/_nvme nvme-cli-1.14/completions/_nvme
--- nvme-cli-1.12/completions/_nvme 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/completions/_nvme 2021-04-20 19:51:42.000000000 +0000
@@ -10,17 +10,25 @@
'id-ctrl:display information about the controller'
'id-ns:display information about the namespace'
'list-ns:identify all namespace(s) attached'
+ 'id-iocs:display information about I/O command sets'
'create-ns:create a new namespace before attachment'
'delete-ns:delete a detached namespace'
'attach-ns:attach namespace to controller'
'detach-ns:detach namespace from controller'
'list-ctrl:identify all controller(s) attached'
+ 'nvm-id-ctrl:display information about the nvm command set'
'get-ns-id:get namespace id of opened block device'
'get-log:retrieve any log in raw format'
+ 'predictable-lat-log:retrieve predictable latency per nvmset log'
+ 'pred-lat-event-agg-log:retrieve predictable latency event aggregate log'
+ 'persistent-event-log:retrieve presistent event log'
'fw-log:retrieve fw log'
'smart-log:retrieve SMART log'
'smart-log-add:retrieve additional SMART log'
'error-log:retrieve error log'
+ 'endurance-event-agg-log:retrieve endurance group event aggregate log'
+ 'lba-status-log:retrieve lba status log'
+ 'resv-notif-log: retrieve reservation notification log'
'get-feature:display a controller feature'
'set-feature:set a controller feature and show results'
'format:apply new block format to namespace'
@@ -34,6 +42,7 @@
'resv-register:register reservation on a namespace'
'resv-release:release reservation on a namespace'
'resv-report:report reservation on a namespace'
+ 'copy:submit a simple copy command'
'flush:submit a flush'
'compare:compare data on device to data elsewhere'
'read:submit a read command'
@@ -88,10 +97,30 @@
/dev/nvme':supply a device to use (required)'
--namespace-id=':start namespace infos listing with this nsid'
-n':alias of --namespace-id'
+ --csi=':command set identifier'
+ -y':alias of --csi'
)
_arguments '*:: :->subcmds'
_describe -t commands "nvme list-ns options" _listns
;;
+ (id-iocs)
+ local _idiocs
+ _idiocs=(
+ /dev/nvme':supply a device to use (required)'
+ --controller-id=':show infos for controller '
+ -c':alias of --controller-id'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme id-iocs options" _idiocs
+ ;;
+ nvm-id-ctrl)
+ local _nvmidctrl
+ _nvmidctrl=(
+ /dev/nvme':supply a device to use (required)'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme nvm-id-ctrl options" _nvmidctrl
+ ;;
(create-ns)
local _createns
_createns=(
@@ -106,6 +135,8 @@
-d':alias of --dps'
--nmic=':multipath and sharing'
-n':alias of --nmic'
+ --csi=':command set identifier'
+ -y':alias of --csi'
)
_arguments '*:: :->subcmds'
_describe -t commands "nvme create-ns options" _createns
@@ -180,6 +211,46 @@
_arguments '*:: :->subcmds'
_describe -t commands "nvme get-log options" _getlog
;;
+ (persistent-event-log)
+ local _persistenteventlog
+ _persistenteventlog=(
+ /dev/nvme':supply a device to use (required)'
+ --action=': action the controller shall take for this log page'
+ -a':alias to --action'
+ --log-len=':number of bytes to show for requested log'
+ -l':alias of --log-len'
+ --raw-binary':dump infos in binary format'
+ -b':alias of --raw-binary'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "persistent-event-log options" _persistenteventlog
+ ;;
+ (pred-lat-event-agg-log)
+ local _predlateventagglog
+ _predlateventagglog=(
+ /dev/nvme':supply a device to use (required)'
+ --log-entries=': Number of pending NVM Set Entries log list'
+ -e':alias to --log-entries'
+ --rae': Retain an Asynchronous Event'
+ -r':alias to --rae
+ --raw-binary':dump infos in binary format'
+ -b':alias of --raw-binary'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme pred-lat-event-agg-log options" _predlateventagglog
+ ;;
+ (predictablelatlog)
+ local _predictablelatlog
+ _predictablelatlog=(
+ /dev/nvme':supply a device to use (required)'
+ --nvmset-id=': NVM Set Identifier on which log page retrieve info'
+ -i':alias to --nvmset-id'
+ --raw-binary':dump infos in binary format'
+ -b':alias of --raw-binary'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme predictable-lat-log options" _predictablelatlog
+ ;;
(fw-log)
local _fwlog
_fwlog=(
@@ -228,6 +299,38 @@
_arguments '*:: :->subcmds'
_describe -t commands "nvme error-log options" _errlog
;;
+ (endurance-event-agg-log)
+ local _enduranceeventagglog
+ _enduranceeventagglog=(
+ /dev/nvme':supply a device to use (required)'
+ --log-entries=': Number of Endurance Group Event Agg Entries log list'
+ -e':alias to --log-entries'
+ --rae': Retain an Asynchronous Event'
+ -r':alias to --rae
+ --raw-binary':dump infos in binary format'
+ -b':alias of --raw-binary'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme endurance-event-agg-log options" _enduranceeventagglog
+ ;;
+ (lba-status-log)
+ local _lbastatuslog
+ _lbastatuslog=(
+ /dev/nvme':supply a device to use (required)'
+ --rae': Retain an Asynchronous Event'
+ -r':alias to --rae
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme lba-status-log options" _lbastatuslog
+ ;;
+ (resv-notif-log)
+ local _resvnotiflog
+ _resvnotiflog=(
+ /dev/nvme':supply a device to use (required)'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme resv-notif-log options" _resvnotiflog
+ ;;
(get-feature)
local _getf
_getf=(
@@ -515,6 +618,46 @@
_arguments '*:: :->subcmds'
_describe -t commands "nvme resv-register options" _reg
;;
+ (copy)
+ local _copy
+ _copy=(
+ /dev/nvme':supply a device to use (required)'
+ --sdlba=':64-bit addr of first destination logical block'
+ -d':alias of --sdlba'
+ --slbs=':64-bit addr of first block per range (comma-separated list)'
+ -s':alias of --slbs'
+ --blocks=':number of blocks per range (comma-separated list, zeroes-based values)'
+ -b':alias of --blocks'
+ --limited-retry':if included, controller should try less hard to retrieve data from media (if not included, all available data recovery means used)'
+ -l':alias of --limited-retry'
+ --force-unit-access':if included, the data shall be read from non-volatile media'
+ -f':alias of --force-unit access'
+ --prinfow=':protection information and check field (write part)'
+ -p':alias of --prinfow'
+ --prinfor=':protection information and check field (read part)'
+ -P':alias of --prinfor'
+ --ref-tag=':initial lba reference tag (write part)'
+ -r':alias of --ref-tag'
+ --expected-ref-tags=':expected lba reference tags (read part, comma-separated list)'
+ -R':alias of --expected-ref-tags'
+ --app-tag=':lba application tag (write part)'
+ -a':alias of --app-tag'
+ --expected-app-tags=':expected lba application tags (read part, comma-separated list)'
+ -A':alias of --expected-app-tags'
+ --app-tag-mask=':lba application tag mask (write part)'
+ -m':alias of --app-tag-mask'
+ --expected-app-tag-masks=':expected lba application tag masks (read part, comma-separated list)'
+ -M':alias of --expected-app-tag-masks'
+ --dir-type':directive type (write part)'
+ -T':alias of --dir-type'
+ --dir-spec':directive specific (write part)'
+ -S':alias of --dir-spec'
+ --format':source range entry format'
+ -F':alias of --format'
+ )
+ _arguments '*:: :->subcmds'
+ _describe -t commands "nvme copy options" _copy
+ ;;
(flush)
local _flush
_flush=(
@@ -639,11 +782,13 @@
;;
(help)
local _h
- _h=( id-ctrl id-ns list-ns create-ns delete-ns attach-ns detach-ns
+ _h=( id-ctrl id-ns list-ns id-iocs create-ns delete-ns attach-ns detach-ns
list-ctrl get-ns-id get-log fw-log smart-log error-log get-feature
set-feature format fw-activate fw-download admin-passthru io-passthru
security-send security-recv resv-acquire resv-register resv-release
- resv-report flush compare read write show-regs
+ resv-report flush compare read write copy show-regs persistent-event-log
+ pred-lat-event-agg-log nvm-id-ctrl endurance-event-agg-log lba-status-log
+ resv-notif-log
)
_arguments '*:: :->subcmds'
_describe -t commands "help: infos on a specific nvme command, or provide no option to see a synopsis of all nvme commands" _h
diff -Nru nvme-cli-1.12/debian/changelog nvme-cli-1.14/debian/changelog
--- nvme-cli-1.12/debian/changelog 2021-07-02 20:41:27.000000000 +0000
+++ nvme-cli-1.14/debian/changelog 2021-07-02 21:08:03.000000000 +0000
@@ -1,3 +1,33 @@
+nvme-cli (1.14-1) experimental; urgency=medium
+
+ * Uploading to experimental.
+ * Merging upstream version 1.14:
+ - fixes bug that can cause some Samsung controllers to go
+ offline (Closes: #989840).
+ * Removing whitespaces at EOL.
+ * Correcting name entries in changelog.
+ * Adding vcs fields.
+ * Updating to standards version 4.5.1.
+ * Adding rules-requires-root field.
+ * Repeating section for binary packages in control for consistency
+ reasons.
+ * Updating format url in copyright.
+ * Updating source url in copyright.
+ * Adding upstream-name in copyright.
+ * Adding upstream-contact in copyright.
+ * Updating year in copyright.
+ * Using default GPL license blocks in copyright.
+ * Making postinst executable in source tree.
+ * Rewriting postinst with the standard maintainer script.
+ * Removing spurious bash-completion file in source tree.
+ * Harmonizing rules file.
+ * Removing spurious source/include-binaries file (Closes: #944833).
+ * Updating watch file to version 4.
+ * Wrap and sorting debian directory.
+ * Updating package description.
+
+ -- Daniel Baumann Fri, 02 Jul 2021 23:08:03 +0200
+
nvme-cli (1.12-8) unstable; urgency=medium
* Adopting package.
@@ -8,46 +38,46 @@
* Orphaning the package
- -- Fri, 02 Jul 2021 19:37:48 +0100
+ -- Breno Leitao Fri, 02 Jul 2021 19:37:48 +0100
nvme-cli (1.12-5) unstable; urgency=medium
* Add uuid-runtime as dependency. (Closes: #970637)
- -- Tue, 22 Sep 2020 20:37:51 +0100
+ -- Breno Leitao Tue, 22 Sep 2020 20:37:51 +0100
nvme-cli (1.12-4) unstable; urgency=medium
* Fix udev rules and config files. Thanks intrigeri (Closes: #968769)
* Remove debian/package.bash-completion (Closes: #969345)
- -- Sun, 20 Sep 2020 10:39:01 +0100
+ -- Breno Leitao Sun, 20 Sep 2020 10:39:01 +0100
nvme-cli (1.12-3) unstable; urgency=medium
* Bring debhelper compat to 13 and fix build deps (Closes: ##969183)
- -- Sun, 20 Sep 2020 10:23:14 +0100
+ -- Breno Leitao Sun, 20 Sep 2020 10:23:14 +0100
nvme-cli (1.12-2) unstable; urgency=medium
* Generate /etc/nvme/host* files at install time, not build time.
Thanks Dan for the patch. (Closes: #969340)
- -- Sun, 20 Sep 2020 10:14:36 +0100
+ -- Breno Leitao Sun, 20 Sep 2020 10:14:36 +0100
nvme-cli (1.12-1) unstable; urgency=medium
* New upstream release.
- -- Sat, 20 Jun 2020 09:27:22 +0100
+ -- Breno Leitao Sat, 20 Jun 2020 09:27:22 +0100
nvme-cli (1.9-1) unstable; urgency=medium
- * New upstream release
- * Fixed dependencies (Closes: #944832)
+ * New upstream release
+ * Fixed dependencies (Closes: #944832)
- -- Breno Leitao Sat, 23 Nov 2019 13:40:40 +0000
+ -- Breno Leitao Sat, 23 Nov 2019 13:40:40 +0000
nvme-cli (1.7-1) unstable; urgency=medium
@@ -76,7 +106,7 @@
nvme-cli (1.3-1) unstable; urgency=medium
- * New upstream release. Thanks Rodrigo R. Galvão
+ * New upstream release. Thanks Rodrigo R. Galvão
-- Breno Leitao Wed, 14 Jun 2017 16:36:20 -0300
diff -Nru nvme-cli-1.12/debian/control nvme-cli-1.14/debian/control
--- nvme-cli-1.12/debian/control 2021-07-02 20:41:27.000000000 +0000
+++ nvme-cli-1.14/debian/control 2021-07-02 21:08:03.000000000 +0000
@@ -1,24 +1,29 @@
Source: nvme-cli
-Maintainer: Daniel Baumann
Section: admin
Priority: optional
-Standards-Version: 4.1.1
+Maintainer: Daniel Baumann
Build-Depends:
debhelper-compat (= 13),
pci.ids,
pkg-config,
uuid-dev,
uuid-runtime,
+Rules-Requires-Root: no
+Standards-Version: 4.5.1
Homepage: https://github.com/linux-nvme/nvme-cli
+Vcs-Browser: https://git.progress-linux.org/users/daniel.baumann/debian/packages/nvme-cli
+Vcs-Git: https://git.progress-linux.org/users/daniel.baumann/debian/packages/nvme-cli
Package: nvme-cli
+Section: admin
Architecture: any
Depends:
+ uuid-runtime,
${misc:Depends},
${shlibs:Depends},
- uuid-runtime,
-Description: userspace tooling to control NVMe drives
- NVMe is a fast, scalable, direct attached storage interface, accessing
- solid state drives through PCIe.
+Description: NVMe management tool
+ NVM Express (NVMe) is a interface specification for accessing non-volatile
+ storage media, typically modern solid state drives (SSDs) through PCI Express
+ (PCIe).
.
- The nvme CLI contains core management tools with minimal dependencies.
+ The nvme-cli tool provides management functions for these devices.
diff -Nru nvme-cli-1.12/debian/copyright nvme-cli-1.14/debian/copyright
--- nvme-cli-1.12/debian/copyright 2016-07-03 15:07:14.000000000 +0000
+++ nvme-cli-1.14/debian/copyright 2021-07-02 21:08:03.000000000 +0000
@@ -1,8 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://github.com/linux-nvme/nvme-cli
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nvme-cli
+Upstream-Contact: n/a
+Source: https://github.com/linux-nvme/nvme-cli/releases
Files: *
-Copyright: 2011-2015 Intel Corporation
+Copyright: 2011-2021 Intel Corporation
2014 PMC-Sierra, Inc
License: GPL-2+
@@ -10,29 +12,35 @@
Copyright: 2015 CNEX Labs
License: GPL-2
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
- On Debian systems, the full text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
-License: GPL-2
- This program is free software; you can redistribute it and/or modify it
- under the terms and conditions of the GNU General Public License,
- version 2, as published by the Free Software Foundation.
- .
- This program is distributed in the hope it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
+License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
.
- On Debian systems, the full text of the GNU General Public License
- version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
diff -Nru nvme-cli-1.12/debian/nvme-cli.postinst nvme-cli-1.14/debian/nvme-cli.postinst
--- nvme-cli-1.12/debian/nvme-cli.postinst 2020-09-20 09:14:26.000000000 +0000
+++ nvme-cli-1.14/debian/nvme-cli.postinst 2021-07-02 21:00:35.000000000 +0000
@@ -2,14 +2,29 @@
set -e
-if [ "$1" = "configure" ]; then
- if [ ! -s /etc/nvme/hostnqn ]; then
- nvme gen-hostnqn > /etc/nvme/hostnqn
- fi
-
- if [ ! -s /etc/nvme/hostid ]; then
- uuidgen > /etc/nvme/hostid
- fi
-fi
+case "${1}" in
+ configure)
+ if [ ! -s /etc/nvme/hostnqn ]
+ then
+ nvme gen-hostnqn > /etc/nvme/hostnqn
+ fi
+
+ if [ ! -s /etc/nvme/hostid ]
+ then
+ uuidgen > /etc/nvme/hostid
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`${1}'" >&2
+ exit 1
+ ;;
+esac
#DEBHELPER#
+
+exit 0
diff -Nru nvme-cli-1.12/debian/package.bash-completion nvme-cli-1.14/debian/package.bash-completion
--- nvme-cli-1.12/debian/package.bash-completion 2017-02-06 13:20:45.000000000 +0000
+++ nvme-cli-1.14/debian/package.bash-completion 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-bash_completion.d/nvme
diff -Nru nvme-cli-1.12/debian/rules nvme-cli-1.14/debian/rules
--- nvme-cli-1.12/debian/rules 2020-09-20 09:37:56.000000000 +0000
+++ nvme-cli-1.14/debian/rules 2021-07-02 21:08:03.000000000 +0000
@@ -3,16 +3,15 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
- dh $@
+ dh ${@}
override_dh_auto_install:
dh_auto_install -- PREFIX=/usr UDEVDIR=/lib/udev
- # Remove build-time unique id files, instead these will be
- # generated by the postinst script
+
+ # removing unique files
rm -f debian/nvme-cli/etc/nvme/hostid
rm -f debian/nvme-cli/etc/nvme/hostnqn
rm -f debian/nvme-cli/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
override_dh_auto_test:
- # Overriding auto test, since the tests require that the build machine
- # has a NVME device.
+ # disabled, requires a NVMe device
diff -Nru nvme-cli-1.12/debian/source/include-binaries nvme-cli-1.14/debian/source/include-binaries
--- nvme-cli-1.12/debian/source/include-binaries 2017-06-14 19:36:20.000000000 +0000
+++ nvme-cli-1.14/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-argconfig.o
-fabrics.o
-huawei-nvme.o
-intel-nvme.o
-json.o
-lnvm-nvme.o
-memblaze-nvme.o
-nvme
-nvme-ioctl.o
-nvme-lightnvm.o
-nvme-models.o
-nvme-print.o
-parser.o
-plugin.o
-suffix.o
-wdc-nvme.o
diff -Nru nvme-cli-1.12/debian/watch nvme-cli-1.14/debian/watch
--- nvme-cli-1.12/debian/watch 2016-01-07 17:52:33.000000000 +0000
+++ nvme-cli-1.14/debian/watch 2021-07-02 21:08:03.000000000 +0000
@@ -1,3 +1,3 @@
-version=3
-opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/nvme-cli-$1.tar.gz/" \
-https://github.com/linux-nvme/nvme-cli/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+version=4
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/nvme-cli-$1\.tar\.gz/ \
+https://github.com/linux-nvme/nvme-cli/releases .*/v?(\d\S+)\.tar\.gz
diff -Nru nvme-cli-1.12/Documentation/cmds-main.txt nvme-cli-1.14/Documentation/cmds-main.txt
--- nvme-cli-1.12/Documentation/cmds-main.txt 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/cmds-main.txt 2021-04-20 19:51:42.000000000 +0000
@@ -17,7 +17,10 @@
Format namespace(s)
linknvme:nvme-fw-activate[1]::
- F/W Activate
+ F/W Activate (in old version < 1.2)
+
+linknvme:nvme-fw-commit[1]::
+ F/W Commit (in > 1.2)
linknvme:nvme-fw-download[1]::
F/W Download
@@ -34,15 +37,24 @@
linknvme:nvme-telemetry-log[1]::
Telemetry Host-Initiated Log
+linknvme:nvme-changed-ns-list-log[1]::
+ Retrieve Changed Namespace List Log
+
linknvme:nvme-smart-log[1]::
Retrieve Smart Log
+linknvme:nvme-ana-log[1]::
+ Retreive ANA(Asymmetric Namespace Access) Log
+
linknvme:nvme-endurance-log[1]::
Retrieve endurance Log
linknvme:nvme-effects-log[1]::
Retrieve effects Log
+linknvme:nvme-self-test-log[1]::
+ Retrieve Device Self-test Log
+
linknvme:nvme-get-ns-id[1]::
Retrieve namespace identifier
@@ -55,6 +67,12 @@
linknvme:nvme-id-ns[1]::
Identify Namespace
+linknvme:nvme-id-nvmset[1]::
+ Identify NVM Set List
+
+linknvme:nvme-id-iocs[1]::
+ Identify I/O Command Set
+
linknvme:nvme-create-ns[1]::
Create a new namespace
@@ -82,6 +100,15 @@
linknvme:nvme-list-ctrl[1]::
List controller in NVMe subsystem
+linknvme:nvme-list-subsys[1]::
+ List NVMe subsystems
+
+linknvme:nvme-reset[1]::
+ Reset a NVMe controller
+
+linknvme:nvme-device-self-test[1]::
+ Issue Device Self-test Command
+
linknvme:nvme-read[1]::
Issue IO Read Command
@@ -112,6 +139,12 @@
linknvme:nvme-security-send[1]::
Security Send
+linknvme:nvme-dsm[1]::
+ Issue Data Set Management Command
+
+linknvme:nvme-copy[1]::
+ Issue Simple Copy Command
+
linknvme:nvme-set-feature[1]::
Set Feature
diff -Nru nvme-cli-1.12/Documentation/nvme.1 nvme-cli-1.14/Documentation/nvme.1
--- nvme-cli-1.12/Documentation/nvme.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme.1 2021-04-20 19:51:42.000000000 +0000
@@ -1,13 +1,13 @@
'\" t
.\" Title: nvme
.\" Author: [see the "Authors" section]
-.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/24/2020
+.\" Generator: DocBook XSL Stylesheets v1.79.1
+.\" Date: 12/01/2020
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME" "1" "04/24/2020" "NVMe" "NVMe Manual"
+.TH "NVME" "1" "12/01/2020" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -85,7 +85,12 @@
.PP
\fBnvme-fw-activate\fR(1)
.RS 4
-F/W Activate
+F/W Activate (in old version < 1\&.2)
+.RE
+.PP
+\fBnvme-fw-commit\fR(1)
+.RS 4
+F/W Commit (in > 1\&.2)
.RE
.PP
\fBnvme-fw-download\fR(1)
@@ -113,11 +118,21 @@
Telemetry Host\-Initiated Log
.RE
.PP
+\fBnvme-changed-ns-list-log\fR(1)
+.RS 4
+Retrieve Changed Namespace List Log
+.RE
+.PP
\fBnvme-smart-log\fR(1)
.RS 4
Retrieve Smart Log
.RE
.PP
+\fBnvme-ana-log\fR(1)
+.RS 4
+Retreive ANA(Asymmetric Namespace Access) Log
+.RE
+.PP
\fBnvme-endurance-log\fR(1)
.RS 4
Retrieve endurance Log
@@ -128,6 +143,11 @@
Retrieve effects Log
.RE
.PP
+\fBnvme-self-test-log\fR(1)
+.RS 4
+Retrieve Device Self\-test Log
+.RE
+.PP
\fBnvme-get-ns-id\fR(1)
.RS 4
Retrieve namespace identifier
@@ -148,6 +168,16 @@
Identify Namespace
.RE
.PP
+\fBnvme-id-nvmset\fR(1)
+.RS 4
+Identify NVM Set List
+.RE
+.PP
+\fBnvme-id-iocs\fR(1)
+.RS 4
+Identify I/O Command Set
+.RE
+.PP
\fBnvme-create-ns\fR(1)
.RS 4
Create a new namespace
@@ -193,6 +223,21 @@
List controller in NVMe subsystem
.RE
.PP
+\fBnvme-list-subsys\fR(1)
+.RS 4
+List NVMe subsystems
+.RE
+.PP
+\fBnvme-reset\fR(1)
+.RS 4
+Reset a NVMe controller
+.RE
+.PP
+\fBnvme-device-self-test\fR(1)
+.RS 4
+Issue Device Self\-test Command
+.RE
+.PP
\fBnvme-read\fR(1)
.RS 4
Issue IO Read Command
@@ -243,6 +288,16 @@
Security Send
.RE
.PP
+\fBnvme-dsm\fR(1)
+.RS 4
+Issue Data Set Management Command
+.RE
+.PP
+\fBnvme-copy\fR(1)
+.RS 4
+Issue Simple Copy Command
+.RE
+.PP
\fBnvme-set-feature\fR(1)
.RS 4
Set Feature
diff -Nru nvme-cli-1.12/Documentation/nvme-admin-passthru.1 nvme-cli-1.14/Documentation/nvme-admin-passthru.1
--- nvme-cli-1.12/Documentation/nvme-admin-passthru.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-admin-passthru.1 2021-04-20 19:51:42.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: nvme-admin-passthru
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/24/2020
+.\" Date: 10/20/2020
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME\-ADMIN\-PASSTHR" "1" "04/24/2020" "NVMe" "NVMe Manual"
+.TH "NVME\-ADMIN\-PASSTHR" "1" "10/20/2020" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru nvme-cli-1.12/Documentation/nvme-ana-log.1 nvme-cli-1.14/Documentation/nvme-ana-log.1
--- nvme-cli-1.12/Documentation/nvme-ana-log.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-ana-log.1 2021-04-20 19:51:42.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: nvme-ana-log
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/24/2020
+.\" Date: 10/20/2020
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME\-ANA\-LOG" "1" "04/24/2020" "NVMe" "NVMe Manual"
+.TH "NVME\-ANA\-LOG" "1" "10/20/2020" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru nvme-cli-1.12/Documentation/nvme-attach-ns.1 nvme-cli-1.14/Documentation/nvme-attach-ns.1
--- nvme-cli-1.12/Documentation/nvme-attach-ns.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-attach-ns.1 2021-04-20 19:51:42.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: nvme-attach-ns
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/24/2020
+.\" Date: 10/20/2020
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME\-ATTACH\-NS" "1" "04/24/2020" "NVMe" "NVMe Manual"
+.TH "NVME\-ATTACH\-NS" "1" "10/20/2020" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru nvme-cli-1.12/Documentation/nvme-changed-ns-list-log.1 nvme-cli-1.14/Documentation/nvme-changed-ns-list-log.1
--- nvme-cli-1.12/Documentation/nvme-changed-ns-list-log.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-changed-ns-list-log.1 2021-04-20 19:51:42.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: nvme-changed-ns-list-log
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/24/2020
+.\" Date: 10/20/2020
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME\-CHANGED\-NS\-L" "1" "04/24/2020" "NVMe" "NVMe Manual"
+.TH "NVME\-CHANGED\-NS\-L" "1" "10/20/2020" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru nvme-cli-1.12/Documentation/nvme-compare.1 nvme-cli-1.14/Documentation/nvme-compare.1
--- nvme-cli-1.12/Documentation/nvme-compare.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-compare.1 2021-04-20 19:51:42.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: nvme-compare
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/24/2020
+.\" Date: 10/20/2020
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME\-COMPARE" "1" "04/24/2020" "NVMe" "NVMe Manual"
+.TH "NVME\-COMPARE" "1" "10/20/2020" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -Nru nvme-cli-1.12/Documentation/nvme-connect.1 nvme-cli-1.14/Documentation/nvme-connect.1
--- nvme-cli-1.12/Documentation/nvme-connect.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-connect.1 2021-04-20 19:51:42.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: nvme-connect
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/24/2020
+.\" Date: 10/20/2020
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME\-CONNECT" "1" "04/24/2020" "NVMe" "NVMe Manual"
+.TH "NVME\-CONNECT" "1" "10/20/2020" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -65,6 +65,7 @@
lt lt
lt lt
lt lt
+lt lt
lt lt.
T{
Value
@@ -83,6 +84,11 @@
The network fabric is a Fibre Channel network\&.
T}
T{
+tcp
+T}:T{
+The network fabric is a TCP/IP network\&.
+T}
+T{
loop
T}:T{
Connect to a NVMe over Fabrics target on the local host
diff -Nru nvme-cli-1.12/Documentation/nvme-connect-all.1 nvme-cli-1.14/Documentation/nvme-connect-all.1
--- nvme-cli-1.12/Documentation/nvme-connect-all.1 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-connect-all.1 2021-04-20 19:51:42.000000000 +0000
@@ -2,12 +2,12 @@
.\" Title: nvme-connect-all
.\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
.\" Generator: DocBook XSL Stylesheets vsnapshot
-.\" Date: 04/29/2020
+.\" Date: 01/20/2021
.\" Manual: NVMe Manual
.\" Source: NVMe
.\" Language: English
.\"
-.TH "NVME\-CONNECT\-ALL" "1" "04/29/2020" "NVMe" "NVMe Manual"
+.TH "NVME\-CONNECT\-ALL" "1" "01/20/2021" "NVMe" "NVMe Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -51,7 +51,7 @@
[\-\-queue\-size=<#> | \-Q <#>]
[\-\-matching | \-m]
[\-\-persistent | \-p]
- [\-\-quiet | \-q]
+ [\-\-quiet | \-S]
.fi
.SH "DESCRIPTION"
.sp
@@ -72,6 +72,7 @@
lt lt
lt lt
lt lt
+lt lt
lt lt.
T{
Value
@@ -90,6 +91,11 @@
The network fabric is a Fibre Channel network\&.
T}
T{
+tcp
+T}:T{
+The network fabric is a TCP/IP network\&.
+T}
+T{
loop
T}:T{
Connect to a NVMe over Fabrics target on the local host
@@ -187,7 +193,7 @@
Don\(cqt remove the discovery controller after retrieving the discovery log page\&.
.RE
.PP
-\-q, \-\-quiet
+\-S, \-\-quiet
.RS 4
Suppress error messages\&.
.RE
diff -Nru nvme-cli-1.12/Documentation/nvme-connect-all.html nvme-cli-1.14/Documentation/nvme-connect-all.html
--- nvme-cli-1.12/Documentation/nvme-connect-all.html 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-connect-all.html 2021-04-20 19:51:42.000000000 +0000
@@ -768,7 +768,7 @@
[--queue-size=<#> | -Q <#>]
[--matching | -m]
[--persistent | -p]
- [--quiet | -q]
+ [--quiet | -S]
@@ -825,6 +825,10 @@
WIP The network fabric is a Fibre Channel network. |
+tcp |
+The network fabric is a TCP/IP network. |
+
+
loop |
Connect to a NVMe over Fabrics target on the local host |
@@ -1044,7 +1048,7 @@
--q
+-S
--quiet
@@ -1111,7 +1115,7 @@
+
+
+
+
SYNOPSIS
+
+
+
nvme-copy <device> [--sdlba=<sdlba> | -d <sdlba>]
+ [--blocks=<nlb-list,> | -b <nlb-list,>]
+ [--slbs=<slbas,> | -s <slbas,>]
+ [--limited-retry | -l]
+ [--force-unit-access | -f]
+ [--prinfow=<prinfow> | -p <prinfow>]
+ [--prinfor=<prinfor> | -P <prinfor>]
+ [--ref-tag=<reftag> | -r <reftag>]
+ [--expected-ref-tags=<reftag,> | -R <reftag,>]
+ [--app-tag=<apptag> | -a <apptag>]
+ [--expected-app-tags=<apptag,> | -A <apptag,>]
+ [--app-mask=<appmask> | -m <appmask>]
+ [--expected-app-masks=<appmask,> | -M <appmask,>]
+ [--dir-type=<type> | -T <type>]
+ [--dir-spec=<spec> | -S <spec>]
+ [--format=<entry-format> | -F <entry-format>]
+
+
+
+
+
+
DESCRIPTION
+
+
The Copy command is used by the host to copy data from one or more source
+logical block ranges to a single consecutive destination logical block range.
+
+
+
+
OPTIONS
+
+
+-
+--sdlba=<sdlba>
+
+-
+-d <sdlba>
+
+-
+
+ 64-bit addr of first destination logical block
+
+
+-
+--blocks=<nlb-list,>
+
+-
+-b <nlb-list,>
+
+-
+
+ Comma separated list of the number of blocks in each range
+
+
+-
+--slbs=<slbas,>
+
+-
+-s <slbas,>
+
+-
+
+ Comma separated list of the starting blocks in each range
+
+
+-
+--limited-retry
+
+-
+-l
+
+-
+
+ Sets the limited retry flag.
+
+
+-
+--force-unit-access
+
+-
+-f
+
+-
+
+ Set the force-unit access flag.
+
+
+-
+--prinfow=<prinfow>
+
+-
+-p <prinfow>
+
+-
+
+ Protection Information field write definition.
+
+
+-
+--prinfor=<prinfor>
+
+-
+-P <prinfor>
+
+-
+
+ Protection Information field read definition.
+
+
+-
+--ref-tag=<reftag>
+
+-
+-r <reftag>
+
+-
+
+ initial lba reference tag.
+
+
+-
+--expected-ref-tags=<reftag,>
+
+-
+-R <reftag,>
+
+-
+
+ expected lba reference tags (comma-separated list).
+
+
+-
+--app-tag=<apptag>
+
+-
+-a <apptag>
+
+-
+
+ lba app tag
+
+
+-
+--expected-app-tags=<apptag,>
+
+-
+-A <apptag,>
+
+-
+
+ expected lba app tags (comma-separated list)
+
+
+-
+--app-mask=<appmask>
+
+-
+-m <appmask>
+
+-
+
+ lba tag mask
+
+
+-
+--expected-app-masks=<appmask,>
+
+-
+-M <appmask,>
+
+-
+
+ expected lba tag masks (comma-separated list)
+
+
+-
+--dir-type=<type>
+
+-
+-T <type>
+
+-
+
+ Optional directive type. The nvme-cli only enforces the value
+ be in the defined range for the directive type, though the NVMe
+ specifcation (1.3a) defines only one directive, 01h, for write
+ stream idenfiers.
+
+
+-
+--dir-spec=<spec>
+
+-
+-S <spec>
+
+-
+
+ Optional field for directive specifics. When used with
+ write streams, this value is defined to be the write stream
+ identifier. The nvme-cli will not validate the stream requested
+ is within the controller’s capabilities.
+
+
+-
+--format=<entry-format>
+
+-
+-F <entry-format>
+
+-
+
+ source range entry format
+
+
+
+
+
+
+
+
NVME
+
+
Part of the nvme-user suite
+
+
+
+
+
+
diff -Nru nvme-cli-1.12/Documentation/nvme-connect-all.txt nvme-cli-1.14/Documentation/nvme-connect-all.txt
--- nvme-cli-1.12/Documentation/nvme-connect-all.txt 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-connect-all.txt 2021-04-20 19:51:42.000000000 +0000
@@ -27,7 +27,7 @@
[--queue-size=<#> | -Q <#>]
[--matching | -m]
[--persistent | -p]
- [--quiet | -q]
+ [--quiet | -S]
DESCRIPTION
-----------
@@ -58,6 +58,7 @@
|Value|Definition
|rdma|The network fabric is an rdma network (RoCE, iWARP, Infiniband, basic rdma, etc)
|fc |*WIP* The network fabric is a Fibre Channel network.
+|tcp |The network fabric is a TCP/IP network.
|loop|Connect to a NVMe over Fabrics target on the local host
|=================
@@ -153,7 +154,7 @@
Don't remove the discovery controller after retrieving the discovery
log page.
--q::
+-S::
--quiet::
Suppress error messages.
diff -Nru nvme-cli-1.12/Documentation/nvme-connect.html nvme-cli-1.14/Documentation/nvme-connect.html
--- nvme-cli-1.12/Documentation/nvme-connect.html 2020-06-16 15:12:15.000000000 +0000
+++ nvme-cli-1.14/Documentation/nvme-connect.html 2021-04-20 19:51:42.000000000 +0000
@@ -4,7 +4,7 @@