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: David Hildenbrand <dahi@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 81b0e11521e4..f00d0b02f868 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -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.addr = kvm_run->psw_addr;
-        if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX) {
-                kvm_run->kvm_dirty_regs &= ~KVM_SYNC_PREFIX;
+        if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX)
                 kvm_s390_set_prefix(vcpu, kvm_run->s.regs.prefix);
-        }
         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);
                 kvm_s390_set_prefix(vcpu, kvm_run->s.regs.prefix);
         }
+        kvm_run->kvm_dirty_regs = 0;
 
         might_fault();
         rc = __vcpu_run(vcpu);