diff options
author | Lee Schermerhorn <Lee.Schermerhorn@hp.com> | 2007-10-16 04:25:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:42:59 -0400 |
commit | 37b07e4163f7306aa735a6e250e8d22293e5b8de (patch) | |
tree | 5c9c1935253a39aa840a9923bf1c86620cb6f733 /mm/shmem.c | |
parent | 0e1e7c7a739562a321fda07c7cd2a97a7114f8f8 (diff) |
memoryless nodes: fixup uses of node_online_map in generic code
Here's a cut at fixing up uses of the online node map in generic code.
mm/shmem.c:shmem_parse_mpol()
Ensure nodelist is subset of nodes with memory.
Use node_states[N_HIGH_MEMORY] as default for missing
nodelist for interleave policy.
mm/shmem.c:shmem_fill_super()
initialize policy_nodes to node_states[N_HIGH_MEMORY]
mm/page-writeback.c:highmem_dirtyable_memory()
sum over nodes with memory
mm/page_alloc.c:zlc_setup()
allowednodes - use nodes with memory.
mm/page_alloc.c:default_zonelist_order()
average over nodes with memory.
mm/page_alloc.c:find_next_best_node()
skip nodes w/o memory.
N_HIGH_MEMORY state mask may not be initialized at this time,
unless we want to depend on early_calculate_totalpages() [see
below]. Will ZONE_MOVABLE ever be configurable?
mm/page_alloc.c:find_zone_movable_pfns_for_nodes()
spread kernelcore over nodes with memory.
This required calling early_calculate_totalpages()
unconditionally, and populating N_HIGH_MEMORY node
state therein from nodes in the early_node_map[].
If we can depend on this, we can eliminate the
population of N_HIGH_MEMORY mask from __build_all_zonelists()
and use the N_HIGH_MEMORY mask in find_next_best_node().
mm/mempolicy.c:mpol_check_policy()
Ensure nodes specified for policy are subset of
nodes with memory.
[akpm@linux-foundation.org: fix warnings]
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>
Acked-by: Christoph Lameter <clameter@sgi.com>
Cc: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r-- | mm/shmem.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 131f2938f3ad..855b93b3637c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -971,7 +971,7 @@ static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_ | |||
971 | *nodelist++ = '\0'; | 971 | *nodelist++ = '\0'; |
972 | if (nodelist_parse(nodelist, *policy_nodes)) | 972 | if (nodelist_parse(nodelist, *policy_nodes)) |
973 | goto out; | 973 | goto out; |
974 | if (!nodes_subset(*policy_nodes, node_online_map)) | 974 | if (!nodes_subset(*policy_nodes, node_states[N_HIGH_MEMORY])) |
975 | goto out; | 975 | goto out; |
976 | } | 976 | } |
977 | if (!strcmp(value, "default")) { | 977 | if (!strcmp(value, "default")) { |
@@ -996,9 +996,11 @@ static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_ | |||
996 | err = 0; | 996 | err = 0; |
997 | } else if (!strcmp(value, "interleave")) { | 997 | } else if (!strcmp(value, "interleave")) { |
998 | *policy = MPOL_INTERLEAVE; | 998 | *policy = MPOL_INTERLEAVE; |
999 | /* Default to nodes online if no nodelist */ | 999 | /* |
1000 | * Default to online nodes with memory if no nodelist | ||
1001 | */ | ||
1000 | if (!nodelist) | 1002 | if (!nodelist) |
1001 | *policy_nodes = node_online_map; | 1003 | *policy_nodes = node_states[N_HIGH_MEMORY]; |
1002 | err = 0; | 1004 | err = 0; |
1003 | } | 1005 | } |
1004 | out: | 1006 | out: |
@@ -1060,7 +1062,8 @@ shmem_alloc_page(gfp_t gfp, struct shmem_inode_info *info, | |||
1060 | return page; | 1062 | return page; |
1061 | } | 1063 | } |
1062 | #else | 1064 | #else |
1063 | static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_nodes) | 1065 | static inline int shmem_parse_mpol(char *value, int *policy, |
1066 | nodemask_t *policy_nodes) | ||
1064 | { | 1067 | { |
1065 | return 1; | 1068 | return 1; |
1066 | } | 1069 | } |
@@ -2238,7 +2241,7 @@ static int shmem_fill_super(struct super_block *sb, | |||
2238 | unsigned long blocks = 0; | 2241 | unsigned long blocks = 0; |
2239 | unsigned long inodes = 0; | 2242 | unsigned long inodes = 0; |
2240 | int policy = MPOL_DEFAULT; | 2243 | int policy = MPOL_DEFAULT; |
2241 | nodemask_t policy_nodes = node_online_map; | 2244 | nodemask_t policy_nodes = node_states[N_HIGH_MEMORY]; |
2242 | 2245 | ||
2243 | #ifdef CONFIG_TMPFS | 2246 | #ifdef CONFIG_TMPFS |
2244 | /* | 2247 | /* |