Skip to content

Commit f5ba56c

Browse files
committed
nvme-fabrics: enable option 'concat'
Enable the option 'concat' to start secure concatenation on TCP connections. Signed-off-by: Hannes Reinecke <hare@suse.de>
1 parent 613dea4 commit f5ba56c

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

Documentation/nvme-connect-all.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SYNOPSIS
2727
[--nr-poll-queues=<#> | -P <#>]
2828
[--queue-size=<#> | -Q <#>] [--keyring=<#>]
2929
[--tls_key=<#>] [--hdr-digest | -g] [--data-digest | -G]
30-
[--persistent | -p] [--tls] [--quiet | -S]
30+
[--persistent | -p] [--tls] [--concat] [--quiet | -S]
3131
[--dump-config | -O] [--nbft] [--no-nbft]
3232
[--nbft-path=<STR>] [--context=<STR>]
3333
[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
@@ -186,6 +186,9 @@ OPTIONS
186186
--tls::
187187
Enable TLS encryption (TCP).
188188

189+
--concat::
190+
Enable secure concatenation (TCP).
191+
189192
-S::
190193
--quiet::
191194
Suppress error messages.

Documentation/nvme-connect.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SYNOPSIS
2929
[--keyring=<#>] [--tls_key=<#>]
3030
[--duplicate-connect | -D] [--disable-sqflow | -d]
3131
[--hdr-digest | -g] [--data-digest | -G] [--tls]
32-
[--dump-config | -O] [--application=<id>]
32+
[--concat] [--dump-config | -O] [--application=<id>]
3333
[--output-format=<fmt> | -o <fmt>] [--verbose | -v]
3434

3535
DESCRIPTION
@@ -176,6 +176,9 @@ OPTIONS
176176
--tls::
177177
Enable TLS encryption (TCP).
178178

179+
--concat::
180+
Enable secure concatenation (TCP).
181+
179182
-O::
180183
--dump-config::
181184
Print out resulting JSON configuration file to stdout.

Documentation/nvme-discover.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SYNOPSIS
2727
[--nr-poll-queues=<#> | -P <#>]
2828
[--queue-size=<#> | -Q <#>] [--keyring=<#>]
2929
[--tls_key=<#>] [--hdr-digest | -g] [--data-digest | -G]
30-
[--persistent | -p] [--quiet | -S] [--tls]
30+
[--persistent | -p] [--quiet | -S] [--tls] [--concat]
3131
[--dump-config | -O] [--output-format=<fmt> | -o <fmt>]
3232
[--force] [--nbft] [--no-nbft] [--nbft-path=<STR>]
3333
[--context=<STR>]
@@ -206,6 +206,9 @@ OPTIONS
206206
--tls::
207207
Enable TLS encryption (TCP).
208208

209+
--concat::
210+
Enable secure concatenation (TCP).
211+
209212
-S::
210213
--quiet::
211214
Suppress already connected errors.

fabrics.c

+2
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ static const char *nvmf_disable_sqflow = "disable controller sq flow control (de
8484
static const char *nvmf_hdr_digest = "enable transport protocol header digest (TCP transport)";
8585
static const char *nvmf_data_digest = "enable transport protocol data digest (TCP transport)";
8686
static const char *nvmf_tls = "enable TLS";
87+
static const char *nvmf_concat = "enable secure concatenation";
8788
static const char *nvmf_config_file = "Use specified JSON configuration file or 'none' to disable";
8889
static const char *nvmf_context = "execution context identification string";
8990

@@ -113,6 +114,7 @@ static const char *nvmf_context = "execution context identification string";
113114
OPT_FLAG("hdr-digest", 'g', &c.hdr_digest, nvmf_hdr_digest), \
114115
OPT_FLAG("data-digest", 'G', &c.data_digest, nvmf_data_digest), \
115116
OPT_FLAG("tls", 0, &c.tls, nvmf_tls), \
117+
OPT_FLAG("concat", 0, &c.concat, nvmf_concat), \
116118
__VA_ARGS__, \
117119
OPT_END() \
118120
}

0 commit comments

Comments
 (0)