From: Avi Kivity <avi@redhat.com>
To: stable@vger.kernel.org
Cc: Marcelo Tosatti <mtosatti@redhat.com>, kvm@vger.kernel.org
Subject: [PATCH 01/11] KVM: s390: do store status after handling STOP_ON_STOP bit
Date: Wed, 9 May 2012 16:10:37 +0300 [thread overview]
Message-ID: <1336569047-23576-2-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1336569047-23576-1-git-send-email-avi@redhat.com>
From: Jens Freimann <jfrei@linux.vnet.ibm.com>
In handle_stop() handle the stop bit before doing the store status as
described for "Stop and Store Status" in the Principles of Operation.
We have to give up the local_int.lock before calling kvm store status
since it calls gmap_fault() which might sleep. Since local_int.lock
only protects local_int.* and not guest memory we can give up the lock.
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 9e0d5473e2f0ba2d2fe9dab9408edef3060b710e)
---
arch/s390/kvm/intercept.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
index 0243454..a5f6eff 100644
--- a/arch/s390/kvm/intercept.c
+++ b/arch/s390/kvm/intercept.c
@@ -133,13 +133,6 @@ static int handle_stop(struct kvm_vcpu *vcpu)
vcpu->stat.exit_stop_request++;
spin_lock_bh(&vcpu->arch.local_int.lock);
- if (vcpu->arch.local_int.action_bits & ACTION_STORE_ON_STOP) {
- vcpu->arch.local_int.action_bits &= ~ACTION_STORE_ON_STOP;
- rc = kvm_s390_vcpu_store_status(vcpu,
- KVM_S390_STORE_STATUS_NOADDR);
- if (rc >= 0)
- rc = -EOPNOTSUPP;
- }
if (vcpu->arch.local_int.action_bits & ACTION_RELOADVCPU_ON_STOP) {
vcpu->arch.local_int.action_bits &= ~ACTION_RELOADVCPU_ON_STOP;
@@ -155,7 +148,18 @@ static int handle_stop(struct kvm_vcpu *vcpu)
rc = -EOPNOTSUPP;
}
- spin_unlock_bh(&vcpu->arch.local_int.lock);
+ if (vcpu->arch.local_int.action_bits & ACTION_STORE_ON_STOP) {
+ vcpu->arch.local_int.action_bits &= ~ACTION_STORE_ON_STOP;
+ /* store status must be called unlocked. Since local_int.lock
+ * only protects local_int.* and not guest memory we can give
+ * up the lock here */
+ spin_unlock_bh(&vcpu->arch.local_int.lock);
+ rc = kvm_s390_vcpu_store_status(vcpu,
+ KVM_S390_STORE_STATUS_NOADDR);
+ if (rc >= 0)
+ rc = -EOPNOTSUPP;
+ } else
+ spin_unlock_bh(&vcpu->arch.local_int.lock);
return rc;
}
--
1.7.10.1
next prev parent reply other threads:[~2012-05-09 13:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 13:10 [PATCH 00/11] KVM fixes for 3.3.5 Avi Kivity
2012-05-09 13:10 ` Avi Kivity [this message]
2012-05-09 13:10 ` [PATCH 02/11] KVM: s390: Sanitize fpc registers for KVM_SET_FPU Avi Kivity
2012-05-09 13:10 ` [PATCH 03/11] KVM: Fix write protection race during dirty logging Avi Kivity
2012-05-09 13:10 ` [PATCH 04/11] KVM: mmu_notifier: Flush TLBs before releasing mmu_lock Avi Kivity
2012-05-09 13:10 ` [PATCH 05/11] KVM: x86 emulator: correctly mask pmc index bits in RDPMC instruction emulation Avi Kivity
2012-05-09 13:10 ` [PATCH 06/11] KVM: Ensure all vcpus are consistent with in-kernel irqchip settings Avi Kivity
2012-05-09 13:10 ` [PATCH 07/11] KVM: VMX: Fix delayed load of shared MSRs Avi Kivity
2012-05-09 13:10 ` [PATCH 08/11] KVM: nVMX: Fix erroneous exception bitmap check Avi Kivity
2012-05-09 13:10 ` [PATCH 09/11] KVM: VMX: vmx_set_cr0 expects kvm->srcu locked Avi Kivity
2012-05-09 13:10 ` [PATCH 10/11] KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context Avi Kivity
2012-05-09 13:10 ` [PATCH 11/11] KVM: lock slots_lock around device assignment Avi Kivity
2012-05-10 16:28 ` [PATCH 00/11] KVM fixes for 3.3.5 Greg KH
2012-05-12 0:35 ` Ben Hutchings
2012-05-13 9:23 ` Avi Kivity
2012-05-13 10:19 ` Ben Hutchings
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=1336569047-23576-2-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=stable@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox