| Message ID | 20240722142122.128258-1-hare@kernel.org |
|---|---|
| Headers | show |
| Series | nvme: implement secure concatenation | expand |
On Mon, Jul 22, 2024 at 04:21:13PM +0200, Hannes Reinecke wrote: > > Patchset can be found at > git.kernel.org:/pub/scm/linux/kernel/git/hare/nvme.git > branch secure-concat.v8 Not a valid git URL. Also no base commit given and this doesn't apply to upstream. - Eric
On 7/23/24 00:28, Eric Biggers wrote: > On Mon, Jul 22, 2024 at 04:21:13PM +0200, Hannes Reinecke wrote: >> >> Patchset can be found at >> git.kernel.org:/pub/scm/linux/kernel/git/hare/nvme.git >> branch secure-concat.v8 > > Not a valid git URL. > git://git.kernel.org/pub/scm/linux/kernel/git/hare/nvme.git branch secure-concat.v8 base commit f178e8f9eaa900a353145179fc0164a12acfbb2c Sorry for the inconvenience. Cheers, Hannes
From: Hannes Reinecke <hare@suse.de> Hi all, here's my attempt to implement secure concatenation for NVMe-of TCP as outlined in TP8018. The original (v5) patchset had been split in two, and this is the second part based on top of the patchset 'nvme: fixes for secure concatenation' sent earlier to the mailinglist. Secure concatenation means that a TLS PSK is generated from the key material negotiated by the DH-HMAC-CHAP protocol, and the TLS PSK is then used for a subsequent TLS connection. The difference between the original definition of secure concatenation and the method outlined in TP8018 is that with TP8018 the connection is reset after DH-HMAC-CHAP negotiation, and a new connection is setup with the generated TLS PSK. To implement that Sagi came up with the idea to directly reset the admin queue once the DH-CHAP negotiation has completed; that way it will be transparent to the upper layers and we don't have to worry about exposing queues which should not be used. As usual, comments and reviews are welcome. Patchset can be found at git.kernel.org:/pub/scm/linux/kernel/git/hare/nvme.git branch secure-concat.v8 Changes to v7: - Add patch to display nvme target TLS status in debugfs - Include reviews from Sagi Changes to v6: - Rebase to nvme-6.11 Changes to v5: - Include reviews from Sagi - Split patchset in two parts Changes to v4: - Rework reset admin queue functionality based on an idea from Sagi (thanks!) - kbuild robot fixes - Fixup dhchap negotiation with non-empty C2 value Changes to v3: - Include reviews from Sagi - Do not start I/O queues after DH-HMAC-CHAP negotiation - Use bool to indicate TLS has been enabled on a queue - Add 'tls_keyring' sysfs attribute - Add 'tls_configured_key' sysfs attribute Changes to v2: - Fixup reset after dhchap negotiation - Disable namespace scanning on I/O queues after dhchap negotiation - Reworked TLS key handling (again) Changes to the original submission: - Sanitize TLS key handling - Fixup modconfig compilation Hannes Reinecke (9): crypto,fs: Separate out hkdf_extract() and hkdf_expand() nvme: add nvme_auth_generate_psk() nvme: add nvme_auth_generate_digest() nvme: add nvme_auth_derive_tls_psk() nvme-keyring: add nvme_tls_psk_refresh() nvme-tcp: request secure channel concatenation nvme-fabrics: reset admin connection for secure concatenation nvmet-tcp: support secure channel concatenation nvmet: add tls_concat and tls_key debugfs entries crypto/Makefile | 1 + crypto/hkdf.c | 112 +++++++++ drivers/nvme/common/auth.c | 303 +++++++++++++++++++++++++ drivers/nvme/common/keyring.c | 50 ++++ drivers/nvme/host/auth.c | 108 ++++++++- drivers/nvme/host/fabrics.c | 34 ++- drivers/nvme/host/fabrics.h | 3 + drivers/nvme/host/nvme.h | 2 + drivers/nvme/host/sysfs.c | 4 +- drivers/nvme/host/tcp.c | 56 ++++- drivers/nvme/target/auth.c | 72 +++++- drivers/nvme/target/debugfs.c | 27 +++ drivers/nvme/target/fabrics-cmd-auth.c | 49 +++- drivers/nvme/target/fabrics-cmd.c | 33 ++- drivers/nvme/target/nvmet.h | 38 +++- drivers/nvme/target/tcp.c | 23 +- fs/crypto/hkdf.c | 68 +----- include/crypto/hkdf.h | 18 ++ include/linux/nvme-auth.h | 7 + include/linux/nvme-keyring.h | 7 + include/linux/nvme.h | 7 + 21 files changed, 926 insertions(+), 96 deletions(-) create mode 100644 crypto/hkdf.c create mode 100644 include/crypto/hkdf.h