lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 012/161] KVM: s390: use created_vcpus in more places
    Date
    From: Christian Borntraeger <borntraeger@de.ibm.com>

    [ Upstream commit 241e3ec0faf5ab1a0d9b1f6c43eefa919fb9c112 ]

    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@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: 4e0b1ab72b8a ("KVM: s390: gs support for kvm guests")
    Fixes: a03825bbd0c3 ("KVM: s390: use kvm->created_vcpus")
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    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 0fa3a788dd20..0bce918db11a 100644
    --- a/arch/s390/kvm/kvm-s390.c
    +++ b/arch/s390/kvm/kvm-s390.c
    @@ -601,7 +601,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);
    @@ -1121,7 +1121,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;
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 05:27    [W:4.056 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site