Commit d684f3a4 authored by Fuad Tabba's avatar Fuad Tabba Committed by Junhao He
Browse files

KVM: arm64: Initialize the kvm host data's fpsimd_state pointer in pKVM 

mainline inclusion
from mainline-v6.10-rc1
commit 4c22a40dd9c3dcc2156f312ffc71955e56192a76
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8EC9K
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4c22a40dd9c3dcc2156f312ffc71955e56192a76



--------------------------------

Since the host_fpsimd_state has been removed from kvm_vcpu_arch,
it isn't pointing to the hyp's version of the host fp_regs in
protected mode.

Initialize the host_data fpsimd_state point to the host_data's
context fp_regs on pKVM initialization.

Fixes: 51e09b5572d6 ("KVM: arm64: Exclude host_fpsimd_state pointer from kvm_vcpu_arch")
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Acked-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20240423150538.2103045-2-tabba@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarJunhao He <hejunhao3@huawei.com>
parent e0eb7fc0

arch/arm64/kvm/hyp/include/nvhe/pkvm.h

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ pkvm_hyp_vcpu_to_hyp_vm(struct pkvm_hyp_vcpu *hyp_vcpu) 
}



void pkvm_hyp_vm_table_init(void *tbl);

void pkvm_host_fpsimd_state_init(void);



int __pkvm_init_vm(struct kvm *host_kvm, unsigned long vm_hva,

		   unsigned long pgd_hva);

arch/arm64/kvm/hyp/nvhe/pkvm.c

+11 −0
Original line number Diff line number Diff line
@@ -243,6 +243,17 @@ void pkvm_hyp_vm_table_init(void *tbl) 
	vm_table = tbl;

}



void pkvm_host_fpsimd_state_init(void)

{

	unsigned long i;



	for (i = 0; i < hyp_nr_cpus; i++) {

		struct kvm_host_data *host_data = per_cpu_ptr(&kvm_host_data, i);



		host_data->fpsimd_state = &host_data->host_ctxt.fp_regs;

	}

}



/*

 * Return the hyp vm structure corresponding to the handle.

 */

arch/arm64/kvm/hyp/nvhe/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ void __noreturn __pkvm_init_finalise(void) 
		goto out;



	pkvm_hyp_vm_table_init(vm_table_base);

	pkvm_host_fpsimd_state_init();

out:

	/*

	 * We tail-called to here from handle___pkvm_init() and will not return,