[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v3 07/18] numa: do default mapping based on possible_c
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [PATCH v3 07/18] numa: do default mapping based on possible_cpus instead of node_cpu bitmaps |
Date: |
Wed, 10 May 2017 13:29:51 +0200 |
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Andrew Jones <address@hidden>
---
numa.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/numa.c b/numa.c
index 7db5dde..c89fc2d 100644
--- a/numa.c
+++ b/numa.c
@@ -458,6 +458,7 @@ void numa_default_auto_assign_ram(MachineClass *mc,
NodeInfo *nodes,
void parse_numa_opts(MachineState *ms)
{
int i;
+ const CPUArchIdList *possible_cpus;
MachineClass *mc = MACHINE_GET_CLASS(ms);
for (i = 0; i < MAX_NODES; i++) {
@@ -519,18 +520,21 @@ void parse_numa_opts(MachineState *ms)
numa_set_mem_ranges();
- for (i = 0; i < nb_numa_nodes; i++) {
- if (!bitmap_empty(numa_info[i].node_cpu, max_cpus)) {
- break;
- }
- }
-
/* assign CPUs to nodes using board provided default mapping */
- if (!mc->cpu_index_to_instance_props) {
+ if (!mc->cpu_index_to_instance_props || !mc->possible_cpu_arch_ids) {
error_report("default CPUs to NUMA node mapping isn't supported");
exit(1);
}
- if (i == nb_numa_nodes) {
+
+ possible_cpus = mc->possible_cpu_arch_ids(ms);
+ for (i = 0; i < possible_cpus->len; i++) {
+ if (possible_cpus->cpus[i].props.has_node_id) {
+ break;
+ }
+ }
+
+ /* no CPUs are assigned to NUMA nodes */
+ if (i == possible_cpus->len) {
for (i = 0; i < max_cpus; i++) {
CpuInstanceProperties props;
/* fetch default mapping from board and enable it */
--
2.7.4
- [Qemu-ppc] [PATCH v3 00/18] numa: add '-numa cpu' option, Igor Mammedov, 2017/05/10
- [Qemu-ppc] [PATCH v3 02/18] spapr: add node-id property to sPAPR core, Igor Mammedov, 2017/05/10
- [Qemu-ppc] [PATCH v3 03/18] pc: add node-id property to CPU, Igor Mammedov, 2017/05/10
- [Qemu-ppc] [PATCH v3 05/18] numa: add check that board supports cpu_index to node mapping, Igor Mammedov, 2017/05/10
- [Qemu-ppc] [PATCH v3 01/18] numa: move source of default CPUs to NUMA node mapping into boards, Igor Mammedov, 2017/05/10
- [Qemu-ppc] [PATCH v3 04/18] virt-arm: add node-id property to CPU, Igor Mammedov, 2017/05/10
- [Qemu-ppc] [PATCH v3 07/18] numa: do default mapping based on possible_cpus instead of node_cpu bitmaps,
Igor Mammedov <=
- [Qemu-ppc] [PATCH v3 06/18] numa: mirror cpu to node mapping in MachineState::possible_cpus, Igor Mammedov, 2017/05/10
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v3 06/18] numa: mirror cpu to node mapping in MachineState::possible_cpus, Igor Mammedov, 2017/05/30
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v3 06/18] numa: mirror cpu to node mapping in MachineState::possible_cpus, Eduardo Habkost, 2017/05/30
[Qemu-ppc] [PATCH v3 08/18] pc: get numa node mapping from possible_cpus instead of numa_get_node_for_cpu(), Igor Mammedov, 2017/05/10
[Qemu-ppc] [PATCH v3 09/18] spapr: get numa node mapping from possible_cpus instead of numa_get_node_for_cpu(), Igor Mammedov, 2017/05/10
[Qemu-ppc] [PATCH v3 10/18] virt-arm: get numa node mapping from possible_cpus instead of numa_get_node_for_cpu(), Igor Mammedov, 2017/05/10