Commit 1696fc21 authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Consolidate initializing the host data's fpsimd_state/sve in pKVM 



Now that we have introduced finalize_init_hyp_mode(), lets
consolidate the initializing of the host_data fpsimd_state and
sve state.

Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20240603122852.3923848-8-tabba@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent b5b99556

arch/arm64/include/asm/kvm_host.h

+8 −2
Original line number Diff line number Diff line
@@ -550,8 +550,14 @@ struct cpu_sve_state { 
struct kvm_host_data {

	struct kvm_cpu_context host_ctxt;



	struct user_fpsimd_state *fpsimd_state;	/* hyp VA */

	struct cpu_sve_state *sve_state;	/* hyp VA */

	/*

	 * All pointers in this union are hyp VA.

	 * sve_state is only used in pKVM and if system_supports_sve().

	 */

	union {

		struct user_fpsimd_state *fpsimd_state;

		struct cpu_sve_state *sve_state;

	};



	/* Ownership of the FP regs */

	enum {

arch/arm64/kvm/arm.c

+14 −6
Original line number Diff line number Diff line
@@ -2444,14 +2444,22 @@ static void finalize_init_hyp_mode(void) 
{

	int cpu;



	if (!is_protected_kvm_enabled() || !system_supports_sve())

		return;



	if (system_supports_sve() && is_protected_kvm_enabled()) {

		for_each_possible_cpu(cpu) {

			struct cpu_sve_state *sve_state;



			sve_state = per_cpu_ptr_nvhe_sym(kvm_host_data, cpu)->sve_state;

		per_cpu_ptr_nvhe_sym(kvm_host_data, cpu)->sve_state = kern_hyp_va(sve_state);

			per_cpu_ptr_nvhe_sym(kvm_host_data, cpu)->sve_state =

				kern_hyp_va(sve_state);

		}

	} else {

		for_each_possible_cpu(cpu) {

			struct user_fpsimd_state *fpsimd_state;



			fpsimd_state = &per_cpu_ptr_nvhe_sym(kvm_host_data, cpu)->host_ctxt.fp_regs;

			per_cpu_ptr_nvhe_sym(kvm_host_data, cpu)->fpsimd_state =

				kern_hyp_va(fpsimd_state);

		}

	}

}

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

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static inline bool pkvm_hyp_vcpu_is_protected(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

+0 −11
Original line number Diff line number Diff line
@@ -249,17 +249,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ 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,