nvme: In-kernel TLS support for TCP
Subsystems (6)
v8 cover nvme: In-kernel TLS support for TCP
Hi all,
with the merge of Chuck Levers handshake upcall mechanism and my tls_read_sock() implementation finally merged with net-next it's now time to restart on the actual issue, namely implementing in-kernel TLS support for nvme-tcp.
The patchset is based on the recent net-next git tree; everything after commit ba4a734e1aa0 ("net/tls: avoid TCP window full during ->read_sock()") should work.
You might want to add the patch
'nvmet-tcp: use 'spin_lock_bh' for state_lock()' before applying this patchset; otherwise results might be ... interesting.
It also requires the 'tlshd' userspace daemon
(https://github.com/oracle/ktls-utils)
for the actual TLS handshake.
Changes for nvme-cli are already included in the upstream repository.
Theory of operation:
A dedicated '.nvme' keyring is created to hold the pre-shared keys (PSKs) for the TLS handshake. Keys will have to be provisioned before TLS handshake is attempted; that can be done with the 'nvme gen-tls-key' command for nvme-cli (patches are already merged upstream).
After connection to the remote TCP port the client side will use the 'best' PSK (as inferred from the NVMe TCP spec) or the PSK specified by the '--tls_key' option to nvme-cli and call the TLS userspace daemon to initiate a TLS handshake.
The server side will then invoke the TLS userspace daemon to run the TLS handshake.
If the TLS handshake succeeds the userspace daemon will be activating kTLS on the socket, and control is passed back to the kernel.
This implementation currently does not implement the so-called 'secure concatenation' mode from NVMe-TCP; a TPAR is still pending with fixes for it, so I'll wait until it's published before posting patches for that.
Patchset can be found at:
git.kernel.org/pub/scm/linux/kernel/git/hare/nvme.git branch tls.v13
For testing I'm using this script, running on a nvme target with NQN 'nqn.test' and using 127.0.0.1 as a port; the port has to set 'addr_tsas' to 'tls1.3':
modprobe nvmet-tcp
nvmetcli restore
modprobe nvme-tcp
./nvme gen-tls-key --subsysnqn=nqn.test -i
./nvme gen-tls-key --subsysnqn=nqn.2014-08.org.nvmexpress.discovery -i tlshd -c /etc/tlshd.conf
and then one can do a simple:
# nvme connect -t tcp -a 127.0.0.1 -s 4420 -n nqn.test --tls to start the connection.
As usual, comments and reviews are welcome.
Changes to v8:
- Simplify reference counting as suggested by Sagi
- Implement nvmf_parse_key() to simplify options parsing
- Add patch to peek at icreq to figure out whether TLS should be started
Changes to v7:
- Include reviews from Simon
- Do not call sock_release() when sock_alloc_file() fails
Changes to v6:
- More reviews from Sagi
- Fixup non-tls connections
- Fixup nvme options handling
- Add reference counting to nvmet-tcp queues
Changes to v5:
- Include reviews from Sagi
- Split off nvmet tsas/treq handling
- Sanitize sock_file handling
Changes to v4:
- Split off network patches into a separate
patchset
- Handle TLS Alert notifications
Changes to v3:
- Really handle MSG_EOR for TLS
- Fixup MSG_SENDPAGE_NOTLAST handling
- Conditionally disable fabric option
Changes to v2:
- Included reviews from Sagi
- Removed MSG_SENDPAGE_NOTLAST
- Improved MSG_EOR handling for TLS
- Add config options NVME_TCP_TLS
and NVME_TARGET_TCP_TLS
Changes to the original RFC:
- Add a CONFIG_NVME_TLS config option
- Use a single PSK for the TLS handshake
- Make TLS connections mandatory
- Do not peek messages for the server
- Simplify data_ready callback
- Implement read_sock() for TLS
Hannes Reinecke (17):
nvme-keyring: register '.nvme' keyring
nvme-keyring: define a 'psk' keytype
nvme: add TCP TSAS definitions
nvme-tcp: add definitions for TLS cipher suites
nvme-keyring: implement nvme_tls_psk_default() security/keys: export key_lookup()
nvme-tcp: allocate socket file
nvme-tcp: enable TLS handshake upcall
nvme-tcp: control message handling for recvmsg()
nvme-fabrics: parse options 'keyring' and 'tls_key'
nvmet: make TCP sectype settable via configfs
nvmet-tcp: make nvmet_tcp_alloc_queue() a void function
nvmet-tcp: allocate socket file
nvmet: Set 'TREQ' to 'required' when TLS is enabled
nvmet-tcp: enable TLS handshake upcall
nvmet-tcp: control messages for recvmsg()
nvmet-tcp: peek icreq before starting TLS
drivers/nvme/common/Kconfig | 4 + drivers/nvme/common/Makefile | 3 +- drivers/nvme/common/keyring.c | 182 ++++++++++++++++++ drivers/nvme/host/Kconfig | 15 ++ drivers/nvme/host/core.c | 12 +- drivers/nvme/host/fabrics.c | 64 ++++++- drivers/nvme/host/fabrics.h | 9 + drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/sysfs.c | 21 +++ drivers/nvme/host/tcp.c | 174 +++++++++++++++++- drivers/nvme/target/Kconfig | 15 ++ drivers/nvme/target/configfs.c | 91 ++++++++- drivers/nvme/target/nvmet.h | 11 ++ drivers/nvme/target/tcp.c | 327 ++++++++++++++++++++++++++++++--- include/linux/nvme-keyring.h | 36 ++++ include/linux/nvme-tcp.h | 6 + include/linux/nvme.h | 10 + security/keys/key.c | 1 + 18 files changed, 937 insertions(+), 45 deletions(-) create mode 100644 drivers/nvme/common/keyring.c create mode 100644 include/linux/nvme-keyring.h
Signature · 1 line
2.35.3
PATCH v8 1/17 nvme-keyring: register '.nvme' keyring
Register a '.nvme' keyring to hold keys for TLS and DH-HMAC-CHAP and add a new config option NVME_KEYRING.
We need a separate keyring for NVMe as the configuration is done via individual commands (eg for configfs), and the usual per-session or per-process keyrings can't be used.
--- drivers/nvme/common/Kconfig | 4 ++++ drivers/nvme/common/Makefile | 3 ++- drivers/nvme/common/keyring.c | 40 +++++++++++++++++++++++++++++++++++ drivers/nvme/host/core.c | 10 +++++++-- include/linux/nvme-keyring.h | 28 ++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 drivers/nvme/common/keyring.c create mode 100644 include/linux/nvme-keyring.h
drivers/nvme/common/Kconfig +4 -0
@@ -2,3 +2,7 @@ config NVME_COMMON tristate + +config NVME_KEYRING + bool + select KEYS
drivers/nvme/common/Makefile +2 -1
@@ -4,4 +4,5 @@ ccflags-y += -I$(src) obj-$(CONFIG_NVME_COMMON) += nvme-common.o -nvme-common-y += auth.o +nvme-common-$(CONFIG_NVME_AUTH) += auth.o +nvme-common-$(CONFIG_NVME_KEYRING) += keyring.o
drivers/nvme/common/keyring.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2023 Hannes Reinecke, SUSE Labs +*/ + +#include <linux/module.h> +#include <linux/seq_file.h> +#include <linux/key-type.h> +#include <keys/user-type.h> +#include <linux/nvme.h> + +static struct key *nvme_keyring; + +key_serial_t nvme_keyring_id (void ) +{ +return nvme_keyring->serial; +} +EXPORT_SYMBOL_GPL (nvme_keyring_id); + +int nvme_keyring_init (void ) +{ + nvme_keyring =keyring_alloc (".nvme" , +GLOBAL_ROOT_UID ,GLOBAL_ROOT_GID , +current_cred (), + (KEY_POS_ALL & ~KEY_POS_SETATTR ) | + (KEY_USR_ALL & ~KEY_USR_SETATTR ), +KEY_ALLOC_NOT_IN_QUOTA ,NULL ,NULL ); +if (IS_ERR (nvme_keyring)) +return PTR_ERR (nvme_keyring); + +return 0 ; +} +EXPORT_SYMBOL_GPL (nvme_keyring_init); + +void nvme_keyring_exit (void ) +{ +key_revoke (nvme_keyring); +key_put (nvme_keyring); +} +EXPORT_SYMBOL_GPL (nvme_keyring_exit);
drivers/nvme/host/core.c +8 -2
@@ -25,6 +25,7 @@#include "nvme.h" #include "fabrics.h" #include <linux/nvme-auth.h> +#include <linux/nvme-keyring.h> #define CREATE_TRACE_POINTS #include "trace.h"
@@ -4703,12 +4704,16 @@ static int __init nvme_core_init(void) result =PTR_ERR (nvme_ns_chr_class); goto unregister_generic_ns; } - - result =nvme_init_auth (); + result =nvme_keyring_init ();if (result) goto destroy_ns_chr; + result =nvme_init_auth (); +if (result) + goto keyring_exit;return 0 ; +keyring_exit: +nvme_keyring_exit (); destroy_ns_chr:class_destroy (nvme_ns_chr_class); unregister_generic_ns:
@@ -4732,6 +4737,7 @@ static int __init nvme_core_init(void) static void __exit nvme_core_exit(void) {nvme_exit_auth (); +nvme_keyring_exit ();class_destroy (nvme_ns_chr_class);class_destroy (nvme_subsys_class);class_destroy (nvme_class);
include/linux/nvme-keyring.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2023 Hannes Reinecke, SUSE Labs +*/ + +#ifndef _NVME_KEYRING_H +#define _NVME_KEYRING_H + +#ifdef CONFIG_NVME_KEYRING + +key_serial_t nvme_keyring_id (void ); +int nvme_keyring_init (void ); +void nvme_keyring_exit (void ); + +#else + +static inline key_serial_t nvme_keyring_id (void ) +{ +return 0 ; +} +static inline int nvme_keyring_init (void ) +{ +return 0 ; +} +static inline void nvme_keyring_exit (void ) {} + +#endif /* !CONFIG_NVME_KEYRING */ +#endif /* _NVME_KEYRING_H */
Signature · 1 line
2.35.3
PATCH v8 2/17 nvme-keyring: define a 'psk' keytype
In reply to Hannes ReineckeDefine a 'psk' keytype to hold the NVMe TLS PSKs.
--- drivers/nvme/common/keyring.c | 94 +++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+)
drivers/nvme/common/keyring.c +94 -0
@@ -8,6 +8,8 @@#include <linux/key-type.h> #include <keys/user-type.h> #include <linux/nvme.h> +#include <linux/nvme-tcp.h> +#include <linux/nvme-keyring.h> static struct key *nvme_keyring;
@@ -17,8 +19,94 @@ key_serial_t nvme_keyring_id(void) }EXPORT_SYMBOL_GPL (nvme_keyring_id); +static void nvme_tls_psk_describe (const struct key *key,struct seq_file *m) +{ +seq_puts (m, key->description); +seq_printf (m,": %u" , key->datalen); +} + +static bool nvme_tls_psk_match (const struct key *key, +const struct key_match_data *match_data) +{ +const char *match_id; +size_t match_len; + +if (!key->description) { +pr_debug ("%s: no key description\n" , __func__); +return false; + } + match_len =strlen (key->description); +pr_debug ("%s: id %s len %zd\n" , __func__, key->description, match_len); + +if (!match_data->raw_data) { +pr_debug ("%s: no match data\n" , __func__); +return false; + } + match_id = match_data->raw_data; +pr_debug ("%s: match '%s' '%s' len %zd\n" , + __func__, match_id, key->description, match_len); +return !memcmp (key->description, match_id, match_len); +} + +static int nvme_tls_psk_match_preparse (struct key_match_data *match_data) +{ + match_data->lookup_type =KEYRING_SEARCH_LOOKUP_ITERATE ; + match_data->cmp = nvme_tls_psk_match; +return 0 ; +} + +static struct key_type nvme_tls_psk_key_type = { + .name ="psk" , + .flags =KEY_TYPE_NET_DOMAIN , + .preparse = user_preparse, + .free_preparse = user_free_preparse, + .match_preparse = nvme_tls_psk_match_preparse, + .instantiate = generic_key_instantiate, + .revoke = user_revoke, + .destroy = user_destroy, + .describe = nvme_tls_psk_describe, + .read = user_read, +}; + +static struct key *nvme_tls_psk_lookup (struct key *keyring, +const char *hostnqn,const char *subnqn, +int hmac,bool generated) +{ +char *identity; +size_t identity_len = (NVMF_NQN_SIZE ) *2 +11 ; +key_ref_t keyref; +key_serial_t keyring_id; + + identity =kzalloc (identity_len,GFP_KERNEL ); +if (!identity) +return ERR_PTR (-ENOMEM ); + +snprintf (identity, identity_len,"NVMe0%c%02d %s %s" , + generated ?'G' :'R' , hmac, hostnqn, subnqn); + +if (!keyring) + keyring = nvme_keyring; + keyring_id =key_serial (keyring); +pr_debug ("keyring %x lookup tls psk '%s'\n" , + keyring_id, identity); + keyref =keyring_search (make_key_ref (keyring, true), + &nvme_tls_psk_key_type, + identity, false); +if (IS_ERR (keyref)) { +pr_debug ("lookup tls psk '%s' failed, error %ld\n" , + identity,PTR_ERR (keyref)); +kfree (identity); +return ERR_PTR (-ENOKEY ); + } +kfree (identity); + +return key_ref_to_ptr (keyref); +} +int nvme_keyring_init (void ) { +int err; + nvme_keyring = keyring_alloc(".nvme", GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, current_cred(),
@@ -28,12 +116,18 @@ int nvme_keyring_init(void)if (IS_ERR (nvme_keyring))return PTR_ERR (nvme_keyring); + err =register_key_type (&nvme_tls_psk_key_type); +if (err) { +key_put (nvme_keyring); +return err; + }return 0 ; }EXPORT_SYMBOL_GPL (nvme_keyring_init);void nvme_keyring_exit (void ) { +unregister_key_type (&nvme_tls_psk_key_type);key_revoke (nvme_keyring);key_put (nvme_keyring); }
Signature · 1 line
2.35.3
PATCH v8 3/17 nvme: add TCP TSAS definitions
In reply to Hannes Reinecke--- include/linux/nvme.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/linux/nvme.h +10 -0
@@ -108,6 +108,13 @@ enum { NVMF_RDMA_CMS_RDMA_CM = 1, /* Sockets based endpoint addressing */ }; +/* TSAS SECTYPE for TCP transport */ +enum { +NVMF_TCP_SECTYPE_NONE =0 ,/* No Security */ +NVMF_TCP_SECTYPE_TLS12 =1 ,/* TLSv1.2, NVMe-oF 1.1 and NVMe-TCP 3.6.1.1 */ +NVMF_TCP_SECTYPE_TLS13 =2 ,/* TLSv1.3, NVMe-oF 1.1 and NVMe-TCP 3.6.1.1 */ +}; +#define NVME_AQ_DEPTH 32#define NVME_NR_AEN_COMMANDS 1#define NVME_AQ_BLK_MQ_DEPTH (NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
@@ -1493,6 +1500,9 @@ struct nvmf_disc_rsp_page_entry {__u16 pkey;__u8 resv10[246 ]; } rdma; +struct tcp { +__u8 sectype; + } tcp; } tsas; };
Signature · 1 line
2.35.3
PATCH v8 4/17 nvme-tcp: add definitions for TLS cipher suites
In reply to Hannes Reinecke--- include/linux/nvme-tcp.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/linux/nvme-tcp.h +6 -0
@@ -18,6 +18,12 @@ enum nvme_tcp_pfv { NVME_TCP_PFV_1_0 = 0x0, }; +enum nvme_tcp_tls_cipher { +NVME_TCP_TLS_CIPHER_INVALID =0 , +NVME_TCP_TLS_CIPHER_SHA256 =1 , +NVME_TCP_TLS_CIPHER_SHA384 =2 , +}; +enum nvme_tcp_fatal_error_status {NVME_TCP_FES_INVALID_PDU_HDR =0x01 ,NVME_TCP_FES_PDU_SEQ_ERR =0x02 ,
Signature · 1 line
2.35.3
PATCH v8 5/17 nvme-keyring: implement nvme_tls_psk_default()
In reply to Hannes ReineckeImplement a function to select the preferred PSK for TLS. A 'retained' PSK should be preferred over a 'generated' PSK, and SHA-384 should be preferred to SHA-256.
--- drivers/nvme/common/keyring.c | 48 +++++++++++++++++++++++++++++++++++ include/linux/nvme-keyring.h | 8 ++++++ 2 files changed, 56 insertions(+)
drivers/nvme/common/keyring.c +48 -0
@@ -5,6 +5,7 @@#include <linux/module.h> #include <linux/seq_file.h> +#include <linux/key.h> #include <linux/key-type.h> #include <keys/user-type.h> #include <linux/nvme.h>
@@ -103,6 +104,53 @@ static struct key *nvme_tls_psk_lookup(struct key *keyring,return key_ref_to_ptr (keyref); } +/* +* NVMe PSK priority list +* +* 'Retained' PSKs (ie 'generated == false') +* should be preferred to 'generated' PSKs, +* and SHA-384 should be preferred to SHA-256. +*/ +struct nvme_tls_psk_priority_list { +bool generated; +enum nvme_tcp_tls_cipher cipher; +} nvme_tls_psk_prio[] = { + { .generated = false, + .cipher =NVME_TCP_TLS_CIPHER_SHA384 , }, + { .generated = false, + .cipher =NVME_TCP_TLS_CIPHER_SHA256 , }, + { .generated = true, + .cipher =NVME_TCP_TLS_CIPHER_SHA384 , }, + { .generated = true, + .cipher =NVME_TCP_TLS_CIPHER_SHA256 , }, +}; + +/* +* nvme_tls_psk_default - Return the preferred PSK to use for TLS ClientHello +*/ +key_serial_t nvme_tls_psk_default (struct key *keyring, +const char *hostnqn,const char *subnqn) +{ +struct key *tls_key; +key_serial_t tls_key_id; +int prio; + +for (prio =0 ; prio <ARRAY_SIZE (nvme_tls_psk_prio); prio++) { +bool generated = nvme_tls_psk_prio[prio].generated; +enum nvme_tcp_tls_cipher cipher = nvme_tls_psk_prio[prio].cipher; + + tls_key =nvme_tls_psk_lookup (keyring, hostnqn, subnqn, + cipher, generated); +if (!IS_ERR (tls_key)) { + tls_key_id = tls_key->serial; +key_put (tls_key); +return tls_key_id; + } + } +return 0 ; +} +EXPORT_SYMBOL_GPL (nvme_tls_psk_default); +int nvme_keyring_init (void ) {int err;
include/linux/nvme-keyring.h +8 -0
@@ -8,12 +8,20 @@#ifdef CONFIG_NVME_KEYRING +key_serial_t nvme_tls_psk_default (struct key *keyring, +const char *hostnqn,const char *subnqn); +key_serial_t nvme_keyring_id (void );int nvme_keyring_init (void );void nvme_keyring_exit (void );#else +static inline key_serial_t nvme_tls_psk_default (struct key *keyring, +const char *hostnqn,const char *subnqn) +{ +return 0 ; +}static inline key_serial_t nvme_keyring_id (void ) {return 0 ;
Signature · 1 line
2.35.3
PATCH v8 6/17 security/keys: export key_lookup()
In reply to Hannes ReineckeFor in-kernel consumers one cannot readily assign a user (eg when running from a workqueue), so the normal key search permissions cannot be applied.
This patch exports the 'key_lookup()' function for a simple lookup of keys without checking for permissions.
--- security/keys/key.c | 1 + 1 file changed, 1 insertion(+)
security/keys/key.c +1 -0
@@ -693,6 +693,7 @@ struct key *key_lookup(key_serial_t id)spin_unlock (&key_serial_lock);return key; } +EXPORT_SYMBOL (key_lookup);/* * Find and lock the specified key type against removal.
Signature · 1 line
2.35.3
PATCH v8 7/17 nvme-tcp: allocate socket file
In reply to Hannes ReineckeWhen using the TLS upcall we need to allocate a socket file such that the userspace daemon is able to use the socket.
--- drivers/nvme/host/tcp.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/nvme/host/tcp.c +11 -2
@@ -1338,7 +1338,9 @@ static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid) } noreclaim_flag =memalloc_noreclaim_save (); -sock_release (queue->sock); +/* ->sock will be released by fput() */ +fput (queue->sock->file); + queue->sock =NULL ;memalloc_noreclaim_restore (noreclaim_flag);kfree (queue->pdu);
@@ -1512,6 +1514,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid)struct nvme_tcp_ctrl *ctrl =to_tcp_ctrl (nctrl);struct nvme_tcp_queue *queue = &ctrl->queues[qid];int ret, rcv_pdu_size; +struct file *sock_file;mutex_init (&queue->queue_lock); queue->ctrl = ctrl;
@@ -1534,6 +1537,11 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid) goto err_destroy_mutex; } + sock_file =sock_alloc_file (queue->sock,O_CLOEXEC ,NULL ); +if (IS_ERR (sock_file)) { + ret =PTR_ERR (sock_file); + goto err_destroy_mutex; + }nvme_tcp_reclassify_socket (queue->sock);/* Single syn retry */
@@ -1640,7 +1648,8 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, int qid)if (queue->hdr_digest || queue->data_digest)nvme_tcp_free_crypto (queue); err_sock: -sock_release (queue->sock); +/* ->sock will be released by fput() */ +fput (queue->sock->file); queue->sock =NULL ; err_destroy_mutex:mutex_destroy (&queue->send_mutex);
Signature · 1 line
2.35.3
PATCH v8 8/17 nvme-tcp: enable TLS handshake upcall
In reply to Hannes ReineckeAdd a fabrics option 'tls' and start the TLS handshake upcall with the default PSK. When TLS is started the PSK key serial number is displayed in the sysfs attribute 'tls_key'
--- drivers/nvme/host/Kconfig | 15 ++++ drivers/nvme/host/core.c | 2 +- drivers/nvme/host/fabrics.c | 12 ++++ drivers/nvme/host/fabrics.h | 3 + drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/sysfs.c | 21 ++++++ drivers/nvme/host/tcp.c | 138 ++++++++++++++++++++++++++++++++++-- 7 files changed, 185 insertions(+), 7 deletions(-)
drivers/nvme/host/Kconfig +15 -0
@@ -92,6 +92,21 @@ config NVME_TCP If unsure, say N. +config NVME_TCP_TLS + bool "NVMe over Fabrics TCP TLS encryption support" + depends on NVME_TCP + select NVME_COMMON + select NVME_KEYRING + select NET_HANDSHAKE + select KEYS + help + Enables TLS encryption for NVMe TCP using the netlink handshake API. + + The TLS handshake daemon is availble at + https://github.com/oracle/ktls-utils. + + If unsure, say N. + config NVME_AUTH bool "NVM Express over Fabrics In-Band Authentication" depends on NVME_CORE
drivers/nvme/host/core.c +1 -1
@@ -4380,7 +4380,7 @@ static void nvme_free_ctrl(struct device *dev)if (!subsys || ctrl->instance != subsys->instance)ida_free (&nvme_instance_ida, ctrl->instance); - +key_put (ctrl->tls_key);nvme_free_cels (ctrl);nvme_mpath_uninit (ctrl);nvme_auth_stop (ctrl);
drivers/nvme/host/fabrics.c +12 -0
@@ -647,6 +647,9 @@ static const match_table_t opt_tokens = { { NVMF_OPT_DISCOVERY, "discovery" }, { NVMF_OPT_DHCHAP_SECRET, "dhchap_secret=%s" }, { NVMF_OPT_DHCHAP_CTRL_SECRET, "dhchap_ctrl_secret=%s" }, +#ifdef CONFIG_NVME_TCP_TLS + { NVMF_OPT_TLS, "tls" }, +#endif { NVMF_OPT_ERR, NULL } };
@@ -671,6 +674,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, opts->hdr_digest = false; opts->data_digest = false; opts->tos =-1 ;/* < 0 == use transport default */ + opts->tls = false; options = o =kstrdup (buf,GFP_KERNEL );if (!options)
@@ -955,6 +959,14 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,kfree (opts->dhchap_ctrl_secret); opts->dhchap_ctrl_secret = p;break ; +case NVMF_OPT_TLS : +if (!IS_ENABLED (CONFIG_NVME_TCP_TLS )) { +pr_err ("TLS is not supported\n" ); + ret = -EINVAL ; + goto out; + } + opts->tls = true; +break ;default :pr_warn ("unknown parameter or missing value '%s' in ctrl creation request\n" , p);
drivers/nvme/host/fabrics.h +3 -0
@@ -70,6 +70,7 @@ enum {NVMF_OPT_DISCOVERY =1 <<22 ,NVMF_OPT_DHCHAP_SECRET =1 <<23 ,NVMF_OPT_DHCHAP_CTRL_SECRET =1 <<24 , + NVMF_OPT_TLS = 1 << 25, };/**
@@ -102,6 +103,7 @@ enum {* @dhchap_secret: DH-HMAC-CHAP secret * @dhchap_ctrl_secret: DH-HMAC-CHAP controller secret for bi-directional * authentication +* @tls: Start TLS encrypted connections (TCP) * @disable_sqflow: disable controller sq flow control * @hdr_digest: generate/verify header digest (TCP) * @data_digest: generate/verify data digest (TCP)
@@ -128,6 +130,7 @@ struct nvmf_ctrl_options {struct nvmf_host *host;char *dhchap_secret;char *dhchap_ctrl_secret; +bool tls;bool disable_sqflow;bool hdr_digest;bool data_digest;
drivers/nvme/host/nvme.h +1 -0
@@ -357,6 +357,7 @@ struct nvme_ctrl {struct nvme_dhchap_key *ctrl_key;u16 transaction;#endif +struct key *tls_key;/* Power saving configuration */ u64 ps_max_latency_us;
drivers/nvme/host/sysfs.c +21 -0
@@ -527,6 +527,19 @@ static DEVICE_ATTR(dhchap_ctrl_secret, S_IRUGO | S_IWUSR, nvme_ctrl_dhchap_ctrl_secret_show, nvme_ctrl_dhchap_ctrl_secret_store);#endif +#ifdef CONFIG_NVME_TCP_TLS +static ssize_t tls_key_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct nvme_ctrl *ctrl =dev_get_drvdata (dev); + +if (!ctrl->tls_key) +return 0 ; +return sysfs_emit (buf,"%08x" ,key_serial (ctrl->tls_key)); +} +static DEVICE_ATTR_RO (tls_key); +#endif +static struct attribute *nvme_dev_attrs[] = { &dev_attr_reset_controller.attr, &dev_attr_rescan_controller.attr,
@@ -553,6 +566,9 @@ static struct attribute *nvme_dev_attrs[] = {#ifdef CONFIG_NVME_AUTH &dev_attr_dhchap_secret.attr, &dev_attr_dhchap_ctrl_secret.attr, +#endif +#ifdef CONFIG_NVME_TCP_TLS + &dev_attr_tls_key.attr, #endifNULL };
@@ -583,6 +599,11 @@ static umode_t nvme_dev_attrs_are_visible(struct kobject *kobj,if (a == &dev_attr_dhchap_ctrl_secret.attr && !ctrl->opts)return 0 ;#endif +#ifdef CONFIG_NVME_TCP_TLS +if (a == &dev_attr_tls_key.attr && + (!ctrl->opts ||strcmp (ctrl->opts->transport,"tcp" ))) +return 0 ; +#endif return a->mode; }
drivers/nvme/host/tcp.c +132 -6
192 lines not on this page · raw message
Signature · 1 line
2.35.3
PATCH v8 9/17 nvme-tcp: control message handling for recvmsg()
In reply to Hannes ReineckekTLS is sending TLS ALERT messages as control messages for recvmsg(). As we can't do anything sensible with it just abort the connection and let the userspace agent to a re-negotiation.
--- drivers/nvme/host/tcp.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/nvme/host/tcp.c +16 -1
@@ -14,6 +14,7 @@#include <net/sock.h> #include <net/tcp.h> #include <net/tls.h> +#include <net/tls_prot.h> #include <net/handshake.h> #include <linux/blk-mq.h> #include <crypto/hash.h>
@@ -1369,6 +1370,8 @@ static int nvme_tcp_init_connection(struct nvme_tcp_queue *queue) {struct nvme_tcp_icreq_pdu *icreq;struct nvme_tcp_icresp_pdu *icresp; +char cbuf[CMSG_LEN (sizeof (char ))] = {}; +u8 ctype;struct msghdr msg = {};struct kvec iov;bool ctrl_hdgst, ctrl_ddgst;
@@ -1406,11 +1409,23 @@ static int nvme_tcp_init_connection(struct nvme_tcp_queue *queue)memset (&msg,0 ,sizeof (msg)); iov.iov_base = icresp; iov.iov_len =sizeof (*icresp); +if (queue->ctrl->ctrl.opts->tls) { + msg.msg_control = cbuf; + msg.msg_controllen =sizeof (cbuf); + } ret =kernel_recvmsg (queue->sock, &msg, &iov,1 , iov.iov_len, msg.msg_flags);if (ret <0 ) goto free_icresp; - +if (queue->ctrl->ctrl.opts->tls) { + ctype =tls_get_record_type (queue->sock->sk, + (struct cmsghdr *)cbuf); +if (ctype !=TLS_RECORD_TYPE_DATA ) { +pr_err ("queue %d: unhandled TLS record %d\n" , +nvme_tcp_queue_id (queue), ctype); +return -ENOTCONN ; + } + } ret = -EINVAL ;if (icresp->hdr.type != nvme_tcp_icresp) { pr_err("queue %d: bad type returned %d\n",
Signature · 1 line
2.35.3
PATCH v8 10/17 nvme-fabrics: parse options 'keyring' and 'tls_key'
In reply to Hannes ReineckeParse the fabrics options 'keyring' and 'tls_key' and store the referenced keys in the options structure.
--- drivers/nvme/host/fabrics.c | 52 ++++++++++++++++++++++++++++++++++++- drivers/nvme/host/fabrics.h | 6 +++++ drivers/nvme/host/tcp.c | 14 +++++++--- 3 files changed, 67 insertions(+), 5 deletions(-)
drivers/nvme/host/fabrics.c +51 -1
@@ -622,6 +622,23 @@ static struct nvmf_transport_ops *nvmf_lookup_transport(return NULL ; } +static struct key *nvmf_parse_key (int key_id,char *key_type) +{ +struct key *key; + +if (!IS_ENABLED (CONFIG_NVME_TCP_TLS )) { +pr_err ("TLS is not supported\n" ); +return ERR_PTR (-EINVAL ); + } + + key =key_lookup (key_id); +if (IS_ERR (key)) +pr_err ("%s %08x not found\n" , key_type, key_id); +else +pr_debug ("Using %s %08x\n" , key_type, key_id); +return key; +} +static const match_table_t opt_tokens = { {NVMF_OPT_TRANSPORT ,"transport=%s" }, {NVMF_OPT_TRADDR ,"traddr=%s" },
@@ -643,6 +660,10 @@ static const match_table_t opt_tokens = { { NVMF_OPT_NR_WRITE_QUEUES, "nr_write_queues=%d" }, { NVMF_OPT_NR_POLL_QUEUES, "nr_poll_queues=%d" }, { NVMF_OPT_TOS, "tos=%d" }, +#ifdef CONFIG_NVME_TCP_TLS + { NVMF_OPT_KEYRING, "keyring=%d" }, + { NVMF_OPT_TLS_KEY, "tls_key=%d" }, +#endif { NVMF_OPT_FAIL_FAST_TMO, "fast_io_fail_tmo=%d" }, { NVMF_OPT_DISCOVERY, "discovery" }, { NVMF_OPT_DHCHAP_SECRET, "dhchap_secret=%s" },
@@ -660,9 +681,10 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts,char *options, *o, *p;int token, ret =0 ;size_t nqnlen =0 ; -int ctrl_loss_tmo =NVMF_DEF_CTRL_LOSS_TMO ; +int ctrl_loss_tmo =NVMF_DEF_CTRL_LOSS_TMO , key_id;uuid_t hostid;char hostnqn[NVMF_NQN_SIZE ]; +struct key *key;/* Set defaults */ opts->queue_size =NVMF_DEF_QUEUE_SIZE ;
@@ -928,6 +950,32 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, } opts->tos = token;break ; +case NVMF_OPT_KEYRING : +if (match_int (args, &key_id) || key_id <=0 ) { + ret = -EINVAL ; + goto out; + } + key =nvmf_parse_key (key_id,"Keyring" ); +if (IS_ERR (key)) { + ret =PTR_ERR (key); + goto out; + } +key_put (opts->keyring); + opts->keyring = key; +break ; +case NVMF_OPT_TLS_KEY : +if (match_int (args, &key_id) || key_id <=0 ) { + ret = -EINVAL ; + goto out; + } + key =nvmf_parse_key (key_id,"Key" ); +if (IS_ERR (key)) { + ret =PTR_ERR (key); + goto out; + } +key_put (opts->tls_key); + opts->tls_key = key; +break ;case NVMF_OPT_DISCOVERY : opts->discovery_nqn = true;break ;
@@ -1168,6 +1216,8 @@ static int nvmf_check_allowed_opts(struct nvmf_ctrl_options *opts,void nvmf_free_options (struct nvmf_ctrl_options *opts) {nvmf_host_put (opts->host); +key_put (opts->keyring); +key_put (opts->tls_key);kfree (opts->transport);kfree (opts->traddr);kfree (opts->trsvcid);
drivers/nvme/host/fabrics.h +6 -0
@@ -71,6 +71,8 @@ enum {NVMF_OPT_DHCHAP_SECRET =1 <<23 ,NVMF_OPT_DHCHAP_CTRL_SECRET =1 <<24 ,NVMF_OPT_TLS =1 <<25 , +NVMF_OPT_KEYRING =1 <<26 , + NVMF_OPT_TLS_KEY = 1 << 27, };/**
@@ -103,6 +105,8 @@ enum {* @dhchap_secret: DH-HMAC-CHAP secret * @dhchap_ctrl_secret: DH-HMAC-CHAP controller secret for bi-directional * authentication +* @keyring: Keyring to use for key lookups +* @tls_key: TLS key for encrypted connections (TCP) * @tls: Start TLS encrypted connections (TCP) * @disable_sqflow: disable controller sq flow control * @hdr_digest: generate/verify header digest (TCP)
@@ -130,6 +134,8 @@ struct nvmf_ctrl_options {struct nvmf_host *host;char *dhchap_secret;char *dhchap_ctrl_secret; +struct key *keyring; +struct key *tls_key;bool tls;bool disable_sqflow;bool hdr_digest;
drivers/nvme/host/tcp.c +10 -4
@@ -1583,6 +1583,8 @@ static int nvme_tcp_start_tls(struct nvme_ctrl *nctrl,dev_dbg (nctrl->device,"queue %d: start TLS with key %x\n" , qid, pskid); +if (nctrl->opts->keyring) + keyring =key_serial (nctrl->opts->keyring);memset (&args,0 ,sizeof (args)); args.ta_sock = queue->sock; args.ta_done = nvme_tcp_tls_done;
@@ -1908,9 +1910,12 @@ static int nvme_tcp_alloc_admin_queue(struct nvme_ctrl *ctrl)key_serial_t pskid =0 ;if (ctrl->opts->tls) { - pskid =nvme_tls_psk_default (NULL , - ctrl->opts->host->nqn, - ctrl->opts->subsysnqn); +if (ctrl->opts->tls_key) + pskid =key_serial (ctrl->opts->tls_key); +else + pskid =nvme_tls_psk_default (ctrl->opts->keyring, + ctrl->opts->host->nqn, + ctrl->opts->subsysnqn);if (!pskid) {dev_err (ctrl->device,"no valid PSK found\n" ); ret = -ENOKEY ;
@@ -2770,7 +2775,8 @@ static struct nvmf_transport_ops nvme_tcp_transport = {NVMF_OPT_HOST_TRADDR |NVMF_OPT_CTRL_LOSS_TMO |NVMF_OPT_HDR_DIGEST |NVMF_OPT_DATA_DIGEST |NVMF_OPT_NR_WRITE_QUEUES |NVMF_OPT_NR_POLL_QUEUES | - NVMF_OPT_TOS | NVMF_OPT_HOST_IFACE | NVMF_OPT_TLS, +NVMF_OPT_TOS |NVMF_OPT_HOST_IFACE |NVMF_OPT_TLS | + NVMF_OPT_KEYRING | NVMF_OPT_TLS_KEY, .create_ctrl = nvme_tcp_create_ctrl, };
Signature · 1 line
2.35.3
Re: [PATCH 10/17] nvme-fabrics: parse options 'keyring' and 'tls_key'
PATCH v8 11/17 nvmet: make TCP sectype settable via configfs
In reply to Hannes ReineckeAdd a new configfs attribute 'addr_tsas' to make the TCP sectype settable via configfs.
--- drivers/nvme/target/configfs.c | 75 +++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-)
drivers/nvme/target/configfs.c +74 -1
@@ -174,11 +174,16 @@ static ssize_t nvmet_addr_treq_show(struct config_item *item, char *page)return snprintf (page,PAGE_SIZE ,"\n" ); } +static inline u8 nvmet_port_disc_addr_treq_mask (struct nvmet_port *port) +{ +return (port->disc_addr.treq & ~NVME_TREQ_SECURE_CHANNEL_MASK ); +} +static ssize_t nvmet_addr_treq_store (struct config_item *item,const char *page,size_t count) {struct nvmet_port *port =to_nvmet_port (item); -u8 treq = port->disc_addr.treq & ~NVME_TREQ_SECURE_CHANNEL_MASK ; +u8 treq =nvmet_port_disc_addr_treq_mask (port);int i;if (nvmet_is_port_enabled (port, __func__))
@@ -303,6 +308,11 @@ static void nvmet_port_init_tsas_rdma(struct nvmet_port *port) port->disc_addr.tsas.rdma.cms =NVMF_RDMA_CMS_RDMA_CM ; } +static void nvmet_port_init_tsas_tcp (struct nvmet_port *port,int sectype) +{ + port->disc_addr.tsas.tcp.sectype = sectype; +} +static ssize_t nvmet_addr_trtype_store (struct config_item *item,const char *page,size_t count) {
@@ -325,11 +335,73 @@ static ssize_t nvmet_addr_trtype_store(struct config_item *item, port->disc_addr.trtype = nvmet_transport[i].type;if (port->disc_addr.trtype ==NVMF_TRTYPE_RDMA )nvmet_port_init_tsas_rdma (port); +else if (port->disc_addr.trtype ==NVMF_TRTYPE_TCP ) +nvmet_port_init_tsas_tcp (port,NVMF_TCP_SECTYPE_NONE );return count; }CONFIGFS_ATTR (nvmet_, addr_trtype); +static const struct nvmet_type_name_map nvmet_addr_tsas_tcp[] = { + {NVMF_TCP_SECTYPE_NONE ,"none" }, + {NVMF_TCP_SECTYPE_TLS13 ,"tls1.3" }, +}; + +static const struct nvmet_type_name_map nvmet_addr_tsas_rdma[] = { + {NVMF_RDMA_QPTYPE_CONNECTED ,"connected" }, + {NVMF_RDMA_QPTYPE_DATAGRAM ,"datagram" }, +}; + +static ssize_t nvmet_addr_tsas_show (struct config_item *item, +char *page) +{ +struct nvmet_port *port =to_nvmet_port (item); +int i; + +if (port->disc_addr.trtype ==NVMF_TRTYPE_TCP ) { +for (i =0 ; i <ARRAY_SIZE (nvmet_addr_tsas_tcp); i++) { +if (port->disc_addr.tsas.tcp.sectype == nvmet_addr_tsas_tcp[i].type) +return sprintf (page,"%s\n" , nvmet_addr_tsas_tcp[i].name); + } + }else if (port->disc_addr.trtype ==NVMF_TRTYPE_RDMA ) { +for (i =0 ; i <ARRAY_SIZE (nvmet_addr_tsas_rdma); i++) { +if (port->disc_addr.tsas.rdma.qptype == nvmet_addr_tsas_rdma[i].type) +return sprintf (page,"%s\n" , nvmet_addr_tsas_rdma[i].name); + } + } +return sprintf (page,"reserved\n" ); +} + +static ssize_t nvmet_addr_tsas_store (struct config_item *item, +const char *page,size_t count) +{ +struct nvmet_port *port =to_nvmet_port (item); +u8 sectype; +int i; + +if (nvmet_is_port_enabled (port, __func__)) +return -EACCES ; + +if (port->disc_addr.trtype !=NVMF_TRTYPE_TCP ) +return -EINVAL ; + +for (i =0 ; i <ARRAY_SIZE (nvmet_addr_tsas_tcp); i++) { +if (sysfs_streq (page, nvmet_addr_tsas_tcp[i].name)) { + sectype = nvmet_addr_tsas_tcp[i].type; + goto found; + } + } + +pr_err ("Invalid value '%s' for tsas\n" , page); +return -EINVAL ; + +found: +nvmet_port_init_tsas_tcp (port, sectype); +return count; +} + +CONFIGFS_ATTR (nvmet_, addr_tsas); +/* * Namespace structures & file operation functions below */
@@ -1741,6 +1813,7 @@ static struct configfs_attribute *nvmet_port_attrs[] = { &nvmet_attr_addr_traddr, &nvmet_attr_addr_trsvcid, &nvmet_attr_addr_trtype, + &nvmet_attr_addr_tsas, &nvmet_attr_param_inline_data_size, #ifdef CONFIG_BLK_DEV_INTEGRITY &nvmet_attr_param_pi_enable,
Signature · 1 line
2.35.3
PATCH v8 12/17 nvmet-tcp: make nvmet_tcp_alloc_queue() a void function
In reply to Hannes ReineckeThe return value from nvmet_tcp_alloc_queue() are just used to figure out if sock_release() need to be called. So this patch moves sock_release() into nvmet_tcp_alloc_queue() and make it a void function.
--- drivers/nvme/target/tcp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/nvme/target/tcp.c +10 -10
@@ -1621,15 +1621,17 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue)return ret; } -static int nvmet_tcp_alloc_queue (struct nvmet_tcp_port *port, +static void nvmet_tcp_alloc_queue (struct nvmet_tcp_port *port,struct socket *newsock) {struct nvmet_tcp_queue *queue;int ret; queue =kzalloc (sizeof (*queue),GFP_KERNEL ); -if (!queue) -return -ENOMEM ; +if (!queue) { + ret = -ENOMEM ; + goto out_release; + }INIT_WORK (&queue->release_work, nvmet_tcp_release_queue_work);INIT_WORK (&queue->io_work, nvmet_tcp_io_work);
@@ -1666,7 +1668,7 @@ static int nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,if (ret) goto out_destroy_sq; -return 0 ; +return ; out_destroy_sq:mutex_lock (&nvmet_tcp_queue_mutex);list_del_init (&queue->queue_list);
@@ -1678,7 +1680,9 @@ static int nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,ida_free (&nvmet_tcp_queue_ida, queue->idx); out_free_queue:kfree (queue); -return ret; +out_release: +pr_err ("failed to allocate queue, error %d\n" , ret); +sock_release (newsock); }static void nvmet_tcp_accept_work (struct work_struct *w)
@@ -1695,11 +1699,7 @@ static void nvmet_tcp_accept_work(struct work_struct *w)pr_warn ("failed to accept err=%d\n" , ret);return ; } - ret =nvmet_tcp_alloc_queue (port, newsock); -if (ret) { -pr_err ("failed to allocate queue\n" ); -sock_release (newsock); - } +nvmet_tcp_alloc_queue (port, newsock); } }
Signature · 1 line
2.35.3
PATCH v8 13/17 nvmet-tcp: allocate socket file
In reply to Hannes ReineckeFor the TLS upcall we need to allocate a socket file such that the userspace daemon is able to use the socket.
--- drivers/nvme/target/tcp.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/nvme/target/tcp.c +14 -4
@@ -1493,12 +1493,12 @@ static void nvmet_tcp_release_queue_work(struct work_struct *w)nvmet_sq_destroy (&queue->nvme_sq);cancel_work_sync (&queue->io_work);nvmet_tcp_free_cmd_data_in_buffers (queue); -sock_release (queue->sock); +/* ->sock will be released by fput() */ +fput (queue->sock->file);nvmet_tcp_free_cmds (queue);if (queue->hdr_digest || queue->data_digest)nvmet_tcp_free_crypto (queue);ida_free (&nvmet_tcp_queue_ida, queue->idx); - page =virt_to_head_page (queue->pf_cache.va);__page_frag_cache_drain (page, queue->pf_cache.pagecnt_bias);kfree (queue);
@@ -1625,6 +1625,7 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, struct socket *newsock) {struct nvmet_tcp_queue *queue; +struct file *sock_file =NULL ;int ret; queue =kzalloc (sizeof (*queue),GFP_KERNEL );
@@ -1644,10 +1645,16 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,init_llist_head (&queue->resp_list);INIT_LIST_HEAD (&queue->resp_send_list); + sock_file =sock_alloc_file (queue->sock,O_CLOEXEC ,NULL ); +if (IS_ERR (sock_file)) { + ret =PTR_ERR (sock_file); + goto out_free_queue; + } + queue->idx =ida_alloc (&nvmet_tcp_queue_ida,GFP_KERNEL );if (queue->idx <0 ) { ret = queue->idx; - goto out_free_queue; + goto out_sock; } ret =nvmet_tcp_alloc_cmd (queue, &queue->connect);
@@ -1678,11 +1685,14 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,nvmet_tcp_free_cmd (&queue->connect); out_ida_remove:ida_free (&nvmet_tcp_queue_ida, queue->idx); +out_sock: +fput (queue->sock->file); out_free_queue:kfree (queue); out_release:pr_err ("failed to allocate queue, error %d\n" , ret); -sock_release (newsock); +if (!sock_file) +sock_release (newsock); }static void nvmet_tcp_accept_work (struct work_struct *w)
Signature · 1 line
2.35.3
PATCH v8 14/17 nvmet: Set 'TREQ' to 'required' when TLS is enabled
In reply to Hannes ReineckeThe current implementation does not support secure concatenation, so 'TREQ' is always set to 'required' when TLS is enabled.
--- drivers/nvme/target/configfs.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/nvme/target/configfs.c +12 -0
@@ -376,6 +376,7 @@ static ssize_t nvmet_addr_tsas_store(struct config_item *item, const char *page, size_t count) {struct nvmet_port *port =to_nvmet_port (item); +u8 treq =nvmet_port_disc_addr_treq_mask (port);u8 sectype;int i;
@@ -397,6 +398,17 @@ static ssize_t nvmet_addr_tsas_store(struct config_item *item, found:nvmet_port_init_tsas_tcp (port, sectype); +/* +* The TLS implementation currently does not support +* secure concatenation, so TREQ is always set to 'required' +* if TLS is enabled. +*/ +if (sectype ==NVMF_TCP_SECTYPE_TLS13 ) { + treq |=NVMF_TREQ_REQUIRED ; + }else { + treq |=NVMF_TREQ_NOT_SPECIFIED ; + } + port->disc_addr.treq = treq;return count; }
Signature · 1 line
2.35.3
PATCH v8 15/17 nvmet-tcp: enable TLS handshake upcall
In reply to Hannes ReineckeAdd functions to start the TLS handshake upcall when the TCP TSAS sectype is set to 'tls1.3' and add a config option NVME_TARGET_TCP_TLS.
--- drivers/nvme/target/Kconfig | 15 ++++ drivers/nvme/target/configfs.c | 21 +++++ drivers/nvme/target/nvmet.h | 1 + drivers/nvme/target/tcp.c | 146 ++++++++++++++++++++++++++++++++- 4 files changed, 179 insertions(+), 4 deletions(-)
drivers/nvme/target/Kconfig +15 -0
@@ -84,6 +84,21 @@ config NVME_TARGET_TCP If unsure, say N. +config NVME_TARGET_TCP_TLS + bool "NVMe over Fabrics TCP target TLS encryption support" + depends on NVME_TARGET_TCP + select NVME_COMMON + select NVME_KEYRING + select NET_HANDSHAKE + select KEYS + help + Enables TLS encryption for the NVMe TCP target using the netlink handshake API. + + The TLS handshake daemon is availble at + https://github.com/oracle/ktls-utils. + + If unsure, say N. + config NVME_TARGET_AUTH bool "NVMe over Fabrics In-band Authentication support" depends on NVME_TARGET
drivers/nvme/target/configfs.c +21 -0
@@ -15,6 +15,7 @@#ifdef CONFIG_NVME_TARGET_AUTH #include <linux/nvme-auth.h> #endif +#include <linux/nvme-keyring.h> #include <crypto/hash.h> #include <crypto/kpp.h>
@@ -397,6 +398,17 @@ static ssize_t nvmet_addr_tsas_store(struct config_item *item,return -EINVAL ; found: +if (sectype ==NVMF_TCP_SECTYPE_TLS13 ) { +if (!IS_ENABLED (CONFIG_NVME_TARGET_TCP_TLS )) { +pr_err ("TLS is not supported\n" ); +return -EINVAL ; + } +if (!port->keyring) { +pr_err ("TLS keyring not configured\n" ); +return -EINVAL ; + } + } +nvmet_port_init_tsas_tcp (port, sectype);/* * The TLS implementation currently does not support
@@ -1815,6 +1827,7 @@ static void nvmet_port_release(struct config_item *item)flush_workqueue (nvmet_wq);list_del (&port->global_entry); +key_put (port->keyring);kfree (port->ana_state);kfree (port); }
@@ -1864,6 +1877,14 @@ static struct config_group *nvmet_ports_make(struct config_group *group,return ERR_PTR (-ENOMEM ); } +if (nvme_keyring_id ()) { + port->keyring =key_lookup (nvme_keyring_id ()); +if (IS_ERR (port->keyring)) { +pr_warn ("NVMe keyring not available, disabling TLS\n" ); + port->keyring =NULL ; + } + } +for (i =1 ; i <=NVMET_MAX_ANAGRPS ; i++) {if (i ==NVMET_DEFAULT_ANA_GRPID ) port->ana_state[1 ] =NVME_ANA_OPTIMIZED ;
drivers/nvme/target/nvmet.h +1 -0
@@ -158,6 +158,7 @@ struct nvmet_port {struct config_group ana_groups_group;struct nvmet_ana_group ana_default_group;enum nvme_ana_state *ana_state; +struct key *keyring;void *priv;bool enabled;int inline_data_size;
drivers/nvme/target/tcp.c +142 -4
229 lines not on this page · raw message
Signature · 1 line
2.35.3
Sagi Grimberg
maintainerRe: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 3 lines · Hannes Reinecke
Add functions to start the TLS handshake upcall when the TCP TSAS sectype is set to 'tls1.3' and add a config option
NVME_TARGET_TCP_TLS.
Need to document the refcount added.
Also the general design with upcalling tls handshake in userspace and continue from there...
Quoted 74 lines
Signed-off-by Hannes Reinecke <[email protected]>--- drivers/nvme/target/Kconfig | 15 ++++ drivers/nvme/target/configfs.c | 21 +++++ drivers/nvme/target/nvmet.h | 1 + drivers/nvme/target/tcp.c | 146 ++++++++++++++++++++++++++++++++- 4 files changed, 179 insertions(+), 4 deletions(-)drivers/nvme/target/Kconfig +15
-0@@ -84,6 +84,21 @@ config NVME_TARGET_TCP If unsure, say N. +config NVME_TARGET_TCP_TLS + bool "NVMe over Fabrics TCP target TLS encryption support" + depends on NVME_TARGET_TCP + select NVME_COMMON + select NVME_KEYRING + select NET_HANDSHAKE + select KEYS + help + Enables TLS encryption for the NVMe TCP target using the netlink handshake API. + + The TLS handshake daemon is availble at + https://github.com/oracle/ktls-utils. + + If unsure, say N. + config NVME_TARGET_AUTH bool "NVMe over Fabrics In-band Authentication support" depends on NVME_TARGETdrivers/nvme/target/configfs.c +13
-0@@ -15,6 +15,7 @@#ifdef CONFIG_NVME_TARGET_AUTH #include <linux/nvme-auth.h> #endif +#include <linux/nvme-keyring.h> #include <crypto/hash.h> #include <crypto/kpp.h> @@ -397,6 +398,17 @@ static ssize_t nvmet_addr_tsas_store(struct config_item *item,return -EINVAL ; found: +if (sectype ==NVMF_TCP_SECTYPE_TLS13 ) { +if (!IS_ENABLED (CONFIG_NVME_TARGET_TCP_TLS )) { +pr_err ("TLS is not supported\n" ); +return -EINVAL ; + } +if (!port->keyring) { +pr_err ("TLS keyring not configured\n" ); +return -EINVAL ; + } + } +nvmet_port_init_tsas_tcp (port, sectype);/* * The TLS implementation currently does not support @@ -1815,6 +1827,7 @@ static void nvmet_port_release(struct config_item *item)flush_workqueue (nvmet_wq);list_del (&port->global_entry); +key_put (port->keyring);kfree (port->ana_state);kfree (port); }
drivers/nvme/target/configfs.c static struct config_group *nvmet_ports_make(struct config_group *group, · line 1884
Quoted 8 lines
drivers/nvme/target/configfs.c +5
-0@@ -1864,6 +1877,14 @@ static struct config_group *nvmet_ports_make(struct config_group *group,return ERR_PTR (-ENOMEM ); } +if (nvme_keyring_id ()) { + port->keyring =key_lookup (nvme_keyring_id ()); +if (IS_ERR (port->keyring)) { +pr_warn ("NVMe keyring not available, disabling TLS\n" ); + port->keyring =NULL ;
why setting this to NULL?
Quoted 54 lines
drivers/nvme/target/configfs.c +3
-0+ } + } +for (i =1 ; i <=NVMET_MAX_ANAGRPS ; i++) {if (i ==NVMET_DEFAULT_ANA_GRPID ) port->ana_state[1 ] =NVME_ANA_OPTIMIZED ;drivers/nvme/target/nvmet.h +1
-0@@ -158,6 +158,7 @@ struct nvmet_port {struct config_group ana_groups_group;struct nvmet_ana_group ana_default_group;enum nvme_ana_state *ana_state; +struct key *keyring;void *priv;bool enabled;int inline_data_size;drivers/nvme/target/tcp.c +14
-0@@ -8,9 +8,13 @@#include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/key.h> #include <linux/nvme-tcp.h> +#include <linux/nvme-keyring.h> #include <net/sock.h> #include <net/tcp.h> +#include <net/tls.h> +#include <net/handshake.h> #include <linux/inet.h> #include <linux/llist.h> #include <crypto/hash.h> @@ -66,6 +70,16 @@ device_param_cb(idle_poll_period_usecs, &set_param_ops,MODULE_PARM_DESC (idle_poll_period_usecs,"nvmet tcp io_work poll till idle time period in usecs: Default 0" ); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +/* +* TLS handshake timeout +*/ +static int tls_handshake_timeout =10 ; +module_param (tls_handshake_timeout, int,0644 ); +MODULE_PARM_DESC (tls_handshake_timeout, +"nvme TLS handshake timeout in seconds (default 10)" ); +#endif +#define NVMET_TCP_RECV_BUDGET 8#define NVMET_TCP_SEND_BUDGET 8#define NVMET_TCP_IO_WORK_BUDGET 64
drivers/nvme/target/tcp.c struct nvmet_tcp_cmd { · line 145
Quoted 10 lines
drivers/nvme/target/tcp.c +2
-0@@ -122,11 +136,13 @@ struct nvmet_tcp_cmd {enum nvmet_tcp_queue_state {NVMET_TCP_Q_CONNECTING , +NVMET_TCP_Q_TLS_HANDSHAKE ,NVMET_TCP_Q_LIVE ,NVMET_TCP_Q_DISCONNECTING , };struct nvmet_tcp_queue { +struct kref kref;
Why is kref the first member of the struct?
Quoted 38 lines
drivers/nvme/target/tcp.c +14
-1struct socket *sock;struct nvmet_tcp_port *port;struct work_struct io_work;@@ -155,6 +171,10 @@ struct nvmet_tcp_queue {struct ahash_request *snd_hash;struct ahash_request *rcv_hash; +/* TLS state */ +key_serial_t tls_pskid; +struct delayed_work tls_handshake_work; +unsigned long poll_end;spinlock_t state_lock;@@ -1283,12 +1303,21 @@ static int nvmet_tcp_try_recv(struct nvmet_tcp_queue *queue,return ret; } +static void nvmet_tcp_release_queue (struct kref *kref) +{ +struct nvmet_tcp_queue *queue = + container_of(kref, struct nvmet_tcp_queue, kref); + +WARN_ON (queue->state !=NVMET_TCP_Q_DISCONNECTING ); +queue_work (nvmet_wq, &queue->release_work); +} +static void nvmet_tcp_schedule_release_queue (struct nvmet_tcp_queue *queue) {spin_lock_bh (&queue->state_lock);if (queue->state !=NVMET_TCP_Q_DISCONNECTING ) { queue->state =NVMET_TCP_Q_DISCONNECTING ; -queue_work (nvmet_wq, &queue->release_work); +kref_put (&queue->kref, nvmet_tcp_release_queue); }spin_unlock_bh (&queue->state_lock); }
drivers/nvme/target/tcp.c static void nvmet_tcp_release_queue_work(struct work_struct *w) · line 1518
Quoted 5 lines
drivers/nvme/target/tcp.c +2
-0@@ -1485,6 +1514,8 @@ static void nvmet_tcp_release_queue_work(struct work_struct *w)mutex_unlock (&nvmet_tcp_queue_mutex);nvmet_tcp_restore_socket_callbacks (queue); +tls_handshake_cancel (queue->sock->sk); +cancel_delayed_work_sync (&queue->tls_handshake_work);
We should call it tls_handshake_tmo_work or something to make it clear it is a timeout work.
Quoted 23 lines
drivers/nvme/target/tcp.c +7
-2cancel_work_sync (&queue->io_work);/* stop accepting incoming data */ queue->rcv_state =NVMET_TCP_RECV_ERR ;@@ -1512,8 +1543,13 @@ static void nvmet_tcp_data_ready(struct sock *sk)read_lock_bh (&sk->sk_callback_lock); queue = sk->sk_user_data; -if (likely (queue)) -queue_work_on (queue_cpu (queue), nvmet_tcp_wq, &queue->io_work); +if (likely (queue)) { +if (queue->data_ready) + queue->data_ready (sk); +if (queue->state !=NVMET_TCP_Q_TLS_HANDSHAKE ) +queue_work_on (queue_cpu (queue), nvmet_tcp_wq, + &queue->io_work); + }read_unlock_bh (&sk->sk_callback_lock); }@@ -1621,6 +1657,83 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue)return ret; }
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1669
Quoted 10 lines
drivers/nvme/target/tcp.c +10
-0+#ifdef CONFIG_NVME_TARGET_TCP_TLS +static void nvmet_tcp_tls_handshake_done (void *data,int status, +key_serial_t peerid) +{ +struct nvmet_tcp_queue *queue = data; + +pr_debug ("queue %d: TLS handshake done, key %x, status %d\n" , + queue->idx, peerid, status); +spin_lock_bh (&queue->state_lock); +if (queue->state !=NVMET_TCP_Q_TLS_HANDSHAKE ) {
Is this even possible?
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1673
Quoted 4 lines
drivers/nvme/target/tcp.c +4
-0+pr_warn ("queue %d: TLS handshake already completed\n" , + queue->idx); +spin_unlock_bh (&queue->state_lock); +kref_put (&queue->kref, nvmet_tcp_release_queue);
How can we get here?
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1682
Quoted 9 lines
drivers/nvme/target/tcp.c +9
-0+return ; + } +if (!status) + queue->tls_pskid = peerid; + queue->state =NVMET_TCP_Q_CONNECTING ; +spin_unlock_bh (&queue->state_lock); + +cancel_delayed_work_sync (&queue->tls_handshake_work); +if (status) {
Wait, did we assign the sk_state_change in this stage? What will sock shutdown trigger?
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1683
Quoted 1 line
drivers/nvme/target/tcp.c +1
-0+kernel_sock_shutdown (queue->sock,SHUT_RDWR );
Probably the put can be moved to a out: label in the end.
Quoted 6 lines
drivers/nvme/target/tcp.c +6
-0+kref_put (&queue->kref, nvmet_tcp_release_queue); +return ; + } + +pr_debug ("queue %d: resetting queue callbacks after TLS handshake\n" , + queue->idx);
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1699
Quoted 10 lines
drivers/nvme/target/tcp.c +10
-0+nvmet_tcp_set_queue_sock (queue); +kref_put (&queue->kref, nvmet_tcp_release_queue); +} + +static void nvmet_tcp_tls_handshake_timeout_work (struct work_struct *w) +{ +struct nvmet_tcp_queue *queue =container_of (to_delayed_work (w), + struct nvmet_tcp_queue, tls_handshake_work); + +pr_debug ("queue %d: TLS handshake timeout\n" , queue->idx);
Probably its better to make this pr_warn...
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1702
Quoted 3 lines
drivers/nvme/target/tcp.c +3
-0+if (!tls_handshake_cancel (queue->sock->sk)) +return ; +kernel_sock_shutdown (queue->sock,SHUT_RDWR );
Same question here, did we assign sk_state_change yet?
Quoted 75 lines
drivers/nvme/target/tcp.c +56
-1+kref_put (&queue->kref, nvmet_tcp_release_queue); +} + +static int nvmet_tcp_tls_handshake (struct nvmet_tcp_queue *queue) +{ +int ret = -EOPNOTSUPP ; +struct tls_handshake_args args; + +if (queue->state !=NVMET_TCP_Q_TLS_HANDSHAKE ) { +pr_warn ("cannot start TLS in state %d\n" , queue->state); +return -EINVAL ; + } + +kref_get (&queue->kref); +pr_debug ("queue %d: TLS ServerHello\n" , queue->idx); +memset (&args,0 ,sizeof (args)); + args.ta_sock = queue->sock; + args.ta_done = nvmet_tcp_tls_handshake_done; + args.ta_data = queue; + args.ta_keyring =key_serial (queue->port->nport->keyring); + args.ta_timeout_ms = tls_handshake_timeout *1000 ; + + ret =tls_server_hello_psk (&args,GFP_KERNEL ); +if (ret) { +kref_put (&queue->kref, nvmet_tcp_release_queue); +pr_err ("failed to start TLS, err=%d\n" , ret); + }else { +queue_delayed_work (nvmet_wq, &queue->tls_handshake_work, + tls_handshake_timeout *HZ ); + } +return ret; +} +#endif +static void nvmet_tcp_alloc_queue (struct nvmet_tcp_port *port,struct socket *newsock) {@@ -1636,11 +1749,16 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,INIT_WORK (&queue->release_work, nvmet_tcp_release_queue_work);INIT_WORK (&queue->io_work, nvmet_tcp_io_work); +kref_init (&queue->kref); queue->sock = newsock; queue->port = port; queue->nr_cmds =0 ;spin_lock_init (&queue->state_lock); - queue->state =NVMET_TCP_Q_CONNECTING ; +if (queue->port->nport->disc_addr.tsas.tcp.sectype == +NVMF_TCP_SECTYPE_TLS13 ) + queue->state =NVMET_TCP_Q_TLS_HANDSHAKE ; +else + queue->state =NVMET_TCP_Q_CONNECTING ;INIT_LIST_HEAD (&queue->free_list);init_llist_head (&queue->resp_list);INIT_LIST_HEAD (&queue->resp_send_list);@@ -1671,12 +1789,32 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,list_add_tail (&queue->queue_list, &nvmet_tcp_queue_list);mutex_unlock (&nvmet_tcp_queue_mutex); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +INIT_DELAYED_WORK (&queue->tls_handshake_work, + nvmet_tcp_tls_handshake_timeout_work); +if (queue->state ==NVMET_TCP_Q_TLS_HANDSHAKE ) { +struct sock *sk = queue->sock->sk; + +/* Restore the default callbacks before starting upcall */ +read_lock_bh (&sk->sk_callback_lock); + sk->sk_user_data =NULL ; + sk->sk_data_ready = port->data_ready; +read_unlock_bh (&sk->sk_callback_lock); +if (!nvmet_tcp_tls_handshake (queue)) +return ; + +/* TLS handshake failed, terminate the connection */ + goto out_destroy_sq;
drivers/nvme/target/tcp.c static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, · line 1817
Quoted 10 lines
drivers/nvme/target/tcp.c +4
-0+ } +#endif + ret =nvmet_tcp_set_queue_sock (queue);if (ret) goto out_destroy_sq;return ; out_destroy_sq: + queue->state =NVMET_TCP_Q_DISCONNECTING ;
Can you clarify what this is used for?
Quoted 3 lines
drivers/nvme/target/tcp.c +0
-0mutex_lock (&nvmet_tcp_queue_mutex);list_del_init (&queue->queue_list);mutex_unlock (&nvmet_tcp_queue_mutex);
Re: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 11 lines · Sagi Grimberg
Quoted 3 lines · Hannes Reinecke
Add functions to start the TLS handshake upcall when the TCP TSAS sectype is set to 'tls1.3' and add a config option
NVME_TARGET_TCP_TLS.Need to document the refcount added.
Also the general design with upcalling tls handshake in userspace and continue from there...
Okay.
Quoted 74 lines
Quoted 74 lines
Signed-off-by Hannes Reinecke <[email protected]>---
drivers/nvme/target/Kconfig | 15 ++++drivers/nvme/target/configfs.c| 21 +++++ drivers/nvme/target/nvmet.h | 1 + drivers/nvme/target/tcp.c | 146 ++++++++++++++++++++++++++++++++-4 files changed, 179 insertions(+), 4 deletions(-)drivers/nvme/target/Kconfig +0
-0@@ -84,6 +84,21 @@ config NVME_TARGET_TCPIf unsure, say N.
+configNVME_TARGET_TCP_TLS
+ bool "NVMe over Fabrics TCP target TLS encryption support" + depends onNVME_TARGET_TCP
+ selectNVME_COMMON
+ selectNVME_KEYRING
+ selectNET_HANDSHAKE
+ select KEYS
+ help
+ Enables TLS encryption for the NVMe TCP target using the netlink handshake API.drivers/nvme/target/Kconfig +6
-0+ + The TLS handshake daemon is availble at + https://github.com/oracle/ktls-utils. + + If unsure, say N. +config
NVME_TARGET_AUTH
bool "NVMe over Fabrics In-band Authentication support" depends onNVME_TARGETdrivers/nvme/target/configfs.c +1
-0@@ -15,6 +15,7 @@ #ifdef CONFIG_NVME_TARGET_AUTH #include <linux/nvme-auth.h> #endif +#include <linux/nvme-keyring.h> #include <crypto/hash.h> #include <crypto/kpp.h>@@ -397,6 +398,17 @@ static ssize_t nvmet_addr_tsas_store(structconfig_item *item, return -EINVAL;found:
+ if (sectype ==NVMF_TCP_SECTYPE_TLS13) {
+ if (!IS_ENABLED(CONFIG_NVME_TARGET_TCP_TLS)) { +pr_err("TLS is not supported\n");
+ return-EINVAL;
+ }
+ if (!port->keyring) {
+pr_err("TLS keyring not configured\n"); + return-EINVAL;
+ }
+ }
+
nvmet_port_init_tsas_tcp(port, sectype);
/*
* The TLS implementation currently does not supportdrivers/nvme/target/configfs.c +1
-0@@ -1815,6 +1827,7 @@ static void nvmet_port_release(struct config_item *item) flush_workqueue(nvmet_wq); list_del(&port->global_entry); + key_put(port->keyring); kfree(port->ana_state); kfree(port); }@@ -1864,6 +1877,14 @@ static struct config_group *nvmet_ports_make(struct config_group *group, return ERR_PTR(-ENOMEM);
Quoted 9 lines
drivers/nvme/target/configfs.c static struct config_group *nvmet_ports_make(struct config_group *group, · line 1884
Quoted 6 lines
drivers/nvme/target/configfs.c +5
-0} + if (nvme_keyring_id()) { + port->keyring = key_lookup(nvme_keyring_id()); + if (IS_ERR(port->keyring)) { + pr_warn("NVMe keyring not available, disabling TLS\n"); + port->keyring = NULL;why setting this to NULL?
It's check when changing TSAS; we can only enable TLS if the nvme keyring is available.
Quoted 56 lines
Quoted 56 lines
drivers/nvme/target/configfs.c +3
-0+ } + } + for (i = 1; i <= NVMET_MAX_ANAGRPS; i++) { if (i == NVMET_DEFAULT_ANA_GRPID) port->ana_state[1] = NVME_ANA_OPTIMIZED;drivers/nvme/target/nvmet.h +1
-0@@ -158,6 +158,7 @@ struct nvmet_port { struct config_group ana_groups_group; struct nvmet_ana_group ana_default_group; enum nvme_ana_state *ana_state; + struct key *keyring; void *priv; bool enabled; int inline_data_size;drivers/nvme/target/tcp.c +14
-0@@ -8,9 +8,13 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/key.h> #include <linux/nvme-tcp.h> +#include <linux/nvme-keyring.h> #include <net/sock.h> #include <net/tcp.h> +#include <net/tls.h> +#include <net/handshake.h> #include <linux/inet.h> #include <linux/llist.h> #include <crypto/hash.h>@@ -66,6 +70,16 @@ device_param_cb(idle_poll_period_usecs, &set_param_ops, MODULE_PARM_DESC(idle_poll_period_usecs, "nvmet tcp io_work poll till idle time period in usecs: Default 0"); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +/* +* TLS handshake timeout +*/ +static int tls_handshake_timeout =10 ; +module_param (tls_handshake_timeout, int,0644 ); +MODULE_PARM_DESC (tls_handshake_timeout, + "nvme TLS handshake timeout in seconds (default 10)"); +#endif + #define NVMET_TCP_RECV_BUDGET 8 #define NVMET_TCP_SEND_BUDGET 8 #define NVMET_TCP_IO_WORK_BUDGET 64@@ -122,11 +136,13 @@ struct nvmet_tcp_cmd { enum nvmet_tcp_queue_state { NVMET_TCP_Q_CONNECTING,
Quoted 9 lines
drivers/nvme/target/tcp.c struct nvmet_tcp_cmd { · line 145
Quoted 6 lines
drivers/nvme/target/tcp.c +2
-0+ NVMET_TCP_Q_TLS_HANDSHAKE, NVMET_TCP_Q_LIVE, NVMET_TCP_Q_DISCONNECTING, }; struct nvmet_tcp_queue { + struct kref kref;Why is kref the first member of the struct?
Habit.
I don't mind where it'll end up.
Quoted 36 lines
Quoted 36 lines
drivers/nvme/target/tcp.c +14
-1struct socket *sock; struct nvmet_tcp_port *port; struct work_struct io_work;@@ -155,6 +171,10 @@ struct nvmet_tcp_queue { struct ahash_request *snd_hash; struct ahash_request *rcv_hash; + /* TLS state */ + key_serial_t tls_pskid; + struct delayed_work tls_handshake_work; + unsigned long poll_end; spinlock_t state_lock;@@ -1283,12 +1303,21 @@ static int nvmet_tcp_try_recv(structnvmet_tcp_queue *queue, return ret; } +static void nvmet_tcp_release_queue (struct kref *kref) +{ + struct nvmet_tcp_queue *queue = + container_of(kref, struct nvmet_tcp_queue, kref); + + WARN_ON(queue->state != NVMET_TCP_Q_DISCONNECTING); + queue_work(nvmet_wq, &queue->release_work); +} + static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue) { spin_lock_bh(&queue->state_lock); if (queue->state != NVMET_TCP_Q_DISCONNECTING) { queue->state = NVMET_TCP_Q_DISCONNECTING; - queue_work(nvmet_wq, &queue->release_work); + kref_put(&queue->kref, nvmet_tcp_release_queue); } spin_unlock_bh(&queue->state_lock); }@@ -1485,6 +1514,8 @@ static void nvmet_tcp_release_queue_work(struct
Quoted 9 lines
drivers/nvme/target/tcp.c static void nvmet_tcp_release_queue_work(struct work_struct *w) · line 1518
Quoted 5 lines
drivers/nvme/target/tcp.c +2
-0work_struct *w) mutex_unlock(&nvmet_tcp_queue_mutex); nvmet_tcp_restore_socket_callbacks(queue); + tls_handshake_cancel(queue->sock->sk); + cancel_delayed_work_sync(&queue->tls_handshake_work);We should call it
tls_handshake_tmo_workor something to make it clear it is a timeout work.
Okay.
Quoted 25 lines
Quoted 25 lines
drivers/nvme/target/tcp.c +11
-2cancel_work_sync(&queue->io_work); /* stop accepting incoming data */ queue->rcv_state = NVMET_TCP_RECV_ERR;@@ -1512,8 +1543,13 @@ static void nvmet_tcp_data_ready(struct sock *sk) read_lock_bh(&sk->sk_callback_lock); queue = sk->sk_user_data; - if (likely(queue)) - queue_work_on(queue_cpu(queue), nvmet_tcp_wq, &queue->io_work); + if (likely(queue)) { + if (queue->data_ready) + queue->data_ready(sk); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) + queue_work_on(queue_cpu(queue), nvmet_tcp_wq, + &queue->io_work); + } read_unlock_bh(&sk->sk_callback_lock); }@@ -1621,6 +1657,83 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) return ret; } +#ifdef CONFIG_NVME_TARGET_TCP_TLS +static void nvmet_tcp_tls_handshake_done (void *data,int status, + key_serial_t peerid) +{
Quoted 9 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1669
Quoted 6 lines
drivers/nvme/target/tcp.c +6
-0+ struct nvmet_tcp_queue *queue = data; + + pr_debug("queue %d: TLS handshake done, key %x, status %d\n", + queue->idx, peerid, status); + spin_lock_bh(&queue->state_lock); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) {Is this even possible?
I guess it can happen when the socket closes during handshake; the daemon might still be sending a 'done' event but nvmet_tcp_schedule_release_queue() has been called.
Quoted 7 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1673
Quoted 4 lines
drivers/nvme/target/tcp.c +4
-0+ pr_warn("queue %d: TLS handshake already completed\n", + queue->idx); + spin_unlock_bh(&queue->state_lock); + kref_put(&queue->kref, nvmet_tcp_release_queue);How can we get here?
See above.
Quoted 10 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1682
Quoted 9 lines
drivers/nvme/target/tcp.c +9
-0+ return; + } + if (!status) + queue->tls_pskid = peerid; + queue->state = NVMET_TCP_Q_CONNECTING; + spin_unlock_bh(&queue->state_lock); + + cancel_delayed_work_sync(&queue->tls_handshake_work); + if (status) {
Quoted 3 lines
Wait, did we assign the
sk_state_changein this stage? What will sock shutdown trigger?
That, however is a good point. You might be right. Will be checking.
Quoted 4 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct · line 1683
Quoted 1 line
drivers/nvme/target/tcp.c +1
-0+ kernel_sock_shutdown(queue->sock, SHUT_RDWR);Probably the put can be moved to a out: label in the end.
Probably.
Quoted 11 lines
Quoted 11 lines
drivers/nvme/target/tcp.c +10
-0+ kref_put(&queue->kref, nvmet_tcp_release_queue); + return; + } + + pr_debug("queue %d: resetting queue callbacks after TLS handshake\n", + queue->idx); + nvmet_tcp_set_queue_sock(queue); + kref_put(&queue->kref, nvmet_tcp_release_queue); +} +
Quoted 9 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1699
Quoted 6 lines
drivers/nvme/target/tcp.c +6
-0+static void nvmet_tcp_tls_handshake_timeout_work (struct work_struct *w) +{ + struct nvmet_tcp_queue *queue = container_of(to_delayed_work(w), + struct nvmet_tcp_queue, tls_handshake_work); + + pr_debug("queue %d: TLS handshake timeout\n", queue->idx);Probably its better to make this
pr_warn...
Ok.
Quoted 6 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1702
Quoted 3 lines
drivers/nvme/target/tcp.c +3
-0+ if (!tls_handshake_cancel(queue->sock->sk)) + return; + kernel_sock_shutdown(queue->sock, SHUT_RDWR);Same question here, did we assign
sk_state_changeyet?
Will be checking.
Quoted 78 lines
Quoted 78 lines
drivers/nvme/target/tcp.c +34
-0+ kref_put(&queue->kref, nvmet_tcp_release_queue); +} + +static int nvmet_tcp_tls_handshake (struct nvmet_tcp_queue *queue) +{ + int ret = -EOPNOTSUPP; + struct tls_handshake_args args; + + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) { + pr_warn("cannot start TLS in state %d\n", queue->state); + return -EINVAL; + } + + kref_get(&queue->kref); + pr_debug("queue %d: TLS ServerHello\n", queue->idx); + memset(&args, 0, sizeof(args)); + args.ta_sock = queue->sock; + args.ta_done = nvmet_tcp_tls_handshake_done; + args.ta_data = queue; + args.ta_keyring = key_serial(queue->port->nport->keyring); + args.ta_timeout_ms = tls_handshake_timeout * 1000; + + ret = tls_server_hello_psk(&args, GFP_KERNEL); + if (ret) { + kref_put(&queue->kref, nvmet_tcp_release_queue); + pr_err("failed to start TLS, err=%d\n", ret); + } else { + queue_delayed_work(nvmet_wq, &queue->tls_handshake_work, + tls_handshake_timeout * HZ); + } + return ret; +} +#endif + static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port, struct socket *newsock){
drivers/nvme/target/tcp.c +25
-1@@ -1636,11 +1749,16 @@ static void nvmet_tcp_alloc_queue(structnvmet_tcp_port *port, INIT_WORK(&queue->release_work, nvmet_tcp_release_queue_work); INIT_WORK(&queue->io_work, nvmet_tcp_io_work); + kref_init(&queue->kref); queue->sock = newsock; queue->port = port; queue->nr_cmds = 0; spin_lock_init(&queue->state_lock); - queue->state = NVMET_TCP_Q_CONNECTING; + if (queue->port->nport->disc_addr.tsas.tcp.sectype == + NVMF_TCP_SECTYPE_TLS13) + queue->state = NVMET_TCP_Q_TLS_HANDSHAKE; + else + queue->state = NVMET_TCP_Q_CONNECTING; INIT_LIST_HEAD(&queue->free_list); init_llist_head(&queue->resp_list); INIT_LIST_HEAD(&queue->resp_send_list);@@ -1671,12 +1789,32 @@ static void nvmet_tcp_alloc_queue(structnvmet_tcp_port *port, list_add_tail(&queue->queue_list, &nvmet_tcp_queue_list); mutex_unlock(&nvmet_tcp_queue_mutex); +#ifdef CONFIG_NVME_TARGET_TCP_TLS + INIT_DELAYED_WORK(&queue->tls_handshake_work, + nvmet_tcp_tls_handshake_timeout_work); + if (queue->state == NVMET_TCP_Q_TLS_HANDSHAKE) { + struct sock *sk = queue->sock->sk; + + /* Restore the default callbacks before starting upcall */ + read_lock_bh(&sk->sk_callback_lock); + sk->sk_user_data = NULL; + sk->sk_data_ready = port->data_ready; + read_unlock_bh(&sk->sk_callback_lock); + if (!nvmet_tcp_tls_handshake(queue)) + return; + + /* TLS handshake failed, terminate the connection */ + goto out_destroy_sq; + } +#endif +
Quoted 9 lines
Quoted 6 lines
drivers/nvme/target/tcp.c +0
-0ret = nvmet_tcp_set_queue_sock(queue); if (ret) goto out_destroy_sq; return;
out_destroy_sq:
+queue->state=NVMET_TCP_Q_DISCONNECTING;Can you clarify what this is used for?
Primarily for debugging, to signal that we really are disconnecting. But yeah, not really required.
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions Germany GmbH, Frankenstr. 146, 90461 Nürnberg Managing Directors: I. Totev, A. Myers, A. McDonald, M. B. Moerman (HRB 36809, AG Nürnberg)
Sagi Grimberg
maintainerRe: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 13 lines
Quoted 13 lines
drivers/nvme/target/configfs.c static struct config_group · line 1884
Quoted 10 lines
drivers/nvme/target/configfs.c +5
-0@@ -1864,6 +1877,14 @@ static struct config_group *nvmet_ports_make(struct config_group *group, return ERR_PTR(-ENOMEM); } + if (nvme_keyring_id()) { + port->keyring = key_lookup(nvme_keyring_id()); + if (IS_ERR(port->keyring)) { + pr_warn("NVMe keyring not available, disabling TLS\n"); + port->keyring = NULL;why setting this to NULL?
Quoted 1 line
It's check when changing TSAS; we can only enable TLS if the nvme keyring is available.
ok
Quoted 66 lines
Quoted 57 lines
Quoted 57 lines
drivers/nvme/target/configfs.c +3
-0+ } + } + for (i = 1; i <= NVMET_MAX_ANAGRPS; i++) { if (i == NVMET_DEFAULT_ANA_GRPID) port->ana_state[1] = NVME_ANA_OPTIMIZED;drivers/nvme/target/nvmet.h +1
-0@@ -158,6 +158,7 @@ struct nvmet_port { struct config_group ana_groups_group; struct nvmet_ana_group ana_default_group; enum nvme_ana_state *ana_state; + struct key *keyring; void *priv; bool enabled; int inline_data_size;drivers/nvme/target/tcp.c +14
-0@@ -8,9 +8,13 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/key.h> #include <linux/nvme-tcp.h> +#include <linux/nvme-keyring.h> #include <net/sock.h> #include <net/tcp.h> +#include <net/tls.h> +#include <net/handshake.h> #include <linux/inet.h> #include <linux/llist.h> #include <crypto/hash.h>@@ -66,6 +70,16 @@ device_param_cb(idle_poll_period_usecs, &set_param_ops, MODULE_PARM_DESC(idle_poll_period_usecs, "nvmet tcp io_work poll till idle time period in usecs: Default 0"); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +/* +* TLS handshake timeout +*/ +static int tls_handshake_timeout =10 ; +module_param (tls_handshake_timeout, int,0644 ); +MODULE_PARM_DESC (tls_handshake_timeout, + "nvme TLS handshake timeout in seconds (default 10)"); +#endif + #define NVMET_TCP_RECV_BUDGET 8 #define NVMET_TCP_SEND_BUDGET 8 #define NVMET_TCP_IO_WORK_BUDGET 64@@ -122,11 +136,13 @@ struct nvmet_tcp_cmd { enum nvmet_tcp_queue_state { NVMET_TCP_Q_CONNECTING,Quoted 9 lines
drivers/nvme/target/tcp.c struct nvmet_tcp_cmd { · line 145
Quoted 6 lines
drivers/nvme/target/tcp.c +2
-0+ NVMET_TCP_Q_TLS_HANDSHAKE, NVMET_TCP_Q_LIVE, NVMET_TCP_Q_DISCONNECTING, }; struct nvmet_tcp_queue { + struct kref kref;Why is kref the first member of the struct?
Quoted 2 lines
Habit.
I don't mind where it'll end up.
Move it to the back together with the tls section.
Quoted 82 lines
Quoted 37 lines
Quoted 37 lines
drivers/nvme/target/tcp.c +14
-1struct socket *sock; struct nvmet_tcp_port *port; struct work_struct io_work;@@ -155,6 +171,10 @@ struct nvmet_tcp_queue { struct ahash_request *snd_hash; struct ahash_request *rcv_hash; + /* TLS state */ + key_serial_t tls_pskid; + struct delayed_work tls_handshake_work; + unsigned long poll_end; spinlock_t state_lock;@@ -1283,12 +1303,21 @@ static int nvmet_tcp_try_recv(structnvmet_tcp_queue *queue, return ret; } +static void nvmet_tcp_release_queue (struct kref *kref) +{ + struct nvmet_tcp_queue *queue = + container_of(kref, struct nvmet_tcp_queue, kref); + + WARN_ON(queue->state != NVMET_TCP_Q_DISCONNECTING); + queue_work(nvmet_wq, &queue->release_work); +} + static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue) { spin_lock_bh(&queue->state_lock); if (queue->state != NVMET_TCP_Q_DISCONNECTING) { queue->state = NVMET_TCP_Q_DISCONNECTING; - queue_work(nvmet_wq, &queue->release_work); + kref_put(&queue->kref, nvmet_tcp_release_queue); } spin_unlock_bh(&queue->state_lock); }@@ -1485,6 +1514,8 @@ static void nvmet_tcp_release_queue_work(structQuoted 9 lines
drivers/nvme/target/tcp.c static void nvmet_tcp_release_queue_work(struct work_struct *w) · line 1518
Quoted 5 lines
drivers/nvme/target/tcp.c +2
-0work_struct *w) mutex_unlock(&nvmet_tcp_queue_mutex); nvmet_tcp_restore_socket_callbacks(queue); + tls_handshake_cancel(queue->sock->sk); + cancel_delayed_work_sync(&queue->tls_handshake_work);We should call it
tls_handshake_tmo_workor something to make it clear it is a timeout work.Okay.
Quoted 25 lines
Quoted 25 lines
drivers/nvme/target/tcp.c +11
-2cancel_work_sync(&queue->io_work); /* stop accepting incoming data */ queue->rcv_state = NVMET_TCP_RECV_ERR;@@ -1512,8 +1543,13 @@ static void nvmet_tcp_data_ready(struct sock *sk) read_lock_bh(&sk->sk_callback_lock); queue = sk->sk_user_data; - if (likely(queue)) - queue_work_on(queue_cpu(queue), nvmet_tcp_wq, &queue->io_work); + if (likely(queue)) { + if (queue->data_ready) + queue->data_ready(sk); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) + queue_work_on(queue_cpu(queue), nvmet_tcp_wq, + &queue->io_work); + } read_unlock_bh(&sk->sk_callback_lock); }@@ -1621,6 +1657,83 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) return ret; } +#ifdef CONFIG_NVME_TARGET_TCP_TLS +static void nvmet_tcp_tls_handshake_done (void *data,int status, + key_serial_t peerid) +{Quoted 9 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1669
Quoted 6 lines
drivers/nvme/target/tcp.c +6
-0+ struct nvmet_tcp_queue *queue = data; + + pr_debug("queue %d: TLS handshake done, key %x, status %d\n", + queue->idx, peerid, status); + spin_lock_bh(&queue->state_lock); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) {Is this even possible?
Quoted 1 line
I guess it can happen when the socket closes during handshake; the daemon might still be sending a 'done' event but
nvmet_tcp_schedule_release_queue()has been called.
Umm, if the socket closes during the handshake then the state is NVMET_TCP_Q_TLS_HANDSHAKE.
p.s. you call handshake cancel in the release flow so you should be fenced properly no?
Re: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 172 lines · Sagi Grimberg
Quoted 13 lines
Quoted 13 lines
drivers/nvme/target/configfs.c static struct config_group · line 1884
Quoted 10 lines
drivers/nvme/target/configfs.c +5
-0@@ -1864,6 +1877,14 @@ static struct config_group *nvmet_ports_make(struct config_group *group, return ERR_PTR(-ENOMEM); } + if (nvme_keyring_id()) { + port->keyring = key_lookup(nvme_keyring_id()); + if (IS_ERR(port->keyring)) { + pr_warn("NVMe keyring not available, disabling TLS\n"); + port->keyring = NULL;why setting this to NULL?
Quoted 1 line
It's check when changing TSAS; we can only enable TLS if the nvme keyring is available.
ok
Quoted 66 lines
Quoted 57 lines
Quoted 57 lines
drivers/nvme/target/configfs.c +3
-0+ } + } + for (i = 1; i <= NVMET_MAX_ANAGRPS; i++) { if (i == NVMET_DEFAULT_ANA_GRPID) port->ana_state[1] = NVME_ANA_OPTIMIZED;drivers/nvme/target/nvmet.h +1
-0@@ -158,6 +158,7 @@ struct nvmet_port { struct config_group ana_groups_group; struct nvmet_ana_group ana_default_group; enum nvme_ana_state *ana_state; + struct key *keyring; void *priv; bool enabled; int inline_data_size;drivers/nvme/target/tcp.c +14
-0@@ -8,9 +8,13 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/key.h> #include <linux/nvme-tcp.h> +#include <linux/nvme-keyring.h> #include <net/sock.h> #include <net/tcp.h> +#include <net/tls.h> +#include <net/handshake.h> #include <linux/inet.h> #include <linux/llist.h> #include <crypto/hash.h>@@ -66,6 +70,16 @@ device_param_cb(idle_poll_period_usecs, &set_param_ops, MODULE_PARM_DESC(idle_poll_period_usecs, "nvmet tcp io_work poll till idle time period in usecs: Default 0"); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +/* +* TLS handshake timeout +*/ +static int tls_handshake_timeout =10 ; +module_param (tls_handshake_timeout, int,0644 ); +MODULE_PARM_DESC (tls_handshake_timeout, + "nvme TLS handshake timeout in seconds (default 10)"); +#endif + #define NVMET_TCP_RECV_BUDGET 8 #define NVMET_TCP_SEND_BUDGET 8 #define NVMET_TCP_IO_WORK_BUDGET 64@@ -122,11 +136,13 @@ struct nvmet_tcp_cmd { enum nvmet_tcp_queue_state { NVMET_TCP_Q_CONNECTING,Quoted 9 lines
drivers/nvme/target/tcp.c struct nvmet_tcp_cmd { · line 145
Quoted 6 lines
drivers/nvme/target/tcp.c +2
-0+ NVMET_TCP_Q_TLS_HANDSHAKE, NVMET_TCP_Q_LIVE, NVMET_TCP_Q_DISCONNECTING, }; struct nvmet_tcp_queue { + struct kref kref;Why is kref the first member of the struct?
Quoted 2 lines
Habit.
I don't mind where it'll end up.Move it to the back together with the tls section.
Quoted 84 lines
Quoted 37 lines
Quoted 37 lines
drivers/nvme/target/tcp.c +14
-1struct socket *sock; struct nvmet_tcp_port *port; struct work_struct io_work;@@ -155,6 +171,10 @@ struct nvmet_tcp_queue { struct ahash_request *snd_hash; struct ahash_request *rcv_hash; + /* TLS state */ + key_serial_t tls_pskid; + struct delayed_work tls_handshake_work; + unsigned long poll_end; spinlock_t state_lock;@@ -1283,12 +1303,21 @@ static int nvmet_tcp_try_recv(structnvmet_tcp_queue *queue, return ret; } +static void nvmet_tcp_release_queue (struct kref *kref) +{ + struct nvmet_tcp_queue *queue = + container_of(kref, struct nvmet_tcp_queue, kref); + + WARN_ON(queue->state != NVMET_TCP_Q_DISCONNECTING); + queue_work(nvmet_wq, &queue->release_work); +} + static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue) { spin_lock_bh(&queue->state_lock); if (queue->state != NVMET_TCP_Q_DISCONNECTING) { queue->state = NVMET_TCP_Q_DISCONNECTING; - queue_work(nvmet_wq, &queue->release_work); + kref_put(&queue->kref, nvmet_tcp_release_queue); } spin_unlock_bh(&queue->state_lock); }@@ -1485,6 +1514,8 @@ static voidQuoted 9 lines
drivers/nvme/target/tcp.c static void nvmet_tcp_release_queue_work(struct work_struct *w) · line 1518
Quoted 5 lines
drivers/nvme/target/tcp.c +2
-0nvmet_tcp_release_queue_work(struct work_struct *w) mutex_unlock(&nvmet_tcp_queue_mutex); nvmet_tcp_restore_socket_callbacks(queue); + tls_handshake_cancel(queue->sock->sk); + cancel_delayed_work_sync(&queue->tls_handshake_work);We should call it
tls_handshake_tmo_workor something to make it clear it is a timeout work.Okay.
Quoted 36 lines
Quoted 23 lines
drivers/nvme/target/tcp.c +7
-2cancel_work_sync(&queue->io_work); /* stop accepting incoming data */ queue->rcv_state = NVMET_TCP_RECV_ERR;@@ -1512,8 +1543,13 @@ static void nvmet_tcp_data_ready(struct sock *sk) read_lock_bh(&sk->sk_callback_lock); queue = sk->sk_user_data; - if (likely(queue)) - queue_work_on(queue_cpu(queue), nvmet_tcp_wq, &queue->io_work); + if (likely(queue)) { + if (queue->data_ready) + queue->data_ready(sk); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) + queue_work_on(queue_cpu(queue), nvmet_tcp_wq, + &queue->io_work); + } read_unlock_bh(&sk->sk_callback_lock); }@@ -1621,6 +1657,83 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) return ret; }drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct · line 1669
Quoted 10 lines
drivers/nvme/target/tcp.c +10
-0+#ifdef CONFIG_NVME_TARGET_TCP_TLS +static void nvmet_tcp_tls_handshake_done (void *data,int status, + key_serial_t peerid) +{ + struct nvmet_tcp_queue *queue = data; + + pr_debug("queue %d: TLS handshake done, key %x, status %d\n", + queue->idx, peerid, status); + spin_lock_bh(&queue->state_lock); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) {Is this even possible?
Quoted 5 lines
Quoted 1 line
I guess it can happen when the socket closes during handshake; the daemon might still be sending a 'done' event but
nvmet_tcp_schedule_release_queue()has been called.Umm, if the socket closes during the handshake then the state is
NVMET_TCP_Q_TLS_HANDSHAKE.
But there's a race window between setting it to NVMET_TCP_Q_DISCONNECTING and calling tls_handshake_cancel().
Quoted 2 lines
p.s. you call handshake cancel in the release flow so you should be fenced properly no?
Not really. But I'll check if I can fix it up.
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
Sagi Grimberg
maintainerRe: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 174 lines
Quoted 174 lines
Quoted 13 lines
Quoted 13 lines
drivers/nvme/target/configfs.c static struct config_group · line 1884
Quoted 10 lines
drivers/nvme/target/configfs.c +5
-0@@ -1864,6 +1877,14 @@ static struct config_group *nvmet_ports_make(struct config_group *group, return ERR_PTR(-ENOMEM); } + if (nvme_keyring_id()) { + port->keyring = key_lookup(nvme_keyring_id()); + if (IS_ERR(port->keyring)) { + pr_warn("NVMe keyring not available, disabling TLS\n"); + port->keyring = NULL;why setting this to NULL?
Quoted 1 line
It's check when changing TSAS; we can only enable TLS if the nvme keyring is available.
ok
Quoted 66 lines
Quoted 57 lines
Quoted 57 lines
drivers/nvme/target/configfs.c +3
-0+ } + } + for (i = 1; i <= NVMET_MAX_ANAGRPS; i++) { if (i == NVMET_DEFAULT_ANA_GRPID) port->ana_state[1] = NVME_ANA_OPTIMIZED;drivers/nvme/target/nvmet.h +1
-0@@ -158,6 +158,7 @@ struct nvmet_port { struct config_group ana_groups_group; struct nvmet_ana_group ana_default_group; enum nvme_ana_state *ana_state; + struct key *keyring; void *priv; bool enabled; int inline_data_size;drivers/nvme/target/tcp.c +14
-0@@ -8,9 +8,13 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/key.h> #include <linux/nvme-tcp.h> +#include <linux/nvme-keyring.h> #include <net/sock.h> #include <net/tcp.h> +#include <net/tls.h> +#include <net/handshake.h> #include <linux/inet.h> #include <linux/llist.h> #include <crypto/hash.h>@@ -66,6 +70,16 @@ device_param_cb(idle_poll_period_usecs, &set_param_ops, MODULE_PARM_DESC(idle_poll_period_usecs, "nvmet tcp io_work poll till idle time period in usecs: Default 0"); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +/* +* TLS handshake timeout +*/ +static int tls_handshake_timeout =10 ; +module_param (tls_handshake_timeout, int,0644 ); +MODULE_PARM_DESC (tls_handshake_timeout, + "nvme TLS handshake timeout in seconds (default 10)"); +#endif + #define NVMET_TCP_RECV_BUDGET 8 #define NVMET_TCP_SEND_BUDGET 8 #define NVMET_TCP_IO_WORK_BUDGET 64@@ -122,11 +136,13 @@ struct nvmet_tcp_cmd { enum nvmet_tcp_queue_state { NVMET_TCP_Q_CONNECTING,Quoted 9 lines
drivers/nvme/target/tcp.c struct nvmet_tcp_cmd { · line 145
Quoted 6 lines
drivers/nvme/target/tcp.c +2
-0+ NVMET_TCP_Q_TLS_HANDSHAKE, NVMET_TCP_Q_LIVE, NVMET_TCP_Q_DISCONNECTING, }; struct nvmet_tcp_queue { + struct kref kref;Why is kref the first member of the struct?
Quoted 2 lines
Habit.
I don't mind where it'll end up.Move it to the back together with the tls section.
Quoted 85 lines
Quoted 37 lines
Quoted 37 lines
drivers/nvme/target/tcp.c +14
-1struct socket *sock; struct nvmet_tcp_port *port; struct work_struct io_work;@@ -155,6 +171,10 @@ struct nvmet_tcp_queue { struct ahash_request *snd_hash; struct ahash_request *rcv_hash; + /* TLS state */ + key_serial_t tls_pskid; + struct delayed_work tls_handshake_work; + unsigned long poll_end; spinlock_t state_lock;@@ -1283,12 +1303,21 @@ static int nvmet_tcp_try_recv(structnvmet_tcp_queue *queue, return ret; } +static void nvmet_tcp_release_queue (struct kref *kref) +{ + struct nvmet_tcp_queue *queue = + container_of(kref, struct nvmet_tcp_queue, kref); + + WARN_ON(queue->state != NVMET_TCP_Q_DISCONNECTING); + queue_work(nvmet_wq, &queue->release_work); +} + static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue) { spin_lock_bh(&queue->state_lock); if (queue->state != NVMET_TCP_Q_DISCONNECTING) { queue->state = NVMET_TCP_Q_DISCONNECTING; - queue_work(nvmet_wq, &queue->release_work); + kref_put(&queue->kref, nvmet_tcp_release_queue); } spin_unlock_bh(&queue->state_lock); }@@ -1485,6 +1514,8 @@ static voidQuoted 9 lines
drivers/nvme/target/tcp.c static void nvmet_tcp_release_queue_work(struct work_struct *w) · line 1518
Quoted 5 lines
drivers/nvme/target/tcp.c +2
-0nvmet_tcp_release_queue_work(struct work_struct *w) mutex_unlock(&nvmet_tcp_queue_mutex); nvmet_tcp_restore_socket_callbacks(queue); + tls_handshake_cancel(queue->sock->sk); + cancel_delayed_work_sync(&queue->tls_handshake_work);We should call it
tls_handshake_tmo_workor something to make it clear it is a timeout work.Okay.
Quoted 27 lines
Quoted 27 lines
drivers/nvme/target/tcp.c +11
-2cancel_work_sync(&queue->io_work); /* stop accepting incoming data */ queue->rcv_state = NVMET_TCP_RECV_ERR;@@ -1512,8 +1543,13 @@ static void nvmet_tcp_data_ready(struct sock *sk) read_lock_bh(&sk->sk_callback_lock); queue = sk->sk_user_data; - if (likely(queue)) - queue_work_on(queue_cpu(queue), nvmet_tcp_wq, &queue->io_work); + if (likely(queue)) { + if (queue->data_ready) + queue->data_ready(sk); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) + queue_work_on(queue_cpu(queue), nvmet_tcp_wq, + &queue->io_work); + } read_unlock_bh(&sk->sk_callback_lock); }@@ -1621,6 +1657,83 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) return ret; } +#ifdef CONFIG_NVME_TARGET_TCP_TLS +static void nvmet_tcp_tls_handshake_done (void *data,int status, + key_serial_t peerid) +{Quoted 9 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1669
Quoted 6 lines
drivers/nvme/target/tcp.c +6
-0+ struct nvmet_tcp_queue *queue = data; + + pr_debug("queue %d: TLS handshake done, key %x, status %d\n", + queue->idx, peerid, status); + spin_lock_bh(&queue->state_lock); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) {Is this even possible?
I guess it can happen when the socket closes during handshake; the daemon might still be sending a 'done' event but
nvmet_tcp_schedule_release_queue()has been called.
Quoted 8 lines
Quoted 3 lines
Umm, if the socket closes during the handshake then the state is
NVMET_TCP_Q_TLS_HANDSHAKE.But there's a race window between setting it to
NVMET_TCP_Q_DISCONNECTINGand callingtls_handshake_cancel().Quoted 2 lines
p.s. you call handshake cancel in the release flow so you should be fenced properly no?
Not really. But I'll check if I can fix it up.
The teardown handling feels complicated to me.
How are you testing it btw?
Re: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 177 lines · Sagi Grimberg
Quoted 177 lines
Quoted 177 lines
Quoted 13 lines
Quoted 13 lines
drivers/nvme/target/configfs.c static struct config_group · line 1884
Quoted 10 lines
drivers/nvme/target/configfs.c +5
-0@@ -1864,6 +1877,14 @@ static struct config_group *nvmet_ports_make(struct config_group *group, return ERR_PTR(-ENOMEM); } + if (nvme_keyring_id()) { + port->keyring = key_lookup(nvme_keyring_id()); + if (IS_ERR(port->keyring)) { + pr_warn("NVMe keyring not available, disabling TLS\n"); + port->keyring = NULL;why setting this to NULL?
Quoted 1 line
It's check when changing TSAS; we can only enable TLS if the nvme keyring is available.
ok
Quoted 66 lines
Quoted 57 lines
Quoted 57 lines
drivers/nvme/target/configfs.c +3
-0+ } + } + for (i = 1; i <= NVMET_MAX_ANAGRPS; i++) { if (i == NVMET_DEFAULT_ANA_GRPID) port->ana_state[1] = NVME_ANA_OPTIMIZED;drivers/nvme/target/nvmet.h +1
-0@@ -158,6 +158,7 @@ struct nvmet_port { struct config_group ana_groups_group; struct nvmet_ana_group ana_default_group; enum nvme_ana_state *ana_state; + struct key *keyring; void *priv; bool enabled; int inline_data_size;drivers/nvme/target/tcp.c +14
-0@@ -8,9 +8,13 @@ #include <linux/init.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/key.h> #include <linux/nvme-tcp.h> +#include <linux/nvme-keyring.h> #include <net/sock.h> #include <net/tcp.h> +#include <net/tls.h> +#include <net/handshake.h> #include <linux/inet.h> #include <linux/llist.h> #include <crypto/hash.h>@@ -66,6 +70,16 @@ device_param_cb(idle_poll_period_usecs, &set_param_ops, MODULE_PARM_DESC(idle_poll_period_usecs, "nvmet tcp io_work poll till idle time period in usecs: Default 0"); +#ifdef CONFIG_NVME_TARGET_TCP_TLS +/* +* TLS handshake timeout +*/ +static int tls_handshake_timeout =10 ; +module_param (tls_handshake_timeout, int,0644 ); +MODULE_PARM_DESC (tls_handshake_timeout, + "nvme TLS handshake timeout in seconds (default 10)"); +#endif + #define NVMET_TCP_RECV_BUDGET 8 #define NVMET_TCP_SEND_BUDGET 8 #define NVMET_TCP_IO_WORK_BUDGET 64@@ -122,11 +136,13 @@ struct nvmet_tcp_cmd { enum nvmet_tcp_queue_state { NVMET_TCP_Q_CONNECTING,Quoted 9 lines
drivers/nvme/target/tcp.c struct nvmet_tcp_cmd { · line 145
Quoted 6 lines
drivers/nvme/target/tcp.c +2
-0+ NVMET_TCP_Q_TLS_HANDSHAKE, NVMET_TCP_Q_LIVE, NVMET_TCP_Q_DISCONNECTING, }; struct nvmet_tcp_queue { + struct kref kref;Why is kref the first member of the struct?
Quoted 2 lines
Habit.
I don't mind where it'll end up.Move it to the back together with the tls section.
Quoted 84 lines
Quoted 37 lines
Quoted 37 lines
drivers/nvme/target/tcp.c +14
-1struct socket *sock; struct nvmet_tcp_port *port; struct work_struct io_work;@@ -155,6 +171,10 @@ struct nvmet_tcp_queue { struct ahash_request *snd_hash; struct ahash_request *rcv_hash; + /* TLS state */ + key_serial_t tls_pskid; + struct delayed_work tls_handshake_work; + unsigned long poll_end; spinlock_t state_lock;@@ -1283,12 +1303,21 @@ static int nvmet_tcp_try_recv(structnvmet_tcp_queue *queue, return ret; } +static void nvmet_tcp_release_queue (struct kref *kref) +{ + struct nvmet_tcp_queue *queue = + container_of(kref, struct nvmet_tcp_queue, kref); + + WARN_ON(queue->state != NVMET_TCP_Q_DISCONNECTING); + queue_work(nvmet_wq, &queue->release_work); +} + static void nvmet_tcp_schedule_release_queue(struct nvmet_tcp_queue *queue) { spin_lock_bh(&queue->state_lock); if (queue->state != NVMET_TCP_Q_DISCONNECTING) { queue->state = NVMET_TCP_Q_DISCONNECTING; - queue_work(nvmet_wq, &queue->release_work); + kref_put(&queue->kref, nvmet_tcp_release_queue); } spin_unlock_bh(&queue->state_lock); }@@ -1485,6 +1514,8 @@ static voidQuoted 9 lines
drivers/nvme/target/tcp.c static void nvmet_tcp_release_queue_work(struct work_struct *w) · line 1518
Quoted 5 lines
drivers/nvme/target/tcp.c +2
-0nvmet_tcp_release_queue_work(struct work_struct *w) mutex_unlock(&nvmet_tcp_queue_mutex); nvmet_tcp_restore_socket_callbacks(queue); + tls_handshake_cancel(queue->sock->sk); + cancel_delayed_work_sync(&queue->tls_handshake_work);We should call it
tls_handshake_tmo_workor something to make it clear it is a timeout work.Okay.
Quoted 27 lines
Quoted 27 lines
drivers/nvme/target/tcp.c +11
-2cancel_work_sync(&queue->io_work); /* stop accepting incoming data */ queue->rcv_state = NVMET_TCP_RECV_ERR;@@ -1512,8 +1543,13 @@ static void nvmet_tcp_data_ready(struct sock *sk) read_lock_bh(&sk->sk_callback_lock); queue = sk->sk_user_data; - if (likely(queue)) - queue_work_on(queue_cpu(queue), nvmet_tcp_wq, &queue->io_work); + if (likely(queue)) { + if (queue->data_ready) + queue->data_ready(sk); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) + queue_work_on(queue_cpu(queue), nvmet_tcp_wq, + &queue->io_work); + } read_unlock_bh(&sk->sk_callback_lock); }@@ -1621,6 +1657,83 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) return ret; } +#ifdef CONFIG_NVME_TARGET_TCP_TLS +static void nvmet_tcp_tls_handshake_done (void *data,int status, + key_serial_t peerid) +{Quoted 9 lines
drivers/nvme/target/tcp.c static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) · line 1669
Quoted 6 lines
drivers/nvme/target/tcp.c +6
-0+ struct nvmet_tcp_queue *queue = data; + + pr_debug("queue %d: TLS handshake done, key %x, status %d\n", + queue->idx, peerid, status); + spin_lock_bh(&queue->state_lock); + if (queue->state != NVMET_TCP_Q_TLS_HANDSHAKE) {Is this even possible?
Quoted 1 line
I guess it can happen when the socket closes during handshake; the daemon might still be sending a 'done' event but
nvmet_tcp_schedule_release_queue()has been called.Umm, if the socket closes during the handshake then the state is
NVMET_TCP_Q_TLS_HANDSHAKE.
Quoted 8 lines
Quoted 5 lines
But there's a race window between setting it to
NVMET_TCP_Q_DISCONNECTINGand callingtls_handshake_cancel().Quoted 2 lines
p.s. you call handshake cancel in the release flow so you should be fenced properly no?
Not really. But I'll check if I can fix it up.
The teardown handling feels complicated to me.
You tell me. TLS timeout handling always gets in the way. But I've reworked it now to look slightly better.
Quoted 1 line
How are you testing it btw?
As outlined in the patchset description.
I've a target configuration running over the loopback interface.
Will expand to have two VMs talking to each other; however, that needs more fiddling with the PSK deployment.
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
Sagi Grimberg
maintainerRe: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 8 lines
Quoted 2 lines
How are you testing it btw?
As outlined in the patchset description.
I've a target configuration running over the loopback interface.Will expand to have two VMs talking to each other; however, that needs more fiddling with the PSK deployment.
Was referring to the timeout part. Would maybe make sense to run a very short timeouts to see that is behaving...
Re: [PATCH 15/17] nvmet-tcp: enable TLS handshake upcall
Quoted 11 lines · Sagi Grimberg
Quoted 8 lines
Quoted 2 lines
How are you testing it btw?
As outlined in the patchset description.
I've a target configuration running over the loopback interface.Will expand to have two VMs talking to each other; however, that needs more fiddling with the PSK deployment.
Was referring to the timeout part. Would maybe make sense to run a very short timeouts to see that is behaving...
I'll see to patch it into tlshd.
I used to trigger it quite easily during development, but now that things have stabilised of course it doesn't happen anymore. Kinda the point, I guess :-)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
PATCH v8 16/17 nvmet-tcp: control messages for recvmsg()
In reply to Hannes ReineckekTLS requires control messages for recvmsg() to relay any out-of-band TLS messages (eg TLS alerts) to the caller.
--- drivers/nvme/target/tcp.c | 94 +++++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 13 deletions(-)
drivers/nvme/target/tcp.c +81 -13
@@ -14,6 +14,7 @@#include <net/sock.h> #include <net/tcp.h> #include <net/tls.h> +#include <net/tls_prot.h> #include <net/handshake.h> #include <linux/inet.h> #include <linux/llist.h>
@@ -118,6 +119,7 @@ struct nvmet_tcp_cmd {u32 pdu_len;u32 pdu_recv;int sg_idx; +char recv_cbuf[CMSG_LEN (sizeof (char ))];struct msghdr recv_msg;struct bio_vec *iov;u32 flags;
@@ -1119,20 +1121,65 @@ static inline bool nvmet_tcp_pdu_valid(u8 type)return false; } +static int nvmet_tcp_tls_record_ok (struct nvmet_tcp_queue *queue, +struct msghdr *msg,char *cbuf) +{ +struct cmsghdr *cmsg = (struct cmsghdr *)cbuf; +u8 ctype, level, description; +int ret =0 ; + + ctype =tls_get_record_type (queue->sock->sk, cmsg); +switch (ctype) { +case 0 : +break ; +case TLS_RECORD_TYPE_DATA : +break ; +case TLS_RECORD_TYPE_ALERT : +tls_alert_recv (queue->sock->sk, msg, &level, &description); +if (level ==TLS_ALERT_LEVEL_FATAL ) { +pr_err ("queue %d: TLS Alert desc %u\n" , + queue->idx, description); + ret = -ENOTCONN ; + }else { +pr_warn ("queue %d: TLS Alert desc %u\n" , + queue->idx, description); + ret = -EAGAIN ; + } +break ; +default : +/* discard this record type */ +pr_err ("queue %d: TLS record %d unhandled\n" , + queue->idx, ctype); + ret = -EAGAIN ; +break ; + } +return ret; +} +static int nvmet_tcp_try_recv_pdu (struct nvmet_tcp_queue *queue) {struct nvme_tcp_hdr *hdr = &queue->pdu.cmd.hdr; -int len; +int len, ret;struct kvec iov; +char cbuf[CMSG_LEN (sizeof (char ))] = {};struct msghdr msg = { .msg_flags =MSG_DONTWAIT }; recv: iov.iov_base = (void *)&queue->pdu + queue->offset; iov.iov_len = queue->left; +if (queue->tls_pskid) { + msg.msg_control = cbuf; + msg.msg_controllen =sizeof (cbuf); + } len =kernel_recvmsg (queue->sock, &msg, &iov,1 , iov.iov_len, msg.msg_flags);if (unlikely (len <0 ))return len; +if (queue->tls_pskid) { + ret =nvmet_tcp_tls_record_ok (queue, &msg, cbuf); +if (ret <0 ) +return ret; + } queue->offset += len; queue->left -= len;
@@ -1185,16 +1232,22 @@ static void nvmet_tcp_prep_recv_ddgst(struct nvmet_tcp_cmd *cmd)static int nvmet_tcp_try_recv_data (struct nvmet_tcp_queue *queue) {struct nvmet_tcp_cmd *cmd = queue->cmd; -int ret; +int len, ret;while (msg_data_left (&cmd->recv_msg)) { - ret =sock_recvmsg (cmd->queue->sock, &cmd->recv_msg, + len =sock_recvmsg (cmd->queue->sock, &cmd->recv_msg, cmd->recv_msg.msg_flags); -if (ret <=0 ) -return ret; +if (len <=0 ) +return len; +if (queue->tls_pskid) { + ret =nvmet_tcp_tls_record_ok (cmd->queue, + &cmd->recv_msg, cmd->recv_cbuf); +if (ret <0 ) +return ret; + } - cmd->pdu_recv += ret; - cmd->rbytes_done += ret; + cmd->pdu_recv += len; + cmd->rbytes_done += len; }if (queue->data_digest) {
@@ -1212,20 +1265,30 @@ static int nvmet_tcp_try_recv_data(struct nvmet_tcp_queue *queue)static int nvmet_tcp_try_recv_ddgst (struct nvmet_tcp_queue *queue) {struct nvmet_tcp_cmd *cmd = queue->cmd; -int ret; +int ret, len; +char cbuf[CMSG_LEN (sizeof (char ))] = {};struct msghdr msg = { .msg_flags =MSG_DONTWAIT };struct kvec iov = { .iov_base = (void *)&cmd->recv_ddgst + queue->offset, .iov_len = queue->left }; - ret =kernel_recvmsg (queue->sock, &msg, &iov,1 , +if (queue->tls_pskid) { + msg.msg_control = cbuf; + msg.msg_controllen =sizeof (cbuf); + } + len =kernel_recvmsg (queue->sock, &msg, &iov,1 , iov.iov_len, msg.msg_flags); -if (unlikely (ret <0 )) -return ret; +if (unlikely (len <0 )) +return len; +if (queue->tls_pskid) { + ret =nvmet_tcp_tls_record_ok (queue, &msg, cbuf); +if (ret <0 ) +return ret; + } - queue->offset += ret; - queue->left -= ret; + queue->offset += len; + queue->left -= len;if (queue->left)return -EAGAIN ;
@@ -1401,6 +1464,10 @@ static int nvmet_tcp_alloc_cmd(struct nvmet_tcp_queue *queue,if (!c->r2t_pdu) goto out_free_data; +if (queue->state ==NVMET_TCP_Q_TLS_HANDSHAKE ) { + c->recv_msg.msg_control = c->recv_cbuf; + c->recv_msg.msg_controllen =sizeof (c->recv_cbuf); + } c->recv_msg.msg_flags =MSG_DONTWAIT |MSG_NOSIGNAL ;list_add_tail (&c->entry, &queue->free_list);
@@ -1675,6 +1742,7 @@ static void nvmet_tcp_tls_handshake_done(void *data, int status, }if (!status) queue->tls_pskid = peerid; + queue->state =NVMET_TCP_Q_CONNECTING ;spin_unlock_bh (&queue->state_lock);
Signature · 1 line
2.35.3
Re: [PATCH 16/17] nvmet-tcp: control messages for recvmsg()
PATCH v8 17/17 nvmet-tcp: peek icreq before starting TLS
In reply to Hannes ReineckeIncoming connection might be either 'normal' NVMe-TCP connections starting with icreq or TLS handshakes. To ensure that 'normal' connections can still be handled we need to peek the first packet and only start TLS handshake if it's not an icreq.
With that we can lift the restriction to always set TREQ to 'required' when TLS1.3 is enabled.
--- drivers/nvme/target/configfs.c | 17 ---------- drivers/nvme/target/nvmet.h | 10 ++++++ drivers/nvme/target/tcp.c | 61 +++++++++++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 22 deletions(-)
drivers/nvme/target/configfs.c +0 -17
@@ -175,11 +175,6 @@ static ssize_t nvmet_addr_treq_show(struct config_item *item, char *page)return snprintf (page,PAGE_SIZE ,"\n" ); } -static inline u8 nvmet_port_disc_addr_treq_mask (struct nvmet_port *port) -{ -return (port->disc_addr.treq & ~NVME_TREQ_SECURE_CHANNEL_MASK ); -} -static ssize_t nvmet_addr_treq_store (struct config_item *item,const char *page,size_t count) {
@@ -377,7 +372,6 @@ static ssize_t nvmet_addr_tsas_store(struct config_item *item, const char *page, size_t count) {struct nvmet_port *port =to_nvmet_port (item); -u8 treq =nvmet_port_disc_addr_treq_mask (port);u8 sectype;int i;
@@ -410,17 +404,6 @@ static ssize_t nvmet_addr_tsas_store(struct config_item *item, }nvmet_port_init_tsas_tcp (port, sectype); -/* -* The TLS implementation currently does not support -* secure concatenation, so TREQ is always set to 'required' -* if TLS is enabled. -*/ -if (sectype ==NVMF_TCP_SECTYPE_TLS13 ) { - treq |=NVMF_TREQ_REQUIRED ; - }else { - treq |=NVMF_TREQ_NOT_SPECIFIED ; - } - port->disc_addr.treq = treq;return count; }
drivers/nvme/target/nvmet.h +10 -0
@@ -179,6 +179,16 @@ static inline struct nvmet_port *ana_groups_to_port( ana_groups_group); } +static inline u8 nvmet_port_disc_addr_treq_mask (struct nvmet_port *port) +{ +return (port->disc_addr.treq & ~NVME_TREQ_SECURE_CHANNEL_MASK ); +} + +static inline bool nvmet_port_secure_channel_required (struct nvmet_port *port) +{ +return nvmet_port_disc_addr_treq_mask (port) ==NVMF_TREQ_REQUIRED ; +} +struct nvmet_ctrl {struct nvmet_subsys *subsys;struct nvmet_sq **sqs;
drivers/nvme/target/tcp.c +56 -5
73 lines not on this page · raw message
Signature · 1 line
2.35.3
Sagi Grimberg
maintainerRe: [PATCH 17/17] nvmet-tcp: peek icreq before starting TLS
Quoted 5 lines
Incoming connection might be either 'normal' NVMe-TCP connections starting with icreq or TLS handshakes. To ensure that 'normal' connections can still be handled we need to peek the first packet and only start TLS handshake if it's not an icreq.
That depends if we want to do that.
Why should we let so called normal connections if tls1.3 is enabled?
Re: [PATCH 17/17] nvmet-tcp: peek icreq before starting TLS
Quoted 9 lines · Sagi Grimberg
Quoted 5 lines
Incoming connection might be either 'normal' NVMe-TCP connections starting with icreq or TLS handshakes. To ensure that 'normal' connections can still be handled we need to peek the first packet and only start TLS handshake if it's not an icreq.
That depends if we want to do that.
Why should we let so called normal connections if tls1.3 is enabled?
Because of the TREQ setting.
TREQ can be 'not specified, 'required', or 'not required'.
Consequently when TSAS is set to 'tls1.3', and TREQ to 'not required' the initiator can choose whether he wants to do TLS.
And we don't need this weird 'select TREQ required' when TLS is active; never particularly liked that one.
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions Germany GmbH, Frankenstr. 146, 90461 Nürnberg Managing Directors: I. Totev, A. Myers, A. McDonald, M. B. Moerman (HRB 36809, AG Nürnberg)
Sagi Grimberg
maintainerRe: [PATCH 17/17] nvmet-tcp: peek icreq before starting TLS
Quoted 11 lines · Hannes Reinecke
Quoted 9 lines · Sagi Grimberg
Quoted 5 lines
Incoming connection might be either 'normal' NVMe-TCP connections starting with icreq or TLS handshakes. To ensure that 'normal' connections can still be handled we need to peek the first packet and only start TLS handshake if it's not an icreq.
That depends if we want to do that.
Why should we let so called normal connections if tls1.3 is enabled?
Quoted 6 lines
Because of the TREQ setting.
TREQ can be 'not specified, 'required', or 'not required'.
Consequently when TSAS is set to 'tls1.3', and TREQ to 'not required' the initiator can choose whether he wants to do TLS.And we don't need this weird 'select TREQ required' when TLS is active; never particularly liked that one.
The guideline should be that treq 'not required' should be the explicit setting in tls and not the other way around. We should be strict by default and permissive only if the user explicitly chose it, and log a warning in the log.
Re: [PATCH 17/17] nvmet-tcp: peek icreq before starting TLS
Quoted 18 lines · Sagi Grimberg
Quoted 15 lines · Hannes Reinecke
Quoted 9 lines · Sagi Grimberg
Quoted 5 lines
Incoming connection might be either 'normal' NVMe-TCP connections starting with icreq or TLS handshakes. To ensure that 'normal' connections can still be handled we need to peek the first packet and only start TLS handshake if it's not an icreq.
That depends if we want to do that.
Why should we let so called normal connections if tls1.3 is enabled?Because of the TREQ setting.
TREQ can be 'not specified, 'required', or 'not required'.
Consequently when TSAS is set to 'tls1.3', and TREQ to 'not required' the initiator can choose whether he wants to do TLS.
Quoted 7 lines
Quoted 2 lines
And we don't need this weird 'select TREQ required' when TLS is active; never particularly liked that one.
The guideline should be that treq 'not required' should be the explicit setting in tls and not the other way around. We should be strict by default and permissive only if the user explicitly chose it, and log a warning in the log.
Whatever you say. I'll modify the patch.
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman