korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

x86-64, NUMA: Wrap node ID during emulation

Browse Source 
Both emulation layout functions - split_nodes[_size]_interleave() -
didn't wrap emulated nid while laying out the fake nodes and tried to
avoid interating over the specified number of nodes, which is fragile.

Now that the emulation code generates numa_meminfo, the node memblks
don't need to be consecutive and emulated node IDs can simply wrap.
This makes the code more robust and is necessary for updates to better
handle the cases where the physical nodes are interleaved.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Shaohui Zheng <shaohui.zheng@intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
Tejun Heo 2011-02-16 17:11:10 +01:00
parent c88aea7a70
commit 775ee85d7b
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/mm/numa_64.c
View File

@ -768,15 +768,7 @@ static int __init split_nodes_interleave(struct numa_meminfo *ei,
memblock_x86_hole_size(end, physnodes[i].end) < size)
end = physnodes[i].end;
/*
* Avoid allocating more nodes than requested, which can
* happen as a result of rounding down each node's size
* to FAKE_NODE_MIN_SIZE.
*/
if (nodes_weight(physnode_mask) + nid >= nr_nodes)
end = physnodes[i].end;
ret = emu_setup_memblk(ei, nid++, i,
ret = emu_setup_memblk(ei, nid++ % nr_nodes, i,
physnodes[i].start,
min(end, physnodes[i].end));
if (ret < 0)
@ -873,7 +865,7 @@ static int __init split_nodes_size_interleave(struct numa_meminfo *ei,
memblock_x86_hole_size(end, physnodes[i].end) < size)
end = physnodes[i].end;
ret = emu_setup_memblk(ei, nid++, i,
ret = emu_setup_memblk(ei, nid++ % MAX_NUMNODES, i,
physnodes[i].start,
min(end, physnodes[i].end));
if (ret < 0)