KOSAKI Motohiro
0753ba01e1
mm: revert "oom: move oom_adj value"
...
The commit 2ff05b2b (oom: move oom_adj value) moveed the oom_adj value to
the mm_struct. It was a very good first step for sanitize OOM.
However Paul Menage reported the commit makes regression to his job
scheduler. Current OOM logic can kill OOM_DISABLED process.
Why? His program has the code of similar to the following.
...
set_oom_adj(OOM_DISABLE); /* The job scheduler never killed by oom */
...
if (vfork() == 0) {
set_oom_adj(0); /* Invoked child can be killed */
execve("foo-bar-cmd");
}
....
vfork() parent and child are shared the same mm_struct. then above
set_oom_adj(0) doesn't only change oom_adj for vfork() child, it's also
change oom_adj for vfork() parent. Then, vfork() parent (job scheduler)
lost OOM immune and it was killed.
Actually, fork-setting-exec idiom is very frequently used in userland program.
We must not break this assumption.
Then, this patch revert commit 2ff05b2b and related commit.
Reverted commit list
---------------------
- commit 2ff05b2b4e (oom: move oom_adj value from task_struct to mm_struct)
- commit 4d8b9135c3 (oom: avoid unnecessary mm locking and scanning for OOM_DISABLE)
- commit 8123681022 (oom: only oom kill exiting tasks with attached memory)
- commit 933b787b57 (mm: copy over oom_adj value at fork time)
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com >
Cc: Paul Menage <menage@google.com >
Cc: David Rientjes <rientjes@google.com >
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com >
Cc: Rik van Riel <riel@redhat.com >
Cc: Linus Torvalds <torvalds@linux-foundation.org >
Cc: Oleg Nesterov <oleg@redhat.com >
Cc: Nick Piggin <npiggin@suse.de >
Cc: Mel Gorman <mel@csn.ul.ie >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-08-18 16:31:13 -07:00
..
2009-06-19 16:46:03 -07:00
2009-08-07 10:39:56 -07:00
2009-06-20 10:17:02 -07:00
2009-08-05 22:20:14 -07:00
2009-06-17 18:02:10 -07:00
2009-06-17 19:41:52 +02:00
2009-06-16 19:14:16 -03:00
2009-08-03 14:16:01 +01:00
2009-06-29 14:31:46 +02:00
2009-06-22 12:55:50 -07:00
2009-06-18 08:46:47 +10:00
2009-06-15 11:18:26 +01:00
2009-06-30 18:56:00 -07:00
2009-07-12 12:22:34 -07:00
2009-07-12 15:16:36 -07:00
Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release
2009-06-24 01:19:50 -04:00
2009-06-17 00:36:36 -04:00
2009-06-19 10:21:42 +10:00
2009-06-30 18:55:58 -07:00
2009-06-15 18:52:52 +02:00
2009-06-24 00:00:52 -04:00
2009-07-11 11:22:26 -07:00
2009-07-01 10:56:25 +02:00
2009-08-01 10:24:35 +02:00
2009-06-16 19:47:48 -07:00
2009-06-15 15:49:34 +02:00
2009-07-31 12:28:46 +02:00
2009-06-11 21:36:09 -04:00
2009-07-29 19:10:35 -07:00
2009-07-10 17:32:55 +02:00
2009-07-31 14:12:36 +02:00
2009-06-18 13:03:57 -07:00
2009-06-12 21:46:57 +09:30
2009-06-22 10:12:35 +01:00
2009-07-16 09:19:16 -07:00
2009-06-22 21:18:12 -07:00
2009-06-16 19:47:31 -07:00
2009-06-11 21:36:10 -04:00
2009-07-12 12:22:34 -07:00
2009-06-11 21:36:06 -04:00
2009-07-23 20:30:42 +01:00
2009-07-12 13:02:10 -07:00
2009-06-22 10:12:30 +01:00
2009-06-22 10:12:35 +01:00
2009-06-19 16:46:08 -07:00
2009-06-23 22:09:17 +01:00
2009-06-17 09:33:49 -07:00
2009-06-15 21:30:26 -07:00
2009-07-08 09:18:05 -07:00
2009-06-30 18:55:58 -07:00
2009-06-24 08:17:04 -04:00
2009-07-15 21:30:46 +02:00
2009-06-24 08:15:27 -04:00
2009-06-30 18:56:00 -07:00
2009-06-25 19:42:36 +02:00
2009-06-16 19:47:28 -07:00
2009-06-15 21:30:25 -07:00
2009-07-29 19:10:36 -07:00
2009-08-07 14:38:29 -03:00
2009-06-18 13:03:42 -07:00
2009-07-21 15:26:27 -04:00
2009-06-11 14:57:54 -04:00
2009-08-09 12:53:48 +02:00
2009-06-18 18:40:18 -04:00
2009-06-30 20:12:24 +02:00
2009-06-18 13:04:05 -07:00
2009-08-17 21:33:49 -07:00
2009-06-15 21:30:25 -07:00
2009-06-18 13:12:57 -07:00
2009-07-12 12:22:34 -07:00
2009-06-16 19:47:41 -07:00
2009-07-10 19:33:00 +02:00
2009-06-23 11:23:33 -07:00
2009-06-13 10:39:28 +01:00
2009-06-19 16:58:21 +02:00
2009-06-23 04:31:07 -07:00
2009-06-29 19:20:42 -07:00
2009-07-02 13:16:58 -07:00
2009-06-29 08:59:10 +10:00
2009-07-27 18:39:45 -07:00
2009-06-27 00:06:42 +02:00
2009-06-18 13:03:57 -07:00
2009-06-19 22:55:17 -07:00
2009-07-22 10:12:18 -07:00
2009-07-31 08:55:48 +02:00
2009-06-11 12:04:06 -07:00
2009-06-18 13:03:56 -07:00
2009-06-20 11:30:01 -07:00
2009-06-17 11:47:48 -04:00
2009-06-22 10:12:35 +01:00
2009-06-18 13:03:40 -07:00
2009-06-25 22:06:11 +02:00
2009-06-14 13:50:36 -07:00
2009-06-15 15:49:23 +02:00
2009-07-08 14:25:14 +01:00
2009-08-05 14:03:43 +03:00
2009-06-23 20:21:38 +01:00
2009-06-23 20:21:39 +01:00
2009-07-30 16:03:45 +09:30
2009-07-30 16:03:46 +09:30
2009-07-28 21:07:09 -04:00
2009-06-26 23:58:39 +02:00
2009-06-16 19:47:57 -07:00
2009-06-16 19:47:57 -07:00
2009-06-13 12:28:57 +02:00
2009-06-22 14:34:22 -07:00
2009-06-11 21:36:10 -04:00
2009-06-16 19:47:48 -07:00
2009-06-18 13:03:47 -07:00
2009-06-16 08:40:20 +02:00
2009-06-15 21:30:25 -07:00
2009-08-18 16:31:13 -07:00
2009-08-17 15:09:11 +10:00
2009-06-16 19:47:42 -07:00
2009-07-08 09:31:56 -07:00
2009-06-18 13:03:57 -07:00
2009-06-12 21:46:58 +09:30
2009-06-11 21:36:02 -04:00
2009-06-11 21:36:01 -04:00
2009-06-15 03:02:23 -07:00
2009-06-18 00:29:08 -07:00
2009-06-17 18:02:11 -07:00
2009-06-17 18:02:11 -07:00
2009-06-17 12:24:34 -07:00
2009-06-17 14:11:42 -07:00
2009-08-12 08:21:39 -07:00
2009-06-17 12:24:34 -07:00
2009-06-17 18:02:11 -07:00
2009-06-15 21:44:43 -07:00
2009-08-07 10:39:55 -07:00
2009-07-22 09:27:18 -07:00
2009-06-12 11:00:54 +03:00
2009-06-17 08:30:15 +03:00
2009-06-16 19:47:42 -07:00
Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release
2009-06-24 01:19:50 -04:00
2009-06-30 18:55:59 -07:00
2009-06-22 21:38:22 -07:00
2009-06-16 14:29:30 -07:00
2009-06-29 12:14:51 -07:00
2009-06-30 18:55:59 -07:00
2009-08-13 12:58:04 +02:00
2009-07-12 12:21:33 -07:00
2009-06-15 21:30:24 -07:00
2009-06-12 21:32:31 +02:00
2009-06-16 19:47:48 -07:00
2009-06-24 16:58:48 -04:00
2009-06-18 13:04:04 -07:00
2009-07-29 19:10:36 -07:00
2009-06-11 21:36:01 -04:00
2009-06-18 13:03:51 -07:00
2009-06-11 21:36:12 -04:00
2009-07-12 12:22:34 -07:00
2009-06-16 19:47:30 -07:00
2009-06-24 08:17:06 -04:00
2009-06-24 08:17:06 -04:00
2009-06-11 21:35:58 -04:00
2009-06-18 13:03:46 -07:00
2009-06-18 13:03:48 -07:00
2009-07-21 12:07:43 -04:00
2009-06-15 15:49:37 +02:00
2009-06-23 12:50:05 -07:00
2009-07-31 12:28:45 +02:00
2009-08-18 16:31:13 -07:00
2009-08-17 15:09:27 +10:00
2009-06-18 13:03:57 -07:00
2009-06-22 11:32:25 -07:00
2009-06-22 11:32:24 -07:00
2009-06-24 08:17:06 -04:00
2009-07-14 12:03:42 -07:00
2009-06-13 08:58:43 +02:00
2009-06-15 15:50:49 +02:00
2009-06-12 18:53:33 +03:00
2009-07-08 14:25:14 +01:00
2009-06-16 19:47:48 -07:00
2009-07-09 17:06:58 -07:00
2009-06-12 23:04:12 +02:00
2009-06-12 21:32:33 +02:00
2009-06-23 12:50:05 -07:00
2009-07-07 10:51:39 +02:00
2009-07-06 13:57:03 -07:00
2009-06-13 12:00:26 +02:00
2009-06-24 11:15:09 +02:00
2009-06-16 19:47:27 -07:00
2009-06-15 11:37:09 -04:00
2009-06-18 13:03:49 -07:00
2009-06-15 21:30:28 -07:00
2009-08-04 13:46:30 -07:00
2009-07-29 12:15:56 -07:00
2009-06-19 08:08:50 +02:00
2009-07-29 19:10:39 -07:00
2009-06-12 18:01:45 +02:00
2009-07-12 15:16:39 -07:00
2009-06-16 19:47:47 -07:00
2009-07-24 14:03:30 -03:00
2009-07-30 16:03:46 +09:30
2009-07-30 16:03:46 +09:30
2009-07-30 16:03:46 +09:30
2009-06-12 22:16:37 +09:30
2009-07-30 16:03:46 +09:30
2009-06-12 22:16:36 +09:30
2009-06-16 19:47:52 -07:00
2009-06-16 19:47:46 -07:00
2009-06-18 13:03:58 -07:00
2009-08-10 14:43:09 +02:00
2009-06-11 21:36:03 -04:00