Commit 8f56770d authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

RISC-V: KVM: use kvm_trylock_all_vcpus when locking all vCPUs 



Use kvm_trylock_all_vcpus instead of a custom implementation when locking
all vCPUs of a VM.

Compile tested only.

Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Tested-by: default avatarAnup Patel <anup@brainfault.org>
Message-ID: <20250512180407.659015-7-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b586c5d2

arch/riscv/kvm/aia_device.c

+2 −32
Original line number Diff line number Diff line
@@ -12,36 +12,6 @@ 
#include <linux/kvm_host.h>

#include <linux/uaccess.h>



static void unlock_vcpus(struct kvm *kvm, int vcpu_lock_idx)

{

	struct kvm_vcpu *tmp_vcpu;



	for (; vcpu_lock_idx >= 0; vcpu_lock_idx--) {

		tmp_vcpu = kvm_get_vcpu(kvm, vcpu_lock_idx);

		mutex_unlock(&tmp_vcpu->mutex);

	}

}



static void unlock_all_vcpus(struct kvm *kvm)

{

	unlock_vcpus(kvm, atomic_read(&kvm->online_vcpus) - 1);

}



static bool lock_all_vcpus(struct kvm *kvm)

{

	struct kvm_vcpu *tmp_vcpu;

	unsigned long c;



	kvm_for_each_vcpu(c, tmp_vcpu, kvm) {

		if (!mutex_trylock(&tmp_vcpu->mutex)) {

			unlock_vcpus(kvm, c - 1);

			return false;

		}

	}



	return true;

}



static int aia_create(struct kvm_device *dev, u32 type)

{

	int ret;
@@ -53,7 +23,7 @@ static int aia_create(struct kvm_device *dev, u32 type) 
		return -EEXIST;



	ret = -EBUSY;

	if (!lock_all_vcpus(kvm))

	if (kvm_trylock_all_vcpus(kvm))

		return ret;



	kvm_for_each_vcpu(i, vcpu, kvm) {
@@ -65,7 +35,7 @@ static int aia_create(struct kvm_device *dev, u32 type) 
	kvm->arch.aia.in_kernel = true;



out_unlock:

	unlock_all_vcpus(kvm);

	kvm_unlock_all_vcpus(kvm);

	return ret;

}