From: Avi Kivity <avi@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 05/46] KVM: Add Directed EOI support to APIC emulation
Date: Sun, 23 Aug 2009 14:56:04 +0300 [thread overview]
Message-ID: <1251028605-31977-6-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1251028605-31977-1-git-send-email-avi@redhat.com>
From: Gleb Natapov <gleb@redhat.com>
Directed EOI is specified by x2APIC, but is available even when lapic is
in xAPIC mode.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/x86/include/asm/apicdef.h | 2 ++
arch/x86/kvm/lapic.c | 38 ++++++++++++++++++++++++++++++--------
arch/x86/kvm/lapic.h | 1 +
arch/x86/kvm/x86.c | 4 ++--
arch/x86/kvm/x86.h | 4 ++++
5 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index 7ddb36a..74ca38f 100644
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -14,6 +14,7 @@
#define APIC_LVR 0x30
#define APIC_LVR_MASK 0xFF00FF
+#define APIC_LVR_DIRECTED_EOI (1 << 24)
#define GET_APIC_VERSION(x) ((x) & 0xFFu)
#define GET_APIC_MAXLVT(x) (((x) >> 16) & 0xFFu)
#ifdef CONFIG_X86_32
@@ -40,6 +41,7 @@
#define APIC_DFR_CLUSTER 0x0FFFFFFFul
#define APIC_DFR_FLAT 0xFFFFFFFFul
#define APIC_SPIV 0xF0
+#define APIC_SPIV_DIRECTED_EOI (1 << 12)
#define APIC_SPIV_FOCUS_DISABLED (1 << 9)
#define APIC_SPIV_APIC_ENABLED (1 << 8)
#define APIC_ISR 0x100
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 265a765..62ea2ab 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -35,6 +35,7 @@
#include "kvm_cache_regs.h"
#include "irq.h"
#include "trace.h"
+#include "x86.h"
#ifndef CONFIG_X86_64
#define mod_64(x, y) ((x) - (y) * div64_u64(x, y))
@@ -142,6 +143,21 @@ static inline int apic_lvt_nmi_mode(u32 lvt_val)
return (lvt_val & (APIC_MODE_MASK | APIC_LVT_MASKED)) == APIC_DM_NMI;
}
+void kvm_apic_set_version(struct kvm_vcpu *vcpu)
+{
+ struct kvm_lapic *apic = vcpu->arch.apic;
+ struct kvm_cpuid_entry2 *feat;
+ u32 v = APIC_VERSION;
+
+ if (!irqchip_in_kernel(vcpu->kvm))
+ return;
+
+ feat = kvm_find_cpuid_entry(apic->vcpu, 0x1, 0);
+ if (feat && (feat->ecx & (1 << (X86_FEATURE_X2APIC & 31))))
+ v |= APIC_LVR_DIRECTED_EOI;
+ apic_set_reg(apic, APIC_LVR, v);
+}
+
static unsigned int apic_lvt_mask[APIC_LVT_NUM] = {
LVT_MASK | APIC_LVT_TIMER_PERIODIC, /* LVTT */
LVT_MASK | APIC_MODE_MASK, /* LVTTHMR */
@@ -442,9 +458,11 @@ static void apic_set_eoi(struct kvm_lapic *apic)
trigger_mode = IOAPIC_LEVEL_TRIG;
else
trigger_mode = IOAPIC_EDGE_TRIG;
- mutex_lock(&apic->vcpu->kvm->irq_lock);
- kvm_ioapic_update_eoi(apic->vcpu->kvm, vector, trigger_mode);
- mutex_unlock(&apic->vcpu->kvm->irq_lock);
+ if (!(apic_get_reg(apic, APIC_SPIV) & APIC_SPIV_DIRECTED_EOI)) {
+ mutex_lock(&apic->vcpu->kvm->irq_lock);
+ kvm_ioapic_update_eoi(apic->vcpu->kvm, vector, trigger_mode);
+ mutex_unlock(&apic->vcpu->kvm->irq_lock);
+ }
}
static void apic_send_ipi(struct kvm_lapic *apic)
@@ -694,8 +712,11 @@ static int apic_mmio_write(struct kvm_io_device *this,
apic_set_reg(apic, APIC_DFR, val | 0x0FFFFFFF);
break;
- case APIC_SPIV:
- apic_set_reg(apic, APIC_SPIV, val & 0x3ff);
+ case APIC_SPIV: {
+ u32 mask = 0x3ff;
+ if (apic_get_reg(apic, APIC_LVR) & APIC_LVR_DIRECTED_EOI)
+ mask |= APIC_SPIV_DIRECTED_EOI;
+ apic_set_reg(apic, APIC_SPIV, val & mask);
if (!(val & APIC_SPIV_APIC_ENABLED)) {
int i;
u32 lvt_val;
@@ -710,7 +731,7 @@ static int apic_mmio_write(struct kvm_io_device *this,
}
break;
-
+ }
case APIC_ICR:
/* No delay here, so we always clear the pending bit */
apic_set_reg(apic, APIC_ICR, val & ~(1 << 12));
@@ -837,7 +858,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu)
hrtimer_cancel(&apic->lapic_timer.timer);
apic_set_reg(apic, APIC_ID, vcpu->vcpu_id << 24);
- apic_set_reg(apic, APIC_LVR, APIC_VERSION);
+ kvm_apic_set_version(apic->vcpu);
for (i = 0; i < APIC_LVT_NUM; i++)
apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED);
@@ -1041,7 +1062,8 @@ void kvm_apic_post_state_restore(struct kvm_vcpu *vcpu)
apic->base_address = vcpu->arch.apic_base &
MSR_IA32_APICBASE_BASE;
- apic_set_reg(apic, APIC_LVR, APIC_VERSION);
+ kvm_apic_set_version(vcpu);
+
apic_update_ppr(apic);
hrtimer_cancel(&apic->lapic_timer.timer);
update_divide_count(apic);
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 3f3ecc6..bc1c524 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -29,6 +29,7 @@ u64 kvm_lapic_get_cr8(struct kvm_vcpu *vcpu);
void kvm_lapic_set_tpr(struct kvm_vcpu *vcpu, unsigned long cr8);
void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value);
u64 kvm_lapic_get_base(struct kvm_vcpu *vcpu);
+void kvm_apic_set_version(struct kvm_vcpu *vcpu);
int kvm_apic_match_physical_addr(struct kvm_lapic *apic, u16 dest);
int kvm_apic_match_logical_addr(struct kvm_lapic *apic, u8 mda);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d32e3c6..086f931 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -79,8 +79,6 @@ static u64 __read_mostly efer_reserved_bits = 0xfffffffffffffffeULL;
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries);
-struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,
- u32 function, u32 index);
struct kvm_x86_ops *kvm_x86_ops;
EXPORT_SYMBOL_GPL(kvm_x86_ops);
@@ -1373,6 +1371,7 @@ static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
vcpu->arch.cpuid_nent = cpuid->nent;
cpuid_fix_nx_cap(vcpu);
r = 0;
+ kvm_apic_set_version(vcpu);
out_free:
vfree(cpuid_entries);
@@ -1394,6 +1393,7 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
goto out;
vcpu->arch.cpuid_nent = cpuid->nent;
+ kvm_apic_set_version(vcpu);
return 0;
out:
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 4c8e10a..5eadea5 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -31,4 +31,8 @@ static inline bool kvm_exception_is_soft(unsigned int nr)
{
return (nr == BP_VECTOR) || (nr == OF_VECTOR);
}
+
+struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu,
+ u32 function, u32 index);
+
#endif
--
1.6.4.1
next prev parent reply other threads:[~2009-08-23 12:04 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-23 11:55 [PATCH 00/46] KVM updates for 2.6.32 merge window (3/4) Avi Kivity
2009-08-23 11:56 ` [PATCH 01/46] KVM: Trace irq level and source id Avi Kivity
2009-08-23 11:56 ` [PATCH 02/46] KVM: Ignore PCI ECS I/O enablement Avi Kivity
2009-08-23 11:56 ` [PATCH 03/46] KVM: Trace mmio Avi Kivity
2009-08-23 11:56 ` [PATCH 04/46] KVM: Trace apic registers using their symbolic names Avi Kivity
2009-08-23 11:56 ` Avi Kivity [this message]
2009-08-23 11:56 ` [PATCH 06/46] KVM: x2apic interface to lapic Avi Kivity
2009-08-23 11:56 ` [PATCH 07/46] KVM: Use temporary variable to shorten lines Avi Kivity
2009-08-23 11:56 ` [PATCH 08/46] KVM: Fix apic_mmio_write return for unaligned write Avi Kivity
2009-08-23 11:56 ` [PATCH 09/46] KVM: handle AMD microcode MSR Avi Kivity
2009-08-23 11:56 ` [PATCH 10/46] Revert "KVM: x86: check for cr3 validity in ioctl_set_sregs" Avi Kivity
2009-08-23 11:56 ` [PATCH 11/46] KVM: MMU: Trace guest pagetable walker Avi Kivity
2009-08-23 11:56 ` [PATCH 12/46] KVM: Document basic API Avi Kivity
2009-08-23 11:56 ` [PATCH 13/46] KVM: Trace shadow page lifecycle Avi Kivity
2009-08-23 11:56 ` [PATCH 14/46] KVM: fix MMIO_CONF_BASE MSR access Avi Kivity
2009-08-23 11:56 ` [PATCH 15/46] KVM: ignore msi request if !level Avi Kivity
2009-08-23 11:56 ` [PATCH 16/46] KVM: Add trace points in irqchip code Avi Kivity
2009-08-23 11:56 ` [PATCH 17/46] KVM: No need to kick cpu if not in a guest mode Avi Kivity
2009-08-23 11:56 ` [PATCH 18/46] KVM: Always report x2apic as supported feature Avi Kivity
2009-08-23 11:56 ` [PATCH 19/46] KVM: PIT support for HPET legacy mode Avi Kivity
2009-08-23 11:56 ` [PATCH 20/46] KVM: add module parameters documentation Avi Kivity
2009-08-23 11:56 ` [PATCH 21/46] KVM: make io_bus interface more robust Avi Kivity
2009-08-23 11:56 ` [PATCH 22/46] KVM: add ioeventfd support Avi Kivity
2009-08-23 11:56 ` [PATCH 23/46] KVM: MMU: Fix MMU_DEBUG compile breakage Avi Kivity
2009-08-23 11:56 ` [PATCH 24/46] KVM: Move exception handling to the same place as other events Avi Kivity
2009-08-23 11:56 ` [PATCH 25/46] KVM: Move kvm_cpu_get_interrupt() declaration to x86 code Avi Kivity
2009-08-23 11:56 ` [PATCH 26/46] KVM: Reduce runnability interface with arch support code Avi Kivity
2009-08-23 11:56 ` [PATCH 27/46] KVM: silence lapic kernel messages that can be triggered by a guest Avi Kivity
2009-08-23 11:56 ` [PATCH 28/46] KVM: Discard unnecessary kvm_mmu_flush_tlb() in kvm_mmu_load() Avi Kivity
2009-08-23 11:56 ` [PATCH 29/46] KVM: MMU: fix missing locking in alloc_mmu_pages Avi Kivity
2009-08-23 11:56 ` [PATCH 30/46] KVM: s390: remove unused structs Avi Kivity
2009-08-23 11:56 ` [PATCH 31/46] KVM: x86: use get_desc_base() and get_desc_limit() Avi Kivity
2009-08-23 11:56 ` [PATCH 32/46] KVM: x86: use kvm_get_gdt() and kvm_read_ldt() Avi Kivity
2009-08-23 11:56 ` [PATCH 33/46] KVM: VMX: Introduce KVM_SET_IDENTITY_MAP_ADDR ioctl Avi Kivity
2009-08-23 11:56 ` [PATCH 34/46] KVM: PIT: Unregister ack notifier callback when freeing Avi Kivity
2009-08-23 11:56 ` [PATCH 35/46] KVM: Drop obsolete cpu_get/put in make_all_cpus_request Avi Kivity
2009-08-23 11:56 ` [PATCH 36/46] KVM: VMX: Avoid to return ENOTSUPP to userland Avi Kivity
2009-08-23 11:56 ` [PATCH 37/46] KVM: Align cr8 threshold when userspace changes cr8 Avi Kivity
2009-08-23 11:56 ` [PATCH 38/46] KVM: limit lapic periodic timer frequency Avi Kivity
2009-08-23 11:56 ` [PATCH 39/46] KVM: fix kvm_init() error handling Avi Kivity
2009-08-23 11:56 ` [PATCH 40/46] KVM: MMU: make rmap code aware of mapping levels Avi Kivity
2009-08-23 11:56 ` [PATCH 41/46] KVM: MMU: rename is_largepage_backed to mapping_level Avi Kivity
2009-08-23 11:56 ` [PATCH 42/46] KVM: MMU: make direct mapping paths aware of mapping levels Avi Kivity
2009-08-23 11:56 ` [PATCH 43/46] KVM: MMU: make page walker " Avi Kivity
2009-08-23 11:56 ` [PATCH 44/46] KVM: MMU: shadow support for 1gb pages Avi Kivity
2009-08-23 11:56 ` [PATCH 45/46] KVM: MMU: enable gbpages by increasing nr of pagesizes Avi Kivity
2009-08-23 11:56 ` [PATCH 46/46] KVM: report 1GB page support to userspace Avi Kivity
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=1251028605-31977-6-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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