David Rientjes 2ff05b2b4e
oom: move oom_adj value from task_struct to mm_struct ...
The per-task oom_adj value is a characteristic of its mm more than the
task itself since it's not possible to oom kill any thread that shares the
mm. If a task were to be killed while attached to an mm that could not be
freed because another thread were set to OOM_DISABLE, it would have
needlessly been terminated since there is no potential for future memory
freeing.
This patch moves oomkilladj (now more appropriately named oom_adj) from
struct task_struct to struct mm_struct. This requires task_lock() on a
task to check its oom_adj value to protect against exec, but it's already
necessary to take the lock when dereferencing the mm to find the total VM
size for the badness heuristic.
This fixes a livelock if the oom killer chooses a task and another thread
sharing the same memory has an oom_adj value of OOM_DISABLE. This occurs
because oom_kill_task() repeatedly returns 1 and refuses to kill the
chosen task while select_bad_process() will repeatedly choose the same
task during the next retry.
Taking task_lock() in select_bad_process() to check for OOM_DISABLE and in
oom_kill_task() to check for threads sharing the same memory will be
removed in the next patch in this series where it will no longer be
necessary.
Writing to /proc/pid/oom_adj for a kthread will now return -EINVAL since
these threads are immune from oom killing already. They simply report an
oom_adj value of OOM_DISABLE.
Cc: Nick Piggin <npiggin@suse.de >
Cc: Rik van Riel <riel@redhat.com >
Cc: Mel Gorman <mel@csn.ul.ie >
Signed-off-by: David Rientjes <rientjes@google.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-06-16 19:47:43 -07:00
2009-06-11 11:10:35 -07:00
2009-01-15 16:39:37 -08:00
2008-11-07 21:45:29 -05:00
2008-02-08 09:22:31 -08:00
2009-05-18 16:26:03 +01:00
2008-10-30 11:38:45 -07:00
2009-01-07 23:14:38 +08:00
2009-06-12 18:01:47 +02:00
2009-04-07 08:12:38 +02:00
2008-10-10 08:22:44 +02:00
2009-04-13 15:04:33 -07:00
2009-02-12 16:47:01 -08:00
2007-07-19 10:04:47 -07:00
2009-02-24 22:47:31 -05:00
2008-02-14 00:16:13 -05:00
2008-10-16 11:21:30 -07:00
2009-01-05 18:10:19 -07:00
2009-06-04 10:32:49 -06:00
2008-04-25 13:27:03 +01:00
2009-06-15 03:02:23 -07:00
2009-06-12 18:01:47 +02:00
2009-03-30 12:43:31 -03:00
2008-04-21 22:19:05 +00:00
2007-07-16 09:05:45 -07:00
2009-06-12 18:01:47 +02:00
2009-06-16 19:47:43 -07:00
2008-04-21 22:23:30 +00:00
2008-02-03 15:54:28 +02:00
2009-06-01 13:46:50 +02:00
2009-06-13 10:39:28 +01:00
2007-05-09 08:58:19 +02:00
2009-03-30 15:21:59 +02:00
2009-06-07 13:52:52 +02:00
2009-04-08 13:52:01 -07:00
2009-05-23 09:53:26 -07:00
2009-03-30 12:43:15 -03:00
2009-06-08 00:45:52 -07:00
2009-01-28 15:55:48 -08:00
2009-06-09 22:37:47 +02:00
2009-06-12 18:01:47 +02:00
2007-12-17 10:33:19 -08:00
2009-06-12 18:01:47 +02:00
2009-06-12 22:27:13 +09:30
2008-01-11 18:22:30 -06:00
2007-10-17 08:43:05 -07:00
2009-01-14 19:19:03 +01:00
2009-04-01 08:59:18 -07:00
2009-06-12 18:01:47 +02:00
2009-06-12 18:01:47 +02:00
2007-11-29 09:24:53 -08:00
2007-05-09 08:57:56 +02:00
2009-06-15 03:02:23 -07:00
2005-04-16 15:20:36 -07:00
2009-03-20 11:35:04 -07:00
2008-10-30 11:38:45 -07:00
2009-06-14 13:46:25 -07:00
2009-06-15 09:40:05 -07:00
2008-04-19 19:19:55 +02:00
2009-06-12 18:01:47 +02:00
2009-06-12 18:01:47 +02:00
2009-06-12 18:01:47 +02:00
2009-06-12 18:01:47 +02:00
2008-11-14 17:28:53 +00:00
2008-12-22 18:44:05 +09:00
2009-06-14 13:46:25 -07:00
2008-08-29 02:15:25 -07:00
2009-04-21 13:41:50 -07:00
2009-06-16 19:47:35 -07:00
2008-07-22 19:24:29 +10:00
2008-04-29 02:49:47 -04:00
2009-06-12 18:01:47 +02:00
2009-06-12 18:01:51 +02:00
2006-11-30 04:58:40 +01:00
2009-06-12 18:01:51 +02:00
2009-06-12 18:01:47 +02:00
2009-06-16 19:47:38 -07:00
2009-01-08 08:31:14 -08:00
2008-10-30 11:38:45 -07:00
2009-01-07 10:00:18 -08:00
2009-06-11 23:31:52 +02:00
2008-01-24 20:40:04 -08:00
2009-03-30 15:22:02 +02:00
2006-01-10 08:01:54 -08:00
2008-02-23 17:52:36 -08:00
2008-12-03 16:09:53 -07:00
2005-06-24 00:06:27 -07:00
2007-05-09 08:58:19 +02:00
2009-06-12 18:01:47 +02:00
2008-07-25 10:53:30 -07:00
2008-02-06 10:41:09 -08:00
2008-11-12 17:17:18 -08:00
2007-10-19 11:53:34 -07:00
2009-06-14 14:12:18 -07:00
2009-06-12 18:01:46 +02:00
2008-12-18 12:08:05 +01:00
2007-03-01 14:53:39 -08:00
2009-01-11 19:12:49 +01:00
2008-11-14 10:39:26 +11:00
2005-09-07 16:57:27 -07:00
2008-02-03 15:27:38 +02:00
2008-04-18 17:55:33 +02:00
2009-06-12 18:01:50 +02:00
2009-04-07 08:44:05 -07:00
2009-06-12 18:01:47 +02:00
2008-07-22 10:39:36 +10:00
2006-11-30 04:55:36 +01:00
2009-04-07 08:31:12 -07:00
2009-01-05 18:10:19 -07:00
2009-03-26 15:45:43 -07:00
2009-03-24 16:38:27 -07:00
2009-06-12 18:01:47 +02:00
2006-11-30 04:58:40 +01:00
2008-11-06 15:41:19 -08:00
2006-10-03 22:57:56 +02:00
2009-06-15 03:02:23 -07:00
2009-05-09 07:12:50 +02:00
2009-06-12 18:01:47 +02:00
2008-04-21 15:10:15 -07:00
2008-10-16 11:21:32 -07:00
2008-03-24 19:22:19 -07:00
2008-11-12 17:17:18 -08:00
2008-02-03 14:54:41 +02:00
2008-07-26 12:00:06 -07:00
2005-04-16 15:20:36 -07:00
2008-11-03 18:21:44 +01:00
2009-01-29 18:19:29 -08:00
2008-07-26 12:00:06 -07:00
2007-10-18 14:37:32 -07:00
2008-06-05 15:18:30 +02:00
2006-06-29 10:26:25 -07:00
2006-07-03 15:27:03 -07:00
2005-04-16 15:20:36 -07:00
2007-10-20 02:37:21 +02:00
2009-05-02 15:36:10 -07:00
2008-06-06 11:29:10 -07:00
2009-06-15 09:32:52 -07:00
2008-04-29 08:06:16 -07:00
2008-07-26 12:00:06 -07:00
2009-06-11 17:03:29 +01:00
2009-06-12 18:01:47 +02:00
2009-04-07 08:31:08 -07:00
2008-02-06 10:41:09 -08:00
2007-05-21 09:58:40 -07:00
2008-07-26 12:00:06 -07:00
2009-06-12 18:01:47 +02:00
2009-04-26 18:21:24 +02:00
2008-10-20 15:43:10 +02:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2009-01-06 15:59:28 -08:00
2008-08-12 16:07:30 -07:00
2008-10-30 11:38:46 -07:00
2008-11-28 16:47:41 +01:00
2008-03-17 09:03:05 +01:00
2009-03-31 15:18:37 +11:00
2009-04-29 14:15:55 +02:00
2009-06-12 18:01:47 +02:00
2005-04-16 15:20:36 -07:00
2006-10-03 22:53:09 +02:00
2007-10-20 00:15:26 +02:00
2008-10-30 19:07:04 +01:00
2009-01-08 12:04:47 +00:00
2005-04-16 15:20:36 -07:00
2008-04-29 08:05:59 -07:00
2007-11-26 19:39:01 -08:00
2005-04-16 15:20:36 -07:00
2006-10-03 23:39:02 +02:00
2008-01-24 20:40:04 -08:00
2005-04-16 15:20:36 -07:00
2008-11-12 17:17:17 -08:00
2006-10-03 22:57:56 +02:00
2009-06-12 18:01:47 +02:00
2009-06-03 14:06:15 -04:00
2006-11-30 04:58:40 +01:00
2006-11-30 05:21:10 +01:00
2006-10-01 00:39:24 -07:00
2006-06-27 17:32:47 -07:00
2008-02-06 10:41:14 -08:00
2008-10-16 11:21:32 -07:00
2005-04-16 15:20:36 -07:00
2008-08-27 08:54:08 +10:00
2006-03-25 08:23:00 -08:00
2005-06-21 18:46:32 -07:00
2005-04-16 15:20:36 -07:00
2009-04-03 16:42:35 +01:00
2009-06-12 18:01:47 +02:00
2009-04-14 09:00:23 +10:00
2009-04-11 08:18:11 +02:00
2008-04-11 13:21:14 -06:00
2007-07-30 14:25:12 -07:00
2008-10-29 15:03:49 -07:00
2008-10-16 11:21:32 -07:00
2008-10-16 11:21:32 -07:00
2009-06-14 13:46:25 -07:00
2005-04-16 15:20:36 -07:00
2009-05-08 19:22:20 -07:00
2009-04-02 00:49:02 +02:00
2009-04-14 09:14:58 +10:00
2008-07-25 10:53:27 -07:00
2005-04-16 15:20:36 -07:00
2006-10-03 22:57:56 +02:00
2005-04-16 15:20:36 -07:00
2006-12-20 01:46:58 -05:00
2008-07-26 12:00:06 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2ff05b2b4e
