Skip to contentSkip to conversation

correctly trace irq injection on SVM.

PATCH Applied Gleb Natapov 2 participants 2 messages May 23, 2010

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Gleb Natapov

author
#0 lore raw

PATCH v3 1/1 correctly trace irq injection on SVM.

On SVM interrupts are injected by svm_set_irq() not svm_inject_irq(). The later is used only to wait for irq window.

Signed-off-by Gleb Natapov <[email protected]>

---

ChangeLog:
v1->v2:
- fix stupid cut&paste error.

v2->v3:
- Move also kvm_stat accounting of irq_injections to correct place.

arch/x86/kvm/svm.c +3 -3
index 4af2c12..ebc24b5 100644
@@ -2919,9 +2919,6 @@ static inline void svm_inject_irq(struct vcpu_svm *svm, int irq)
 {
 	struct vmcb_control_area *control;
 
-	trace_kvm_inj_virq(irq);
-
-	++svm->vcpu.stat.irq_injections;
 	control = &svm->vmcb->control;
 	control->int_vector = irq;
 	control->int_ctl &= ~V_INTR_PRIO_MASK;

@@ -2935,6 +2932,9 @@ static void svm_set_irq(struct kvm_vcpu *vcpu)
 
 	BUG_ON(!(gif_set(svm)));
 
+	trace_kvm_inj_virq(vcpu->arch.interrupt.nr);
+	++vcpu->stat.irq_injections;
+
 	svm->vmcb->control.event_inj = vcpu->arch.interrupt.nr |
 		SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_INTR;
 }

--
Gleb.

Applied
#1 lore raw
Quoted 3 lines · Gleb Natapov

On SVM interrupts are injected by svm_set_irq() not svm_inject_irq(). The later is used only to wait for irq window.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function