aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/memcontrol.h2
-rw-r--r--include/linux/oom.h3
-rw-r--r--mm/memcontrol.c15
-rw-r--r--mm/oom_kill.c23
4 files changed, 18 insertions, 25 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 2a80544aec99..5a3ee6423634 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -180,8 +180,6 @@ static inline void mem_cgroup_dec_page_stat(struct page *page,
180unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, 180unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
181 gfp_t gfp_mask, 181 gfp_t gfp_mask,
182 unsigned long *total_scanned); 182 unsigned long *total_scanned);
183extern void __mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
184 int order);
185 183
186void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx); 184void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx);
187#ifdef CONFIG_TRANSPARENT_HUGEPAGE 185#ifdef CONFIG_TRANSPARENT_HUGEPAGE
diff --git a/include/linux/oom.h b/include/linux/oom.h
index 5dc0e384ae9e..49a3031fda50 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -61,6 +61,9 @@ extern void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
61extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags); 61extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
62extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags); 62extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);
63 63
64extern void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
65 int order, const nodemask_t *nodemask);
66
64extern enum oom_scan_t oom_scan_process_thread(struct task_struct *task, 67extern enum oom_scan_t oom_scan_process_thread(struct task_struct *task,
65 unsigned long totalpages, const nodemask_t *nodemask, 68 unsigned long totalpages, const nodemask_t *nodemask,
66 bool force_kill); 69 bool force_kill);
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 77a29cea5d76..0f692a2dbfcb 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1469,8 +1469,8 @@ static u64 mem_cgroup_get_limit(struct mem_cgroup *memcg)
1469 return min(limit, memsw); 1469 return min(limit, memsw);
1470} 1470}
1471 1471
1472void __mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, 1472void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
1473 int order) 1473 int order)
1474{ 1474{
1475 struct mem_cgroup *iter; 1475 struct mem_cgroup *iter;
1476 unsigned long chosen_points = 0; 1476 unsigned long chosen_points = 0;
@@ -1478,6 +1478,17 @@ void __mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
1478 unsigned int points = 0; 1478 unsigned int points = 0;
1479 struct task_struct *chosen = NULL; 1479 struct task_struct *chosen = NULL;
1480 1480
1481 /*
1482 * If current has a pending SIGKILL, then automatically select it. The
1483 * goal is to allow it to allocate so that it may quickly exit and free
1484 * its memory.
1485 */
1486 if (fatal_signal_pending(current)) {
1487 set_thread_flag(TIF_MEMDIE);
1488 return;
1489 }
1490
1491 check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL);
1481 totalpages = mem_cgroup_get_limit(memcg) >> PAGE_SHIFT ? : 1; 1492 totalpages = mem_cgroup_get_limit(memcg) >> PAGE_SHIFT ? : 1;
1482 for_each_mem_cgroup_tree(iter, memcg) { 1493 for_each_mem_cgroup_tree(iter, memcg) {
1483 struct cgroup *cgroup = iter->css.cgroup; 1494 struct cgroup *cgroup = iter->css.cgroup;
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index a3a32ae02e9d..198600861638 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -556,8 +556,8 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
556/* 556/*
557 * Determines whether the kernel must panic because of the panic_on_oom sysctl. 557 * Determines whether the kernel must panic because of the panic_on_oom sysctl.
558 */ 558 */
559static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask, 559void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
560 int order, const nodemask_t *nodemask) 560 int order, const nodemask_t *nodemask)
561{ 561{
562 if (likely(!sysctl_panic_on_oom)) 562 if (likely(!sysctl_panic_on_oom))
563 return; 563 return;
@@ -575,25 +575,6 @@ static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,
575 sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide"); 575 sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide");
576} 576}
577 577
578#ifdef CONFIG_MEMCG
579void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
580 int order)
581{
582 /*
583 * If current has a pending SIGKILL, then automatically select it. The
584 * goal is to allow it to allocate so that it may quickly exit and free
585 * its memory.
586 */
587 if (fatal_signal_pending(current)) {
588 set_thread_flag(TIF_MEMDIE);
589 return;
590 }
591
592 check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL);
593 __mem_cgroup_out_of_memory(memcg, gfp_mask, order);
594}
595#endif
596
597static BLOCKING_NOTIFIER_HEAD(oom_notify_list); 578static BLOCKING_NOTIFIER_HEAD(oom_notify_list);
598 579
599int register_oom_notifier(struct notifier_block *nb) 580int register_oom_notifier(struct notifier_block *nb)