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>
72 lines
2.6 KiB
Diff
72 lines
2.6 KiB
Diff
From c375e6fdc49f7d3d0232786e4cfd8b792379107c Mon Sep 17 00:00:00 2001
|
|
From: Salil Mehta <salil.mehta@huawei.com>
|
|
Date: Wed, 6 May 2020 14:12:34 +0100
|
|
Subject: [PATCH] arm/virt: Init PMU at host for all possible vcpus
|
|
|
|
PMU for all possible vCPUs must be initialized at the VM initialization time.
|
|
Refactor existing code to accomodate possible vCPUs. This also assumes that all
|
|
processor being used are identical.
|
|
|
|
Past discussion for reference:
|
|
Link: https://lists.gnu.org/archive/html/qemu-devel/2020-06/msg00131.html
|
|
|
|
Co-developed-by: Salil Mehta <salil.mehta@huawei.com>
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
|
Co-developed-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
|
|
---
|
|
hw/arm/virt.c | 12 ++++++++----
|
|
include/hw/arm/virt.h | 1 +
|
|
2 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index 08ba255317..78ed3c4ba8 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -2055,12 +2055,14 @@ static void finalize_gic_version(VirtMachineState *vms)
|
|
*/
|
|
static void virt_cpu_post_init(VirtMachineState *vms, MemoryRegion *sysmem)
|
|
{
|
|
+ CPUArchIdList *possible_cpus = vms->parent.possible_cpus;
|
|
int max_cpus = MACHINE(vms)->smp.max_cpus;
|
|
- bool aarch64, pmu, steal_time;
|
|
+ bool aarch64, steal_time;
|
|
CPUState *cpu;
|
|
+ int n;
|
|
|
|
aarch64 = object_property_get_bool(OBJECT(first_cpu), "aarch64", NULL);
|
|
- pmu = object_property_get_bool(OBJECT(first_cpu), "pmu", NULL);
|
|
+ vms->pmu = object_property_get_bool(OBJECT(first_cpu), "pmu", NULL);
|
|
steal_time = object_property_get_bool(OBJECT(first_cpu),
|
|
"kvm-steal-time", NULL);
|
|
|
|
@@ -2087,8 +2089,10 @@ static void virt_cpu_post_init(VirtMachineState *vms, MemoryRegion *sysmem)
|
|
memory_region_add_subregion(sysmem, pvtime_reg_base, pvtime);
|
|
}
|
|
|
|
- CPU_FOREACH(cpu) {
|
|
- if (pmu) {
|
|
+ for (n = 0; n < possible_cpus->len; n++) {
|
|
+ cpu = qemu_get_possible_cpu(n);
|
|
+
|
|
+ if (vms->pmu) {
|
|
assert(arm_feature(&ARM_CPU(cpu)->env, ARM_FEATURE_PMU));
|
|
if (kvm_irqchip_in_kernel()) {
|
|
kvm_arm_pmu_set_irq(cpu, VIRTUAL_PMU_IRQ);
|
|
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
|
|
index a6977bade5..c2fde0522c 100644
|
|
--- a/include/hw/arm/virt.h
|
|
+++ b/include/hw/arm/virt.h
|
|
@@ -155,6 +155,7 @@ struct VirtMachineState {
|
|
bool ras;
|
|
bool mte;
|
|
bool dtb_randomness;
|
|
+ bool pmu;
|
|
OnOffAuto acpi;
|
|
VirtGICType gic_version;
|
|
VirtIOMMUType iommu;
|
|
--
|
|
2.27.0
|
|
|