diff mbox series

[RFC,26/27] epoll: massage the check list insertion

Message ID	20201004023929.2740074-26-viro@ZenIV.linux.org.uk (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=aLzn=DL=vger.kernel.org=linux-fsdevel-owner@kernel.org> From: Al Viro <viro@ZenIV.linux.org.uk> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Marc Zyngier <maz@kernel.org> Subject: [RFC PATCH 26/27] epoll: massage the check list insertion Date: Sun, 4 Oct 2020 03:39:28 +0100 Message-Id: <20201004023929.2740074-26-viro@ZenIV.linux.org.uk> In-Reply-To: <20201004023929.2740074-1-viro@ZenIV.linux.org.uk> References: <20201004023608.GM3421308@ZenIV.linux.org.uk> <20201004023929.2740074-1-viro@ZenIV.linux.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro <viro@ftp.linux.org.uk> Precedence: bulk
Series	[RFC,01/27] epoll: switch epitem->pwqlist to single-linked list \| expand [RFC,01/27] epoll: switch epitem->pwqlist to single-linked list [RFC,02/27] epoll: get rid of epitem->nwait [RFC,03/27] untangling ep_call_nested(): get rid of useless arguments [RFC,05/27] untangling ep_call_nested(): take pushing cookie into a helper [RFC,06/27] untangling ep_call_nested(): move push/pop of cookie into the callbacks [RFC,08/27] reverse_path_check_proc(): sane arguments [RFC,09/27] reverse_path_check_proc(): don't bother with cookies [RFC,10/27] clean reverse_path_check_proc() a bit [RFC,11/27] ep_loop_check_proc(): lift pushing the cookie into callers [RFC,12/27] get rid of ep_push_nested() [RFC,13/27] ep_loop_check_proc(): saner calling conventions [RFC,14/27] ep_scan_ready_list(): prepare to splitup [RFC,15/27] lift the calls of ep_read_events_proc() into the callers [RFC,16/27] lift the calls of ep_send_events_proc() into the callers [RFC,17/27] ep_send_events_proc(): fold into the caller [RFC,18/27] lift locking/unlocking ep->mtx out of ep_{start,done}_scan() [RFC,19/27] ep_insert(): don't open-code ep_remove() on failure exits [RFC,20/27] ep_insert(): we only need tep->mtx around the insertion itself [RFC,21/27] take the common part of ep_eventpoll_poll() and ep_item_poll() into helper [RFC,22/27] fold ep_read_events_proc() into the only caller [RFC,23/27] ep_insert(): move creation of wakeup source past the fl_ep_links insertion [RFC,24/27] convert ->f_ep_links/->fllink to hlist [RFC,25/27] lift rcu_read_lock() into reverse_path_check() [RFC,26/27] epoll: massage the check list insertion [RFC,27/27] epoll: take epitem list out of struct file

Commit Message

Al Viro Oct. 4, 2020, 2:39 a.m. UTC

From: Al Viro <viro@zeniv.linux.org.uk>

in the "non-epoll target" cases do it in ep_insert() rather than
in do_epoll_ctl(), so that we do it only with some epitem is already
guaranteed to exist.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/eventpoll.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 8a7ad752befd..eea269670168 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1375,6 +1375,10 @@  static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,
 	spin_lock(&tfile->f_lock);
 	hlist_add_head_rcu(&epi->fllink, &tfile->f_ep_links);
 	spin_unlock(&tfile->f_lock);
+	if (full_check && !tep) {
+		get_file(tfile);
+		list_add(&tfile->f_tfile_llink, &tfile_check_list);
+	}
 
 	/*
 	 * Add the current item to the RB tree. All RB tree operations are
@@ -2013,10 +2017,6 @@  int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
 				error = -ELOOP;
 				if (ep_loop_check(ep, tep) != 0)
 					goto error_tgt_fput;
-			} else {
-				get_file(tf.file);
-				list_add(&tf.file->f_tfile_llink,
-							&tfile_check_list);
 			}
 			error = epoll_mutex_lock(&ep->mtx, 0, nonblock);
 			if (error)