From: Avi Kivity <avi@qumranet.com>
To: linux-kernel@vger.kernel.org, kvm-devel@lists.sourceforge.net
Cc: Zhang Xiantao <xiantao.zhang@intel.com>
Subject: [PATCH 15/52] KVM: Move some static inline functions out from kvm.h into x86.h
Date: Sun, 30 Dec 2007 09:10:01 +0200 [thread overview]
Message-ID: <1198998638-22713-16-git-send-email-avi@qumranet.com> (raw)
In-Reply-To: <1198998638-22713-1-git-send-email-avi@qumranet.com>
From: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
drivers/kvm/kvm.h | 109 ----------------------------------------------------
drivers/kvm/x86.h | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 110 insertions(+), 109 deletions(-)
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 1c4de50..41f6ee2 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -577,115 +577,6 @@ static inline int memslot_id(struct kvm *kvm, struct kvm_memory_slot *slot)
return slot - kvm->memslots;
}
-static inline struct kvm_mmu_page *page_header(hpa_t shadow_page)
-{
- struct page *page = pfn_to_page(shadow_page >> PAGE_SHIFT);
-
- return (struct kvm_mmu_page *)page_private(page);
-}
-
-static inline u16 read_fs(void)
-{
- u16 seg;
- asm("mov %%fs, %0" : "=g"(seg));
- return seg;
-}
-
-static inline u16 read_gs(void)
-{
- u16 seg;
- asm("mov %%gs, %0" : "=g"(seg));
- return seg;
-}
-
-static inline u16 read_ldt(void)
-{
- u16 ldt;
- asm("sldt %0" : "=g"(ldt));
- return ldt;
-}
-
-static inline void load_fs(u16 sel)
-{
- asm("mov %0, %%fs" : : "rm"(sel));
-}
-
-static inline void load_gs(u16 sel)
-{
- asm("mov %0, %%gs" : : "rm"(sel));
-}
-
-#ifndef load_ldt
-static inline void load_ldt(u16 sel)
-{
- asm("lldt %0" : : "rm"(sel));
-}
-#endif
-
-static inline void get_idt(struct descriptor_table *table)
-{
- asm("sidt %0" : "=m"(*table));
-}
-
-static inline void get_gdt(struct descriptor_table *table)
-{
- asm("sgdt %0" : "=m"(*table));
-}
-
-static inline unsigned long read_tr_base(void)
-{
- u16 tr;
- asm("str %0" : "=g"(tr));
- return segment_base(tr);
-}
-
-#ifdef CONFIG_X86_64
-static inline unsigned long read_msr(unsigned long msr)
-{
- u64 value;
-
- rdmsrl(msr, value);
- return value;
-}
-#endif
-
-static inline void fx_save(struct i387_fxsave_struct *image)
-{
- asm("fxsave (%0)":: "r" (image));
-}
-
-static inline void fx_restore(struct i387_fxsave_struct *image)
-{
- asm("fxrstor (%0)":: "r" (image));
-}
-
-static inline void fpu_init(void)
-{
- asm("finit");
-}
-
-static inline u32 get_rdx_init_val(void)
-{
- return 0x600; /* P6 family */
-}
-
-#define ASM_VMX_VMCLEAR_RAX ".byte 0x66, 0x0f, 0xc7, 0x30"
-#define ASM_VMX_VMLAUNCH ".byte 0x0f, 0x01, 0xc2"
-#define ASM_VMX_VMRESUME ".byte 0x0f, 0x01, 0xc3"
-#define ASM_VMX_VMPTRLD_RAX ".byte 0x0f, 0xc7, 0x30"
-#define ASM_VMX_VMREAD_RDX_RAX ".byte 0x0f, 0x78, 0xd0"
-#define ASM_VMX_VMWRITE_RAX_RDX ".byte 0x0f, 0x79, 0xd0"
-#define ASM_VMX_VMWRITE_RSP_RDX ".byte 0x0f, 0x79, 0xd4"
-#define ASM_VMX_VMXOFF ".byte 0x0f, 0x01, 0xc4"
-#define ASM_VMX_VMXON_RAX ".byte 0xf3, 0x0f, 0xc7, 0x30"
-
-#define MSR_IA32_TIME_STAMP_COUNTER 0x010
-
-#define TSS_IOPB_BASE_OFFSET 0x66
-#define TSS_BASE_SIZE 0x68
-#define TSS_IOPB_SIZE (65536 / 8)
-#define TSS_REDIRECTION_SIZE (256 / 8)
-#define RMODE_TSS_SIZE (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1)
enum kvm_stat_kind {
KVM_STAT_VM,
diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h
index 77a4a4a..f1c43ca 100644
--- a/drivers/kvm/x86.h
+++ b/drivers/kvm/x86.h
@@ -267,4 +267,114 @@ static inline int is_paging(struct kvm_vcpu *vcpu)
int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3);
int complete_pio(struct kvm_vcpu *vcpu);
+
+static inline struct kvm_mmu_page *page_header(hpa_t shadow_page)
+{
+ struct page *page = pfn_to_page(shadow_page >> PAGE_SHIFT);
+
+ return (struct kvm_mmu_page *)page_private(page);
+}
+
+static inline u16 read_fs(void)
+{
+ u16 seg;
+ asm("mov %%fs, %0" : "=g"(seg));
+ return seg;
+}
+
+static inline u16 read_gs(void)
+{
+ u16 seg;
+ asm("mov %%gs, %0" : "=g"(seg));
+ return seg;
+}
+
+static inline u16 read_ldt(void)
+{
+ u16 ldt;
+ asm("sldt %0" : "=g"(ldt));
+ return ldt;
+}
+
+static inline void load_fs(u16 sel)
+{
+ asm("mov %0, %%fs" : : "rm"(sel));
+}
+
+static inline void load_gs(u16 sel)
+{
+ asm("mov %0, %%gs" : : "rm"(sel));
+}
+
+#ifndef load_ldt
+static inline void load_ldt(u16 sel)
+{
+ asm("lldt %0" : : "rm"(sel));
+}
+#endif
+
+static inline void get_idt(struct descriptor_table *table)
+{
+ asm("sidt %0" : "=m"(*table));
+}
+
+static inline void get_gdt(struct descriptor_table *table)
+{
+ asm("sgdt %0" : "=m"(*table));
+}
+
+static inline unsigned long read_tr_base(void)
+{
+ u16 tr;
+ asm("str %0" : "=g"(tr));
+ return segment_base(tr);
+}
+
+#ifdef CONFIG_X86_64
+static inline unsigned long read_msr(unsigned long msr)
+{
+ u64 value;
+
+ rdmsrl(msr, value);
+ return value;
+}
+#endif
+
+static inline void fx_save(struct i387_fxsave_struct *image)
+{
+ asm("fxsave (%0)":: "r" (image));
+}
+
+static inline void fx_restore(struct i387_fxsave_struct *image)
+{
+ asm("fxrstor (%0)":: "r" (image));
+}
+
+static inline void fpu_init(void)
+{
+ asm("finit");
+}
+
+static inline u32 get_rdx_init_val(void)
+{
+ return 0x600; /* P6 family */
+}
+
+#define ASM_VMX_VMCLEAR_RAX ".byte 0x66, 0x0f, 0xc7, 0x30"
+#define ASM_VMX_VMLAUNCH ".byte 0x0f, 0x01, 0xc2"
+#define ASM_VMX_VMRESUME ".byte 0x0f, 0x01, 0xc3"
+#define ASM_VMX_VMPTRLD_RAX ".byte 0x0f, 0xc7, 0x30"
+#define ASM_VMX_VMREAD_RDX_RAX ".byte 0x0f, 0x78, 0xd0"
+#define ASM_VMX_VMWRITE_RAX_RDX ".byte 0x0f, 0x79, 0xd0"
+#define ASM_VMX_VMWRITE_RSP_RDX ".byte 0x0f, 0x79, 0xd4"
+#define ASM_VMX_VMXOFF ".byte 0x0f, 0x01, 0xc4"
+#define ASM_VMX_VMXON_RAX ".byte 0xf3, 0x0f, 0xc7, 0x30"
+
+#define MSR_IA32_TIME_STAMP_COUNTER 0x010
+
+#define TSS_IOPB_BASE_OFFSET 0x66
+#define TSS_BASE_SIZE 0x68
+#define TSS_IOPB_SIZE (65536 / 8)
+#define TSS_REDIRECTION_SIZE (256 / 8)
+#define RMODE_TSS_SIZE (TSS_BASE_SIZE + TSS_REDIRECTION_SIZE + TSS_IOPB_SIZE + 1)
#endif
--
1.5.3.7
next prev parent reply other threads:[~2007-12-30 7:16 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-30 7:09 [PATCH 00/52] KVM patch queue review for 2.6.25 merge window (part III) Avi Kivity
2007-12-30 7:09 ` [PATCH 01/52] KVM: Remove ptr comparisons to 0 Avi Kivity
2007-12-30 7:09 ` [PATCH 02/52] KVM: Remove __init attributes for kvm_init_debug and kvm_init_msr_list Avi Kivity
2007-12-30 7:09 ` [PATCH 03/52] KVM: Portability: Add two hooks to handle kvm_create and destroy vm Avi Kivity
2007-12-30 7:09 ` [PATCH 04/52] KVM: Replace 'light_exits' stat with 'host_state_reload' Avi Kivity
2007-12-30 7:09 ` [PATCH 05/52] KVM: Add fpu_reload counter Avi Kivity
2007-12-30 7:09 ` [PATCH 06/52] KVM: Add instruction emulation statistics Avi Kivity
2007-12-30 7:09 ` [PATCH 07/52] KVM: Extend stats support for VM stats Avi Kivity
2007-12-30 7:09 ` [PATCH 08/52] KVM: MMU: Add some mmu statistics Avi Kivity
2007-12-30 7:09 ` [PATCH 09/52] KVM: Make unloading of FPU state when putting vcpu arch-independent Avi Kivity
2007-12-30 7:09 ` [PATCH 10/52] KVM: Portability: Move kvm_vcpu_ioctl_get_dirty_log to arch-specific file Avi Kivity
2007-12-30 7:09 ` [PATCH 11/52] KVM: Portability: MMU initialization and teardown split Avi Kivity
2007-12-30 7:09 ` [PATCH 12/52] KVM: Portability: Move some macro definitions from kvm.h to x86.h Avi Kivity
2007-12-30 7:09 ` [PATCH 13/52] KVM: Portability: Move struct kvm_x86_ops definition " Avi Kivity
2007-12-30 7:10 ` [PATCH 14/52] KVM: Portability: Move vcpu regs enumeration " Avi Kivity
2007-12-30 7:10 ` Avi Kivity [this message]
2007-12-30 7:10 ` [PATCH 16/52] KVM: Portability: Move some function declarations " Avi Kivity
2007-12-30 7:10 ` [PATCH 17/52] KVM: VMX: Force seg.base == (seg.sel << 4) in real mode Avi Kivity
2007-12-30 7:10 ` [PATCH 18/52] KVM: MMU: Change guest pte access to kvm_{read,write}_guest() Avi Kivity
2007-12-30 7:10 ` [PATCH 19/52] KVM: Simplify kvm_clear_guest_page() Avi Kivity
2007-12-30 7:10 ` [PATCH 20/52] KVM: Add missing #include <asm/pgtable.h> Avi Kivity
2008-01-03 18:14 ` Adrian Bunk
2008-01-06 9:09 ` [kvm-devel] " Avi Kivity
2007-12-30 7:10 ` [PATCH 21/52] KVM: MMU: Remove unused variable Avi Kivity
2007-12-30 7:10 ` [PATCH 22/52] KVM: Remove unused "rmap_overflow" variable Avi Kivity
2007-12-30 7:10 ` [PATCH 23/52] KVM: Correct consistent typo: "destory" -> "destroy" Avi Kivity
2007-12-30 7:10 ` [PATCH 24/52] KVM: Move misplaced comment Avi Kivity
2007-12-30 7:10 ` [PATCH 25/52] KVM: Portability: Move kvm_memory_alias to asm/kvm.h Avi Kivity
2007-12-30 7:10 ` [PATCH 26/52] KVM: Portability: Move x86 pic strutctures Avi Kivity
2007-12-30 7:10 ` [PATCH 27/52] KVM: Portability: Move kvm_regs to <asm/kvm.h> Avi Kivity
2007-12-30 7:10 ` [PATCH 28/52] KVM: Portability: Move structure lapic_state " Avi Kivity
2007-12-30 7:10 ` [PATCH 29/52] KVM: Portability: Move kvm_segment & kvm_dtable structure " Avi Kivity
2007-12-30 7:10 ` [PATCH 30/52] KVM: Portability: Move kvm_sregs and msr structures " Avi Kivity
2007-12-30 7:10 ` [PATCH 31/52] KVM: Portability: Move cpuid " Avi Kivity
2007-12-30 7:10 ` [PATCH 32/52] KVM: Export include/asm-x86/kvm.h Avi Kivity
2007-12-30 7:10 ` [PATCH 33/52] KVM: MMU: Fix potential memory leak with smp real-mode Avi Kivity
2007-12-30 7:10 ` [PATCH 34/52] KVM: MMU: Selectively set PageDirty when releasing guest memory Avi Kivity
2007-12-30 7:10 ` [PATCH 35/52] KVM: x86 emulator: retire ->write_std() Avi Kivity
2007-12-30 7:10 ` [PATCH 36/52] KVM: x86 emulator: prefetch up to 15 bytes of the instruction executed Avi Kivity
2007-12-30 7:10 ` [PATCH 37/52] KVM: Recalculate mmu pages needed for every memory region change Avi Kivity
2007-12-30 7:10 ` [PATCH 38/52] KVM: Portability: Split kvm_set_memory_region() to have an arch callout Avi Kivity
2007-12-30 7:10 ` [PATCH 39/52] KVM: Split vcpu creation to avoid vcpu_load() before preemption setup Avi Kivity
2007-12-30 7:10 ` [PATCH 40/52] KVM: MMU: Implement guest page fault bypass for nonpae Avi Kivity
2007-12-30 7:10 ` [PATCH 41/52] KVM: Add statistic for remote tlb flushes Avi Kivity
2007-12-30 7:10 ` [PATCH 42/52] KVM: MMU: Avoid unnecessary remote tlb flushes when guest updates a pte Avi Kivity
2007-12-30 7:10 ` [PATCH 43/52] KVM: Don't bother the mmu if cr3 load doesn't change cr3 Avi Kivity
2007-12-30 7:10 ` [PATCH 44/52] KVM: MMU: Code cleanup Avi Kivity
2007-12-30 7:10 ` [PATCH 45/52] KVM: MMU: Introduce and use gpte_to_gfn() Avi Kivity
2007-12-30 7:10 ` [PATCH 46/52] KVM: MMU: Move pse36 handling to the guest walker Avi Kivity
2007-12-30 7:10 ` [PATCH 47/52] KVM: MMU: Remove extra gaddr parameter from set_pte_common() Avi Kivity
2007-12-30 7:10 ` [PATCH 48/52] KVM: MMU: Remove set_pde() Avi Kivity
2007-12-30 7:10 ` [PATCH 49/52] KVM: MMU: Merge set_pte() and set_pte_common() Avi Kivity
2007-12-30 7:10 ` [PATCH 50/52] KVM: MMU: Adjust page_header_update_slot() to accept a gfn instead of a gpa Avi Kivity
2007-12-30 7:10 ` [PATCH 51/52] KVM: MMU: Introduce gfn_to_gpa() Avi Kivity
2007-12-30 7:10 ` [PATCH 52/52] KVM: MMU: Simplify nonpaging_map() 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=1198998638-22713-16-git-send-email-avi@qumranet.com \
--to=avi@qumranet.com \
--cc=kvm-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=xiantao.zhang@intel.com \
/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®