From: Steven Jaconette Date: Mon, 23 Feb 2009 05:44:04 +0000 (-0600) Subject: changes to direct passthrough pagefault handlers X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=a568601e28c34c590815d1d2a16e85fbca352ebd changes to direct passthrough pagefault handlers --- diff --git a/palacios/include/palacios/vmm_direct_paging.h b/palacios/include/palacios/vmm_direct_paging.h index 00eac31..3bae7e3 100644 --- a/palacios/include/palacios/vmm_direct_paging.h +++ b/palacios/include/palacios/vmm_direct_paging.h @@ -1,3 +1,23 @@ +/* + * 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, Steven Jaconette + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Steven Jaconette + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #ifndef __VMM_DIRECT_PAGING_H__ #define __VMM_DIRECT_PAGING_H__ @@ -6,7 +26,7 @@ #include #include -pde32_t * v3_create_direct_passthrough_pts(struct guest_info * guest_info); +addr_t v3_create_direct_passthrough_pts(struct guest_info * guest_info); int v3_handle_passthrough_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code); diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c index 9fd33ce..674be35 100644 --- a/palacios/src/palacios/svm.c +++ b/palacios/src/palacios/svm.c @@ -242,7 +242,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) { /* Testing 64 bit page tables for long paged real mode guests */ // vm_info->direct_map_pt = (addr_t)V3_PAddr(create_passthrough_pts_64(vm_info)); - vm_info->direct_map_pt = (addr_t)V3_PAddr(v3_create_direct_passthrough_pts(vm_info)); + vm_info->direct_map_pt = (addr_t)V3_PAddr((void *)v3_create_direct_passthrough_pts(vm_info)); /* End Test */ vm_info->shdw_pg_state.guest_cr0 = 0x0000000000000010LL; diff --git a/palacios/src/palacios/vmm_direct_paging.c b/palacios/src/palacios/vmm_direct_paging.c index 44742cb..df873bc 100644 --- a/palacios/src/palacios/vmm_direct_paging.c +++ b/palacios/src/palacios/vmm_direct_paging.c @@ -1,31 +1,44 @@ +/* + * 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, Steven Jaconette + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Steven Jaconette + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include #include #include #include #include +static addr_t create_generic_pt_page() { + void * page = 0; + page = V3_VAddr(V3_AllocPages(1)); + memset(page, 0, PAGE_SIZE); + return (addr_t)page; +} // Inline handler functions for each cpu mode #include "vmm_direct_paging_32.h" +#include "vmm_direct_paging_32pae.h" -pde32_t * v3_create_direct_passthrough_pts(struct guest_info * info) { - v3_vm_cpu_mode_t mode = v3_get_cpu_mode(info); - switch(mode) { - case REAL: - case PROTECTED: - return create_direct_passthrough_pts_32(info); - case PROTECTED_PAE: - break; - case LONG: - break; - case LONG_32_COMPAT: - break; - default: - PrintError("Unknown CPU Mode\n"); - break; - } - return NULL; + +addr_t v3_create_direct_passthrough_pts(struct guest_info * info) { + return create_generic_pt_page(); } int v3_handle_passthrough_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) { @@ -36,7 +49,7 @@ int v3_handle_passthrough_pagefault(struct guest_info * info, addr_t fault_addr, case PROTECTED: return handle_passthrough_pagefault_32(info, fault_addr, error_code); case PROTECTED_PAE: - break; + return handle_passthrough_pagefault_32pae(info, fault_addr, error_code); case LONG: break; case LONG_32_COMPAT: diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h index 2b34cf2..ff421bc 100644 --- a/palacios/src/palacios/vmm_direct_paging_32.h +++ b/palacios/src/palacios/vmm_direct_paging_32.h @@ -1,3 +1,24 @@ +/* + * 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, Steven Jaconette + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Steven Jaconette + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + + #ifndef __VMM_DIRECT_PAGING_32_H__ #define __VMM_DIRECT_PAGING_32_H__ @@ -7,84 +28,76 @@ #include #include -static pde32_t * create_pde32() { - void * pde = 0; - pde = V3_VAddr(V3_AllocPages(1)); - memset(pde, 0, PAGE_SIZE); - - return (pde32_t *) pde; -} - - -static pte32_t * create_pte32() { - void * pte = 0; - pte = V3_VAddr(V3_AllocPages(1)); - memset(pte, 0, PAGE_SIZE); - - return (pte32_t *) pte; -} - - -static inline pde32_t * create_direct_passthrough_pts_32(struct guest_info * info) { - return create_pde32(); -} - static inline int handle_passthrough_pagefault_32(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) { // Check to see if pde and pte exist (create them if not) pde32_t * pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3); + pte32_t * pte = NULL; + addr_t host_addr = 0; + int pde_index = PDE32_INDEX(fault_addr); int pte_index = PTE32_INDEX(fault_addr); - if (pde[pde_index].present != 1) { - - PrintError("Creating new page table for PTE index: %d\n", pde_index); - - pte32_t * pte = create_pte32(); - addr_t host_addr; + struct v3_shadow_region * region = v3_get_shadow_region(info, fault_addr); - if(guest_pa_to_host_pa(info, fault_addr, &host_addr) == -1) return -1; + if ((region == NULL) || + (region->host_type == SHDW_REGION_INVALID)) { + PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", + (void *)fault_addr); + return -1; + } - struct v3_shadow_region * region = v3_get_shadow_region(info, PAGE_BASE_ADDR(host_addr)); + host_addr = v3_get_shadow_addr(region, fault_addr); - pte[pte_index].present = 1; - pte[pte_index].writable = 1; - pte[pte_index].user_page = 1; - pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr); + // Fix up the PDE entry + if (pde[pde_index].present == 0) { + pte = (pte32_t *)create_generic_pt_page(); pde[pde_index].present = 1; pde[pde_index].writable = 1; pde[pde_index].user_page = 1; pde[pde_index].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte)); - - if (region->host_type == SHDW_REGION_WRITE_HOOK) { - pte[pte_index].writable = 0; - } - - PrintError("Fault Addr: 0x%p\nHost Addr: 0x%p\n", (void*)fault_addr, (void*)host_addr); - + } else { - pte32_t * pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr)); - - if (pte[pte_index].present != 1) { - addr_t host_addr; - - if (guest_pa_to_host_pa(info, fault_addr, &host_addr) == -1) return -1; - - struct v3_shadow_region * region = v3_get_shadow_region(info, PAGE_BASE_ADDR(host_addr)); - + pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr)); + } + + // Fix up the PTE entry + if (pte[pte_index].present == 0) { + + pte[pte_index].user_page = 1; + + if (region->host_type == SHDW_REGION_ALLOCATED) { + // Full access pte[pte_index].present = 1; pte[pte_index].writable = 1; - pte[pte_index].user_page = 1; + pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr); - - if (region->host_type == SHDW_REGION_WRITE_HOOK) { - pte[pte_index].writable = 0; - } + } else if (region->host_type == SHDW_REGION_WRITE_HOOK) { + // Only trap writes + pte[pte_index].present = 1; + pte[pte_index].writable = 0; + + pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr); + } else if (region->host_type == SHDW_REGION_FULL_HOOK) { + // trap all accesses + return v3_handle_mem_full_hook(info, fault_addr, fault_addr, region, error_code); + } else { + PrintError("Unknown Region Type...\n"); + return -1; + } + } else { + if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && + (error_code.write == 1) ) { + return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code); + } else { + PrintError("Weird...\n"); + return -1; } } + return 0; } diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h new file mode 100644 index 0000000..7396d9b --- /dev/null +++ b/palacios/src/palacios/vmm_direct_paging_32pae.h @@ -0,0 +1,120 @@ +/* + * 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, Steven Jaconette + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Steven Jaconette + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + +#ifndef __VMM_DIRECT_PAGING_32PAE_H__ +#define __VMM_DIRECT_PAGING_32PAE_H__ + +#include +#include +#include +#include +#include + + +static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, + addr_t fault_addr, + pf_error_t error_code) { + pdpe32pae_t * pdpe = CR3_TO_PDPE32PAE_VA(info->ctrl_regs.cr3); + pde32pae_t * pde = NULL; + pte32pae_t * pte = NULL; + addr_t host_addr = 0; + + int pdpe_index = PDPE32PAE_INDEX(fault_addr); + int pde_index = PDE32PAE_INDEX(fault_addr); + int pte_index = PTE32PAE_INDEX(fault_addr); + + struct v3_shadow_region * region = v3_get_shadow_region(info, fault_addr); + + if ((region == NULL) || + (region->host_type == SHDW_REGION_INVALID)) { + PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", + (void *)fault_addr); + return -1; + } + + host_addr = v3_get_shadow_addr(region, fault_addr); + + // Fix up the PDPE entry + if (pdpe[pdpe_index].present == 0) { + pde = (pde32pae_t *)create_generic_pt_page(); + + pdpe[pdpe_index].present = 1; + // Set default PDPE Flags... + pdpe[pdpe_index].pd_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pde)); + } else { + pde = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pdpe[pdpe_index].pd_base_addr)); + } + + + // Fix up the PDE entry + if (pde[pde_index].present == 0) { + pte = (pte32pae_t *)create_generic_pt_page(); + + pde[pde_index].present = 1; + pde[pde_index].writable = 1; + pde[pde_index].user_page = 1; + + pde[pde_index].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte)); + } else { + pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr)); + } + + + // Fix up the PTE entry + if (pte[pte_index].present == 0) { + pte[pte_index].user_page = 1; + + if (region->host_type == SHDW_REGION_ALLOCATED) { + // Full access + pte[pte_index].present = 1; + pte[pte_index].writable = 1; + + pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr); + + } else if (region->host_type == SHDW_REGION_WRITE_HOOK) { + // Only trap writes + pte[pte_index].present = 1; + pte[pte_index].writable = 0; + + pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr); + + } else if (region->host_type == SHDW_REGION_FULL_HOOK) { + // trap all accesses + return v3_handle_mem_full_hook(info, fault_addr, fault_addr, region, error_code); + + } else { + PrintError("Unknown Region Type...\n"); + return -1; + } + } else { + if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && + (error_code.write == 1) ) { + return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code); + } else { + PrintError("Weird...\n"); + return -1; + } + } + + return 0; +} + + +#endif