| Message ID | 1344849408-2697-3-git-send-email-gleb@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/13/2012 12:16 PM, Gleb Natapov wrote: > Signed-off-by: Gleb Natapov <gleb@redhat.com> > > -int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, > +int kvm_irq_delivery_to_apic(struct kvm_kernel_irq_routing_entry *e, > + struct kvm *kvm, struct kvm_lapic *src, > struct kvm_lapic_irq *irq) Would be nicer to put e at the end, and explain that it is optional. > { > - int i, r = -1; > - struct kvm_vcpu *vcpu, *lowest = NULL; > + int i, r = -1, c = 0; > + struct kvm_vcpu *vcpu, *cache = NULL, *lowest = NULL; > > if (irq->dest_mode == 0 && irq->dest_id == 0xff && > kvm_is_dm_lowest_prio(irq)) > @@ -82,6 +83,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, > if (!kvm_is_dm_lowest_prio(irq)) { > if (r < 0) > r = 0; > + c++; > + cache = vcpu; > r += kvm_apic_set_irq(vcpu, irq); > } else if (kvm_lapic_enabled(vcpu)) { > if (!lowest) > @@ -93,6 +96,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, > > if (lowest) > r = kvm_apic_set_irq(lowest, irq); > + else if (e && c == 1) > + e->vcpu = cache; /* cache it */ > > return r; > } > @@ -118,7 +123,9 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, > irq.shorthand = 0; > > /* TODO Deal with RH bit of MSI message address */ > - return kvm_irq_delivery_to_apic(kvm, NULL, &irq); > + if (e->vcpu) > + return kvm_apic_set_irq(e->vcpu, &irq); > + return kvm_irq_delivery_to_apic(e, kvm, NULL, &irq); > } > > int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) > @@ -131,6 +138,7 @@ int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) > route.msi.address_lo = msi->address_lo; > route.msi.address_hi = msi->address_hi; > route.msi.data = msi->data; > + route.vcpu = NULL; > > return kvm_set_msi(&route, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1); > } > Missing cache invalidate on apicid write? Otherwise nice and simple.
On Mon, Aug 13, 2012 at 12:32:44PM +0300, Avi Kivity wrote: > On 08/13/2012 12:16 PM, Gleb Natapov wrote: > > Signed-off-by: Gleb Natapov <gleb@redhat.com> > > > > -int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, > > +int kvm_irq_delivery_to_apic(struct kvm_kernel_irq_routing_entry *e, > > + struct kvm *kvm, struct kvm_lapic *src, > > struct kvm_lapic_irq *irq) > > Would be nicer to put e at the end, and explain that it is optional. > Just a prototype to see how it goes :) > > { > > - int i, r = -1; > > - struct kvm_vcpu *vcpu, *lowest = NULL; > > + int i, r = -1, c = 0; > > + struct kvm_vcpu *vcpu, *cache = NULL, *lowest = NULL; > > > > if (irq->dest_mode == 0 && irq->dest_id == 0xff && > > kvm_is_dm_lowest_prio(irq)) > > @@ -82,6 +83,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, > > if (!kvm_is_dm_lowest_prio(irq)) { > > if (r < 0) > > r = 0; > > + c++; > > + cache = vcpu; > > r += kvm_apic_set_irq(vcpu, irq); > > } else if (kvm_lapic_enabled(vcpu)) { > > if (!lowest) > > @@ -93,6 +96,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, > > > > if (lowest) > > r = kvm_apic_set_irq(lowest, irq); > > + else if (e && c == 1) > > + e->vcpu = cache; /* cache it */ > > > > return r; > > } > > @@ -118,7 +123,9 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, > > irq.shorthand = 0; > > > > /* TODO Deal with RH bit of MSI message address */ > > - return kvm_irq_delivery_to_apic(kvm, NULL, &irq); > > + if (e->vcpu) > > + return kvm_apic_set_irq(e->vcpu, &irq); > > + return kvm_irq_delivery_to_apic(e, kvm, NULL, &irq); > > } > > > > int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) > > @@ -131,6 +138,7 @@ int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) > > route.msi.address_lo = msi->address_lo; > > route.msi.address_hi = msi->address_hi; > > route.msi.data = msi->data; > > + route.vcpu = NULL; > > > > return kvm_set_msi(&route, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1); > > } > > > > Missing cache invalidate on apicid write? > Yes. Need to call to kvm_set_irq_routing() in strategic places. Same for ioapic. > Otherwise nice and simple. > > > -- > error compiling committee.c: too many arguments to function -- Gleb. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 18d149d..367a514 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -629,7 +629,7 @@ static void apic_send_ipi(struct kvm_lapic *apic) irq.trig_mode, irq.level, irq.dest_mode, irq.delivery_mode, irq.vector); - kvm_irq_delivery_to_apic(apic->vcpu->kvm, apic, &irq); + kvm_irq_delivery_to_apic(NULL, apic->vcpu->kvm, apic, &irq); } static u32 apic_get_tmcct(struct kvm_lapic *apic) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index d2b897e..bcd3dc7 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -271,6 +271,7 @@ struct kvm_kernel_irq_routing_entry { struct msi_msg msi; }; struct hlist_node link; + struct kvm_vcpu *vcpu; }; #ifdef __KVM_HAVE_IOAPIC diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index ef61d52..e6c8717 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -188,7 +188,7 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq) irqe.dest_id = ioapic->kvm->bsp_vcpu_id; } #endif - return kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe); + return kvm_irq_delivery_to_apic(NULL, ioapic->kvm, NULL, &irqe); } int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id, diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h index a30abfe..2a715bd 100644 --- a/virt/kvm/ioapic.h +++ b/virt/kvm/ioapic.h @@ -78,7 +78,8 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id, int level); void kvm_ioapic_clear_all(struct kvm_ioapic *ioapic, int irq_source_id); void kvm_ioapic_reset(struct kvm_ioapic *ioapic); -int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, +int kvm_irq_delivery_to_apic(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, struct kvm_lapic *src, struct kvm_lapic_irq *irq); int kvm_get_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); int kvm_set_ioapic(struct kvm *kvm, struct kvm_ioapic_state *state); diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index aad58e7..b556c2c 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c @@ -61,11 +61,12 @@ inline static bool kvm_is_dm_lowest_prio(struct kvm_lapic_irq *irq) #endif } -int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, +int kvm_irq_delivery_to_apic(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, struct kvm_lapic *src, struct kvm_lapic_irq *irq) { - int i, r = -1; - struct kvm_vcpu *vcpu, *lowest = NULL; + int i, r = -1, c = 0; + struct kvm_vcpu *vcpu, *cache = NULL, *lowest = NULL; if (irq->dest_mode == 0 && irq->dest_id == 0xff && kvm_is_dm_lowest_prio(irq)) @@ -82,6 +83,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, if (!kvm_is_dm_lowest_prio(irq)) { if (r < 0) r = 0; + c++; + cache = vcpu; r += kvm_apic_set_irq(vcpu, irq); } else if (kvm_lapic_enabled(vcpu)) { if (!lowest) @@ -93,6 +96,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, if (lowest) r = kvm_apic_set_irq(lowest, irq); + else if (e && c == 1) + e->vcpu = cache; /* cache it */ return r; } @@ -118,7 +123,9 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, irq.shorthand = 0; /* TODO Deal with RH bit of MSI message address */ - return kvm_irq_delivery_to_apic(kvm, NULL, &irq); + if (e->vcpu) + return kvm_apic_set_irq(e->vcpu, &irq); + return kvm_irq_delivery_to_apic(e, kvm, NULL, &irq); } int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) @@ -131,6 +138,7 @@ int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi) route.msi.address_lo = msi->address_lo; route.msi.address_hi = msi->address_hi; route.msi.data = msi->data; + route.vcpu = NULL; return kvm_set_msi(&route, kvm, KVM_USERSPACE_IRQ_SOURCE_ID, 1); }
Signed-off-by: Gleb Natapov <gleb@redhat.com> --- arch/x86/kvm/lapic.c | 2 +- include/linux/kvm_host.h | 1 + virt/kvm/ioapic.c | 2 +- virt/kvm/ioapic.h | 3 ++- virt/kvm/irq_comm.c | 16 ++++++++++++---- 5 files changed, 17 insertions(+), 7 deletions(-)