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

numa: make -numa parser dynamically allocate CPUs masks

Browse Source 
so it won't impose an additional limits on max_cpus limits
supported by different targets.

It removes global MAX_CPUMASK_BITS constant and need to
bump it up whenever max_cpus is being increased for
a target above MAX_CPUMASK_BITS value.

Use runtime max_cpus value instead to allocate sufficiently
sized node_cpu bitmasks in numa parser.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <1479466974-249781-1-git-send-email-imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
[ehabkost: Added asserts to ensure cpu_index < max_cpus]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2016-11-18 12:02:54 +01:00 committed by Eduardo Habkost
parent 410e98146f
commit cdda2018e3
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sysemu/numa.h
View File

@ -17,7 +17,7 @@ struct numa_addr_range {
typedef struct node_info { typedef struct node_info {
uint64_t node_mem; uint64_t node_mem;
DECLARE_BITMAP(node_cpu, MAX_CPUMASK_BITS); 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 */

7
include/sysemu/sysemu.h
View File

@ -168,13 +168,6 @@ extern int mem_prealloc;
#define MAX_NODES 128 #define MAX_NODES 128
#define NUMA_NODE_UNASSIGNED MAX_NODES #define NUMA_NODE_UNASSIGNED MAX_NODES
/* The following shall be true for all CPUs:
* cpu->cpu_index < max_cpus <= MAX_CPUMASK_BITS
*
* Note that cpu->get_arch_id() may be larger than MAX_CPUMASK_BITS.
*/
#define MAX_CPUMASK_BITS 288
#define MAX_OPTION_ROMS 16 #define MAX_OPTION_ROMS 16
typedef struct QEMUOptionRom { typedef struct QEMUOptionRom {
const char *name; const char *name;

21
numa.c
View File

@ -266,20 +266,19 @@ static char *enumerate_cpus(unsigned long *cpus, int max_cpus)
static void validate_numa_cpus(void) static void validate_numa_cpus(void)
{ {
int i; int i;
DECLARE_BITMAP(seen_cpus, MAX_CPUMASK_BITS); unsigned long *seen_cpus = bitmap_new(max_cpus);
bitmap_zero(seen_cpus, MAX_CPUMASK_BITS);
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
if (bitmap_intersects(seen_cpus, numa_info[i].node_cpu, if (bitmap_intersects(seen_cpus, numa_info[i].node_cpu, max_cpus)) {
MAX_CPUMASK_BITS)) {
bitmap_and(seen_cpus, seen_cpus, bitmap_and(seen_cpus, seen_cpus,
numa_info[i].node_cpu, MAX_CPUMASK_BITS); numa_info[i].node_cpu, max_cpus);
error_report("CPU(s) present in multiple NUMA nodes: %s", error_report("CPU(s) present in multiple NUMA nodes: %s",
enumerate_cpus(seen_cpus, max_cpus)); enumerate_cpus(seen_cpus, max_cpus));
g_free(seen_cpus);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
bitmap_or(seen_cpus, seen_cpus, bitmap_or(seen_cpus, seen_cpus,
numa_info[i].node_cpu, MAX_CPUMASK_BITS); numa_info[i].node_cpu, max_cpus);
} }
if (!bitmap_full(seen_cpus, max_cpus)) { if (!bitmap_full(seen_cpus, max_cpus)) {
@ -291,12 +290,17 @@ static void validate_numa_cpus(void)
"in NUMA config"); "in NUMA config");
g_free(msg); g_free(msg);
} }
g_free(seen_cpus);
} }
void parse_numa_opts(MachineClass *mc) void parse_numa_opts(MachineClass *mc)
{ {
int i; int i;
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, NULL, NULL)) { if (qemu_opts_foreach(qemu_find_opts("numa"), parse_numa, NULL, NULL)) {
exit(1); exit(1);
} }
@ -362,7 +366,7 @@ void parse_numa_opts(MachineClass *mc)
numa_set_mem_ranges(); numa_set_mem_ranges();
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
if (!bitmap_empty(numa_info[i].node_cpu, MAX_CPUMASK_BITS)) { if (!bitmap_empty(numa_info[i].node_cpu, max_cpus)) {
break; break;
} }
} }
@ -397,6 +401,7 @@ void numa_post_machine_init(void)
CPU_FOREACH(cpu) { CPU_FOREACH(cpu) {
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
assert(cpu->cpu_index < max_cpus);
if (test_bit(cpu->cpu_index, numa_info[i].node_cpu)) { if (test_bit(cpu->cpu_index, numa_info[i].node_cpu)) {
cpu->numa_node = i; cpu->numa_node = i;
} }
@ -558,6 +563,8 @@ int numa_get_node_for_cpu(int idx)
{ {
int i; int i;
assert(idx < max_cpus);
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
if (test_bit(idx, numa_info[i].node_cpu)) { if (test_bit(idx, numa_info[i].node_cpu)) {
break; break;

5
vl.c
View File

@ -1277,11 +1277,6 @@ static void smp_parse(QemuOpts *opts)
max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus); max_cpus = qemu_opt_get_number(opts, "maxcpus", cpus);
if (max_cpus > MAX_CPUMASK_BITS) {
error_report("unsupported number of maxcpus");
exit(1);
}
if (max_cpus < cpus) { if (max_cpus < cpus) {
error_report("maxcpus must be equal to or greater than smp"); error_report("maxcpus must be equal to or greater than smp");
exit(1); exit(1);