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, 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 1/4] net/tls: handle MSG_EOR for tls_sw TX flow
Date: Tue, 20 Jun 2023 12:28:53 +0200 [thread overview]
Message-ID: <20230620102856.56074-2-hare@suse.de> (raw)
In-Reply-To: <20230620102856.56074-1-hare@suse.de>
tls_sw_sendmsg() / tls_do_sw_sendpage() already handles
MSG_MORE / MSG_SENDPAGE_NOTLAST, but bails out on MSG_EOR.
But seeing that MSG_EOR is basically the opposite of
MSG_MORE / MSG_SENDPAGE_NOTLAST this patch adds handling
MSG_EOR by treating it as the negation of MSG_MORE.
And erroring out if MSG_EOR is specified with either
MSG_MORE or MSG_SENDPAGE_NOTLAST.
Cc: Jakub Kicinski <kuba@kernel•org>
Cc: netdev@vger•kernel.org
Signed-off-by: Hannes Reinecke <hare@suse•de>
---
net/tls/tls_sw.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 319f61590d2c..97379e34c997 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -984,6 +984,9 @@ static int tls_sw_sendmsg_locked(struct sock *sk, struct msghdr *msg,
int ret = 0;
int pending;
+ if (!eor && (msg->msg_flags & MSG_EOR))
+ return -EINVAL;
+
if (unlikely(msg->msg_controllen)) {
ret = tls_process_cmsg(sk, msg, &record_type);
if (ret) {
@@ -1193,7 +1196,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
int ret;
if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL |
- MSG_CMSG_COMPAT | MSG_SPLICE_PAGES |
+ MSG_CMSG_COMPAT | MSG_SPLICE_PAGES | MSG_EOR |
MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY))
return -EOPNOTSUPP;
@@ -1287,7 +1290,7 @@ int tls_sw_sendpage_locked(struct sock *sk, struct page *page,
struct bio_vec bvec;
struct msghdr msg = { .msg_flags = flags | MSG_SPLICE_PAGES, };
- 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;
@@ -1305,7 +1308,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page,
struct bio_vec bvec;
struct msghdr msg = { .msg_flags = flags | MSG_SPLICE_PAGES, };
- 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;
if (flags & MSG_SENDPAGE_NOTLAST)
--
2.35.3
next prev parent reply other threads:[~2023-06-20 10:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 10:28 [PATCHv5 0/4] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-06-20 10:28 ` Hannes Reinecke [this message]
2023-06-20 10:28 ` [PATCH 2/4] net/tls: handle MSG_EOR for tls_device TX flow Hannes Reinecke
2023-06-20 17:12 ` Sabrina Dubroca
2023-06-21 6:09 ` Hannes Reinecke
2023-06-20 10:28 ` [PATCH 3/4] selftests/net/tls: add test for MSG_EOR Hannes Reinecke
2023-06-20 10:28 ` [PATCH 4/4] net/tls: implement ->read_sock() Hannes Reinecke
2023-06-20 13:21 ` Sagi Grimberg
2023-06-20 17:08 ` Jakub Kicinski
2023-06-21 6:44 ` Hannes Reinecke
2023-06-21 8:39 ` Sagi Grimberg
2023-06-21 9:08 ` Hannes Reinecke
2023-06-21 9:49 ` Sagi Grimberg
2023-06-21 19:31 ` Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2023-06-14 6:22 [PATCHv4 0/4] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-06-14 6:22 ` [PATCH 1/4] net/tls: handle MSG_EOR for tls_sw TX flow Hannes Reinecke
2023-06-17 6:26 ` Jakub Kicinski
2023-06-12 14:38 [PATCHv3 0/4] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-06-12 14:38 ` [PATCH 1/4] net/tls: handle MSG_EOR for tls_sw TX flow Hannes Reinecke
2023-06-09 12:51 [PATCHv2 0/4] net/tls: fixes for NVMe-over-TLS Hannes Reinecke
2023-06-09 12:51 ` [PATCH 1/4] net/tls: handle MSG_EOR for tls_sw TX flow Hannes Reinecke
2023-06-09 16:37 ` Sabrina Dubroca
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=20230620102856.56074-2-hare@suse.de \
--to=hare@suse$(echo .)de \
--cc=edumazet@google$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=kbusch@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-nvme@lists$(echo .)infradead.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=sagi@grimberg$(echo .)me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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