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

Commit 3cfc3092 authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: x86: Add KVM_GET/SET_VCPU_EVENTS 



This new IOCTL exports all yet user-invisible states related to
exceptions, interrupts, and NMIs. Together with appropriate user space
changes, this fixes sporadic problems of vmsave/restore, live migration
and system reset.

[avi: future-proof abi by adding a flags field]

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 65ac7264

Documentation/kvm/api.txt

+49 −0
Original line number Original line Diff line number Diff line
@@ -653,6 +653,55 @@ struct kvm_clock_data { 
	__u32 pad[9];

	__u32 pad[9];

};

};





4.29 KVM_GET_VCPU_EVENTS



Capability: KVM_CAP_VCPU_EVENTS

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_vcpu_event (out)

Returns: 0 on success, -1 on error



Gets currently pending exceptions, interrupts, and NMIs as well as related

states of the vcpu.



struct kvm_vcpu_events {

	struct {

		__u8 injected;

		__u8 nr;

		__u8 has_error_code;

		__u8 pad;

		__u32 error_code;

	} exception;

	struct {

		__u8 injected;

		__u8 nr;

		__u8 soft;

		__u8 pad;

	} interrupt;

	struct {

		__u8 injected;

		__u8 pending;

		__u8 masked;

		__u8 pad;

	} nmi;

	__u32 sipi_vector;

	__u32 flags;   /* must be zero */

};



4.30 KVM_SET_VCPU_EVENTS



Capability: KVM_CAP_VCPU_EVENTS

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_vcpu_event (in)

Returns: 0 on success, -1 on error



Set pending exceptions, interrupts, and NMIs as well as related states of the

vcpu.



See KVM_GET_VCPU_EVENTS for the data structure.





5. The kvm_run structure

5. The kvm_run structure





Application code obtains a pointer to the kvm_run structure by

Application code obtains a pointer to the kvm_run structure by

arch/x86/include/asm/kvm.h

+28 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define __KVM_HAVE_MCE

#define __KVM_HAVE_MCE

#define __KVM_HAVE_PIT_STATE2

#define __KVM_HAVE_PIT_STATE2

#define __KVM_HAVE_XEN_HVM

#define __KVM_HAVE_XEN_HVM

#define __KVM_HAVE_VCPU_EVENTS





/* Architectural interrupt line count. */

/* Architectural interrupt line count. */

#define KVM_NR_INTERRUPTS 256

#define KVM_NR_INTERRUPTS 256
@@ -252,4 +253,31 @@ struct kvm_reinject_control { 
	__u8 pit_reinject;

	__u8 pit_reinject;

	__u8 reserved[31];

	__u8 reserved[31];

};

};



/* for KVM_GET/SET_VCPU_EVENTS */

struct kvm_vcpu_events {

	struct {

		__u8 injected;

		__u8 nr;

		__u8 has_error_code;

		__u8 pad;

		__u32 error_code;

	} exception;

	struct {

		__u8 injected;

		__u8 nr;

		__u8 soft;

		__u8 pad;

	} interrupt;

	struct {

		__u8 injected;

		__u8 pending;

		__u8 masked;

		__u8 pad;

	} nmi;

	__u32 sipi_vector;

	__u32 flags;

	__u32 reserved[10];

};



#endif /* _ASM_X86_KVM_H */
 
#endif /* _ASM_X86_KVM_H */

arch/x86/include/asm/kvm_host.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -523,6 +523,8 @@ struct kvm_x86_ops { 
				bool has_error_code, u32 error_code);

				bool has_error_code, u32 error_code);

	int (*interrupt_allowed)(struct kvm_vcpu *vcpu);

	int (*interrupt_allowed)(struct kvm_vcpu *vcpu);

	int (*nmi_allowed)(struct kvm_vcpu *vcpu);

	int (*nmi_allowed)(struct kvm_vcpu *vcpu);

	bool (*get_nmi_mask)(struct kvm_vcpu *vcpu);

	void (*set_nmi_mask)(struct kvm_vcpu *vcpu, bool masked);

	void (*enable_nmi_window)(struct kvm_vcpu *vcpu);

	void (*enable_nmi_window)(struct kvm_vcpu *vcpu);

	void (*enable_irq_window)(struct kvm_vcpu *vcpu);

	void (*enable_irq_window)(struct kvm_vcpu *vcpu);

	void (*update_cr8_intercept)(struct kvm_vcpu *vcpu, int tpr, int irr);

	void (*update_cr8_intercept)(struct kvm_vcpu *vcpu, int tpr, int irr);

