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

Commit 9eed0735 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Avi Kivity
Browse files

KVM: s390: provide control registers via kvm_run 



There are several cases were we need the control registers for
userspace. Lets also provide those in kvm_run.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 9ec2d6dc

arch/s390/include/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -44,10 +44,12 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_PREFIX (1UL << 0)

#define KVM_SYNC_GPRS   (1UL << 1)

#define KVM_SYNC_ACRS   (1UL << 2)

#define KVM_SYNC_CRS    (1UL << 3)

/* definition of registers in kvm_run */

struct kvm_sync_regs {

	__u64 prefix;	/* prefix register */

	__u64 gprs[16];	/* general purpose registers */

	__u32 acrs[16];	/* access registers */

	__u64 crs[16];	/* control registers */

};

#endif

arch/s390/kvm/kvm-s390.c

+8 −1
Original line number Diff line number Diff line
@@ -291,7 +291,8 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	vcpu->arch.gmap = vcpu->kvm->arch.gmap;

	vcpu->run->kvm_valid_regs = KVM_SYNC_PREFIX |

				    KVM_SYNC_GPRS |

				    KVM_SYNC_ACRS;

				    KVM_SYNC_ACRS |

				    KVM_SYNC_CRS;

	return 0;

}
@@ -580,6 +581,11 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
		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);

	}



	might_fault();
@@ -629,6 +635,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	kvm_run->psw_mask     = vcpu->arch.sie_block->gpsw.mask;

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

	kvm_run->s.regs.prefix = vcpu->arch.sie_block->prefix;

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



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &sigsaved, NULL);