X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=31d00001cb697ecc55eb73bb3316279845a77eef;hb=a2b7cc4f2d739213d1edefb85ff941c41c86907b;hp=44393550e83c8595f6d91d84fa27e540c48b9bce;hpb=af355c370ac80f8e19d6375cb3070213c29a92eb;p=palacios.git diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c index 4439355..31d0000 100644 --- a/palacios/src/palacios/vmm_ctrl_regs.c +++ b/palacios/src/palacios/vmm_ctrl_regs.c @@ -1,3 +1,22 @@ +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include #include #include @@ -20,15 +39,10 @@ #endif - - - - - // First Attempt = 494 lines // current = 106 lines -int handle_cr0_write(struct guest_info * info) { - char instr[15]; +int v3_handle_cr0_write(struct guest_info * info) { + uchar_t instr[15]; int ret; struct x86_instr dec_instr; @@ -38,11 +52,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"); @@ -50,7 +66,7 @@ int handle_cr0_write(struct guest_info * info) { } - if (opcode_cmp(V3_OPCODE_LMSW, (const uchar_t *)(dec_instr.opcode)) == 0) { + if (v3_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.src_operand.operand); uchar_t new_cr0_val; @@ -75,7 +91,7 @@ int handle_cr0_write(struct guest_info * info) { *(uchar_t*)shadow_cr0 |= new_cr0_val; PrintDebug("New Shadow CR0=%x\n", *shadow_cr0); } - } else if (opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) { + } else if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) { PrintDebug("MOV2CR0\n"); if (info->cpu_mode == LONG) { @@ -85,7 +101,7 @@ int handle_cr0_write(struct guest_info * info) { struct cr0_32 *real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0); struct cr0_32 *new_cr0= (struct cr0_32 *)(dec_instr.src_operand.operand); - PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.dst_operand.size); + PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.src_operand.size); PrintDebug("Old CR0=%x\n", *real_cr0); @@ -102,7 +118,7 @@ int handle_cr0_write(struct guest_info * info) { *shadow_cr0 = *new_cr0; shadow_cr0->et = 1; - if (get_mem_mode(info) == VIRTUAL_MEM) { + if (v3_get_mem_mode(info) == VIRTUAL_MEM) { struct cr3_32 * shadow_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.shadow_cr3); info->ctrl_regs.cr3 = *(addr_t*)shadow_cr3; @@ -116,7 +132,7 @@ int handle_cr0_write(struct guest_info * info) { PrintDebug("New CR0=%x\n", *real_cr0); } - } else if (opcode_cmp(V3_OPCODE_CLTS, (const uchar_t *)(dec_instr.opcode)) == 0) { + } else if (v3_opcode_cmp(V3_OPCODE_CLTS, (const uchar_t *)(dec_instr.opcode)) == 0) { // CLTS struct cr0_32 *real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0); @@ -139,8 +155,8 @@ int handle_cr0_write(struct guest_info * info) { // First attempt = 253 lines // current = 51 lines -int handle_cr0_read(struct guest_info * info) { - char instr[15]; +int v3_handle_cr0_read(struct guest_info * info) { + uchar_t instr[15]; int ret; struct x86_instr dec_instr; @@ -150,18 +166,20 @@ 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"); return -1; } - if (opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) { + if (v3_opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) { 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); @@ -176,7 +194,7 @@ int handle_cr0_read(struct guest_info * info) { PrintDebug("real CR0: %x\n", *(uint_t*)real_cr0); PrintDebug("returned CR0: %x\n", *(uint_t*)virt_cr0); - } else if (opcode_cmp(V3_OPCODE_SMSW, (const uchar_t *)(dec_instr.opcode)) == 0) { + } else if (v3_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.dst_operand.operand); char cr0_val = *(char*)real_cr0 & 0x0f; @@ -200,11 +218,11 @@ 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 v3_handle_cr3_write(struct guest_info * info) { int ret; - char instr[15]; + uchar_t instr[15]; struct x86_instr dec_instr; if (info->mem_mode == PHYSICAL_MEM) { @@ -213,18 +231,20 @@ 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"); return -1; } - if (opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) { + if (v3_opcode_cmp(V3_OPCODE_MOV2CR, (const uchar_t *)(dec_instr.opcode)) == 0) { PrintDebug("MOV2CR3\n"); @@ -234,22 +254,31 @@ int handle_cr3_write(struct guest_info * info) { 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 (1 || !CR3_32_SAME_BASE(new_cr3, guest_cr3)) { - addr_t shadow_pt; + cached = v3_cache_page_tables32(info, (addr_t)CR3_TO_PDE32((void *)*(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 = v3_create_new_shadow_pt32(); - shadow_cr3->pdt_base_addr = PD32_BASE_ADDR(shadow_pt); - } + shadow_cr3->pdt_base_addr = (addr_t)V3_PAddr((void *)(addr_t)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; @@ -279,8 +308,8 @@ int handle_cr3_write(struct guest_info * info) { // first attempt = 156 lines // current = 36 lines -int handle_cr3_read(struct guest_info * info) { - char instr[15]; +int v3_handle_cr3_read(struct guest_info * info) { + uchar_t instr[15]; int ret; struct x86_instr dec_instr; @@ -290,18 +319,20 @@ 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"); return -1; } - if (opcode_cmp(V3_OPCODE_MOVCR2, (const uchar_t *)(dec_instr.opcode)) == 0) { + if (v3_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.dst_operand.operand); @@ -317,7 +348,6 @@ int handle_cr3_read(struct guest_info * info) { return -1; } - info->rip += dec_instr.instr_length; return 0;