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

Commit dfcf7dc6 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Gleb Natapov
Browse files

s390/kvm: fix psw rewinding in handle_skey 



The PSW can wrap if the guest has been running in the 24 bit or 31 bit
addressing mode. Use __rewind_psw to find the correct address.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent eed3b1e5

arch/s390/kvm/priv.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static int handle_store_cpu_address(struct kvm_vcpu *vcpu) 
static int handle_skey(struct kvm_vcpu *vcpu)

{

	vcpu->stat.instruction_storage_key++;

	vcpu->arch.sie_block->gpsw.addr -= 4;

	vcpu->arch.sie_block->gpsw.addr =

		__rewind_psw(vcpu->arch.sie_block->gpsw, 4);

	VCPU_EVENT(vcpu, 4, "%s", "retrying storage key operation");

	return 0;

}