The patch titled
Subject: mm/oom_kill: wake futex waiters before annihilating victim shared mutex
has been removed from the -mm tree. Its filename was
mm-oom_kill-wake-futex-waiters-before-annihilating-victim-shared-mutex.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Joel Savitz <jsavitz@xxxxxxxxxx>
Subject: mm/oom_kill: wake futex waiters before annihilating victim shared mutex
In the case that two or more processes share a futex located within a
shared mmaped region, such as a process that shares a lock between itself
and a number of child processes, we have observed that when a process
holding the lock is oom killed, at least one waiter is never alerted to
this new development and simply continues to wait.
This is visible via pthreads by checking the __owner field of the
pthread_mutex_t structure within a waiting process, perhaps with gdb.
We identify reproduction of this issue by checking a waiting process of a
test program and viewing the contents of the pthread_mutex_t, taking note
of the value in the owner field, and then checking dmesg to see if the
owner has already been killed.
This issue can be tricky to reproduce, but with the modifications of this
small patch, I have found it to be impossible to reproduce. There may be
additional considerations that I have not taken into account in this patch
and I welcome any comments and criticism.
Link: https://lkml.kernel.org/r/20211208181714.880312-1-jsavitz@xxxxxxxxxx
Co-developed-by: Nico Pache <npache@xxxxxxxxxx>
Signed-off-by: Nico Pache <npache@xxxxxxxxxx>
Signed-off-by: Joel Savitz <jsavitz@xxxxxxxxxx>
Cc: Waiman Long <longman@xxxxxxxxxx>
Cc: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Darren Hart <dvhart@xxxxxxxxxxxxx>
Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx>
Cc: Andr Almeida <andrealmeid@xxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/oom_kill.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- a/mm/oom_kill.c~mm-oom_kill-wake-futex-waiters-before-annihilating-victim-shared-mutex
+++ a/mm/oom_kill.c
@@ -44,6 +44,7 @@
#include <linux/kthread.h>
#include <linux/init.h>
#include <linux/mmu_notifier.h>
+#include <linux/futex.h>
#include <asm/tlb.h>
#include "internal.h"
@@ -886,6 +887,11 @@ static void __oom_kill_process(struct ta
memcg_memory_event_mm(mm, MEMCG_OOM_KILL);
/*
+ * We call futex_exit_release() on the victim task to ensure any waiters on any
+ * process-shared futexes held by the victim task are woken up.
+ */
+ futex_exit_release(victim);
+ /*
* We should send SIGKILL before granting access to memory reserves
* in order to prevent the OOM victim from depleting the memory
* reserves from the user space under its control.
@@ -930,6 +936,12 @@ static void __oom_kill_process(struct ta
*/
if (unlikely(p->flags & PF_KTHREAD))
continue;
+ /*
+ * We call futex_exit_release() on any task p sharing the
+ * victim->mm to ensure any waiters on any
+ * process-shared futexes held by task p are woken up.
+ */
+ futex_exit_release(p);
do_send_sig_info(SIGKILL, SEND_SIG_PRIV, p, PIDTYPE_TGID);
}
rcu_read_unlock();
_
Patches currently in -mm which might be from jsavitz@xxxxxxxxxx are
