From: Avi Kivity <avi@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 29/47] KVM: x86 emulator: Add sysenter emulation
Date: Wed, 19 Aug 2009 16:02:25 +0300 [thread overview]
Message-ID: <1250686963-8357-30-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1250686963-8357-1-git-send-email-avi@redhat.com>
From: Andre Przywara <andre.przywara@amd.com>
Handle #UD intercept of the sysenter instruction in 32bit compat mode on
an AMD host.
Setup the segment descriptors for CS and SS and the EIP/ESP registers
according to the manual.
Signed-off-by: Christoph Egger <christoph.egger@amd.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/x86/kvm/x86_emulate.c | 70 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 4d7256d..7a9bddb 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -1476,6 +1476,71 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt)
return 0;
}
+static int
+emulate_sysenter(struct x86_emulate_ctxt *ctxt)
+{
+ struct decode_cache *c = &ctxt->decode;
+ struct kvm_segment cs, ss;
+ u64 msr_data;
+
+ /* inject #UD if LOCK prefix is used */
+ if (c->lock_prefix)
+ return -1;
+
+ /* inject #GP if in real mode or paging is disabled */
+ if (ctxt->mode == X86EMUL_MODE_REAL ||
+ !(ctxt->vcpu->arch.cr0 & X86_CR0_PE)) {
+ kvm_inject_gp(ctxt->vcpu, 0);
+ return -1;
+ }
+
+ /* XXX sysenter/sysexit have not been tested in 64bit mode.
+ * Therefore, we inject an #UD.
+ */
+ if (ctxt->mode == X86EMUL_MODE_PROT64)
+ return -1;
+
+ setup_syscalls_segments(ctxt, &cs, &ss);
+
+ kvm_x86_ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
+ switch (ctxt->mode) {
+ case X86EMUL_MODE_PROT32:
+ if ((msr_data & 0xfffc) == 0x0) {
+ kvm_inject_gp(ctxt->vcpu, 0);
+ return -1;
+ }
+ break;
+ case X86EMUL_MODE_PROT64:
+ if (msr_data == 0x0) {
+ kvm_inject_gp(ctxt->vcpu, 0);
+ return -1;
+ }
+ break;
+ }
+
+ ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
+ cs.selector = (u16)msr_data;
+ cs.selector &= ~SELECTOR_RPL_MASK;
+ ss.selector = cs.selector + 8;
+ ss.selector &= ~SELECTOR_RPL_MASK;
+ if (ctxt->mode == X86EMUL_MODE_PROT64
+ || is_long_mode(ctxt->vcpu)) {
+ cs.db = 0;
+ cs.l = 1;
+ }
+
+ kvm_x86_ops->set_segment(ctxt->vcpu, &cs, VCPU_SREG_CS);
+ kvm_x86_ops->set_segment(ctxt->vcpu, &ss, VCPU_SREG_SS);
+
+ kvm_x86_ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_EIP, &msr_data);
+ c->eip = msr_data;
+
+ kvm_x86_ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_ESP, &msr_data);
+ c->regs[VCPU_REGS_RSP] = msr_data;
+
+ return 0;
+}
+
int
x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
{
@@ -2144,7 +2209,10 @@ twobyte_insn:
c->dst.type = OP_NONE;
break;
case 0x34: /* sysenter */
- goto cannot_emulate;
+ if (emulate_sysenter(ctxt) == -1)
+ goto cannot_emulate;
+ else
+ goto writeback;
break;
case 0x35: /* sysexit */
goto cannot_emulate;
--
1.6.3.3
next prev parent reply other threads:[~2009-08-19 13:04 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-19 13:01 [PATCH 00/47] KVM updates for 2.6.32 merge window (2/4) Avi Kivity
2009-08-19 13:01 ` [PATCH 01/47] KVM: Return to userspace on emulation failure Avi Kivity
2009-08-19 13:01 ` [PATCH 02/47] KVM: MMU: introduce is_last_spte helper Avi Kivity
2009-08-19 13:01 ` [PATCH 03/47] KVM: MMU audit: update count_writable_mappings / count_rmaps Avi Kivity
2009-08-19 13:02 ` [PATCH 04/47] KVM: MMU audit: update audit_write_protection Avi Kivity
2009-08-19 13:02 ` [PATCH 05/47] KVM: MMU audit: nontrapping ptes in nonleaf level Avi Kivity
2009-08-19 13:02 ` [PATCH 06/47] KVM: MMU audit: audit_mappings tweaks Avi Kivity
2009-08-19 13:02 ` [PATCH 07/47] KVM: MMU audit: largepage handling Avi Kivity
2009-08-19 13:02 ` [PATCH 08/47] KVM: Move performance counter MSR access interception to generic x86 path Avi Kivity
2009-08-19 13:02 ` [PATCH 09/47] KVM: VMX: more MSR_IA32_VMX_EPT_VPID_CAP capability bits Avi Kivity
2009-08-19 13:02 ` [PATCH 10/47] KVM: MMU: make for_each_shadow_entry aware of largepages Avi Kivity
2009-08-19 13:02 ` [PATCH 11/47] KVM: MMU: add kvm_mmu_get_spte_hierarchy helper Avi Kivity
2009-08-19 13:02 ` [PATCH 12/47] KVM: VMX: EPT misconfiguration handler Avi Kivity
2009-08-19 13:02 ` [PATCH 13/47] KVM: VMX: conditionally disable 2M pages Avi Kivity
2009-08-19 13:02 ` [PATCH 14/47] KVM: Replace pending exception by PF if it happens serially Avi Kivity
2009-08-19 13:02 ` [PATCH 15/47] KVM: Optimize searching for highest IRR Avi Kivity
2009-08-19 13:02 ` [PATCH 16/47] KVM: Fix racy event propagation in timer Avi Kivity
2009-08-19 13:02 ` [PATCH 17/47] KVM: Drop useless atomic test from timer function Avi Kivity
2009-08-19 13:02 ` [PATCH 18/47] KVM: VMX: Only reload guest cr2 if different from host cr2 Avi Kivity
2009-08-19 13:02 ` [PATCH 19/47] KVM: SVM: Don't save/restore " Avi Kivity
2009-08-19 13:02 ` [PATCH 20/47] x86: Add definition for IGNNE MSR Avi Kivity
2009-08-19 13:02 ` [PATCH 21/47] KVM: Implement MSRs used by Hyper-V Avi Kivity
2009-08-19 13:02 ` [PATCH 22/47] KVM: SVM: Implement INVLPGA Avi Kivity
2009-08-19 13:02 ` [PATCH 23/47] KVM: SVM: Improve nested interrupt injection Avi Kivity
2009-08-19 13:02 ` [PATCH 24/47] KVM: convert custom marker based tracing to event traces Avi Kivity
2009-08-19 13:02 ` [PATCH 25/47] KVM: Allow emulation of syscalls instructions on #UD Avi Kivity
2009-08-19 13:02 ` [PATCH 26/47] KVM: x86 emulator: Add missing EFLAGS bit definitions Avi Kivity
2009-08-19 13:02 ` [PATCH 27/47] KVM: x86 emulator: Prepare for emulation of syscall instructions Avi Kivity
2009-08-19 13:02 ` [PATCH 28/47] KVM: x86 emulator: add syscall emulation Avi Kivity
2009-08-19 13:02 ` Avi Kivity [this message]
2009-08-19 13:02 ` [PATCH 30/47] KVM: x86 emulator: Add sysexit emulation Avi Kivity
2009-08-19 13:02 ` [PATCH 31/47] KVM: s390: Fix memslot initialization for userspace_addr != 0 Avi Kivity
2009-08-19 13:02 ` [PATCH 32/47] hugetlbfs: export vma_kernel_pagsize to modules Avi Kivity
2009-08-19 13:02 ` [PATCH 33/47] KVM: Prepare memslot data structures for multiple hugepage sizes Avi Kivity
2009-08-19 13:02 ` [PATCH 34/47] KVM: x86: missing locking in PIT/IRQCHIP/SET_BSP_CPU ioctl paths Avi Kivity
2009-08-19 13:02 ` [PATCH 35/47] KVM: ignore AMDs HWCR register access to set the FFDIS bit Avi Kivity
2009-08-19 13:02 ` [PATCH 36/47] KVM: ignore reads from AMDs C1E enabled MSR Avi Kivity
2009-08-19 13:02 ` [PATCH 37/47] KVM: introduce module parameter for ignoring unknown MSRs accesses Avi Kivity
2009-08-19 13:02 ` [PATCH 38/47] KVM: powerpc: convert marker probes to event trace Avi Kivity
2009-08-19 13:02 ` [PATCH 39/47] KVM: remove old KVMTRACE support code Avi Kivity
2009-08-19 13:02 ` [PATCH 40/47] KVM: use vcpu_id instead of bsp_vcpu pointer in kvm_vcpu_is_bsp Avi Kivity
2009-08-19 13:02 ` [PATCH 41/47] KVM: document locking for kvm_io_device_ops Avi Kivity
2009-08-19 13:02 ` [PATCH 42/47] KVM: switch coalesced mmio changes to slots_lock Avi Kivity
2009-08-19 13:02 ` [PATCH 43/47] KVM: switch pit creation " Avi Kivity
2009-08-19 13:02 ` [PATCH 44/47] KVM: convert bus " Avi Kivity
2009-08-19 13:02 ` [PATCH 45/47] KVM: remove in_range from io devices Avi Kivity
2009-08-19 13:02 ` [PATCH 46/47] KVM: document lock nesting rule Avi Kivity
2009-08-19 13:02 ` [PATCH 47/47] KVM: fix lock imbalance 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=1250686963-8357-30-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