c025e9059a
- coro: support live patch for libcare
- tests/acpi: Update expected ACPI tables for vcpu hotplug(update BinDir)
- arm/virt: Require mc->has_hotpluggable_cpus for cold-plugged vcpu
- arm/virt: Consider has_ged when set mc->has_hotpluggable_cpus
- arm/virt-acpi: Require possible_cpu_arch_ids for build_cpus_aml()
- acpi/ged: Remove cpuhp field of ged
- acpi/ged: Init cpu hotplug only when machine support it
- intc/gicv3: Fixes for vcpu hotplug
- arm/kvm: Set psci smccc filter only with vcpu hotplug
- accel/kvm: Use correct id for parked vcpu
- arm/virt: Fix adjudgement of core_id for vcpu hotplugged
- arm/virt.c: Convey local_err when set psci-conduit
- system/cpus: Fix resume_all_vcpus() under vCPU hotplug condition
- system/cpus: Fix pause_all_vcpus() under concurrent environment
- acpi/cpu: Fix cpu_hotplug_hw_init()
- arm/cpu: Some fixes for arm_cpu_unrealizefn()
- system/physmem: Fix possible double free when destroy cpu as
- hw/arm/virt: Expose cold-booted CPUs as MADT GICC Enabled
- tcg/mttcg: enable threads to unregister in tcg_ctxs[]
- hw/arm: Support hotplug capability check using _OSC method
- target/arm/kvm,tcg: Register/Handle SMCCC hypercall exits to VMM/Qemu
- target/arm/kvm: Write CPU state back to KVM on reset
- target/arm: Add support of *unrealize* ARMCPU during vCPU Hot-unplug
- physmem,gdbstub: Common helping funcs/changes to *unrealize* vCPU
- hw/arm: Changes required for reset and to support next boot
- arm/virt: Update the guest(via GED) about CPU hot-(un)plug events
- hw/intc/arm-gicv3*: Changes required to (re)init the vCPU register info
- hw/arm,gicv3: Changes to update GIC with vCPU hot-plug notification
- arm/virt: Changes to (un)wire GICC<->vCPU IRQs during hot-(un)plug
- arm/virt: Add/update basic hot-(un)plug framework
- hw/acpi: Update ACPI GED framework to support vCPU Hotplug
- arm/virt: Release objects for *disabled* possible vCPUs after init
- hw/acpi: Make _MAT method optional
- hw/arm: MADT Tbl change to size the guest with possible vCPUs
- hw/acpi: Update GED _EVT method AML with cpu scan
- hw/acpi: ACPI/AML Changes to reflect the correct _STA.{PRES,ENA} Bits to Guest
- arm/virt: Make ARM vCPU *present* status ACPI *persistent*
- arm/virt/acpi: Build CPUs AML with CPU Hotplug support
- tests/acpi/bios-tables-test: Allow changes to virt/DSDT file
- acpi/cpu: Add cpu_cppc building support
- arm/virt/acpi: Factor out CPPC building from DSDT CPU aml
- hw/acpi: Update CPUs AML with cpu-(ctrl)dev change
- arm/virt: Create GED dev before *disabled* CPU Objs are destroyed
- arm/virt: Add cpu hotplug events to GED during creation
- hw/acpi: Init GED framework with cpu hotplug events
- hw/acpi: Use qemu_present_cpu() API in ACPI CPU hotplug init
- hw/acpi: Add ACPI CPU hotplug init stub
- arm/acpi: Enable ACPI support for vcpu hotplug
- hw/acpi: Move CPU ctrl-dev MMIO region len macro to common header file
- arm/virt: Init PMU at host for all possible vcpus
- arm/virt,gicv3: Changes to pre-size GIC with possible vcpus @machine init
- arm/virt,kvm: Pre-create disabled possible vCPUs @machine init
- accel/kvm: Extract common KVM vCPU {creation,parking} code
- arm/virt,target/arm: Machine init time change common to vCPU {cold|hot}-plug
- hw/arm/virt: Move setting of common CPU properties in a function
- cpus-common: Add common CPU utility for possible vCPUs
- arm/virt,target/arm: Add new ARMCPU {socket,cluster,core,thread}-id property
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
98 lines
3.2 KiB
Diff
98 lines
3.2 KiB
Diff
From 3780dddd4fc8f0471525c50893e24846d1474692 Mon Sep 17 00:00:00 2001
|
|
From: Salil Mehta <salil.mehta@huawei.com>
|
|
Date: Tue, 8 Aug 2023 00:43:18 +0000
|
|
Subject: [PATCH] arm/virt: Make ARM vCPU *present* status ACPI *persistent*
|
|
|
|
ARM arch does not allow CPUs presence to be changed [1] after kernel has booted.
|
|
Hence, firmware/ACPI/Qemu must ensure persistent view of the vCPUs to the Guest
|
|
kernel even when they are not present in the QoM i.e. are unplugged or are
|
|
yet-to-be-plugged
|
|
|
|
References:
|
|
[1] Check comment 5 in the bugzilla entry
|
|
Link: https://bugzilla.tianocore.org/show_bug.cgi?id=4481#c5
|
|
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
|
---
|
|
cpu-common.c | 6 ++++++
|
|
hw/arm/virt.c | 7 +++++++
|
|
include/hw/core/cpu.h | 20 ++++++++++++++++++++
|
|
3 files changed, 33 insertions(+)
|
|
|
|
diff --git a/cpu-common.c b/cpu-common.c
|
|
index d041a351ab..da52e45760 100644
|
|
--- a/cpu-common.c
|
|
+++ b/cpu-common.c
|
|
@@ -128,6 +128,12 @@ bool qemu_enabled_cpu(CPUState *cpu)
|
|
return cpu && !cpu->disabled;
|
|
}
|
|
|
|
+bool qemu_persistent_cpu(CPUState *cpu)
|
|
+{
|
|
+ /* cpu state can be faked to the guest via acpi */
|
|
+ return cpu->acpi_persistent;
|
|
+}
|
|
+
|
|
uint64_t qemu_get_cpu_archid(int cpu_index)
|
|
{
|
|
MachineState *ms = MACHINE(qdev_get_machine());
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index 818398e753..91b2653c03 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -3104,6 +3104,13 @@ static void virt_cpu_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
return;
|
|
}
|
|
virt_cpu_set_properties(OBJECT(cs), cpu_slot, errp);
|
|
+
|
|
+ /*
|
|
+ * To give persistent presence view of vCPUs to the guest, ACPI might need
|
|
+ * to fake the presence of the vCPUs to the guest but keep them disabled.
|
|
+ * This shall be used during the init of ACPI Hotplug state and hot-unplug
|
|
+ */
|
|
+ cs->acpi_persistent = true;
|
|
}
|
|
|
|
static void virt_cpu_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
|
|
index fdfb952259..0ca778eb75 100644
|
|
--- a/include/hw/core/cpu.h
|
|
+++ b/include/hw/core/cpu.h
|
|
@@ -550,6 +550,13 @@ struct CPUState {
|
|
* By default every CPUState is enabled as of now across all archs.
|
|
*/
|
|
bool disabled;
|
|
+ /*
|
|
+ * On certain architectures, to give persistent view of the 'presence' of
|
|
+ * vCPUs to the guest, ACPI might need to fake the 'presence' of the vCPUs
|
|
+ * but keep them ACPI disabled to the guest. This is done by returning
|
|
+ * _STA.PRES=True and _STA.Ena=False for the unplugged vCPUs in QEMU QoM.
|
|
+ */
|
|
+ bool acpi_persistent;
|
|
/* TODO Move common fields from CPUArchState here. */
|
|
int cpu_index;
|
|
int cluster_index;
|
|
@@ -957,6 +964,19 @@ bool qemu_present_cpu(CPUState *cpu);
|
|
*/
|
|
bool qemu_enabled_cpu(CPUState *cpu);
|
|
|
|
+/**
|
|
+ * qemu_persistent_cpu:
|
|
+ * @cpu: The vCPU to check
|
|
+ *
|
|
+ * Checks if the vCPU state should always be reflected as *present* via ACPI
|
|
+ * to the Guest. By default, this is False on all architectures and has to be
|
|
+ * explicity set during initialization.
|
|
+ *
|
|
+ * Returns: True if it is ACPI 'persistent' CPU
|
|
+ *
|
|
+ */
|
|
+bool qemu_persistent_cpu(CPUState *cpu);
|
|
+
|
|
/**
|
|
* qemu_get_cpu_archid:
|
|
* @cpu_index: possible vCPU for which arch-id needs to be retreived
|
|
--
|
|
2.27.0
|
|
|