From: Jack Lange Date: Fri, 25 Jul 2008 20:10:48 +0000 (+0000) Subject: added decoder support for cr0 write handler X-Git-Tag: vmmhack1-ramdisk-boot-iso-puppy~43 X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=07820ee58e9b356341ce86cd2b2938d3abef60c9 added decoder support for cr0 write handler --- diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h index 9475597..684af4d 100644 --- a/palacios/include/palacios/vm_guest.h +++ b/palacios/include/palacios/vm_guest.h @@ -36,6 +36,7 @@ struct v3_ctrl_regs { v3_reg_t cr4; v3_reg_t cr8; v3_reg_t rflags; + v3_reg_t efer; }; @@ -123,6 +124,10 @@ struct guest_info { }; +vm_cpu_mode_t get_cpu_mode(struct guest_info * info); +vm_mem_mode_t get_mem_mode(struct guest_info * info); + + void PrintV3Segments(struct guest_info * info); void PrintV3CtrlRegs(struct guest_info * info); void PrintV3GPRs(struct guest_info * info); diff --git a/palacios/include/palacios/vmm_ctrl_regs.h b/palacios/include/palacios/vmm_ctrl_regs.h index 1849092..69602bb 100644 --- a/palacios/include/palacios/vmm_ctrl_regs.h +++ b/palacios/include/palacios/vmm_ctrl_regs.h @@ -119,6 +119,21 @@ struct cr4_64 { +struct efer_64 { + uint_t sce : 1; + uint_t rsvd1 : 7; // RAZ + uint_t lme : 1; + uint_t rsvd2 : 1; // MBZ + uint_t lma : 1; + uint_t nxe : 1; + uint_t svme : 1; + uint_t rsvd3 : 1; // MBZ + uint_t ffxsr : 1; + uint_t rsvd4 : 12; // MBZ + uint_t rsvd5 : 32; // MBZ +}; + + struct rflags { uint_t cf : 1; // carry flag uint_t rsvd1 : 1; // Must be 1 @@ -149,6 +164,7 @@ struct rflags { + // First opcode byte static const uchar_t cr_access_byte = 0x0f; diff --git a/palacios/include/palacios/vmm_decoder.h b/palacios/include/palacios/vmm_decoder.h index ddbf9f8..bee9b4f 100644 --- a/palacios/include/palacios/vmm_decoder.h +++ b/palacios/include/palacios/vmm_decoder.h @@ -6,14 +6,6 @@ #include #include -/* - * This is where we do the hideous X86 instruction parsing among other things - * We can parse out the instruction prefixes, as well as decode the operands - */ - - - - typedef enum {INVALID_OPERAND, REG_OPERAND, MEM_OPERAND} operand_type_t; @@ -23,7 +15,7 @@ struct x86_operand { operand_type_t type; }; -struct x86_prefix_list { +struct x86_prefixes { uint_t lock : 1; // 0xF0 uint_t repne : 1; // 0xF2 uint_t repnz : 1; // 0xF2 @@ -44,10 +36,10 @@ struct x86_prefix_list { struct x86_instr { + struct x86_prefixes prefixes; uint_t instr_length; addr_t opcode; // a pointer to the V3_OPCODE_[*] arrays defined below uint_t num_operands; - struct x86_prefix_list prefixes; struct x86_operand first_operand; struct x86_operand second_operand; struct x86_operand third_operand; @@ -181,6 +173,9 @@ MAKE_INSTR(SMSW, 3, 0x0f, 0x01, 0x00); #define PREFIX_OP_SIZE 0x66 #define PREFIX_ADDR_SIZE 0x67 +int opcode_cmp(const uchar_t * op1, const uchar_t * op2); + + static inline int is_prefix_byte(char byte) { switch (byte) { case 0xF0: // lock diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c index 18ea2e3..b5ad69f 100644 --- a/palacios/src/palacios/svm_handler.c +++ b/palacios/src/palacios/svm_handler.c @@ -32,8 +32,11 @@ int handle_svm_exit(struct guest_info * info) { info->ctrl_regs.cr4 = guest_state->cr4; info->ctrl_regs.cr8 = guest_ctrl->guest_ctrl.V_TPR; info->ctrl_regs.rflags = guest_state->rflags; + info->ctrl_regs.efer = guest_state->efer; get_vmcb_segments((vmcb_t*)(info->vmm_data), &(info->segments)); + info->cpu_mode = get_cpu_mode(info); + info->mem_mode = get_mem_mode(info); exit_code = guest_ctrl->exit_code; @@ -328,7 +331,7 @@ int handle_svm_exit(struct guest_info * info) { guest_state->cr4 = info->ctrl_regs.cr4; guest_ctrl->guest_ctrl.V_TPR = info->ctrl_regs.cr8 & 0xff; guest_state->rflags = info->ctrl_regs.rflags; - + guest_state->efer = info->ctrl_regs.efer; guest_state->cpl = info->cpl; diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c index f920d1b..39af9d2 100644 --- a/palacios/src/palacios/vm_guest.c +++ b/palacios/src/palacios/vm_guest.c @@ -1,6 +1,60 @@ #include +#include #include + +vm_cpu_mode_t get_cpu_mode(struct guest_info * info) { + struct cr0_32 * cr0; + struct cr4_32 * cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4); + struct efer_64 * efer = (struct efer_64 *)&(info->ctrl_regs.efer); + struct v3_segment * cs = &(info->segments.cs); + + if (info->shdw_pg_mode == SHADOW_PAGING) { + cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); + } else if (info->shdw_pg_mode == NESTED_PAGING) { + cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0); + } else { + PrintError("Invalid Paging Mode...\n"); + V3_ASSERT(0); + return -1; + } + + if (cr0->pe == 0) { + return REAL; + } else if ((cr4->pae == 0) && (efer->lma == 0)) { + return PROTECTED; + } else if (efer->lma == 0) { + return PROTECTED_PAE; + } else if ((efer->lma == 1) && (cs->long_mode == 1)) { + return LONG; + } else { + return LONG_32_COMPAT; + } +} + +vm_mem_mode_t get_mem_mode(struct guest_info * info) { + struct cr0_32 * cr0; + + if (info->shdw_pg_mode == SHADOW_PAGING) { + cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); + } else if (info->shdw_pg_mode == NESTED_PAGING) { + cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0); + } else { + PrintError("Invalid Paging Mode...\n"); + V3_ASSERT(0); + return -1; + } + + + + if (cr0->pg == 0) { + return PHYSICAL_MEM; + } else { + return VIRTUAL_MEM; + } +} + + void PrintV3Segments(struct guest_info * info) { struct v3_segments * segs = &(info->segments); int i = 0; diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c index b31fcaa..ba83f3b 100644 --- a/palacios/src/palacios/vmm_ctrl_regs.c +++ b/palacios/src/palacios/vmm_ctrl_regs.c @@ -1,4 +1,4 @@ - #include +#include #include #include #include @@ -7,9 +7,6 @@ -extern void SerialMemDump(unsigned char *start, int n); - - /* Segmentation is a problem here... * * When we get a memory operand, presumably we use the default segment (which is?) @@ -17,481 +14,120 @@ extern void SerialMemDump(unsigned char *start, int n); */ -#ifndef VMM_CTRL_REGS +#ifndef DEBUG_CTRL_REGS #undef PrintDebug #define PrintDebug(fmt, args...) #endif -int handle_cr0_write(struct guest_info * info) { - char instr[15]; - - - switch (info->cpu_mode) { - case REAL: - { - int index = 0; - int ret; - - PrintDebug("Real Mode write to CR0 at linear guest pa 0x%x\n",get_addr_linear(info,info->rip,&(info->segments.cs))); - - //PrintV3Segments(info); - - // The real rip address is actually a combination of the rip + CS base - ret = read_guest_pa_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 - PrintDebug("Could not read instruction (ret=%d)\n", ret); - return -1; - } - /* - { - struct x86_instr dec_instr; - v3_decode(info, (addr_t)instr, &dec_instr); - return -1; - } - - */ - while (is_prefix_byte(instr[index])) { - switch(instr[index]) { - case PREFIX_CS_OVERRIDE: - case PREFIX_SS_OVERRIDE: - case PREFIX_DS_OVERRIDE: - case PREFIX_ES_OVERRIDE: - case PREFIX_FS_OVERRIDE: - case PREFIX_GS_OVERRIDE: - PrintDebug("Segment Override!!\n"); - return -1; - break; - default: - break; - } - index++; - } - - if ((instr[index] == cr_access_byte) && - (instr[index + 1] == lmsw_byte) && - (MODRM_REG(instr[index + 2]) == lmsw_reg_byte)) { - - addr_t first_operand; - addr_t second_operand; - struct cr0_real *real_cr0; - struct cr0_real *new_cr0; - operand_type_t addr_type; - char new_cr0_val = 0; - // LMSW - // decode mod/RM - index += 2; - - real_cr0 = (struct cr0_real*)&(info->ctrl_regs.cr0); - addr_type = decode_operands16(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG16); - if (addr_type == REG_OPERAND) { - new_cr0 = (struct cr0_real *)first_operand; - } else if (addr_type == MEM_OPERAND) { - addr_t host_addr; - if (guest_pa_to_host_va(info, first_operand + (info->segments.ds.base << 4), &host_addr) == -1) { - // gpf the guest - return -1; - } - new_cr0 = (struct cr0_real *)host_addr; - } else { - - // error... don't know what to do - return -1; - } - - if ((new_cr0->pe == 1) && (real_cr0->pe == 0)) { - info->cpu_mode = PROTECTED; - } else if ((new_cr0->pe == 0) && (real_cr0->pe == 1)) { - info->cpu_mode = REAL; - } - - new_cr0_val = (*(char*)(new_cr0)) & 0x0f; +int handle_cr0_write(struct guest_info * info) { + char instr[15]; + int ret; + struct x86_instr dec_instr; - if (info->shdw_pg_mode == SHADOW_PAGING) { - struct cr0_real * shadow_cr0 = (struct cr0_real*)&(info->shdw_pg_state.guest_cr0); - - PrintDebug("Old CR0=%x, Old Shadow CR0=%x\n", *real_cr0, *shadow_cr0); - /* struct cr0_real is only 4 bits wide, - * so we can overwrite the real_cr0 without worrying about the shadow fields - */ - *(char*)real_cr0 &= 0xf0; - *(char*)real_cr0 |= new_cr0_val; - - *(char*)shadow_cr0 &= 0xf0; - *(char*)shadow_cr0 |= new_cr0_val; + if (info->mem_mode == PHYSICAL_MEM) { + ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); + } else { + 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; + } - PrintDebug("New CR0=%x, New Shadow CR0=%x\n", *real_cr0, *shadow_cr0); - } else { - PrintDebug("Old CR0=%x\n", *real_cr0); - // for now we just pass through.... - *(char*)real_cr0 &= 0xf0; - *(char*)real_cr0 |= new_cr0_val; + if (v3_decode(info, (addr_t)instr, &dec_instr) == -1) { + PrintError("Could not decode instruction\n"); + return -1; + } - PrintDebug("New CR0=%x\n", *real_cr0); - } + 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); + uchar_t new_cr0_val; - info->rip += index; + PrintDebug("LMSW\n"); - } else if ((instr[index] == cr_access_byte) && - (instr[index + 1] == clts_byte)) { - // CLTS - PrintDebug("CLTS unhandled in CR0 write\n"); - return -1; + new_cr0_val = (*(char*)(new_cr0)) & 0x0f; + + PrintDebug("OperandVal = %x\n", new_cr0_val); - } else if ((instr[index] == cr_access_byte) && - (instr[index + 1] = mov_to_cr_byte)) { - addr_t first_operand; - addr_t second_operand; - struct cr0_32 *real_cr0; - struct cr0_32 *new_cr0; - operand_type_t addr_type; - + PrintDebug("Old CR0=%x\n", *real_cr0); + *(uchar_t*)real_cr0 &= 0xf0; + *(uchar_t*)real_cr0 |= new_cr0_val; + PrintDebug("New CR0=%x\n", *real_cr0); - index += 2; - - real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0); - - addr_type = decode_operands16(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG32); - if (addr_type != REG_OPERAND) { - PrintDebug("Moving to CR0 from non-register operand in CR0 write\n"); - /* Mov to CR0 Can only be a 32 bit register */ - // FIX ME - return -1; - } - - new_cr0 = (struct cr0_32 *)first_operand; - - if (new_cr0->pe == 1) { - PrintDebug("Entering Protected Mode\n"); - info->cpu_mode = PROTECTED; - } - - if (new_cr0->pe == 0) { - PrintDebug("Entering Real Mode\n"); - info->cpu_mode = REAL; - } - - - - if ((new_cr0->pg == 1) && (new_cr0->pe == 1)) { - PrintDebug("Paging is already turned on in switch to protected mode in CR0 write\n"); - - // Actually This appears to be Ok. - // Why shouldn't windows be allowed to switch to real mode whenever it wants to modify its page tables? - - info->mem_mode = VIRTUAL_MEM; - - // GPF the guest?? - // return -1; - } else if ((new_cr0->pg == 1) && (new_cr0->pe == 0)) { - PrintDebug("Will the madness Never End??\n"); - return -1; - } - - - if (info->shdw_pg_mode == SHADOW_PAGING) { - struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); - - PrintDebug("Old CR0=%x, Old Shadow CR0=%x\n", *real_cr0, *shadow_cr0); - *real_cr0 = *new_cr0; - real_cr0->pg = 1; - real_cr0->et = 1; - - *shadow_cr0 = *new_cr0; - shadow_cr0->et = 1; - - // Setup the page tables...??? - if (info->mem_mode == VIRTUAL_MEM) { - // If we aren't in paged mode then we have to preserve the identity mapped CR3 - info->ctrl_regs.cr3 = *(addr_t*)&(info->shdw_pg_state.shadow_cr3); - } - - PrintDebug("New CR0=%x, New Shadow CR0=%x\n", *real_cr0, *shadow_cr0); - } else { - PrintDebug("Old CR0=%x\n", *real_cr0); - *real_cr0 = *new_cr0; - PrintDebug("New CR0=%x\n", *real_cr0); - } - - info->rip += index; - - } else { - PrintDebug("Unsupported Instruction\n"); - // unsupported instruction, UD the guest - return -1; - } + if (info->shdw_pg_mode == SHADOW_PAGING) { + struct cr0_real * shadow_cr0 = (struct cr0_real*)&(info->shdw_pg_state.guest_cr0); + + PrintDebug(" Old Shadow CR0=%x\n", *shadow_cr0); + *(uchar_t*)shadow_cr0 &= 0xf0; + *(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) { + PrintDebug("MOV2CR0\n"); - } - break; - - case PROTECTED: - { + if (info->cpu_mode == LONG) { + // 64 bit registers + } 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); - int index = 0; - int ret; + PrintDebug("OperandVal = %x, length=%d\n", *new_cr0, dec_instr.first_operand.size); - PrintDebug("Protected %s Mode write to CR0 at guest %s linear rip 0x%x\n", - info->mem_mode == VIRTUAL_MEM ? "Paged" : "", - info->mem_mode == VIRTUAL_MEM ? "virtual" : "", - get_addr_linear(info, info->rip, &(info->segments.cs))); - // OK, now we will read the instruction - // The only difference between PROTECTED and PROTECTED_PG is whether we read - // from guest_pa or guest_va - if (info->mem_mode == PHYSICAL_MEM) { - // The real rip address is actually a combination of the rip + CS base - ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); - } else { - ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); - } + PrintDebug("Old CR0=%x\n", *real_cr0); + *real_cr0 = *new_cr0; - if (ret != 15) { - // I think we should inject a GPF into the guest - PrintDebug("Could not read instruction (ret=%d)\n", ret); - return -1; - } - - - while (is_prefix_byte(instr[index])) { - switch(instr[index]) { - case PREFIX_CS_OVERRIDE: - case PREFIX_SS_OVERRIDE: - case PREFIX_DS_OVERRIDE: - case PREFIX_ES_OVERRIDE: - case PREFIX_FS_OVERRIDE: - case PREFIX_GS_OVERRIDE: - PrintDebug("Segment Override!!\n"); - return -1; - break; - default: - break; - } - index++; - } - - /* - while (is_prefix_byte(instr[index])) { - index++; - } - */ - - struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); - - struct cr0_32 * real_cr0 = (struct cr0_32*)&(info->ctrl_regs.cr0); - - if ((instr[index] == cr_access_byte) && - (instr[index + 1] == mov_to_cr_byte)) { - - // MOV to CR0 - - addr_t first_operand; - addr_t second_operand; - struct cr0_32 *new_cr0; - operand_type_t addr_type; - - index += 2; - - /* - PrintDebug("MovToCR0 instr:\n"); - PrintTraceMemDump(instr, 15); - PrintDebug("EAX=%x\n", *(uint_t*)&(info->vm_regs.rax)); - */ - addr_type = decode_operands32(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG32); - - if (addr_type != REG_OPERAND) { - PrintDebug("Non-register operand in write to CR0\n"); - return -1; - } - - new_cr0 = (struct cr0_32 *)first_operand; - - //PrintDebug("first operand=%x\n", *(uint_t *)first_operand); - - if (info->shdw_pg_mode == SHADOW_PAGING) { - struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); - - if (new_cr0->pg == 1){ - // This should be new_cr0->pg && !(old_cr->pg), right? - // and then a case for turning paging off? - - struct cr3_32 * shadow_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.shadow_cr3); - - info->mem_mode = VIRTUAL_MEM; + if (info->shdw_pg_mode == SHADOW_PAGING) { + struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); - *shadow_cr0 = *new_cr0; - *real_cr0 = *new_cr0; - shadow_cr0->et = 1; - real_cr0->et = 1; - - // - // Activate Shadow Paging - // - PrintDebug("Turning on paging in the guest\n"); - - info->ctrl_regs.cr3 = *(addr_t*)shadow_cr3; + PrintDebug("Old Shadow CR0=%x\n", *shadow_cr0); - - } else if (new_cr0->pe == 0) { - info->cpu_mode = REAL; - info->mem_mode = PHYSICAL_MEM; - PrintDebug("Entering Real Mode\n"); - - //PrintV3CtrlRegs(info); - // reinstate the identity mapped paged tables - // But keep the shadow tables around to handle TLB issues.... UGH... - //info->shdw_pg_state.shadow_cr3 &= 0x00000fff; - //info->shdw_pg_state.shadow_cr3 |= ((addr_t)create_passthrough_pde32_pts(info) & ~0xfff); - - //info->ctrl_regs.cr3 = info->shdw_pg_state.shadow_cr3; + real_cr0->et = 1; + + *shadow_cr0 = *new_cr0; + shadow_cr0->et = 1; + + if (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; + } else { info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt); - - *shadow_cr0 = *new_cr0; - *real_cr0 = *new_cr0; real_cr0->pg = 1; - shadow_cr0->et = 1; - real_cr0->et = 1; - - //PrintV3CtrlRegs(info); - } - - - } else { - if (new_cr0->pg == 1) { - info->mem_mode = VIRTUAL_MEM; - } else if (new_cr0->pg == 0) { - info->cpu_mode = REAL; - info->mem_mode = PHYSICAL_MEM; - } - - *real_cr0 = *new_cr0; - } - - info->rip += index; - } else if ((instr[index] == cr_access_byte) && - (instr[index + 1] == lmsw_byte) && - (MODRM_REG(instr[index + 2]) == lmsw_reg_byte)) { - addr_t first_operand; - addr_t second_operand; - struct cr0_real *real_cr0; - struct cr0_real *new_cr0; - operand_type_t addr_type; - char new_cr0_val = 0; - - index += 2; - - real_cr0 = (struct cr0_real*)&(info->ctrl_regs.cr0); - - addr_type = decode_operands16(&(info->vm_regs), instr + index, &index, &first_operand, &second_operand, REG16); - - if (addr_type == REG_OPERAND) { - new_cr0 = (struct cr0_real *)first_operand; - } else if (addr_type == MEM_OPERAND) { - addr_t host_addr; - // check segment descriptors.... - - /* TODO, TODO, TODO: Lookup segment overrides */ - struct v3_segment *lmsw_segment = &(info->segments.ds); - - if (info->mem_mode == PHYSICAL_MEM) { - if (guest_pa_to_host_va(info, get_addr_linear(info, first_operand, lmsw_segment), &host_addr) == -1) { - return -1; - } - } else { - if (guest_va_to_host_va(info, get_addr_linear(info, first_operand, lmsw_segment), &host_addr) == -1) { - return -1; - } - } - - new_cr0 = (struct cr0_real *)host_addr; - } else { - return -1; - } - - - if (new_cr0->pe == 0) { - // According to the intel manual this it is illegal to use - // lmsw to turn _off_ Protected mode - PrintDebug("Cannot switch to real mode with LMSW, unclear what to do\n"); - return -1; - } - - new_cr0_val = (*(char *)(new_cr0)) & 0x0f; - - - if (info->shdw_pg_mode == SHADOW_PAGING) { - struct cr0_real * shadow_cr0 = (struct cr0_real*)&(info->shdw_pg_state.guest_cr0); - - PrintDebug("Old CR0=%x, Old Shadow CR0=%x\n", *real_cr0, *shadow_cr0); - /* struct cr0_real is only 4 bits wide, - * so we can overwrite the real_cr0 without worrying about the shadow fields - */ - *(char*)real_cr0 &= 0xf0; - *(char*)real_cr0 |= new_cr0_val; - - *(char*)shadow_cr0 &= 0xf0; - *(char*)shadow_cr0 |= new_cr0_val; - - - PrintDebug("New CR0=%x, New Shadow CR0=%x\n", *real_cr0, *shadow_cr0); - } else { - PrintDebug("Old CR0=%x\n", *real_cr0); - // for now we just pass through.... - *(char*)real_cr0 &= 0xf0; - *(char*)real_cr0 |= new_cr0_val; - - PrintDebug("New CR0=%x\n", *real_cr0); - } - - info->rip += index; - - - } else if ((instr[index] == 0x0f) && - (instr[index + 1] == 0x06)) { - // CLTS instruction - PrintDebug("CLTS instruction - clearing TS flag of real and shadow CR0\n"); - shadow_cr0->ts = 0; - real_cr0->ts = 0; - - index+=2; - - info->rip+=index; - - } else { - PrintDebug("Unkown instruction: \n"); - SerialMemDump(instr,15); - return -1; - } + + PrintDebug("New Shadow CR0=%x\n",*shadow_cr0); + } + PrintDebug("New CR0=%x\n", *real_cr0); } - break; - - case PROTECTED_PAE: - PrintDebug("Protected PAE Mode write to CR0 is UNIMPLEMENTED\n"); - return -1; - case LONG: - PrintDebug("Protected Long Mode write to CR0 is UNIMPLEMENTED\n"); - return -1; + } else if (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); + + real_cr0->ts = 0; - default: - { - PrintDebug("Unknown Mode write to CR0 (info->cpu_mode=0x%x\n)",info->cpu_mode); - return -1; + if (info->shdw_pg_mode == SHADOW_PAGING) { + struct cr0_32 * shadow_cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0); + shadow_cr0->ts = 0; } - break; - } + info->rip += dec_instr.instr_length; + return 0; } @@ -615,6 +251,8 @@ int handle_cr0_read(struct guest_info * info) { *virt_cr0 = *real_cr0; } + PrintDebug("Returning CR0: %x\n", *virt_cr0); + info->rip += index; } else { @@ -866,7 +504,7 @@ int handle_cr3_write(struct guest_info * info) { } else { PrintDebug("Unknown Instruction\n"); - SerialMemDump(instr,15); + PrintTraceMemDump(instr,15); return -1; } @@ -1001,7 +639,7 @@ int handle_cr3_write(struct guest_info * info) { } else { PrintDebug("Unknown Instruction\n"); - SerialMemDump(instr,15); + PrintTraceMemDump(instr,15); return -1; } } else { @@ -1082,7 +720,7 @@ int handle_cr3_read(struct guest_info * info) { info->rip += index; } else { PrintDebug("Unknown Instruction\n"); - SerialMemDump(instr,15); + PrintTraceMemDump(instr,15); return -1; } @@ -1161,7 +799,7 @@ int handle_cr3_read(struct guest_info * info) { info->rip += index; } else { PrintDebug("Unknown Instruction\n"); - SerialMemDump(instr,15); + PrintTraceMemDump(instr,15); return -1; } } else { diff --git a/palacios/src/palacios/vmm_decoder.c b/palacios/src/palacios/vmm_decoder.c index 6884d33..6d1299a 100644 --- a/palacios/src/palacios/vmm_decoder.c +++ b/palacios/src/palacios/vmm_decoder.c @@ -1,2 +1,10 @@ #include + +int opcode_cmp(const uchar_t * op1, const uchar_t * op2) { + if (op1[0] != op2[0]) { + return op1[0] - op2[0];; + } else { + return memcmp(op1 + 1, op2 + 1, op1[0]); + } +} diff --git a/palacios/src/palacios/vmm_xed.c b/palacios/src/palacios/vmm_xed.c index 9535eab..afa4f69 100644 --- a/palacios/src/palacios/vmm_xed.c +++ b/palacios/src/palacios/vmm_xed.c @@ -93,6 +93,7 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins PrintDebug("Number of operands: %d\n", instr->num_operands); + PrintDebug("INSTR length: %d\n", instr->instr_length); // set first operand if (instr->num_operands >= 1) { @@ -640,6 +641,15 @@ static int get_opcode(xed_iform_enum_t iform, addr_t * opcode) { *opcode = (addr_t)&V3_OPCODE_MOV2CR; break; + + case XED_IFORM_LMSW_GPR16: + *opcode = (addr_t)&V3_OPCODE_LMSW; + break; + + case XED_IFORM_CLTS: + *opcode = (addr_t)&V3_OPCODE_CLTS; + break; + default: *opcode = 0; return -1;