From nobody Thu Apr 3 11:39:53 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17411552775334.514239399211192; Tue, 4 Mar 2025 22:14:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpi0M-0000rx-7p; Wed, 05 Mar 2025 01:13:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpi0K-0000rH-H0 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 01:13:16 -0500 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpi0I-0004IA-E5 for qemu-devel@nongnu.org; Wed, 05 Mar 2025 01:13:16 -0500 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8AxmnFt68dn1N+KAA--.40644S3; Wed, 05 Mar 2025 14:13:01 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMBx3MRi68dnfRQ3AA--.5679S14; Wed, 05 Mar 2025 14:13:01 +0800 (CST) From: Bibo Mao To: Stefan Hajnoczi Cc: qemu-devel@nongnu.org, Song Gao , Xianglai Li Subject: [PULL 12/15] hw/loongarch/virt: Implement cpu plug interface Date: Wed, 5 Mar 2025 14:12:47 +0800 Message-Id: <20250305061250.1908444-13-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250305061250.1908444-1-maobibo@loongson.cn> References: <20250305061250.1908444-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowMBx3MRi68dnfRQ3AA--.5679S14 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1741155279683019000 Content-Type: text/plain; charset="utf-8" Implement cpu plug interface, and cold-plug cpu uses plug interface when cpu object is created. Co-developed-by: Xianglai Li Signed-off-by: Bibo Mao --- hw/loongarch/virt.c | 88 ++++++++++++++++++++++++++++++++++++------ target/loongarch/cpu.c | 1 + 2 files changed, 78 insertions(+), 11 deletions(-) diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index 297f71dc00..7788efbe44 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -647,15 +647,13 @@ static void fw_cfg_add_memory(MachineState *ms) =20 static void virt_init(MachineState *machine) { - LoongArchCPU *lacpu; const char *cpu_model =3D machine->cpu_type; MemoryRegion *address_space_mem =3D get_system_memory(); LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(machine); int i; hwaddr base, size, ram_size =3D machine->ram_size; - const CPUArchIdList *possible_cpus; MachineClass *mc =3D MACHINE_GET_CLASS(machine); - CPUState *cpu; + Object *cpuobj; =20 if (!cpu_model) { cpu_model =3D LOONGARCH_CPU_TYPE_NAME("la464"); @@ -671,14 +669,15 @@ static void virt_init(MachineState *machine) memory_region_add_subregion(&lvms->system_iocsr, 0, &lvms->iocsr_mem); =20 /* Init CPUs */ - possible_cpus =3D mc->possible_cpu_arch_ids(machine); - for (i =3D 0; i < possible_cpus->len; i++) { - cpu =3D cpu_create(machine->cpu_type); - cpu->cpu_index =3D i; - machine->possible_cpus->cpus[i].cpu =3D cpu; - lacpu =3D LOONGARCH_CPU(cpu); - lacpu->phy_id =3D machine->possible_cpus->cpus[i].arch_id; - lacpu->env.address_space_iocsr =3D &lvms->as_iocsr; + mc->possible_cpu_arch_ids(machine); + for (i =3D 0; i < machine->smp.cpus; i++) { + cpuobj =3D object_new(machine->cpu_type); + if (cpuobj =3D=3D NULL) { + error_report("Fail to create object with type %s ", + machine->cpu_type); + exit(EXIT_FAILURE); + } + qdev_realize_and_unref(DEVICE(cpuobj), NULL, &error_fatal); } fw_cfg_add_memory(machine); =20 @@ -829,9 +828,52 @@ static CPUArchId *virt_find_cpu_slot(MachineState *ms,= int arch_id) return NULL; } =20 +/* Find cpu slot for cold-plut CPU object where cpu is NULL */ +static CPUArchId *virt_find_empty_cpu_slot(MachineState *ms) +{ + int n; + for (n =3D 0; n < ms->possible_cpus->len; n++) { + if (ms->possible_cpus->cpus[n].cpu =3D=3D NULL) { + return &ms->possible_cpus->cpus[n]; + } + } + + return NULL; +} + static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(hotplug_dev= ); + MachineState *ms =3D MACHINE(OBJECT(hotplug_dev)); + LoongArchCPU *cpu =3D LOONGARCH_CPU(dev); + CPUState *cs =3D CPU(dev); + CPUArchId *cpu_slot; + Error *err =3D NULL; + LoongArchCPUTopo topo; + + if (lvms->acpi_ged) { + error_setg(&err, "CPU hotplug not supported"); + goto out; + } else { + /* For cold-add cpu, find empty cpu slot */ + cpu_slot =3D virt_find_empty_cpu_slot(ms); + topo.socket_id =3D cpu_slot->props.socket_id; + topo.core_id =3D cpu_slot->props.core_id; + topo.thread_id =3D cpu_slot->props.thread_id; + object_property_set_int(OBJECT(dev), "socket-id", topo.socket_id, = NULL); + object_property_set_int(OBJECT(dev), "core-id", topo.core_id, NULL= ); + object_property_set_int(OBJECT(dev), "thread-id", topo.thread_id, = NULL); + } + + cpu->env.address_space_iocsr =3D &lvms->as_iocsr; + cpu->phy_id =3D cpu_slot->arch_id; + cs->cpu_index =3D cpu_slot - ms->possible_cpus->cpus; + numa_cpu_pre_plug(cpu_slot, dev, &err); +out: + if (err) { + error_propagate(errp, err); + } } =20 static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev, @@ -892,6 +934,30 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_de= v, static void virt_cpu_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { + CPUArchId *cpu_slot; + LoongArchCPU *cpu =3D LOONGARCH_CPU(dev); + LoongArchVirtMachineState *lvms =3D LOONGARCH_VIRT_MACHINE(hotplug_dev= ); + Error *err =3D NULL; + + cpu_slot =3D virt_find_cpu_slot(MACHINE(lvms), cpu->phy_id); + cpu_slot->cpu =3D CPU(dev); + if (lvms->ipi) { + hotplug_handler_plug(HOTPLUG_HANDLER(lvms->ipi), dev, &err); + if (err) { + error_propagate(errp, err); + return; + } + } + + if (lvms->extioi) { + hotplug_handler_plug(HOTPLUG_HANDLER(lvms->extioi), dev, &err); + if (err) { + error_propagate(errp, err); + return; + } + } + + return; } =20 static bool memhp_type_supported(DeviceState *dev) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 8b99b8def4..b2961d8605 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -932,6 +932,7 @@ static void loongarch_cpu_class_init(ObjectClass *c, vo= id *data) #ifdef CONFIG_TCG cc->tcg_ops =3D &loongarch_tcg_ops; #endif + dc->user_creatable =3D true; } =20 static const gchar *loongarch32_gdb_arch_name(CPUState *cs) --=20 2.43.5