samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Ensure SVE initialization precedes PSCI for protected VCPUs

Browse Source 
Reorder the initialization sequence for protected KVM VCPUs on arm64.
Specifically, ensure that SVE state is initialized *before* PSCI (and
PVM Firmare).

The current order presents a problem: PSCI initialization triggers the
bring-up of the PVM (Protected Virtual Machine) firmware. Should SVE
initialization then fail due to insufficient memory, there is no reliable
mechanism to roll back or clean up the already-initialized PVM firmware.
This can lead to an undesirable and unrecoverable state for the protected
VCPU. By initializing SVE first, any memory allocation failures will occur
prior to the PVM firmware becoming active, allowing for a more controlled
failure scenario.

Bug: 278749606
Bug: 417970855
Bug: 420967829
Bug: 427128726
Reported-by: Shikha Panwar <shikhapanwar@google.com>
Change-Id: Ia82bb409d83bdc7560589152ec6cf50f54eebefe
Signed-off-by: Fuad Tabba <tabba@google.com>
This commit is contained in:
Fuad Tabba
2025-06-23 11:28:53 +01:00
parent 3b75103301
commit 3a0107a38e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/kvm/hyp/nvhe/pkvm.c
View File

@@ -702,16 +702,13 @@ static int init_pkvm_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu,
if (ret) if (ret)
goto done; goto done;
ret = pkvm_vcpu_init_psci(hyp_vcpu);
if (ret)
goto done;
if (test_bit(KVM_ARM_VCPU_SVE, hyp_vcpu->vcpu.arch.features)) { if (test_bit(KVM_ARM_VCPU_SVE, hyp_vcpu->vcpu.arch.features)) {
ret = init_pkvm_hyp_vcpu_sve(hyp_vcpu, host_vcpu); ret = init_pkvm_hyp_vcpu_sve(hyp_vcpu, host_vcpu);
if (ret) if (ret)
goto done; goto done;
} }
WARN_ON(pkvm_vcpu_init_psci(hyp_vcpu));
pkvm_vcpu_init_traps(hyp_vcpu); pkvm_vcpu_init_traps(hyp_vcpu);
kvm_reset_pvm_sys_regs(&hyp_vcpu->vcpu); kvm_reset_pvm_sys_regs(&hyp_vcpu->vcpu);
done: done: