shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: KVM: arm64: Reset primary vCPU according to PVM firmware boot protocol

Browse Source 
When a PVM firmware image is present for a protected VM, treat the first
running vCPU as the "primary" vCPU and reset its registers accordingly,
in particular by initialising its PC to enter the firmware at startup.

Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Will Deacon <willdeacon@google.com>
Bug: 254819795
Change-Id: I26676637145c7d809c5dc5ac0ad0e1fadaf275d2
This commit is contained in:
Will Deacon
2021-12-09 12:46:14 +00:00
committed by Will Deacon
parent f8516f3e3a
commit f19614d0a0
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/kvm/hyp/include/nvhe/pkvm.h
View File

@@ -55,6 +55,9 @@ struct pkvm_hyp_vm {
struct hyp_pool pool;
hyp_spinlock_t lock;
/* Primary vCPU pending entry to the pvmfw */
struct pkvm_hyp_vcpu *pvmfw_entry_vcpu;
/*
* The number of vcpus initialized and ready to run.
* Modifying this is protected by 'vm_table_lock'.

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

@@ -390,13 +390,21 @@ static int pkvm_vcpu_init_ptrauth(struct pkvm_hyp_vcpu *hyp_vcpu)
return ret;
}
static void pkvm_vcpu_init_psci(struct pkvm_hyp_vcpu *hyp_vcpu)
static int pkvm_vcpu_init_psci(struct pkvm_hyp_vcpu *hyp_vcpu)
{
struct vcpu_reset_state *reset_state = &hyp_vcpu->vcpu.arch.reset_state;
struct pkvm_hyp_vm *hyp_vm = pkvm_hyp_vcpu_to_hyp_vm(hyp_vcpu);
if (test_bit(KVM_ARM_VCPU_POWER_OFF, hyp_vcpu->vcpu.arch.features)) {
reset_state->reset = false;
hyp_vcpu->power_state = PSCI_0_2_AFFINITY_LEVEL_OFF;
} else if (pkvm_hyp_vm_has_pvmfw(hyp_vm)) {
if (hyp_vm->pvmfw_entry_vcpu)
return -EINVAL;
hyp_vm->pvmfw_entry_vcpu = hyp_vcpu;
reset_state->reset = true;
hyp_vcpu->power_state = PSCI_0_2_AFFINITY_LEVEL_ON_PENDING;
} else {
struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu;
@@ -405,6 +413,8 @@ static void pkvm_vcpu_init_psci(struct pkvm_hyp_vcpu *hyp_vcpu)
reset_state->reset = true;
hyp_vcpu->power_state = PSCI_0_2_AFFINITY_LEVEL_ON_PENDING;
}
return 0;
}
static void unpin_host_vcpu(struct kvm_vcpu *host_vcpu)
@@ -486,6 +496,10 @@ static int init_pkvm_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu,
if (ret)
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)) {
size_t sve_state_size;
void *sve_state;
@@ -508,7 +522,6 @@ static int init_pkvm_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu,
pkvm_vcpu_init_traps(hyp_vcpu);
kvm_reset_pvm_sys_regs(&hyp_vcpu->vcpu);
pkvm_vcpu_init_psci(hyp_vcpu);
done:
if (ret)
unpin_host_vcpu(host_vcpu);
@@ -881,6 +894,7 @@ void pkvm_clear_pvmfw_pages(void)
void pkvm_reset_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu)
{
struct vcpu_reset_state *reset_state = &hyp_vcpu->vcpu.arch.reset_state;
struct pkvm_hyp_vm *hyp_vm = pkvm_hyp_vcpu_to_hyp_vm(hyp_vcpu);
WARN_ON(!reset_state->reset);
@@ -890,6 +904,25 @@ void pkvm_reset_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu)
/* Must be done after reseting sys registers. */
kvm_reset_vcpu_psci(&hyp_vcpu->vcpu, reset_state);
if (hyp_vm->pvmfw_entry_vcpu == hyp_vcpu) {
struct kvm_vcpu *host_vcpu = hyp_vcpu->host_vcpu;
u64 entry = hyp_vm->kvm.arch.pkvm.pvmfw_load_addr;
int i;
/* X0 - X14 provided by the VMM (preserved) */
for (i = 0; i <= 14; ++i) {
u64 val = vcpu_get_reg(host_vcpu, i);
vcpu_set_reg(&hyp_vcpu->vcpu, i, val);
}
/* X15: Boot protocol version */
vcpu_set_reg(&hyp_vcpu->vcpu, 15, 0);
/* PC: IPA of pvmfw base */
*vcpu_pc(&hyp_vcpu->vcpu) = entry;
hyp_vm->pvmfw_entry_vcpu = NULL;
}
reset_state->reset = false;