From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Thu, 20 Aug 2009 22:00:03 +0000 (-0500)
Subject: symbiotic swap updates
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=316c417125ed34aaa60f9fc5486a6d8dec4fb361

symbiotic swap updates
maps in readonly with user flag setting
---

diff --git a/palacios/src/palacios/vmm_shadow_paging.c b/palacios/src/palacios/vmm_shadow_paging.c
index e43a969..eeb493b 100644
--- a/palacios/src/palacios/vmm_shadow_paging.c
+++ b/palacios/src/palacios/vmm_shadow_paging.c
@@ -273,12 +273,19 @@ static int is_guest_pf(pt_access_status_t guest_access, pt_access_status_t shado
 	    return 1;
 	}
 
-	if ((shadow_access == PT_ACCESS_NOT_PRESENT) &&
-	    (guest_access == PT_ACCESS_NOT_PRESENT)) {
+	/*
+	  if ((shadow_access == PT_ACCESS_NOT_PRESENT) &&
+	  (guest_access == PT_ACCESS_NOT_PRESENT)) {
+	  // Page tables completely blank, handle guest first
+	  return 1;
+	  }
+	*/
+
+	if (guest_access == PT_ACCESS_NOT_PRESENT) {
 	    // Page tables completely blank, handle guest first
 	    return 1;
 	}
-
+	
 	// Otherwise we'll handle the guest fault later...?
     }
 
diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h
index 2760400..03e1f7a 100644
--- a/palacios/src/palacios/vmm_shadow_paging_32.h
+++ b/palacios/src/palacios/vmm_shadow_paging_32.h
@@ -229,7 +229,7 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 	PrintDebug("Access error injecting pf to guest (guest access error=%d) (pf error code=%d)\n", 
 		   guest_pte_access, *(uint_t*)&error_code);
 #ifdef CONFIG_SYMBIOTIC_SWAP
-	if (is_swapped_pte32(guest_pte)) {
+	if ((error_code.write == 0) && (is_swapped_pte32(guest_pte))) {
 	    PrintError("Page fault on swapped out page (pte=%x)\n", *(uint32_t *)guest_pte);
 
  	    addr_t swp_pg_addr = v3_get_swapped_pg_addr(info, shadow_pte, guest_pte);
@@ -245,13 +245,20 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 		 */
 		
 		/* We need some way to check permissions.... */
-
+		
 		shadow_pte->accessed = 1;
-		shadow_pte->writable = 1;
+		shadow_pte->writable = 0;
+
+		if (fault_addr & 0xc0000000) {
+		    shadow_pte->user_page = 0;
+		} else {
+		    shadow_pte->user_page = 1;
+		}
+
 		shadow_pte->write_through = 0;
 		shadow_pte->cache_disable = 0;
 		shadow_pte->global_page = 0;
-		shadow_pte->user_page = 1;
+	
 		shadow_pte->present = 1;
 		
 		shadow_pte->page_base_addr = swp_pg_addr;
diff --git a/palacios/src/palacios/vmm_sym_swap.c b/palacios/src/palacios/vmm_sym_swap.c
index 216894a..c22937c 100644
--- a/palacios/src/palacios/vmm_sym_swap.c
+++ b/palacios/src/palacios/vmm_sym_swap.c
@@ -174,6 +174,7 @@ addr_t v3_get_swapped_pg_addr(struct guest_info * info, pte32_t * shadow_pte, pt
     if (shdw_ptr_list == NULL) {
 	shdw_ptr_list = (struct list_head *)V3_Malloc(sizeof(struct list_head *));
 	INIT_LIST_HEAD(shdw_ptr_list);
+	v3_htable_insert(swap_state->shdw_ptr_ht, (addr_t)*(uint32_t *)guest_pte, (addr_t)shdw_ptr_list);
     }
 
     shdw_ptr = (struct shadow_pointer *)V3_Malloc(sizeof(struct shadow_pointer));