Commit be8f684d authored Jul 25, 2011 by David Rientjes Committed by Linus Torvalds Jul 25, 2011

oom: make deprecated use of oom_adj more verbose



/proc/pid/oom_adj is deprecated and scheduled for removal in August 2012
according to Documentation/feature-removal-schedule.txt.

This patch makes the warning more verbose by making it appear as a more
serious problem (the presence of a stack trace and being multiline should
attract more attention) so that applications still using the old interface
can get fixed.

Very popular users of the old interface have been converted since the oom
killer rewrite has been introduced.  udevd switched to the
/proc/pid/oom_score_adj interface for v162, kde switched in 4.6.1, and
opensshd switched in 5.7p1.

At the start of 2012, this should be changed into a WARN() to emit all
such incidents and then finally remove the tunable in August 2012 as
scheduled.

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 11239836

fs/proc/base.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -1118,10 +1118,9 @@ static ssize_t oom_adjust_write(struct file file, const char __user buf,
		* Warn that /proc/pid/oom_adj is deprecated, see
		* Documentation/feature-removal-schedule.txt.
		*/
		printk_once(KERN_WARNING "%s (%d): /proc/%d/oom_adj is deprecated, "
		"please use /proc/%d/oom_score_adj instead.\n",
		current->comm, task_pid_nr(current),
		task_pid_nr(task), task_pid_nr(task));
		WARN_ONCE(1, "%s (%d): /proc/%d/oom_adj is deprecated, please use /proc/%d/oom_score_adj instead.\n",
		current->comm, task_pid_nr(current), task_pid_nr(task),
		task_pid_nr(task));
		task->signal->oom_adj = oom_adjust;
		/*
		* Scale /proc/pid/oom_score_adj appropriately ensuring that a maximum

Admin message