| Message ID | 20230509002739.18388-4-gshan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | NUMA: Apply cluster-NUMA-node boundary for aarch64 and riscv machines | expand |
On Tue, May 9, 2023 at 10:29 AM Gavin Shan <gshan@redhat.com> wrote: > > There are two RISCV machines where NUMA is aware: 'virt' and 'spike'. > Both of them are required to follow cluster-NUMA-node boundary. To > enable the validation to warn about the irregular configuration where > multiple CPUs in one cluster has been associated with multiple NUMA > nodes. > > Signed-off-by: Gavin Shan <gshan@redhat.com> > Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > Acked-by: Igor Mammedov <imammedo@redhat.com> Acked-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/riscv/spike.c | 2 ++ > hw/riscv/virt.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c > index 2c5546560a..81f7e53aed 100644 > --- a/hw/riscv/spike.c > +++ b/hw/riscv/spike.c > @@ -354,6 +354,8 @@ static void spike_machine_class_init(ObjectClass *oc, void *data) > mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props; > mc->get_default_cpu_node_id = riscv_numa_get_default_cpu_node_id; > mc->numa_mem_supported = true; > + /* platform instead of architectural choice */ > + mc->cpu_cluster_has_numa_boundary = true; > mc->default_ram_id = "riscv.spike.ram"; > object_class_property_add_str(oc, "signature", NULL, spike_set_signature); > object_class_property_set_description(oc, "signature", > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 4e3efbee16..84a2bca460 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -1678,6 +1678,8 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) > mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props; > mc->get_default_cpu_node_id = riscv_numa_get_default_cpu_node_id; > mc->numa_mem_supported = true; > + /* platform instead of architectural choice */ > + mc->cpu_cluster_has_numa_boundary = true; > mc->default_ram_id = "riscv_virt_board.ram"; > assert(!mc->get_hotplug_handler); > mc->get_hotplug_handler = virt_machine_get_hotplug_handler; > -- > 2.23.0 > >
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 2c5546560a..81f7e53aed 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -354,6 +354,8 @@ static void spike_machine_class_init(ObjectClass *oc, void *data) mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props; mc->get_default_cpu_node_id = riscv_numa_get_default_cpu_node_id; mc->numa_mem_supported = true; + /* platform instead of architectural choice */ + mc->cpu_cluster_has_numa_boundary = true; mc->default_ram_id = "riscv.spike.ram"; object_class_property_add_str(oc, "signature", NULL, spike_set_signature); object_class_property_set_description(oc, "signature", diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 4e3efbee16..84a2bca460 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1678,6 +1678,8 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props; mc->get_default_cpu_node_id = riscv_numa_get_default_cpu_node_id; mc->numa_mem_supported = true; + /* platform instead of architectural choice */ + mc->cpu_cluster_has_numa_boundary = true; mc->default_ram_id = "riscv_virt_board.ram"; assert(!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler;