From: Babu Moger <babu.moger@amd.com>
To: Igor Mammedov <imammedo@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Thomas Huth <thuth@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"qemu-arm@nongnu.org" <qemu-arm@nongnu.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: RE: [PATCH v6 15/20] x86: move cpu hotplug from pc to x86
Date: Mon, 31 Aug 2020 08:12:13 -0500 [thread overview]
Message-ID: <1fb9ff57-9f7b-11d1-a3c7-e18550829ec4@amd.com> (raw)
In-Reply-To: <20200831095032.55e7863b@redhat.com>
> -----Original Message-----
> From: Igor Mammedov <imammedo@redhat.com>
> Sent: Monday, August 31, 2020 2:51 AM
> To: Gerd Hoffmann <kraxel@redhat.com>
> Cc: qemu-devel@nongnu.org; Laurent Vivier <lvivier@redhat.com>; Peter
> Maydell <peter.maydell@linaro.org>; Thomas Huth <thuth@redhat.com>;
> Eduardo Habkost <ehabkost@redhat.com>; Sergio Lopez
> <slp@redhat.com>; Michael S. Tsirkin <mst@redhat.com>; Shannon Zhao
> <shannon.zhaosl@gmail.com>; qemu-arm@nongnu.org; Paolo Bonzini
> <pbonzini@redhat.com>; Richard Henderson <rth@twiddle.net>; Moger,
> Babu <Babu.Moger@amd.com>
> Subject: Re: [PATCH v6 15/20] x86: move cpu hotplug from pc to x86
>
> On Wed, 26 Aug 2020 12:52:49 +0200
> Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> > The cpu hotplug code handles the iniu hotplug is not supported.
> >
> > Move the code from pc to x86, so microvm can use it.
> >
> > Move both plug and unplug to keep everything in one place, even though
> > microvm needs plug only.
>
> this will conflict with planned revert of EPYC changes
> 2e26f4ab3bf8 hw/i386: Move arch_id decode inside x86_cpus_init so it will
> mess up otherwise clean revert, I'd prefer revert being merged first and than
> this reased on top of it.
Sure. I will send the revert patches later today. Thanks
>
>
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> > ---
> > include/hw/i386/x86.h | 10 ++
> > hw/i386/pc.c | 283 +-----------------------------------------
> > hw/i386/x86.c | 268
> +++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 283 insertions(+), 278 deletions(-)
> >
> > diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index
> > de74c831c3ab..5c3803e74e31 100644
> > --- a/include/hw/i386/x86.h
> > +++ b/include/hw/i386/x86.h
> > @@ -102,6 +102,16 @@ CpuInstanceProperties
> x86_cpu_index_to_props(MachineState *ms,
> > unsigned cpu_index);
> > int64_t x86_get_default_cpu_node_id(const MachineState *ms, int idx);
> > const CPUArchIdList *x86_possible_cpu_arch_ids(MachineState *ms);
> > +CPUArchId *x86_find_cpu_slot(MachineState *ms, uint32_t id, int
> > +*idx); void x86_rtc_set_cpus_count(ISADevice *rtc, uint16_t
> > +cpus_count); void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp); void
> > +x86_cpu_plug(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp); void
> > +x86_cpu_unplug_request_cb(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp); void
> > +x86_cpu_unplug_cb(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp);
> >
> > void x86_bios_rom_init(MemoryRegion *rom_memory, bool
> isapc_ram_fw);
> >
> > diff --git a/hw/i386/pc.c b/hw/i386/pc.c index
> > 0bd6dbbd7bf6..b55369357e5d 100644
> > --- a/hw/i386/pc.c
> > +++ b/hw/i386/pc.c
> > @@ -803,19 +803,6 @@ void pc_hot_add_cpu(MachineState *ms, const
> int64_t id, Error **errp)
> > }
> > }
> >
> > -static void rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count)
> > -{
> > - if (cpus_count > 0xff) {
> > - /* If the number of CPUs can't be represented in 8 bits, the
> > - * BIOS must use "FW_CFG_NB_CPUS". Set RTC field to 0 just
> > - * to make old BIOSes fail more predictably.
> > - */
> > - rtc_set_memory(rtc, 0x5f, 0);
> > - } else {
> > - rtc_set_memory(rtc, 0x5f, cpus_count - 1);
> > - }
> > -}
> > -
> > static
> > void pc_machine_done(Notifier *notifier, void *data) { @@ -825,7
> > +812,7 @@ void pc_machine_done(Notifier *notifier, void *data)
> > PCIBus *bus = pcms->bus;
> >
> > /* set the number of CPUs */
> > - rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
> > + x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
> >
> > if (bus) {
> > int extra_hosts = 0;
> > @@ -1373,266 +1360,6 @@ static void pc_memory_unplug(HotplugHandler
> *hotplug_dev,
> > error_propagate(errp, local_err); }
> >
> > -static int pc_apic_cmp(const void *a, const void *b) -{
> > - CPUArchId *apic_a = (CPUArchId *)a;
> > - CPUArchId *apic_b = (CPUArchId *)b;
> > -
> > - return apic_a->arch_id - apic_b->arch_id;
> > -}
> > -
> > -/* returns pointer to CPUArchId descriptor that matches CPU's apic_id
> > - * in ms->possible_cpus->cpus, if ms->possible_cpus->cpus has no
> > - * entry corresponding to CPU's apic_id returns NULL.
> > - */
> > -static CPUArchId *pc_find_cpu_slot(MachineState *ms, uint32_t id, int
> > *idx) -{
> > - CPUArchId apic_id, *found_cpu;
> > -
> > - apic_id.arch_id = id;
> > - found_cpu = bsearch(&apic_id, ms->possible_cpus->cpus,
> > - ms->possible_cpus->len, sizeof(*ms->possible_cpus->cpus),
> > - pc_apic_cmp);
> > - if (found_cpu && idx) {
> > - *idx = found_cpu - ms->possible_cpus->cpus;
> > - }
> > - return found_cpu;
> > -}
> > -
> > -static void pc_cpu_plug(HotplugHandler *hotplug_dev,
> > - DeviceState *dev, Error **errp)
> > -{
> > - CPUArchId *found_cpu;
> > - Error *local_err = NULL;
> > - X86CPU *cpu = X86_CPU(dev);
> > - PCMachineState *pcms = PC_MACHINE(hotplug_dev);
> > - X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > -
> > - if (x86ms->acpi_dev) {
> > - hotplug_handler_plug(x86ms->acpi_dev, dev, &local_err);
> > - if (local_err) {
> > - goto out;
> > - }
> > - }
> > -
> > - /* increment the number of CPUs */
> > - x86ms->boot_cpus++;
> > - if (x86ms->rtc) {
> > - rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
> > - }
> > - if (x86ms->fw_cfg) {
> > - fw_cfg_modify_i16(x86ms->fw_cfg, FW_CFG_NB_CPUS, x86ms-
> >boot_cpus);
> > - }
> > -
> > - found_cpu = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL);
> > - found_cpu->cpu = OBJECT(dev);
> > -out:
> > - error_propagate(errp, local_err);
> > -}
> > -static void pc_cpu_unplug_request_cb(HotplugHandler *hotplug_dev,
> > - DeviceState *dev, Error **errp)
> > -{
> > - int idx = -1;
> > - X86CPU *cpu = X86_CPU(dev);
> > - PCMachineState *pcms = PC_MACHINE(hotplug_dev);
> > - X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > -
> > - if (!x86ms->acpi_dev) {
> > - error_setg(errp, "CPU hot unplug not supported without ACPI");
> > - return;
> > - }
> > -
> > - pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx);
> > - assert(idx != -1);
> > - if (idx == 0) {
> > - error_setg(errp, "Boot CPU is unpluggable");
> > - return;
> > - }
> > -
> > - hotplug_handler_unplug_request(x86ms->acpi_dev, dev,
> > - errp);
> > -}
> > -
> > -static void pc_cpu_unplug_cb(HotplugHandler *hotplug_dev,
> > - DeviceState *dev, Error **errp)
> > -{
> > - CPUArchId *found_cpu;
> > - Error *local_err = NULL;
> > - X86CPU *cpu = X86_CPU(dev);
> > - PCMachineState *pcms = PC_MACHINE(hotplug_dev);
> > - X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > -
> > - hotplug_handler_unplug(x86ms->acpi_dev, dev, &local_err);
> > - if (local_err) {
> > - goto out;
> > - }
> > -
> > - found_cpu = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, NULL);
> > - found_cpu->cpu = NULL;
> > - qdev_unrealize(dev);
> > -
> > - /* decrement the number of CPUs */
> > - x86ms->boot_cpus--;
> > - /* Update the number of CPUs in CMOS */
> > - rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
> > - fw_cfg_modify_i16(x86ms->fw_cfg, FW_CFG_NB_CPUS, x86ms-
> >boot_cpus);
> > - out:
> > - error_propagate(errp, local_err);
> > -}
> > -
> > -static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
> > - DeviceState *dev, Error **errp)
> > -{
> > - int idx;
> > - CPUState *cs;
> > - CPUArchId *cpu_slot;
> > - X86CPUTopoIDs topo_ids;
> > - X86CPU *cpu = X86_CPU(dev);
> > - CPUX86State *env = &cpu->env;
> > - MachineState *ms = MACHINE(hotplug_dev);
> > - PCMachineState *pcms = PC_MACHINE(hotplug_dev);
> > - X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > - unsigned int smp_cores = ms->smp.cores;
> > - unsigned int smp_threads = ms->smp.threads;
> > - X86CPUTopoInfo topo_info;
> > -
> > - if(!object_dynamic_cast(OBJECT(cpu), ms->cpu_type)) {
> > - error_setg(errp, "Invalid CPU type, expected cpu type: '%s'",
> > - ms->cpu_type);
> > - return;
> > - }
> > -
> > - init_topo_info(&topo_info, x86ms);
> > -
> > - env->nr_dies = x86ms->smp_dies;
> > - env->nr_nodes = topo_info.nodes_per_pkg;
> > - env->pkg_offset = x86ms->apicid_pkg_offset(&topo_info);
> > -
> > - /*
> > - * If APIC ID is not set,
> > - * set it based on socket/die/core/thread properties.
> > - */
> > - if (cpu->apic_id == UNASSIGNED_APIC_ID) {
> > - int max_socket = (ms->smp.max_cpus - 1) /
> > - smp_threads / smp_cores / x86ms->smp_dies;
> > -
> > - /*
> > - * die-id was optional in QEMU 4.0 and older, so keep it optional
> > - * if there's only one die per socket.
> > - */
> > - if (cpu->die_id < 0 && x86ms->smp_dies == 1) {
> > - cpu->die_id = 0;
> > - }
> > -
> > - if (cpu->socket_id < 0) {
> > - error_setg(errp, "CPU socket-id is not set");
> > - return;
> > - } else if (cpu->socket_id > max_socket) {
> > - error_setg(errp, "Invalid CPU socket-id: %u must be in range 0:%u",
> > - cpu->socket_id, max_socket);
> > - return;
> > - }
> > - if (cpu->die_id < 0) {
> > - error_setg(errp, "CPU die-id is not set");
> > - return;
> > - } else if (cpu->die_id > x86ms->smp_dies - 1) {
> > - error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u",
> > - cpu->die_id, x86ms->smp_dies - 1);
> > - return;
> > - }
> > - if (cpu->core_id < 0) {
> > - error_setg(errp, "CPU core-id is not set");
> > - return;
> > - } else if (cpu->core_id > (smp_cores - 1)) {
> > - error_setg(errp, "Invalid CPU core-id: %u must be in range 0:%u",
> > - cpu->core_id, smp_cores - 1);
> > - return;
> > - }
> > - if (cpu->thread_id < 0) {
> > - error_setg(errp, "CPU thread-id is not set");
> > - return;
> > - } else if (cpu->thread_id > (smp_threads - 1)) {
> > - error_setg(errp, "Invalid CPU thread-id: %u must be in range 0:%u",
> > - cpu->thread_id, smp_threads - 1);
> > - return;
> > - }
> > -
> > - topo_ids.pkg_id = cpu->socket_id;
> > - topo_ids.die_id = cpu->die_id;
> > - topo_ids.core_id = cpu->core_id;
> > - topo_ids.smt_id = cpu->thread_id;
> > - cpu->apic_id = x86ms->apicid_from_topo_ids(&topo_info,
> &topo_ids);
> > - }
> > -
> > - cpu_slot = pc_find_cpu_slot(MACHINE(pcms), cpu->apic_id, &idx);
> > - if (!cpu_slot) {
> > - MachineState *ms = MACHINE(pcms);
> > -
> > - x86ms->topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids);
> > - error_setg(errp,
> > - "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with"
> > - " APIC ID %" PRIu32 ", valid index range 0:%d",
> > - topo_ids.pkg_id, topo_ids.die_id, topo_ids.core_id,
> topo_ids.smt_id,
> > - cpu->apic_id, ms->possible_cpus->len - 1);
> > - return;
> > - }
> > -
> > - if (cpu_slot->cpu) {
> > - error_setg(errp, "CPU[%d] with APIC ID %" PRIu32 " exists",
> > - idx, cpu->apic_id);
> > - return;
> > - }
> > -
> > - /* if 'address' properties socket-id/core-id/thread-id are not set, set
> them
> > - * so that machine_query_hotpluggable_cpus would show correct
> values
> > - */
> > - /* TODO: move socket_id/core_id/thread_id checks into
> x86_cpu_realizefn()
> > - * once -smp refactoring is complete and there will be CPU private
> > - * CPUState::nr_cores and CPUState::nr_threads fields instead of globals
> */
> > - x86ms->topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids);
> > - if (cpu->socket_id != -1 && cpu->socket_id != topo_ids.pkg_id) {
> > - error_setg(errp, "property socket-id: %u doesn't match set apic-id:"
> > - " 0x%x (socket-id: %u)", cpu->socket_id, cpu->apic_id,
> > - topo_ids.pkg_id);
> > - return;
> > - }
> > - cpu->socket_id = topo_ids.pkg_id;
> > -
> > - if (cpu->die_id != -1 && cpu->die_id != topo_ids.die_id) {
> > - error_setg(errp, "property die-id: %u doesn't match set apic-id:"
> > - " 0x%x (die-id: %u)", cpu->die_id, cpu->apic_id, topo_ids.die_id);
> > - return;
> > - }
> > - cpu->die_id = topo_ids.die_id;
> > -
> > - if (cpu->core_id != -1 && cpu->core_id != topo_ids.core_id) {
> > - error_setg(errp, "property core-id: %u doesn't match set apic-id:"
> > - " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id,
> > - topo_ids.core_id);
> > - return;
> > - }
> > - cpu->core_id = topo_ids.core_id;
> > -
> > - if (cpu->thread_id != -1 && cpu->thread_id != topo_ids.smt_id) {
> > - error_setg(errp, "property thread-id: %u doesn't match set apic-id:"
> > - " 0x%x (thread-id: %u)", cpu->thread_id, cpu->apic_id,
> > - topo_ids.smt_id);
> > - return;
> > - }
> > - cpu->thread_id = topo_ids.smt_id;
> > -
> > - if (hyperv_feat_enabled(cpu, HYPERV_FEAT_VPINDEX) &&
> > - !kvm_hv_vpindex_settable()) {
> > - error_setg(errp, "kernel doesn't allow setting HyperV VP_INDEX");
> > - return;
> > - }
> > -
> > - cs = CPU(cpu);
> > - cs->cpu_index = idx;
> > -
> > - numa_cpu_pre_plug(cpu_slot, dev, errp);
> > -}
> > -
> > static void pc_virtio_md_pci_pre_plug(HotplugHandler *hotplug_dev,
> > DeviceState *dev, Error **errp)
> > { @@ -1701,7 +1428,7 @@ static void
> > pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
> > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > pc_memory_pre_plug(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> > - pc_cpu_pre_plug(hotplug_dev, dev, errp);
> > + x86_cpu_pre_plug(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI)
> ||
> > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
> > pc_virtio_md_pci_pre_plug(hotplug_dev, dev, errp); @@ -1714,7
> > +1441,7 @@ static void pc_machine_device_plug_cb(HotplugHandler
> *hotplug_dev,
> > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > pc_memory_plug(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> > - pc_cpu_plug(hotplug_dev, dev, errp);
> > + x86_cpu_plug(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI)
> ||
> > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
> > pc_virtio_md_pci_plug(hotplug_dev, dev, errp); @@ -1727,7
> > +1454,7 @@ static void
> pc_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > pc_memory_unplug_request(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> > - pc_cpu_unplug_request_cb(hotplug_dev, dev, errp);
> > + x86_cpu_unplug_request_cb(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI)
> ||
> > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
> > pc_virtio_md_pci_unplug_request(hotplug_dev, dev, errp); @@
> > -1743,7 +1470,7 @@ static void
> pc_machine_device_unplug_cb(HotplugHandler *hotplug_dev,
> > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {
> > pc_memory_unplug(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
> > - pc_cpu_unplug_cb(hotplug_dev, dev, errp);
> > + x86_cpu_unplug_cb(hotplug_dev, dev, errp);
> > } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI)
> ||
> > object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
> > pc_virtio_md_pci_unplug(hotplug_dev, dev, errp); diff --git
> > a/hw/i386/x86.c b/hw/i386/x86.c index 31a82885d735..f1eeca01cd79
> > 100644
> > --- a/hw/i386/x86.c
> > +++ b/hw/i386/x86.c
> > @@ -41,6 +41,7 @@
> > #include "hw/i386/topology.h"
> > #include "hw/i386/fw_cfg.h"
> > #include "hw/intc/i8259.h"
> > +#include "hw/rtc/mc146818rtc.h"
> >
> > #include "hw/acpi/cpu_hotplug.h"
> > #include "hw/irq.h"
> > @@ -165,6 +166,273 @@ void x86_cpus_init(X86MachineState *x86ms, int
> default_cpu_version)
> > }
> > }
> >
> > +void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp) {
> > + int idx;
> > + CPUState *cs;
> > + CPUArchId *cpu_slot;
> > + X86CPUTopoIDs topo_ids;
> > + X86CPU *cpu = X86_CPU(dev);
> > + CPUX86State *env = &cpu->env;
> > + MachineState *ms = MACHINE(hotplug_dev);
> > + X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > + unsigned int smp_cores = ms->smp.cores;
> > + unsigned int smp_threads = ms->smp.threads;
> > + X86CPUTopoInfo topo_info;
> > +
> > + if(!object_dynamic_cast(OBJECT(cpu), ms->cpu_type)) {
> > + error_setg(errp, "Invalid CPU type, expected cpu type: '%s'",
> > + ms->cpu_type);
> > + return;
> > + }
> > +
> > + init_topo_info(&topo_info, x86ms);
> > +
> > + env->nr_dies = x86ms->smp_dies;
> > + env->nr_nodes = topo_info.nodes_per_pkg;
> > + env->pkg_offset = x86ms->apicid_pkg_offset(&topo_info);
> > +
> > + /*
> > + * If APIC ID is not set,
> > + * set it based on socket/die/core/thread properties.
> > + */
> > + if (cpu->apic_id == UNASSIGNED_APIC_ID) {
> > + int max_socket = (ms->smp.max_cpus - 1) /
> > + smp_threads / smp_cores /
> > + x86ms->smp_dies;
> > +
> > + /*
> > + * die-id was optional in QEMU 4.0 and older, so keep it optional
> > + * if there's only one die per socket.
> > + */
> > + if (cpu->die_id < 0 && x86ms->smp_dies == 1) {
> > + cpu->die_id = 0;
> > + }
> > +
> > + if (cpu->socket_id < 0) {
> > + error_setg(errp, "CPU socket-id is not set");
> > + return;
> > + } else if (cpu->socket_id > max_socket) {
> > + error_setg(errp, "Invalid CPU socket-id: %u must be in range 0:%u",
> > + cpu->socket_id, max_socket);
> > + return;
> > + }
> > + if (cpu->die_id < 0) {
> > + error_setg(errp, "CPU die-id is not set");
> > + return;
> > + } else if (cpu->die_id > x86ms->smp_dies - 1) {
> > + error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u",
> > + cpu->die_id, x86ms->smp_dies - 1);
> > + return;
> > + }
> > + if (cpu->core_id < 0) {
> > + error_setg(errp, "CPU core-id is not set");
> > + return;
> > + } else if (cpu->core_id > (smp_cores - 1)) {
> > + error_setg(errp, "Invalid CPU core-id: %u must be in range 0:%u",
> > + cpu->core_id, smp_cores - 1);
> > + return;
> > + }
> > + if (cpu->thread_id < 0) {
> > + error_setg(errp, "CPU thread-id is not set");
> > + return;
> > + } else if (cpu->thread_id > (smp_threads - 1)) {
> > + error_setg(errp, "Invalid CPU thread-id: %u must be in range 0:%u",
> > + cpu->thread_id, smp_threads - 1);
> > + return;
> > + }
> > +
> > + topo_ids.pkg_id = cpu->socket_id;
> > + topo_ids.die_id = cpu->die_id;
> > + topo_ids.core_id = cpu->core_id;
> > + topo_ids.smt_id = cpu->thread_id;
> > + cpu->apic_id = x86ms->apicid_from_topo_ids(&topo_info,
> &topo_ids);
> > + }
> > +
> > + cpu_slot = x86_find_cpu_slot(MACHINE(x86ms), cpu->apic_id, &idx);
> > + if (!cpu_slot) {
> > + MachineState *ms = MACHINE(x86ms);
> > +
> > + x86ms->topo_ids_from_apicid(cpu->apic_id, &topo_info,
> &topo_ids);
> > + error_setg(errp,
> > + "Invalid CPU [socket: %u, die: %u, core: %u, thread: %u] with"
> > + " APIC ID %" PRIu32 ", valid index range 0:%d",
> > + topo_ids.pkg_id, topo_ids.die_id, topo_ids.core_id,
> topo_ids.smt_id,
> > + cpu->apic_id, ms->possible_cpus->len - 1);
> > + return;
> > + }
> > +
> > + if (cpu_slot->cpu) {
> > + error_setg(errp, "CPU[%d] with APIC ID %" PRIu32 " exists",
> > + idx, cpu->apic_id);
> > + return;
> > + }
> > +
> > + /* if 'address' properties socket-id/core-id/thread-id are not set, set
> them
> > + * so that machine_query_hotpluggable_cpus would show correct
> values
> > + */
> > + /* TODO: move socket_id/core_id/thread_id checks into
> x86_cpu_realizefn()
> > + * once -smp refactoring is complete and there will be CPU private
> > + * CPUState::nr_cores and CPUState::nr_threads fields instead of
> globals */
> > + x86ms->topo_ids_from_apicid(cpu->apic_id, &topo_info, &topo_ids);
> > + if (cpu->socket_id != -1 && cpu->socket_id != topo_ids.pkg_id) {
> > + error_setg(errp, "property socket-id: %u doesn't match set apic-id:"
> > + " 0x%x (socket-id: %u)", cpu->socket_id, cpu->apic_id,
> > + topo_ids.pkg_id);
> > + return;
> > + }
> > + cpu->socket_id = topo_ids.pkg_id;
> > +
> > + if (cpu->die_id != -1 && cpu->die_id != topo_ids.die_id) {
> > + error_setg(errp, "property die-id: %u doesn't match set apic-id:"
> > + " 0x%x (die-id: %u)", cpu->die_id, cpu->apic_id, topo_ids.die_id);
> > + return;
> > + }
> > + cpu->die_id = topo_ids.die_id;
> > +
> > + if (cpu->core_id != -1 && cpu->core_id != topo_ids.core_id) {
> > + error_setg(errp, "property core-id: %u doesn't match set apic-id:"
> > + " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id,
> > + topo_ids.core_id);
> > + return;
> > + }
> > + cpu->core_id = topo_ids.core_id;
> > +
> > + if (cpu->thread_id != -1 && cpu->thread_id != topo_ids.smt_id) {
> > + error_setg(errp, "property thread-id: %u doesn't match set apic-id:"
> > + " 0x%x (thread-id: %u)", cpu->thread_id, cpu->apic_id,
> > + topo_ids.smt_id);
> > + return;
> > + }
> > + cpu->thread_id = topo_ids.smt_id;
> > +
> > + if (hyperv_feat_enabled(cpu, HYPERV_FEAT_VPINDEX) &&
> > + !kvm_hv_vpindex_settable()) {
> > + error_setg(errp, "kernel doesn't allow setting HyperV VP_INDEX");
> > + return;
> > + }
> > +
> > + cs = CPU(cpu);
> > + cs->cpu_index = idx;
> > +
> > + numa_cpu_pre_plug(cpu_slot, dev, errp); }
> > +
> > +void x86_rtc_set_cpus_count(ISADevice *rtc, uint16_t cpus_count) {
> > + if (cpus_count > 0xff) {
> > + /* If the number of CPUs can't be represented in 8 bits, the
> > + * BIOS must use "FW_CFG_NB_CPUS". Set RTC field to 0 just
> > + * to make old BIOSes fail more predictably.
> > + */
> > + rtc_set_memory(rtc, 0x5f, 0);
> > + } else {
> > + rtc_set_memory(rtc, 0x5f, cpus_count - 1);
> > + }
> > +}
> > +
> > +static int x86_apic_cmp(const void *a, const void *b) {
> > + CPUArchId *apic_a = (CPUArchId *)a;
> > + CPUArchId *apic_b = (CPUArchId *)b;
> > +
> > + return apic_a->arch_id - apic_b->arch_id; }
> > +
> > +/* returns pointer to CPUArchId descriptor that matches CPU's apic_id
> > + * in ms->possible_cpus->cpus, if ms->possible_cpus->cpus has no
> > + * entry corresponding to CPU's apic_id returns NULL.
> > + */
> > +CPUArchId *x86_find_cpu_slot(MachineState *ms, uint32_t id, int *idx)
> > +{
> > + CPUArchId apic_id, *found_cpu;
> > +
> > + apic_id.arch_id = id;
> > + found_cpu = bsearch(&apic_id, ms->possible_cpus->cpus,
> > + ms->possible_cpus->len, sizeof(*ms->possible_cpus->cpus),
> > + x86_apic_cmp);
> > + if (found_cpu && idx) {
> > + *idx = found_cpu - ms->possible_cpus->cpus;
> > + }
> > + return found_cpu;
> > +}
> > +
> > +void x86_cpu_plug(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp) {
> > + CPUArchId *found_cpu;
> > + X86CPU *cpu = X86_CPU(dev);
> > + X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > +
> > + if (x86ms->acpi_dev) {
> > + hotplug_handler_plug(x86ms->acpi_dev, dev, errp);
> > + if (*errp) {
> > + return;
> > + }
> > + }
> > +
> > + /* increment the number of CPUs */
> > + x86ms->boot_cpus++;
> > + if (x86ms->rtc) {
> > + x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
> > + }
> > + if (x86ms->fw_cfg) {
> > + fw_cfg_modify_i16(x86ms->fw_cfg, FW_CFG_NB_CPUS, x86ms-
> >boot_cpus);
> > + }
> > +
> > + found_cpu = x86_find_cpu_slot(MACHINE(x86ms), cpu->apic_id,
> NULL);
> > + found_cpu->cpu = OBJECT(dev);
> > +}
> > +
> > +void x86_cpu_unplug_request_cb(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp) {
> > + int idx = -1;
> > + X86CPU *cpu = X86_CPU(dev);
> > + X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > +
> > + if (!x86ms->acpi_dev) {
> > + error_setg(errp, "CPU hot unplug not supported without ACPI");
> > + return;
> > + }
> > +
> > + x86_find_cpu_slot(MACHINE(x86ms), cpu->apic_id, &idx);
> > + assert(idx != -1);
> > + if (idx == 0) {
> > + error_setg(errp, "Boot CPU is unpluggable");
> > + return;
> > + }
> > +
> > + hotplug_handler_unplug_request(x86ms->acpi_dev, dev,
> > + errp); }
> > +
> > +void x86_cpu_unplug_cb(HotplugHandler *hotplug_dev,
> > + DeviceState *dev, Error **errp) {
> > + CPUArchId *found_cpu;
> > + Error *local_err = NULL;
> > + X86CPU *cpu = X86_CPU(dev);
> > + X86MachineState *x86ms = X86_MACHINE(hotplug_dev);
> > +
> > + hotplug_handler_unplug(x86ms->acpi_dev, dev, &local_err);
> > + if (local_err) {
> > + goto out;
> > + }
> > +
> > + found_cpu = x86_find_cpu_slot(MACHINE(x86ms), cpu->apic_id,
> NULL);
> > + found_cpu->cpu = NULL;
> > + qdev_unrealize(dev);
> > +
> > + /* decrement the number of CPUs */
> > + x86ms->boot_cpus--;
> > + /* Update the number of CPUs in CMOS */
> > + x86_rtc_set_cpus_count(x86ms->rtc, x86ms->boot_cpus);
> > + fw_cfg_modify_i16(x86ms->fw_cfg, FW_CFG_NB_CPUS,
> > +x86ms->boot_cpus);
> > + out:
> > + error_propagate(errp, local_err); }
> > +
> > CpuInstanceProperties
> > x86_cpu_index_to_props(MachineState *ms, unsigned cpu_index) {
next prev parent reply other threads:[~2020-08-31 13:13 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 10:52 [PATCH v6 00/20] microvm: add acpi support Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 01/20] microvm: name qboot binary qboot.rom Gerd Hoffmann
2020-08-27 8:25 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 02/20] seabios: add microvm config, update build rules Gerd Hoffmann
2020-08-27 14:35 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 03/20] seabios: add bios-microvm.bin binary Gerd Hoffmann
2020-08-27 14:48 ` Sergio Lopez
2020-08-28 5:02 ` Gerd Hoffmann
2020-08-28 10:57 ` Sergio Lopez
2020-08-28 12:12 ` Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 04/20] acpi: ged: add control regs Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 05/20] acpi: ged: add x86 device variant Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 06/20] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 07/20] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 08/20] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-08-31 8:06 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 09/20] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 10/20] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 11/20] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-08-27 14:54 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 12/20] microvm/acpi: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-08-27 8:26 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 13/20] x86: constify x86_machine_is_*_enabled Gerd Hoffmann
2020-08-27 14:56 ` Sergio Lopez
2020-08-31 7:55 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 14/20] x86: move acpi_dev from pc/microvm Gerd Hoffmann
2020-08-27 14:51 ` Sergio Lopez
2020-08-31 7:54 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 15/20] x86: move cpu hotplug from pc to x86 Gerd Hoffmann
2020-08-27 14:50 ` Sergio Lopez
2020-08-31 7:50 ` Igor Mammedov
2020-08-31 13:12 ` Babu Moger [this message]
2020-08-26 10:52 ` [PATCH v6 16/20] microvm: wire up hotplug Gerd Hoffmann
2020-08-27 14:54 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 17/20] tests/acpi: allow microvm test data updates Gerd Hoffmann
2020-08-26 10:52 ` [PATCH v6 18/20] tests/acpi: allow override blkdev Gerd Hoffmann
2020-08-27 14:55 ` Sergio Lopez
2020-08-26 10:52 ` [PATCH v6 19/20] tests/acpi: add microvm test Gerd Hoffmann
2020-08-31 7:43 ` Igor Mammedov
2020-08-31 9:46 ` Gerd Hoffmann
2020-08-31 15:00 ` Igor Mammedov
2020-08-26 10:52 ` [PATCH v6 20/20] tests/acpi: update expected data files for microvm Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1fb9ff57-9f7b-11d1-a3c7-e18550829ec4@amd.com \
--to=babu.moger@amd.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=shannon.zhaosl@gmail.com \
--cc=slp@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.