Commit 8046fa5f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-6.8-1' of... 

Merge tag 'kvmarm-fixes-6.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.8, take #1

- Don't source the VFIO Kconfig twice

- Fix protected-mode locking order between kvm and vcpus
parents e67391ca 42dfa94d

arch/arm64/kvm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# KVM configuration

#



source "virt/lib/Kconfig"

source "virt/kvm/Kconfig"



menuconfig VIRTUALIZATION

arch/arm64/kvm/pkvm.c

+17 −10
Original line number Diff line number Diff line
@@ -101,6 +101,17 @@ void __init kvm_hyp_reserve(void) 
		 hyp_mem_base);

}



static void __pkvm_destroy_hyp_vm(struct kvm *host_kvm)

{

	if (host_kvm->arch.pkvm.handle) {

		WARN_ON(kvm_call_hyp_nvhe(__pkvm_teardown_vm,

					  host_kvm->arch.pkvm.handle));

	}



	host_kvm->arch.pkvm.handle = 0;

	free_hyp_memcache(&host_kvm->arch.pkvm.teardown_mc);

}



/*

 * Allocates and donates memory for hypervisor VM structs at EL2.

 *
@@ -181,7 +192,7 @@ static int __pkvm_create_hyp_vm(struct kvm *host_kvm) 
	return 0;



destroy_vm:

	pkvm_destroy_hyp_vm(host_kvm);

	__pkvm_destroy_hyp_vm(host_kvm);

	return ret;

free_vm:

	free_pages_exact(hyp_vm, hyp_vm_sz);
@@ -194,23 +205,19 @@ int pkvm_create_hyp_vm(struct kvm *host_kvm) 
{

	int ret = 0;



	mutex_lock(&host_kvm->lock);

	mutex_lock(&host_kvm->arch.config_lock);

	if (!host_kvm->arch.pkvm.handle)

		ret = __pkvm_create_hyp_vm(host_kvm);

	mutex_unlock(&host_kvm->lock);

	mutex_unlock(&host_kvm->arch.config_lock);



	return ret;

}



void pkvm_destroy_hyp_vm(struct kvm *host_kvm)

{

	if (host_kvm->arch.pkvm.handle) {

		WARN_ON(kvm_call_hyp_nvhe(__pkvm_teardown_vm,

					  host_kvm->arch.pkvm.handle));

	}



	host_kvm->arch.pkvm.handle = 0;

	free_hyp_memcache(&host_kvm->arch.pkvm.teardown_mc);

	mutex_lock(&host_kvm->arch.config_lock);

	__pkvm_destroy_hyp_vm(host_kvm);

	mutex_unlock(&host_kvm->arch.config_lock);

}



int pkvm_init_host_vm(struct kvm *host_kvm)