public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH v2 3/6] io_uring: trigger eventfd for IOPOLL
Date: Mon,  4 Jan 2021 01:59:16 +0000	[thread overview]
Message-ID: <46d2507d1c704ed5189b9327767db767c617ff03.1609725418.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>

Make sure io_iopoll_complete() tries to wake up eventfd, which currently
is skipped together with io_cqring_ev_posted() for non-SQPOLL IOPOLL.

Add an iopoll version of io_cqring_ev_posted(), duplicates a bit of
code, but they actually use different sets of wait queues may be for
better.

Signed-off-by: Pavel Begunkov <[email protected]>
---
 fs/io_uring.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index cacb14246dbb..2beb1e72302d 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1715,6 +1715,16 @@ static void io_cqring_ev_posted(struct io_ring_ctx *ctx)
 		eventfd_signal(ctx->cq_ev_fd, 1);
 }
 
+static void io_cqring_ev_posted_iopoll(struct io_ring_ctx *ctx)
+{
+	if (ctx->flags & IORING_SETUP_SQPOLL) {
+		if (waitqueue_active(&ctx->wait))
+			wake_up(&ctx->wait);
+	}
+	if (io_should_trigger_evfd(ctx))
+		eventfd_signal(ctx->cq_ev_fd, 1);
+}
+
 /* Returns true if there are no backlogged entries after the flush */
 static bool io_cqring_overflow_flush(struct io_ring_ctx *ctx, bool force,
 				     struct task_struct *tsk,
@@ -2427,8 +2437,7 @@ static void io_iopoll_complete(struct io_ring_ctx *ctx, unsigned int *nr_events,
 	}
 
 	io_commit_cqring(ctx);
-	if (ctx->flags & IORING_SETUP_SQPOLL)
-		io_cqring_ev_posted(ctx);
+	io_cqring_ev_posted_iopoll(ctx);
 	io_req_free_batch_finish(ctx, &rb);
 
 	if (!list_empty(&again))
-- 
2.24.0


  parent reply	other threads:[~2021-01-04  2:03 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-04  1:59 [PATCH v2 0/6] bunch of random fixes Pavel Begunkov
2021-01-04  1:59 ` [PATCH v2 1/6] io_uring: drop file refs after task cancel Pavel Begunkov
2021-01-04  1:59 ` [PATCH v2 2/6] io_uring: cancel more aggressively in exit_work Pavel Begunkov
2021-01-04  1:59 ` Pavel Begunkov [this message]
2021-01-04  1:59 ` [PATCH v2 4/6] io_uring: dont kill fasync under completion_lock Pavel Begunkov
2021-01-04  1:59 ` [PATCH v2 5/6] io_uring: synchronise IOPOLL on task_submit fail Pavel Begunkov
2021-01-04  1:59 ` [PATCH v2 6/6] io_uring: patch up IOPOLL overflow_flush sync Pavel Begunkov
2021-01-04 16:27 ` [PATCH v2 0/6] bunch of random fixes Pavel Begunkov

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=46d2507d1c704ed5189b9327767db767c617ff03.1609725418.git.asml.silence@gmail.com \
    [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