From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:ad09:0:0:0:0:0 with SMTP id t9csp3484344lfc; Mon, 31 Aug 2020 00:51:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyywJ2QWn9Y2AhTwz5UwI8s4/z2EZEfJFyd4WBaF/a4PlFYDsSApklmqIrSC6fk4R72NWcL X-Received: by 2002:a25:dc13:: with SMTP id y19mr557867ybe.247.1598860261226; Mon, 31 Aug 2020 00:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598860261; cv=none; d=google.com; s=arc-20160816; b=Ee2DNvUCRvQVlq5LMFAIWXLgqP+JkoSiGKBRAsEPtAlatHQTGB/Kkdzt003QeQm9Yq 4yzaQzRgJ+T1uVVxAfnI2EuPUBfHQYFqmGk1z9Aakz632aIdpsjOWfQZIFIm8nC3QZj3 YSapRO7BgMKg7qybMEi0yfr/J1pAq/rUrlRQRrh/oXLNM/ipBXhnOr/2ucI1zUVm7Ga7 8jDJJ9IWnS0o1B7SCvQMAiLrkPITNFNpaRpIl7pF3V02QwJbSp1w92M5mjZu03Es+wA4 a0ekmYRM/GNT+1a/bqFFDzXPnc1O3KYcM+6sTHa7H+ryCy6NlcO5HT9SyOz011beyDgl VdtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:subject:to:from:date :dkim-signature; bh=TMW+5u9zp3kQ+o800Qso5sB64KwKl8c0ERhbchrlD+I=; b=BUH3hDFDmAvCQn9l/f5NofTEA2Ayiw31j/jet/WQ1I4R9tYcRoxKML+9Hvt6zsJ2xg J5BY5U+gKC6AdYT+Kib5b3BOHQjZ5uv7GsqEUmQxdoZ3kHl40J1Yg2qVGO3enKF90zyO PSLlBH0Xhya2+/2OMUu4zGd7z3HPy2SsfARvbJc+8S3Y9BFLbvcfBnk8td/fCZu8YSZ5 WMs8vm20VDtzw+brTEMNKRoZq23YOTh9m5Jvv7I2qoNXtru1Sa1X1A2G9Ll75AE+Zk65 PvfJEzWm2/0iCVJnqD8TtvPeeoBLRzfGGjxXdjJqRPBwsD5knMLZYNaMvCJOx1ziyPIz JdFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=KAizCitN; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i140si6753416yba.254.2020.08.31.00.51.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 31 Aug 2020 00:51:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=KAizCitN; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:37620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCeai-0002NP-Id for alex.bennee@linaro.org; Mon, 31 Aug 2020 03:51:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCeaa-0002NI-FC for qemu-arm@nongnu.org; Mon, 31 Aug 2020 03:50:52 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51355 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCeaX-0001Ny-H9 for qemu-arm@nongnu.org; Mon, 31 Aug 2020 03:50:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598860248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TMW+5u9zp3kQ+o800Qso5sB64KwKl8c0ERhbchrlD+I=; b=KAizCitN4WgT7mZvTuLAy+ALl/ie4UvRjovdj0TH5c4UgN5pxp1TbVgh0TGAgctG4AomEz lnpR4MKq9NyLBkx586AFGDz/TN68v1N9fggJ335FJbktZEn/Cjki92cQCvexyl9ohZWH6w AfZfU4kl8pmS6kgwXUaHjb60ST6UxuY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-281-iVDo7tPvOqym_fSCOQQnrA-1; Mon, 31 Aug 2020 03:50:46 -0400 X-MC-Unique: iVDo7tPvOqym_fSCOQQnrA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7115D801ADB; Mon, 31 Aug 2020 07:50:45 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA4F41014174; Mon, 31 Aug 2020 07:50:33 +0000 (UTC) Date: Mon, 31 Aug 2020 09:50:32 +0200 From: Igor Mammedov To: Gerd Hoffmann Subject: Re: [PATCH v6 15/20] x86: move cpu hotplug from pc to x86 Message-ID: <20200831095032.55e7863b@redhat.com> In-Reply-To: <20200826105254.28496-16-kraxel@redhat.com> References: <20200826105254.28496-1-kraxel@redhat.com> <20200826105254.28496-16-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=imammedo@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 02:54:46 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Babu Moger , Shannon Zhao , qemu-arm@nongnu.org, Paolo Bonzini , Richard Henderson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: Kt18b3UFVrda On Wed, 26 Aug 2020 12:52:49 +0200 Gerd Hoffmann 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. > Signed-off-by: Gerd Hoffmann > --- > 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) > {