Palacios Public Git Repository

To checkout Palacios execute 

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute 
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.

projects / palacios.git / blobdiff
? search: re
summary | shortlog | log | commit | commitdiff | tree
raw
added symbiotic interface and a number of other small changes
[palacios.git] / palacios / src / palacios / vmm_shadow_paging_64.h
diff --git a/palacios/src/palacios/vmm_shadow_paging_64.h b/palacios/src/palacios/vmm_shadow_paging_64.h
index f0dcd31..421707a 100644 (file)
--- a/palacios/src/palacios/vmm_shadow_paging_64.h
+++ b/palacios/src/palacios/vmm_shadow_paging_64.h
@@ -96,7 +96,10 @@ static inline int handle_shadow_pagefault_64(struct guest_info * info, addr_t fa
     if (is_guest_pf(guest_pml4e_access, shadow_pml4e_access) == 1) {
        PrintDebug("Injecting PML4E pf to guest: (guest access error=%d) (pf error code=%d)\n", 
                   *(uint_t *)&guest_pml4e_access, *(uint_t *)&error_code);
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        return 0;
     }
 
@@ -106,12 +109,18 @@ static inline int handle_shadow_pagefault_64(struct guest_info * info, addr_t fa
        //      
        PrintDebug("Shadow Paging User access error (shadow_pml4e_access=0x%x, guest_pml4e_access=0x%x)\n", 
                   shadow_pml4e_access, guest_pml4e_access);
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        return 0;
     } else if ((shadow_pml4e_access != PT_ACCESS_NOT_PRESENT) &&
               (shadow_pml4e_access != PT_ACCESS_OK)) {
        // inject page fault in guest
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        PrintDebug("Unknown Error occurred (shadow_pde_access=%d)\n", shadow_pml4e_access);
        PrintDebug("Manual Says to inject page fault into guest\n");
        return 0;
@@ -131,11 +140,8 @@ static inline int handle_shadow_pagefault_64(struct guest_info * info, addr_t fa
        shadow_pml4e->present = 1;
        shadow_pml4e->user_page = guest_pml4e->user_page;
        shadow_pml4e->writable = guest_pml4e->writable;
-    
-       // VMM Specific options
-       shadow_pml4e->write_through = 0;
-       shadow_pml4e->cache_disable = 0;
-       //
+       shadow_pml4e->cache_disable = guest_pml4e->cache_disable;
+       shadow_pml4e->write_through = guest_pml4e->write_through;
     
        guest_pml4e->accessed = 1;
     
@@ -148,7 +154,7 @@ static inline int handle_shadow_pagefault_64(struct guest_info * info, addr_t fa
 
     if (guest_pa_to_host_va(info, BASE_TO_PAGE_ADDR(guest_pml4e->pdp_base_addr), (addr_t *)&guest_pdp) == -1) {
        // Machine check the guest
-       PrintDebug("Invalid Guest PDP Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pml4e->pdp_base_addr));
+       PrintError("Invalid Guest PDP Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pml4e->pdp_base_addr));
        v3_raise_exception(info, MC_EXCEPTION);
        return 0;
     }
@@ -190,7 +196,10 @@ static int handle_pdpe_shadow_pagefault_64(struct guest_info * info, addr_t faul
     if (is_guest_pf(guest_pdpe_access, shadow_pdpe_access) == 1) {
        PrintDebug("Injecting PDPE pf to guest: (guest access error=%d) (pf error code=%d)\n", 
                   *(uint_t *)&guest_pdpe_access, *(uint_t *)&error_code);
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        return 0;
     }
 
@@ -200,12 +209,18 @@ static int handle_pdpe_shadow_pagefault_64(struct guest_info * info, addr_t faul
        //      
        PrintDebug("Shadow Paging User access error (shadow_pdpe_access=0x%x, guest_pdpe_access=0x%x)\n", 
                   shadow_pdpe_access, guest_pdpe_access);
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        return 0;
     } else if ((shadow_pdpe_access != PT_ACCESS_NOT_PRESENT) &&
               (shadow_pdpe_access != PT_ACCESS_OK)) {
        // inject page fault in guest
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        PrintDebug("Unknown Error occurred (shadow_pde_access=%d)\n", shadow_pdpe_access);
        PrintDebug("Manual Says to inject page fault into guest\n");
        return 0;
@@ -225,11 +240,9 @@ static int handle_pdpe_shadow_pagefault_64(struct guest_info * info, addr_t faul
        shadow_pdpe->present = 1;
        shadow_pdpe->user_page = guest_pdpe->user_page;
        shadow_pdpe->writable = guest_pdpe->writable;
-    
-       // VMM Specific options
-       shadow_pdpe->write_through = 0;
-       shadow_pdpe->cache_disable = 0;
-       //
+       shadow_pdpe->write_through = guest_pdpe->write_through;
+       shadow_pdpe->cache_disable = guest_pdpe->cache_disable;
+
     
        guest_pdpe->accessed = 1;
     
@@ -242,7 +255,7 @@ static int handle_pdpe_shadow_pagefault_64(struct guest_info * info, addr_t faul
 
     if (guest_pa_to_host_va(info, BASE_TO_PAGE_ADDR(guest_pdpe->pd_base_addr), (addr_t *)&guest_pd) == -1) {
        // Machine check the guest
-       PrintDebug("Invalid Guest PTE Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pdpe->pd_base_addr));
+       PrintError("Invalid Guest PTE Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pdpe->pd_base_addr));
        v3_raise_exception(info, MC_EXCEPTION);
        return 0;
     }
@@ -275,7 +288,10 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
     if (is_guest_pf(guest_pde_access, shadow_pde_access) == 1) {
        PrintDebug("Injecting PDE pf to guest: (guest access error=%d) (pf error code=%d)\n", 
                   *(uint_t *)&guest_pde_access, *(uint_t *)&error_code);
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        return 0;
     }
 
@@ -285,7 +301,10 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
        //      
        PrintDebug("Shadow Paging User access error (shadow_pdpe_access=0x%x, guest_pdpe_access=0x%x)\n", 
                   shadow_pde_access, guest_pde_access);
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        return 0;
 
     } else if ((shadow_pde_access == PT_ACCESS_WRITE_ERROR) && 
@@ -301,7 +320,10 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
     } else if ((shadow_pde_access != PT_ACCESS_NOT_PRESENT) &&
               (shadow_pde_access != PT_ACCESS_OK)) {
        // inject page fault in guest
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        PrintDebug("Unknown Error occurred (shadow_pde_access=%d)\n", shadow_pde_access);
        PrintDebug("Manual Says to inject page fault into guest\n");
        return 0;
@@ -339,9 +361,9 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
        }
     
        // VMM Specific options
-       shadow_pde->write_through = 0;
-       shadow_pde->cache_disable = 0;
-       shadow_pde->global_page = 0;
+       shadow_pde->write_through = guest_pde->write_through;
+       shadow_pde->cache_disable = guest_pde->cache_disable;
+       shadow_pde->global_page = guest_pde->global_page;
        //
     
        guest_pde->accessed = 1;
@@ -355,7 +377,7 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
     if (guest_pde->large_page == 0) {
        if (guest_pa_to_host_va(info, BASE_TO_PAGE_ADDR(guest_pde->pt_base_addr), (addr_t *)&guest_pt) == -1) {
            // Machine check the guest
-           PrintDebug("Invalid Guest PTE Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pde->pt_base_addr));
+           PrintError("Invalid Guest PTE Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pde->pt_base_addr));
            v3_raise_exception(info, MC_EXCEPTION);
            return 0;
        }
@@ -390,10 +412,9 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * info, addr_t fault
 
 
 
-    if ((shdw_reg == NULL) || 
-       (shdw_reg->host_type == SHDW_REGION_INVALID)) {
+    if (shdw_reg == NULL) {
        // Inject a machine check in the guest
-       PrintDebug("Invalid Guest Address in page table (0x%p)\n", (void *)guest_pa);
+       PrintError("Invalid Guest Address in page table (0x%p)\n", (void *)guest_pa);
        v3_raise_exception(info, MC_EXCEPTION);
        return 0;
     }
@@ -406,9 +427,15 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * info, addr_t fault
 
     /* Was the page fault caused by the Guest's page tables? */
     if (is_guest_pf(guest_pte_access, shadow_pte_access) == 1) {
+
        PrintDebug("Access error injecting pf to guest (guest access error=%d) (pf error code=%d)\n", 
                   guest_pte_access, *(uint_t*)&error_code);    
-       inject_guest_pf(info, fault_addr, error_code);
+
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
+
        return 0; 
     }
 
@@ -435,9 +462,9 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * info, addr_t fault
            shadow_pte->user_page = guest_pte->user_page;
       
            //set according to VMM policy
-           shadow_pte->write_through = 0;
-           shadow_pte->cache_disable = 0;
-           shadow_pte->global_page = 0;
+           shadow_pte->write_through = guest_pte->write_through;
+           shadow_pte->cache_disable = guest_pte->cache_disable;
+           shadow_pte->global_page = guest_pte->global_page;
            //
       
            guest_pte->accessed = 1;
@@ -451,15 +478,6 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * info, addr_t fault
                shadow_pte->writable = 0;
            }
 
-           // dirty flag has been set, check if its in the cache
-           /*       if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_pa)) != NULL) { */
-           /*  if (error_code.write == 1) { */
-           /*    state->cached_cr3 = 0; */
-           /*    shadow_pte->writable = guest_pte->writable; */
-           /*  } else { */
-           /*    shadow_pte->writable = 0; */
-           /*  } */
-           /*       } */
 
            // Write hooks trump all, and are set Read Only
            if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) {
@@ -487,17 +505,15 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * info, addr_t fault
            shadow_pte->writable = guest_pte->writable;
        }
 
-       /*     if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_pa)) != NULL) { */
-       /*       struct shadow_page_state * state = &(info->shdw_pg_state); */
-       /*       PrintDebug("Write operation on Guest PAge Table Page\n"); */
-       /*       state->cached_cr3 = 0; */
-       /*     } */
 
        return 0;
 
     } else {
        // Inject page fault into the guest     
-       inject_guest_pf(info, fault_addr, error_code);
+       if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+           PrintError("Could not inject guest page fault\n");
+           return -1;
+       }
        PrintError("PTE Page fault fell through... Not sure if this should ever happen\n");
        PrintError("Manual Says to inject page fault into guest\n");
        return -1;
@@ -523,12 +539,11 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * info,
     struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info, guest_fault_pa);
 
  
-    if ((shdw_reg == NULL) || 
-       (shdw_reg->host_type == SHDW_REGION_INVALID)) {
+    if (shdw_reg == NULL) {
        // Inject a machine check in the guest
-       PrintDebug("Invalid Guest Address in page table (0x%p)\n", (void *)guest_fault_pa);
+       PrintError("Invalid Guest Address in page table (0x%p)\n", (void *)guest_fault_pa);
        v3_raise_exception(info, MC_EXCEPTION);
-       return -1;
+       return 0;
     }
 
     if (shadow_pte_access == PT_ACCESS_OK) {
@@ -547,10 +562,7 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * info,
            (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK)) {
            addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, guest_fault_pa);
 
-           PrintDebug("Shadow PA=%p, ShadowPTE=%p\n", (void *)shadow_pa, (void *)shadow_pte);
-
            shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa);
-           PrintDebug("Test1\n");
 
            shadow_pte->present = 1;
 
@@ -561,28 +573,19 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * info,
             */
            shadow_pte->user_page = 1;
 
-
-
-           /*       if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_fault_pa)) != NULL) { */
-           /*  // Check if the entry is a page table... */
-                /*     PrintDebug("Marking page as Guest Page Table (large page)\n"); */
-                /*     shadow_pte->writable = 0; */
-                /*       } else */ if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) {
+           if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) {
                shadow_pte->writable = 0;
            } else {
                shadow_pte->writable = 1;
            }
 
            //set according to VMM policy
-           shadow_pte->write_through = 0;
-           shadow_pte->cache_disable = 0;
-           shadow_pte->global_page = 0;
+           shadow_pte->write_through = large_guest_pde->write_through;
+           shadow_pte->cache_disable = large_guest_pde->cache_disable;
+           shadow_pte->global_page = large_guest_pde->global_page;
            //
       
        } else {
-           // Handle hooked pages as well as other special pages
-           //      if (handle_special_page_fault(info, fault_addr, guest_fault_pa, error_code) == -1) {
-
            if (v3_handle_mem_full_hook(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
                PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
                return -1;
@@ -598,14 +601,6 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * info,
            }
        }
 
-
-       /*     if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_fault_pa)) != NULL) { */
-       /*       struct shadow_page_state * state = &(info->shdw_pg_state); */
-       /*       PrintDebug("Write operation on Guest PAge Table Page (large page)\n"); */
-       /*       state->cached_cr3 = 0; */
-       /*       shadow_pte->writable = 1; */
-       /*     } */
-
     } else {
        PrintError("Error in large page fault handler...\n");
        PrintError("This case should have been handled at the top level handler\n");
Public Palacios Development Repository for the V3VEE Project