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

Commit f2d8421b authored by Radim Krčmář's avatar Radim Krčmář
Browse files

Merge tag 'kvm-s390-master-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux 

KVM: s390: two fixes for sthyi emulation

- missing inline assembly constraint
- wrong exception handling
parents 14ccee78 857b8de9

arch/s390/kvm/sthyi.c

+5 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int sthyi(u64 vaddr) 
		"srl     %[cc],28\n"

		: [cc] "=d" (cc)

		: [code] "d" (code), [addr] "a" (addr)

		: "memory", "cc");

		: "3", "memory", "cc");

	return cc;

}
@@ -425,7 +425,7 @@ int handle_sthyi(struct kvm_vcpu *vcpu) 
	VCPU_EVENT(vcpu, 3, "STHYI: fc: %llu addr: 0x%016llx", code, addr);

	trace_kvm_s390_handle_sthyi(vcpu, code, addr);



	if (reg1 == reg2 || reg1 & 1 || reg2 & 1 || addr & ~PAGE_MASK)

	if (reg1 == reg2 || reg1 & 1 || reg2 & 1)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);



	if (code & 0xffff) {
@@ -433,6 +433,9 @@ int handle_sthyi(struct kvm_vcpu *vcpu) 
		goto out;

	}



	if (addr & ~PAGE_MASK)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);



	/*

	 * If the page has not yet been faulted in, we want to do that

	 * now and not after all the expensive calculations.