X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_sym_swap.c;h=5e1aa8002b42fc111183721e808d3f39df62d9ce;hp=24f2869f2e4687a3536d9e8973e1d99e53ca9ca0;hb=0121a4503305424096e2b5c5bd3b6c3af2d813e5;hpb=4290e5f20a4ea5e5f32cb8228ac4d7446dc1021b

diff --git a/palacios/src/palacios/vmm_sym_swap.c b/palacios/src/palacios/vmm_sym_swap.c
index 24f2869..5e1aa80 100644
--- a/palacios/src/palacios/vmm_sym_swap.c
+++ b/palacios/src/palacios/vmm_sym_swap.c
@@ -21,7 +21,7 @@
 
 #include <palacios/vmm_sym_swap.h>
 #include <palacios/vmm_list.h>
-
+#include <palacios/vm_guest.h>
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
 #include <palacios/vmm_telemetry.h>
@@ -76,7 +76,9 @@ static void telemetry_cb(struct guest_info * info, void * private_data, char * h
     V3_Print("%sSymbiotic Swap:\n", hdr);
     V3_Print("%s\tRead faults=%d\n", hdr, swap_state->read_faults);
     V3_Print("%s\tWrite faults=%d\n", hdr, swap_state->write_faults);
+    V3_Print("%s\tMapped Pages=%d\n", hdr, swap_state->mapped_pages);
     V3_Print("%s\tFlushes=%d\n", hdr, swap_state->flushes);
+    V3_Print("%s\tlist size=%d\n", hdr, swap_state->list_size);
 }
 #endif
 
@@ -148,12 +150,16 @@ int v3_swap_flush(struct guest_info * info) {
     struct v3_sym_swap_state * swap_state = &(info->swap_state);
     struct hashtable_iter * ht_iter = v3_create_htable_iter(swap_state->shdw_ptr_ht);
 
-    PrintDebug("Flushing Symbiotic Swap table\n");
+    //    PrintDebug("Flushing Symbiotic Swap table\n");
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
     swap_state->flushes++;
 #endif
 
+    if (!ht_iter) {
+	PrintError("NULL iterator in swap flush!! Probably will crash soon...\n");
+    }
+
     while (ht_iter->entry) {
 	struct shadow_pointer * tmp_shdw_ptr = NULL;
 	struct shadow_pointer * shdw_ptr = NULL;
@@ -163,45 +169,69 @@ int v3_swap_flush(struct guest_info * info) {
 	// we can leave the list_head structures and reuse them for the next round
 	
 	list_for_each_entry_safe(shdw_ptr, tmp_shdw_ptr, shdw_ptr_list, node) {
+	    if (shdw_ptr == NULL) {
+		PrintError("Null shadow pointer in swap flush!! Probably crashing soon...\n");
+	    }
+
 	    // Trigger faults for next shadow access
 	    shdw_ptr->shadow_pte->present = 0;
 	    
 	    // Delete entry from list
 	    list_del(&(shdw_ptr->node));
-	    V3_Free(shdw_ptr);	    
+	    V3_Free(shdw_ptr);
 	}
 
 	v3_htable_iter_advance(ht_iter);
     }
 
+    V3_Free(ht_iter);
+
     return 0;
 }
 
+int v3_get_vaddr_perms(struct guest_info * info, addr_t vaddr, pte32_t * guest_pte, pf_error_t * page_perms) {
+    uint64_t pte_val = (uint64_t)*(uint32_t *)guest_pte;
 
-int v3_sym_get_addr_info(struct guest_info * info, addr_t vaddr,
-			    int (*cb)(struct guest_info * info)) {
-    return 0;
+    // symcall to check if page is in cache or on swap disk
+    if (v3_sym_call3(info, SYMCALL_MEM_LOOKUP, (uint64_t *)&vaddr, (uint64_t *)&pte_val, (uint64_t *)page_perms) == -1) {
+	PrintError("Sym call error?? that's weird... \n");
+	return -1;
+    }
+
+    //    V3_Print("page perms = %x\n", *(uint32_t *)page_perms);
+
+    if (vaddr == 0) {
+	return 1;
+    }
 
+    return 0;
 }
 
 
 
-addr_t v3_get_swapped_pg_addr(struct guest_info * info, pte32_t * shadow_pte, pte32_t * guest_pte) {
-    struct list_head * shdw_ptr_list = NULL;
+addr_t v3_get_swapped_pg_addr(struct guest_info * info, pte32_t * guest_pte) {
     struct v3_sym_swap_state * swap_state = &(info->swap_state);
-    struct shadow_pointer * shdw_ptr = NULL;
-    void * swp_page_ptr = NULL;
     int dev_index = get_dev_index(guest_pte);
     struct v3_swap_dev * swp_dev = &(swap_state->devs[dev_index]);
 
+
     if (! swp_dev->present ) {
 	return 0;
     }
 
-    swp_page_ptr = swp_dev->ops->get_swap_entry(get_pg_index(guest_pte), swp_dev->private_data);
+    return (addr_t)swp_dev->ops->get_swap_entry(get_pg_index(guest_pte), swp_dev->private_data);
+}
+
+
+addr_t v3_map_swp_page(struct guest_info * info, pte32_t * shadow_pte, pte32_t * guest_pte, void * swp_page_ptr) {
+    struct list_head * shdw_ptr_list = NULL;
+    struct v3_sym_swap_state * swap_state = &(info->swap_state);
+    struct shadow_pointer * shdw_ptr = NULL;
+
+
 
     if (swp_page_ptr == NULL) {
-	PrintError("Swapped out page not found on swap device\n");
+	//	PrintError("Swapped out page not found on swap device\n");
 	return 0;
     }
 
@@ -209,12 +239,19 @@ 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 *));
+	swap_state->list_size++;
 	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));
 
+    if (shdw_ptr == NULL) {
+	PrintError("MEMORY LEAK\n");
+	telemetry_cb(info, NULL, "");
+	return 0;
+    }
+
     shdw_ptr->shadow_pte = shadow_pte;
     shdw_ptr->guest_pte = *(uint32_t *)guest_pte;
     shdw_ptr->pg_index = get_pg_index(guest_pte);
@@ -225,3 +262,23 @@ addr_t v3_get_swapped_pg_addr(struct guest_info * info, pte32_t * shadow_pte, pt
 
     return PAGE_BASE_ADDR((addr_t)V3_PAddr(swp_page_ptr));
 }
+
+
+
+/*
+int v3_is_mapped_fault(struct guest_info * info, pte32_t * shadow_pte, pte32_t * guest_pte) {
+    struct list_head * shdw_ptr_list = NULL;
+
+    shdw_ptr_list = (struct list_head * )v3_htable_search(swap_state->shdw_ptr_ht, *(addr_t *)&(guest_pte));
+
+
+    if (shdw_ptr_list != NULL) {
+	PrintError("We faulted on a mapped in page....\n");
+	return -1;
+    }
+    
+    return 0;
+}
+
+
+*/