diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-07-31 16:31:49 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-07-31 16:31:49 +0200 |
| commit | 307d2740b1895b5ff91d40735916ab46b63cf4ff (patch) | |
| tree | 21537d572c204417e55f55a78f54e820f2408dff | |
| parent | KVM: x86: always exit on EOIs for interrupts listed in the IOAPIC redir table (diff) | |
| parent | KVM: s390: rework broken SIGP STOP interrupt handling (diff) | |
| download | linux-307d2740b1895b5ff91d40735916ab46b63cf4ff.tar.xz linux-307d2740b1895b5ff91d40735916ab46b63cf4ff.zip | |
Merge tag 'kvm-s390-20140730' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next
Two fixes for recently introduced regressions
- a memory leak on busy SIGP
- pontentially lost SIGP stop in rare situations (shutdown loops)
The first issue is not part of a released kernel. The 2nd issue is
present in all KVM versions, but did not trigger before commit
7dfc63cf977447e09b1072911c2 (KVM: s390: allow only one SIGP STOP
(AND STORE STATUS) at a time) with Linux as a guest.
So no need for cc stable
| -rw-r--r-- | arch/s390/kvm/interrupt.c | 3 | ||||
| -rw-r--r-- | arch/s390/kvm/sigp.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 1be3d8da49e9..92528a0bdda6 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -158,6 +158,9 @@ static void __reset_intercept_indicators(struct kvm_vcpu *vcpu) LCTL_CR10 | LCTL_CR11); vcpu->arch.sie_block->ictl |= (ICTL_STCTL | ICTL_PINT); } + + if (vcpu->arch.local_int.action_bits & ACTION_STOP_ON_STOP) + atomic_set_mask(CPUSTAT_STOP_INT, &vcpu->arch.sie_block->cpuflags); } static void __set_cpuflag(struct kvm_vcpu *vcpu, u32 flag) diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index c6f1c2bc9753..cf243ba3d50f 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c @@ -139,6 +139,7 @@ static int __inject_sigp_stop(struct kvm_vcpu *dst_vcpu, int action) spin_lock(&li->lock); if (li->action_bits & ACTION_STOP_ON_STOP) { /* another SIGP STOP is pending */ + kfree(inti); rc = SIGP_CC_BUSY; goto out; } |