From: Joerg Roedel <joerg.roedel@amd.com>
To: Avi Kivity <avi@redhat.com>
Cc: Alexander Graf <agraf@suse.de>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 04/21] kvm/svm: copy only necessary parts of the control area on vmrun/vmexit
Date: Fri, 7 Aug 2009 11:49:31 +0200 [thread overview]
Message-ID: <1249638588-10982-5-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1249638588-10982-1-git-send-email-joerg.roedel@amd.com>
The vmcb control area contains more then 800 bytes of reserved fields
which are unnecessarily copied. Fix this by introducing a copy
function which only copies the relevant part and saves time.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Alexander Graf <agraf@suse.de>
---
arch/x86/kvm/svm.c | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index d4011cc..e656425 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1570,6 +1570,38 @@ static int nested_svm_exit_handled(struct vcpu_svm *svm, bool kvm_override)
nested_svm_exit_handled_real);
}
+static inline void copy_vmcb_control_area(struct vmcb *dst_vmcb, struct vmcb *from_vmcb)
+{
+ struct vmcb_control_area *dst = &dst_vmcb->control;
+ struct vmcb_control_area *from = &from_vmcb->control;
+
+ dst->intercept_cr_read = from->intercept_cr_read;
+ dst->intercept_cr_write = from->intercept_cr_write;
+ dst->intercept_dr_read = from->intercept_dr_read;
+ dst->intercept_dr_write = from->intercept_dr_write;
+ dst->intercept_exceptions = from->intercept_exceptions;
+ dst->intercept = from->intercept;
+ dst->iopm_base_pa = from->iopm_base_pa;
+ dst->msrpm_base_pa = from->msrpm_base_pa;
+ dst->tsc_offset = from->tsc_offset;
+ dst->asid = from->asid;
+ dst->tlb_ctl = from->tlb_ctl;
+ dst->int_ctl = from->int_ctl;
+ dst->int_vector = from->int_vector;
+ dst->int_state = from->int_state;
+ dst->exit_code = from->exit_code;
+ dst->exit_code_hi = from->exit_code_hi;
+ dst->exit_info_1 = from->exit_info_1;
+ dst->exit_info_2 = from->exit_info_2;
+ dst->exit_int_info = from->exit_int_info;
+ dst->exit_int_info_err = from->exit_int_info_err;
+ dst->nested_ctl = from->nested_ctl;
+ dst->event_inj = from->event_inj;
+ dst->event_inj_err = from->event_inj_err;
+ dst->nested_cr3 = from->nested_cr3;
+ dst->lbr_ctl = from->lbr_ctl;
+}
+
static int nested_svm_vmexit_real(struct vcpu_svm *svm, void *arg1,
void *arg2, void *opaque)
{
@@ -1615,7 +1647,7 @@ static int nested_svm_vmexit_real(struct vcpu_svm *svm, void *arg1,
nested_vmcb->control.int_ctl &= ~V_INTR_MASKING_MASK;
/* Restore the original control entries */
- svm->vmcb->control = hsave->control;
+ copy_vmcb_control_area(vmcb, hsave);
/* Kill any pending exceptions */
if (svm->vcpu.arch.exception.pending == true)
@@ -1713,7 +1745,7 @@ static int nested_svm_vmrun(struct vcpu_svm *svm, void *arg1,
else
hsave->save.cr3 = svm->vcpu.arch.cr3;
- hsave->control = vmcb->control;
+ copy_vmcb_control_area(hsave, vmcb);
if (svm->vmcb->save.rflags & X86_EFLAGS_IF)
svm->vcpu.arch.hflags |= HF_HIF_MASK;
--
1.6.3.3
next prev parent reply other threads:[~2009-08-07 9:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-07 9:49 [PATCH 0/21] Nested SVM cleanups v2 Joerg Roedel
2009-08-07 9:49 ` [PATCH 01/21] kvm/svm: add helper functions for global interrupt flag Joerg Roedel
2009-08-07 9:49 ` [PATCH 02/21] kvm/svm: optimize nested #vmexit Joerg Roedel
2009-08-07 9:49 ` [PATCH 03/21] kvm/svm: optimize nested vmrun Joerg Roedel
2009-08-07 9:49 ` Joerg Roedel [this message]
2009-08-07 9:49 ` [PATCH 05/21] kvm/svm: complete interrupts after handling nested exits Joerg Roedel
2009-08-07 9:49 ` [PATCH 06/21] kvm/svm: move nested svm state into seperate struct Joerg Roedel
2009-08-07 9:49 ` [PATCH 07/21] kvm/svm: cache nested intercepts Joerg Roedel
2009-08-07 9:49 ` [PATCH 08/21] kvm/svm: consolidate nested_svm_exit_handled Joerg Roedel
2009-08-07 9:49 ` [PATCH 09/21] kvm/svm: do nested vmexit in nested_svm_exit_handled Joerg Roedel
2009-08-07 9:49 ` [PATCH 10/21] kvm/svm: simplify nested_svm_check_exception Joerg Roedel
2009-08-07 9:49 ` [PATCH 11/21] kvm/svm: get rid of nested_svm_vmexit_real Joerg Roedel
2009-08-07 9:49 ` [PATCH 12/21] kvm/svm: clean up nested_svm_exit_handled_msr Joerg Roedel
2009-08-07 9:49 ` [PATCH 13/21] kvm/svm: clean up nestec vmload/vmsave paths Joerg Roedel
2009-08-07 9:49 ` [PATCH 14/21] kvm/svm: clean up nested vmrun path Joerg Roedel
2009-08-07 9:49 ` [PATCH 15/21] kvm/svm: remove nested_svm_do and helper functions Joerg Roedel
2009-08-07 9:49 ` [PATCH 16/21] kvm/svm: handle errors in vmrun emulation path appropriatly Joerg Roedel
2009-08-07 9:49 ` [PATCH 17/21] kvm/svm: move special nested exit handling to separate function Joerg Roedel
2009-08-07 9:49 ` [PATCH 18/21] kvm/svm: remove unnecessary is_nested check from svm_cpu_run Joerg Roedel
2009-08-07 9:49 ` [PATCH 19/21] kvm/svm: move nested_svm_intr main logic out of if-clause Joerg Roedel
2009-08-07 9:49 ` [PATCH 20/21] kvm/svm: check for nested VINTR flag in svm_interrupt_allowed Joerg Roedel
2009-08-07 9:49 ` [PATCH 21/21] kvm/svm: enable nested svm by default Joerg Roedel
2009-08-09 9:41 ` [PATCH 0/21] Nested SVM cleanups v2 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=1249638588-10982-5-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=agraf@suse.de \
--cc=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
all inboxes | Powered by JetHome®