From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33BDDC61D9B for ; Wed, 22 Nov 2023 15:06:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EBCC6B062A; Wed, 22 Nov 2023 10:06:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A0046B062C; Wed, 22 Nov 2023 10:06:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44F446B062D; Wed, 22 Nov 2023 10:06:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 2C1076B062C for ; Wed, 22 Nov 2023 10:06:41 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EB9621A0C91 for ; Wed, 22 Nov 2023 15:06:40 +0000 (UTC) X-FDA: 81485916960.04.D7F2019 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf25.hostedemail.com (Postfix) with ESMTP id D2D92A00F5; Wed, 22 Nov 2023 15:05:40 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ZcrRoEFw; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=LyVeT+mO; spf=pass (imf25.hostedemail.com: domain of jack@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1700665542; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mhP7e+31Z9+nB58srBCpzmS+Md5+Kp/dzX7wM4wK75A=; b=OBTRx0ASdFL1FCt9gKskyX42oyzqE8NiKPjf4wXLliiVyJ+B1A/SiQ8KkL8JI/jvRgABrS Hkps9C3+/WPE4u+Eon17qil7aKgGrtYonv53stdHaApZKFqohnsMSFHSLnspQnAdzVFNB6 nrMIsj26sTWZHGNYJ1ibFDXAEVGb3DI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1700665542; a=rsa-sha256; cv=none; b=MjN+1di4g7Ftk3WH+eOMllV/C/Ig00FJQeiaVQfVOZmuQluW0wfHO6ofumafLFTVvsCZFw 8lqyNbSmQkNzE9ji3136iqNbCgFyE7dtmFUCCWF18HQ5ni0VQ1ZDz6hDm81myeCp1mWqkl f8PS1FeTbqwWwOjR8q7lY+hjqcvzZfI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=ZcrRoEFw; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=LyVeT+mO; spf=pass (imf25.hostedemail.com: domain of jack@suse.cz designates 195.135.220.28 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8A0A721980; Wed, 22 Nov 2023 15:05:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1700665539; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mhP7e+31Z9+nB58srBCpzmS+Md5+Kp/dzX7wM4wK75A=; b=ZcrRoEFwpxJc4wiCEvI5Z6vwSDJRa19aPELohVHLwMcw/gKwapwnuXIaHRJa9vJ+tGL1AJ Ls/CVRotqPlYPG1beOQ8VFeXwe0gt0ftJwH4JcQAtaS9xH9WKxGamyRLuJd3y322CCYv9r qS0Bj5Pp3oItCpC7oV5QKyBTiYqDYO0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1700665539; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mhP7e+31Z9+nB58srBCpzmS+Md5+Kp/dzX7wM4wK75A=; b=LyVeT+mOky5Yb8PakQHBxFNY5YlaGwagm+iIpbHOizt4yAof2fpPH820159ugYTF4DZisp oyqigpl/uBuPcDAQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5FF60139FD; Wed, 22 Nov 2023 15:05:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id e0laF8MYXmVpGgAAMHmgww (envelope-from ); Wed, 22 Nov 2023 15:05:39 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id F216FA07DC; Wed, 22 Nov 2023 16:05:38 +0100 (CET) Date: Wed, 22 Nov 2023 16:05:38 +0100 From: Jan Kara To: Christian Brauner Cc: linux-fsdevel@vger.kernel.org, Christoph Hellwig , Jan Kara , Vitaly Kuznetsov , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, David Woodhouse , Paul Durrant , Oded Gabbay , Wu Hao , Tom Rix , Moritz Fischer , Xu Yilun , Zhenyu Wang , Zhi Wang , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Leon Romanovsky , Jason Gunthorpe , Frederic Barrat , Andrew Donnellan , Arnd Bergmann , Greg Kroah-Hartman , Eric Farman , Matthew Rosato , Halil Pasic , Vineeth Vijayan , Peter Oberparleiter , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Tony Krowiak , Jason Herne , Harald Freudenberger , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Diana Craciun , Alex Williamson , Eric Auger , Fei Li , Benjamin LaHaise , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Kirti Wankhede , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-fpga@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-rdma@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-usb@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-aio@kvack.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Jens Axboe , Pavel Begunkov , io-uring@vger.kernel.org Subject: Re: [PATCH v2 3/4] eventfd: simplify eventfd_signal_mask() Message-ID: <20231122150538.6zwikm3tymnkcdxf@quack3> References: <20231122-vfs-eventfd-signal-v2-0-bd549b14ce0c@kernel.org> <20231122-vfs-eventfd-signal-v2-3-bd549b14ce0c@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231122-vfs-eventfd-signal-v2-3-bd549b14ce0c@kernel.org> X-Rspamd-Queue-Id: D2D92A00F5 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: hit9raentchwndts4fwqqf4apyis1ak9 X-HE-Tag: 1700665540-272970 X-HE-Meta: U2FsdGVkX1/y1Az9htzlyb0hSuX5OS+5DzYaLzov+y5lGO61fyHVBX04k556UP4iP+2xYiIoC/gs7i8SPat+sXlfsDohrHBUWXX8qcK6Zl4XSSxcMm6r02Wg9JCArio8MxXQIJ0f+/Kkwb+2bjh3KOiyiwnwg8g0f3Y/zcfHdH1aUUXRCo9XcV4g0wgxAtKjR2QABLv/MXwLF9bOP9tA4fa+o0kH4/RrpyR6weGfq02L0VpeN5WQEZ6tYk5+TBX4UrGru3XL7nJ48FyX88cLheXihzDlqVE9K0dXHNvuoDyh52P+342prKpMw65UQS4RWb+onwSMJlus/lUnAKBCsCQ3dDnVjChqv/ZaHF9cxuTkoGjrLkkLG8m/drfkWuA2xL5B2XaRHAeiv6NPlGNnQQNLE/Ep7TdiPFGSw7Vkpos49+oGPDrHfTR9C45v5cVIwwlEl4/WNaudsPdWfLKE5F3ctNm7OSG4fL31kqyh8ns/PQlMmTQjBreA6xpxvh9fCRghodi8eKcCFHIIBi05se4Z3/fDTq+4Xw2Xb+c4gfQf+LByuAlgR4e6OHT3AkhhJlrvxT66Xj/B/bPfLyC48uvBq7+/WIay30uL6X+GRF9/OBCkkv8ladg3ipk062HcuknL3dMl+4XNYHOLjhd/TsM8iUppQZjbFAxGq0EaHDlADgMepKVSSFNVvO8vQCoW9Q03DY++c93EZL+Wqw/IGYUmhT1Zf27sjF3uFPKePf4zssjVLJjZC5qirI/e1VgrTSl7paETl7bvnBsfZH1tU1kQmK1tFxlKez0N9L4bZknnkCeDbWzjSVAEUokro/abPKy3+/8nt6XwYqwJ2zGo83+CNRFrke/9TRrIFWHXk0V5hfvjlqcH8QRcURbl6gzZrtLNWb35Gxu1Zqw7AyuAiTrDH2KI5HS6owlJlibEbP4+1tYcObwSBEUBRldaSJOY1amysajsTBEaAIre7cU H/yfgYEk jOoBj6NR/juuddBEKYbxv8O2zxgz9AQCtZRWCxgbqpDPvoNgjwa2gjcUalhSMfTy+E/OpiHA09tNkR6aPJ5hBKUziNNWBxwIFKjOsiIgR3rpdcgGXgste6EaSQLgi3goP1CY1EQ1dHe/13j4N3eYWspw9akJEVWHQ7DgAeTaI3Jd7BW0Xhwg5sgZHVtAT5DdZzdKYzemhQJTBaPnfQLJVzr3pMkQqfUzR+LfN61h5abAlCv1fk/tMRxPnmfgjzt7YAQWoRXAAY5L3g75ekEYT/hoKsd4EPJj1dssOaOsDtdktAJ31Z1yyfGctIbhAf+8Kykt4KTeiRXg7pg6x+vX3WMQjqHg4PJQ/A00/MdgW6W5x8MdWAJUOccHsvmO2Lg04V9F8UDIXTz4xwE7HabfcG6RF3MnWbhHLIgHTJWEjCAm8ncOcxwjUhraX+g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 Nice. Feel free to add: Reviewed-by: Jan Kara 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 SUSE Labs, CR