Commit 5a32c1af authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Avi Kivity
Browse files

KVM: s390: provide general purpose guest registers via kvm_run 



This patch adds the general purpose registers to the kvm_run structure.

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 60b413c9

arch/s390/include/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -42,8 +42,10 @@ struct kvm_guest_debug_arch { 
};



#define KVM_SYNC_PREFIX (1UL << 0)

#define KVM_SYNC_GPRS   (1UL << 1)

/* definition of registers in kvm_run */

struct kvm_sync_regs {

	__u64 prefix;	/* prefix register */

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

};

#endif

arch/s390/include/asm/kvm_host.h

+1 −2
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ struct kvm_s390_float_interrupt { 


struct kvm_vcpu_arch {

	struct kvm_s390_sie_block *sie_block;

	unsigned long	  guest_gprs[16];

	s390_fp_regs      host_fpregs;

	unsigned int      host_acrs[NUM_ACRS];

	s390_fp_regs      guest_fpregs;
@@ -254,5 +253,5 @@ struct kvm_arch{ 
	struct gmap *gmap;

};



extern int sie64a(struct kvm_s390_sie_block *, unsigned long *);

extern int sie64a(struct kvm_s390_sie_block *, u64 *);

#endif

arch/s390/kvm/diag.c

+3 −3
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ static int diag_release_pages(struct kvm_vcpu *vcpu) 
	unsigned long start, end;

	unsigned long prefix  = vcpu->arch.sie_block->prefix;



	start = vcpu->arch.guest_gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];

	end = vcpu->arch.guest_gprs[vcpu->arch.sie_block->ipa & 0xf] + 4096;

	start = vcpu->run->s.regs.gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];

	end = vcpu->run->s.regs.gprs[vcpu->arch.sie_block->ipa & 0xf] + 4096;



	if (start & ~PAGE_MASK || end & ~PAGE_MASK || start > end

	    || start < 2 * PAGE_SIZE)
@@ -56,7 +56,7 @@ static int __diag_time_slice_end(struct kvm_vcpu *vcpu) 
static int __diag_ipl_functions(struct kvm_vcpu *vcpu)

{

	unsigned int reg = vcpu->arch.sie_block->ipa & 0xf;

	unsigned long subcode = vcpu->arch.guest_gprs[reg] & 0xffff;

	unsigned long subcode = vcpu->run->s.regs.gprs[reg] & 0xffff;



	VCPU_EVENT(vcpu, 5, "diag ipl functions, subcode %lx", subcode);

	switch (subcode) {

arch/s390/kvm/intercept.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int handle_lctlg(struct kvm_vcpu *vcpu) 


	useraddr = disp2;

	if (base2)

		useraddr += vcpu->arch.guest_gprs[base2];

		useraddr += vcpu->run->s.regs.gprs[base2];



	if (useraddr & 7)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
@@ -75,7 +75,7 @@ static int handle_lctl(struct kvm_vcpu *vcpu) 


	useraddr = disp2;

	if (base2)

		useraddr += vcpu->arch.guest_gprs[base2];

		useraddr += vcpu->run->s.regs.gprs[base2];



	if (useraddr & 3)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

arch/s390/kvm/kvm-s390.c

+7 −7
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	}



	vcpu->arch.gmap = vcpu->kvm->arch.gmap;

	vcpu->run->kvm_valid_regs = KVM_SYNC_PREFIX;

	vcpu->run->kvm_valid_regs = KVM_SYNC_PREFIX | KVM_SYNC_GPRS;

	return 0;

}
@@ -428,13 +428,13 @@ static int kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 


int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

{

	memcpy(&vcpu->arch.guest_gprs, &regs->gprs, sizeof(regs->gprs));

	memcpy(&vcpu->run->s.regs.gprs, &regs->gprs, sizeof(regs->gprs));

	return 0;

}



int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)

{

	memcpy(&regs->gprs, &vcpu->arch.guest_gprs, sizeof(regs->gprs));

	memcpy(&regs->gprs, &vcpu->run->s.regs.gprs, sizeof(regs->gprs));

	return 0;

}
@@ -511,7 +511,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
{

	int rc;



	memcpy(&vcpu->arch.sie_block->gg14, &vcpu->arch.guest_gprs[14], 16);

	memcpy(&vcpu->arch.sie_block->gg14, &vcpu->run->s.regs.gprs[14], 16);



	if (need_resched())

		schedule();
@@ -528,7 +528,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
	local_irq_enable();

	VCPU_EVENT(vcpu, 6, "entering sie flags %x",

		   atomic_read(&vcpu->arch.sie_block->cpuflags));

	rc = sie64a(vcpu->arch.sie_block, vcpu->arch.guest_gprs);

	rc = sie64a(vcpu->arch.sie_block, vcpu->run->s.regs.gprs);

	if (rc) {

		if (kvm_is_ucontrol(vcpu->kvm)) {

			rc = SIE_INTERCEPT_UCONTROL;
@@ -544,7 +544,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
	kvm_guest_exit();

	local_irq_enable();



	memcpy(&vcpu->arch.guest_gprs[14], &vcpu->arch.sie_block->gg14, 16);

	memcpy(&vcpu->run->s.regs.gprs[14], &vcpu->arch.sie_block->gg14, 16);

	return rc;

}
@@ -673,7 +673,7 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr) 
		return -EFAULT;



	if (__guestcopy(vcpu, addr + offsetof(struct save_area, gp_regs),

			vcpu->arch.guest_gprs, 128, prefix))

			vcpu->run->s.regs.gprs, 128, prefix))

		return -EFAULT;



	if (__guestcopy(vcpu, addr + offsetof(struct save_area, psw),