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

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

KVM: s390: enable SRS only if enabled for the guest 



If we don't have SIGP SENSE RUNNING STATUS enabled for the guest, let's
not enable interpretation so we can correctly report an invalid order.

Reviewed-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 d6af0b49

arch/s390/include/asm/sigp.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


/* SIGP cpu status bits */



#define SIGP_STATUS_INVALID_ORDER	0x00000002UL

#define SIGP_STATUS_CHECK_STOP		0x00000010UL

#define SIGP_STATUS_STOPPED		0x00000040UL

#define SIGP_STATUS_EXT_CALL_PENDING	0x00000080UL

arch/s390/kvm/kvm-s390.c

+3 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 


	kvm_s390_vcpu_setup_model(vcpu);



	vcpu->arch.sie_block->ecb   = 6;

	vcpu->arch.sie_block->ecb = 0x02;

	if (test_kvm_facility(vcpu->kvm, 9))

		vcpu->arch.sie_block->ecb |= 0x04;

	if (test_kvm_facility(vcpu->kvm, 50) && test_kvm_facility(vcpu->kvm, 73))

		vcpu->arch.sie_block->ecb |= 0x10;

arch/s390/kvm/sigp.c

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ static int __sigp_sense_running(struct kvm_vcpu *vcpu, 
	struct kvm_s390_local_interrupt *li;

	int rc;



	if (!test_kvm_facility(vcpu->kvm, 9)) {

		*reg &= 0xffffffff00000000UL;

		*reg |= SIGP_STATUS_INVALID_ORDER;

		return SIGP_CC_STATUS_STORED;

	}



	li = &dst_vcpu->arch.local_int;

	if (atomic_read(li->cpuflags) & CPUSTAT_RUNNING) {

		/* running */