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

Commit 62d9f0db authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: add ioctls to save/store mpstate 



So userspace can save/restore the mpstate during migration.

[avi: export the #define constants describing the value]
[christian: add s390 stubs]
[avi: ditto for ia64]

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent a4535290

arch/ia64/kvm/kvm-ia64.c

+12 −0
Original line number Diff line number Diff line
@@ -1792,3 +1792,15 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) 
{

	return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE;

}



int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	return -EINVAL;

}



int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	return -EINVAL;

}

arch/s390/kvm/kvm-s390.c

+12 −0
Original line number Diff line number Diff line
@@ -414,6 +414,18 @@ int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu, 
	return -EINVAL; /* not implemented yet */

}



int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	return -EINVAL; /* not implemented yet */

}



int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	return -EINVAL; /* not implemented yet */

}



static void __vcpu_run(struct kvm_vcpu *vcpu)

{

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

arch/x86/kvm/x86.c

+19 −0
Original line number Diff line number Diff line
@@ -817,6 +817,7 @@ int kvm_dev_ioctl_check_extension(long ext) 
	case KVM_CAP_CLOCKSOURCE:

	case KVM_CAP_PIT:

	case KVM_CAP_NOP_IO_DELAY:

	case KVM_CAP_MP_STATE:

		r = 1;

		break;

	case KVM_CAP_VAPIC:
@@ -3083,6 +3084,24 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
	return 0;

}



int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	vcpu_load(vcpu);

	mp_state->mp_state = vcpu->arch.mp_state;

	vcpu_put(vcpu);

	return 0;

}



int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,

				    struct kvm_mp_state *mp_state)

{

	vcpu_load(vcpu);

	vcpu->arch.mp_state = mp_state->mp_state;

	vcpu_put(vcpu);

	return 0;

}



static void set_segment(struct kvm_vcpu *vcpu,

			struct kvm_segment *var, int seg)

{

include/asm-x86/kvm_host.h

+0 −5
Original line number Diff line number Diff line
@@ -227,11 +227,6 @@ struct kvm_vcpu_arch { 
	u64 shadow_efer;

	u64 apic_base;

	struct kvm_lapic *apic;    /* kernel irqchip context */

#define KVM_MP_STATE_RUNNABLE          0

#define KVM_MP_STATE_UNINITIALIZED     1

#define KVM_MP_STATE_INIT_RECEIVED     2

#define KVM_MP_STATE_SIPI_RECEIVED     3

#define KVM_MP_STATE_HALTED            4

	int mp_state;

	int sipi_vector;

	u64 ia32_misc_enable_msr;

include/linux/kvm.h

+15 −0
Original line number Diff line number Diff line
@@ -228,6 +228,18 @@ struct kvm_vapic_addr { 
	__u64 vapic_addr;

};



/* for KVM_SET_MPSTATE */



#define KVM_MP_STATE_RUNNABLE          0

#define KVM_MP_STATE_UNINITIALIZED     1

#define KVM_MP_STATE_INIT_RECEIVED     2

#define KVM_MP_STATE_HALTED            3

#define KVM_MP_STATE_SIPI_RECEIVED     4



struct kvm_mp_state {

	__u32 mp_state;

};



struct kvm_s390_psw {

	__u64 mask;

	__u64 addr;
@@ -326,6 +338,7 @@ struct kvm_trace_rec { 
#define KVM_CAP_PIT 11

#define KVM_CAP_NOP_IO_DELAY 12

#define KVM_CAP_PV_MMU 13

#define KVM_CAP_MP_STATE 14



/*

 * ioctls for VM fds
@@ -387,5 +400,7 @@ struct kvm_trace_rec { 
#define KVM_S390_SET_INITIAL_PSW  _IOW(KVMIO,  0x96, struct kvm_s390_psw)

/* initial reset for s390 */

#define KVM_S390_INITIAL_RESET    _IO(KVMIO,  0x97)

#define KVM_GET_MP_STATE          _IOR(KVMIO,  0x98, struct kvm_mp_state)

#define KVM_SET_MP_STATE          _IOW(KVMIO,  0x99, struct kvm_mp_state)



#endif