mirror of https://github.com/xemu-project/xemu.git
numa: move numa global variable numa_info into MachineState
Move existing numa global numa_info (renamed as "nodes") into NumaState. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Suggested-by: Igor Mammedov <imammedo@redhat.com> Suggested-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Tao Xu <tao3.xu@intel.com> Message-Id: <20190809065731.9097-5-tao3.xu@intel.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
118154b767
commit
7e721e7b10
2
exec.c
2
exec.c
|
@ -1780,7 +1780,7 @@ long qemu_minrampagesize(void)
|
||||||
if (hpsize > mainrampagesize &&
|
if (hpsize > mainrampagesize &&
|
||||||
(ms->numa_state == NULL ||
|
(ms->numa_state == NULL ||
|
||||||
ms->numa_state->num_nodes == 0 ||
|
ms->numa_state->num_nodes == 0 ||
|
||||||
numa_info[0].node_memdev == NULL)) {
|
ms->numa_state->nodes[0].node_memdev == NULL)) {
|
||||||
static bool warned;
|
static bool warned;
|
||||||
if (!warned) {
|
if (!warned) {
|
||||||
error_report("Huge page support disabled (n/a for main memory).");
|
error_report("Huge page support disabled (n/a for main memory).");
|
||||||
|
|
|
@ -1738,8 +1738,10 @@ void build_slit(GArray *table_data, BIOSLinker *linker, MachineState *ms)
|
||||||
build_append_int_noprefix(table_data, nb_numa_nodes, 8);
|
build_append_int_noprefix(table_data, nb_numa_nodes, 8);
|
||||||
for (i = 0; i < nb_numa_nodes; i++) {
|
for (i = 0; i < nb_numa_nodes; i++) {
|
||||||
for (j = 0; j < nb_numa_nodes; j++) {
|
for (j = 0; j < nb_numa_nodes; j++) {
|
||||||
assert(numa_info[i].distance[j]);
|
assert(ms->numa_state->nodes[i].distance[j]);
|
||||||
build_append_int_noprefix(table_data, numa_info[i].distance[j], 1);
|
build_append_int_noprefix(table_data,
|
||||||
|
ms->numa_state->nodes[i].distance[j],
|
||||||
|
1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -601,7 +601,7 @@ int arm_load_dtb(hwaddr addr, const struct arm_boot_info *binfo,
|
||||||
if (ms->numa_state != NULL && ms->numa_state->num_nodes > 0) {
|
if (ms->numa_state != NULL && ms->numa_state->num_nodes > 0) {
|
||||||
mem_base = binfo->loader_start;
|
mem_base = binfo->loader_start;
|
||||||
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
||||||
mem_len = numa_info[i].node_mem;
|
mem_len = ms->numa_state->nodes[i].node_mem;
|
||||||
rc = fdt_add_memory_node(fdt, acells, mem_base,
|
rc = fdt_add_memory_node(fdt, acells, mem_base,
|
||||||
scells, mem_len, i);
|
scells, mem_len, i);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
|
|
|
@ -170,7 +170,8 @@ static void create_fdt(SBSAMachineState *sms)
|
||||||
idx = (i * nb_numa_nodes + j) * 3;
|
idx = (i * nb_numa_nodes + j) * 3;
|
||||||
matrix[idx + 0] = cpu_to_be32(i);
|
matrix[idx + 0] = cpu_to_be32(i);
|
||||||
matrix[idx + 1] = cpu_to_be32(j);
|
matrix[idx + 1] = cpu_to_be32(j);
|
||||||
matrix[idx + 2] = cpu_to_be32(numa_info[i].distance[j]);
|
matrix[idx + 2] =
|
||||||
|
cpu_to_be32(ms->numa_state->nodes[i].distance[j]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -535,11 +535,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
||||||
|
|
||||||
mem_base = vms->memmap[VIRT_MEM].base;
|
mem_base = vms->memmap[VIRT_MEM].base;
|
||||||
for (i = 0; i < ms->numa_state->num_nodes; ++i) {
|
for (i = 0; i < ms->numa_state->num_nodes; ++i) {
|
||||||
if (numa_info[i].node_mem > 0) {
|
if (ms->numa_state->nodes[i].node_mem > 0) {
|
||||||
numamem = acpi_data_push(table_data, sizeof(*numamem));
|
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->nodes[i].node_mem, i,
|
||||||
MEM_AFFINITY_ENABLED);
|
MEM_AFFINITY_ENABLED);
|
||||||
mem_base += numa_info[i].node_mem;
|
mem_base += ms->numa_state->nodes[i].node_mem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -246,7 +246,8 @@ static void create_fdt(VirtMachineState *vms)
|
||||||
idx = (i * nb_numa_nodes + j) * 3;
|
idx = (i * nb_numa_nodes + j) * 3;
|
||||||
matrix[idx + 0] = cpu_to_be32(i);
|
matrix[idx + 0] = cpu_to_be32(i);
|
||||||
matrix[idx + 1] = cpu_to_be32(j);
|
matrix[idx + 1] = cpu_to_be32(j);
|
||||||
matrix[idx + 2] = cpu_to_be32(numa_info[i].distance[j]);
|
matrix[idx + 2] =
|
||||||
|
cpu_to_be32(ms->numa_state->nodes[i].distance[j]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,8 +55,6 @@ static int have_mem;
|
||||||
static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.
|
static int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.
|
||||||
* For all nodes, nodeid < max_numa_nodeid
|
* For all nodes, nodeid < max_numa_nodeid
|
||||||
*/
|
*/
|
||||||
NodeInfo numa_info[MAX_NODES];
|
|
||||||
|
|
||||||
|
|
||||||
static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
|
static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
|
@ -66,6 +64,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
|
||||||
uint16List *cpus = NULL;
|
uint16List *cpus = NULL;
|
||||||
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
||||||
unsigned int max_cpus = ms->smp.max_cpus;
|
unsigned int max_cpus = ms->smp.max_cpus;
|
||||||
|
NodeInfo *numa_info = ms->numa_state->nodes;
|
||||||
|
|
||||||
if (node->has_nodeid) {
|
if (node->has_nodeid) {
|
||||||
nodenr = node->nodeid;
|
nodenr = node->nodeid;
|
||||||
|
@ -145,6 +144,7 @@ void parse_numa_distance(MachineState *ms, NumaDistOptions *dist, Error **errp)
|
||||||
uint16_t src = dist->src;
|
uint16_t src = dist->src;
|
||||||
uint16_t dst = dist->dst;
|
uint16_t dst = dist->dst;
|
||||||
uint8_t val = dist->val;
|
uint8_t val = dist->val;
|
||||||
|
NodeInfo *numa_info = ms->numa_state->nodes;
|
||||||
|
|
||||||
if (src >= MAX_NODES || dst >= MAX_NODES) {
|
if (src >= MAX_NODES || dst >= MAX_NODES) {
|
||||||
error_setg(errp, "Parameter '%s' expects an integer between 0 and %d",
|
error_setg(errp, "Parameter '%s' expects an integer between 0 and %d",
|
||||||
|
@ -203,7 +203,7 @@ void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp)
|
||||||
error_setg(&err, "Missing mandatory node-id property");
|
error_setg(&err, "Missing mandatory node-id property");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
if (!numa_info[object->u.cpu.node_id].present) {
|
if (!ms->numa_state->nodes[object->u.cpu.node_id].present) {
|
||||||
error_setg(&err, "Invalid node-id=%" PRId64 ", NUMA node must be "
|
error_setg(&err, "Invalid node-id=%" PRId64 ", NUMA node must be "
|
||||||
"defined with -numa node,nodeid=ID before it's used with "
|
"defined with -numa node,nodeid=ID before it's used with "
|
||||||
"-numa cpu,node-id=ID", object->u.cpu.node_id);
|
"-numa cpu,node-id=ID", object->u.cpu.node_id);
|
||||||
|
@ -263,6 +263,7 @@ static void validate_numa_distance(MachineState *ms)
|
||||||
int src, dst;
|
int src, dst;
|
||||||
bool is_asymmetrical = false;
|
bool is_asymmetrical = false;
|
||||||
int nb_numa_nodes = ms->numa_state->num_nodes;
|
int nb_numa_nodes = ms->numa_state->num_nodes;
|
||||||
|
NodeInfo *numa_info = ms->numa_state->nodes;
|
||||||
|
|
||||||
for (src = 0; src < nb_numa_nodes; src++) {
|
for (src = 0; src < nb_numa_nodes; src++) {
|
||||||
for (dst = src; dst < nb_numa_nodes; dst++) {
|
for (dst = src; dst < nb_numa_nodes; dst++) {
|
||||||
|
@ -303,6 +304,7 @@ static void validate_numa_distance(MachineState *ms)
|
||||||
static void complete_init_numa_distance(MachineState *ms)
|
static void complete_init_numa_distance(MachineState *ms)
|
||||||
{
|
{
|
||||||
int src, dst;
|
int src, dst;
|
||||||
|
NodeInfo *numa_info = ms->numa_state->nodes;
|
||||||
|
|
||||||
/* Fixup NUMA distance by symmetric policy because if it is an
|
/* Fixup NUMA distance by symmetric policy because if it is an
|
||||||
* asymmetric distance table, it should be a complete table and
|
* asymmetric distance table, it should be a complete table and
|
||||||
|
@ -362,6 +364,7 @@ void numa_complete_configuration(MachineState *ms)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
MachineClass *mc = MACHINE_GET_CLASS(ms);
|
||||||
|
NodeInfo *numa_info = ms->numa_state->nodes;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If memory hotplug is enabled (slots > 0) but without '-numa'
|
* 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);
|
memory_region_init(mr, owner, name, ram_size);
|
||||||
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
||||||
uint64_t size = numa_info[i].node_mem;
|
uint64_t size = ms->numa_state->nodes[i].node_mem;
|
||||||
HostMemoryBackend *backend = numa_info[i].node_memdev;
|
HostMemoryBackend *backend = ms->numa_state->nodes[i].node_memdev;
|
||||||
if (!backend) {
|
if (!backend) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -594,7 +597,7 @@ void query_numa_node_mem(NumaNodeMem node_mem[], MachineState *ms)
|
||||||
|
|
||||||
numa_stat_memory_devices(node_mem);
|
numa_stat_memory_devices(node_mem);
|
||||||
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
||||||
node_mem[i].node_mem += numa_info[i].node_mem;
|
node_mem[i].node_mem += ms->numa_state->nodes[i].node_mem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1046,7 +1046,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, PCMachineState *pcms)
|
||||||
}
|
}
|
||||||
for (i = 0; i < nb_numa_nodes; i++) {
|
for (i = 0; i < nb_numa_nodes; i++) {
|
||||||
numa_fw_cfg[pcms->apic_id_limit + 1 + i] =
|
numa_fw_cfg[pcms->apic_id_limit + 1 + i] =
|
||||||
cpu_to_le64(numa_info[i].node_mem);
|
cpu_to_le64(ms->numa_state->nodes[i].node_mem);
|
||||||
}
|
}
|
||||||
fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, numa_fw_cfg,
|
fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, numa_fw_cfg,
|
||||||
(1 + pcms->apic_id_limit + nb_numa_nodes) *
|
(1 + pcms->apic_id_limit + nb_numa_nodes) *
|
||||||
|
@ -1783,7 +1783,7 @@ void pc_guest_info_init(PCMachineState *pcms)
|
||||||
pcms->node_mem = g_malloc0(pcms->numa_nodes *
|
pcms->node_mem = g_malloc0(pcms->numa_nodes *
|
||||||
sizeof *pcms->node_mem);
|
sizeof *pcms->node_mem);
|
||||||
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
for (i = 0; i < ms->numa_state->num_nodes; i++) {
|
||||||
pcms->node_mem[i] = numa_info[i].node_mem;
|
pcms->node_mem[i] = ms->numa_state->nodes[i].node_mem;
|
||||||
}
|
}
|
||||||
|
|
||||||
pcms->machine_done.notify = pc_machine_done;
|
pcms->machine_done.notify = pc_machine_done;
|
||||||
|
|
|
@ -359,8 +359,8 @@ static hwaddr spapr_node0_size(MachineState *machine)
|
||||||
if (machine->numa_state->num_nodes) {
|
if (machine->numa_state->num_nodes) {
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < machine->numa_state->num_nodes; ++i) {
|
for (i = 0; i < machine->numa_state->num_nodes; ++i) {
|
||||||
if (numa_info[i].node_mem) {
|
if (machine->numa_state->nodes[i].node_mem) {
|
||||||
return MIN(pow2floor(numa_info[i].node_mem),
|
return MIN(pow2floor(machine->numa_state->nodes[i].node_mem),
|
||||||
machine->ram_size);
|
machine->ram_size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -404,7 +404,7 @@ static int spapr_populate_memory(SpaprMachineState *spapr, void *fdt)
|
||||||
MachineState *machine = MACHINE(spapr);
|
MachineState *machine = MACHINE(spapr);
|
||||||
hwaddr mem_start, node_size;
|
hwaddr mem_start, node_size;
|
||||||
int i, nb_nodes = machine->numa_state->num_nodes;
|
int i, nb_nodes = machine->numa_state->num_nodes;
|
||||||
NodeInfo *nodes = numa_info;
|
NodeInfo *nodes = machine->numa_state->nodes;
|
||||||
NodeInfo ramnode;
|
NodeInfo ramnode;
|
||||||
|
|
||||||
/* No NUMA nodes, assume there is just one node with whole RAM */
|
/* No NUMA nodes, assume there is just one node with whole RAM */
|
||||||
|
@ -2541,11 +2541,11 @@ static void spapr_validate_node_memory(MachineState *machine, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < machine->numa_state->num_nodes; i++) {
|
for (i = 0; i < machine->numa_state->num_nodes; i++) {
|
||||||
if (numa_info[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) {
|
if (machine->numa_state->nodes[i].node_mem % SPAPR_MEMORY_BLOCK_SIZE) {
|
||||||
error_setg(errp,
|
error_setg(errp,
|
||||||
"Node %d memory size 0x%" PRIx64
|
"Node %d memory size 0x%" PRIx64
|
||||||
" is not aligned to %" PRIu64 " MiB",
|
" is not aligned to %" PRIu64 " MiB",
|
||||||
i, numa_info[i].node_mem,
|
i, machine->numa_state->nodes[i].node_mem,
|
||||||
SPAPR_MEMORY_BLOCK_SIZE / MiB);
|
SPAPR_MEMORY_BLOCK_SIZE / MiB);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1825,6 +1825,7 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
|
||||||
SysBusDevice *s = SYS_BUS_DEVICE(dev);
|
SysBusDevice *s = SYS_BUS_DEVICE(dev);
|
||||||
SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(s);
|
SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(s);
|
||||||
PCIHostState *phb = PCI_HOST_BRIDGE(s);
|
PCIHostState *phb = PCI_HOST_BRIDGE(s);
|
||||||
|
MachineState *ms = MACHINE(spapr);
|
||||||
char *namebuf;
|
char *namebuf;
|
||||||
int i;
|
int i;
|
||||||
PCIBus *bus;
|
PCIBus *bus;
|
||||||
|
@ -1877,7 +1878,8 @@ static void spapr_phb_realize(DeviceState *dev, Error **errp)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sphb->numa_node != -1 &&
|
if (sphb->numa_node != -1 &&
|
||||||
(sphb->numa_node >= MAX_NODES || !numa_info[sphb->numa_node].present)) {
|
(sphb->numa_node >= MAX_NODES ||
|
||||||
|
!ms->numa_state->nodes[sphb->numa_node].present)) {
|
||||||
error_setg(errp, "Invalid NUMA node ID for PCI host bridge");
|
error_setg(errp, "Invalid NUMA node ID for PCI host bridge");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,14 +26,15 @@ struct NumaNodeMem {
|
||||||
uint64_t node_plugged_mem;
|
uint64_t node_plugged_mem;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern NodeInfo numa_info[MAX_NODES];
|
|
||||||
|
|
||||||
struct NumaState {
|
struct NumaState {
|
||||||
/* Number of NUMA nodes */
|
/* Number of NUMA nodes */
|
||||||
int num_nodes;
|
int num_nodes;
|
||||||
|
|
||||||
/* Allow setting NUMA distance for different NUMA nodes */
|
/* Allow setting NUMA distance for different NUMA nodes */
|
||||||
bool have_numa_distance;
|
bool have_numa_distance;
|
||||||
|
|
||||||
|
/* NUMA nodes information */
|
||||||
|
NodeInfo nodes[MAX_NODES];
|
||||||
};
|
};
|
||||||
typedef struct NumaState NumaState;
|
typedef struct NumaState NumaState;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue