From: Luke Hsiao <luke.w.hsiao@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
Luke Hsiao <lukehsiao@google.com>,
Arjun Roy <arjunroy@google.com>,
Soheil Hassas Yeganeh <soheil@google.com>,
Eric Dumazet <edumazet@google.com>
Subject: [PATCH net-next 2/2] io_uring: ignore POLLIN for recvmsg on MSG_ERRQUEUE
Date: Thu, 20 Aug 2020 16:49:54 -0700 [thread overview]
Message-ID: <20200820234954.1784522-3-luke.w.hsiao@gmail.com> (raw)
In-Reply-To: <20200820234954.1784522-1-luke.w.hsiao@gmail.com>
From: Luke Hsiao <lukehsiao@google.com>
Currently, io_uring's recvmsg subscribes to both POLLERR and POLLIN. In
the context of TCP tx zero-copy, this is inefficient since we are only
reading the error queue and not using recvmsg to read POLLIN responses.
This patch was tested by using a simple sending program to call recvmsg
using io_uring with MSG_ERRQUEUE set and verifying with printks that the
POLLIN is correctly unset when the msg flags are MSG_ERRQUEUE.
Signed-off-by: Arjun Roy <arjunroy@google.com>
Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Luke Hsiao <lukehsiao@google.com>
---
fs/io_uring.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index dc506b75659c..664ce8739615 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -79,6 +79,7 @@
#include <linux/splice.h>
#include <linux/task_work.h>
#include <linux/pagemap.h>
+#include <linux/socket.h>
#define CREATE_TRACE_POINTS
#include <trace/events/io_uring.h>
@@ -4902,7 +4903,8 @@ static __poll_t __io_arm_poll_handler(struct io_kiocb *req,
return mask;
}
-static bool io_arm_poll_handler(struct io_kiocb *req)
+static bool io_arm_poll_handler(struct io_kiocb *req,
+ const struct io_uring_sqe *sqe)
{
const struct io_op_def *def = &io_op_defs[req->opcode];
struct io_ring_ctx *ctx = req->ctx;
@@ -4932,6 +4934,11 @@ static bool io_arm_poll_handler(struct io_kiocb *req)
mask |= POLLIN | POLLRDNORM;
if (def->pollout)
mask |= POLLOUT | POLLWRNORM;
+
+ /* If reading from MSG_ERRQUEUE using recvmsg, ignore POLLIN */
+ if (req->opcode == IORING_OP_RECVMSG && (sqe->msg_flags & MSG_ERRQUEUE))
+ mask &= ~(POLLIN);
+
mask |= POLLERR | POLLPRI;
ipt.pt._qproc = io_async_queue_proc;
@@ -6146,7 +6153,7 @@ static void __io_queue_sqe(struct io_kiocb *req, const struct io_uring_sqe *sqe,
* doesn't support non-blocking read/write attempts
*/
if (ret == -EAGAIN && !(req->flags & REQ_F_NOWAIT)) {
- if (!io_arm_poll_handler(req)) {
+ if (!io_arm_poll_handler(req, sqe)) {
punt:
ret = io_prep_work_files(req);
if (unlikely(ret))
--
2.28.0.297.g1956fa8f8d-goog
next prev parent reply other threads:[~2020-08-20 23:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 23:49 [PATCH net-next 0/2] Support reading msg errq from io_uring Luke Hsiao
2020-08-20 23:49 ` [PATCH net-next 1/2] io_uring: allow tcp ancillary data for __sys_recvmsg_sock() Luke Hsiao
2020-08-21 21:10 ` Jens Axboe
2020-08-20 23:49 ` Luke Hsiao [this message]
2020-08-21 20:41 ` [PATCH net-next 2/2] io_uring: ignore POLLIN for recvmsg on MSG_ERRQUEUE Jakub Kicinski
2020-08-21 21:11 ` Jens Axboe
2020-08-22 0:08 ` Luke Hsiao
2020-08-22 1:17 ` Jens Axboe
2020-08-22 2:04 ` [PATCH net-next v2 1/2] io_uring: allow tcp ancillary data for __sys_recvmsg_sock() Luke Hsiao
2020-08-22 2:04 ` [PATCH net-next v2 2/2] io_uring: ignore POLLIN for recvmsg on MSG_ERRQUEUE Luke Hsiao
2020-08-22 2:08 ` Jens Axboe
2020-08-22 2:13 ` Luke Hsiao
2020-08-22 2:16 ` Jens Axboe
2020-08-22 4:41 ` [PATCH net-next v3 1/2] io_uring: allow tcp ancillary data for __sys_recvmsg_sock() Luke Hsiao
2020-08-22 4:41 ` [PATCH net-next v3 2/2] io_uring: ignore POLLIN for recvmsg on MSG_ERRQUEUE Luke Hsiao
2020-08-22 15:49 ` Jens Axboe
2020-08-24 23:16 ` David Miller
2020-08-24 23:16 ` [PATCH net-next v3 1/2] io_uring: allow tcp ancillary data for __sys_recvmsg_sock() David Miller
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=20200820234954.1784522-3-luke.w.hsiao@gmail.com \
--to=luke.w.hsiao@gmail.com \
--cc=arjunroy@google.com \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=lukehsiao@google.com \
--cc=netdev@vger.kernel.org \
--cc=soheil@google.com \
/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