On 20.12.2017 16:52, Christian Borntraeger wrote: > commit a03825bbd0c3 ("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@xxxxxxxxxxxxxxxxxx> > Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx> > Reviewed-by: Halil Pasic <pasic@xxxxxxxxxxxxxxxxxx> > Fixes: 4e0b1ab72b8a ("KVM: s390: gs support for kvm guests") > Fixes: a03825bbd0c3 ("KVM: s390: use kvm->created_vcpus") > --- > arch/s390/kvm/kvm-s390.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index 40f0ae5a883f..00ef6f47e466 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -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; > Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> -- Thanks, David / dhildenb -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html