@@ -1738,7 +1738,7 @@ long qemu_getrampagesize(void)
if (hpsize > mainrampagesize &&
(ms->numa_state == NULL ||
ms->numa_state->nb_numa_nodes == 0 ||
- numa_info[0].node_memdev == NULL)) {
+ ms->numa_state->numa_info[0].node_memdev == NULL)) {
static bool warned;
if (!warned) {
error_report("Huge page support disabled (n/a for main memory).");
@@ -1737,8 +1737,10 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms)
build_append_int_noprefix(table_data, nb_numa_nodes, 8);
for (i = 0; i < nb_numa_nodes; i++) {
for (j = 0; j < nb_numa_nodes; j++) {
- assert(numa_info[i].distance[j]);
- build_append_int_noprefix(table_data, numa_info[i].distance[j], 1);
+ assert(ms->numa_state->numa_info[i].distance[j]);
+ build_append_int_noprefix(table_data,
+ ms->numa_state->numa_info[i].distance[j],
+ 1);
}
}
@@ -602,7 +602,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
if (nb_numa_nodes > 0) {
mem_base = binfo->loader_start;
for (i = 0; i < nb_numa_nodes; i++) {
- mem_len = numa_info[i].node_mem;
+ mem_len = ms->numa_state->numa_info[i].node_mem;
rc = fdt_add_memory_node(fdt, acells, mem_base,
scells, mem_len, i);
if (rc < 0) {
@@ -535,11 +535,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
mem_base = vms->memmap[VIRT_MEM].base;
for (i = 0; i < nb_numa_nodes; ++i) {
- if (numa_info[i].node_mem > 0) {
+ if (ms->numa_state->numa_info[i].node_mem > 0) {
numamem = acpi_data_push(table_data, sizeof(*numamem));
- build_srat_memory(numamem, mem_base, numa_info[i].node_mem, i,
+ build_srat_memory(numamem, mem_base,
+ ms->numa_state->numa_info[i].node_mem, i,
MEM_AFFINITY_ENABLED);
- mem_base += numa_info[i].node_mem;
+ mem_base += ms->numa_state->numa_info[i].node_mem;
}
}
@@ -198,6 +198,7 @@ static void create_fdt(VirtMachineState *vms)
MachineState *ms = MACHINE(vms);
int nb_numa_nodes = ms->numa_state->nb_numa_nodes;
bool have_numa_distance = ms->numa_state->have_numa_distance;
+ NodeInfo *numa_info = ms->numa_state->numa_info;
void *fdt = create_device_tree(&vms->fdt_size);
if (!fdt) {
@@ -998,6 +998,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms)
MachineClass *mc = MACHINE_GET_CLASS(pcms);
MachineState *ms = MACHINE(pcms);
int nb_numa_nodes = ms->numa_state->nb_numa_nodes;
+ NodeInfo *numa_info = ms->numa_state->numa_info;
fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4, as);
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);
@@ -1676,6 +1677,7 @@ void pc_guest_info_init(PCMachineState *pcms)
int i;
MachineState *ms = MACHINE(pcms);
int nb_numa_nodes = ms->numa_state->nb_numa_nodes;
+ NodeInfo *numa_info = ms->numa_state->numa_info;
pcms->apic_xrupt_override = kvm_allows_irq0_override();
pcms->numa_nodes = nb_numa_nodes;
@@ -349,6 +349,10 @@ static hwaddr spapr_node0_size(MachineState *machine)
int nb_numa_nodes = machine->numa_state ?
machine->numa_state->nb_numa_nodes :
0;
+ NodeInfo *numa_info = machine->numa_state ?
+ machine->numa_state->numa_info :
+ NULL;
+
if (nb_numa_nodes) {
int i;
for (i = 0; i < nb_numa_nodes; ++i) {
@@ -400,7 +404,9 @@ static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt)
0;
hwaddr mem_start, node_size;
int i, nb_nodes = nb_numa_nodes;
- NodeInfo *nodes = numa_info;
+ NodeInfo *nodes = machine->numa_state ?
+ machine->numa_state->numa_info :
+ NULL;
NodeInfo ramnode;
/* No NUMA nodes, assume there is just one node with whole RAM */
@@ -2484,6 +2490,9 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp)
int nb_numa_nodes = machine->numa_state ?
machine->numa_state->nb_numa_nodes :
0;
+ NodeInfo *numa_info = machine->numa_state ?
+ machine->numa_state->numa_info :
+ NULL;
if (machine->ram_size % SPAPR_MEMORY_BLOCK_SIZE) {
error_setg(errp, "Memory size 0x" RAM_ADDR_FMT
@@ -1672,6 +1672,8 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
SysBusDevice *s = SYS_BUS_DEVICE(dev);
SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(s);
PCIHostState *phb = PCI_HOST_BRIDGE(s);
+ MachineState *ms = MACHINE(spapr);
+ NodeInfo *numa_info = ms->numa_state ? ms->numa_state->numa_info : NULL;
char *namebuf;
int i;
PCIBus *bus;
@@ -233,6 +233,13 @@ typedef struct DeviceMemoryState {
MemoryRegion mr;
} DeviceMemoryState;
+struct NodeInfo {
+ uint64_t node_mem;
+ struct HostMemoryBackend *node_memdev;
+ bool present;
+ uint8_t distance[MAX_NODES];
+};
+
typedef struct NumaState {
/* Number of NUMA nodes */
int nb_numa_nodes;
@@ -240,6 +247,8 @@ typedef struct NumaState {
/* Allow setting NUMA distance for different NUMA nodes */
bool have_numa_distance;
+ /* NUMA nodes information */
+ NodeInfo numa_info[MAX_NODES];
} NumaState;
/**
@@ -6,19 +6,11 @@
#include "sysemu/hostmem.h"
#include "hw/boards.h"
-struct NodeInfo {
- uint64_t node_mem;
- struct HostMemoryBackend *node_memdev;
- bool present;
- uint8_t distance[MAX_NODES];
-};
-
struct NumaNodeMem {
uint64_t node_mem;
uint64_t node_plugged_mem;
};
-extern NodeInfo numa_info[MAX_NODES];
void parse_numa_opts(MachineState *ms);
void numa_complete_configuration(MachineState *ms);
void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms);
@@ -52,8 +52,6 @@ static int have_memdevs = -1;
static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.
* For all nodes, nodeid < max_numa_nodeid
*/
-NodeInfo numa_info[MAX_NODES];
-
static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
Error **errp)
@@ -62,6 +60,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
uint16_t nodenr;
uint16List *cpus = NULL;
MachineClass *mc = MACHINE_GET_CLASS(ms);
+ NodeInfo *numa_info = ms->numa_state->numa_info;
if (node->has_nodeid) {
nodenr = node->nodeid;
@@ -143,6 +142,7 @@ void parse_numa_distance(MachineState *ms, NumaDistOptions *dist, Error **errp)
uint16_t src = dist->src;
uint16_t dst = dist->dst;
uint8_t val = dist->val;
+ NodeInfo *numa_info = ms->numa_state->numa_info;
if (src >= MAX_NODES || dst >= MAX_NODES) {
error_setg(errp, "Parameter '%s' expects an integer between 0 and %d",
@@ -196,7 +196,7 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp)
error_setg(&err, "Missing mandatory node-id property");
goto end;
}
- if (!numa_info[object->u.cpu.node_id].present) {
+ if (!ms->numa_state->numa_info[object->u.cpu.node_id].present) {
error_setg(&err, "Invalid node-id=%" PRId64 ", NUMA node must be "
"defined with -numa node,nodeid=ID before it's used with "
"-numa cpu,node-id=ID", object->u.cpu.node_id);
@@ -256,6 +256,7 @@ static void validate_numa_distance(MachineState *ms)
int src, dst;
bool is_asymmetrical = false;
int nb_numa_nodes = ms->numa_state->nb_numa_nodes;
+ NodeInfo *numa_info = ms->numa_state->numa_info;
for (src = 0; src < nb_numa_nodes; src++) {
for (dst = src; dst < nb_numa_nodes; dst++) {
@@ -297,6 +298,7 @@ static void complete_init_numa_distance(MachineState *ms)
{
int src, dst;
int nb_numa_nodes = ms->numa_state->nb_numa_nodes;
+ NodeInfo *numa_info = ms->numa_state->numa_info;
/* Fixup NUMA distance by symmetric policy because if it is an
* asymmetric distance table, it should be a complete table and
@@ -356,6 +358,7 @@ void numa_complete_configuration(MachineState *ms)
{
int i;
MachineClass *mc = MACHINE_GET_CLASS(ms);
+ NodeInfo *numa_info = ms->numa_state->numa_info;
/*
* If memory hotplug is enabled (slots > 0) but without '-numa'
@@ -527,8 +530,8 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner,
memory_region_init(mr, owner, name, ram_size);
for (i = 0; i < nb_numa_nodes; i++) {
- uint64_t size = numa_info[i].node_mem;
- HostMemoryBackend *backend = numa_info[i].node_memdev;
+ uint64_t size = ms->numa_state->numa_info[i].node_mem;
+ HostMemoryBackend *backend = ms->numa_state->numa_info[i].node_memdev;
if (!backend) {
continue;
}
@@ -594,7 +597,7 @@ void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms)
numa_stat_memory_devices(node_mem);
for (i = 0; i < ms->numa_state->nb_numa_nodes; i++) {
- node_mem[i].node_mem += numa_info[i].node_mem;
+ node_mem[i].node_mem += ms->numa_state->numa_info[i].node_mem;
}
}
The aim of this patch is to move existing numa global numa_info into NumaState. Suggested-by: Igor Mammedov <imammedo@redhat.com> Suggested-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Tao Xu <tao3.xu@intel.com> --- exec.c | 2 +- hw/acpi/aml-build.c | 6 ++++-- hw/arm/boot.c | 2 +- hw/arm/virt-acpi-build.c | 7 ++++--- hw/arm/virt.c | 1 + hw/i386/pc.c | 2 ++ hw/ppc/spapr.c | 11 ++++++++++- hw/ppc/spapr_pci.c | 2 ++ include/hw/boards.h | 9 +++++++++ include/sysemu/numa.h | 8 -------- numa.c | 15 +++++++++------ 11 files changed, 43 insertions(+), 22 deletions(-)