From nobody Wed Oct 23 00:26:25 2024 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; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1728986904; cv=none; d=zohomail.com; s=zohoarc; b=fBh5NRQbnGtGsK62gm3ilMAbIvvplLJVuaUlOBCM8jnviMA4stlyRGOL8ykd/OWXcyplg1l1BxbAgNWBEPV4hD+rIJ0jLD66zGGcIlWu1DgWbDltyGze96Ly8Koxi2CEPTeXvy+wNwtox2tCH0qoTv79iwBS+EsMjJ5LbeC/SW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728986904; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=cfzfDLLf9xiYRqICfIYhaTgYVk2WIGmOhalHqhYtblM=; b=CoF6IjVjBcZN/n1DrQX30/r/5G3M7kMHSJ+aR+2iYmE8Ou/EJp+Kqttd42UDbyyPe14eOVSTAdJPF+25hvi7mzIjCfyRuAVCdP53ogKeSnTg3OISI2Tf1m4Li3IaDm6bSC5M6m4xOATl/jAY0mgkrcpq5Ybt6V2UiMzGsZkGIMU= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17289869045211012.4308476134107; Tue, 15 Oct 2024 03:08:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0eTO-0004LF-PO; Tue, 15 Oct 2024 06:08:15 -0400 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 1t0eT0-0004AV-Aw; Tue, 15 Oct 2024 06:07:52 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0eSv-0002CP-Ez; Tue, 15 Oct 2024 06:07:47 -0400 Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4XSV5r1Mr9z6DB5T; Tue, 15 Oct 2024 18:02:56 +0800 (CST) Received: from frapeml500007.china.huawei.com (unknown [7.182.85.172]) by mail.maildlp.com (Postfix) with ESMTPS id 853B21404F5; Tue, 15 Oct 2024 18:07:24 +0800 (CST) Received: from 00293818-MRGF.huawei.com (10.48.146.149) by frapeml500007.china.huawei.com (7.182.85.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Tue, 15 Oct 2024 12:07:04 +0200 To: , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH RFC V5 19/30] hw/arm, gicv3: Changes to notify GICv3 CPU state with vCPU hot-(un)plug event Date: Tue, 15 Oct 2024 11:00:01 +0100 Message-ID: <20241015100012.254223-20-salil.mehta@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241015100012.254223-1-salil.mehta@huawei.com> References: <20241015100012.254223-1-salil.mehta@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.48.146.149] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To frapeml500007.china.huawei.com (7.182.85.172) 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=185.176.79.56; envelope-from=salil.mehta@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: , Reply-to: Salil Mehta From: Salil Mehta via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1728986905654116600 Virtual CPU hot-(un)plug events must be communicated to the GIC. Introduce a notification mechanism to ensure these events are properly relayed to the G= IC, allowing it to update the accessibility of the GIC CPU interface and adjust= the vCPU-to-GIC CPU interface association accordingly. This approach deviates from the standard ARM CPU architecture specification, where the CPU-to-GIC interface is typically fixed and the accessibility of = the GIC CPU interface cannot be disabled. However, this workaround is necessary to address limitations imposed by the ARM CPU architecture [1][2]. For more details regarding these constraints and the workarounds, please re= fer to the slides below: References: [1] KVMForum 2023 Presentation: Challenges Revisited in Supporting Virt CPU= Hotplug on architectures that don=E2=80=99t Support CPU Hotplug (like ARM64) Link: https://kvm-forum.qemu.org/2023/Challenges_Revisited_in_Supporti= ng_Virt_CPU_Hotplug_-__ii0iNb3.pdf (Slides 13,17,18) [2] KVMForum 2020 Presentation: Challenges in Supporting Virtual CPU Hotplu= g on SoC Based Systems (like ARM64) Link: https://kvmforum2020.sched.com/event/eE4m Co-developed-by: Keqian Zhu Signed-off-by: Keqian Zhu Signed-off-by: Salil Mehta --- hw/arm/virt.c | 31 ++++++++++++++- hw/intc/arm_gicv3_common.c | 60 +++++++++++++++++++++++++++++- include/hw/arm/virt.h | 1 + include/hw/intc/arm_gicv3_common.h | 23 ++++++++++++ 4 files changed, 112 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0a912919ec..295012bce1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -703,6 +703,16 @@ static inline DeviceState *create_acpi_ged(VirtMachine= State *vms) return dev; } =20 +static void virt_add_gic_cpuhp_notifier(VirtMachineState *vms) +{ + MachineClass *mc =3D MACHINE_GET_CLASS(vms); + + if (mc->has_hotpluggable_cpus) { + Notifier *cpuhp_notifier =3D gicv3_cpuhp_notifier(vms->gic); + notifier_list_add(&vms->cpuhp_notifiers, cpuhp_notifier); + } +} + static void create_its(VirtMachineState *vms) { const char *itsclass =3D its_class_name(); @@ -979,6 +989,9 @@ static void create_gic(VirtMachineState *vms, MemoryReg= ion *mem) } else if (vms->gic_version =3D=3D VIRT_GIC_VERSION_2) { create_v2m(vms); } + + /* add GIC CPU hot(un)plug update notifier */ + virt_add_gic_cpuhp_notifier(vms); } =20 static void create_uart(const VirtMachineState *vms, int uart, @@ -2450,6 +2463,8 @@ static void machvirt_init(MachineState *machine) =20 create_fdt(vms); =20 + notifier_list_init(&vms->cpuhp_notifiers); + assert(possible_cpus->len =3D=3D max_cpus); for (n =3D 0; n < possible_cpus->len; n++) { CPUArchId *cpu_slot; @@ -3066,6 +3081,18 @@ static void virt_memory_plug(HotplugHandler *hotplug= _dev, dev, &error_abort); } =20 +static void virt_update_gic(VirtMachineState *vms, CPUState *cs, bool plug= ging) +{ + GICv3CPUHotplugInfo gic_info =3D { + .gic =3D vms->gic, + .cpu =3D cs, + .cpu_plugging =3D plugging + }; + + /* notify gic to stitch GICC to this new cpu */ + notifier_list_notify(&vms->cpuhp_notifiers, &gic_info); +} + static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev, DeviceState *de= v, Error **errp) { @@ -3142,7 +3169,7 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug= _dev, DeviceState *dev, * `machvirt_init()`. */ if (vms->acpi_dev) { - /* TODO: update GIC about this hotplug change here */ + virt_update_gic(vms, cs, true); wire_gic_cpu_irqs(vms, cs); } } @@ -3227,7 +3254,7 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_d= ev, DeviceState *dev, /* TODO: update the acpi cpu hotplug state for cpu hot-unplug */ =20 unwire_gic_cpu_irqs(vms, cs); - /* TODO: update the GIC about this hot unplug change */ + virt_update_gic(vms, cs, false); =20 /* TODO: unregister cpu for reset & update F/W info for the next boot = */ =20 diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 218ced1d9f..c21fff4903 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -33,7 +33,6 @@ #include "hw/arm/linux-boot-if.h" #include "sysemu/kvm.h" =20 - static void gicv3_gicd_no_migration_shift_bug_post_load(GICv3State *cs) { if (cs->gicd_no_migration_shift_bug) { @@ -366,6 +365,62 @@ void gicv3_init_irqs_and_mmio(GICv3State *s, qemu_irq_= handler handler, } } =20 +static int arm_gicv3_get_proc_num(GICv3State *s, CPUState *cpu) +{ + uint64_t mp_affinity; + uint64_t gicr_typer; + uint64_t cpu_affid; + int i; + + mp_affinity =3D object_property_get_uint(OBJECT(cpu), "mp-affinity", N= ULL); + /* match the cpu mp-affinity to get the gic cpuif number */ + for (i =3D 0; i < s->num_cpu; i++) { + gicr_typer =3D s->cpu[i].gicr_typer; + cpu_affid =3D (gicr_typer >> 32) & 0xFFFFFF; + if (cpu_affid =3D=3D mp_affinity) { + return i; + } + } + + return -1; +} + +static void arm_gicv3_cpu_update_notifier(Notifier *notifier, void * data) +{ + GICv3CPUHotplugInfo *gic_info =3D (GICv3CPUHotplugInfo *)data; + CPUState *cpu =3D gic_info->cpu; + ARMGICv3CommonClass *agcc; + int gic_cpuif_num; + GICv3State *s; + + s =3D ARM_GICV3_COMMON(gic_info->gic); + agcc =3D ARM_GICV3_COMMON_GET_CLASS(s); + + /* this shall get us mapped GICv3 CPU interface corresponding to MPIDR= */ + gic_cpuif_num =3D arm_gicv3_get_proc_num(s, cpu); + if (gic_cpuif_num < 0) { + error_report("Failed to associate cpu %d with any GIC cpuif", + cpu->cpu_index); + abort(); + } + + /* Update the GICv3 CPU interface accessibiltiy accordingly */ + gicv3_set_cpustate(&s->cpu[gic_cpuif_num], cpu, gic_info->cpu_plugging= ); + + if (!gic_info->cpu_plugging) { + return; + } + + /* re-stitch the GICv3 CPU interface to this new vCPU */ + gicv3_set_gicv3state(cpu, &s->cpu[gic_cpuif_num]); + + /* + * define and register the GICv3 CPU interface `system registers` for + * this new vCPU being hotplugged + */ + agcc->init_cpu_reginfo(cpu); +} + static void arm_gicv3_common_realize(DeviceState *dev, Error **errp) { GICv3State *s =3D ARM_GICV3_COMMON(dev); @@ -492,6 +547,8 @@ static void arm_gicv3_common_realize(DeviceState *dev, = Error **errp) s->cpu[cpuidx - 1].gicr_typer |=3D GICR_TYPER_LAST; } =20 + s->cpu_update_notifier.notify =3D arm_gicv3_cpu_update_notifier; + s->itslist =3D g_ptr_array_new(); } =20 @@ -499,6 +556,7 @@ static void arm_gicv3_finalize(Object *obj) { GICv3State *s =3D ARM_GICV3_COMMON(obj); =20 + notifier_remove(&s->cpu_update_notifier); g_free(s->redist_region_count); } =20 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 98ce68eae1..0202f0252c 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -186,6 +186,7 @@ struct VirtMachineState { char *oem_id; char *oem_table_id; bool ns_el2_virt_timer_irq; + NotifierList cpuhp_notifiers; }; =20 #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3= _common.h index 3f585162f3..c02a810da9 100644 --- a/include/hw/intc/arm_gicv3_common.h +++ b/include/hw/intc/arm_gicv3_common.h @@ -295,6 +295,7 @@ struct GICv3State { GICv3CPUState *gicd_irouter_target[GICV3_MAXIRQ]; uint32_t gicd_nsacr[DIV_ROUND_UP(GICV3_MAXIRQ, 16)]; =20 + Notifier cpu_update_notifier; GICv3CPUState *cpu; /* List of all ITSes connected to this GIC */ GPtrArray *itslist; @@ -345,6 +346,28 @@ struct ARMGICv3CommonClass { =20 void gicv3_init_irqs_and_mmio(GICv3State *s, qemu_irq_handler handler, const MemoryRegionOps *ops); +/** + * Structure used by GICv3 CPU hotplug notifier + */ +typedef struct GICv3CPUHotplugInfo { + DeviceState *gic; /* GICv3State */ + CPUState *cpu; + bool cpu_plugging; /* CPU being plugged or unplugged */ +} GICv3CPUHotplugInfo; + +/** + * gicv3_cpuhp_notifier + * + * Returns CPU hotplug notifier which could be used to update GIC about any + * CPU hot(un)plug events. + * + * Returns: Notifier initialized with CPU Hot(un)plug update function + */ +static inline Notifier *gicv3_cpuhp_notifier(DeviceState *dev) +{ + GICv3State *s =3D ARM_GICV3_COMMON(dev); + return &s->cpu_update_notifier; +} =20 /** * gicv3_class_name --=20 2.34.1