X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging.c;h=06d79f519d74d3fc708debd1101fdef2a23b5dba;hb=8c767ddb04d3ac42d080d9f9f5f40196d6f8f217;hp=05d913d9193493eb71dd8ebe60b0c435cbf61e13;hpb=56f8088296ee4116a4811a2f4f843edd80a7748d;p=palacios.git diff --git a/palacios/src/palacios/vmm_shadow_paging.c b/palacios/src/palacios/vmm_shadow_paging.c index 05d913d..06d79f5 100644 --- a/palacios/src/palacios/vmm_shadow_paging.c +++ b/palacios/src/palacios/vmm_shadow_paging.c @@ -1,5 +1,21 @@ -/* (c) 2008, Jack Lange */ -/* (c) 2008, The V3VEE Project */ +/* + * 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 @@ -60,10 +76,8 @@ static int handle_shadow_pte32_fault(struct guest_info* info, static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr, pf_error_t error_code); -int init_shadow_page_state(struct guest_info * info) { +int v3_init_shadow_page_state(struct guest_info * info) { struct shadow_page_state * state = &(info->shdw_pg_state); - state->guest_mode = PDE32; - state->shadow_mode = PDE32; state->guest_cr3 = 0; state->shadow_cr3 = 0; @@ -130,7 +144,7 @@ int cache_page_tables32(struct guest_info * info, addr_t pde) { } */ -int cache_page_tables32(struct guest_info * info, addr_t pde) { +int v3_cache_page_tables32(struct guest_info * info, addr_t pde) { struct shadow_page_state * state = &(info->shdw_pg_state); addr_t pde_host_addr; pde32_t * tmp_pde; @@ -151,7 +165,7 @@ int cache_page_tables32(struct guest_info * info, addr_t pde) { pte_cache = create_hashtable(0, &pte_hash_fn, &pte_equals); state->cached_ptes = pte_cache; - if (guest_pa_to_host_pa(info, pde, &pde_host_addr) == -1) { + if (guest_pa_to_host_va(info, pde, &pde_host_addr) == -1) { PrintError("Could not lookup host address of guest PDE\n"); return -1; } @@ -165,7 +179,7 @@ int cache_page_tables32(struct guest_info * info, addr_t pde) { if ((tmp_pde[i].present) && (tmp_pde[i].large_page == 0)) { addr_t pte_host_addr; - if (guest_pa_to_host_pa(info, (addr_t)(PDE32_T_ADDR(tmp_pde[i])), &pte_host_addr) == -1) { + if (guest_pa_to_host_va(info, (addr_t)(PDE32_T_ADDR(tmp_pde[i])), &pte_host_addr) == -1) { PrintError("Could not lookup host address of guest PDE\n"); return -1; } @@ -185,7 +199,7 @@ int v3_replace_shdw_page32(struct guest_info * info, addr_t location, pte32_t * pde32_t * shadow_pde = (pde32_t *)&(shadow_pd[PDE32_INDEX(location)]); if (shadow_pde->large_page == 0) { - pte32_t * shadow_pt = (pte32_t *)PDE32_T_ADDR((*shadow_pde)); + pte32_t * shadow_pt = (pte32_t *)(addr_t)PDE32_T_ADDR((*shadow_pde)); pte32_t * shadow_pte = (pte32_t *)&(shadow_pt[PTE32_INDEX(location)]); //if (shadow_pte->present == 1) { @@ -207,7 +221,7 @@ int v3_replace_shdw_page32(struct guest_info * info, addr_t location, pte32_t * -int handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) { +int v3_handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) { if (info->mem_mode == PHYSICAL_MEM) { // If paging is not turned on we need to handle the special cases @@ -230,10 +244,10 @@ int handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_erro } } -addr_t create_new_shadow_pt32() { +addr_t v3_create_new_shadow_pt32() { void * host_pde = 0; - host_pde = V3_AllocPages(1); + host_pde = V3_VAddr(V3_AllocPages(1)); memset(host_pde, 0, PAGE_SIZE); return (addr_t)host_pde; @@ -345,7 +359,7 @@ static int handle_large_pagefault32(struct guest_info * info, } else { // Handle hooked pages as well as other special pages if (handle_special_page_fault(info, fault_addr, guest_fault_pa, error_code) == -1) { - PrintError("Special Page Fault handler returned error for address: %x\n", fault_addr); + PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr); return -1; } } @@ -371,7 +385,7 @@ static int handle_large_pagefault32(struct guest_info * info, static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) { pde32_t * guest_pd = NULL; pde32_t * shadow_pd = (pde32_t *)CR3_TO_PDE32(info->shdw_pg_state.shadow_cr3); - addr_t guest_cr3 = CR3_TO_PDE32(info->shdw_pg_state.guest_cr3); + addr_t guest_cr3 = (addr_t)CR3_TO_PDE32(info->shdw_pg_state.guest_cr3); pt_access_status_t guest_pde_access; pt_access_status_t shadow_pde_access; pde32_t * guest_pde = NULL; @@ -380,7 +394,7 @@ static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr PrintDebug("Shadow page fault handler\n"); if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pd) == -1) { - PrintError("Invalid Guest PDE Address: 0x%x\n", guest_cr3); + PrintError("Invalid Guest PDE Address: 0x%p\n", (void *)guest_cr3); return -1; } @@ -404,7 +418,7 @@ static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr if (shadow_pde_access == PT_ENTRY_NOT_PRESENT) { - pte32_t * shadow_pt = (pte32_t *)create_new_shadow_pt32(); + pte32_t * shadow_pt = (pte32_t *)v3_create_new_shadow_pt32(); shadow_pde->present = 1; shadow_pde->user_page = guest_pde->user_page; @@ -420,11 +434,12 @@ static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr guest_pde->accessed = 1; - shadow_pde->pt_base_addr = PD32_BASE_ADDR(shadow_pt); + shadow_pde->pt_base_addr = PD32_BASE_ADDR((addr_t)V3_PAddr(shadow_pt)); if (guest_pde->large_page == 0) { shadow_pde->writable = guest_pde->writable; } else { + // ?? What if guest pde is dirty a this point? ((pde32_4MB_t *)guest_pde)->dirty = 0; shadow_pde->writable = 0; } @@ -434,7 +449,7 @@ static int handle_shadow_pagefault32(struct guest_info * info, addr_t fault_addr // // PTE fault // - pte32_t * shadow_pt = (pte32_t *)PDE32_T_ADDR((*shadow_pde)); + pte32_t * shadow_pt = (pte32_t *)(addr_t)PDE32_T_ADDR((*shadow_pde)); if (guest_pde->large_page == 0) { pte32_t * guest_pt = NULL; @@ -601,7 +616,7 @@ static int handle_shadow_pte32_fault(struct guest_info * info, state->cached_cr3 = 0; } - } else if ((guest_pte->dirty = 0) && (error_code.write == 0)) { + } else if ((guest_pte->dirty == 0) && (error_code.write == 0)) { // was = shadow_pte->writable = 0; } @@ -610,7 +625,7 @@ static int handle_shadow_pte32_fault(struct guest_info * info, } else { // Page fault handled by hook functions if (handle_special_page_fault(info, fault_addr, guest_pa, error_code) == -1) { - PrintError("Special Page fault handler returned error for address: %x\n", fault_addr); + PrintError("Special Page fault handler returned error for address: %p\n", (void *)fault_addr); return -1; } } @@ -648,7 +663,7 @@ static int handle_shadow_pte32_fault(struct guest_info * info, /* Currently Does not work with Segmentation!!! */ -int handle_shadow_invlpg(struct guest_info * info) { +int v3_handle_shadow_invlpg(struct guest_info * info) { if (info->mem_mode != VIRTUAL_MEM) { // Paging must be turned on... // should handle with some sort of fault I think @@ -658,13 +673,13 @@ int handle_shadow_invlpg(struct guest_info * info) { if (info->cpu_mode == PROTECTED) { - char instr[15]; + uchar_t instr[15]; int ret; int index = 0; ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr); if (ret != 15) { - PrintError("Could not read instruction 0x%x (ret=%d)\n", info->rip, ret); + PrintError("Could not read instruction 0x%p (ret=%d)\n", (void *)(info->rip), ret); return -1; } @@ -680,13 +695,13 @@ int handle_shadow_invlpg(struct guest_info * info) { addr_t first_operand; addr_t second_operand; - operand_type_t addr_type; - addr_t guest_cr3 = CR3_TO_PDE32(info->shdw_pg_state.guest_cr3); + v3_operand_type_t addr_type; + addr_t guest_cr3 = (addr_t)CR3_TO_PDE32(info->shdw_pg_state.guest_cr3); pde32_t * guest_pd = NULL; if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pd) == -1) { - PrintError("Invalid Guest PDE Address: 0x%x\n", guest_cr3); + PrintError("Invalid Guest PDE Address: 0x%p\n", (void *)guest_cr3); return -1; } @@ -715,7 +730,7 @@ int handle_shadow_invlpg(struct guest_info * info) { } else { if (shadow_pde->present == 1) { - pte32_t * shadow_pt = (pte32_t *)PDE32_T_ADDR((*shadow_pde)); + pte32_t * shadow_pt = (pte32_t *)(addr_t)PDE32_T_ADDR((*shadow_pde)); pte32_t * shadow_pte = (pte32_t *)&shadow_pt[PTE32_INDEX(first_operand)]; #ifdef DEBUG_SHADOW_PAGING