All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@de.ibm.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: KVM <kvm@vger.kernel.org>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	linux-s390 <linux-s390@vger.kernel.org>
Subject: [PATCH 2/5] KVM: s390: use created_vcpus in more places
Date: Wed, 20 Dec 2017 16:52:57 +0100	[thread overview]
Message-ID: <20171220155300.102321-3-borntraeger@de.ibm.com> (raw)
In-Reply-To: <20171220155300.102321-1-borntraeger@de.ibm.com>

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>
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;
-- 
2.13.4

  parent reply	other threads:[~2017-12-20 15:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-20 15:52 [PATCH 0/5] preview of first chunk of s390 patches for kvm/next Christian Borntraeger
2017-12-20 15:52 ` [PATCH 1/5] s390x/mm: cleanup gmap_pte_op_walk() Christian Borntraeger
2017-12-20 16:33   ` Cornelia Huck
2017-12-20 15:52 ` Christian Borntraeger [this message]
2017-12-20 16:35   ` [PATCH 2/5] KVM: s390: use created_vcpus in more places Cornelia Huck
2018-01-08 11:08   ` David Hildenbrand
2017-12-20 15:52 ` [PATCH 3/5] KVM: s390: add debug tracing for cpu features of CPU model Christian Borntraeger
2017-12-20 16:37   ` Cornelia Huck
2018-01-08 11:14   ` David Hildenbrand
2017-12-20 15:52 ` [PATCH 4/5] KVM: s390: drop use of spin lock in __floating_irq_kick Christian Borntraeger
2017-12-20 16:40   ` Cornelia Huck
2018-01-08 12:10   ` David Hildenbrand
2017-12-20 15:53 ` [PATCH 5/5] kvm_config: add CONFIG_S390_GUEST Christian Borntraeger
2017-12-20 16:44   ` Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171220155300.102321-3-borntraeger@de.ibm.com \
    --to=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.