Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement support for secure concatenation #2191

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Implement support for secure concatenation #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
613dea4
build: Update libnvme wrap
hreinecke Jan 23, 2024
bb8614e
nvme-fabrics: enable option 'concat'
hreinecke Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Documentation/nvme-connect-all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -186,6 +186,9 @@ OPTIONS
--tls::
Enable TLS encryption (TCP).

--concat::
Enable secure concatenation (TCP).

-S::
--quiet::
Suppress error messages.
Expand Down
5 changes: 4 additions & 1 deletion Documentation/nvme-connect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
5 changes: 4 additions & 1 deletion Documentation/nvme-discover.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>]
Expand Down Expand Up @@ -206,6 +206,9 @@ OPTIONS
--tls::
Enable TLS encryption (TCP).

--concat::
Enable secure concatenation (TCP).

-S::
--quiet::
Suppress already connected errors.
Expand Down
2 changes: 2 additions & 0 deletions fabrics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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() \
}
Expand Down
2 changes: 1 addition & 1 deletion subprojects/libnvme.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/linux-nvme/libnvme.git
revision = f38b1d72e5077c827a3fdf8989dcc2dae70701d1
revision = b5122474cc0f545e7a8868f9c0177a41428acb2b

[provide]
libnvme = libnvme_dep
Expand Down