Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 876aafbf authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds
Browse files

mm, memcg: move all oom handling to memcontrol.c 



By globally defining check_panic_on_oom(), the memcg oom handler can be
moved entirely to mm/memcontrol.c.  This removes the ugly #ifdef in the
oom killer and cleans up the code.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6b0c81b3

include/linux/memcontrol.h

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ static inline void mem_cgroup_dec_page_stat(struct page *page, 
unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,

						gfp_t gfp_mask,

						unsigned long *total_scanned);

extern void __mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,

				       int order);



void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx);

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

include/linux/oom.h

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ extern void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, 
extern int try_set_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);

extern void clear_zonelist_oom(struct zonelist *zonelist, gfp_t gfp_flags);



extern void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,

			       int order, const nodemask_t *nodemask);



extern enum oom_scan_t oom_scan_process_thread(struct task_struct *task,

		unsigned long totalpages, const nodemask_t *nodemask,

		bool force_kill);

mm/memcontrol.c

+13 −2
Original line number Diff line number Diff line
@@ -1469,7 +1469,7 @@ static u64 mem_cgroup_get_limit(struct mem_cgroup *memcg) 
	return min(limit, memsw);

}



void __mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,

void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,

			      int order)

{

	struct mem_cgroup *iter;
@@ -1478,6 +1478,17 @@ void __mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask, 
	unsigned int points = 0;

	struct task_struct *chosen = NULL;



	/*

	 * If current has a pending SIGKILL, then automatically select it.  The

	 * goal is to allow it to allocate so that it may quickly exit and free

	 * its memory.

	 */

	if (fatal_signal_pending(current)) {

		set_thread_flag(TIF_MEMDIE);

		return;

	}



	check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL);

	totalpages = mem_cgroup_get_limit(memcg) >> PAGE_SHIFT ? : 1;

	for_each_mem_cgroup_tree(iter, memcg) {

		struct cgroup *cgroup = iter->css.cgroup;

mm/oom_kill.c

+2 −21
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, 
/*

 * Determines whether the kernel must panic because of the panic_on_oom sysctl.

 */

static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,

void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask,

			int order, const nodemask_t *nodemask)

{

	if (likely(!sysctl_panic_on_oom))
@@ -575,25 +575,6 @@ static void check_panic_on_oom(enum oom_constraint constraint, gfp_t gfp_mask, 
		sysctl_panic_on_oom == 2 ? "compulsory" : "system-wide");

}



#ifdef CONFIG_MEMCG

void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,

			      int order)

{

	/*

	 * If current has a pending SIGKILL, then automatically select it.  The

	 * goal is to allow it to allocate so that it may quickly exit and free

	 * its memory.

	 */

	if (fatal_signal_pending(current)) {

		set_thread_flag(TIF_MEMDIE);

		return;

	}



	check_panic_on_oom(CONSTRAINT_MEMCG, gfp_mask, order, NULL);

	__mem_cgroup_out_of_memory(memcg, gfp_mask, order);

}

#endif



static BLOCKING_NOTIFIER_HEAD(oom_notify_list);



int register_oom_notifier(struct notifier_block *nb)