Commit e93fc7b4 authored by Christian Borntraeger's avatar Christian Borntraeger
Browse files

KVM: s390: Also reset registers in sync regs for initial cpu reset 



When we do the initial CPU reset we must not only clear the registers
in the internal data structures but also in kvm_run sync_regs. For
modern userspace sync_regs is the only place that it looks at.

Fixes: 7de3f142 ("KVM: s390: Add new reset vcpu API")
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent d718fdc3

arch/s390/kvm/kvm-s390.c

+17 −1
Original line number Diff line number Diff line
@@ -3268,7 +3268,10 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 
	/* Initial reset is a superset of the normal reset */

	kvm_arch_vcpu_ioctl_normal_reset(vcpu);



	/* this equals initial cpu reset in pop, but we don't switch to ESA */

	/*

	 * This equals initial cpu reset in pop, but we don't switch to ESA.

	 * We do not only reset the internal data, but also ...

	 */

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

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

	kvm_s390_set_prefix(vcpu, 0);
@@ -3278,6 +3281,19 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 
	memset(vcpu->arch.sie_block->gcr, 0, sizeof(vcpu->arch.sie_block->gcr));

	vcpu->arch.sie_block->gcr[0] = CR0_INITIAL_MASK;

	vcpu->arch.sie_block->gcr[14] = CR14_INITIAL_MASK;



	/* ... the data in sync regs */

	memset(vcpu->run->s.regs.crs, 0, sizeof(vcpu->run->s.regs.crs));

	vcpu->run->s.regs.ckc = 0;

	vcpu->run->s.regs.crs[0] = CR0_INITIAL_MASK;

	vcpu->run->s.regs.crs[14] = CR14_INITIAL_MASK;

	vcpu->run->psw_addr = 0;

	vcpu->run->psw_mask = 0;

	vcpu->run->s.regs.todpr = 0;

	vcpu->run->s.regs.cputm = 0;

	vcpu->run->s.regs.ckc = 0;

	vcpu->run->s.regs.pp = 0;

	vcpu->run->s.regs.gbea = 1;

	vcpu->run->s.regs.fpc = 0;

	vcpu->arch.sie_block->gbea = 1;

	vcpu->arch.sie_block->pp = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE