Merge tag 'kvm-s390-20140730' of... (307d2740) · Commits · 戴 / test

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 (KVM: s390: allow only one SIGP STOP (AND STORE STATUS) at a time) with Linux as a guest. So no need for cc stable

arch/s390/kvm/interrupt.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)

arch/s390/kvm/sigp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message