mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

numa: remove node_cpu bitmaps as they are no longer used

Browse Source 
Postfactum "CPU(s) present in multiple NUMA nodes" check
was the last user of node_cpu bitmaps, but it's not need
as machine_set_cpu_numa_node() does the similar check at
the time mapping is set for cpus (i.e. when -numa cpus=
is parsed) and ensures that cpu can be mapped only to
one node.

Remove duplicate check based on node_cpu bitmaps and
since the last user is gone remove node_cpu as well,
which completes internal transition from legacy bitmap
based mapping storage to possible_cpus storage.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Message-Id: <1494415802-227633-17-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-05-10 13:30:00 +02:00 committed by Eduardo Habkost
parent ec78f8114b
commit 1171ae9a5b
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sysemu/numa.h
View File

@ -18,7 +18,6 @@ struct numa_addr_range {
struct node_info { struct node_info {
uint64_t node_mem; uint64_t node_mem;
unsigned long *node_cpu;
struct HostMemoryBackend *node_memdev; struct HostMemoryBackend *node_memdev;
bool present; bool present;
QLIST_HEAD(, numa_addr_range) addr; /* List to store address ranges */ QLIST_HEAD(, numa_addr_range) addr; /* List to store address ranges */

43
numa.c
View File

@ -178,7 +178,6 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
cpus->value, max_cpus); cpus->value, max_cpus);
return; return;
} }
bitmap_set(numa_info[nodenr].node_cpu, cpus->value, 1);
props = mc->cpu_index_to_instance_props(ms, cpus->value); props = mc->cpu_index_to_instance_props(ms, cpus->value);
props.node_id = nodenr; props.node_id = nodenr;
props.has_node_id = true; props.has_node_id = true;
@ -305,41 +304,6 @@ end:
return 0; return 0;
} }
static char *enumerate_cpus(unsigned long *cpus, int max_cpus)
{
int cpu;
bool first = true;
GString *s = g_string_new(NULL);
for (cpu = find_first_bit(cpus, max_cpus);
cpu < max_cpus;
cpu = find_next_bit(cpus, max_cpus, cpu + 1)) {
g_string_append_printf(s, "%s%d", first ? "" : " ", cpu);
first = false;
}
return g_string_free(s, FALSE);
}
static void validate_numa_cpus(void)
{
int i;
unsigned long *seen_cpus = bitmap_new(max_cpus);
for (i = 0; i < nb_numa_nodes; i++) {
if (bitmap_intersects(seen_cpus, numa_info[i].node_cpu, max_cpus)) {
bitmap_and(seen_cpus, seen_cpus,
numa_info[i].node_cpu, max_cpus);
error_report("CPU(s) present in multiple NUMA nodes: %s",
enumerate_cpus(seen_cpus, max_cpus));
g_free(seen_cpus);
exit(EXIT_FAILURE);
}
bitmap_or(seen_cpus, seen_cpus,
numa_info[i].node_cpu, max_cpus);
}
g_free(seen_cpus);
}
/* If all node pair distances are symmetric, then only distances /* If all node pair distances are symmetric, then only distances
* in one direction are enough. If there is even one asymmetric * in one direction are enough. If there is even one asymmetric
* pair, though, then all distances must be provided. The * pair, though, then all distances must be provided. The
@ -451,10 +415,6 @@ void parse_numa_opts(MachineState *ms)
const CPUArchIdList *possible_cpus; const CPUArchIdList *possible_cpus;
MachineClass *mc = MACHINE_GET_CLASS(ms); MachineClass *mc = MACHINE_GET_CLASS(ms);
for (i = 0; i < MAX_NODES; i++) {
numa_info[i].node_cpu = bitmap_new(max_cpus);
}
if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) { if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, ms, NULL)) {
exit(1); exit(1);
} }
@ -531,13 +491,10 @@ void parse_numa_opts(MachineState *ms)
props = mc->cpu_index_to_instance_props(ms, i); props = mc->cpu_index_to_instance_props(ms, i);
props.has_node_id = true; props.has_node_id = true;
set_bit(i, numa_info[props.node_id].node_cpu);
machine_set_cpu_numa_node(ms, &props, &error_fatal); machine_set_cpu_numa_node(ms, &props, &error_fatal);
} }
} }
validate_numa_cpus();
/* QEMU needs at least all unique node pair distances to build /* QEMU needs at least all unique node pair distances to build
* the whole NUMA distance table. QEMU treats the distance table * the whole NUMA distance table. QEMU treats the distance table
* as symmetric by default, i.e. distance A->B == distance B->A. * as symmetric by default, i.e. distance A->B == distance B->A.