From: Jan Kara <[email protected]>
To: Christian Brauner <[email protected]>
Cc: [email protected], Christoph Hellwig <[email protected]>,
Jan Kara <[email protected]>, Vitaly Kuznetsov <[email protected]>,
Sean Christopherson <[email protected]>,
Paolo Bonzini <[email protected]>,
Thomas Gleixner <[email protected]>,
Ingo Molnar <[email protected]>, Borislav Petkov <[email protected]>,
Dave Hansen <[email protected]>,
[email protected], David Woodhouse <[email protected]>,
Paul Durrant <[email protected]>, Oded Gabbay <[email protected]>,
Wu Hao <[email protected]>, Tom Rix <[email protected]>,
Moritz Fischer <[email protected]>, Xu Yilun <[email protected]>,
Zhenyu Wang <[email protected]>,
Zhi Wang <[email protected]>,
Jani Nikula <[email protected]>,
Joonas Lahtinen <[email protected]>,
Rodrigo Vivi <[email protected]>,
Tvrtko Ursulin <[email protected]>,
David Airlie <[email protected]>, Daniel Vetter <[email protected]>,
Leon Romanovsky <[email protected]>, Jason Gunthorpe <[email protected]>,
Frederic Barrat <[email protected]>,
Andrew Donnellan <[email protected]>,
Arnd Bergmann <[email protected]>,
Greg Kroah-Hartman <[email protected]>,
Eric Farman <[email protected]>,
Matthew Rosato <[email protected]>,
Halil Pasic <[email protected]>,
Vineeth Vijayan <[email protected]>,
Peter Oberparleiter <[email protected]>,
Heiko Carstens <[email protected]>,
Vasily Gorbik <[email protected]>,
Alexander Gordeev <[email protected]>,
Christian Borntraeger <[email protected]>,
Sven Schnelle <[email protected]>,
Tony Krowiak <[email protected]>,
Jason Herne <[email protected]>,
Harald Freudenberger <[email protected]>,
"Michael S. Tsirkin" <[email protected]>,
Jason Wang <[email protected]>,
Xuan Zhuo <[email protected]>,
Diana Craciun <[email protected]>,
Alex Williamson <[email protected]>,
Eric Auger <[email protected]>, Fei Li <[email protected]>,
Benjamin LaHaise <[email protected]>,
Johannes Weiner <[email protected]>,
Michal Hocko <[email protected]>,
Roman Gushchin <[email protected]>,
Shakeel Butt <[email protected]>,
Muchun Song <[email protected]>,
Kirti Wankhede <[email protected]>,
[email protected], [email protected],
[email protected], [email protected],
[email protected],
[email protected], [email protected],
[email protected], [email protected],
[email protected],
[email protected],
[email protected], [email protected],
[email protected], [email protected],
Jens Axboe <[email protected]>,
Pavel Begunkov <[email protected]>,
[email protected]
Subject: Re: [PATCH v2 3/4] eventfd: simplify eventfd_signal_mask()
Date: Wed, 22 Nov 2023 16:05:38 +0100 [thread overview]
Message-ID: <20231122150538.6zwikm3tymnkcdxf@quack3> (raw)
In-Reply-To: <[email protected]>
On Wed 22-11-23 13:48:24, Christian Brauner wrote:
> The eventfd_signal_mask() helper was introduced for io_uring and similar
> to eventfd_signal() it always passed 1 for @n. So don't bother with that
> argument at all.
>
> Signed-off-by: Christian Brauner <[email protected]>
Nice. Feel free to add:
Reviewed-by: Jan Kara <[email protected]>
Honza
> ---
> fs/eventfd.c | 7 ++++---
> include/linux/eventfd.h | 5 ++---
> io_uring/io_uring.c | 4 ++--
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/fs/eventfd.c b/fs/eventfd.c
> index dc9e01053235..a9a6de920fb4 100644
> --- a/fs/eventfd.c
> +++ b/fs/eventfd.c
> @@ -43,9 +43,10 @@ struct eventfd_ctx {
> int id;
> };
>
> -__u64 eventfd_signal_mask(struct eventfd_ctx *ctx, __u64 n, __poll_t mask)
> +__u64 eventfd_signal_mask(struct eventfd_ctx *ctx, __poll_t mask)
> {
> unsigned long flags;
> + __u64 n = 1;
>
> /*
> * Deadlock or stack overflow issues can happen if we recurse here
> @@ -68,7 +69,7 @@ __u64 eventfd_signal_mask(struct eventfd_ctx *ctx, __u64 n, __poll_t mask)
> current->in_eventfd = 0;
> spin_unlock_irqrestore(&ctx->wqh.lock, flags);
>
> - return n;
> + return n == 1;
> }
>
> /**
> @@ -84,7 +85,7 @@ __u64 eventfd_signal_mask(struct eventfd_ctx *ctx, __u64 n, __poll_t mask)
> */
> __u64 eventfd_signal(struct eventfd_ctx *ctx)
> {
> - return eventfd_signal_mask(ctx, 1, 0);
> + return eventfd_signal_mask(ctx, 0);
> }
> EXPORT_SYMBOL_GPL(eventfd_signal);
>
> diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h
> index 562089431551..4f8aac7eb62a 100644
> --- a/include/linux/eventfd.h
> +++ b/include/linux/eventfd.h
> @@ -36,7 +36,7 @@ struct file *eventfd_fget(int fd);
> struct eventfd_ctx *eventfd_ctx_fdget(int fd);
> struct eventfd_ctx *eventfd_ctx_fileget(struct file *file);
> __u64 eventfd_signal(struct eventfd_ctx *ctx);
> -__u64 eventfd_signal_mask(struct eventfd_ctx *ctx, __u64 n, __poll_t mask);
> +__u64 eventfd_signal_mask(struct eventfd_ctx *ctx, __poll_t mask);
> int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, wait_queue_entry_t *wait,
> __u64 *cnt);
> void eventfd_ctx_do_read(struct eventfd_ctx *ctx, __u64 *cnt);
> @@ -63,8 +63,7 @@ static inline int eventfd_signal(struct eventfd_ctx *ctx)
> return -ENOSYS;
> }
>
> -static inline int eventfd_signal_mask(struct eventfd_ctx *ctx, __u64 n,
> - unsigned mask)
> +static inline int eventfd_signal_mask(struct eventfd_ctx *ctx, unsigned mask)
> {
> return -ENOSYS;
> }
> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
> index ed254076c723..70170a41eac4 100644
> --- a/io_uring/io_uring.c
> +++ b/io_uring/io_uring.c
> @@ -558,7 +558,7 @@ static void io_eventfd_ops(struct rcu_head *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, 1, EPOLL_URING_WAKE);
> + eventfd_signal_mask(ev_fd->cq_ev_fd, EPOLL_URING_WAKE);
>
> /* 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
> @@ -594,7 +594,7 @@ static void io_eventfd_signal(struct io_ring_ctx *ctx)
> goto out;
>
> if (likely(eventfd_signal_allowed())) {
> - eventfd_signal_mask(ev_fd->cq_ev_fd, 1, EPOLL_URING_WAKE);
> + 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))
>
> --
> 2.42.0
>
--
Jan Kara <[email protected]>
SUSE Labs, CR
next prev parent reply other threads:[~2023-11-22 15:05 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 12:48 [PATCH v2 0/4] eventfd: simplify signal helpers Christian Brauner
2023-11-22 12:48 ` [PATCH v2 1/4] i915: make inject_virtual_interrupt() void Christian Brauner
2023-11-22 15:05 ` Jan Kara
2023-11-23 0:24 ` Zhenyu Wang
2023-11-23 13:11 ` Christian Brauner
2023-11-22 12:48 ` [PATCH v2 2/4] eventfd: simplify eventfd_signal() Christian Brauner
2023-11-22 14:49 ` Xu Yilun
2023-11-22 15:05 ` Jan Kara
2023-11-22 15:19 ` Jani Nikula
2023-11-23 13:18 ` Christian Brauner
2023-11-24 2:02 ` Andrew Donnellan
2023-11-27 16:17 ` Eric Farman
2024-02-06 19:44 ` Stefan Hajnoczi
2024-02-07 14:33 ` Anthony Krowiak
2024-02-07 14:34 ` Paolo Bonzini
2024-02-08 9:02 ` Christian Brauner
2023-11-22 12:48 ` [PATCH v2 3/4] eventfd: simplify eventfd_signal_mask() Christian Brauner
2023-11-22 15:05 ` Jan Kara [this message]
2023-11-22 12:48 ` [PATCH v2 4/4] eventfd: make eventfd_signal{_mask}() void Christian Brauner
2023-11-22 15:06 ` Jan Kara
2023-11-23 19:43 ` [PATCH v2 0/4] eventfd: simplify signal helpers Jens Axboe
2023-11-24 7:47 ` Christian Brauner
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=20231122150538.6zwikm3tymnkcdxf@quack3 \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[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