# HG changeset patch
# User akw27@xxxxxxxxxxxxxxxxxxxxxx
# Node ID 9b1866006aea3aab960b88baf500a356f9bb367c
# Parent f6e7c967212e5c0098e6f6cdbc9cdac042d9124c
# Parent e1fbb7fee1d8e9f944b32fe427d342103a1c916e
merge
Signed-off-by: andrew.warfield@xxxxxxxxxxxx
diff -r f6e7c967212e -r 9b1866006aea xen/arch/x86/vmx.c
--- a/xen/arch/x86/vmx.c Mon Jul 4 15:31:47 2005
+++ b/xen/arch/x86/vmx.c Mon Jul 4 15:35:35 2005
@@ -46,6 +46,214 @@
unsigned int opt_vmx_debug_level = 0;
integer_param("vmx_debug", opt_vmx_debug_level);
+#ifdef __x86_64__
+static struct msr_state percpu_msr[NR_CPUS];
+
+static u32 msr_data_index[VMX_MSR_COUNT] =
+{
+ MSR_LSTAR, MSR_STAR, MSR_CSTAR,
+ MSR_SYSCALL_MASK, MSR_EFER,
+};
+
+/*
+ * To avoid MSR save/restore at every VM exit/entry time, we restore
+ * the x86_64 specific MSRs at domain switch time. Since those MSRs are
+ * are not modified once set for generic domains, we don't save them,
+ * but simply reset them to the values set at percpu_traps_init().
+ */
+void vmx_load_msrs(struct vcpu *p, struct vcpu *n)
+{
+ struct msr_state *host_state;
+ host_state = &percpu_msr[smp_processor_id()];
+
+ while (host_state->flags){
+ int i;
+
+ i = find_first_set_bit(host_state->flags);
+ wrmsrl(msr_data_index[i], host_state->msr_items[i]);
+ clear_bit(i, &host_state->flags);
+ }
+}
+
+static void vmx_save_init_msrs(void)
+{
+ struct msr_state *host_state;
+ host_state = &percpu_msr[smp_processor_id()];
+ int i;
+
+ for (i = 0; i < VMX_MSR_COUNT; i++)
+ rdmsrl(msr_data_index[i], host_state->msr_items[i]);
+}
+
+#define CASE_READ_MSR(address) \
+ case MSR_ ## address: \
+ msr_content = msr->msr_items[VMX_INDEX_MSR_ ## address]; \
+ break
+
+#define CASE_WRITE_MSR(address) \
+ case MSR_ ## address: \
+ msr->msr_items[VMX_INDEX_MSR_ ## address] = msr_content; \
+ if (!test_bit(VMX_INDEX_MSR_ ## address, &msr->flags)){ \
+ set_bit(VMX_INDEX_MSR_ ## address, &msr->flags); \
+ }\
+ break
+
+#define IS_CANO_ADDRESS(add) 1
+static inline int long_mode_do_msr_read(struct cpu_user_regs *regs)
+{
+ u64 msr_content = 0;
+ struct vcpu *vc = current;
+ struct msr_state * msr = &vc->arch.arch_vmx.msr_content;
+ switch(regs->ecx){
+ case MSR_EFER:
+ msr_content = msr->msr_items[VMX_INDEX_MSR_EFER];
+ VMX_DBG_LOG(DBG_LEVEL_2, "EFER msr_content %llx\n", (unsigned long
long)msr_content);
+ if (test_bit(VMX_CPU_STATE_LME_ENABLED,
+ &vc->arch.arch_vmx.cpu_state))
+ msr_content |= 1 << _EFER_LME;
+
+ if (VMX_LONG_GUEST(vc))
+ msr_content |= 1 << _EFER_LMA;
+ break;
+ case MSR_FS_BASE:
+ if (!(VMX_LONG_GUEST(vc)))
+ /* XXX should it be GP fault */
+ domain_crash();
+ __vmread(GUEST_FS_BASE, &msr_content);
+ break;
+ case MSR_GS_BASE:
+ if (!(VMX_LONG_GUEST(vc)))
+ domain_crash();
+ __vmread(GUEST_GS_BASE, &msr_content);
+ break;
+ case MSR_SHADOW_GS_BASE:
+ msr_content = msr->shadow_gs;
+ break;
+
+ CASE_READ_MSR(STAR);
+ CASE_READ_MSR(LSTAR);
+ CASE_READ_MSR(CSTAR);
+ CASE_READ_MSR(SYSCALL_MASK);
+ default:
+ return 0;
+ }
+ VMX_DBG_LOG(DBG_LEVEL_2, "mode_do_msr_read: msr_content: %lx\n",
msr_content);
+ regs->eax = msr_content & 0xffffffff;
+ regs->edx = msr_content >> 32;
+ return 1;
+}
+
+static inline int long_mode_do_msr_write(struct cpu_user_regs *regs)
+{
+ u64 msr_content = regs->eax | ((u64)regs->edx << 32);
+ struct vcpu *vc = current;
+ struct msr_state * msr = &vc->arch.arch_vmx.msr_content;
+ struct msr_state * host_state =
+ &percpu_msr[smp_processor_id()];
+
+ VMX_DBG_LOG(DBG_LEVEL_1, " mode_do_msr_write msr %lx msr_content %lx\n",
+ regs->ecx, msr_content);
+
+ switch (regs->ecx){
+ case MSR_EFER:
+ if ((msr_content & EFER_LME) ^
+ test_bit(VMX_CPU_STATE_LME_ENABLED,
+ &vc->arch.arch_vmx.cpu_state)){
+ if (test_bit(VMX_CPU_STATE_PG_ENABLED,
+ &vc->arch.arch_vmx.cpu_state) ||
+ !test_bit(VMX_CPU_STATE_PAE_ENABLED,
+ &vc->arch.arch_vmx.cpu_state)){
+ vmx_inject_exception(vc, TRAP_gp_fault, 0);
+ }
+ }
+ if (msr_content & EFER_LME)
+ set_bit(VMX_CPU_STATE_LME_ENABLED,
+ &vc->arch.arch_vmx.cpu_state);
+ /* No update for LME/LMA since it have no effect */
+ msr->msr_items[VMX_INDEX_MSR_EFER] =
+ msr_content;
+ if (msr_content & ~(EFER_LME | EFER_LMA)){
+ msr->msr_items[VMX_INDEX_MSR_EFER] = msr_content;
+ if (!test_bit(VMX_INDEX_MSR_EFER, &msr->flags)){
+ rdmsrl(MSR_EFER,
+ host_state->msr_items[VMX_INDEX_MSR_EFER]);
+ set_bit(VMX_INDEX_MSR_EFER, &host_state->flags);
+ set_bit(VMX_INDEX_MSR_EFER, &msr->flags);
+ wrmsrl(MSR_EFER, msr_content);
+ }
+ }
+ break;
+
+ case MSR_FS_BASE:
+ case MSR_GS_BASE:
+ if (!(VMX_LONG_GUEST(vc)))
+ domain_crash();
+ if (!IS_CANO_ADDRESS(msr_content)){
+ VMX_DBG_LOG(DBG_LEVEL_1, "Not cano address of msr write\n");
+ vmx_inject_exception(vc, TRAP_gp_fault, 0);
+ }
+ if (regs->ecx == MSR_FS_BASE)
+ __vmwrite(GUEST_FS_BASE, msr_content);
+ else
+ __vmwrite(GUEST_GS_BASE, msr_content);
+ break;
+
+ case MSR_SHADOW_GS_BASE:
+ if (!(VMX_LONG_GUEST(vc)))
+ domain_crash();
+ vc->arch.arch_vmx.msr_content.shadow_gs = msr_content;
+ wrmsrl(MSR_SHADOW_GS_BASE, msr_content);
+ break;
+
+ CASE_WRITE_MSR(STAR);
+ CASE_WRITE_MSR(LSTAR);
+ CASE_WRITE_MSR(CSTAR);
+ CASE_WRITE_MSR(SYSCALL_MASK);
+ default:
+ return 0;
+ }
+ return 1;
+}
+
+void
+vmx_restore_msrs(struct vcpu *d)
+{
+ int i = 0;
+ struct msr_state *guest_state;
+ struct msr_state *host_state;
+ unsigned long guest_flags ;
+
+ guest_state = &d->arch.arch_vmx.msr_content;;
+ host_state = &percpu_msr[smp_processor_id()];
+
+ wrmsrl(MSR_SHADOW_GS_BASE, guest_state->shadow_gs);
+ guest_flags = guest_state->flags;
+ if (!guest_flags)
+ return;
+
+ while (guest_flags){
+ i = find_first_set_bit(guest_flags);
+
+ VMX_DBG_LOG(DBG_LEVEL_2,
+ "restore guest's index %d msr %lx with %lx\n",
+ i, (unsigned long) msr_data_index[i], (unsigned long)
guest_state->msr_items[i]);
+ set_bit(i, &host_state->flags);
+ wrmsrl(msr_data_index[i], guest_state->msr_items[i]);
+ clear_bit(i, &guest_flags);
+ }
+}
+
+#else /* __i386__ */
+#define vmx_save_init_msrs() ((void)0)
+
+static inline int long_mode_do_msr_read(struct cpu_user_regs *regs){
+ return 0;
+}
+static inline int long_mode_do_msr_write(struct cpu_user_regs *regs){
+ return 0;
+}
+#endif
+
extern long evtchn_send(int lport);
extern long do_block(void);
void do_nmi(struct cpu_user_regs *, unsigned long);
@@ -92,6 +300,8 @@
if (!(__vmxon(phys_vmcs))) {
printk("VMXON is done\n");
}
+
+ vmx_save_init_msrs();
return 1;
}
@@ -122,7 +332,6 @@
static int vmx_do_page_fault(unsigned long va, struct cpu_user_regs *regs)
{
unsigned long eip;
- l1_pgentry_t gpte;
unsigned long gpa; /* FIXME: PAE */
int result;
@@ -139,13 +348,16 @@
handle_mmio(va, va);
return 1;
}
- gpte = gva_to_gpte(va);
- if (!(l1e_get_flags(gpte) & _PAGE_PRESENT) )
- return 0;
- gpa = l1e_get_paddr(gpte) + (va & ~PAGE_MASK);
+ gpa = gva_to_gpa(va);
/* Use 1:1 page table to identify MMIO address space */
- if (mmio_space(gpa)){
+ if ( mmio_space(gpa) ){
+ if (gpa >= 0xFEE00000) { /* workaround for local APIC */
+ u32 inst_len;
+ __vmread(INSTRUCTION_LEN, &(inst_len));
+ __update_guest_eip(inst_len);
+ return 1;
+ }
handle_mmio(va, gpa);
return 1;
}
@@ -196,9 +408,11 @@
cpuid(input, &eax, &ebx, &ecx, &edx);
if (input == 1) {
+#ifdef __i386__
clear_bit(X86_FEATURE_PSE, &edx);
clear_bit(X86_FEATURE_PAE, &edx);
clear_bit(X86_FEATURE_PSE36, &edx);
+#endif
}
regs->eax = (unsigned long) eax;
@@ -386,8 +600,6 @@
* selector is null.
*/
if (!vm86 && check_for_null_selector(eip)) {
- printf("String I/O with null selector (cs:eip=0x%lx:0x%lx)\n",
- cs, eip);
laddr = (p->dir == IOREQ_WRITE) ? regs->esi : regs->edi;
}
p->pdata_valid = 1;
@@ -709,10 +921,10 @@
static int vmx_set_cr0(unsigned long value)
{
struct vcpu *d = current;
- unsigned long old_base_mfn, mfn;
+ unsigned long mfn;
unsigned long eip;
int paging_enabled;
-
+ unsigned long vm_entry_value;
/*
* CR0: We don't want to lose PE and PG.
*/
@@ -733,10 +945,42 @@
printk("Invalid CR3 value = %lx", d->arch.arch_vmx.cpu_cr3);
domain_crash_synchronous(); /* need to take a clean path */
}
+
+#if defined(__x86_64__)
+ if (test_bit(VMX_CPU_STATE_LME_ENABLED,
+ &d->arch.arch_vmx.cpu_state) &&
+ !test_bit(VMX_CPU_STATE_PAE_ENABLED,
+ &d->arch.arch_vmx.cpu_state)){
+ VMX_DBG_LOG(DBG_LEVEL_1, "Enable paging before PAE enable\n");
+ vmx_inject_exception(d, TRAP_gp_fault, 0);
+ }
+ if (test_bit(VMX_CPU_STATE_LME_ENABLED,
+ &d->arch.arch_vmx.cpu_state)){
+ /* Here the PAE is should to be opened */
+ VMX_DBG_LOG(DBG_LEVEL_1, "Enable the Long mode\n");
+ set_bit(VMX_CPU_STATE_LMA_ENABLED,
+ &d->arch.arch_vmx.cpu_state);
+ __vmread(VM_ENTRY_CONTROLS, &vm_entry_value);
+ vm_entry_value |= VM_ENTRY_CONTROLS_IA_32E_MODE;
+ __vmwrite(VM_ENTRY_CONTROLS, vm_entry_value);
+
+ }
+
+ unsigned long crn;
+ /* update CR4's PAE if needed */
+ __vmread(GUEST_CR4, &crn);
+ if ( (!(crn & X86_CR4_PAE)) &&
+ test_bit(VMX_CPU_STATE_PAE_ENABLED,
+ &d->arch.arch_vmx.cpu_state)){
+ VMX_DBG_LOG(DBG_LEVEL_1, "enable PAE on cr4\n");
+ __vmwrite(GUEST_CR4, crn | X86_CR4_PAE);
+ }
+#elif defined( __i386__)
+ unsigned long old_base_mfn;
old_base_mfn = pagetable_get_pfn(d->arch.guest_table);
if (old_base_mfn)
put_page(pfn_to_page(old_base_mfn));
-
+#endif
/*
* Now arch.guest_table points to machine physical.
*/
@@ -760,6 +1004,24 @@
* a partition disables the CR0.PE bit.
*/
if ((value & X86_CR0_PE) == 0) {
+ if ( value & X86_CR0_PG ) {
+ /* inject GP here */
+ vmx_inject_exception(d, TRAP_gp_fault, 0);
+ return 0;
+ } else {
+ /*
+ * Disable paging here.
+ * Same to PE == 1 && PG == 0
+ */
+ if (test_bit(VMX_CPU_STATE_LMA_ENABLED,
+ &d->arch.arch_vmx.cpu_state)){
+ clear_bit(VMX_CPU_STATE_LMA_ENABLED,
+ &d->arch.arch_vmx.cpu_state);
+ __vmread(VM_ENTRY_CONTROLS, &vm_entry_value);
+ vm_entry_value &= ~VM_ENTRY_CONTROLS_IA_32E_MODE;
+ __vmwrite(VM_ENTRY_CONTROLS, vm_entry_value);
+ }
+ }
__vmread(GUEST_RIP, &eip);
VMX_DBG_LOG(DBG_LEVEL_1,
"Disabling CR0.PE at %%eip 0x%lx\n", eip);
@@ -791,6 +1053,26 @@
#define CASE_GET_REG(REG, reg) \
case REG_ ## REG: value = regs->reg; break
+#define CASE_EXTEND_SET_REG \
+ CASE_EXTEND_REG(S)
+#define CASE_EXTEND_GET_REG \
+ CASE_EXTEND_REG(G)
+
+#ifdef __i386__
+#define CASE_EXTEND_REG(T)
+#else
+#define CASE_EXTEND_REG(T) \
+ CASE_ ## T ## ET_REG(R8, r8); \
+ CASE_ ## T ## ET_REG(R9, r9); \
+ CASE_ ## T ## ET_REG(R10, r10); \
+ CASE_ ## T ## ET_REG(R11, r11); \
+ CASE_ ## T ## ET_REG(R12, r12); \
+ CASE_ ## T ## ET_REG(R13, r13); \
+ CASE_ ## T ## ET_REG(R14, r14); \
+ CASE_ ## T ## ET_REG(R15, r15);
+#endif
+
+
/*
* Write to control registers
*/
@@ -808,6 +1090,7 @@
CASE_GET_REG(EBP, ebp);
CASE_GET_REG(ESI, esi);
CASE_GET_REG(EDI, edi);
+ CASE_EXTEND_GET_REG
case REG_ESP:
__vmread(GUEST_RSP, &value);
break;
@@ -878,12 +1161,30 @@
break;
}
case 4:
+ {
/* CR4 */
- if (value & X86_CR4_PAE)
- __vmx_bug(regs); /* not implemented */
+ unsigned long old_guest_cr;
+ unsigned long pae_disabled = 0;
+
+ __vmread(GUEST_CR4, &old_guest_cr);
+ if (value & X86_CR4_PAE){
+ set_bit(VMX_CPU_STATE_PAE_ENABLED, &d->arch.arch_vmx.cpu_state);
+ if(!vmx_paging_enabled(d))
+ pae_disabled = 1;
+ } else {
+ if (test_bit(VMX_CPU_STATE_LMA_ENABLED,
+ &d->arch.arch_vmx.cpu_state)){
+ vmx_inject_exception(d, TRAP_gp_fault, 0);
+ }
+ clear_bit(VMX_CPU_STATE_PAE_ENABLED, &d->arch.arch_vmx.cpu_state);
+ }
+
__vmread(CR4_READ_SHADOW, &old_cr);
-
- __vmwrite(GUEST_CR4, (value | X86_CR4_VMXE));
+ if (pae_disabled)
+ __vmwrite(GUEST_CR4, ((value & ~X86_CR4_PAE) | X86_CR4_VMXE));
+ else
+ __vmwrite(GUEST_CR4, value| X86_CR4_VMXE);
+
__vmwrite(CR4_READ_SHADOW, value);
/*
@@ -891,10 +1192,10 @@
* all TLB entries except global entries.
*/
if ((old_cr ^ value) & (X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE)) {
- vmx_shadow_clear_state(d->domain);
shadow_sync_all(d->domain);
}
break;
+ }
default:
printk("invalid cr: %d\n", gp);
__vmx_bug(regs);
@@ -1000,7 +1301,9 @@
regs->edx = 0;
break;
default:
- rdmsr(regs->ecx, regs->eax, regs->edx);
+ if(long_mode_do_msr_read(regs))
+ return;
+ rdmsr_user(regs->ecx, regs->eax, regs->edx);
break;
}
@@ -1026,6 +1329,7 @@
__vmwrite(GUEST_SYSENTER_EIP, regs->eax);
break;
default:
+ long_mode_do_msr_write(regs);
break;
}
diff -r f6e7c967212e -r 9b1866006aea xen/include/asm-x86/vmx_intercept.h
--- a/xen/include/asm-x86/vmx_intercept.h Mon Jul 4 15:31:47 2005
+++ b/xen/include/asm-x86/vmx_intercept.h Mon Jul 4 15:35:35 2005
@@ -8,7 +8,7 @@
#include <xen/errno.h>
#include <public/io/ioreq.h>
-#define MAX_IO_HANDLER 6
+#define MAX_IO_HANDLER 10
typedef int (*intercept_action_t)(ioreq_t*);
diff -r f6e7c967212e -r 9b1866006aea xen/arch/x86/vmx_vmcs.c
--- a/xen/arch/x86/vmx_vmcs.c Mon Jul 4 15:31:47 2005
+++ b/xen/arch/x86/vmx_vmcs.c Mon Jul 4 15:35:35 2005
@@ -65,8 +65,12 @@
error |= __vmwrite(CPU_BASED_VM_EXEC_CONTROL,
MONITOR_CPU_BASED_EXEC_CONTROLS);
-
+#if defined (__x86_64__)
+ error |= __vmwrite(VM_EXIT_CONTROLS,
+ MONITOR_VM_EXIT_CONTROLS | VM_EXIT_CONTROLS_IA_32E_MODE);
+#else
error |= __vmwrite(VM_EXIT_CONTROLS, MONITOR_VM_EXIT_CONTROLS);
+#endif
error |= __vmwrite(VM_ENTRY_CONTROLS, MONITOR_VM_ENTRY_CONTROLS);
return error;
@@ -93,6 +97,11 @@
unsigned long tr_base;
unsigned long ds_base;
unsigned long cs_base;
+#ifdef __x86_64__
+ unsigned long fs_base;
+ unsigned long gs_base;
+#endif
+
/* control registers */
unsigned long cr3;
unsigned long cr0;
@@ -230,8 +239,8 @@
/* interrupt */
error |= __vmwrite(VM_ENTRY_INTR_INFO_FIELD, 0);
/* mask */
- error |= __vmwrite(CR0_GUEST_HOST_MASK, 0xffffffff);
- error |= __vmwrite(CR4_GUEST_HOST_MASK, 0xffffffff);
+ error |= __vmwrite(CR0_GUEST_HOST_MASK, -1UL);
+ error |= __vmwrite(CR4_GUEST_HOST_MASK, -1UL);
error |= __vmwrite(PAGE_FAULT_ERROR_CODE_MASK, 0);
error |= __vmwrite(PAGE_FAULT_ERROR_CODE_MATCH, 0);
@@ -298,9 +307,19 @@
shadow_cr &= ~X86_CR0_PG;
error |= __vmwrite(CR0_READ_SHADOW, shadow_cr);
/* CR3 is set in vmx_final_setup_guest */
+#ifdef __x86_64__
+ error |= __vmwrite(GUEST_CR4, host_env->cr4 & ~X86_CR4_PAE);
+ printk("construct_init_vmcs_guest: guest CR4 is %lx\n", host_env->cr4 );
+#else
error |= __vmwrite(GUEST_CR4, host_env->cr4);
+#endif
shadow_cr = host_env->cr4;
+
+#ifdef __x86_64__
+ shadow_cr &= ~(X86_CR4_PGE | X86_CR4_VMXE | X86_CR4_PAE);
+#else
shadow_cr &= ~(X86_CR4_PGE | X86_CR4_VMXE);
+#endif
error |= __vmwrite(CR4_READ_SHADOW, shadow_cr);
error |= __vmwrite(GUEST_ES_BASE, host_env->ds_base);
@@ -339,16 +358,24 @@
error |= __vmwrite(HOST_ES_SELECTOR, host_env->ds_selector);
error |= __vmwrite(HOST_SS_SELECTOR, host_env->ds_selector);
error |= __vmwrite(HOST_DS_SELECTOR, host_env->ds_selector);
+#if defined (__i386__)
error |= __vmwrite(HOST_FS_SELECTOR, host_env->ds_selector);
error |= __vmwrite(HOST_GS_SELECTOR, host_env->ds_selector);
-
+ error |= __vmwrite(HOST_FS_BASE, host_env->ds_base);
+ error |= __vmwrite(HOST_GS_BASE, host_env->ds_base);
+
+#else
+ rdmsrl(MSR_FS_BASE, host_env->fs_base);
+ rdmsrl(MSR_GS_BASE, host_env->gs_base);
+ error |= __vmwrite(HOST_FS_BASE, host_env->fs_base);
+ error |= __vmwrite(HOST_GS_BASE, host_env->gs_base);
+
+#endif
host_env->cs_selector = __HYPERVISOR_CS;
error |= __vmwrite(HOST_CS_SELECTOR, host_env->cs_selector);
host_env->ds_base = 0;
host_env->cs_base = 0;
- error |= __vmwrite(HOST_FS_BASE, host_env->ds_base);
- error |= __vmwrite(HOST_GS_BASE, host_env->ds_base);
/* Debug */
__asm__ __volatile__ ("sidt (%0) \n" :: "a"(&desc) : "memory");
@@ -366,6 +393,12 @@
host_env->cr4 = crn;
error |= __vmwrite(HOST_CR4, crn);
error |= __vmwrite(HOST_RIP, (unsigned long) vmx_asm_vmexit_handler);
+#ifdef __x86_64__
+ /* TBD: support cr8 for 64-bit guest */
+ __vmwrite(VIRTUAL_APIC_PAGE_ADDR, 0);
+ __vmwrite(TPR_THRESHOLD, 0);
+ __vmwrite(SECONDARY_VM_EXEC_CONTROL, 0);
+#endif
return error;
}
diff -r f6e7c967212e -r 9b1866006aea xen/include/asm-x86/vmx_vmcs.h
--- a/xen/include/asm-x86/vmx_vmcs.h Mon Jul 4 15:31:47 2005
+++ b/xen/include/asm-x86/vmx_vmcs.h Mon Jul 4 15:35:35 2005
@@ -26,6 +26,14 @@
extern int start_vmx(void);
extern void stop_vmx(void);
+
+#if defined (__x86_64__)
+extern void vmx_load_msrs(struct vcpu *p, struct vcpu *n);
+void vmx_restore_msrs(struct vcpu *d);
+#else
+#define vmx_load_msrs(_p, _n) ((void)0)
+#define vmx_restore_msrs(_v) ((void)0)
+#endif
void vmx_enter_scheduler(void);
@@ -87,7 +95,6 @@
void free_vmcs(struct vmcs_struct *);
int load_vmcs(struct arch_vmx_struct *, u64);
int store_vmcs(struct arch_vmx_struct *, u64);
-void dump_vmcs(void);
int construct_vmcs(struct arch_vmx_struct *, struct cpu_user_regs *,
struct vcpu_guest_context *, int);
diff -r f6e7c967212e -r 9b1866006aea
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c Mon Jul 4
15:31:47 2005
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c Mon Jul 4
15:35:35 2005
@@ -910,31 +910,31 @@
static trap_info_t trap_table[] = {
- { 0, 0, (__KERNEL_CS|0x3), 0, (unsigned long)divide_error
},
- { 1, 0, (__KERNEL_CS|0x3), 0, (unsigned long)debug
},
- { 3, 3, (__KERNEL_CS|0x3), 0, (unsigned long)int3
},
- { 4, 3, (__KERNEL_CS|0x3), 0, (unsigned long)overflow
},
- { 5, 3, (__KERNEL_CS|0x3), 0, (unsigned long)bounds
},
- { 6, 0, (__KERNEL_CS|0x3), 0, (unsigned long)invalid_op
},
- { 7, 0, (__KERNEL_CS|0x3), 0, (unsigned long)device_not_available
},
- { 9, 0, (__KERNEL_CS|0x3), 0, (unsigned
long)coprocessor_segment_overrun},
- { 10, 0, (__KERNEL_CS|0x3), 0, (unsigned long)invalid_TSS
},
- { 11, 0, (__KERNEL_CS|0x3), 0, (unsigned long)segment_not_present
},
- { 12, 0, (__KERNEL_CS|0x3), 0, (unsigned long)stack_segment
},
- { 13, 0, (__KERNEL_CS|0x3), 0, (unsigned long)general_protection
},
- { 14, 0, (__KERNEL_CS|0x3), 0, (unsigned long)page_fault
},
- { 15, 0, (__KERNEL_CS|0x3), 0, (unsigned long)spurious_interrupt_bug
},
- { 16, 0, (__KERNEL_CS|0x3), 0, (unsigned long)coprocessor_error
},
- { 17, 0, (__KERNEL_CS|0x3), 0, (unsigned long)alignment_check
},
+ { 0, 0, (__KERNEL_CS|0x3), (unsigned long)divide_error
},
+ { 1, 0, (__KERNEL_CS|0x3), (unsigned long)debug
},
+ { 3, 3, (__KERNEL_CS|0x3), (unsigned long)int3
},
+ { 4, 3, (__KERNEL_CS|0x3), (unsigned long)overflow
},
+ { 5, 3, (__KERNEL_CS|0x3), (unsigned long)bounds
},
+ { 6, 0, (__KERNEL_CS|0x3), (unsigned long)invalid_op
},
+ { 7, 0, (__KERNEL_CS|0x3), (unsigned long)device_not_available
},
+ { 9, 0, (__KERNEL_CS|0x3), (unsigned
long)coprocessor_segment_overrun},
+ { 10, 0, (__KERNEL_CS|0x3), (unsigned long)invalid_TSS
},
+ { 11, 0, (__KERNEL_CS|0x3), (unsigned long)segment_not_present
},
+ { 12, 0, (__KERNEL_CS|0x3), (unsigned long)stack_segment
},
+ { 13, 0, (__KERNEL_CS|0x3), (unsigned long)general_protection
},
+ { 14, 0, (__KERNEL_CS|0x3), (unsigned long)page_fault
},
+ { 15, 0, (__KERNEL_CS|0x3), (unsigned long)spurious_interrupt_bug
},
+ { 16, 0, (__KERNEL_CS|0x3), (unsigned long)coprocessor_error
},
+ { 17, 0, (__KERNEL_CS|0x3), (unsigned long)alignment_check
},
#ifdef CONFIG_X86_MCE
- { 18, 0, (__KERNEL_CS|0x3), 0, (unsigned long)machine_check
},
-#endif
- { 19, 0, (__KERNEL_CS|0x3), 0, (unsigned long)simd_coprocessor_error
},
- { SYSCALL_VECTOR, 3, (__KERNEL_CS|0x3), 0, (unsigned long)system_call
},
+ { 18, 0, (__KERNEL_CS|0x3), (unsigned long)machine_check
},
+#endif
+ { 19, 0, (__KERNEL_CS|0x3), (unsigned long)simd_coprocessor_error
},
+ { SYSCALL_VECTOR, 3, (__KERNEL_CS|0x3), (unsigned long)system_call },
#ifdef CONFIG_IA32_EMULATION
- { IA32_SYSCALL_VECTOR, 3, (__KERNEL_CS|0x3), 0, (unsigned
long)ia32_syscall},
-#endif
- { 0, 0, 0, 0, 0
}
+ { IA32_SYSCALL_VECTOR, 3, (__KERNEL_CS|0x3), (unsigned
long)ia32_syscall},
+#endif
+ { 0, 0, 0, 0 }
};
void __init trap_init(void)
diff -r f6e7c967212e -r 9b1866006aea xen/arch/x86/vmx_platform.c
--- a/xen/arch/x86/vmx_platform.c Mon Jul 4 15:31:47 2005
+++ b/xen/arch/x86/vmx_platform.c Mon Jul 4 15:35:35 2005
@@ -503,7 +503,7 @@
int inst_copy_from_guest(unsigned char *buf, unsigned long guest_eip, int
inst_len)
{
- l1_pgentry_t gpte;
+ unsigned long gpa;
unsigned long mfn;
unsigned char *inst_start;
int remaining = 0;
@@ -513,8 +513,9 @@
if ( vmx_paging_enabled(current) )
{
- gpte = gva_to_gpte(guest_eip);
- mfn = phys_to_machine_mapping(l1e_get_pfn(gpte));
+ gpa = gva_to_gpa(guest_eip);
+ mfn = phys_to_machine_mapping(gpa >> PAGE_SHIFT);
+
/* Does this cross a page boundary ? */
if ( (guest_eip & PAGE_MASK) != ((guest_eip + inst_len) & PAGE_MASK) )
{
@@ -533,8 +534,9 @@
if ( remaining )
{
- gpte = gva_to_gpte(guest_eip+inst_len+remaining);
- mfn = phys_to_machine_mapping(l1e_get_pfn(gpte));
+ gpa = gva_to_gpa(guest_eip+inst_len+remaining);
+ mfn = phys_to_machine_mapping(gpa >> PAGE_SHIFT);
+
inst_start = map_domain_page(mfn);
memcpy((char *)buf+inst_len, inst_start, remaining);
unmap_domain_page(inst_start);
diff -r f6e7c967212e -r 9b1866006aea xen/include/asm-x86/msr.h
--- a/xen/include/asm-x86/msr.h Mon Jul 4 15:31:47 2005
+++ b/xen/include/asm-x86/msr.h Mon Jul 4 15:35:35 2005
@@ -17,6 +17,8 @@
__asm__ __volatile__("wrmsr" \
: /* no outputs */ \
: "c" (msr), "a" (val1), "d" (val2))
+
+#define wrmsrl(msr,val) wrmsr(msr,(__u32)((__u64)(val)),((__u64)(val))>>32)
#define rdmsr_user(msr,val1,val2) ({\
int _rc; \
diff -r f6e7c967212e -r 9b1866006aea docs/misc/hg-cheatsheet.txt
--- a/docs/misc/hg-cheatsheet.txt Mon Jul 4 15:31:47 2005
+++ b/docs/misc/hg-cheatsheet.txt Mon Jul 4 15:35:35 2005
@@ -3,7 +3,7 @@
================================
Written by Andrew Warfield, extended by Michael Fetterman and Ian Pratt
-June 29, 2005
+June 29, 2005, extended by Grzegorz Milos 04 July 2005.
Overview
--------
@@ -121,7 +121,7 @@
the current state of your working directory. If you weren't already
"updated" to your local repository's tip, you might be surprised to
find yourself merging the results of the pull with a non-tip node in
-your local repository.
+your local repository.
Revision History
@@ -258,6 +258,11 @@
will generate a patch describing the diff between that changeset and
its parent.
+
+To generate a patch between two specified revisions use:
+ hg diff -r A -r B [files]
+NB: BK syntax -rA..B isn't supported by Hg.
+
Pushing changesets to a parent repository
-----------------------------------------
@@ -268,6 +273,12 @@
repository off the web interface. In fact, you can currently only push
to an ssh target -- filesystem drectory targets don't work, but this
will be fixed soon.
+For now it is possible to set up assymetric pull/push paths. Pulls can
+be done via web interface while pushes via ssh. Example of .hg/hgrc config
+file:
+ | [paths]
+ | default = http://your.server/repository_name
+ | default-push = ssh://[username@]your.server//repository_location
Repository history
@@ -384,7 +395,7 @@
Shows the differences between whatever changeset you most recently
checked out, and your current working directory:
- hg diff
+ hg diff
View an annotated version of a source file:
diff -r f6e7c967212e -r 9b1866006aea xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c Mon Jul 4 15:31:47 2005
+++ b/xen/arch/x86/domain.c Mon Jul 4 15:35:35 2005
@@ -296,6 +296,8 @@
}
#ifdef CONFIG_VMX
+static int vmx_switch_on;
+
void arch_vmx_do_resume(struct vcpu *v)
{
u64 vmcs_phys_ptr = (u64) virt_to_phys(v->arch.arch_vmx.vmcs);
@@ -363,6 +365,9 @@
SHM_enable|SHM_refcounts|
SHM_translate|SHM_external);
}
+
+ if (!vmx_switch_on)
+ vmx_switch_on = 1;
return 0;
@@ -441,9 +446,12 @@
}
else
{
- if ( !get_page_and_type(&frame_table[phys_basetab>>PAGE_SHIFT], d,
- PGT_base_page_table) )
- return -EINVAL;
+#ifdef __x86_64__
+ if ( !(c->flags & VGCF_VMX_GUEST) )
+#endif
+ if ( !get_page_and_type(&frame_table[phys_basetab>>PAGE_SHIFT], d,
+ PGT_base_page_table) )
+ return -EINVAL;
}
if ( (rc = (int)set_gdt(v, c->gdt_frames, c->gdt_ents)) != 0 )
@@ -524,6 +532,12 @@
: "=r" (__r) : "r" (value), "0" (__r) );\
__r; })
+#if CONFIG_VMX
+#define load_msrs(_p, _n) if (vmx_switch_on) vmx_load_msrs((_p), (_n))
+#else
+#define load_msrs(_p, _n) ((void)0)
+#endif
+
static void load_segments(struct vcpu *p, struct vcpu *n)
{
struct vcpu_guest_context *pctxt = &p->arch.guest_context;
@@ -681,6 +695,7 @@
#elif defined(__i386__)
#define load_segments(_p, _n) ((void)0)
+#define load_msrs(_p, _n) ((void)0)
#define save_segments(_p) ((void)0)
#define clear_segments() ((void)0)
@@ -780,6 +795,7 @@
{
load_LDT(next);
load_segments(realprev, next);
+ load_msrs(realprev, next);
}
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home