Commit 99996d57 authored by Quentin Perret's avatar Quentin Perret Committed by Marc Zyngier
Browse files

KVM: arm64: Add {get,put}_pkvm_hyp_vm() helpers 



In preparation for accessing pkvm_hyp_vm structures at EL2 in a context
where we can't always expect a vCPU to be loaded (e.g. MMU notifiers),
introduce get/put helpers to get temporary references to hyp VMs from
any context.

Tested-by: default avatarFuad Tabba <tabba@google.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Signed-off-by: default avatarQuentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20241218194059.3670226-9-qperret@google.com


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

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

+3 −0
Original line number Diff line number Diff line
@@ -70,4 +70,7 @@ struct pkvm_hyp_vcpu *pkvm_load_hyp_vcpu(pkvm_handle_t handle, 
					 unsigned int vcpu_idx);

void pkvm_put_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu);



struct pkvm_hyp_vm *get_pkvm_hyp_vm(pkvm_handle_t handle);

void put_pkvm_hyp_vm(struct pkvm_hyp_vm *hyp_vm);



#endif /* __ARM64_KVM_NVHE_PKVM_H__ */

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

+20 −0
Original line number Diff line number Diff line
@@ -327,6 +327,26 @@ void pkvm_put_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) 
	hyp_spin_unlock(&vm_table_lock);

}



struct pkvm_hyp_vm *get_pkvm_hyp_vm(pkvm_handle_t handle)

{

	struct pkvm_hyp_vm *hyp_vm;



	hyp_spin_lock(&vm_table_lock);

	hyp_vm = get_vm_by_handle(handle);

	if (hyp_vm)

		hyp_page_ref_inc(hyp_virt_to_page(hyp_vm));

	hyp_spin_unlock(&vm_table_lock);



	return hyp_vm;

}



void put_pkvm_hyp_vm(struct pkvm_hyp_vm *hyp_vm)

{

	hyp_spin_lock(&vm_table_lock);

	hyp_page_ref_dec(hyp_virt_to_page(hyp_vm));

	hyp_spin_unlock(&vm_table_lock);

}



static void pkvm_init_features_from_host(struct pkvm_hyp_vm *hyp_vm, const struct kvm *host_kvm)

{

	struct kvm *kvm = &hyp_vm->kvm;