From: Jens Axboe <axboe@kernel.dk>
To: io-uring@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 3/6] io_uring/eventfd: move actual signaling part into separate helper
Date: Sat, 21 Sep 2024 01:59:49 -0600 [thread overview]
Message-ID: <20240921080307.185186-4-axboe@kernel.dk> (raw)
In-Reply-To: <20240921080307.185186-1-axboe@kernel.dk>
In preparation for using this from multiple spots, move the signaling
into a helper.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
io_uring/eventfd.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/io_uring/eventfd.c b/io_uring/eventfd.c
index 829873806f9f..58e76f4d1e00 100644
--- a/io_uring/eventfd.c
+++ b/io_uring/eventfd.c
@@ -47,6 +47,22 @@ static void io_eventfd_put(struct io_ev_fd *ev_fd)
call_rcu(&ev_fd->rcu, io_eventfd_free);
}
+/*
+ * Returns true if the caller should put the ev_fd reference, false if not.
+ */
+static bool __io_eventfd_signal(struct io_ev_fd *ev_fd)
+{
+ if (eventfd_signal_allowed()) {
+ eventfd_signal_mask(ev_fd->cq_ev_fd, EPOLL_URING_WAKE);
+ return true;
+ }
+ if (!atomic_fetch_or(BIT(IO_EVENTFD_OP_SIGNAL_BIT), &ev_fd->ops)) {
+ call_rcu_hurry(&ev_fd->rcu, io_eventfd_do_signal);
+ return false;
+ }
+ return true;
+}
+
void io_eventfd_signal(struct io_ring_ctx *ctx)
{
struct io_ev_fd *ev_fd = NULL;
@@ -73,16 +89,8 @@ void io_eventfd_signal(struct io_ring_ctx *ctx)
return;
if (!refcount_inc_not_zero(&ev_fd->refs))
return;
-
- if (likely(eventfd_signal_allowed())) {
- eventfd_signal_mask(ev_fd->cq_ev_fd, EPOLL_URING_WAKE);
- } else {
- if (!atomic_fetch_or(BIT(IO_EVENTFD_OP_SIGNAL_BIT), &ev_fd->ops)) {
- call_rcu_hurry(&ev_fd->rcu, io_eventfd_do_signal);
- return;
- }
- }
- io_eventfd_put(ev_fd);
+ if (__io_eventfd_signal(ev_fd))
+ io_eventfd_put(ev_fd);
}
void io_eventfd_flush_signal(struct io_ring_ctx *ctx)
--
2.45.2
next prev parent reply other threads:[~2024-09-21 8:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-21 7:59 [PATCHSET next 0/6] Move eventfd cq tracking into io_ev_fd Jens Axboe
2024-09-21 7:59 ` [PATCH 1/6] io_uring/eventfd: abstract out ev_fd put helper Jens Axboe
2024-09-21 7:59 ` [PATCH 2/6] io_uring/eventfd: check for the need to async notifier earlier Jens Axboe
2024-09-21 7:59 ` Jens Axboe [this message]
2024-09-21 7:59 ` [PATCH 4/6] io_uring/eventfd: move trigger check into a helper Jens Axboe
2024-09-21 7:59 ` [PATCH 5/6] io_uring/eventfd: abstract out ev_fd grab + release helpers Jens Axboe
2024-09-21 7:59 ` [PATCH 6/6] io_uring/eventfd: move ctx->evfd_last_cq_tail into io_ev_fd Jens Axboe
2024-09-21 8:18 ` Jens Axboe
2024-09-30 14:28 ` [PATCHSET next 0/6] Move eventfd cq tracking " 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=20240921080307.185186-4-axboe@kernel.dk \
--to=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
/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