From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>,
[email protected], Stefan Metzmacher <[email protected]>
Subject: [PATCH for-6.1 1/2] io_uring/net: fail zc send for unsupported protocols
Date: Thu, 20 Oct 2022 02:42:35 +0100 [thread overview]
Message-ID: <ee7c163db8cea65b208d327610a6a96f936c1c6f.1666229889.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
If a protocol doesn't support zerocopy it will silently fall back to
copying. This type of behaviour has always been a source of troubles
so it's better to fail such requests instead. For now explicitly
whitelist supported protocols in io_uring, which should be turned later
into a socket flag.
Cc: <[email protected]> # 6.0
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/net.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/io_uring/net.c b/io_uring/net.c
index 8c7226b5bf41..28127f1de1f0 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -120,6 +120,13 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags)
}
}
+static inline bool io_sock_support_zc(struct socket *sock)
+{
+ return likely(sock->sk && sk_fullsock(sock->sk) &&
+ (sock->sk->sk_protocol == IPPROTO_TCP ||
+ sock->sk->sk_protocol == IPPROTO_UDP));
+}
+
static struct io_async_msghdr *io_msg_alloc_async(struct io_kiocb *req,
unsigned int issue_flags)
{
@@ -1056,6 +1063,8 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags)
sock = sock_from_file(req->file);
if (unlikely(!sock))
return -ENOTSOCK;
+ if (!io_sock_support_zc(sock))
+ return -EOPNOTSUPP;
msg.msg_name = NULL;
msg.msg_control = NULL;
--
2.38.0
next prev parent reply other threads:[~2022-10-20 1:43 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 1:42 [PATCH for-6.1 0/2] don't fallback if sock doesn't undestand zc Pavel Begunkov
2022-10-20 1:42 ` Pavel Begunkov [this message]
2022-10-20 9:13 ` [PATCH for-6.1 1/2] io_uring/net: fail zc send for unsupported protocols Stefan Metzmacher
2022-10-20 12:48 ` Pavel Begunkov
2022-10-20 13:05 ` Stefan Metzmacher
2022-10-20 12:49 ` Jens Axboe
2022-10-20 12:53 ` Pavel Begunkov
2022-10-20 12:59 ` Jens Axboe
2022-10-20 1:42 ` [PATCH for-6.1 2/2] io_uring/net: fail zc sendmsg " Pavel Begunkov
2022-10-20 2:26 ` [PATCH for-6.1 0/2] don't fallback if sock doesn't undestand zc Jens Axboe
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=ee7c163db8cea65b208d327610a6a96f936c1c6f.1666229889.git.asml.silence@gmail.com \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/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