Skip to contentSkip to conversation

epoll-ep_autoremove_wake_function-should-use-list_del_init_careful.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Jun 7, 2023 Stable branch

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: epoll: ep_autoremove_wake_function should use list_del_init_careful
has been removed from the -mm tree. Its filename was
epoll-ep_autoremove_wake_function-should-use-list_del_init_careful.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Benjamin Segall <[email protected]>
Subject: epoll: ep_autoremove_wake_function should use list_del_init_careful
Date: Tue, 30 May 2023 11:32:28 -0700

autoremove_wake_function uses list_del_init_careful, so should epoll's more aggressive variant. It only doesn't because it was copied from an older wait.c rather than the most recent.

[[email protected]: add comment]
Fixes a16ceb139610 ("epoll: autoremove wakers even more aggressively")
Cc Al Viro <[email protected]>
Cc Christian Brauner <[email protected]>

---

 fs/eventpoll.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
fs/eventpoll.c renamed from fs/eventpoll.c~epoll-ep_autoremove_wake_function-should-use-list_del_init_careful +5 -1
@@ -1805,7 +1805,11 @@ static int ep_autoremove_wake_function(s
 {
 	int ret = default_wake_function(wq_entry, mode, sync, key);
 
-	list_del_init(&wq_entry->entry);
+	/*
+	 * Pairs with list_empty_careful in ep_poll, and ensures future loop
+	 * iterations see the cause of this wakeup.
+	 */
+	list_del_init_careful(&wq_entry->entry);
 	return ret;
 }
 

_

Patches currently in -mm which might be from [email protected] are