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

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

mm, oom: introduce independent oom killer ratelimit state 



printk_ratelimit() uses the global ratelimit state for all printks.  The
oom killer should not be subjected to this state just because another
subsystem or driver may be flooding the kernel log.

This patch introduces printk ratelimiting specifically for the oom killer.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8447d950

mm/oom_kill.c

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/ptrace.h>

#include <linux/freezer.h>

#include <linux/ftrace.h>

#include <linux/ratelimit.h>



#define CREATE_TRACE_POINTS

#include <trace/events/oom.h>
@@ -444,6 +445,8 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, 
	struct task_struct *t = p;

	struct mm_struct *mm;

	unsigned int victim_points = 0;

	static DEFINE_RATELIMIT_STATE(oom_rs, DEFAULT_RATELIMIT_INTERVAL,

					      DEFAULT_RATELIMIT_BURST);



	/*

	 * If the task is already exiting, don't alarm the sysadmin or kill
@@ -454,7 +457,7 @@ static void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, 
		return;

	}



	if (printk_ratelimit())

	if (__ratelimit(&oom_rs))

		dump_header(p, gfp_mask, order, memcg, nodemask);



	task_lock(p);