netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hannes Reinecke <hare@suse.de>
To: Sagi Grimberg <sagi@grimberg.me>
Cc: Keith Busch <kbusch@kernel.org>, Christoph Hellwig <hch@lst.de>,
	linux-nvme@lists.infradead.org, Jakub Kicinski <kuba@kernel.org>,
	Eric Dumazet <edumazet@google.com>,
	Paolo Abeni <pabeni@redhat.com>,
	netdev@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 2/5] net/tls: handle MSG_EOR for tls_device TX flow
Date: Mon,  3 Jul 2023 11:04:41 +0200	[thread overview]
Message-ID: <20230703090444.38734-3-hare@suse.de> (raw)
In-Reply-To: <20230703090444.38734-1-hare@suse.de>

tls_push_data() MSG_MORE, but bails out on MSG_EOR.
Seeing that MSG_EOR is basically the opposite of MSG_MORE
this patch adds handling MSG_EOR by treating it as the
absence of MSG_MORE.
Consequently we should return an error when both are set.

Cc: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 net/tls/tls_device.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/tls/tls_device.c b/net/tls/tls_device.c
index 2021fe557e50..5df18f696d7f 100644
--- a/net/tls/tls_device.c
+++ b/net/tls/tls_device.c
@@ -441,9 +441,13 @@ static int tls_push_data(struct sock *sk,
 	long timeo;
 
 	if (flags &
-	    ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_SPLICE_PAGES))
+	    ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
+	      MSG_SPLICE_PAGES | MSG_EOR))
 		return -EOPNOTSUPP;
 
+	if ((flags & (MSG_MORE | MSG_EOR)) == (MSG_MORE | MSG_EOR))
+		return -EINVAL;
+
 	if (unlikely(sk->sk_err))
 		return -sk->sk_err;
 
-- 
2.35.3


  parent reply	other threads:[~2023-07-03  9:04 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-03  9:04 [PATCHv6 0/5] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-07-03  9:04 ` [PATCH 1/5] net/tls: handle MSG_EOR for tls_sw TX flow Hannes Reinecke
2023-07-03  9:04 ` Hannes Reinecke [this message]
2023-07-03  9:04 ` [PATCH 3/5] selftests/net/tls: add test for MSG_EOR Hannes Reinecke
2023-07-03  9:04 ` [PATCH 4/5] net/tls: split tls_rx_reader_lock Hannes Reinecke
2023-07-03 10:06   ` Sagi Grimberg
2023-07-03 10:21     ` Hannes Reinecke
2023-07-05 20:55       ` Jakub Kicinski
2023-07-03  9:04 ` [PATCH 5/5] net/tls: implement ->read_sock() Hannes Reinecke
2023-07-04  7:56   ` Paolo Abeni
2023-07-03 10:08 ` [PATCHv6 0/5] net/tls: fixes for NVMe-over-TLS Sagi Grimberg
2023-07-03 10:20   ` Hannes Reinecke
2023-07-03 12:13     ` Hannes Reinecke
2023-07-03 12:19       ` Hannes Reinecke
2023-07-03 12:26         ` David Howells
2023-07-03 12:33           ` Sagi Grimberg
2023-07-03 13:15             ` Hannes Reinecke
2023-07-03 13:42               ` Sagi Grimberg
2023-07-03 13:46                 ` Hannes Reinecke
2023-07-03 14:01                   ` Sagi Grimberg
2023-07-03 13:57                 ` Hannes Reinecke
2023-07-03 14:10                   ` Sagi Grimberg
2023-07-03 12:35           ` Hannes Reinecke
2023-07-03 12:45             ` David Howells

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=20230703090444.38734-3-hare@suse.de \
    --to=hare@suse.de \
    --cc=edumazet@google.com \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --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).