svm 64bit initial support
PATCH 1/1 svm 64bit initial support
SVM patch to add 64bit hv support.
This patch only modifies svm files.
Tested with c/s 9015 with 32bit hv using UP Dom0, with UP linux and winxpsp1 unmodified guests.
Tested with c/s 9015 with 64bit hv using UP Dom0, with 32bit and 64bit UP linux and 32bit winxpsp1.
Applies cleanly to 9016.
Please apply.
Signed-off-by Tom Woller <[email protected]>
xen/arch/x86/hvm/svm/emulate.c +10 -16
@@ -86,7 +86,7 @@case 0x7 : value = regs->edi;break ; -#if X86_64 +#if __x86_64__case 0x8 : value = regs->r8;break ;
@@ -318,20 +318,14 @@/* Get the register/mode number of src register in ModRM register. */ -unsigned int decode_dest_reg (u8 m) -{ -#if __x86_64__ -ASSERT (0 );/* Need to adjust for REX prefix if applicable */ -#endif -return (m >>3 ) &7 ; -} - -unsigned int decode_src_reg (u8 m) -{ -#if __x86_64__ -ASSERT (0 );/* Need to adjust for REX prefix if applicable */ -#endif -return m &7 ; +unsigned int decode_dest_reg (u8 prefix,u8 m) +{ +return DECODE_MODRM_REG (prefix, m); +} + +unsigned int decode_src_reg (u8 prefix,u8 m) +{ +return DECODE_MODRM_RM (prefix, m); }
@@ -431,7 +425,7 @@* The caller can either pass a NULL pointer to the guest_eip_buf, or a pointer * to enough bytes to satisfy the instruction including prefix bytes. */ -unsigned int __get_instruction_length_from_list (struct vmcb_struct *vmcb, +int __get_instruction_length_from_list (struct vmcb_struct *vmcb,enum instruction_index *list,unsigned int list_count,u8 *guest_eip_buf,enum instruction_index *match) {
xen/arch/x86/hvm/svm/svm.c +171 -177
630 lines not on this page · raw message
xen/arch/x86/hvm/svm/vmcb.c +12 -18
@@ -190,7 +190,6 @@unsigned long eflags;unsigned long shadow_cr;struct vmcb_struct *vmcb = arch_svm->vmcb; -struct Xgt_desc_struct desc;/* Allows IRQs to be shares */ vmcb->vintr.fields.intr_masking =1 ;
@@ -224,9 +223,9 @@ vmcb->fs.base =0 ; vmcb->gs.base =0 ; - __asm__ __volatile__ ("sidt (%0) \n" ::"a" (&desc) :"memory" ); - vmcb->idtr.base = desc.address; - vmcb->idtr.limit = desc.size; +/* Guest Interrupt descriptor table */ + vmcb->idtr.base =0 ; + vmcb->idtr.limit =0 ;/* Set up segment attributes */ attrib.bytes =0 ;
@@ -248,15 +247,11 @@ attrib.fields.type =0xb ;/* type=0xb -> executable/readable, accessed */ vmcb->cs.attributes = attrib; -/* Global descriptor table */ -//NMERGE7500 - can probably remove access to gdtr - vmcb->gdtr.base = regs->edx; - regs->edx =0 ; -ASSERT (regs->eax <=0xFFFF );/* Make sure we're in the limit */ - vmcb->gdtr.limit = regs->eax; - regs->eax =0 ; - -/* Local Descriptor Table */ +/* Guest Global descriptor table */ + vmcb->gdtr.base =0 ; + vmcb->gdtr.limit =0 ; + +/* Guest Local Descriptor Table */ attrib.fields.s =0 ;/* not code or data segement */ attrib.fields.type =0x2 ;/* LDT */ attrib.fields.db =0 ;/* 16-bit */
@@ -279,11 +274,10 @@/* CR3 is set in svm_final_setup_guest */ __asm__ __volatile__ ("mov %%cr4,%0" :"=r" (crn) :); - shadow_cr = crn; - vmcb->cr4 = shadow_cr; - -//MERGE7500 - should write a 0 instead to rsp? - vmcb->rsp = regs->esp; + arch_svm->cpu_shadow_cr4 = crn & ~(X86_CR4_PGE |X86_CR4_PSE ); + vmcb->cr4 = crn |SVM_CR4_HOST_MASK ; + + vmcb->rsp =0 ; vmcb->rip = regs->eip; eflags = regs->eflags & ~HVM_EFLAGS_RESERVED_0 ;/* clear 0s */
xen/arch/x86/hvm/svm/x86_64/exits.S +0 -4
@@ -107,8 +107,6 @@ movq %rax, VMCB_rax(%rcx) movq VCPU_svm_hsa_pa(%rbx), %rax VMSAVE - /* XXX FPU SAVE */ - /* XXX DO TSC OFFSET */ movq VCPU_svm_vmcb_pa(%rbx), %rax popq %r15
@@ -137,9 +135,7 @@ VMSAVE /* rax is the only register we're allowed to touch here... */ - /* XXX FPU SAVE */ GET_CURRENT(%rax) - /* XXX DO TSC OFFSET */ movq VCPU_svm_hsa_pa(%rax), %rax VMLOAD
xen/include/asm-x86/hvm/svm/emulate.h +16 -5
@@ -83,15 +83,15 @@ struct cpu_user_regs *regs, const u8 prefix, const u8 *operand, u8 *size);extern OPERATING_MODE get_operating_mode (struct vmcb_struct *vmcb); -extern unsigned int decode_dest_reg (u8 modrm); -extern unsigned int decode_src_reg (u8 modrm); +extern unsigned int decode_dest_reg (u8 prefix,u8 modrm); +extern unsigned int decode_src_reg (u8 prefix,u8 modrm);extern unsigned long svm_rip2pointer (struct vmcb_struct *vmcb); -extern unsigned int __get_instruction_length_from_list (struct vmcb_struct *vmcb, +extern int __get_instruction_length_from_list (struct vmcb_struct *vmcb,enum instruction_index *list,unsigned int list_count,u8 *guest_eip_buf,enum instruction_index *match); -static inline unsigned int __get_instruction_length (struct vmcb_struct *vmcb, +static inline int __get_instruction_length (struct vmcb_struct *vmcb,enum instruction_index instr,u8 *guest_eip_buf) { return __get_instruction_length_from_list(vmcb, &instr, 1, guest_eip_buf,
@@ -138,9 +138,20 @@ } +static inline int skip_prefix_bytes (u8 *buf,size_t size) +{ +int index; +for (index =0 ; index < size &&is_prefix (buf[index]); index ++) +/* do nothing */ ; +return index; +} + + +static void inline __update_guest_eip (struct vmcb_struct *vmcb, -unsigned long inst_len) +int inst_len) { +ASSERT (inst_len >0 ); vmcb->rip += inst_len; }
xen/include/asm-x86/hvm/svm/vmcb.h +11 -18
@@ -269,21 +269,6 @@#define SVM_LONG_GUEST (ed) \ (test_bit(SVM_CPU_STATE_LMA_ENABLED, &ed->arch.hvm_svm.cpu_state)) -enum { -SVM_INDEX_MSR_LSTAR =0 , -SVM_INDEX_MSR_STAR , -SVM_INDEX_MSR_CSTAR , -SVM_INDEX_MSR_SYSCALL_MASK , -SVM_INDEX_MSR_EFER , - -SVM_MSR_COUNT , -}; - -struct svm_msr_state { -unsigned long flags; -unsigned long msr_items[SVM_MSR_COUNT ]; -unsigned long shadow_gs; -};/* * Attribute for segment selector. This is a copy of bit 40:47 & 52:55 of the
@@ -449,7 +434,7 @@struct arch_svm_struct {struct vmcb_struct *vmcb; -void *host_save_area; +void *host_save_area;u64 host_save_pa;u64 vmcb_pa;u32 *iopm;
@@ -461,11 +446,11 @@u32 asid_core;unsigned long flags;/* VMCB flags */ -unsigned long cpu_shadow_cr0;/* copy of guest read shadow CR0 */ +unsigned long cpu_shadow_cr0;/* Guest value for CR0 */ +unsigned long cpu_shadow_cr4;/* Guest value for CR4 */ unsigned long cpu_cr2;unsigned long cpu_cr3;unsigned long cpu_state; -struct svm_msr_state msr_content;struct timer hlt_timer;/* hlt ins emulation wakeup timer */ };
@@ -486,6 +471,14 @@#define VMCB_EFLAGS_RESERVED_0 0xffc08028/* bitmap for 0 */ #define VMCB_EFLAGS_RESERVED_1 0x00000002/* bitmap for 1 */ + +/* These bits in the CR4 are owned by the host */ +#ifdef __i386__ +#define SVM_CR4_HOST_MASK (0) +#else +#define SVM_CR4_HOST_MASK (X86_CR4_PAE) +#endif +#endif /* ASM_X86_HVM_SVM_VMCS_H__ */
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel