Commit 0546d4a9 authored by Fuad Tabba's avatar Fuad Tabba Committed by Oliver Upton
Browse files

KVM: arm64: Move pkvm_vcpu_init_traps() to init_pkvm_hyp_vcpu() 



Move pkvm_vcpu_init_traps() to the initialization of the
hypervisor's vcpu state in init_pkvm_hyp_vcpu(), and remove the
associated hypercall.

In protected mode, traps need to be initialized whenever a VCPU
is initialized anyway, and not only for protected VMs. This also
saves an unnecessary hypercall.

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20241018074833.2563674-2-tabba@google.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 8aaf3f7d

arch/arm64/include/asm/kvm_asm.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ enum __kvm_host_smccc_func { 
	__KVM_HOST_SMCCC_FUNC___kvm_timer_set_cntvoff,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_save_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___vgic_v3_restore_vmcr_aprs,

	__KVM_HOST_SMCCC_FUNC___pkvm_vcpu_init_traps,

	__KVM_HOST_SMCCC_FUNC___pkvm_init_vm,

	__KVM_HOST_SMCCC_FUNC___pkvm_init_vcpu,

	__KVM_HOST_SMCCC_FUNC___pkvm_teardown_vm,

arch/arm64/kvm/arm.c

+0 −8
Original line number Diff line number Diff line
@@ -856,14 +856,6 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) 
		static_branch_inc(&userspace_irqchip_in_use);

	}



	/*

	 * Initialize traps for protected VMs.

	 * NOTE: Move to run in EL2 directly, rather than via a hypercall, once

	 * the code is in place for first run initialization at EL2.

	 */

	if (kvm_vm_is_protected(kvm))

		kvm_call_hyp_nvhe(__pkvm_vcpu_init_traps, vcpu);



	mutex_lock(&kvm->arch.config_lock);

	set_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags);

	mutex_unlock(&kvm->arch.config_lock);

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

+0 −2
Original line number Diff line number Diff line
@@ -15,6 +15,4 @@ 
#define DECLARE_REG(type, name, ctxt, reg)	\

				type name = (type)cpu_reg(ctxt, (reg))



void __pkvm_vcpu_init_traps(struct kvm_vcpu *vcpu);



#endif /* __ARM64_KVM_NVHE_TRAP_HANDLER_H__ */

arch/arm64/kvm/hyp/nvhe/hyp-main.c

+0 −8
Original line number Diff line number Diff line
@@ -349,13 +349,6 @@ static void handle___pkvm_prot_finalize(struct kvm_cpu_context *host_ctxt) 
	cpu_reg(host_ctxt, 1) = __pkvm_prot_finalize();

}



static void handle___pkvm_vcpu_init_traps(struct kvm_cpu_context *host_ctxt)

{

	DECLARE_REG(struct kvm_vcpu *, vcpu, host_ctxt, 1);



	__pkvm_vcpu_init_traps(kern_hyp_va(vcpu));

}



static void handle___pkvm_init_vm(struct kvm_cpu_context *host_ctxt)

{

	DECLARE_REG(struct kvm *, host_kvm, host_ctxt, 1);
@@ -411,7 +404,6 @@ static const hcall_t host_hcall[] = { 
	HANDLE_FUNC(__kvm_timer_set_cntvoff),

	HANDLE_FUNC(__vgic_v3_save_vmcr_aprs),

	HANDLE_FUNC(__vgic_v3_restore_vmcr_aprs),

	HANDLE_FUNC(__pkvm_vcpu_init_traps),

	HANDLE_FUNC(__pkvm_init_vm),

	HANDLE_FUNC(__pkvm_init_vcpu),

	HANDLE_FUNC(__pkvm_teardown_vm),

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

+3 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static void pvm_init_trap_regs(struct kvm_vcpu *vcpu) 
/*

 * Initialize trap register values in protected mode.

 */

void __pkvm_vcpu_init_traps(struct kvm_vcpu *vcpu)

static void pkvm_vcpu_init_traps(struct kvm_vcpu *vcpu)

{

	pvm_init_trap_regs(vcpu);

	pvm_init_traps_aa64pfr0(vcpu);
@@ -335,6 +335,8 @@ static int init_pkvm_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu, 


	hyp_vcpu->vcpu.arch.hw_mmu = &hyp_vm->kvm.arch.mmu;

	hyp_vcpu->vcpu.arch.cflags = READ_ONCE(host_vcpu->arch.cflags);



	pkvm_vcpu_init_traps(&hyp_vcpu->vcpu);

done:

	if (ret)

		unpin_host_vcpu(host_vcpu);