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

Commit ace50587 authored by Heiko Carstens's avatar Heiko Carstens Committed by Gleb Natapov
Browse files

KVM: s390: fix psw conversion in lpsw handler 



When converting a 64 bit psw to a 128 bit psw the addressing mode bit of
the "addr" part of the 64 bit psw must be moved to the basic addressing
mode bit of the "mask" part of the 128 bit psw.
In addition the addressing mode bit must be cleared when moved to the "addr"
part of the 128 bit psw.
Otherwise an invalid psw would be generated if the orginal psw was in the
31 bit addressing mode.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent d21683ea

arch/s390/kvm/priv.c

+2 −1
Original line number Diff line number Diff line
@@ -286,7 +286,8 @@ int kvm_s390_handle_lpsw(struct kvm_vcpu *vcpu) 


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

		(new_psw.mask & ~PSW32_MASK_BASE) << 32;

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

	vcpu->arch.sie_block->gpsw.mask |= new_psw.addr & PSW32_ADDR_AMODE;

	vcpu->arch.sie_block->gpsw.addr = new_psw.addr & ~PSW32_ADDR_AMODE;



	if ((vcpu->arch.sie_block->gpsw.mask & PSW_MASK_UNASSIGNED) ||

	    (!(vcpu->arch.sie_block->gpsw.mask & PSW_MASK_ADDR_MODE) &&