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>
73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
From 85e8e1ee8560e587845142342f81b218e44cba6a Mon Sep 17 00:00:00 2001
|
|
From: Keqian Zhu <zhukeqian1@huawei.com>
|
|
Date: Tue, 26 Mar 2024 22:07:33 +0800
|
|
Subject: [PATCH] arm/kvm: Set psci smccc filter only with vcpu hotplug
|
|
|
|
The smccc filter mechanism is supported by newer Linux kernel,
|
|
don't try to do it unconditionaly.
|
|
|
|
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
|
|
---
|
|
hw/arm/virt.c | 4 +++-
|
|
target/arm/kvm.c | 21 ++++++++++++---------
|
|
2 files changed, 15 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index e60f3431f9..38b5d214a1 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -2366,8 +2366,10 @@ static void machvirt_init(MachineState *machine)
|
|
finalize_gic_version(vms);
|
|
if (tcg_enabled() || hvf_enabled() || qtest_enabled() ||
|
|
(vms->gic_version < VIRT_GIC_VERSION_3)) {
|
|
- machine->smp.max_cpus = smp_cpus;
|
|
mc->has_hotpluggable_cpus = false;
|
|
+ }
|
|
+ if (!mc->has_hotpluggable_cpus) {
|
|
+ machine->smp.max_cpus = smp_cpus;
|
|
warn_report("cpu hotplug feature has been disabled");
|
|
}
|
|
|
|
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
|
|
index 66caf9e5e7..19783d567f 100644
|
|
--- a/target/arm/kvm.c
|
|
+++ b/target/arm/kvm.c
|
|
@@ -259,6 +259,7 @@ int kvm_arch_get_default_type(MachineState *ms)
|
|
|
|
int kvm_arch_init(MachineState *ms, KVMState *s)
|
|
{
|
|
+ MachineClass *mc = MACHINE_GET_CLASS(ms);
|
|
int ret = 0;
|
|
|
|
/* For ARM interrupt delivery is always asynchronous,
|
|
@@ -316,15 +317,17 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
|
|
* filter in the Host KVM. This is required to support features like
|
|
* virtual CPU Hotplug on ARM platforms.
|
|
*/
|
|
- if (kvm_arm_set_smccc_filter(PSCI_0_2_FN64_CPU_ON,
|
|
- KVM_SMCCC_FILTER_FWD_TO_USER)) {
|
|
- error_report("CPU On PSCI-to-user-space fwd filter install failed");
|
|
- abort();
|
|
- }
|
|
- if (kvm_arm_set_smccc_filter(PSCI_0_2_FN_CPU_OFF,
|
|
- KVM_SMCCC_FILTER_FWD_TO_USER)) {
|
|
- error_report("CPU Off PSCI-to-user-space fwd filter install failed");
|
|
- abort();
|
|
+ if (mc->has_hotpluggable_cpus && ms->smp.max_cpus > ms->smp.cpus) {
|
|
+ if (kvm_arm_set_smccc_filter(PSCI_0_2_FN64_CPU_ON,
|
|
+ KVM_SMCCC_FILTER_FWD_TO_USER)) {
|
|
+ error_report("CPU On PSCI-to-user-space fwd filter install failed");
|
|
+ mc->has_hotpluggable_cpus = false;
|
|
+ }
|
|
+ if (kvm_arm_set_smccc_filter(PSCI_0_2_FN_CPU_OFF,
|
|
+ KVM_SMCCC_FILTER_FWD_TO_USER)) {
|
|
+ error_report("CPU Off PSCI-to-user-space fwd filter install failed");
|
|
+ mc->has_hotpluggable_cpus = false;
|
|
+ }
|
|
}
|
|
|
|
kvm_arm_init_debug(s);
|
|
--
|
|
2.27.0
|
|
|