From d57675fc67455faf7c68d4003a1ce884779e2c7c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Apr 2023 10:17:38 +0200 Subject: Merging upstream version 2.4+really2.3. This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667. --- Documentation/nvme-discover.html | 90 ++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 60 deletions(-) (limited to 'Documentation/nvme-discover.html') diff --git a/Documentation/nvme-discover.html b/Documentation/nvme-discover.html index 5f3c94e..17d8e51 100644 --- a/Documentation/nvme-discover.html +++ b/Documentation/nvme-discover.html @@ -764,17 +764,14 @@ nvme-discover(1) Manual Page [--keep-alive-tmo=<sec> | -k <sec>] [--reconnect-delay=<#> | -c <#>] [--ctrl-loss-tmo=<#> | -l <#>] + [--hdr_digest | -g] + [--data_digest | -G] [--nr-io-queues=<#> | -i <#>] [--nr-write-queues=<#> | -W <#>] [--nr-poll-queues=<#> | -P <#>] [--queue-size=<#> | -Q <#>] - [--keyring=<#> ] - [--tls_key=<#> ] - [--hdr-digest | -g] - [--data-digest | -G] [--persistent | -p] [--quiet | -S] - [--tls ] [--dump-config | -O] [--output-format=<fmt> | -o <fmt>] [--force] @@ -888,7 +885,7 @@ cellspacing="0" cellpadding="4">

This field specifies the network address of the Discovery Controller. For transports using IP addressing (e.g. rdma) this should be an - IP-based address (ex. IPv4). + IP-based (ex. IPv4) address.

@@ -977,10 +974,8 @@ cellspacing="0" cellpadding="4">

- This field takes a device as input. It must be a persistent device - associated with a Discovery Controller previously created by the - command "connect-all" or "discover". <device> follows the format - nvme*, eg. nvme0, nvme1. + This field takes a device as input. Device is in the format of nvme*, + eg. nvme0, nvme1

@@ -1006,8 +1001,8 @@ cellspacing="0" cellpadding="4">

- Overrides the default keep alive timeout (in seconds). This - option will be ignored for discovery, and it is only + Overrides the default timeout (in seconds) for keep alive. + This option will be ignored for the discovery, and it is only implemented for completeness.

@@ -1035,90 +1030,74 @@ cellspacing="0" cellpadding="4">

--i <#> -
-
---nr-io-queues=<#> -
-
-

- Overrides the default number of I/O queues create by the driver. - This option will be ignored for the discovery, and it is only - implemented for completeness. -

-
-
--W <#> +-g
---nr-write-queues=<#> +--hdr_digest

- Adds additional queues that will be used for write I/O. + Generates/verifies header digest (TCP).

--P <#> +-G
---nr-poll-queues=<#> +--data_digest

- Adds additional queues that will be used for polling latency sensitive I/O. + Generates/verifies data digest (TCP).

--Q <#> +-i <#>
---queue-size=<#> +--nr-io-queues=<#>

- Overrides the default number of elements in the I/O queues created - by the driver which can be found at drivers/nvme/host/fabrics.h. + Overrides the default number of I/O queues create by the driver. This option will be ignored for the discovery, and it is only implemented for completeness.

---keyring=<#> +-W <#>
-
-

- Keyring for TLS key lookup. -

-
---tls_key=<#> +--nr-write-queues=<#>

- TLS key for the connection (TCP). + Adds additional queues that will be used for write I/O.

--g +-P <#>
---hdr-digest +--nr-poll-queues=<#>

- Generates/verifies header digest (TCP). + Adds additional queues that will be used for polling latency sensitive I/O.

--G +-Q <#>
---data-digest +--queue-size=<#>

- Generates/verifies data digest (TCP). + Overrides the default number of elements in the I/O queues created + by the driver which can be found at drivers/nvme/host/fabrics.h. + This option will be ignored for the discovery, and it is only + implemented for completeness.

@@ -1129,16 +1108,7 @@ cellspacing="0" cellpadding="4">

- Don’t remove the discovery controller after retrieving the discovery - log page. -

-
-
---tls -
-
-

- Enable TLS encryption (TCP). + Persistent discovery connection.

@@ -1248,7 +1218,7 @@ nvme-connect-all(1)

-- cgit v1.2.3