On Wed, 19 Feb 2014 15:53:54 +0800 Hu Tao <hu...@cn.fujitsu.com> wrote:
> From: Wanlong Gao <gaowanl...@cn.fujitsu.com> > > Add the numa_info structure to contain the numa nodes memory, > VCPUs information and the future added numa nodes host memory > policies. this is old version that breaks spar build which Wanlong already fixed. You can replace patches 1-5 with more recent ones posted recently: http://www.mail-archive.com/qemu-devel@nongnu.org/msg216404.html > > Reviewed-by: Eduardo Habkost <ehabk...@redhat.com> > Signed-off-by: Andre Przywara <andre.przyw...@amd.com> > Signed-off-by: Wanlong Gao <gaowanl...@cn.fujitsu.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > Signed-off-by: Hu Tao <hu...@cn.fujitsu.com> > --- > hw/i386/pc.c | 12 ++++++++---- > include/sysemu/sysemu.h | 8 ++++++-- > monitor.c | 2 +- > numa.c | 23 ++++++++++++----------- > vl.c | 7 +++---- > 5 files changed, 30 insertions(+), 22 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index e715a33..a464e48 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -674,14 +674,14 @@ static FWCfgState *bochs_bios_init(void) > unsigned int apic_id = x86_cpu_apic_id_from_index(i); > assert(apic_id < apic_id_limit); > for (j = 0; j < nb_numa_nodes; j++) { > - if (test_bit(i, node_cpumask[j])) { > + if (test_bit(i, numa_info[j].node_cpu)) { > numa_fw_cfg[apic_id + 1] = cpu_to_le64(j); > break; > } > } > } > for (i = 0; i < nb_numa_nodes; i++) { > - numa_fw_cfg[apic_id_limit + 1 + i] = cpu_to_le64(node_mem[i]); > + numa_fw_cfg[apic_id_limit + 1 + i] = > cpu_to_le64(numa_info[i].node_mem); > } > fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, numa_fw_cfg, > (1 + apic_id_limit + nb_numa_nodes) * > @@ -1077,8 +1077,12 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t > below_4g_mem_size, > guest_info->apic_id_limit = pc_apic_id_limit(max_cpus); > guest_info->apic_xrupt_override = kvm_allows_irq0_override(); > guest_info->numa_nodes = nb_numa_nodes; > - guest_info->node_mem = g_memdup(node_mem, guest_info->numa_nodes * > + guest_info->node_mem = g_malloc0(guest_info->numa_nodes * > sizeof *guest_info->node_mem); > + for (i = 0; i < nb_numa_nodes; i++) { > + guest_info->node_mem[i] = numa_info[i].node_mem; > + } > + > guest_info->node_cpu = g_malloc0(guest_info->apic_id_limit * > sizeof *guest_info->node_cpu); > > @@ -1086,7 +1090,7 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t > below_4g_mem_size, > unsigned int apic_id = x86_cpu_apic_id_from_index(i); > assert(apic_id < guest_info->apic_id_limit); > for (j = 0; j < nb_numa_nodes; j++) { > - if (test_bit(i, node_cpumask[j])) { > + if (test_bit(i, numa_info[j].node_cpu)) { > guest_info->node_cpu[apic_id] = j; > break; > } > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index 2509649..d873b42 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -9,6 +9,7 @@ > #include "qapi-types.h" > #include "qemu/notify.h" > #include "qemu/main-loop.h" > +#include "qemu/bitmap.h" > > /* vl.c */ > > @@ -134,8 +135,11 @@ extern QEMUClockType rtc_clock; > #define MAX_NODES 64 > #define MAX_CPUMASK_BITS 255 > extern int nb_numa_nodes; > -extern uint64_t node_mem[MAX_NODES]; > -extern unsigned long *node_cpumask[MAX_NODES]; > +typedef struct node_info { > + uint64_t node_mem; > + DECLARE_BITMAP(node_cpu, MAX_CPUMASK_BITS); > +} NodeInfo; > +extern NodeInfo numa_info[MAX_NODES]; > void numa_add(const char *optarg); > void set_numa_nodes(void); > void set_numa_modes(void); > diff --git a/monitor.c b/monitor.c > index 690c152..0284735 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2004,7 +2004,7 @@ static void do_info_numa(Monitor *mon, const QDict > *qdict) > } > monitor_printf(mon, "\n"); > monitor_printf(mon, "node %d size: %" PRId64 " MB\n", i, > - node_mem[i] >> 20); > + numa_info[i].node_mem >> 20); > } > } > > diff --git a/numa.c b/numa.c > index a06e2d1..1f413a0 100644 > --- a/numa.c > +++ b/numa.c > @@ -61,7 +61,7 @@ static void numa_node_parse_cpus(int nodenr, const char > *cpus) > goto error; > } > > - bitmap_set(node_cpumask[nodenr], value, endvalue-value+1); > + bitmap_set(numa_info[nodenr].node_cpu, value, endvalue-value+1); > return; > > error: > @@ -101,7 +101,7 @@ void numa_add(const char *optarg) > } > > if (get_param_value(option, 128, "mem", optarg) == 0) { > - node_mem[nodenr] = 0; > + numa_info[nodenr].node_mem = 0; > } else { > int64_t sval; > sval = strtosz(option, &endptr); > @@ -109,7 +109,7 @@ void numa_add(const char *optarg) > fprintf(stderr, "qemu: invalid numa mem size: %s\n", optarg); > exit(1); > } > - node_mem[nodenr] = sval; > + numa_info[nodenr].node_mem = sval; > } > if (get_param_value(option, 128, "cpus", optarg) != 0) { > numa_node_parse_cpus(nodenr, option); > @@ -134,7 +134,7 @@ void set_numa_nodes(void) > * and distribute the available memory equally across all nodes > */ > for (i = 0; i < nb_numa_nodes; i++) { > - if (node_mem[i] != 0) { > + if (numa_info[i].node_mem != 0) { > break; > } > } > @@ -145,15 +145,16 @@ void set_numa_nodes(void) > * the final node gets the rest. > */ > for (i = 0; i < nb_numa_nodes - 1; i++) { > - node_mem[i] = (ram_size / nb_numa_nodes) & ~((1 << 23UL) - > 1); > - usedmem += node_mem[i]; > + numa_info[i].node_mem = (ram_size / nb_numa_nodes) & > + ~((1 << 23UL) - 1); > + usedmem += numa_info[i].node_mem; > } > - node_mem[i] = ram_size - usedmem; > + numa_info[i].node_mem = ram_size - usedmem; > } > > uint64_t numa_total = 0; > for (i = 0; i < nb_numa_nodes; i++) { > - numa_total += node_mem[i]; > + numa_total += numa_info[i].node_mem; > } > if (numa_total != ram_size) { > fprintf(stderr, "qemu: numa nodes total memory size " > @@ -162,7 +163,7 @@ void set_numa_nodes(void) > } > > for (i = 0; i < nb_numa_nodes; i++) { > - if (!bitmap_empty(node_cpumask[i], MAX_CPUMASK_BITS)) { > + if (!bitmap_empty(numa_info[i].node_cpu, MAX_CPUMASK_BITS)) { > break; > } > } > @@ -172,7 +173,7 @@ void set_numa_nodes(void) > */ > if (i == nb_numa_nodes) { > for (i = 0; i < max_cpus; i++) { > - set_bit(i, node_cpumask[i % nb_numa_nodes]); > + set_bit(i, numa_info[i % nb_numa_nodes].node_cpu); > } > } > } > @@ -185,7 +186,7 @@ void set_numa_modes(void) > > CPU_FOREACH(cpu) { > for (i = 0; i < nb_numa_nodes; i++) { > - if (test_bit(cpu->cpu_index, node_cpumask[i])) { > + if (test_bit(cpu->cpu_index, numa_info[i].node_cpu)) { > cpu->numa_node = i; > } > } > diff --git a/vl.c b/vl.c > index 0adac0c..915f8b7 100644 > --- a/vl.c > +++ b/vl.c > @@ -196,8 +196,7 @@ static QTAILQ_HEAD(, FWBootEntry) fw_boot_order = > QTAILQ_HEAD_INITIALIZER(fw_boot_order); > > int nb_numa_nodes; > -uint64_t node_mem[MAX_NODES]; > -unsigned long *node_cpumask[MAX_NODES]; > +NodeInfo numa_info[MAX_NODES]; > > uint8_t qemu_uuid[16]; > bool qemu_uuid_set; > @@ -2787,8 +2786,8 @@ int main(int argc, char **argv, char **envp) > translation = BIOS_ATA_TRANSLATION_AUTO; > > for (i = 0; i < MAX_NODES; i++) { > - node_mem[i] = 0; > - node_cpumask[i] = bitmap_new(MAX_CPUMASK_BITS); > + numa_info[i].node_mem = 0; > + bitmap_zero(numa_info[i].node_cpu, MAX_CPUMASK_BITS); > } > > nb_numa_nodes = 0;
