nvme-fabrics: enable option 'concat'

Enable the option 'concat' to start secure concatenation on TCP
connections.

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/Documentation/nvme-connect-all.txt b/Documentation/nvme-connect-all.txt
index faa2cf89273b0b669aa72e020927ac47cd698f58..6e01e5926b8634ae28a72e7a690e50802c0d530b 100644 (file)
--- a/Documentation/nvme-connect-all.txt
+++ b/Documentation/nvme-connect-all.txt
@@ -27,7 +27,7 @@ SYNOPSIS
                        [--nr-poll-queues=<#> | -P <#>]
                        [--queue-size=<#> | -Q <#>] [--keyring=<#>]
                        [--tls_key=<#>] [--hdr-digest | -g] [--data-digest | -G]
-                       [--persistent | -p] [--tls] [--quiet | -S]
+                       [--persistent | -p] [--tls] [--concat] [--quiet | -S]
                        [--dump-config | -O] [--nbft] [--no-nbft]
                        [--nbft-path=<STR>] [--context=<STR>]
                        [--output-format=<fmt> | -o <fmt>] [--verbose | -v]
@@ -186,6 +186,9 @@ OPTIONS
 --tls::
        Enable TLS encryption (TCP).
 
+--concat::
+       Enable secure concatenation (TCP).
+
 -S::
 --quiet::
        Suppress error messages.

diff --git a/Documentation/nvme-connect.txt b/Documentation/nvme-connect.txt
index af3e7d3748f2c74442160a815b4cc07cdd127ec9..2cdc229218ffb16c74e147d0e773d8c1b82bee62 100644 (file)
--- a/Documentation/nvme-connect.txt
+++ b/Documentation/nvme-connect.txt
@@ -29,7 +29,7 @@ SYNOPSIS
                        [--keyring=<#>] [--tls_key=<#>]
                        [--duplicate-connect | -D] [--disable-sqflow | -d]
                        [--hdr-digest | -g] [--data-digest | -G] [--tls]
-                       [--dump-config | -O] [--application=<id>]
+                       [--concat] [--dump-config | -O] [--application=<id>]
                        [--output-format=<fmt> | -o <fmt>] [--verbose | -v]
 
 DESCRIPTION
@@ -176,6 +176,9 @@ OPTIONS
 --tls::
        Enable TLS encryption (TCP).
 
+--concat::
+       Enable secure concatenation (TCP).
+
 -O::
 --dump-config::
        Print out resulting JSON configuration file to stdout.

diff --git a/Documentation/nvme-discover.txt b/Documentation/nvme-discover.txt
index 32f10bce420a344508914161f4c4f8936324b709..943a8702345acc14b69ef178955f018fe48d73c0 100644 (file)
--- a/Documentation/nvme-discover.txt
+++ b/Documentation/nvme-discover.txt
@@ -27,7 +27,7 @@ SYNOPSIS
                        [--nr-poll-queues=<#> | -P <#>]
                        [--queue-size=<#> | -Q <#>] [--keyring=<#>]
                        [--tls_key=<#>] [--hdr-digest | -g] [--data-digest | -G]
-                       [--persistent | -p] [--quiet | -S] [--tls]
+                       [--persistent | -p] [--quiet | -S] [--tls] [--concat]
                        [--dump-config | -O] [--output-format=<fmt> | -o <fmt>]
                        [--force] [--nbft] [--no-nbft] [--nbft-path=<STR>]
                        [--context=<STR>]
@@ -206,6 +206,9 @@ OPTIONS
 --tls::
        Enable TLS encryption (TCP).
 
+--concat::
+       Enable secure concatenation (TCP).
+
 -S::
 --quiet::
        Suppress already connected errors.

diff --git a/fabrics.c b/fabrics.c
index dcae9aead9378616b4f5ff3c0ba1e6003718ca9d..1a53b232da236f84bb1227408854061d6c3bf7dd 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -84,6 +84,7 @@ static const char *nvmf_disable_sqflow        = "disable controller sq flow control (de
 static const char *nvmf_hdr_digest     = "enable transport protocol header digest (TCP transport)";
 static const char *nvmf_data_digest    = "enable transport protocol data digest (TCP transport)";
 static const char *nvmf_tls            = "enable TLS";
+static const char *nvmf_concat         = "enable secure concatenation";
 static const char *nvmf_config_file    = "Use specified JSON configuration file or 'none' to disable";
 static const char *nvmf_context                = "execution context identification string";
 
@@ -113,6 +114,7 @@ static const char *nvmf_context             = "execution context identification string";
                OPT_FLAG("hdr-digest",        'g', &c.hdr_digest,         nvmf_hdr_digest),      \
                OPT_FLAG("data-digest",       'G', &c.data_digest,        nvmf_data_digest),     \
                OPT_FLAG("tls",                 0, &c.tls,                nvmf_tls),             \
+               OPT_FLAG("concat",              0, &c.concat,             nvmf_concat),          \
                __VA_ARGS__,                                                                     \
                OPT_END()                                                                        \
        }