Commit 1d5e740d authored by Zeng Guang's avatar Zeng Guang Committed by Paolo Bonzini
Browse files

KVM: Move kvm_arch_vcpu_precreate() under kvm->lock 



kvm_arch_vcpu_precreate() targets to handle arch specific VM resource
to be prepared prior to the actual creation of vCPU. For example, x86
platform may need do per-VM allocation based on max_vcpu_ids at the
first vCPU creation. It probably leads to concurrency control on this
allocation as multiple vCPU creation could happen simultaneously. From
the architectual point of view, it's necessary to execute
kvm_arch_vcpu_precreate() under protect of kvm->lock.

Currently only arm64, x86 and s390 have non-nop implementations at the
stage of vCPU pre-creation. Remove the lock acquiring in s390's design
and make sure all architecture can run kvm_arch_vcpu_precreate() safely
under kvm->lock without recrusive lock issue.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarZeng Guang <guang.zeng@intel.com>
Message-Id: <20220419154409.11842-1-guang.zeng@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f08a06c9

arch/s390/kvm/kvm-s390.c

+0 −2
Original line number Diff line number Diff line
@@ -3238,9 +3238,7 @@ static int sca_can_add_vcpu(struct kvm *kvm, unsigned int id) 
	if (!sclp.has_esca || !sclp.has_64bscao)

		return false;



	mutex_lock(&kvm->lock);

	rc = kvm->arch.use_esca ? 0 : sca_switch_to_extended(kvm);

	mutex_unlock(&kvm->lock);



	return rc == 0 && id < KVM_S390_ESCA_CPU_SLOTS;

}

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -11242,7 +11242,7 @@ static int sync_regs(struct kvm_vcpu *vcpu) 


int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)

{

	if (kvm_check_tsc_unstable() && atomic_read(&kvm->online_vcpus) != 0)

	if (kvm_check_tsc_unstable() && kvm->created_vcpus)

		pr_warn_once("kvm: SMP vm created on host with unstable TSC; "

			     "guest TSC will not be reliable\n");

virt/kvm/kvm_main.c

+6 −4
Original line number Diff line number Diff line
@@ -3768,12 +3768,14 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) 
		return -EINVAL;

	}



	kvm->created_vcpus++;

	r = kvm_arch_vcpu_precreate(kvm, id);

	if (r) {

		mutex_unlock(&kvm->lock);

		return r;

	}



	r = kvm_arch_vcpu_precreate(kvm, id);

	if (r)

		goto vcpu_decrement;

	kvm->created_vcpus++;

	mutex_unlock(&kvm->lock);



	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL_ACCOUNT);

	if (!vcpu) {