From: Jack Lange Date: Fri, 21 Aug 2009 21:20:30 +0000 (-0500) Subject: added symbiotic swap telemetry data X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=449bf14185a1b3e2db53855b14e0e3ef3a803fd9 added symbiotic swap telemetry data --- diff --git a/palacios/include/palacios/vmm_sym_swap.h b/palacios/include/palacios/vmm_sym_swap.h index 6bb3788..4e5f9cc 100644 --- a/palacios/include/palacios/vmm_sym_swap.h +++ b/palacios/include/palacios/vmm_sym_swap.h @@ -45,6 +45,12 @@ struct v3_swap_dev { struct v3_sym_swap_state { struct v3_swap_dev devs[256]; +#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY + uint32_t read_faults; + uint32_t write_faults; + uint32_t flushes; +#endif + // shadow pointers struct hashtable * shdw_ptr_ht; }; diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h index 03e1f7a..b6ac424 100644 --- a/palacios/src/palacios/vmm_shadow_paging_32.h +++ b/palacios/src/palacios/vmm_shadow_paging_32.h @@ -228,53 +228,62 @@ 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 ((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); + if (is_swapped_pte32(guest_pte)) { - if (swp_pg_addr == 0) { - if (inject_guest_pf(info, fault_addr, error_code) == -1) { - PrintError("Could not inject guest page fault\n"); - return -1; - } +#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY + if (error_code.write == 0) { + info->swap_state.read_faults++; } else { - /* - * Setup shadow paging state - */ + info->swap_state.write_faults++; + } +#endif + if (error_code.write == 0) { + PrintError("Page fault on swapped out page (pte=%x) (error_code=%x)\n", *(uint32_t *)guest_pte, *(uint32_t *)&error_code); - /* We need some way to check permissions.... */ + addr_t swp_pg_addr = v3_get_swapped_pg_addr(info, shadow_pte, guest_pte); - shadow_pte->accessed = 1; - shadow_pte->writable = 0; - - if (fault_addr & 0xc0000000) { - shadow_pte->user_page = 0; + if (swp_pg_addr == 0) { + if (inject_guest_pf(info, fault_addr, error_code) == -1) { + PrintError("Could not inject guest page fault\n"); + return -1; + } } else { - shadow_pte->user_page = 1; + /* + * Setup shadow paging state + */ + + /* We need some way to check permissions.... */ + + shadow_pte->accessed = 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->present = 1; + + shadow_pte->page_base_addr = swp_pg_addr; } - - shadow_pte->write_through = 0; - shadow_pte->cache_disable = 0; - shadow_pte->global_page = 0; - - shadow_pte->present = 1; - shadow_pte->page_base_addr = swp_pg_addr; - } - } else { - if (inject_guest_pf(info, fault_addr, error_code) == -1) { - PrintError("Could not inject guest page fault\n"); - return -1; + return 0; } } -#else +#endif + + if (inject_guest_pf(info, fault_addr, error_code) == -1) { PrintError("Could not inject guest page fault\n"); return -1; - } -#endif + } return 0; } diff --git a/palacios/src/palacios/vmm_sym_swap.c b/palacios/src/palacios/vmm_sym_swap.c index c22937c..1650c4e 100644 --- a/palacios/src/palacios/vmm_sym_swap.c +++ b/palacios/src/palacios/vmm_sym_swap.c @@ -23,6 +23,10 @@ #include +#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY +#include +#endif + // This is a hack and 32 bit linux specific.... need to fix... struct swap_pte { uint32_t present : 1; @@ -65,9 +69,29 @@ 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) { + struct v3_sym_swap_state * swap_state = &(info->swap_state); + + V3_Print("Symbiotic Swap:\n"); + V3_Print("\tRead faults=%d\n", swap_state->read_faults); + V3_Print("\tWrite faults=%d\n", swap_state->write_faults); + V3_Print("\tFlushes=%d\n", swap_state->flushes); +} +#endif + + int v3_init_sym_swap(struct guest_info * info) { - memset(&(info->swap_state), 0, sizeof(struct v3_sym_swap_state)); - info->swap_state.shdw_ptr_ht = v3_create_htable(0, swap_hash_fn, swap_eq_fn); + struct v3_sym_swap_state * swap_state = &(info->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); + } +#endif PrintDebug("Initialized Symbiotic Swap\n"); @@ -126,6 +150,10 @@ int v3_swap_flush(struct guest_info * info) { PrintDebug("Flushing Symbiotic Swap table\n"); +#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY + swap_state->flushes++; +#endif + while (ht_iter->entry) { struct shadow_pointer * tmp_shdw_ptr = NULL; struct shadow_pointer * shdw_ptr = NULL; diff --git a/palacios/src/palacios/vmm_telemetry.c b/palacios/src/palacios/vmm_telemetry.c index 906f2ef..e69af85 100644 --- a/palacios/src/palacios/vmm_telemetry.c +++ b/palacios/src/palacios/vmm_telemetry.c @@ -26,7 +26,7 @@ #ifdef CONFIG_TELEMETRY_GRANULARITY #define DEFAULT_GRANULARITY CONFIG_TELEMETRY_GRANULARITY #else -#define DEFAULT_GRANULARITY 5000 +#define DEFAULT_GRANULARITY 20000 #endif