* [PATCH 1/3] update discover and connect-all man pages
2016-11-17 16:26 nvme-cli fabrics man pages updates V2 Christoph Hellwig
@ 2016-11-17 16:26 ` Christoph Hellwig
2016-11-17 16:26 ` [PATCH 2/3] add a full blown connect man page Christoph Hellwig
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2016-11-17 16:26 UTC (permalink / raw)
Document the --host-traddr option, and add the missing description of
the --raw command to the connect-all man page.
Signed-off-by: Christoph Hellwig <hch at lst.de>
Conflicts:
Documentation/nvme-connect-all.txt
Documentation/nvme-discover.txt
---
Documentation/nvme-connect-all.txt | 25 ++++++++++++++++++-------
Documentation/nvme-discover.txt | 17 +++++++++++------
2 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
index 40d0913..d85ebb9 100644
--- a/Documentation/nvme-connect-all.txt
+++ b/Documentation/nvme-connect-all.txt
@@ -9,12 +9,12 @@ SYNOPSIS
--------
[verse]
'nvme connect-all'
- [--transport=<trtype> | -t <trtype>]
- [--traddr=<traddr> | -a <traddr>]
- [--host-traddr=<traddr>| -w <host-traddr>]
- [--trsvcid=<trsvcid> | -s <trsvcid>]
- [--hostnqn=<hostnqn> | -q <hostnqn>]
- [--raw=<filename> | -r <filename>]
+ [--transport=<trtype> | -t <trtype>]
+ [--traddr=<traddr> | -a <traddr>]
+ [--trsvcid=<trsvcid> | -s <trsvcid>]
+ [--host_traddr=<traddr> | -w <traddr>]
+ [--hostnqn=<hostnqn> | -q <hostnqn>]
+ [--raw=<filename> | -r <filename>]
DESCRIPTION
-----------
@@ -63,7 +63,12 @@ OPTIONS
This field specifies the transport service id. For transports using IP
addressing (e.g. rdma) this field is the port number. By default, the IP
port number for the RDMA transport is 4420.
-
+
+-s <traddr>::
+--host_traddr=<traddr>::
+ This field specifies the network address used on the host to connect
+ to the Discovery Controller.
+
-q <hostnqn>::
--hostnqn=<hostnqn>::
Overrides the default Host NQN that identifies the NVMe Host.
@@ -74,6 +79,12 @@ OPTIONS
the Discovery Controller to control what NVMe Target resources are
allocated to the NVMe Host for a connection.
+-r <filename>::
+--raw=<filename>::
+ This field will take the output of the 'nvme connect-all' command
+ and dump it to a raw binary file. By default 'nvme connect-all' will
+ dump the output to stdout.
+
EXAMPLES
--------
* Connect to all records returned by the Discover Controller with IP4 address
diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt
index aba71c4..fb6a33f 100644
--- a/Documentation/nvme-discover.txt
+++ b/Documentation/nvme-discover.txt
@@ -9,12 +9,12 @@ SYNOPSIS
--------
[verse]
'nvme discover'
- [--transport=<trtype> | -t <trtype>]
- [--traddr=<traddr> | -a <traddr>]
- [--host-traddr=<traddr>| -w <host-traddr>]
- [--trsvcid=<trsvcid> | -s <trsvcid>]
- [--hostnqn=<hostnqn> | -q <hostnqn>]
- [--raw=<filename> | -r <filename>]
+ [--transport=<trtype> | -t <trtype>]
+ [--traddr=<traddr> | -a <traddr>]
+ [--trsvcid=<trsvcid> | -s <trsvcid>]
+ [--host_traddr=<traddr> | -w <traddr>]
+ [--hostnqn=<hostnqn> | -q <hostnqn>]
+ [--raw=<filename> | -r <filename>]
DESCRIPTION
-----------
@@ -92,6 +92,11 @@ OPTIONS
/etc/nvme/hostnqn first. If that does not exist, the autogenerated
NQN value from the NVMe Host kernel module is used next.
+-s <traddr>::
+--host_traddr=<traddr>::
+ This field specifies the network address used on the host to connect
+ to the Discovery Controller.
+
-r <filename>::
--raw=<filename>::
This field will take the output of the 'nvme discover' command
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] add a full blown connect man page
2016-11-17 16:26 nvme-cli fabrics man pages updates V2 Christoph Hellwig
2016-11-17 16:26 ` [PATCH 1/3] update discover and connect-all man pages Christoph Hellwig
@ 2016-11-17 16:26 ` Christoph Hellwig
2016-11-17 16:26 ` [PATCH 3/3] add a disconnect " Christoph Hellwig
2016-11-17 16:55 ` nvme-cli fabrics man pages updates V2 Keith Busch
3 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2016-11-17 16:26 UTC (permalink / raw)
Mostly based on the wording in connect-all.
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
Documentation/nvme-connect.txt | 89 +++++++++++++++++++++++++++---------------
1 file changed, 58 insertions(+), 31 deletions(-)
diff --git a/Documentation/nvme-connect.txt b/Documentation/nvme-connect.txt
index affcedf..ef1b3c4 100644
--- a/Documentation/nvme-connect.txt
+++ b/Documentation/nvme-connect.txt
@@ -3,39 +3,52 @@ nvme-connect(1)
NAME
----
-nvme-connect - Connect to an NVMe-over-Fabrics subsystem.
+nvme-connect - Connect to a Fabrics controller.
SYNOPSIS
--------
[verse]
-'nvme connect' [device]
- [--transport=<trtype> | -t <trtype>]
- [--traddr=<traddr> | -a <traddr>]
- [--host-traddr=<traddr>| -w <host-traddr>]
- [--trsvcid=<trsvcid> | -s <trsvcid>]
- [--hostnqn=<hostnqn> | -q <hostnqn>]
- [--nqn=<subnqn> | -n <subnqn>]
- [--nr-io-queues=<#> | -i <#>]
- [--keep-alive-tmo=<#> | -k <#>]
- [--reconnect-delay=<#> | -c <#>]
+'nvme connect'
+ [--transport=<trtype> | -t <trtype>]
+ [--nqn=<subnqn> | -n <subnqn>]
+ [--traddr=<traddr> | -a <traddr>]
+ [--trsvcid=<trsvcid> | -s <trsvcid>]
+ [--host_traddr=<traddr> | -w <traddr>]
+ [--hostnqn=<hostnqn> | -q <hostnqn>]
+ [--nr-io-queues=<#> | -i <#>]
+ [--keep-alive-tmo=<#> | -k <#>]
+ [--reconnect-delay=<#> | -c <#>]
DESCRIPTION
-----------
-TBD (note 'device' is optional)
-
-BACKGROUND
-----------
-TBD
+Create a transport connection to a remote system (specified by --traddr and
+--trsvcid) and create a NVMe over Fabrics controller for the NVMe subsystem
+specified by the --nqn option.
OPTIONS
-------
-t <trtype>::
--transport=<trtype>::
- TBD
+ This field specifies the network fabric being used for
+ a NVMe-over-Fabrics network. Current string values include:
++
+[]
+|=================
+|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.
+|loop|Connect to a NVMe over Fabrics target on the local host
+|=================
+
+-n <subnqn>::
+--nqn <subnqn>::
+ This field specifies the name for the NVMe subsystem to connect to.
-a <traddr>::
--traddr=<traddr>::
- TBD
+ This field specifies the network address of the Controller.
+ For transports using IP addressing (e.g. rdma) this should be an
+ IP-based address (ex. IPv4).
-w <traddr>::
--host-traddr=<traddr>::
@@ -43,39 +56,53 @@ OPTIONS
-s <trsvcid>::
--trsvcid=<trsvcid>::
- TBD
-
+ This field specifies the transport service id. For transports using IP
+ addressing (e.g. rdma) this field is the port number. By default, the IP
+ port number for the RDMA transport is 4420.
+
+-s <traddr>::
+--host_traddr=<traddr>::
+ This field specifies the network address used on the host to connect
+ to the Controller.
+
-q <hostnqn>::
--hostnqn=<hostnqn>::
- TBD
-
--n <subnqn>::
---nqn=<subnqn>::
- TBD
+ Overrides the default Host NQN that identifies the NVMe Host.
+ If this option is not specified, the default is read from
+ /etc/nvme/hostnqn first. If that does not exist, the autogenerated
+ NQN value from the NVMe Host kernel module is used next.
+ The Host NQN uniquely identifies the NVMe Host.
-i <#>::
---nr-io-queues<#>::
- TBD
+--nr-io-queues=<#>::
+ Overrides the default number of I/O queues create by the driver.
-k <#>::
--keep-alive-tmo=<#>::
- TBD
+ Overrides the default keep alive timeout (in seconds).
-c <#>::
--reconnect-delay=<#>::
- TBD
+ Overrides the default delay (in seconds) before reconnect is attempted
+ after a connect loss.
EXAMPLES
--------
-* TBD
+* Connect to a subsystem named nqn.2014-08.com.example:nvme:nvm-subsystem-sn-d78432
+on the IP4 address 192.168.1.3. Port 4420 is used by default:
+
------------
-# nvme connect...
+# nvme connect --transport=rdma --traddr=192.168.1.3 \
+--nqn=nqn.2014-08.com.example:nvme:nvm-subsystem-sn-d78432
+------------
+
------------
SEE ALSO
--------
nvme-discover(1)
+nvme-connect-all(1)
+
AUTHORS
-------
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] add a disconnect man page
2016-11-17 16:26 nvme-cli fabrics man pages updates V2 Christoph Hellwig
2016-11-17 16:26 ` [PATCH 1/3] update discover and connect-all man pages Christoph Hellwig
2016-11-17 16:26 ` [PATCH 2/3] add a full blown connect man page Christoph Hellwig
@ 2016-11-17 16:26 ` Christoph Hellwig
2016-11-17 16:55 ` nvme-cli fabrics man pages updates V2 Keith Busch
3 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2016-11-17 16:26 UTC (permalink / raw)
Signed-off-by: Christoph Hellwig <hch at lst.de>
---
Documentation/nvme-disconnect.txt | 58 +++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
create mode 100644 Documentation/nvme-disconnect.txt
diff --git a/Documentation/nvme-disconnect.txt b/Documentation/nvme-disconnect.txt
new file mode 100644
index 0000000..703d901
--- /dev/null
+++ b/Documentation/nvme-disconnect.txt
@@ -0,0 +1,58 @@
+nvme-disconnect(1)
+==================
+
+NAME
+----
+nvme-disconnect - Disonnect one or more Fabrics controller(s).
+
+SYNOPSIS
+--------
+[verse]
+'nvme connect'
+ [--nqn=<subnqn> | -n <subnqn>]
+ [--device=<device> | -d <device>]
+
+DESCRIPTION
+-----------
+Disconnects and removes one or more existing NVMe over Fabrics controllers.
+If the --nqn option is specified all controllers connecting to the Subsystem
+identified by subnqn will be removed. If the --device option is specified
+the controller specified by the --device option will be removed.
+
+OPTIONS
+-------
+-n <subnqn>::
+--nqn <subnqn>::
+ Indicates that all controllers for the NVMe subsystems specified
+ should be removed.
+
+-d <device>::
+--device <device>::
+ Indicates that the controller with the specified name should be
+ removed.
+
+EXAMPLES
+--------
+* Disconnect all controllers for a subsystem named
+nqn.2014-08.com.example:nvme:nvm-subsystem-sn-d78432:
++
+------------
+# nvme disconnect --nqn=nqn.2014-08.com.example:nvme:nvm-subsystem-sn-d78432
+------------
+
+* Disconnect the controller nvme4
++
+------------
+# nvme disconnect --device=nvme4
+------------
+
+------------
+
+SEE ALSO
+--------
+nvme-connect(1)
+
+
+NVME
+----
+Part of the nvme-user suite
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* nvme-cli fabrics man pages updates V2
2016-11-17 16:26 nvme-cli fabrics man pages updates V2 Christoph Hellwig
` (2 preceding siblings ...)
2016-11-17 16:26 ` [PATCH 3/3] add a disconnect " Christoph Hellwig
@ 2016-11-17 16:55 ` Keith Busch
3 siblings, 0 replies; 6+ messages in thread
From: Keith Busch @ 2016-11-17 16:55 UTC (permalink / raw)
On Thu, Nov 17, 2016@05:26:24PM +0100, Christoph Hellwig wrote:
> This completes the remaining missing pieces for documenting the
> fabrics commands.
>
> Changes since V1:
> - updated to latest master, doh
Thanks, applied them all. I did make a few minor changes to remove the older
place holder entries in the doc that you've fixed. Looks correct to me,
but let me know if there's any problem.
^ permalink raw reply [flat|nested] 6+ messages in thread