Merging upstream version 2.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 93 insertions, 5 deletions

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]</pre>

+                [--data-digest            | -G]

+                [--dump-config            | -O]

+                [--output-format=&lt;fmt&gt;    | -o &lt;fmt&gt;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -873,7 +879,21 @@ cellspacing="0" cellpadding="4">
 <dd>

 <p>

         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.

+</p>

+</dd>

+<dt class="hdlist1">

+-f &lt;iface&gt;

+</dt>

+<dt class="hdlist1">

+--host-iface=&lt;iface&gt;

+</dt>

+<dd>

+<p>

+        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.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -904,6 +924,50 @@ cellspacing="0" cellpadding="4">
 </p>

 </dd>

 <dt class="hdlist1">

+-J &lt;cfg&gt;

+</dt>

+<dt class="hdlist1">

+--config-file=&lt;cfg&gt;

+</dt>

+<dd>

+<p>

+        Use the specified JSON configuration file instead of the

+        default /etc/nvme/config.json file or <em>none</em> to not read in

+        an existing configuration file. The JSON configuration file

+        format is documented in

+        <a href="https://github.com/linux-nvme/libnvme/doc/config-schema.json">https://github.com/linux-nvme/libnvme/doc/config-schema.json</a>

+</p>

+</dd>

+<dt class="hdlist1">

+-S &lt;secret&gt;

+</dt>

+<dt class="hdlist1">

+--dhchap-secret=&lt;secret&gt;

+</dt>

+<dd>

+<p>

+        NVMe In-band authentication secret; needs to be in ASCII format as

+        specified in NVMe 2.0 section 8.13.5.8 <em>Secret representation</em>.

+        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.

+</p>

+</dd>

+<dt class="hdlist1">

+-C &lt;secret&gt;

+</dt>

+<dt class="hdlist1">

+--dhchap-ctrl-secret=&lt;secret&gt;

+</dt>

+<dd>

+<p>

+        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 <em>Secret representation</em>.

+        If not present bi-directional authentication is not attempted.

+</p>

+</dd>

+<dt class="hdlist1">

 -i &lt;#&gt;

 </dt>

 <dt class="hdlist1">

@@ -990,7 +1054,7 @@ cellspacing="0" cellpadding="4">
 </dt>

 <dd>

 <p>

-        Allows duplicated connections between same trnsport host and subsystem

+        Allows duplicated connections between same transport host and subsystem

         port.

 </p>

 </dd>

@@ -1028,6 +1092,30 @@ cellspacing="0" cellpadding="4">
         Generates/verifies data digest (TCP).

 </p>

 </dd>

+<dt class="hdlist1">

+-O

+</dt>

+<dt class="hdlist1">

+--dump-config

+</dt>

+<dd>

+<p>

+        Print out resulting JSON configuration file to stdout.

+</p>

+</dd>

+<dt class="hdlist1">

+-o &lt;format&gt;

+</dt>

+<dt class="hdlist1">

+--output-format=&lt;format&gt;

+</dt>

+<dd>

+<p>

+        Set the reporting format to <em>normal</em> or <em>json</em>. 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.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1074,7 +1162,7 @@ and <a href="mailto:hch@lst.de">Christoph Hellwig</a></p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-14 17:50:40 -03

+ 2022-04-08 18:46:59 CEST

 </div>

 </div>

 </body>