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

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

KVM: s390: clear kvm_dirty_regs when dropping to user space 



We should make sure that all kvm_dirty_regs bits are cleared before dropping
to user space. Until now, some would remain pending.

Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent d8482c0d

arch/s390/kvm/kvm-s390.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1319,15 +1319,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 




	vcpu->arch.sie_block->gpsw.mask = kvm_run->psw_mask;

	vcpu->arch.sie_block->gpsw.mask = kvm_run->psw_mask;

	vcpu->arch.sie_block->gpsw.addr = kvm_run->psw_addr;

	vcpu->arch.sie_block->gpsw.addr = kvm_run->psw_addr;

	if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX) {

	if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX)

		kvm_run->kvm_dirty_regs &= ~KVM_SYNC_PREFIX;

		kvm_s390_set_prefix(vcpu, kvm_run->s.regs.prefix);

		kvm_s390_set_prefix(vcpu, kvm_run->s.regs.prefix);

	}

	if (kvm_run->kvm_dirty_regs & KVM_SYNC_CRS) {

	if (kvm_run->kvm_dirty_regs & KVM_SYNC_CRS) {

		kvm_run->kvm_dirty_regs &= ~KVM_SYNC_CRS;

		memcpy(&vcpu->arch.sie_block->gcr, &kvm_run->s.regs.crs, 128);

		memcpy(&vcpu->arch.sie_block->gcr, &kvm_run->s.regs.crs, 128);

		kvm_s390_set_prefix(vcpu, kvm_run->s.regs.prefix);

		kvm_s390_set_prefix(vcpu, kvm_run->s.regs.prefix);

	}

	}

	kvm_run->kvm_dirty_regs = 0;





	might_fault();

	might_fault();

	rc = __vcpu_run(vcpu);

	rc = __vcpu_run(vcpu);