Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a15de8 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

KVM: s390: don't use CPUSTAT_WAIT to detect if a VCPU is idle 



As we want to make use of CPUSTAT_WAIT also when a VCPU is not idle but
to force interception of external calls, let's check in the bitmap instead.

Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent adbf1698

arch/s390/kvm/kvm-s390.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static inline int is_vcpu_stopped(struct kvm_vcpu *vcpu) 


static inline int is_vcpu_idle(struct kvm_vcpu *vcpu)

{

	return atomic_read(&vcpu->arch.sie_block->cpuflags) & CPUSTAT_WAIT;

	return test_bit(vcpu->vcpu_id, vcpu->arch.local_int.float_int->idle_mask);

}



static inline int kvm_is_ucontrol(struct kvm *kvm)

arch/s390/kvm/sigp.c

+5 −5
Original line number Diff line number Diff line
@@ -77,18 +77,18 @@ static int __sigp_conditional_emergency(struct kvm_vcpu *vcpu, 
	const u64 psw_int_mask = PSW_MASK_IO | PSW_MASK_EXT;

	u16 p_asn, s_asn;

	psw_t *psw;

	u32 flags;

	bool idle;



	flags = atomic_read(&dst_vcpu->arch.sie_block->cpuflags);

	idle = is_vcpu_idle(vcpu);

	psw = &dst_vcpu->arch.sie_block->gpsw;

	p_asn = dst_vcpu->arch.sie_block->gcr[4] & 0xffff;  /* Primary ASN */

	s_asn = dst_vcpu->arch.sie_block->gcr[3] & 0xffff;  /* Secondary ASN */



	/* Inject the emergency signal? */

	if (!(flags & CPUSTAT_STOPPED)

	if (!is_vcpu_stopped(vcpu)

	    || (psw->mask & psw_int_mask) != psw_int_mask

	    || ((flags & CPUSTAT_WAIT) && psw->addr != 0)

	    || (!(flags & CPUSTAT_WAIT) && (asn == p_asn || asn == s_asn))) {

	    || (idle && psw->addr != 0)

	    || (!idle && (asn == p_asn || asn == s_asn))) {

		return __inject_sigp_emergency(vcpu, dst_vcpu);

	} else {

		*reg &= 0xffffffff00000000UL;