Re: [PATCH] oom, memcg: handle sysctl oom_kill_allocating_task while memcg oom happening
From: Ni zhan Chen <hidden>
Date: 2012-10-16 10:20:31
Also in:
cgroups, lkml
On 10/16/2012 06:12 PM, Sha Zhengju wrote:
From: Sha Zhengju <redacted> Sysctl oom_kill_allocating_task enables or disables killing the OOM-triggering task in out-of-memory situations, but it only works on overall system-wide oom. But it's also a useful indication in memcg so we take it into consideration while oom happening in memcg. Other sysctl such as panic_on_oom has already been memcg-ware.
Is it the resend one or new version, could you add changelog if it is the last case?
quoted hunk ↗ jump to hunk
Signed-off-by: Sha Zhengju <redacted> --- mm/memcontrol.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e4e9b18..c329940 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c@@ -1486,6 +1486,15 @@ static void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL); totalpages = mem_cgroup_get_limit(memcg) >> PAGE_SHIFT ? : 1; + if (sysctl_oom_kill_allocating_task && current->mm && + !oom_unkillable_task(current, memcg, NULL) && + current->signal->oom_score_adj != OOM_SCORE_ADJ_MIN) { + get_task_struct(current); + oom_kill_process(current, gfp_mask, order, 0, totalpages, memcg, NULL, + "Memory cgroup out of memory (oom_kill_allocating_task)"); + return; + } + for_each_mem_cgroup_tree(iter, memcg) { struct cgroup *cgroup = iter->css.cgroup; struct cgroup_iter it;
-- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>