X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=5bf6dc1b1f09b074020b403d4e7e178554f25b3c;hb=f9bb3db89469169bb5775dc031d89e570c6fed70;hp=a55dd93f4991d70e7fb1f9519b27fa182723620d;hpb=6fa12b728fed57e76c4a4df5c87d989915c7d6c2;p=palacios.git diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c index a55dd93..5bf6dc1 100644 --- a/palacios/src/palacios/vmm_ctrl_regs.c +++ b/palacios/src/palacios/vmm_ctrl_regs.c @@ -1,3 +1,6 @@ +/* Northwestern University */ +/* (c) 2008, Jack Lange */ + #include #include #include @@ -20,10 +23,6 @@ #endif - - - - // First Attempt = 494 lines // current = 106 lines int handle_cr0_write(struct guest_info * info) { @@ -37,11 +36,13 @@ int handle_cr0_write(struct guest_info * info) { ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); } - if (ret != 15) { + /* The IFetch will already have faulted in the necessary bytes for the full instruction + if (ret != 15) { // I think we should inject a GPF into the guest PrintError("Could not read instruction (ret=%d)\n", ret); return -1; - } + } + */ if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) { PrintError("Could not decode instruction\n"); @@ -51,7 +52,7 @@ int handle_cr0_write(struct guest_info * info) { if (opcode_cmp(V3_OPCODE_LMSW, (const uchar_t *)(dec_instr.opcode)) == 0) { struct cr0_real *real_cr0 = (struct cr0_real*)&(info->ctrl_regs.cr0); - struct cr0_real *new_cr0 = (struct cr0_real *)(dec_instr.first_operand.operand); + struct cr0_real *new_cr0 = (struct cr0_real *)(dec_instr.src_operand.operand); uchar_t new_cr0_val; PrintDebug("LMSW\n"); @@ -82,9 +83,9 @@ int handle_cr0_write(struct guest_info * info) { } else { // 32 bit registers struct cr0_32 *real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0); - struct cr0_32 *new_cr0= (struct cr0_32 *)(dec_instr.second_operand.operand); + struct cr0_32 *new_cr0= (struct cr0_32 *)(dec_instr.src_operand.operand); - PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.first_operand.size); + PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.src_operand.size); PrintDebug("Old CR0=%x\n", *real_cr0); @@ -149,11 +150,13 @@ int handle_cr0_read(struct guest_info * info) { ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); } - if (ret != 15) { - // I think we should inject a GPF into the guest - PrintError("Could not read instruction (ret=%d)\n", ret); - return -1; - } + /* The IFetch will already have faulted in the necessary bytes for the full instruction + if (ret != 15) { + // I think we should inject a GPF into the guest + PrintError("Could not read instruction (ret=%d)\n", ret); + return -1; + } + */ if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) { PrintError("Could not decode instruction\n"); @@ -161,7 +164,7 @@ int handle_cr0_read(struct guest_info * info) { } if (opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) { - struct cr0_32 * virt_cr0 = (struct cr0_32 *)(dec_instr.first_operand.operand); + struct cr0_32 * virt_cr0 = (struct cr0_32 *)(dec_instr.dst_operand.operand); struct cr0_32 * real_cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0); PrintDebug("MOVCR2\n"); @@ -177,7 +180,7 @@ int handle_cr0_read(struct guest_info * info) { PrintDebug("returned CR0: %x\n", *(uint_t*)virt_cr0); } else if (opcode_cmp(V3_OPCODE_SMSW, (const uchar_t *)(dec_instr.opcode)) == 0) { struct cr0_real *real_cr0= (struct cr0_real*)&(info->ctrl_regs.cr0); - struct cr0_real *virt_cr0 = (struct cr0_real *)(dec_instr.first_operand.operand); + struct cr0_real *virt_cr0 = (struct cr0_real *)(dec_instr.dst_operand.operand); char cr0_val = *(char*)real_cr0 & 0x0f; PrintDebug("SMSW\n"); @@ -199,7 +202,7 @@ int handle_cr0_read(struct guest_info * info) { -// First Attemp = 256 lines +// First Attempt = 256 lines // current = 65 lines int handle_cr3_write(struct guest_info * info) { int ret; @@ -212,11 +215,13 @@ int handle_cr3_write(struct guest_info * info) { ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); } - if (ret != 15) { - // I think we should inject a GPF into the guest - PrintError("Could not read instruction (ret=%d)\n", ret); - return -1; - } + /* The IFetch will already have faulted in the necessary bytes for the full instruction + if (ret != 15) { + // I think we should inject a GPF into the guest + PrintError("Could not read instruction (ret=%d)\n", ret); + return -1; + } + */ if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) { PrintError("Could not decode instruction\n"); @@ -230,25 +235,34 @@ int handle_cr3_write(struct guest_info * info) { PrintDebug("CR3 at 0x%x\n", &(info->ctrl_regs.cr3)); if (info->shdw_pg_mode == SHADOW_PAGING) { - struct cr3_32 * new_cr3 = (struct cr3_32 *)(dec_instr.second_operand.operand); + struct cr3_32 * new_cr3 = (struct cr3_32 *)(dec_instr.src_operand.operand); struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3); struct cr3_32 * shadow_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.shadow_cr3); + int cached = 0; + PrintDebug("Old Shadow CR3=%x; Old Guest CR3=%x\n", *(uint_t*)shadow_cr3, *(uint_t*)guest_cr3); - if (!CR3_32_SAME_BASE(new_cr3, guest_cr3)) { - addr_t shadow_pt; + cached = cache_page_tables32(info, CR3_TO_PDE32(*(addr_t *)new_cr3)); + + if (cached == -1) { + PrintError("CR3 Cache failed\n"); + return -1; + } else if (cached == 0) { + addr_t shadow_pt; PrintDebug("New CR3 is different - flushing shadow page table\n"); delete_page_tables_pde32((pde32_t *)CR3_TO_PDE32(*(uint_t*)shadow_cr3)); - shadow_pt = create_new_shadow_pt32(info); + shadow_pt = create_new_shadow_pt32(); shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt); - } + } else { + PrintDebug("Reusing cached shadow Page table\n"); + } shadow_cr3->pwt = new_cr3->pwt; shadow_cr3->pcd = new_cr3->pcd; @@ -289,11 +303,13 @@ int handle_cr3_read(struct guest_info * info) { ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); } - if (ret != 15) { - // I think we should inject a GPF into the guest - PrintError("Could not read instruction (ret=%d)\n", ret); - return -1; - } + /* The IFetch will already have faulted in the necessary bytes for the full instruction + if (ret != 15) { + // I think we should inject a GPF into the guest + PrintError("Could not read instruction (ret=%d)\n", ret); + return -1; + } + */ if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) { PrintError("Could not decode instruction\n"); @@ -302,7 +318,7 @@ int handle_cr3_read(struct guest_info * info) { if (opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) { PrintDebug("MOVCR32\n"); - struct cr3_32 * virt_cr3 = (struct cr3_32 *)(dec_instr.first_operand.operand); + struct cr3_32 * virt_cr3 = (struct cr3_32 *)(dec_instr.dst_operand.operand); PrintDebug("CR3 at 0x%x\n", &(info->ctrl_regs.cr3)); @@ -316,7 +332,6 @@ int handle_cr3_read(struct guest_info * info) { return -1; } - info->rip += dec_instr.instr_length; return 0;