mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-21 02:15:04 +00:00
numa,spapr: align default numa node memory size to 256MB
Since commit 224245b
("spapr: Add LMB DR connectors"), NUMA node
memory size must be aligned to 256MB (SPAPR_MEMORY_BLOCK_SIZE).
But when "-numa" option is provided without "mem" parameter,
the memory is equally divided between nodes, but 8MB aligned.
This can be not valid for pseries.
In that case we can have:
$ ./ppc64-softmmu/qemu-system-ppc64 -m 4G -numa node -numa node -numa node
qemu-system-ppc64: Node 0 memory size 0x55000000 is not aligned to 256 MiB
With this patch, we have:
(qemu) info numa
3 nodes
node 0 cpus: 0
node 0 size: 1280 MB
node 1 cpus:
node 1 size: 1280 MB
node 2 cpus:
node 2 size: 1536 MB
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
55a19ad8b2
commit
55641213fc
|
@ -396,6 +396,11 @@ static void machine_class_init(ObjectClass *oc, void *data)
|
||||||
mc->default_ram_size = 128 * M_BYTE;
|
mc->default_ram_size = 128 * M_BYTE;
|
||||||
mc->rom_file_has_mr = true;
|
mc->rom_file_has_mr = true;
|
||||||
|
|
||||||
|
/* numa node memory size aligned on 8MB by default.
|
||||||
|
* On Linux, each node's border has to be 8MB aligned
|
||||||
|
*/
|
||||||
|
mc->numa_mem_align_shift = 23;
|
||||||
|
|
||||||
object_class_property_add_str(oc, "accel",
|
object_class_property_add_str(oc, "accel",
|
||||||
machine_get_accel, machine_set_accel, &error_abort);
|
machine_get_accel, machine_set_accel, &error_abort);
|
||||||
object_class_property_set_description(oc, "accel",
|
object_class_property_set_description(oc, "accel",
|
||||||
|
|
|
@ -3096,6 +3096,11 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
|
||||||
xic->ics_resend = spapr_ics_resend;
|
xic->ics_resend = spapr_ics_resend;
|
||||||
xic->icp_get = spapr_icp_get;
|
xic->icp_get = spapr_icp_get;
|
||||||
ispc->print_info = spapr_pic_print_info;
|
ispc->print_info = spapr_pic_print_info;
|
||||||
|
/* Force NUMA node memory size to be a multiple of
|
||||||
|
* SPAPR_MEMORY_BLOCK_SIZE (256M) since that's the granularity
|
||||||
|
* in which LMBs are represented and hot-added
|
||||||
|
*/
|
||||||
|
mc->numa_mem_align_shift = 28;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo spapr_machine_info = {
|
static const TypeInfo spapr_machine_info = {
|
||||||
|
@ -3180,6 +3185,7 @@ static void spapr_machine_2_8_class_options(MachineClass *mc)
|
||||||
{
|
{
|
||||||
spapr_machine_2_9_class_options(mc);
|
spapr_machine_2_9_class_options(mc);
|
||||||
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_8);
|
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_8);
|
||||||
|
mc->numa_mem_align_shift = 23;
|
||||||
}
|
}
|
||||||
|
|
||||||
DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
|
DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
|
||||||
|
|
|
@ -135,6 +135,7 @@ struct MachineClass {
|
||||||
bool rom_file_has_mr;
|
bool rom_file_has_mr;
|
||||||
int minimum_page_bits;
|
int minimum_page_bits;
|
||||||
bool has_hotpluggable_cpus;
|
bool has_hotpluggable_cpus;
|
||||||
|
int numa_mem_align_shift;
|
||||||
|
|
||||||
HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
|
HotplugHandler *(*get_hotplug_handler)(MachineState *machine,
|
||||||
DeviceState *dev);
|
DeviceState *dev);
|
||||||
|
|
6
numa.c
6
numa.c
|
@ -338,12 +338,12 @@ void parse_numa_opts(MachineClass *mc)
|
||||||
if (i == nb_numa_nodes) {
|
if (i == nb_numa_nodes) {
|
||||||
uint64_t usedmem = 0;
|
uint64_t usedmem = 0;
|
||||||
|
|
||||||
/* On Linux, each node's border has to be 8MB aligned,
|
/* Align each node according to the alignment
|
||||||
* the final node gets the rest.
|
* requirements of the machine class
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < nb_numa_nodes - 1; i++) {
|
for (i = 0; i < nb_numa_nodes - 1; i++) {
|
||||||
numa_info[i].node_mem = (ram_size / nb_numa_nodes) &
|
numa_info[i].node_mem = (ram_size / nb_numa_nodes) &
|
||||||
~((1 << 23UL) - 1);
|
~((1 << mc->numa_mem_align_shift) - 1);
|
||||||
usedmem += numa_info[i].node_mem;
|
usedmem += numa_info[i].node_mem;
|
||||||
}
|
}
|
||||||
numa_info[i].node_mem = ram_size - usedmem;
|
numa_info[i].node_mem = ram_size - usedmem;
|
||||||
|
|
Loading…
Reference in a new issue