From: Yang Zhang <yang.z.zhang@intel.com>
To: kvm@vger.kernel.org
Cc: gleb@redhat.com, mtosatti@redhat.com, xiantao.zhang@intel.com,
Yang Zhang <yang.z.zhang@Intel.com>
Subject: [PATCH v7 7/7] KVM: Use eoi to track RTC interrupt delivery status
Date: Mon, 1 Apr 2013 08:40:16 +0800 [thread overview]
Message-ID: <1364776816-30772-8-git-send-email-yang.z.zhang@intel.com> (raw)
In-Reply-To: <1364776816-30772-1-git-send-email-yang.z.zhang@intel.com>
From: Yang Zhang <yang.z.zhang@Intel.com>
Current interrupt coalescing logci which only used by RTC has conflict
with Posted Interrupt.
This patch introduces a new mechinism to use eoi to track interrupt:
When delivering an interrupt to vcpu, the pending_eoi set to number of
vcpu that received the interrupt. And decrease it when each vcpu writing
eoi. No subsequent RTC interrupt can deliver to vcpu until all vcpus
write eoi.
Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
---
virt/kvm/ioapic.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index ea26a5a..96a226d 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -132,6 +132,29 @@ void kvm_rtc_irq_restore(struct kvm_vcpu *vcpu)
spin_unlock(&ioapic->lock);
}
+static void rtc_irq_ack_eoi(struct kvm_ioapic *ioapic, struct kvm_vcpu *vcpu,
+ int irq)
+{
+ if (irq != RTC_GSI)
+ return;
+
+ if (test_and_clear_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map))
+ --ioapic->rtc_status.pending_eoi;
+
+ WARN_ON(ioapic->rtc_status.pending_eoi < 0);
+}
+
+static bool rtc_irq_check(struct kvm_ioapic *ioapic, int irq, bool line_status)
+{
+ if (irq != RTC_GSI || !line_status)
+ return false;
+
+ if (ioapic->rtc_status.pending_eoi > 0)
+ return true; /* coalesced */
+
+ return false;
+}
+
static int ioapic_service(struct kvm_ioapic *ioapic, unsigned int idx,
bool line_status)
{
@@ -248,6 +271,7 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq, bool line_status)
{
union kvm_ioapic_redirect_entry *entry = &ioapic->redirtbl[irq];
struct kvm_lapic_irq irqe;
+ int ret;
ioapic_debug("dest=%x dest_mode=%x delivery_mode=%x "
"vector=%x trig_mode=%x\n",
@@ -263,7 +287,14 @@ static int ioapic_deliver(struct kvm_ioapic *ioapic, int irq, bool line_status)
irqe.level = 1;
irqe.shorthand = 0;
- return kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe, NULL);
+ if (irq == RTC_GSI && line_status) {
+ ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe,
+ ioapic->rtc_status.dest_map);
+ ioapic->rtc_status.pending_eoi = ret;
+ } else
+ ret = kvm_irq_delivery_to_apic(ioapic->kvm, NULL, &irqe, NULL);
+
+ return ret;
}
int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id,
@@ -287,6 +318,11 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id,
ret = 1;
} else {
int edge = (entry.fields.trig_mode == IOAPIC_EDGE_TRIG);
+
+ if (rtc_irq_check(ioapic, irq, line_status)) {
+ ret = 0; /* coalesced */
+ goto out;
+ }
ioapic->irr |= mask;
if ((edge && old_irr != ioapic->irr) ||
(!edge && !entry.fields.remote_irr))
@@ -294,6 +330,7 @@ int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int irq_source_id,
else
ret = 0; /* report coalesced interrupt */
}
+out:
trace_kvm_ioapic_set_irq(entry.bits, irq, ret == 0);
spin_unlock(&ioapic->lock);
@@ -321,6 +358,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu,
if (ent->fields.vector != vector)
continue;
+ rtc_irq_ack_eoi(ioapic, vcpu, i);
/*
* We are dropping lock while calling ack notifiers because ack
* notifier callbacks for assigned devices call into IOAPIC
--
1.7.1
prev parent reply other threads:[~2013-04-01 0:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-01 0:40 [PATCH v7 0/7] Use eoi to track RTC interrupt delivery status Yang Zhang
2013-04-01 0:40 ` [PATCH v7 1/7] KVM: Add vcpu info to ioapic_update_eoi() Yang Zhang
2013-04-01 0:40 ` [PATCH v7 2/7] KVM: Introduce struct rtc_status Yang Zhang
2013-04-01 0:40 ` [PATCH v7 3/7] KVM : Return destination vcpu on interrupt injection Yang Zhang
2013-04-01 0:40 ` [PATCH v7 4/7] KVM: Add reset/restore rtc_status support Yang Zhang
2013-04-04 11:58 ` Gleb Natapov
2013-04-07 2:30 ` Zhang, Yang Z
2013-04-07 9:17 ` Gleb Natapov
2013-04-07 12:39 ` Zhang, Yang Z
2013-04-07 12:42 ` Gleb Natapov
2013-04-07 13:05 ` Zhang, Yang Z
2013-04-07 13:08 ` Gleb Natapov
2013-04-07 13:16 ` Zhang, Yang Z
2013-04-07 13:32 ` Gleb Natapov
2013-04-07 13:46 ` Zhang, Yang Z
2013-04-07 13:55 ` Gleb Natapov
2013-04-08 11:21 ` Zhang, Yang Z
2013-04-08 12:45 ` Gleb Natapov
2013-04-08 13:12 ` Zhang, Yang Z
2013-04-01 0:40 ` [PATCH v7 5/7] KVM : Force vmexit with virtual interrupt delivery Yang Zhang
2013-04-01 0:40 ` [PATCH v7 6/7] KVM: Let ioapic know the irq line status Yang Zhang
2013-04-01 0:40 ` Yang Zhang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364776816-30772-8-git-send-email-yang.z.zhang@intel.com \
--to=yang.z.zhang@intel.com \
--cc=gleb@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=xiantao.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox