shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Do not pass host struct pointers to kvm_arch_vcpu_load()"

Browse Source 
This reverts commit ab9f8c8200.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I86c1cceabbc4b73beeac96279056da86d8443a2c
This commit is contained in:
Will Deacon
2022-07-07 15:49:12 +01:00
parent 8e1ed1cf82
commit 07dac217ae
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kvm/arm.c
View File

@@ -579,9 +579,7 @@ nommu:
kvm_arch_vcpu_load_debug_state_flags(vcpu);
if (is_protected_kvm_enabled()) {
kvm_call_hyp_nvhe(__pkvm_vcpu_load,
vcpu->kvm->arch.pkvm.shadow_handle,
vcpu->vcpu_idx, vcpu->arch.hcr_el2);
kvm_call_hyp_nvhe(__pkvm_vcpu_load, vcpu);
kvm_call_hyp(__vgic_v3_restore_vmcr_aprs,
&vcpu->arch.vgic_cpu.vgic_v3);
}

13
arch/arm64/kvm/hyp/nvhe/hyp-main.c
View File

@@ -616,10 +616,9 @@ static void fpsimd_host_restore(void)
static void handle___pkvm_vcpu_load(struct kvm_cpu_context *host_ctxt)
{
DECLARE_REG(int, shadow_handle, host_ctxt, 1);
DECLARE_REG(int, vcpu_idx, host_ctxt, 2);
DECLARE_REG(u64, hcr_el2, host_ctxt, 3);
DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 1);
struct pkvm_loaded_state *state;
int handle;
/* Why did you bother? */
if (!is_protected_kvm_enabled())
@@ -631,7 +630,10 @@ static void handle___pkvm_vcpu_load(struct kvm_cpu_context *host_ctxt)
if (state->vcpu)
return;
state->vcpu = get_shadow_vcpu(shadow_handle, vcpu_idx);
vcpu = kern_hyp_va(vcpu);
handle = READ_ONCE(vcpu->arch.pkvm.shadow_handle);
state->vcpu = get_shadow_vcpu(handle, vcpu->vcpu_idx);
if (!state->vcpu)
return;
@@ -645,7 +647,8 @@ static void handle___pkvm_vcpu_load(struct kvm_cpu_context *host_ctxt)
/* Propagate WFx trapping flags, trap ptrauth */
state->vcpu->arch.hcr_el2 &= ~(HCR_TWE | HCR_TWI |
HCR_API | HCR_APK);
state->vcpu->arch.hcr_el2 |= hcr_el2 & (HCR_TWE | HCR_TWI);
state->vcpu->arch.hcr_el2 |= vcpu->arch.hcr_el2 & (HCR_TWE |
HCR_TWI);
}
}