X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=6f99e3914db5b41ac1315ff564ffc5b61930c4f9;hb=57de08049d9a345445d26741c5ee0f7f9e5c2fcc;hp=8966ee7cbe3abfa332f1e1566f4b01ff645f6db4;hpb=990ef457de6998f79947c81a16c8e7f843e784c0;p=palacios.git diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c index 8966ee7..6f99e39 100644 --- a/palacios/src/palacios/vmm_ctrl_regs.c +++ b/palacios/src/palacios/vmm_ctrl_regs.c @@ -23,7 +23,7 @@ #include #include #include - +#include #ifndef DEBUG_CTRL_REGS #undef PrintDebug @@ -229,20 +229,35 @@ int v3_handle_cr0_read(struct guest_info * info) { } if (dec_instr.op_type == V3_OP_MOVCR2) { - struct cr0_32 * dst_reg = (struct cr0_32 *)(dec_instr.dst_operand.operand); - struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0); - PrintDebug("MOVCR2 (mode=%s)\n", v3_cpu_mode_to_str(info->cpu_mode)); + + if ((v3_get_cpu_mode(info) == LONG) || + (v3_get_cpu_mode(info) == LONG_32_COMPAT)) { + struct cr0_64 * dst_reg = (struct cr0_64 *)(dec_instr.dst_operand.operand); - if (info->shdw_pg_mode == SHADOW_PAGING) { - struct cr0_32 * guest_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); - *dst_reg = *guest_cr0; + if (info->shdw_pg_mode == SHADOW_PAGING) { + struct cr0_64 * guest_cr0 = (struct cr0_64 *)&(info->shdw_pg_state.guest_cr0); + *dst_reg = *guest_cr0; + } else { + struct cr0_64 * shadow_cr0 = (struct cr0_64 *)&(info->ctrl_regs.cr0); + *dst_reg = *shadow_cr0; + } + + PrintDebug("returned CR0: %p\n", (void *)*(addr_t *)dst_reg); } else { - *dst_reg = *shadow_cr0; - } + struct cr0_32 * dst_reg = (struct cr0_32 *)(dec_instr.dst_operand.operand); - PrintDebug("Shadow CR0: %x\n", *(uint_t*)shadow_cr0); - PrintDebug("returned CR0: %x\n", *(uint_t*)dst_reg); + if (info->shdw_pg_mode == SHADOW_PAGING) { + struct cr0_32 * guest_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); + *dst_reg = *guest_cr0; + } else { + struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0); + *dst_reg = *shadow_cr0; + } + + PrintDebug("returned CR0: %x\n", *(uint_t*)dst_reg); + } + } else if (dec_instr.op_type == V3_OP_SMSW) { struct cr0_real * shadow_cr0 = (struct cr0_real *)&(info->ctrl_regs.cr0); struct cr0_real * dst_reg = (struct cr0_real *)(dec_instr.dst_operand.operand); @@ -416,7 +431,7 @@ int v3_handle_cr4_write(struct guest_info * info) { int ret; int flush_tlb=0; struct x86_instr dec_instr; - v3_vm_cpu_mode_t cpu_mode = v3_get_cpu_mode(info); + v3_cpu_mode_t cpu_mode = v3_get_cpu_mode(info); if (info->mem_mode == PHYSICAL_MEM) { ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); @@ -469,12 +484,12 @@ int v3_handle_cr4_write(struct guest_info * info) { if ((cr4->pae == 0) && (new_cr4->pae == 1)) { PrintDebug("Creating PAE passthrough tables\n"); - // Delete the old 32 bit direct map page tables - delete_page_tables_32((pde32_t *)V3_VAddr((void *)(info->direct_map_pt))); - // create 32 bit PAE direct map page table - info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_32PAE(info)); - + if (v3_reset_passthrough_pts(info) == -1) { + PrintError("Could not create 32 bit PAE passthrough pages tables\n"); + return -1; + } + // reset cr3 to new page tables info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt); @@ -553,54 +568,6 @@ int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data) { // Enable/Disable Syscall shadow_efer->sce = src.value & 0x1; - - // We have to handle long mode writes.... - - /* - if ((info->shdw_pg_mode == SHADOW_PAGING) && - (v3_get_mem_mode(info) == PHYSICAL_MEM)) { - - if ((shadow_efer->lme == 0) && (new_efer->lme == 1)) { - PrintDebug("Transition to longmode\n"); - PrintDebug("Creating Passthrough 64 bit page tables\n"); - - // Delete the old 32 bit direct map page tables - - PrintDebug("Deleting old PAE Page tables\n"); - PrintError("JRL BUG?: Will the old page tables always be in PAE format??\n"); - delete_page_tables_32PAE((pdpe32pae_t *)V3_VAddr((void *)(info->direct_map_pt))); - - // create 64 bit direct map page table - info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_64(info)); - - // reset cr3 to new page tables - info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt); - - // We mark the Long Mode active because we have paging enabled - // We do this in new_efer because we copy the msr in full below - // new_efer->lma = 1; - - } else if ((shadow_efer->lme == 1) && (new_efer->lme == 0)) { - // transition out of long mode - //((struct efer_64 *)&(info->guest_efer.value))->lme = 0; - //((struct efer_64 *)&(info->guest_efer.value))->lma = 0; - - return -1; - } - - // accept all changes to the efer, but make sure that the SVME bit is set... (SVM specific) - *shadow_efer = *new_efer; - shadow_efer->svme = 1; - - - - PrintDebug("New EFER=%p\n", (void *)*(addr_t *)(shadow_efer)); - } else { - PrintError("Write to EFER in NESTED_PAGING or VIRTUAL_MEM mode not supported\n"); - // Should probably just check for a long mode transition, and bomb out if it is - return -1; - } - */ info->rip += 2; // WRMSR/RDMSR are two byte operands return 0;