From: Hou Tao <houtao1@huawei.com>
To: <linux-fsdevel@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <viro@zeniv.linux.org.uk>,
<jbaron@akamai.com>, <oleg@redhat.com>, <dave@stgolabs.net>,
<koct9i@gmail.com>
Subject: [RFC][PATCH 3/8] epoll: remove file from tfile_check_list when releasing file
Date: Sat, 28 Oct 2017 20:58:22 +0800 [thread overview]
Message-ID: <1509195507-29037-4-git-send-email-houtao1@huawei.com> (raw)
In-Reply-To: <1509195507-29037-1-git-send-email-houtao1@huawei.com>
Before the removal of epmutex, the acquisition of epmutex in
eventpoll_release_file() will prevent the freeing of file, so
it's OK to iterate files in tfile_check_list.
And now epmutex is removed, so when releasing file, we need
to remove file from tfile_check_list to ensure the validity
of file.
Signed-off-by: Hou Tao <houtao1@huawei.com>
---
fs/eventpoll.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 44ea587..998c635 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1029,6 +1029,18 @@ void eventpoll_release_file(struct file *file)
ep_remove(ep, epi);
mutex_unlock(&ep->mtx);
}
+
+ /*
+ * The file can not been added to tfile_check_list again, because
+ * (1) its refcnt has been zero, so ep_ctrl() can no longer get its reference
+ * (2) its related ep items have been removed, so ep_loop_check_proc()
+ * can not get the file by ep->rbr
+ */
+ if (!list_empty_careful(&file->f_tfile_llink)) {
+ mutex_lock(&epmutex);
+ list_del_init(&file->f_tfile_llink);
+ mutex_unlock(&epmutex);
+ }
}
static int ep_alloc(struct eventpoll **pep)
--
2.7.5
next prev parent reply other threads:[~2017-10-28 12:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-28 12:58 [RFC][PATCH 0/8] epoll: remove epmutex from ep_free() and eventpoll_release_file() for non-nested case Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 1/8] epoll: remove epmutex from ep_free() & eventpoll_release_file() Hou Tao
2017-10-28 13:58 ` Davidlohr Bueso
2017-10-30 7:09 ` Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 2/8] epoll: remove ep from visited_list when freeing ep Hou Tao
2017-10-28 12:58 ` Hou Tao [this message]
2017-10-28 12:58 ` [RFC][PATCH 4/8] epoll: free eventpoll by rcu to provide existence guarantee Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 5/8] epoll: iterate epi in file->f_ep_links by using list_first_or_null_rcu Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 6/8] epoll: ensure the validity of ep when removing epi in eventpoll_release_file() Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 7/8] epoll: prevent the double-free of " Hou Tao
2017-10-28 12:58 ` [RFC][PATCH 8/8] epoll: protect the iteration of ep->rbr by ep->mtx in ep_free() Hou Tao
2017-10-31 13:01 ` [RFC][PATCH 0/8] epoll: remove epmutex from ep_free() and eventpoll_release_file() for non-nested case Davidlohr Bueso
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=1509195507-29037-4-git-send-email-houtao1@huawei.com \
--to=houtao1@huawei.com \
--cc=dave@stgolabs.net \
--cc=jbaron@akamai.com \
--cc=koct9i@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/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;
as well as URLs for NNTP newsgroup(s).