3bfe57165b
When there are more nodes than available memory to put the minimum
allowed memory by node, all the memory is put on the last node.
This is because we put (ram_size / nb_numa_nodes) &
~((1 << mc->numa_mem_align_shift) - 1); on each node, and in this
case the value is 0. This is particularly true with pseries,
as the memory must be aligned to 256MB.
To avoid this problem, this patch uses an error diffusion algorithm [1]
to distribute equally the memory on nodes.
We introduce numa_auto_assign_ram() function in MachineClass
to keep compatibility between machine type versions.
The legacy function is used with pseries-2.9, pc-q35-2.9 and
pc-i440fx-2.9 (and previous), the new one with all others.
Example:
qemu-system-ppc64 -S -nographic -nodefaults -monitor stdio -m 1G -smp 8 \
-numa node -numa node -numa node \
-numa node -numa node -numa node
Before:
(qemu) info numa
6 nodes
node 0 cpus: 0 6
node 0 size: 0 MB
node 1 cpus: 1 7
node 1 size: 0 MB
node 2 cpus: 2
node 2 size: 0 MB
node 3 cpus: 3
node 3 size: 0 MB
node 4 cpus: 4
node 4 size: 0 MB
node 5 cpus: 5
node 5 size: 1024 MB
After:
(qemu) info numa
6 nodes
node 0 cpus: 0 6
node 0 size: 0 MB
node 1 cpus: 1 7
node 1 size: 256 MB
node 2 cpus: 2
node 2 size: 0 MB
node 3 cpus: 3
node 3 size: 256 MB
node 4 cpus: 4
node 4 size: 256 MB
node 5 cpus: 5
node 5 size: 256 MB
[1] https://en.wikipedia.org/wiki/Error_diffusion
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20170502162955.1610-2-lvivier@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
[ehabkost: s/ram_size/size/ at numa_default_auto_assign_ram()]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
369 lines
12 KiB
C
369 lines
12 KiB
C
/*
|
|
* Q35 chipset based pc system emulator
|
|
*
|
|
* Copyright (c) 2003-2004 Fabrice Bellard
|
|
* Copyright (c) 2009, 2010
|
|
* Isaku Yamahata <yamahata at valinux co jp>
|
|
* VA Linux Systems Japan K.K.
|
|
* Copyright (C) 2012 Jason Baron <jbaron@redhat.com>
|
|
*
|
|
* This is based on pc.c, but heavily modified.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#include "qemu/osdep.h"
|
|
#include "hw/hw.h"
|
|
#include "hw/loader.h"
|
|
#include "sysemu/arch_init.h"
|
|
#include "hw/i2c/smbus.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/timer/mc146818rtc.h"
|
|
#include "hw/xen/xen.h"
|
|
#include "sysemu/kvm.h"
|
|
#include "hw/kvm/clock.h"
|
|
#include "hw/pci-host/q35.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "hw/i386/pc.h"
|
|
#include "hw/i386/ich9.h"
|
|
#include "hw/smbios/smbios.h"
|
|
#include "hw/ide/pci.h"
|
|
#include "hw/ide/ahci.h"
|
|
#include "hw/usb.h"
|
|
#include "qemu/error-report.h"
|
|
#include "migration/migration.h"
|
|
#include "sysemu/numa.h"
|
|
|
|
/* ICH9 AHCI has 6 ports */
|
|
#define MAX_SATA_PORTS 6
|
|
|
|
/* PC hardware initialisation */
|
|
static void pc_q35_init(MachineState *machine)
|
|
{
|
|
PCMachineState *pcms = PC_MACHINE(machine);
|
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
|
Q35PCIHost *q35_host;
|
|
PCIHostState *phb;
|
|
PCIBus *host_bus;
|
|
PCIDevice *lpc;
|
|
DeviceState *lpc_dev;
|
|
BusState *idebus[MAX_SATA_PORTS];
|
|
ISADevice *rtc_state;
|
|
MemoryRegion *system_io = get_system_io();
|
|
MemoryRegion *pci_memory;
|
|
MemoryRegion *rom_memory;
|
|
MemoryRegion *ram_memory;
|
|
GSIState *gsi_state;
|
|
ISABus *isa_bus;
|
|
qemu_irq *i8259;
|
|
int i;
|
|
ICH9LPCState *ich9_lpc;
|
|
PCIDevice *ahci;
|
|
ram_addr_t lowmem;
|
|
DriveInfo *hd[MAX_SATA_PORTS];
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
|
|
|
/* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory
|
|
* and 256 Mbytes for PCI Express Enhanced Configuration Access Mapping
|
|
* also known as MMCFG).
|
|
* If it doesn't, we need to split it in chunks below and above 4G.
|
|
* In any case, try to make sure that guest addresses aligned at
|
|
* 1G boundaries get mapped to host addresses aligned at 1G boundaries.
|
|
*/
|
|
if (machine->ram_size >= 0xb0000000) {
|
|
lowmem = 0x80000000;
|
|
} else {
|
|
lowmem = 0xb0000000;
|
|
}
|
|
|
|
/* Handle the machine opt max-ram-below-4g. It is basically doing
|
|
* min(qemu limit, user limit).
|
|
*/
|
|
if (!pcms->max_ram_below_4g) {
|
|
pcms->max_ram_below_4g = 1ULL << 32; /* default: 4G */;
|
|
}
|
|
if (lowmem > pcms->max_ram_below_4g) {
|
|
lowmem = pcms->max_ram_below_4g;
|
|
if (machine->ram_size - lowmem > lowmem &&
|
|
lowmem & ((1ULL << 30) - 1)) {
|
|
error_report("Warning: Large machine and max_ram_below_4g(%"PRIu64
|
|
") not a multiple of 1G; possible bad performance.",
|
|
pcms->max_ram_below_4g);
|
|
}
|
|
}
|
|
|
|
if (machine->ram_size >= lowmem) {
|
|
pcms->above_4g_mem_size = machine->ram_size - lowmem;
|
|
pcms->below_4g_mem_size = lowmem;
|
|
} else {
|
|
pcms->above_4g_mem_size = 0;
|
|
pcms->below_4g_mem_size = machine->ram_size;
|
|
}
|
|
|
|
if (xen_enabled()) {
|
|
xen_hvm_init(pcms, &ram_memory);
|
|
}
|
|
|
|
pc_cpus_init(pcms);
|
|
|
|
kvmclock_create();
|
|
|
|
/* pci enabled */
|
|
if (pcmc->pci_enabled) {
|
|
pci_memory = g_new(MemoryRegion, 1);
|
|
memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
|
|
rom_memory = pci_memory;
|
|
} else {
|
|
pci_memory = NULL;
|
|
rom_memory = get_system_memory();
|
|
}
|
|
|
|
pc_guest_info_init(pcms);
|
|
|
|
if (pcmc->smbios_defaults) {
|
|
/* These values are guest ABI, do not change */
|
|
smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
|
|
mc->name, pcmc->smbios_legacy_mode,
|
|
pcmc->smbios_uuid_encoded,
|
|
SMBIOS_ENTRY_POINT_21);
|
|
}
|
|
|
|
/* allocate ram and load rom/bios */
|
|
if (!xen_enabled()) {
|
|
pc_memory_init(pcms, get_system_memory(),
|
|
rom_memory, &ram_memory);
|
|
}
|
|
|
|
/* irq lines */
|
|
gsi_state = g_malloc0(sizeof(*gsi_state));
|
|
if (kvm_ioapic_in_kernel()) {
|
|
kvm_pc_setup_irq_routing(pcmc->pci_enabled);
|
|
pcms->gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
|
|
GSI_NUM_PINS);
|
|
} else {
|
|
pcms->gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
|
|
}
|
|
|
|
/* create pci host bus */
|
|
q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE));
|
|
|
|
object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL);
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory),
|
|
MCH_HOST_PROP_RAM_MEM, NULL);
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory),
|
|
MCH_HOST_PROP_PCI_MEM, NULL);
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(get_system_memory()),
|
|
MCH_HOST_PROP_SYSTEM_MEM, NULL);
|
|
object_property_set_link(OBJECT(q35_host), OBJECT(system_io),
|
|
MCH_HOST_PROP_IO_MEM, NULL);
|
|
object_property_set_int(OBJECT(q35_host), pcms->below_4g_mem_size,
|
|
PCI_HOST_BELOW_4G_MEM_SIZE, NULL);
|
|
object_property_set_int(OBJECT(q35_host), pcms->above_4g_mem_size,
|
|
PCI_HOST_ABOVE_4G_MEM_SIZE, NULL);
|
|
/* pci */
|
|
qdev_init_nofail(DEVICE(q35_host));
|
|
phb = PCI_HOST_BRIDGE(q35_host);
|
|
host_bus = phb->bus;
|
|
/* create ISA bus */
|
|
lpc = pci_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_LPC_DEV,
|
|
ICH9_LPC_FUNC), true,
|
|
TYPE_ICH9_LPC_DEVICE);
|
|
|
|
object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP,
|
|
TYPE_HOTPLUG_HANDLER,
|
|
(Object **)&pcms->acpi_dev,
|
|
object_property_allow_set_link,
|
|
OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort);
|
|
object_property_set_link(OBJECT(machine), OBJECT(lpc),
|
|
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
|
|
|
|
ich9_lpc = ICH9_LPC_DEVICE(lpc);
|
|
lpc_dev = DEVICE(lpc);
|
|
for (i = 0; i < GSI_NUM_PINS; i++) {
|
|
qdev_connect_gpio_out_named(lpc_dev, ICH9_GPIO_GSI, i, pcms->gsi[i]);
|
|
}
|
|
pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc,
|
|
ICH9_LPC_NB_PIRQS);
|
|
pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq);
|
|
isa_bus = ich9_lpc->isa_bus;
|
|
|
|
if (kvm_pic_in_kernel()) {
|
|
i8259 = kvm_i8259_init(isa_bus);
|
|
} else if (xen_enabled()) {
|
|
i8259 = xen_interrupt_controller_init();
|
|
} else {
|
|
i8259 = i8259_init(isa_bus, pc_allocate_cpu_irq());
|
|
}
|
|
|
|
for (i = 0; i < ISA_NUM_IRQS; i++) {
|
|
gsi_state->i8259_irq[i] = i8259[i];
|
|
}
|
|
g_free(i8259);
|
|
|
|
if (pcmc->pci_enabled) {
|
|
ioapic_init_gsi(gsi_state, "q35");
|
|
}
|
|
|
|
pc_register_ferr_irq(pcms->gsi[13]);
|
|
|
|
assert(pcms->vmport != ON_OFF_AUTO__MAX);
|
|
if (pcms->vmport == ON_OFF_AUTO_AUTO) {
|
|
pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
|
|
}
|
|
|
|
/* init basic PC hardware */
|
|
pc_basic_device_init(isa_bus, pcms->gsi, &rtc_state, !mc->no_floppy,
|
|
(pcms->vmport != ON_OFF_AUTO_ON), pcms->pit,
|
|
0xff0104);
|
|
|
|
/* connect pm stuff to lpc */
|
|
ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms));
|
|
|
|
if (pcms->sata) {
|
|
/* ahci and SATA device, for q35 1 ahci controller is built-in */
|
|
ahci = pci_create_simple_multifunction(host_bus,
|
|
PCI_DEVFN(ICH9_SATA1_DEV,
|
|
ICH9_SATA1_FUNC),
|
|
true, "ich9-ahci");
|
|
idebus[0] = qdev_get_child_bus(&ahci->qdev, "ide.0");
|
|
idebus[1] = qdev_get_child_bus(&ahci->qdev, "ide.1");
|
|
g_assert(MAX_SATA_PORTS == ICH_AHCI(ahci)->ahci.ports);
|
|
ide_drive_get(hd, ICH_AHCI(ahci)->ahci.ports);
|
|
ahci_ide_create_devs(ahci, hd);
|
|
} else {
|
|
idebus[0] = idebus[1] = NULL;
|
|
}
|
|
|
|
if (machine_usb(machine)) {
|
|
/* Should we create 6 UHCI according to ich9 spec? */
|
|
ehci_create_ich9_with_companions(host_bus, 0x1d);
|
|
}
|
|
|
|
if (pcms->smbus) {
|
|
/* TODO: Populate SPD eeprom data. */
|
|
smbus_eeprom_init(ich9_smb_init(host_bus,
|
|
PCI_DEVFN(ICH9_SMB_DEV, ICH9_SMB_FUNC),
|
|
0xb100),
|
|
8, NULL, 0);
|
|
}
|
|
|
|
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
|
|
|
|
/* the rest devices to which pci devfn is automatically assigned */
|
|
pc_vga_init(isa_bus, host_bus);
|
|
pc_nic_init(isa_bus, host_bus);
|
|
if (pcmc->pci_enabled) {
|
|
pc_pci_device_init(host_bus);
|
|
}
|
|
|
|
if (pcms->acpi_nvdimm_state.is_enabled) {
|
|
nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io,
|
|
pcms->fw_cfg, OBJECT(pcms));
|
|
}
|
|
}
|
|
|
|
#define DEFINE_Q35_MACHINE(suffix, name, compatfn, optionfn) \
|
|
static void pc_init_##suffix(MachineState *machine) \
|
|
{ \
|
|
void (*compat)(MachineState *m) = (compatfn); \
|
|
if (compat) { \
|
|
compat(machine); \
|
|
} \
|
|
pc_q35_init(machine); \
|
|
} \
|
|
DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
|
|
|
|
|
|
static void pc_q35_machine_options(MachineClass *m)
|
|
{
|
|
m->family = "pc_q35";
|
|
m->desc = "Standard PC (Q35 + ICH9, 2009)";
|
|
m->hot_add_cpu = pc_hot_add_cpu;
|
|
m->units_per_default_bus = 1;
|
|
m->default_machine_opts = "firmware=bios-256k.bin";
|
|
m->default_display = "std";
|
|
m->no_floppy = 1;
|
|
m->has_dynamic_sysbus = true;
|
|
m->max_cpus = 288;
|
|
}
|
|
|
|
static void pc_q35_2_9_machine_options(MachineClass *m)
|
|
{
|
|
pc_q35_machine_options(m);
|
|
m->alias = "q35";
|
|
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
|
|
}
|
|
|
|
DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
|
|
pc_q35_2_9_machine_options);
|
|
|
|
static void pc_q35_2_8_machine_options(MachineClass *m)
|
|
{
|
|
pc_q35_2_9_machine_options(m);
|
|
m->alias = NULL;
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_8);
|
|
}
|
|
|
|
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
|
|
pc_q35_2_8_machine_options);
|
|
|
|
static void pc_q35_2_7_machine_options(MachineClass *m)
|
|
{
|
|
pc_q35_2_8_machine_options(m);
|
|
m->max_cpus = 255;
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7);
|
|
}
|
|
|
|
DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,
|
|
pc_q35_2_7_machine_options);
|
|
|
|
static void pc_q35_2_6_machine_options(MachineClass *m)
|
|
{
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
pc_q35_2_7_machine_options(m);
|
|
pcmc->legacy_cpu_hotplug = true;
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_6);
|
|
}
|
|
|
|
DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
|
|
pc_q35_2_6_machine_options);
|
|
|
|
static void pc_q35_2_5_machine_options(MachineClass *m)
|
|
{
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
pc_q35_2_6_machine_options(m);
|
|
pcmc->save_tsc_khz = false;
|
|
m->legacy_fw_cfg_order = 1;
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
|
|
}
|
|
|
|
DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
|
|
pc_q35_2_5_machine_options);
|
|
|
|
static void pc_q35_2_4_machine_options(MachineClass *m)
|
|
{
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
pc_q35_2_5_machine_options(m);
|
|
m->hw_version = "2.4.0";
|
|
pcmc->broken_reserved_end = true;
|
|
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
|
|
}
|
|
|
|
DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
|
|
pc_q35_2_4_machine_options);
|