diff options
| author | Avi Kivity | 2010-07-20 14:06:17 +0200 |
|---|---|---|
| committer | Avi Kivity | 2010-10-24 10:52:54 +0200 |
| commit | b463a6f744a263fccd7da14db1afdc880371a280 (patch) | |
| tree | 30dbb8d47f4a3a6b2036dd890d03cb53081eadef /arch/x86/kvm/svm.c | |
| parent | KVM: VMX: Parameterize vmx_complete_interrupts() for both exit and entry (diff) | |
| download | kernel-qcow2-linux-b463a6f744a263fccd7da14db1afdc880371a280.tar.gz kernel-qcow2-linux-b463a6f744a263fccd7da14db1afdc880371a280.tar.xz kernel-qcow2-linux-b463a6f744a263fccd7da14db1afdc880371a280.zip | |
KVM: Non-atomic interrupt injection
Change the interrupt injection code to work from preemptible, interrupts
enabled context. This works by adding a ->cancel_injection() operation
that undoes an injection in case we were not able to actually enter the guest
(this condition could never happen with atomic injection).
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 1d2ea65d3537..1a85fc507cf7 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3261,6 +3261,17 @@ static void svm_complete_interrupts(struct vcpu_svm *svm) } } +static void svm_cancel_injection(struct kvm_vcpu *vcpu) +{ + struct vcpu_svm *svm = to_svm(vcpu); + struct vmcb_control_area *control = &svm->vmcb->control; + + control->exit_int_info = control->event_inj; + control->exit_int_info_err = control->event_inj_err; + control->event_inj = 0; + svm_complete_interrupts(svm); +} + #ifdef CONFIG_X86_64 #define R "r" #else @@ -3631,6 +3642,7 @@ static struct kvm_x86_ops svm_x86_ops = { .set_irq = svm_set_irq, .set_nmi = svm_inject_nmi, .queue_exception = svm_queue_exception, + .cancel_injection = svm_cancel_injection, .interrupt_allowed = svm_interrupt_allowed, .nmi_allowed = svm_nmi_allowed, .get_nmi_mask = svm_get_nmi_mask, |