Commit 241e3ec0 authored Nov 16, 2017 by Christian Borntraeger

KVM: s390: use created_vcpus in more places



commit a03825bb ("KVM: s390: use kvm->created_vcpus") introduced
kvm->created_vcpus to avoid races with the existing kvm->online_vcpus
scheme. One place was "forgotten" and one new place was "added".
Let's fix those.

Reported-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Fixes: 4e0b1ab7 ("KVM: s390: gs support for kvm guests")
Fixes: a03825bb ("KVM: s390: use kvm->created_vcpus")

parent 96965941

arch/s390/kvm/kvm-s390.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -573,7 +573,7 @@ static int kvm_vm_ioctl_enable_cap(struct kvm kvm, struct kvm_enable_cap cap)
		case KVM_CAP_S390_GS:
		r = -EINVAL;
		mutex_lock(&kvm->lock);
		if (atomic_read(&kvm->online_vcpus)) {
		if (kvm->created_vcpus) {
		r = -EBUSY;
		} else if (test_facility(133)) {
		set_kvm_facility(kvm->arch.model.fac_mask, 133);
		@@ -1094,7 +1094,7 @@ static int kvm_s390_set_processor_feat(struct kvm *kvm,
		return -EINVAL;

		mutex_lock(&kvm->lock);
		if (!atomic_read(&kvm->online_vcpus)) {
		if (!kvm->created_vcpus) {
		bitmap_copy(kvm->arch.cpu_feat, (unsigned long *) data.feat,
		KVM_S390_VM_CPU_FEAT_NR_BITS);
		ret = 0;