mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
ksm: unmerge is an origin of OOMs
Just as the swapoff system call allocates many pages of RAM to various processes, perhaps triggering OOM, so "echo 2 >/sys/kernel/mm/ksm/run" (unmerge) is liable to allocate many pages of RAM to various processes, perhaps triggering OOM; and each is normally run from a modest admin process (swapoff or shell), easily repeated until it succeeds. So treat unmerge_and_remove_all_rmap_items() in the same way that we treat try_to_unuse(): generalize PF_SWAPOFF to PF_OOM_ORIGIN, and bracket both with that, to ask the OOM killer to kill them first, to prevent them from spawning more and more OOM kills. Signed-off-by: Hugh Dickins <[email protected]> Acked-by: Izik Eidus <[email protected]> Cc: Andrea Arcangeli <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
a913e182ab
commit
35451beecb
4 changed files with 6 additions and 4 deletions
|
|
@ -1575,9 +1575,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
|
|||
p->flags &= ~SWP_WRITEOK;
|
||||
spin_unlock(&swap_lock);
|
||||
|
||||
current->flags |= PF_SWAPOFF;
|
||||
current->flags |= PF_OOM_ORIGIN;
|
||||
err = try_to_unuse(type);
|
||||
current->flags &= ~PF_SWAPOFF;
|
||||
current->flags &= ~PF_OOM_ORIGIN;
|
||||
|
||||
if (err) {
|
||||
/* re-insert swap space back into swap_list */
|
||||
|
|
|
|||
Loading…
Reference in a new issue