mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
Machine/CPU/NUMA queue, 2017-09-19
-----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJZwXs9AAoJECgHk2+YTcWmS18P/1OceEmetatwBQ6YWURA0VfU CB+nCHxijlWXU8UiwoTVDOXc11P00V5VO0mMFouUbv+o+/80qyAfNl2DhDVq7ZXo nhIFHKXUR1BX3YbcqfIonH8xCMGtrAexghhhaGPQbx450PqmGyyjBsZsXttNge1S Yt+jzgD9drsZPYw4ZLJjT/tnWI/+8kDPn37jVujzRzApTD9/fq+77ZZq7q25RzQH ISa5OXOQk6pq+tPHvaIFXfOqfhILcpM7u/X7MYVwiA1oBqcLXTDCjDX3cKavKade +i3yrH7ahNgUO1DyT2bMZX6NAFoZDBrwlYgpkw8n+Yf+EUcdPDOHHEcEeaMpdTGx wgWbQrs+xzIg/ulRb8Qqe9FwdXGQbehfFGofd+gnGQ0XuxekT82in+ucMOivQO3x W/azGnzoz6D83stJFIZ93S69SRswqBuj2R8mu821yzqx1EUSNXgfKXz9OPwwFed5 El9YN127F/VAyp0av1CsOg1XgqIujMUGRxGf7eQBfkh1R3C/g2XNPTvR3yaY9L5B zuMJfWLF6r6zL53ymt7/9UVEim295Lia3mNGS5/Min5QGms7edphsDsrubzXsZGq 2owWfAU/KeDH9gNVNNkZdLcEcS5TEz+2oGPR5oeDeB/QlzVdNQ3FeTVlzFavxNQa 8nrzeFcw7VNrIx2gdvsY =LQ8U -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging Machine/CPU/NUMA queue, 2017-09-19 # gpg: Signature made Tue 19 Sep 2017 21:17:01 BST # gpg: using RSA key 0x2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-next-pull-request: MAINTAINERS: Update git URLs for my trees hw/acpi-build: Fix SRAT memory building in case of node 0 without RAM NUMA: Replace MAX_NODES with nb_numa_nodes in for loop numa: cpu: calculate/set default node-ids after all -numa CLI options are parsed arm: drop intermediate cpu_model -> cpu type parsing and use cpu type directly pc: use generic cpu_model parsing vl.c: convert cpu_model to cpu type and set of global properties before machine_init() cpu: make cpu_generic_init() abort QEMU on error qom: cpus: split cpu_generic_init() on feature parsing and cpu creation parts hostmem-file: Add "discard-data" option osdep: Define QEMU_MADV_REMOVE vl: Clean up user-creatable objects when exiting Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
d3f5433c7b
82 changed files with 307 additions and 525 deletions
|
|
@ -2288,6 +2288,9 @@ build_tpm2(GArray *table_data, BIOSLinker *linker)
|
|||
(void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL);
|
||||
}
|
||||
|
||||
#define HOLE_640K_START (640 * 1024)
|
||||
#define HOLE_640K_END (1024 * 1024)
|
||||
|
||||
static void
|
||||
build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
|
||||
{
|
||||
|
|
@ -2343,17 +2346,30 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
|
|||
next_base = 0;
|
||||
numa_start = table_data->len;
|
||||
|
||||
numamem = acpi_data_push(table_data, sizeof *numamem);
|
||||
build_srat_memory(numamem, 0, 640 * 1024, 0, MEM_AFFINITY_ENABLED);
|
||||
next_base = 1024 * 1024;
|
||||
for (i = 1; i < pcms->numa_nodes + 1; ++i) {
|
||||
mem_base = next_base;
|
||||
mem_len = pcms->node_mem[i - 1];
|
||||
if (i == 1) {
|
||||
mem_len -= 1024 * 1024;
|
||||
}
|
||||
next_base = mem_base + mem_len;
|
||||
|
||||
/* Cut out the 640K hole */
|
||||
if (mem_base <= HOLE_640K_START &&
|
||||
next_base > HOLE_640K_START) {
|
||||
mem_len -= next_base - HOLE_640K_START;
|
||||
if (mem_len > 0) {
|
||||
numamem = acpi_data_push(table_data, sizeof *numamem);
|
||||
build_srat_memory(numamem, mem_base, mem_len, i - 1,
|
||||
MEM_AFFINITY_ENABLED);
|
||||
}
|
||||
|
||||
/* Check for the rare case: 640K < RAM < 1M */
|
||||
if (next_base <= HOLE_640K_END) {
|
||||
next_base = HOLE_640K_END;
|
||||
continue;
|
||||
}
|
||||
mem_base = HOLE_640K_END;
|
||||
mem_len = next_base - HOLE_640K_END;
|
||||
}
|
||||
|
||||
/* Cut out the ACPI_PCI hole */
|
||||
if (mem_base <= pcms->below_4g_mem_size &&
|
||||
next_base > pcms->below_4g_mem_size) {
|
||||
|
|
|
|||
61
hw/i386/pc.c
61
hw/i386/pc.c
|
|
@ -1107,7 +1107,6 @@ static void pc_new_cpu(const char *typename, int64_t apic_id, Error **errp)
|
|||
|
||||
void pc_hot_add_cpu(const int64_t id, Error **errp)
|
||||
{
|
||||
ObjectClass *oc;
|
||||
MachineState *ms = MACHINE(qdev_get_machine());
|
||||
int64_t apic_id = x86_cpu_apic_id_from_index(id);
|
||||
Error *local_err = NULL;
|
||||
|
|
@ -1124,9 +1123,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
assert(ms->possible_cpus->cpus[0].cpu); /* BSP is always present */
|
||||
oc = OBJECT_CLASS(CPU_GET_CLASS(ms->possible_cpus->cpus[0].cpu));
|
||||
pc_new_cpu(object_class_get_name(oc), apic_id, &local_err);
|
||||
pc_new_cpu(ms->cpu_type, apic_id, &local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
return;
|
||||
|
|
@ -1136,39 +1133,10 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)
|
|||
void pc_cpus_init(PCMachineState *pcms)
|
||||
{
|
||||
int i;
|
||||
CPUClass *cc;
|
||||
ObjectClass *oc;
|
||||
const char *typename;
|
||||
gchar **model_pieces;
|
||||
const CPUArchIdList *possible_cpus;
|
||||
MachineState *machine = MACHINE(pcms);
|
||||
MachineState *ms = MACHINE(pcms);
|
||||
MachineClass *mc = MACHINE_GET_CLASS(pcms);
|
||||
|
||||
/* init CPUs */
|
||||
if (machine->cpu_model == NULL) {
|
||||
#ifdef TARGET_X86_64
|
||||
machine->cpu_model = "qemu64";
|
||||
#else
|
||||
machine->cpu_model = "qemu32";
|
||||
#endif
|
||||
}
|
||||
|
||||
model_pieces = g_strsplit(machine->cpu_model, ",", 2);
|
||||
if (!model_pieces[0]) {
|
||||
error_report("Invalid/empty CPU model name");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
oc = cpu_class_by_name(TYPE_X86_CPU, model_pieces[0]);
|
||||
if (oc == NULL) {
|
||||
error_report("Unable to find CPU definition: %s", model_pieces[0]);
|
||||
exit(1);
|
||||
}
|
||||
typename = object_class_get_name(oc);
|
||||
cc = CPU_CLASS(oc);
|
||||
cc->parse_features(typename, model_pieces[1], &error_fatal);
|
||||
g_strfreev(model_pieces);
|
||||
|
||||
/* Calculates the limit to CPU APIC ID values
|
||||
*
|
||||
* Limit for the APIC ID value, so that all
|
||||
|
|
@ -1177,9 +1145,9 @@ void pc_cpus_init(PCMachineState *pcms)
|
|||
* This is used for FW_CFG_MAX_CPUS. See comments on bochs_bios_init().
|
||||
*/
|
||||
pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1;
|
||||
possible_cpus = mc->possible_cpu_arch_ids(machine);
|
||||
possible_cpus = mc->possible_cpu_arch_ids(ms);
|
||||
for (i = 0; i < smp_cpus; i++) {
|
||||
pc_new_cpu(typename, possible_cpus->cpus[i].arch_id, &error_fatal);
|
||||
pc_new_cpu(ms->cpu_type, possible_cpus->cpus[i].arch_id, &error_fatal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2265,6 +2233,16 @@ pc_cpu_index_to_props(MachineState *ms, unsigned cpu_index)
|
|||
return possible_cpus->cpus[cpu_index].props;
|
||||
}
|
||||
|
||||
static int64_t pc_get_default_cpu_node_id(const MachineState *ms, int idx)
|
||||
{
|
||||
X86CPUTopoInfo topo;
|
||||
|
||||
assert(idx < ms->possible_cpus->len);
|
||||
x86_topo_ids_from_apicid(ms->possible_cpus->cpus[idx].arch_id,
|
||||
smp_cores, smp_threads, &topo);
|
||||
return topo.pkg_id % nb_numa_nodes;
|
||||
}
|
||||
|
||||
static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms)
|
||||
{
|
||||
int i;
|
||||
|
|
@ -2294,15 +2272,6 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms)
|
|||
ms->possible_cpus->cpus[i].props.core_id = topo.core_id;
|
||||
ms->possible_cpus->cpus[i].props.has_thread_id = true;
|
||||
ms->possible_cpus->cpus[i].props.thread_id = topo.smt_id;
|
||||
|
||||
/* default distribution of CPUs over NUMA nodes */
|
||||
if (nb_numa_nodes) {
|
||||
/* preset values but do not enable them i.e. 'has_node_id = false',
|
||||
* numa init code will enable them later if manual mapping wasn't
|
||||
* present on CLI */
|
||||
ms->possible_cpus->cpus[i].props.node_id =
|
||||
topo.pkg_id % nb_numa_nodes;
|
||||
}
|
||||
}
|
||||
return ms->possible_cpus;
|
||||
}
|
||||
|
|
@ -2347,6 +2316,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
|
|||
pcmc->linuxboot_dma_enabled = true;
|
||||
mc->get_hotplug_handler = pc_get_hotpug_handler;
|
||||
mc->cpu_index_to_instance_props = pc_cpu_index_to_props;
|
||||
mc->get_default_cpu_node_id = pc_get_default_cpu_node_id;
|
||||
mc->possible_cpu_arch_ids = pc_possible_cpu_arch_ids;
|
||||
mc->has_hotpluggable_cpus = true;
|
||||
mc->default_boot_order = "cad";
|
||||
|
|
@ -2359,6 +2329,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
|
|||
hc->unplug_request = pc_machine_device_unplug_request_cb;
|
||||
hc->unplug = pc_machine_device_unplug_cb;
|
||||
nc->nmi_monitor_handler = x86_nmi;
|
||||
mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;
|
||||
|
||||
object_class_property_add(oc, PC_MACHINE_MEMHP_REGION_SIZE, "int",
|
||||
pc_machine_get_hotplug_memory_region_size, NULL,
|
||||
|
|
|
|||
|
|
@ -378,9 +378,6 @@ static void pc_compat_0_13(MachineState *machine)
|
|||
|
||||
static void pc_init_isa(MachineState *machine)
|
||||
{
|
||||
if (!machine->cpu_model) {
|
||||
machine->cpu_model = "486";
|
||||
}
|
||||
x86_cpu_change_kvm_default("kvm-pv-eoi", NULL);
|
||||
enable_compat_apic_id_mode();
|
||||
pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE);
|
||||
|
|
@ -1113,6 +1110,7 @@ static void isapc_machine_options(MachineClass *m)
|
|||
pcmc->gigabyte_align = false;
|
||||
pcmc->smbios_legacy_mode = true;
|
||||
pcmc->has_reserved_memory = false;
|
||||
m->default_cpu_type = X86_CPU_TYPE_NAME("486");
|
||||
}
|
||||
|
||||
DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue