linux-nvme.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
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>,
	Boris Pismenny <boris.pismenny@gmail.com>,
	Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH 06/17] net/tls: implement ->read_sock()
Date: Wed, 19 Apr 2023 08:57:03 +0200	[thread overview]
Message-ID: <20230419065714.52076-7-hare@suse.de> (raw)
In-Reply-To: <20230419065714.52076-1-hare@suse.de>

Implement ->read_sock() function for use with nvme-tcp.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: Boris Pismenny <boris.pismenny@gmail.com>
Cc: Jakub Kicinski <kuba@kernel.org>
---
 net/tls/tls.h      |  2 ++
 net/tls/tls_main.c |  2 ++
 net/tls/tls_sw.c   | 71 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/net/tls/tls.h b/net/tls/tls.h
index 804c3880d028..a5bf3a9ce142 100644
--- a/net/tls/tls.h
+++ b/net/tls/tls.h
@@ -113,6 +113,8 @@ bool tls_sw_sock_is_readable(struct sock *sk);
 ssize_t tls_sw_splice_read(struct socket *sock, loff_t *ppos,
 			   struct pipe_inode_info *pipe,
 			   size_t len, unsigned int flags);
+int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc,
+		     sk_read_actor_t read_actor);
 
 int tls_device_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);
 int tls_device_sendpage(struct sock *sk, struct page *page,
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index b32c112984dd..0b51b19aa46d 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -921,9 +921,11 @@ static void build_proto_ops(struct proto_ops ops[TLS_NUM_CONFIG][TLS_NUM_CONFIG]
 
 	ops[TLS_BASE][TLS_SW  ] = ops[TLS_BASE][TLS_BASE];
 	ops[TLS_BASE][TLS_SW  ].splice_read	= tls_sw_splice_read;
+	ops[TLS_BASE][TLS_SW  ].read_sock	= tls_sw_read_sock;
 
 	ops[TLS_SW  ][TLS_SW  ] = ops[TLS_SW  ][TLS_BASE];
 	ops[TLS_SW  ][TLS_SW  ].splice_read	= tls_sw_splice_read;
+	ops[TLS_SW  ][TLS_SW  ].read_sock	= tls_sw_read_sock;
 
 #ifdef CONFIG_TLS_DEVICE
 	ops[TLS_HW  ][TLS_BASE] = ops[TLS_BASE][TLS_BASE];
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 635b8bf6b937..827292e29f99 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2214,6 +2214,77 @@ ssize_t tls_sw_splice_read(struct socket *sock,  loff_t *ppos,
 	goto splice_read_end;
 }
 
+int tls_sw_read_sock(struct sock *sk, read_descriptor_t *desc,
+		     sk_read_actor_t read_actor)
+{
+	struct tls_context *tls_ctx = tls_get_ctx(sk);
+	struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx);
+	struct strp_msg *rxm = NULL;
+	struct tls_msg *tlm;
+	struct sk_buff *skb;
+	ssize_t copied = 0;
+	int err, used;
+
+	if (!skb_queue_empty(&ctx->rx_list)) {
+		skb = __skb_dequeue(&ctx->rx_list);
+	} else {
+		struct tls_decrypt_arg darg;
+
+		err = tls_rx_rec_wait(sk, NULL, true, true);
+		if (err <= 0)
+			return err;
+
+		memset(&darg.inargs, 0, sizeof(darg.inargs));
+
+		err = tls_rx_one_record(sk, NULL, &darg);
+		if (err < 0) {
+			tls_err_abort(sk, -EBADMSG);
+			return err;
+		}
+
+		tls_rx_rec_done(ctx);
+		skb = darg.skb;
+	}
+
+	do {
+		rxm = strp_msg(skb);
+		tlm = tls_msg(skb);
+
+		/* read_sock does not support reading control messages */
+		if (tlm->control != TLS_RECORD_TYPE_DATA) {
+			err = -EINVAL;
+			goto read_sock_requeue;
+		}
+
+		used = read_actor(desc, skb, rxm->offset, rxm->full_len);
+		if (used <= 0) {
+			err = used;
+			goto read_sock_end;
+		}
+
+		copied += used;
+		if (used < rxm->full_len) {
+			rxm->offset += used;
+			rxm->full_len -= used;
+			if (!desc->count)
+				goto read_sock_requeue;
+		} else {
+			consume_skb(skb);
+			if (desc->count && !skb_queue_empty(&ctx->rx_list))
+				skb = __skb_dequeue(&ctx->rx_list);
+			else
+				skb = NULL;
+		}
+	} while (skb);
+
+read_sock_end:
+	return copied ? : err;
+
+read_sock_requeue:
+	__skb_queue_head(&ctx->rx_list, skb);
+	goto read_sock_end;
+}
+
 bool tls_sw_sock_is_readable(struct sock *sk)
 {
 	struct tls_context *tls_ctx = tls_get_ctx(sk);
-- 
2.35.3



  parent reply	other threads:[~2023-04-19  6:57 UTC|newest]

Thread overview: 47+ 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 ` Hannes Reinecke [this message]
2023-04-19  9:09   ` [PATCH 06/17] net/tls: implement ->read_sock() 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 ` [PATCH 17/17] nvmet-tcp: control messages for recvmsg() 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=20230419065714.52076-7-hare@suse.de \
    --to=hare@suse.de \
    --cc=boris.pismenny@gmail.com \
    --cc=chuck.lever@oracle.com \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=kernel-tls-handshake@lists.linux.dev \
    --cc=kuba@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;
as well as URLs for NNTP newsgroup(s).