From 589986012c4b3ab68e299a2eadca18f90080113b Mon Sep 17 00:00:00 2001
From: Daniel Baumann
Date: Thu, 14 Jul 2022 20:28:04 +0200
Subject: Merging upstream version 2.0.
Signed-off-by: Daniel Baumann
---
Documentation/nvme-connect.html | 98 ++++++++++++++++++++++++++++++++++++++---
1 file changed, 93 insertions(+), 5 deletions(-)
(limited to 'Documentation/nvme-connect.html')
diff --git a/Documentation/nvme-connect.html b/Documentation/nvme-connect.html
index 1f523dc..c0f1eca 100644
--- a/Documentation/nvme-connect.html
+++ b/Documentation/nvme-connect.html
@@ -436,7 +436,7 @@ thead, p.table.header {
p.table {
margin-top: 0;
}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
+/* Because the table frame attribute is overridden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
border-style: none;
}
@@ -755,8 +755,12 @@ nvme-connect(1) Manual Page
[--traddr=<traddr> | -a <traddr>]
[--trsvcid=<trsvcid> | -s <trsvcid>]
[--host-traddr=<traddr> | -w <traddr>]
+ [--host-iface=<iface> | -f <iface>]
[--hostnqn=<hostnqn> | -q <hostnqn>]
[--hostid=<hostid> | -I <hostid>]
+ [--config-file=<cfg> | -J <cfg> ]
+ [--dhchap-secret=<secret> | -S <secret>]
+ [--dhchap-ctrl-secret=<secret> | -C <secret>]
[--nr-io-queues=<#> | -i <#>]
[--nr-write-queues=<#> | -W <#>]
[--nr-poll-queues=<#> | -P <#>]
@@ -767,7 +771,9 @@ nvme-connect(1) Manual Page
[--duplicate-connect | -D]
[--disable-sqflow | -d]
[--hdr-digest | -g]
- [--data-digest | -G]
+ [--data-digest | -G]
+ [--dump-config | -O]
+ [--output-format=<fmt> | -o <fmt>]
@@ -873,7 +879,21 @@ cellspacing="0" cellpadding="4">
This field specifies the network address used on the host to connect
- to the Controller.
+ to the Controller. For TCP, this sets the source address on the socket.
+
+
+
+-f <iface>
+
+
+--host-iface=<iface>
+
+
+
+ This field specifies the network interface used on the host to connect
+ to the Controller (e.g. IP eth1, enp2s0, enx78e7d1ea46da). This forces
+ the connection to be made on a specific interface instead of letting
+ the system decide.
@@ -904,6 +924,50 @@ cellspacing="0" cellpadding="4">
+-J <cfg>
+
+
+--config-file=<cfg>
+
+
+
+ Use the specified JSON configuration file instead of the
+ default /etc/nvme/config.json file or none to not read in
+ an existing configuration file. The JSON configuration file
+ format is documented in
+ https://github.com/linux-nvme/libnvme/doc/config-schema.json
+
+
+
+-S <secret>
+
+
+--dhchap-secret=<secret>
+
+
+
+ NVMe In-band authentication secret; needs to be in ASCII format as
+ specified in NVMe 2.0 section 8.13.5.8 Secret representation.
+ If this option is not specified, the default is read from
+ /etc/nvme/hostkey. If that does not exist no in-band authentication
+ is attempted.
+
+
+
+-C <secret>
+
+
+--dhchap-ctrl-secret=<secret>
+
+
+
+ NVMe In-band authentication controller secret for bi-directional
+ authentication; needs to be in ASCII format as
+ specified in NVMe 2.0 section 8.13.5.8 Secret representation.
+ If not present bi-directional authentication is not attempted.
+
+
+
-i <#>
@@ -990,7 +1054,7 @@ cellspacing="0" cellpadding="4">
- Allows duplicated connections between same trnsport host and subsystem
+ Allows duplicated connections between same transport host and subsystem
port.
@@ -1028,6 +1092,30 @@ cellspacing="0" cellpadding="4">
Generates/verifies data digest (TCP).
+
+-O
+
+
+--dump-config
+
+
+
+ Print out resulting JSON configuration file to stdout.
+
+
+
+-o <format>
+
+
+--output-format=<format>
+
+
+
+ Set the reporting format to normal or json. Only one output format can
+ be used at a time. When this option is specified, the device associated with
+ the connection will be printed. Nothing is printed otherwise.
+
+
@@ -1074,7 +1162,7 @@ and Christoph Hellwig