ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr: limit numa memory regions by ram size 

This makes sure that all NUMA memory blocks reside within RAM or
have zero length.

Reviewed-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Paul Mackerras 2013-11-25 14:14:51 +11:00 committed by Alexander Graf
parent c417747906
commit 5fe269b16c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/ppc/spapr.c
View File

@ -526,12 +526,16 @@ static int spapr_populate_memory(sPAPREnvironment *spapr, void *fdt)
cpu_to_be32(0x0), cpu_to_be32(0x0), cpu_to_be32(0x0), cpu_to_be32(0x0),
cpu_to_be32(0x0)}; cpu_to_be32(0x0)};
char mem_name[32]; char mem_name[32];
hwaddr node0_size, mem_start; hwaddr node0_size, mem_start, node_size;
uint64_t mem_reg_property[2]; uint64_t mem_reg_property[2];
int i, off; int i, off;
/* memory node(s) */ /* memory node(s) */
node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; if (nb_numa_nodes > 1 && node_mem[0] < ram_size) {
node0_size = node_mem[0];
} else {
node0_size = ram_size;
}
/* RMA */ /* RMA */
mem_reg_property[0] = 0; mem_reg_property[0] = 0;
@ -563,7 +567,15 @@ static int spapr_populate_memory(sPAPREnvironment *spapr, void *fdt)
mem_start = node0_size; mem_start = node0_size;
for (i = 1; i < nb_numa_nodes; i++) { for (i = 1; i < nb_numa_nodes; i++) {
mem_reg_property[0] = cpu_to_be64(mem_start); mem_reg_property[0] = cpu_to_be64(mem_start);
mem_reg_property[1] = cpu_to_be64(node_mem[i]); if (mem_start >= ram_size) {
node_size = 0;
} else {
node_size = node_mem[i];
if (node_size > ram_size - mem_start) {
node_size = ram_size - mem_start;
}
}
mem_reg_property[1] = cpu_to_be64(node_size);
associativity[3] = associativity[4] = cpu_to_be32(i); associativity[3] = associativity[4] = cpu_to_be32(i);
sprintf(mem_name, "memory@" TARGET_FMT_lx, mem_start); sprintf(mem_name, "memory@" TARGET_FMT_lx, mem_start);
off = fdt_add_subnode(fdt, 0, mem_name); off = fdt_add_subnode(fdt, 0, mem_name);
@ -573,7 +585,7 @@ static int spapr_populate_memory(sPAPREnvironment *spapr, void *fdt)
sizeof(mem_reg_property)))); sizeof(mem_reg_property))));
_FDT((fdt_setprop(fdt, off, "ibm,associativity", associativity, _FDT((fdt_setprop(fdt, off, "ibm,associativity", associativity,
sizeof(associativity)))); sizeof(associativity))));
mem_start += node_mem[i]; mem_start += node_size;
} }
return 0; return 0;