diff options
| author | KAMEZAWA Hiroyuki <[email protected]> | 2009-12-16 00:45:33 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-12-16 15:19:57 +0000 |
| commit | 4365a5676fa3aa1d5ae6c90c22a0044f09ba584e (patch) | |
| tree | 5b9914ccbdcf2aa695473421e71f6299fbe78cef /fs/proc/generic.c | |
| parent | oom-kill: show virtual size and rss information of the killed process (diff) | |
| download | kernel-4365a5676fa3aa1d5ae6c90c22a0044f09ba584e.tar.gz kernel-4365a5676fa3aa1d5ae6c90c22a0044f09ba584e.zip | |
oom-kill: fix NUMA constraint check with nodemask
Fix node-oriented allocation handling in oom-kill.c I myself think of this
as a bugfix not as an ehnancement.
In these days, things are changed as
- alloc_pages() eats nodemask as its arguments, __alloc_pages_nodemask().
- mempolicy don't maintain its own private zonelists.
(And cpuset doesn't use nodemask for __alloc_pages_nodemask())
So, current oom-killer's check function is wrong.
This patch does
- check nodemask, if nodemask && nodemask doesn't cover all
node_states[N_HIGH_MEMORY], this is CONSTRAINT_MEMORY_POLICY.
- Scan all zonelist under nodemask, if it hits cpuset's wall
this faiulre is from cpuset.
And
- modifies the caller of out_of_memory not to call oom if __GFP_THISNODE.
This doesn't change "current" behavior. If callers use __GFP_THISNODE
it should handle "page allocation failure" by itself.
- handle __GFP_NOFAIL+__GFP_THISNODE path.
This is something like a FIXME but this gfpmask is not used now.
[[email protected]: coding-style fixes]
Signed-off-by: KAMEZAWA Hiroyuki <[email protected]>
Acked-by: David Rientjes <[email protected]>
Cc: Daisuke Nishimura <[email protected]>
Cc: KOSAKI Motohiro <[email protected]>
Cc: Christoph Lameter <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'fs/proc/generic.c')
0 files changed, 0 insertions, 0 deletions
