diff options
author | Hugh Dickins <hugh.dickins@tiscali.co.uk> | 2009-09-21 20:02:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:33 -0400 |
commit | 35451beecbd7c86ce3249d543594517a5fe9a0cd (patch) | |
tree | e72759e6e6fcd142ab85c607a9b3dd3e1c016eed /mm/ksm.c | |
parent | a913e182ab9484308e870af37a14d372742d53b0 (diff) |
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 <hugh.dickins@tiscali.co.uk>
Acked-by: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/ksm.c')
-rw-r--r-- | mm/ksm.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1557,7 +1557,9 @@ static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr, | |||
1557 | if (ksm_run != flags) { | 1557 | if (ksm_run != flags) { |
1558 | ksm_run = flags; | 1558 | ksm_run = flags; |
1559 | if (flags & KSM_RUN_UNMERGE) { | 1559 | if (flags & KSM_RUN_UNMERGE) { |
1560 | current->flags |= PF_OOM_ORIGIN; | ||
1560 | err = unmerge_and_remove_all_rmap_items(); | 1561 | err = unmerge_and_remove_all_rmap_items(); |
1562 | current->flags &= ~PF_OOM_ORIGIN; | ||
1561 | if (err) { | 1563 | if (err) { |
1562 | ksm_run = KSM_RUN_STOP; | 1564 | ksm_run = KSM_RUN_STOP; |
1563 | count = err; | 1565 | count = err; |