arm: add kvm-psci-version vcpu property
v5 cover arm: add kvm-psci-version vcpu property
This series adds a vcpu knob to request a specific PSCI version from KVM via the KVM_REG_ARM_PSCI_VERSION FW register.
The use case for this is to support migration between host kernels that differ in their default (a.k.a. most recent) PSCI version.
Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case. Alternatively we could limit support to versions >=0.2 .
Changes since V4 [4]:
* incorporated feedback from Peter
* added R-B, T-B
Changes since V3 [3]:
* changed variable name as requested by Eric
* added R-B
Changes since V2 [2]:
* fix kvm_get_psci_version() when the prop is not specified - thanks Eric!
* removed the assertion in kvm_get_psci_version() so that this also works with a future kernel/psci version
* added R-B
Changes since V1 [1]:
* incorporated feedback from Peter and Eric
[1] https://lore.kernel.org/kvmarm/[email protected]/
[2] https://lore.kernel.org/kvmarm/[email protected]/
[3] https://lore.kernel.org/kvmarm/[email protected]/
[4] https://lore.kernel.org/kvmarm/[email protected]/
Sebastian Ott (2):
target/arm/kvm: add constants for new PSCI versions target/arm/kvm: add kvm-psci-version vcpu property
docs/system/arm/cpu-features.rst | 11 ++++++ target/arm/cpu.h | 6 +++ target/arm/kvm-consts.h | 2 + target/arm/kvm.c | 65 +++++++++++++++++++++++++++++++- 4 files changed, 83 insertions(+), 1 deletion(-)
Signature · 1 line
2.52.0
PATCH v5 1/2 target/arm/kvm: add constants for new PSCI versions
Add constants for PSCI version 1_2 and 1_3.
--- target/arm/kvm-consts.h | 2 ++ 1 file changed, 2 insertions(+)
target/arm/kvm-consts.h +2 -0
@@ -97,6 +97,8 @@ MISMATCH_CHECK(QEMU_PSCI_1_0_FN_PSCI_FEATURES, PSCI_1_0_FN_PSCI_FEATURES);#define QEMU_PSCI_VERSION_0_2 0x00002#define QEMU_PSCI_VERSION_1_0 0x10000#define QEMU_PSCI_VERSION_1_1 0x10001 +#define QEMU_PSCI_VERSION_1_2 0x10002 +#define QEMU_PSCI_VERSION_1_3 0x10003MISMATCH_CHECK (QEMU_PSCI_0_2_RET_TOS_MIGRATION_NOT_REQUIRED ,PSCI_0_2_TOS_MP );/* We don't bother to check every possible version value */
Signature · 1 line
2.52.0
PATCH v5 2/2 target/arm/kvm: add kvm-psci-version vcpu property
In reply to Sebastian OttProvide a kvm specific vcpu property to override the default (as of kernel v6.13 that would be PSCI v1.3) PSCI version emulated by kvm. Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3
Note: in order to support PSCI v0.1 we need to drop vcpu initialization with KVM_CAP_ARM_PSCI_0_2 in that case.
--- docs/system/arm/cpu-features.rst | 11 ++++++ target/arm/cpu.h | 6 +++ target/arm/kvm.c | 65 +++++++++++++++++++++++++++++++- 3 files changed, 81 insertions(+), 1 deletion(-)
docs/system/arm/cpu-features.rst +11 -0
@@ -204,6 +204,17 @@ the list of KVM VCPU features and their descriptions. the guest scheduler behavior and/or be exposed to the guest userspace. +``kvm-psci-version`` + Set the Power State Coordination Interface (PSCI) firmware ABI version + that KVM provides to the guest. By default KVM will use the newest + version that it knows about (which is PSCI v1.3 in Linux v6.13). + + You only need to set this if you want to be able to migrate this + VM to a host machine running an older kernel that does not + recognize the PSCI version that this host's kernel defaults to. + + Current valid values are: 0.1, 0.2, 1.0, 1.1, 1.2, and 1.3. + TCG VCPU Features =================
target/arm/cpu.h +6 -0
@@ -1036,6 +1036,12 @@ struct ArchCPU {bool kvm_vtime_dirty;uint64_t kvm_vtime; +/* +* Intermediate value used during property parsing. +* Once finalized, the value should be read from psci_version. +*/ +uint32_t kvm_prop_psci_version; +/* KVM steal time */ OnOffAuto kvm_steal_time;
target/arm/kvm.c +64 -1
89 lines not on this page · raw message
Signature · 1 line
2.52.0
Quoted 10 lines · Sebastian Ott
This series adds a vcpu knob to request a specific PSCI version from KVM via the
KVM_REG_ARM_PSCI_VERSIONFW register.The use case for this is to support migration between host kernels that differ in their default (a.k.a. most recent) PSCI version.
Note: in order to support PSCI v0.1 we need to drop vcpu initialization with
KVM_CAP_ARM_PSCI_0_2in that case. Alternatively we could limit support to versions >=0.2 .
Patch 1 already upstream; for patch 2 the review discussion has been on the thread for the v4 version of patch.
thanks
-- PMM