eventfd handling cleanups
Jens Axboe
maintainercover eventfd handling cleanups
Hi,
Patch 1 I ran into while doing other work, causing leaks. As far as I can tell, not triggerable in the current tree, but I do think the rewritten handling of eventfd is much better and more closely follows the expected RCU usage.
Patch 2 is just a cleanup on top. There's no reason to keep the eventfd code in both io_uring.c and register.c, move it to a separate file to avoid polluting the global space.
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 io_uring/eventfd: move to more idiomatic RCU free usage
In some ways, it just "happens to work" currently with using the ops field for both the free and signaling bit. But it depends on ordering of operations in terms of freeing and signaling. Clean it up and use the usual refs == 0 under RCU read side lock to determine if the ev_fd is still valid, and use the reference to gate the freeing as well.
--- io_uring/io_uring.c | 49 ++++++++++++++++++++++++--------------------- io_uring/io_uring.h | 4 ++-- io_uring/register.c | 6 +++--- 3 files changed, 31 insertions(+), 28 deletions(-)
io_uring/io_uring.c +26 -23
@@ -541,29 +541,33 @@ static __cold void io_queue_deferred(struct io_ring_ctx *ctx) } } -void io_eventfd_ops (struct rcu_head *rcu) +void io_eventfd_free (struct rcu_head *rcu) { struct io_ev_fd *ev_fd = container_of(rcu, struct io_ev_fd, rcu); -int ops =atomic_xchg (&ev_fd->ops,0 ); -if (ops &BIT (IO_EVENTFD_OP_SIGNAL_BIT )) -eventfd_signal_mask (ev_fd->cq_ev_fd,EPOLL_URING_WAKE ); +eventfd_ctx_put (ev_fd->cq_ev_fd); +kfree (ev_fd); +} -/* IO_EVENTFD_OP_FREE_BIT may not be set here depending on callback -* ordering in a race but if references are 0 we know we have to free -* it regardless. -*/ -if (atomic_dec_and_test (&ev_fd->refs)) { -eventfd_ctx_put (ev_fd->cq_ev_fd); -kfree (ev_fd); - } +void io_eventfd_do_signal (struct rcu_head *rcu) +{ + struct io_ev_fd *ev_fd = container_of(rcu, struct io_ev_fd, rcu); + +eventfd_signal_mask (ev_fd->cq_ev_fd,EPOLL_URING_WAKE ); + +if (atomic_dec_and_test (&ev_fd->refs)) +io_eventfd_free (rcu); }static void io_eventfd_signal (struct io_ring_ctx *ctx) {struct io_ev_fd *ev_fd =NULL ; -rcu_read_lock (); +if (READ_ONCE (ctx->rings->cq_flags) &IORING_CQ_EVENTFD_DISABLED ) +return ; + +guard (rcu)(); +/* * rcu_dereference ctx->io_ev_fd once and use it for both for checking * and eventfd_signal
@@ -576,24 +580,23 @@ static void io_eventfd_signal(struct io_ring_ctx *ctx)* the function and rcu_read_lock. */ if (unlikely (!ev_fd)) - goto out; -if (READ_ONCE (ctx->rings->cq_flags) &IORING_CQ_EVENTFD_DISABLED ) - goto out; +return ; +if (!atomic_inc_not_zero (&ev_fd->refs)) +return ;if (ev_fd->eventfd_async && !io_wq_current_is_worker ()) goto out;if (likely (eventfd_signal_allowed ())) {eventfd_signal_mask (ev_fd->cq_ev_fd,EPOLL_URING_WAKE ); }else { -atomic_inc (&ev_fd->refs); -if (!atomic_fetch_or (BIT (IO_EVENTFD_OP_SIGNAL_BIT ), &ev_fd->ops)) -call_rcu_hurry (&ev_fd->rcu, io_eventfd_ops); -else -atomic_dec (&ev_fd->refs); +if (!atomic_fetch_or (BIT (IO_EVENTFD_OP_SIGNAL_BIT ), &ev_fd->ops)) { +call_rcu_hurry (&ev_fd->rcu, io_eventfd_do_signal); +return ; + } } - out: -rcu_read_unlock (); +if (atomic_dec_and_test (&ev_fd->refs)) +call_rcu (&ev_fd->rcu, io_eventfd_free); }static void io_eventfd_flush_signal (struct io_ring_ctx *ctx)
io_uring/io_uring.h +2 -2
@@ -106,10 +106,10 @@ bool io_match_task_safe(struct io_kiocb *head, struct task_struct *task,enum {IO_EVENTFD_OP_SIGNAL_BIT , -IO_EVENTFD_OP_FREE_BIT , }; -void io_eventfd_ops (struct rcu_head *rcu); +void io_eventfd_do_signal (struct rcu_head *rcu); +void io_eventfd_free (struct rcu_head *rcu);void io_activate_pollwq (struct io_ring_ctx *ctx);static inline void io_lockdep_assert_cq_locked (struct io_ring_ctx *ctx)
io_uring/register.c +3 -3
@@ -63,9 +63,9 @@ static int io_eventfd_register(struct io_ring_ctx *ctx, void __user *arg, ev_fd->eventfd_async = eventfd_async; ctx->has_evfd = true; -rcu_assign_pointer (ctx->io_ev_fd, ev_fd);atomic_set (&ev_fd->refs,1 );atomic_set (&ev_fd->ops,0 ); +rcu_assign_pointer (ctx->io_ev_fd, ev_fd);return 0 ; }
@@ -78,8 +78,8 @@ int io_eventfd_unregister(struct io_ring_ctx *ctx)if (ev_fd) { ctx->has_evfd = false;rcu_assign_pointer (ctx->io_ev_fd,NULL ); -if (!atomic_fetch_or (BIT (IO_EVENTFD_OP_FREE_BIT ), &ev_fd->ops)) -call_rcu (&ev_fd->rcu, io_eventfd_ops); +if (atomic_dec_and_test (&ev_fd->refs)) +call_rcu (&ev_fd->rcu, io_eventfd_free);return 0 ; }
Signature · 1 line
2.43.0
Jens Axboe
maintainerPATCH 2/2 io_uring/eventfd: move eventfd handling to separate file
In reply to Jens AxboeThis is pretty nicely abstracted already, but let's move it to a separate file rather than have it in the main io_uring file. With that, we can also move the io_ev_fd struct and enum out of global scope.
--- include/linux/io_uring_types.h | 8 -- io_uring/Makefile | 6 +- io_uring/eventfd.c | 160 +++++++++++++++++++++++++++++++++ io_uring/eventfd.h | 8 ++ io_uring/io_uring.c | 82 +---------------- io_uring/io_uring.h | 6 -- io_uring/register.c | 56 +----------- 7 files changed, 173 insertions(+), 153 deletions(-) create mode 100644 io_uring/eventfd.c create mode 100644 io_uring/eventfd.h
include/linux/io_uring_types.h +0 -8
@@ -211,14 +211,6 @@ struct io_submit_state {struct blk_plug plug; }; -struct io_ev_fd { -struct eventfd_ctx *cq_ev_fd; -unsigned int eventfd_async:1 ; -struct rcu_head rcu; -atomic_t refs; -atomic_t ops; -}; -struct io_alloc_cache {void **entries;unsigned int nr_cached;
io_uring/Makefile +3 -3
@@ -4,9 +4,9 @@ obj-$(CONFIG_IO_URING) += io_uring.o opdef.o kbuf.o rsrc.o notif.o \ tctx.o filetable.o rw.o net.o poll.o \ - uring_cmd.o openclose.o sqpoll.o \ - xattr.o nop.o fs.o splice.o sync.o \ - msg_ring.o advise.o openclose.o \ + eventfd.o uring_cmd.o openclose.o \ + sqpoll.o xattr.o nop.o fs.o splice.o \ + sync.o msg_ring.o advise.o openclose.o \ epoll.o statx.o timeout.o fdinfo.o \ cancel.o waitid.o register.o \ truncate.o memmap.o
io_uring/eventfd.c new file +160 -0
160 lines not on this page · raw message
io_uring/eventfd.h new file +8 -0
@@ -0,0 +1,8 @@ + +struct io_ring_ctx ; +int io_eventfd_register (struct io_ring_ctx *ctx,void __user *arg, +unsigned int eventfd_async); +int io_eventfd_unregister (struct io_ring_ctx *ctx); + +void io_eventfd_flush_signal (struct io_ring_ctx *ctx); +void io_eventfd_signal (struct io_ring_ctx *ctx);
io_uring/io_uring.c +1 -81
94 lines not on this page · raw message
io_uring/io_uring.h +0 -6
@@ -104,12 +104,6 @@ bool __io_alloc_req_refill(struct io_ring_ctx *ctx);bool io_match_task_safe (struct io_kiocb *head,struct task_struct *task,bool cancel_all); -enum { -IO_EVENTFD_OP_SIGNAL_BIT , -}; - -void io_eventfd_do_signal (struct rcu_head *rcu); -void io_eventfd_free (struct rcu_head *rcu);void io_activate_pollwq (struct io_ring_ctx *ctx);static inline void io_lockdep_assert_cq_locked (struct io_ring_ctx *ctx)
io_uring/register.c +1 -55
66 lines not on this page · raw message
Signature · 1 line
2.43.0