public inbox for kernel-tls-handshake@lists.linux.dev
 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>, Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH 07/17] net/tls: handle MSG_EOR for tls_sw TX flow
Date: Wed, 19 Apr 2023 08:57:04 +0200	[thread overview]
Message-ID: <20230419065714.52076-8-hare@suse.de> (raw)
In-Reply-To: <20230419065714.52076-1-hare@suse.de>

tls_sw_sendmsg() / tls_do_sw_sendpage() already checks for an
'end of record' by evaluating the 'MSG_MORE' / 'MSG_SENDPAGE_NOTLAST'
setting. So MSG_EOR can easily be handled by treating it
as the opposite of MSG_MORE / MSG_SENDPAGE_NOTLAST.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: Jakub Kicinski <kuba@kernel.org>
---
 net/tls/tls_sw.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 827292e29f99..9bee2dcd55bf 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -953,9 +953,12 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
 	int pending;
 
 	if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
-			       MSG_CMSG_COMPAT))
+			       MSG_EOR | MSG_CMSG_COMPAT))
 		return -EOPNOTSUPP;
 
+	if (msg->msg_flags & MSG_EOR)
+		eor = true;
+
 	ret = mutex_lock_interruptible(&tls_ctx->tx_lock);
 	if (ret)
 		return ret;
@@ -1173,6 +1176,8 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
 	bool eor;
 
 	eor = !(flags & MSG_SENDPAGE_NOTLAST);
+	if (flags & MSG_EOR)
+		eor = true;
 	sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
 
 	/* Call the sk_stream functions to manage the sndbuf mem. */
@@ -1274,7 +1279,7 @@ static int tls_sw_do_sendpage(struct sock *sk, struct page *page,
 int tls_sw_sendpage_locked(struct sock *sk, struct page *page,
 			   int offset, size_t size, int flags)
 {
-	if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
+	if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_EOR |
 		      MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY |
 		      MSG_NO_SHARED_FRAGS))
 		return -EOPNOTSUPP;
@@ -1288,7 +1293,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,
 	struct tls_context *tls_ctx = tls_get_ctx(sk);
 	int ret;
 
-	if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
+	if (flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_EOR |
 		      MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY))
 		return -EOPNOTSUPP;
 
-- 
2.35.3


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

Thread overview: 46+ 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 ` Hannes Reinecke [this message]
2023-05-09  9:19   ` [PATCH 07/17] net/tls: handle MSG_EOR for tls_sw TX flow 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-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-8-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=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