From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 16/16] nvmet-tcp: control messages for recvmsg()
Date: Tue, 8 Aug 2023 18:53:54 +0200 [thread overview]
Message-ID: <20230808165354.123499-17-hare@suse.de> (raw)
In-Reply-To: <20230808165354.123499-1-hare@suse.de>
kTLS requires control messages for recvmsg() to relay any out-of-band
TLS messages (eg TLS alerts) to the caller.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/nvme/target/tcp.c | 83 +++++++++++++++++++++++++++++++++------
1 file changed, 72 insertions(+), 11 deletions(-)
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index 75e4cb4c2f29..e1aea52e58da 100644
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -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>
@@ -70,6 +71,9 @@ 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");
+#define nvmet_queue_is_tls(queue) \
+ ((queue)->port->nport->disc_addr.tsas.tcp.sectype == NVMF_TCP_SECTYPE_TLS13)
+
#ifdef CONFIG_NVME_TARGET_TCP_TLS
/*
* TLS handshake timeout
@@ -118,6 +122,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;
@@ -1116,20 +1121,59 @@ 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;
+
+ if (!nvmet_queue_is_tls(queue))
+ return 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);
+ pr_err("TLS Alert level %u desc %u\n", level, description);
+ ret = (level == TLS_ALERT_LEVEL_FATAL) ?
+ -ENOTCONN : -EAGAIN;
+ break;
+ default:
+ /* discard this record type */
+ pr_err("TLS record %d unhandled\n", 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 (nvmet_queue_is_tls(queue)) {
+ 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;
+ ret = nvmet_tcp_tls_record_ok(queue, &msg, cbuf);
+ if (ret < 0)
+ return ret;
queue->offset += len;
queue->left -= len;
@@ -1182,16 +1226,21 @@ 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)
+ if (len <= 0)
+ return len;
+ 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) {
@@ -1209,20 +1258,28 @@ 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 (nvmet_queue_is_tls(queue)) {
+ 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))
+ if (unlikely(len < 0))
+ return len;
+ 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;
@@ -1389,6 +1446,10 @@ static int nvmet_tcp_alloc_cmd(struct nvmet_tcp_queue *queue,
if (!c->r2t_pdu)
goto out_free_data;
+ if (nvmet_queue_is_tls(queue)) {
+ 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);
--
2.35.3
next prev parent reply other threads:[~2023-08-08 16:54 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-08 16:53 [PATCHv6 00/16] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-08-08 16:53 ` [PATCH 01/16] nvme-keyring: register '.nvme' keyring Hannes Reinecke
2023-08-08 16:53 ` [PATCH 02/16] nvme-keyring: define a 'psk' keytype Hannes Reinecke
2023-08-08 16:53 ` [PATCH 03/16] nvme: add TCP TSAS definitions Hannes Reinecke
2023-08-08 16:53 ` [PATCH 04/16] nvme-tcp: add definitions for TLS cipher suites Hannes Reinecke
2023-08-08 16:53 ` [PATCH 05/16] nvme-keyring: implement nvme_tls_psk_default() Hannes Reinecke
2023-08-08 16:53 ` [PATCH 06/16] security/keys: export key_lookup() Hannes Reinecke
2023-08-10 13:41 ` David Howells
2023-08-08 16:53 ` [PATCH 07/16] nvme-tcp: allocate socket file Hannes Reinecke
2023-08-08 16:53 ` [PATCH 08/16] nvme-tcp: enable TLS handshake upcall Hannes Reinecke
2023-08-09 9:47 ` Sagi Grimberg
2023-08-09 10:00 ` Hannes Reinecke
2023-08-08 16:53 ` [PATCH 09/16] nvme-tcp: control message handling for recvmsg() Hannes Reinecke
2023-08-08 16:53 ` [PATCH 10/16] nvme-fabrics: parse options 'keyring' and 'tls_key' Hannes Reinecke
2023-08-09 9:56 ` Sagi Grimberg
2023-08-09 10:02 ` Hannes Reinecke
2023-08-08 16:53 ` [PATCH 11/16] nvmet: make TCP sectype settable via configfs Hannes Reinecke
2023-08-08 16:53 ` [PATCH 12/16] nvmet-tcp: make nvmet_tcp_alloc_queue() a void function Hannes Reinecke
2023-08-09 10:26 ` Sagi Grimberg
2023-08-08 16:53 ` [PATCH 13/16] nvmet-tcp: allocate socket file Hannes Reinecke
2023-08-09 10:28 ` Sagi Grimberg
2023-08-08 16:53 ` [PATCH 14/16] nvmet: Allow to change 'TSAS' and 'TREQ' Hannes Reinecke
2023-08-09 10:44 ` Sagi Grimberg
2023-08-09 11:18 ` Hannes Reinecke
2023-08-08 16:53 ` [PATCH 15/16] nvmet-tcp: enable TLS handshake upcall Hannes Reinecke
2023-08-09 10:51 ` Sagi Grimberg
2023-08-09 11:33 ` Hannes Reinecke
2023-08-09 12:51 ` Sagi Grimberg
2023-08-09 12:54 ` Sagi Grimberg
2023-08-09 13:24 ` Hannes Reinecke
2023-08-09 13:22 ` Hannes Reinecke
2023-08-10 7:09 ` Hannes Reinecke
2023-08-10 8:04 ` Sagi Grimberg
2023-08-08 16:53 ` Hannes Reinecke [this message]
2023-08-09 11:30 ` [PATCH 16/16] nvmet-tcp: control messages for recvmsg() Sagi Grimberg
2023-08-09 11:35 ` Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230808165354.123499-17-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox