From: Avi Kivity <avi@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Avi Kivity <avi@qumranet.com>
Subject: [PATCH 18/40] KVM: SVM: Unify register save/restore across 32 and 64 bit hosts
Date: Tue, 23 Sep 2008 16:46:32 +0300 [thread overview]
Message-ID: <1222177614-26669-19-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1222177614-26669-1-git-send-email-avi@redhat.com>
From: Avi Kivity <avi@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
arch/x86/kvm/svm.c | 78 +++++++++++++++++----------------------------------
1 files changed, 26 insertions(+), 52 deletions(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 743c98d..179c2e0 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1697,6 +1697,12 @@ static inline void sync_lapic_to_cr8(struct kvm_vcpu *vcpu)
svm->vmcb->control.int_ctl |= cr8 & V_TPR_MASK;
}
+#ifdef CONFIG_X86_64
+#define R "r"
+#else
+#define R "e"
+#endif
+
static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
{
struct vcpu_svm *svm = to_svm(vcpu);
@@ -1735,19 +1741,14 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
local_irq_enable();
asm volatile (
+ "push %%"R"bp; \n\t"
+ "mov %c[rbx](%[svm]), %%"R"bx \n\t"
+ "mov %c[rcx](%[svm]), %%"R"cx \n\t"
+ "mov %c[rdx](%[svm]), %%"R"dx \n\t"
+ "mov %c[rsi](%[svm]), %%"R"si \n\t"
+ "mov %c[rdi](%[svm]), %%"R"di \n\t"
+ "mov %c[rbp](%[svm]), %%"R"bp \n\t"
#ifdef CONFIG_X86_64
- "push %%rbp; \n\t"
-#else
- "push %%ebp; \n\t"
-#endif
-
-#ifdef CONFIG_X86_64
- "mov %c[rbx](%[svm]), %%rbx \n\t"
- "mov %c[rcx](%[svm]), %%rcx \n\t"
- "mov %c[rdx](%[svm]), %%rdx \n\t"
- "mov %c[rsi](%[svm]), %%rsi \n\t"
- "mov %c[rdi](%[svm]), %%rdi \n\t"
- "mov %c[rbp](%[svm]), %%rbp \n\t"
"mov %c[r8](%[svm]), %%r8 \n\t"
"mov %c[r9](%[svm]), %%r9 \n\t"
"mov %c[r10](%[svm]), %%r10 \n\t"
@@ -1756,41 +1757,24 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
"mov %c[r13](%[svm]), %%r13 \n\t"
"mov %c[r14](%[svm]), %%r14 \n\t"
"mov %c[r15](%[svm]), %%r15 \n\t"
-#else
- "mov %c[rbx](%[svm]), %%ebx \n\t"
- "mov %c[rcx](%[svm]), %%ecx \n\t"
- "mov %c[rdx](%[svm]), %%edx \n\t"
- "mov %c[rsi](%[svm]), %%esi \n\t"
- "mov %c[rdi](%[svm]), %%edi \n\t"
- "mov %c[rbp](%[svm]), %%ebp \n\t"
#endif
-#ifdef CONFIG_X86_64
/* Enter guest mode */
- "push %%rax \n\t"
- "mov %c[vmcb](%[svm]), %%rax \n\t"
+ "push %%"R"ax \n\t"
+ "mov %c[vmcb](%[svm]), %%"R"ax \n\t"
__ex(SVM_VMLOAD) "\n\t"
__ex(SVM_VMRUN) "\n\t"
__ex(SVM_VMSAVE) "\n\t"
- "pop %%rax \n\t"
-#else
- /* Enter guest mode */
- "push %%eax \n\t"
- "mov %c[vmcb](%[svm]), %%eax \n\t"
- __ex(SVM_VMLOAD) "\n\t"
- __ex(SVM_VMRUN) "\n\t"
- __ex(SVM_VMSAVE) "\n\t"
- "pop %%eax \n\t"
-#endif
+ "pop %%"R"ax \n\t"
/* Save guest registers, load host registers */
+ "mov %%"R"bx, %c[rbx](%[svm]) \n\t"
+ "mov %%"R"cx, %c[rcx](%[svm]) \n\t"
+ "mov %%"R"dx, %c[rdx](%[svm]) \n\t"
+ "mov %%"R"si, %c[rsi](%[svm]) \n\t"
+ "mov %%"R"di, %c[rdi](%[svm]) \n\t"
+ "mov %%"R"bp, %c[rbp](%[svm]) \n\t"
#ifdef CONFIG_X86_64
- "mov %%rbx, %c[rbx](%[svm]) \n\t"
- "mov %%rcx, %c[rcx](%[svm]) \n\t"
- "mov %%rdx, %c[rdx](%[svm]) \n\t"
- "mov %%rsi, %c[rsi](%[svm]) \n\t"
- "mov %%rdi, %c[rdi](%[svm]) \n\t"
- "mov %%rbp, %c[rbp](%[svm]) \n\t"
"mov %%r8, %c[r8](%[svm]) \n\t"
"mov %%r9, %c[r9](%[svm]) \n\t"
"mov %%r10, %c[r10](%[svm]) \n\t"
@@ -1799,18 +1783,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
"mov %%r13, %c[r13](%[svm]) \n\t"
"mov %%r14, %c[r14](%[svm]) \n\t"
"mov %%r15, %c[r15](%[svm]) \n\t"
-
- "pop %%rbp; \n\t"
-#else
- "mov %%ebx, %c[rbx](%[svm]) \n\t"
- "mov %%ecx, %c[rcx](%[svm]) \n\t"
- "mov %%edx, %c[rdx](%[svm]) \n\t"
- "mov %%esi, %c[rsi](%[svm]) \n\t"
- "mov %%edi, %c[rdi](%[svm]) \n\t"
- "mov %%ebp, %c[rbp](%[svm]) \n\t"
-
- "pop %%ebp; \n\t"
#endif
+ "pop %%"R"bp"
:
: [svm]"a"(svm),
[vmcb]"i"(offsetof(struct vcpu_svm, vmcb_pa)),
@@ -1831,11 +1805,9 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
[r15]"i"(offsetof(struct vcpu_svm, vcpu.arch.regs[VCPU_REGS_R15]))
#endif
: "cc", "memory"
+ , R"bx", R"cx", R"dx", R"si", R"di"
#ifdef CONFIG_X86_64
- , "rbx", "rcx", "rdx", "rsi", "rdi"
, "r8", "r9", "r10", "r11" , "r12", "r13", "r14", "r15"
-#else
- , "ebx", "ecx", "edx" , "esi", "edi"
#endif
);
@@ -1867,6 +1839,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
svm->next_rip = 0;
}
+#undef R
+
static void svm_set_cr3(struct kvm_vcpu *vcpu, unsigned long root)
{
struct vcpu_svm *svm = to_svm(vcpu);
--
1.6.0.1
next prev parent reply other threads:[~2008-09-23 13:47 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-23 13:46 [PATCH 00/40] KVM Updates for 2.6.28 merge window (part 1 of 3) Avi Kivity
2008-09-23 13:46 ` [PATCH 01/40] KVM: VMX: Rename misnamed msr bits Avi Kivity
2008-09-23 13:46 ` [PATCH 02/40] KVM: x86: accessors for guest registers Avi Kivity
2008-09-23 13:46 ` [PATCH 03/40] KVM: Move KVM TRACE DEFINITIONS to common header Avi Kivity
2008-09-23 13:46 ` [PATCH 04/40] KVM: Introduce kvm_set_irq to inject interrupts in guests Avi Kivity
2008-09-23 13:46 ` [PATCH 05/40] KVM: MMU: Separate the code for unlinking a shadow page from its parents Avi Kivity
2008-09-23 13:46 ` [PATCH 06/40] KVM: MMU: Simplify kvm_mmu_zap_page() Avi Kivity
2008-09-23 13:46 ` [PATCH 07/40] KVM: Move NMI IRET fault processing to new vmx_complete_interrupts() Avi Kivity
2008-09-23 13:46 ` [PATCH 08/40] KVM: VMX: Move nmi injection failure processing to vm exit path Avi Kivity
2008-09-23 13:46 ` [PATCH 09/40] KVM: Clear exception queue before emulating an instruction Avi Kivity
2008-09-23 13:46 ` [PATCH 10/40] KVM: VMX: Fix pending exception processing Avi Kivity
2008-09-23 13:46 ` [PATCH 11/40] KVM: Add a pending interrupt queue Avi Kivity
2008-09-23 13:46 ` [PATCH 12/40] KVM: VMX: Move interrupt post-processing to vmx_complete_interrupts() Avi Kivity
2008-09-23 13:46 ` [PATCH 13/40] KVM: VMX: Remove redundant check in handle_rmode_exception Avi Kivity
2008-09-23 13:46 ` [PATCH 14/40] KVM: Consolidate PIC isr clearing into a function Avi Kivity
2008-09-23 13:46 ` [PATCH 15/40] KVM: Consolidate XX_VECTOR defines Avi Kivity
2008-09-23 13:46 ` [PATCH 16/40] KVM: VMX: Reinject real mode exception Avi Kivity
2008-09-23 13:46 ` [PATCH 17/40] KVM: VMX: Unify register save/restore across 32 and 64 bit hosts Avi Kivity
2008-09-23 13:46 ` Avi Kivity [this message]
2008-09-23 13:46 ` [PATCH 19/40] KVM: kvmtrace: Remove use of bit fields in kvm trace structure Avi Kivity
2008-09-23 13:46 ` [PATCH 20/40] KVM: kvmtrace: replace get_cycles with ktime_get v3 Avi Kivity
2008-09-23 13:46 ` [PATCH 21/40] KVM: ppc: enable KVM_TRACE building for powerpc Avi Kivity
2008-09-23 13:46 ` [PATCH 22/40] KVM: ppc: adds trace points for ppc tlb activity Avi Kivity
2008-09-23 13:46 ` [PATCH 23/40] KVM: ppc: trace powerpc instruction emulation Avi Kivity
2008-09-23 13:46 ` [PATCH 24/40] KVM: VMX: Avoid vmwrite(HOST_RSP) when possible Avi Kivity
2008-09-23 13:46 ` [PATCH 25/40] KVM: Ignore DEBUGCTL MSRs with no effect Avi Kivity
2008-09-23 13:46 ` [PATCH 26/40] KVM: ppc: guest breakpoint support Avi Kivity
2008-09-23 13:46 ` [PATCH 27/40] KVM: ppc: Stop saving host TLB state Avi Kivity
2008-09-23 13:46 ` [PATCH 28/40] KVM: ppc: Write only modified shadow entries into the TLB on exit Avi Kivity
2008-09-23 13:46 ` [PATCH 29/40] KVM: powerpc: Map guest userspace with TID=0 mappings Avi Kivity
2008-09-23 13:46 ` [PATCH 30/40] KVM: Add irq ack notifier list Avi Kivity
2008-09-23 13:46 ` [PATCH 31/40] KVM: irq ack notification Avi Kivity
2008-09-23 13:46 ` [PATCH 32/40] KVM: PIT: fix injection logic and count Avi Kivity
2008-09-23 13:46 ` [PATCH 33/40] x86: paravirt: factor out cpu_khz to common code Avi Kivity
2008-09-23 13:46 ` [PATCH 34/40] x86: KVM guest: use paravirt function to calculate cpu khz Avi Kivity
2008-09-23 13:46 ` [PATCH 35/40] KVM: direct mmio pfn check Avi Kivity
2008-09-23 13:46 ` [PATCH 36/40] KVM: pci device assignment Avi Kivity
2008-09-23 13:46 ` [PATCH 37/40] KVM: Reduce kvm stack usage in kvm_arch_vm_ioctl() Avi Kivity
2008-09-23 13:46 ` [PATCH 38/40] KVM: Reduce stack usage in kvm_vcpu_ioctl() Avi Kivity
2008-09-23 13:46 ` [PATCH 39/40] KVM: Reduce stack usage in kvm_arch_vcpu_ioctl() Avi Kivity
2008-09-23 13:46 ` [PATCH 40/40] KVM: Reduce stack usage in kvm_pv_mmu_op() 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=1222177614-26669-19-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=avi@qumranet.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