The commit is pushed to "branch-rh7-3.10.0-327.10.1.vz7.12.x-ovz" and will
appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.10.1.vz7.12.3
------>
commit 78d0a4fc51ec8c2cd99fcc735ecce2614c7cd4eb
Author: Vladimir Davydov <[email protected]>
Date: Fri Mar 18 15:20:05 2016 +0400
exit: clear TIF_MEMDIE after exit_task_work
An mm_struct may be pinned by a file. An example is vhost-net device
created by a qemu/kvm (see vhost_net_ioctl -> vhost_net_set_owner ->
vhost_dev_set_owner). If such process gets OOM-killed, the reference to
its mm_struct will only be released from exit_task_work -> ____fput ->
__fput -> vhost_net_release -> vhost_dev_cleanup, which is called after
exit_mmap, where TIF_MEMDIE is cleared. As a result, we can start
selecting the next victim before giving the last one a chance to free
its memory. In practice, this leads to killing several VMs along with
the fattest one.
https://jira.sw.ru/browse/PSBM-44683
Signed-off-by: Vladimir Davydov <[email protected]>
Reviewed-by: Kirill Tkhai <[email protected]>
khorenko@: Volodya tried to send this upstream, but the fix was not applied:
https://lkml.org/lkml/2016/2/29/537
The patch was rejected because in ms it increases chances for deadlock:
someone takes a lock A->tries to alloc memory->no memory->calls OOM->
OOM selects a task->task requires lock A in order to die-> deadlock.
Better solution has not been implemented in ms, we are appliying the current
patch because we have a timeout against such a deadlock: in case OOM cannot
kill a task in X secs, the OOM caller drops locks and tries to allocate
memory
once again.
---
kernel/exit.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/kernel/exit.c b/kernel/exit.c
index 1cc765b..2715dc1 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -520,8 +520,6 @@ static void exit_mm(struct task_struct * tsk)
task_unlock(tsk);
mm_update_next_owner(mm);
mmput(mm);
- if (test_thread_flag(TIF_MEMDIE))
- exit_oom_victim();
}
/*
@@ -819,6 +817,10 @@ void do_exit(long code)
exit_fs(tsk);
exit_task_namespaces(tsk);
exit_task_work(tsk);
+
+ if (test_thread_flag(TIF_MEMDIE))
+ exit_oom_victim();
+
check_stack_usage();
exit_thread();
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
