From: Avi Kivity <avi@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 08/38] KVM: VMX: Clean up DR6 emulation
Date: Tue, 16 Feb 2010 12:35:06 +0200 [thread overview]
Message-ID: <1266316536-28936-9-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1266316536-28936-1-git-send-email-avi@redhat.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
As we trap all debug register accesses, we do not need to switch real
DR6 at all. Clean up update_exception_bitmap at this chance, too.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
arch/x86/kvm/vmx.c | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index c7b99e1..b7e812e 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -579,17 +579,12 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)
{
u32 eb;
- eb = (1u << PF_VECTOR) | (1u << UD_VECTOR) | (1u << MC_VECTOR)
- | (1u << NM_VECTOR);
- /*
- * Unconditionally intercept #DB so we can maintain dr6 without
- * reading it every exit.
- */
- eb |= 1u << DB_VECTOR;
- if (vcpu->guest_debug & KVM_GUESTDBG_ENABLE) {
- if (vcpu->guest_debug & KVM_GUESTDBG_USE_SW_BP)
- eb |= 1u << BP_VECTOR;
- }
+ eb = (1u << PF_VECTOR) | (1u << UD_VECTOR) | (1u << MC_VECTOR) |
+ (1u << NM_VECTOR) | (1u << DB_VECTOR);
+ if ((vcpu->guest_debug &
+ (KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP)) ==
+ (KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP))
+ eb |= 1u << BP_VECTOR;
if (to_vmx(vcpu)->rmode.vm86_active)
eb = ~0;
if (enable_ept)
@@ -3777,9 +3772,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
*/
vmcs_writel(HOST_CR0, read_cr0());
- if (vcpu->arch.switch_db_regs)
- set_debugreg(vcpu->arch.dr6, 6);
-
asm(
/* Store host registers */
"push %%"R"dx; push %%"R"bp;"
@@ -3880,9 +3872,6 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
| (1 << VCPU_EXREG_PDPTR));
vcpu->arch.regs_dirty = 0;
- if (vcpu->arch.switch_db_regs)
- get_debugreg(vcpu->arch.dr6, 6);
-
vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
if (vmx->rmode.irq.pending)
fixup_rmode_irq(vmx);
--
1.6.5.3
next prev parent reply other threads:[~2010-02-16 10:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-16 10:34 [PATCH 00/38] KVM updates for the 2.6.34 merge window (batch 3/4) Avi Kivity
2010-02-16 10:34 ` [PATCH 01/38] KVM: export <asm/hyperv.h> Avi Kivity
2010-02-16 10:35 ` [PATCH 02/38] KVM: VMX: Remove emulation failure report Avi Kivity
2010-02-16 10:35 ` [PATCH 03/38] KVM: fix Hyper-V hypercall warnings and wrong mask value Avi Kivity
2010-02-16 10:35 ` [PATCH 04/38] KVM: fix cleanup_srcu_struct on vm destruction Avi Kivity
2010-02-16 10:35 ` [PATCH 05/38] KVM: x86: Use macros for x86_emulate_ops to avoid future mistakes Avi Kivity
2010-02-16 10:35 ` [PATCH 06/38] KVM: VMX: Fix exceptions of mov to dr Avi Kivity
2010-02-16 10:35 ` [PATCH 07/38] KVM: VMX: Fix emulation of DR4 and DR5 Avi Kivity
2010-02-16 10:35 ` Avi Kivity [this message]
2010-02-16 10:35 ` [PATCH 09/38] KVM: SVM: Clean up and enhance mov dr emulation Avi Kivity
2010-02-16 10:35 ` [PATCH 10/38] KVM: SVM: Trap all debug register accesses Avi Kivity
2010-02-16 10:35 ` [PATCH 11/38] KVM: Fix kvm_coalesced_mmio_ring duplicate allocation Avi Kivity
2010-02-16 10:35 ` [PATCH 12/38] KVM: x86: fix checking of cr0 validity Avi Kivity
2010-02-16 10:35 ` [PATCH 13/38] KVM: Allow kvm_load_guest_fpu() even when !vcpu->fpu_active Avi Kivity
2010-02-16 10:35 ` [PATCH 14/38] KVM: Drop kvm_{load,put}_guest_fpu() exports Avi Kivity
2010-02-16 10:35 ` [PATCH 15/38] KVM: Activate fpu on clts Avi Kivity
2010-02-16 10:35 ` [PATCH 16/38] KVM: Add a helper for checking if the guest is in protected mode Avi Kivity
2010-02-16 10:35 ` [PATCH 17/38] KVM: Move cr0/cr4/efer related helpers to x86.h Avi Kivity
2010-02-16 10:35 ` [PATCH 18/38] KVM: Rename vcpu->shadow_efer to efer Avi Kivity
2010-02-16 10:35 ` [PATCH 19/38] KVM: Optimize kvm_read_cr[04]_bits() Avi Kivity
2010-02-16 10:35 ` [PATCH 20/38] KVM: trace guest fpu loads and unloads Avi Kivity
2010-02-16 10:35 ` [PATCH 21/38] KVM: MMU: Remove some useless code from alloc_mmu_pages() Avi Kivity
2010-02-16 10:35 ` [PATCH 22/38] KVM: PPC E500: Add register l1csr0 emulation Avi Kivity
2010-02-16 10:35 ` [PATCH 23/38] KVM: PPC: Add PVR/PIR init for E500 Avi Kivity
2010-02-16 10:35 ` [PATCH 24/38] KVM: PPC E500: fix tlbcfg emulation Avi Kivity
2010-02-16 10:35 ` [PATCH 25/38] KVM: VMX: Pass cr0.mp through to the guest when the fpu is active Avi Kivity
2010-02-16 10:35 ` [PATCH 26/38] KVM: mark segments accessed on HW task switch Avi Kivity
2010-02-16 10:35 ` [PATCH 27/38] KVM: Fix msr trace Avi Kivity
2010-02-16 10:35 ` [PATCH 28/38] KVM: Trace failed msr reads and writes Avi Kivity
2010-02-16 10:35 ` [PATCH 29/38] KVM: VMX: Remove redundant check in vm_need_virtualize_apic_accesses() Avi Kivity
2010-02-16 10:35 ` [PATCH 30/38] KVM: enable PCI multiple-segments for pass-through device Avi Kivity
2010-02-16 10:35 ` [PATCH 31/38] KVM: fix load_guest_segment_descriptor() to return X86EMUL_* Avi Kivity
2010-02-16 10:35 ` [PATCH 32/38] KVM: fix kvm_fix_hypercall() " Avi Kivity
2010-02-16 10:35 ` [PATCH 33/38] KVM: VMX: Wire up .fpu_activate() callback Avi Kivity
2010-02-16 10:35 ` [PATCH 34/38] KVM: ia64: Fix string literal continuation lines Avi Kivity
2010-02-16 10:35 ` [PATCH 35/38] KVM: VMX: Remove redundant test in vmx_set_efer() Avi Kivity
2010-02-16 10:35 ` [PATCH 36/38] KVM: Introduce kvm_host_page_size Avi Kivity
2010-02-16 10:35 ` [PATCH 37/38] KVM: VMX: emulate accessed bit for EPT Avi Kivity
2010-02-16 10:35 ` [PATCH 38/38] KVM: Remove redundant reading of rax on OUT instructions 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=1266316536-28936-9-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
Powered by JetHome