X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_sym_swap.c;h=72a8b4315f7eef4677357a49d4b3a53720ec8f4c;hb=b8e77690b473b3ac50c5fef0a32d1710a2e8a1d9;hp=0fbb853f1fc2426da5fcdde409730388ef0b9f87;hpb=075786ef94c92a5ca5e3fae1ee60e6ec996566c4;p=palacios.git

diff --git a/palacios/src/palacios/vmm_sym_swap.c b/palacios/src/palacios/vmm_sym_swap.c
index 0fbb853..72a8b43 100644
--- a/palacios/src/palacios/vmm_sym_swap.c
+++ b/palacios/src/palacios/vmm_sym_swap.c
@@ -70,27 +70,28 @@ static inline uint32_t get_dev_index(pte32_t * pte) {
 
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
-static void telemetry_cb(struct guest_info * info, void * private_data, char * hdr) {
-    struct v3_sym_swap_state * swap_state = &(info->swap_state);
+static void telemetry_cb(struct v3_vm_info * vm, void * private_data, char * hdr) {
+    struct v3_sym_swap_state * swap_state = &(vm->swap_state);
 
     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
 
 
-int v3_init_sym_swap(struct guest_info * info) {
-    struct v3_sym_swap_state * swap_state = &(info->swap_state);
+int v3_init_sym_swap(struct v3_vm_info * vm) {
+    struct v3_sym_swap_state * swap_state = &(vm->swap_state);
 
     memset(swap_state, 0, sizeof(struct v3_sym_swap_state));
     swap_state->shdw_ptr_ht = v3_create_htable(0, swap_hash_fn, swap_eq_fn);
 
 #ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
-    if (info->enable_telemetry) {
-	v3_add_telemetry_cb(info, telemetry_cb, NULL);
+    if (vm->enable_telemetry) {
+	v3_add_telemetry_cb(vm, telemetry_cb, NULL);
     }
 #endif
 
@@ -100,9 +101,9 @@ int v3_init_sym_swap(struct guest_info * info) {
 }
 
 
-int v3_register_swap_disk(struct guest_info * info, int dev_index, 
+int v3_register_swap_disk(struct v3_vm_info * vm, int dev_index, 
 			  struct v3_swap_ops * ops, void * private_data) {
-    struct v3_sym_swap_state * swap_state = &(info->swap_state);
+    struct v3_sym_swap_state * swap_state = &(vm->swap_state);
 
     swap_state->devs[dev_index].present = 1;
     swap_state->devs[dev_index].private_data = private_data;
@@ -114,9 +115,9 @@ int v3_register_swap_disk(struct guest_info * info, int dev_index,
 
 
 
-int v3_swap_in_notify(struct guest_info * info, int pg_index, int dev_index) {
+int v3_swap_in_notify(struct v3_vm_info * vm, int pg_index, int dev_index) {
     struct list_head * shdw_ptr_list = NULL;
-    struct v3_sym_swap_state * swap_state = &(info->swap_state);
+    struct v3_sym_swap_state * swap_state = &(vm->swap_state);
     struct shadow_pointer * tmp_shdw_ptr = NULL;
     struct shadow_pointer * shdw_ptr = NULL;
     struct swap_pte guest_pte = {0, dev_index, pg_index};
@@ -145,8 +146,8 @@ int v3_swap_in_notify(struct guest_info * info, int pg_index, int dev_index) {
 
 
 
-int v3_swap_flush(struct guest_info * info) {
-    struct v3_sym_swap_state * swap_state = &(info->swap_state);
+int v3_swap_flush(struct v3_vm_info * vm) {
+    struct v3_sym_swap_state * swap_state = &(vm->swap_state);
     struct hashtable_iter * ht_iter = v3_create_htable_iter(swap_state->shdw_ptr_ht);
 
     //    PrintDebug("Flushing Symbiotic Swap table\n");
@@ -168,7 +169,7 @@ 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 (shadw_ptr == NULL) {
+	    if (shdw_ptr == NULL) {
 		PrintError("Null shadow pointer in swap flush!! Probably crashing soon...\n");
 	    }
 
@@ -183,11 +184,13 @@ int v3_swap_flush(struct guest_info * info) {
 	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) {
-    uint32_t pte_val = *(uint32_t *)guest_pte;
+    uint64_t pte_val = (uint64_t)*(uint32_t *)guest_pte;
 
     // 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) {
@@ -195,31 +198,40 @@ int v3_get_vaddr_perms(struct guest_info * info, addr_t vaddr, pte32_t * guest_p
 	return -1;
     }
 
-    V3_Print("page perms = %x\n", *(uint32_t *)page_perms);
+    //    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;
-    struct v3_sym_swap_state * swap_state = &(info->swap_state);
-    struct shadow_pointer * shdw_ptr = NULL;
-    void * swp_page_ptr = NULL;
+addr_t v3_get_swapped_pg_addr(struct v3_vm_info * vm, pte32_t * guest_pte) {
+    struct v3_sym_swap_state * swap_state = &(vm->swap_state);
     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;
     }
 
+    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 v3_vm_info * vm, 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 = &(vm->swap_state);
+    struct shadow_pointer * shdw_ptr = NULL;
 
 
-    swp_page_ptr = swp_dev->ops->get_swap_entry(get_pg_index(guest_pte), swp_dev->private_data);
 
     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;
     }
 
@@ -227,12 +239,23 @@ 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 *));
+#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
+	swap_state->list_size++;
+#endif
 	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");
+#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
+	telemetry_cb(vm, NULL, "");
+#endif
+	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);
@@ -243,3 +266,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;
+}
+
+
+*/