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>
This commit is contained in:

committed by
Linus Torvalds

parent
0e1e7c7a73
commit
37b07e4163
13
mm/shmem.c
13
mm/shmem.c
@@ -971,7 +971,7 @@ static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_
|
||||
*nodelist++ = '\0';
|
||||
if (nodelist_parse(nodelist, *policy_nodes))
|
||||
goto out;
|
||||
if (!nodes_subset(*policy_nodes, node_online_map))
|
||||
if (!nodes_subset(*policy_nodes, node_states[N_HIGH_MEMORY]))
|
||||
goto out;
|
||||
}
|
||||
if (!strcmp(value, "default")) {
|
||||
@@ -996,9 +996,11 @@ static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_
|
||||
err = 0;
|
||||
} else if (!strcmp(value, "interleave")) {
|
||||
*policy = MPOL_INTERLEAVE;
|
||||
/* Default to nodes online if no nodelist */
|
||||
/*
|
||||
* Default to online nodes with memory if no nodelist
|
||||
*/
|
||||
if (!nodelist)
|
||||
*policy_nodes = node_online_map;
|
||||
*policy_nodes = node_states[N_HIGH_MEMORY];
|
||||
err = 0;
|
||||
}
|
||||
out:
|
||||
@@ -1060,7 +1062,8 @@ shmem_alloc_page(gfp_t gfp, struct shmem_inode_info *info,
|
||||
return page;
|
||||
}
|
||||
#else
|
||||
static inline int shmem_parse_mpol(char *value, int *policy, nodemask_t *policy_nodes)
|
||||
static inline int shmem_parse_mpol(char *value, int *policy,
|
||||
nodemask_t *policy_nodes)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@@ -2238,7 +2241,7 @@ static int shmem_fill_super(struct super_block *sb,
|
||||
unsigned long blocks = 0;
|
||||
unsigned long inodes = 0;
|
||||
int policy = MPOL_DEFAULT;
|
||||
nodemask_t policy_nodes = node_online_map;
|
||||
nodemask_t policy_nodes = node_states[N_HIGH_MEMORY];
|
||||
|
||||
#ifdef CONFIG_TMPFS
|
||||
/*
|
||||
|
Reference in New Issue
Block a user