arch/x86/kvm/svm.c

+22 −0
Original line number Original line Diff line number Diff line
@@ -2499,6 +2499,26 @@ static int svm_nmi_allowed(struct kvm_vcpu *vcpu) 
		!(svm->vcpu.arch.hflags & HF_NMI_MASK);

		!(svm->vcpu.arch.hflags & HF_NMI_MASK);

}

}





static bool svm_get_nmi_mask(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);



	return !!(svm->vcpu.arch.hflags & HF_NMI_MASK);

}



static void svm_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)

{

	struct vcpu_svm *svm = to_svm(vcpu);



	if (masked) {

		svm->vcpu.arch.hflags |= HF_NMI_MASK;

		svm->vmcb->control.intercept |= (1UL << INTERCEPT_IRET);

	} else {

		svm->vcpu.arch.hflags &= ~HF_NMI_MASK;

		svm->vmcb->control.intercept &= ~(1UL << INTERCEPT_IRET);

	}

}



static int svm_interrupt_allowed(struct kvm_vcpu *vcpu)

static int svm_interrupt_allowed(struct kvm_vcpu *vcpu)

{

{

	struct vcpu_svm *svm = to_svm(vcpu);

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -2946,6 +2966,8 @@ static struct kvm_x86_ops svm_x86_ops = { 
	.queue_exception = svm_queue_exception,

	.queue_exception = svm_queue_exception,

	.interrupt_allowed = svm_interrupt_allowed,

	.interrupt_allowed = svm_interrupt_allowed,

	.nmi_allowed = svm_nmi_allowed,

	.nmi_allowed = svm_nmi_allowed,

	.get_nmi_mask = svm_get_nmi_mask,

	.set_nmi_mask = svm_set_nmi_mask,

	.enable_nmi_window = enable_nmi_window,

	.enable_nmi_window = enable_nmi_window,

	.enable_irq_window = enable_irq_window,

	.enable_irq_window = enable_irq_window,

	.update_cr8_intercept = update_cr8_intercept,

	.update_cr8_intercept = update_cr8_intercept,

arch/x86/kvm/vmx.c

+30 −0
Original line number Original line Diff line number Diff line
@@ -2639,6 +2639,34 @@ static int vmx_nmi_allowed(struct kvm_vcpu *vcpu) 
				GUEST_INTR_STATE_NMI));

				GUEST_INTR_STATE_NMI));

}

}





static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)

{

	if (!cpu_has_virtual_nmis())

		return to_vmx(vcpu)->soft_vnmi_blocked;

	else

		return !!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) &

			  GUEST_INTR_STATE_NMI);

}



static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);



	if (!cpu_has_virtual_nmis()) {

		if (vmx->soft_vnmi_blocked != masked) {

			vmx->soft_vnmi_blocked = masked;

			vmx->vnmi_blocked_time = 0;

		}

	} else {

		if (masked)

			vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,

				      GUEST_INTR_STATE_NMI);

		else

			vmcs_clear_bits(GUEST_INTERRUPTIBILITY_INFO,

					GUEST_INTR_STATE_NMI);

	}

}



static int vmx_interrupt_allowed(struct kvm_vcpu *vcpu)

static int vmx_interrupt_allowed(struct kvm_vcpu *vcpu)

{

{

	return (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_IF) &&

	return (vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_IF) &&
@@ -3985,6 +4013,8 @@ static struct kvm_x86_ops vmx_x86_ops = { 
	.queue_exception = vmx_queue_exception,

	.queue_exception = vmx_queue_exception,

	.interrupt_allowed = vmx_interrupt_allowed,

	.interrupt_allowed = vmx_interrupt_allowed,

	.nmi_allowed = vmx_nmi_allowed,

	.nmi_allowed = vmx_nmi_allowed,

	.get_nmi_mask = vmx_get_nmi_mask,

	.set_nmi_mask = vmx_set_nmi_mask,

	.enable_nmi_window = enable_nmi_window,

	.enable_nmi_window = enable_nmi_window,

	.enable_irq_window = enable_irq_window,

	.enable_irq_window = enable_irq_window,

	.update_cr8_intercept = update_cr8_intercept,

	.update_cr8_intercept = update_cr8_intercept,