From: Hannes Reinecke <hare@suse.de>
To: Sagi Grimberg <sagi@grimberg.me>
Cc: Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org,
Chuck Lever <chuck.lever@oracle.com>,
kernel-tls-handshake@lists.linux.dev,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 17/17] nvmet-tcp: control messages for recvmsg()
Date: Wed, 19 Apr 2023 08:57:14 +0200 [thread overview]
Message-ID: <20230419065714.52076-18-hare@suse.de> (raw)
In-Reply-To: <20230419065714.52076-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 | 50 +++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index 26c911ddc2de..2974abd30b45 100644
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -118,6 +118,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;
@@ -1104,12 +1105,39 @@ static inline bool nvmet_tcp_pdu_valid(u8 type)
return false;
}
+static bool nvmet_tcp_tls_record_ok(struct msghdr *msg, char *cbuf)
+{
+ struct cmsghdr *cmsg = (struct cmsghdr *)cbuf;
+ unsigned char ctype;
+
+ if (!IS_ENABLED(CONFIG_NVME_TARGET_TCP_TLS))
+ return true;
+
+ if (CMSG_OK(msg, cmsg) &&
+ cmsg->cmsg_level == SOL_TLS &&
+ cmsg->cmsg_type == TLS_GET_RECORD_TYPE) {
+ ctype = *((unsigned char *)CMSG_DATA(cmsg));
+ if (ctype != TLS_RECORD_TYPE_DATA) {
+ pr_err("unhandled TLS record %d\n", ctype);
+ return false;
+ }
+ }
+ return true;
+}
+
static int nvmet_tcp_try_recv_pdu(struct nvmet_tcp_queue *queue)
{
struct nvme_tcp_hdr *hdr = &queue->pdu.cmd.hdr;
int len;
struct kvec iov;
- struct msghdr msg = { .msg_flags = MSG_DONTWAIT };
+ char cbuf[CMSG_LEN(sizeof(char))] = {};
+ struct msghdr msg = {
+#ifdef CONFIG_NVME_TARGET_TCP_TLS
+ .msg_control = cbuf,
+ .msg_controllen = sizeof(cbuf),
+#endif
+ .msg_flags = MSG_DONTWAIT
+ };
recv:
iov.iov_base = (void *)&queue->pdu + queue->offset;
@@ -1118,6 +1146,8 @@ static int nvmet_tcp_try_recv_pdu(struct nvmet_tcp_queue *queue)
iov.iov_len, msg.msg_flags);
if (unlikely(len < 0))
return len;
+ if (!nvmet_tcp_tls_record_ok(&msg, cbuf))
+ return -ENOTCONN;
queue->offset += len;
queue->left -= len;
@@ -1177,6 +1207,9 @@ static int nvmet_tcp_try_recv_data(struct nvmet_tcp_queue *queue)
cmd->recv_msg.msg_flags);
if (ret <= 0)
return ret;
+ if (!nvmet_tcp_tls_record_ok(&cmd->recv_msg,
+ cmd->recv_cbuf))
+ return -ENOTCONN;
cmd->pdu_recv += ret;
cmd->rbytes_done += ret;
@@ -1198,7 +1231,14 @@ static int nvmet_tcp_try_recv_ddgst(struct nvmet_tcp_queue *queue)
{
struct nvmet_tcp_cmd *cmd = queue->cmd;
int ret;
- struct msghdr msg = { .msg_flags = MSG_DONTWAIT };
+ char cbuf[CMSG_LEN(sizeof(char))] = {};
+ struct msghdr msg = {
+#ifdef CONFIG_NVME_TARGET_TCP_TLS
+ .msg_control = cbuf,
+ .msg_controllen = sizeof(cbuf),
+#endif
+ .msg_flags = MSG_DONTWAIT
+ };
struct kvec iov = {
.iov_base = (void *)&cmd->recv_ddgst + queue->offset,
.iov_len = queue->left
@@ -1208,6 +1248,8 @@ static int nvmet_tcp_try_recv_ddgst(struct nvmet_tcp_queue *queue)
iov.iov_len, msg.msg_flags);
if (unlikely(ret < 0))
return ret;
+ if (!nvmet_tcp_tls_record_ok(&msg, cbuf))
+ return -ENOTCONN;
queue->offset += ret;
queue->left -= ret;
@@ -1377,6 +1419,10 @@ static int nvmet_tcp_alloc_cmd(struct nvmet_tcp_queue *queue,
if (!c->r2t_pdu)
goto out_free_data;
+ if (IS_ENABLED(CONFIG_NVME_TARGET_TCP_TLS)) {
+ 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-04-19 6:57 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-19 6:56 [PATCHv4 00/17] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-04-19 6:56 ` [PATCH 01/17] nvme-keyring: register '.nvme' keyring Hannes Reinecke
2023-05-02 14:17 ` Aurelien Aptel
2023-04-19 6:56 ` [PATCH 02/17] nvme-keyring: define a 'psk' keytype Hannes Reinecke
2023-05-08 8:59 ` Max Gurtovoy
2023-05-08 13:56 ` Hannes Reinecke
2023-04-19 6:57 ` [PATCH 03/17] nvme: add TCP TSAS definitions Hannes Reinecke
2023-05-08 16:36 ` Max Gurtovoy
2023-05-08 21:01 ` Hannes Reinecke
2023-04-19 6:57 ` [PATCH 04/17] nvme-tcp: add definitions for TLS cipher suites Hannes Reinecke
2023-04-19 6:57 ` [PATCH 05/17] nvme-keyring: implement nvme_tls_psk_default() Hannes Reinecke
2023-05-09 7:31 ` Max Gurtovoy
2023-05-09 14:13 ` Hannes Reinecke
2023-04-19 6:57 ` [PATCH 06/17] net/tls: implement ->read_sock() Hannes Reinecke
2023-04-19 9:09 ` Sagi Grimberg
2023-05-09 23:30 ` Sagi Grimberg
2023-05-10 0:47 ` Jakub Kicinski
2023-05-17 6:43 ` Sagi Grimberg
2023-05-17 7:53 ` Hannes Reinecke
2023-05-17 7:54 ` Christoph Hellwig
2023-05-17 7:56 ` Hannes Reinecke
2023-05-17 9:36 ` Sagi Grimberg
2023-04-19 6:57 ` [PATCH 07/17] net/tls: handle MSG_EOR for tls_sw TX flow Hannes Reinecke
2023-05-09 9:19 ` Max Gurtovoy
2023-05-09 14:18 ` Hannes Reinecke
2023-05-09 15:13 ` Jakub Kicinski
2023-05-09 23:02 ` Max Gurtovoy
2023-05-09 23:07 ` Hannes Reinecke
2023-04-19 6:57 ` [PATCH 08/17] nvme-tcp: fixup MSG_SENDPAGE_NOTLAST Hannes Reinecke
2023-04-19 9:08 ` Sagi Grimberg
2023-04-19 6:57 ` [PATCH 09/17] security/keys: export key_lookup() Hannes Reinecke
2023-04-19 6:57 ` [PATCH 10/17] nvme/tcp: allocate socket file Hannes Reinecke
2023-04-19 6:57 ` [PATCH 11/17] nvme-tcp: enable TLS handshake upcall Hannes Reinecke
2023-05-09 9:48 ` Max Gurtovoy
2023-05-09 14:22 ` Hannes Reinecke
2023-05-09 23:16 ` Max Gurtovoy
2023-05-10 7:37 ` Hannes Reinecke
2023-05-10 16:26 ` Daniel Wagner
2023-04-19 6:57 ` [PATCH 12/17] nvme-tcp: control message handling for recvmsg() Hannes Reinecke
2023-04-19 6:57 ` [PATCH 13/17] nvme-fabrics: parse options 'keyring' and 'tls_key' Hannes Reinecke
2023-04-21 6:32 ` Daniel Wagner
2023-05-09 10:00 ` Max Gurtovoy
2023-05-09 14:24 ` Hannes Reinecke
2023-04-19 6:57 ` [PATCH 14/17] nvmet: make TCP sectype settable via configfs Hannes Reinecke
2023-04-19 6:57 ` [PATCH 15/17] nvmet-tcp: allocate socket file Hannes Reinecke
2023-04-19 6:57 ` [PATCH 16/17] nvmet-tcp: enable TLS handshake upcall Hannes Reinecke
2023-04-19 6:57 ` Hannes Reinecke [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-10 15:06 [PATCHv7 00/17] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-08-10 15:06 ` [PATCH 17/17] nvmet-tcp: control messages for recvmsg() Hannes Reinecke
2023-08-11 12:17 [PATCHv8 00/17] nvme: In-kernel TLS support for TCP Hannes Reinecke
2023-08-11 12:17 ` [PATCH 17/17] nvmet-tcp: control messages for recvmsg() Hannes Reinecke
2023-08-13 14:04 ` Sagi Grimberg
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=20230419065714.52076-18-hare@suse.de \
--to=hare@suse.de \
--cc=chuck.lever@oracle.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=kernel-tls-handshake@lists.linux.dev \
--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;
as well as URLs for NNTP newsgroup(s).