X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_shadow_paging.h;h=22b0651481b692f8041bde41d89c62e93c4ed987;hb=1fc062adedda3f93f7f95395257a808c7b531fc9;hp=07c15f540a18ae12874f772b978f64f61b6c4b70;hpb=7cdedeb7a01b51c5242cce94924f2ea246008e7d;p=palacios.git

diff --git a/palacios/include/palacios/vmm_shadow_paging.h b/palacios/include/palacios/vmm_shadow_paging.h
index 07c15f5..22b0651 100644
--- a/palacios/include/palacios/vmm_shadow_paging.h
+++ b/palacios/include/palacios/vmm_shadow_paging.h
@@ -17,8 +17,8 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#ifndef __VMM_SHADOW_PAGING_H
-#define __VMM_SHADOW_PAGING_H
+#ifndef __VMM_SHADOW_PAGING_H__
+#define __VMM_SHADOW_PAGING_H__
 
 
 #ifdef __V3VEE__
@@ -26,51 +26,90 @@
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_paging.h>
 #include <palacios/vmm_hashtable.h>
+#include <palacios/vmm_list.h>
+#include <palacios/vmm_msr.h>
 
-struct shadow_page_state {
+#include <palacios/vmm_config.h>
 
-  // these two reflect the top-level page directory
-  // of the guest page table
-  paging_mode_t           guest_mode;
-  ullong_t                guest_cr3;         // points to guest's current page table
 
-  // Should this be here??
-  ullong_t guest_cr0;
+struct guest_info;
 
-  // these two reflect the top-level page directory 
-  // of the shadow page table
-  paging_mode_t           shadow_mode;
-  ullong_t                shadow_cr3;
+struct v3_shdw_pg_impl {
+    char * name;
+    int (*init)(struct v3_vm_info * vm, v3_cfg_tree_t * cfg);
+    int (*deinit)(struct v3_vm_info * vm);
+    int (*local_init)(struct guest_info * core);
+    int (*local_deinit)(struct guest_info * core);
+    int (*handle_pagefault)(struct guest_info * core, addr_t fault_addr, pf_error_t error_code);
+    int (*handle_invlpg)(struct guest_info * core, addr_t vaddr);
+    int (*activate_shdw_pt)(struct guest_info * core);
+    int (*invalidate_shdw_pt)(struct guest_info * core);
+};
 
 
-  // Hash table that ties a CR3 value to a hash table pointer for the PT entries
-  struct hashtable *  cr3_cache;
-  // Hash table that contains a mapping of guest pte addresses to host pte addresses
-  struct hashtable *  cached_ptes;
-  addr_t cached_cr3;
 
+struct v3_shdw_impl_state {
+    
+    struct v3_shdw_pg_impl * current_impl;
+    void * impl_data;
 };
 
+struct v3_shdw_pg_state {
+
+    // virtualized control registers
+    v3_reg_t guest_cr3;
+    v3_reg_t guest_cr0;
+    v3_msr_t guest_efer;
+
+    void * local_impl_data;
+
+#ifdef V3_CONFIG_SHADOW_PAGING_TELEMETRY
+    uint_t guest_faults;
+#endif
+
+};
 
 
-struct guest_info;
 
 
 
-int v3_cache_page_tables32(struct guest_info * info, addr_t  pde);
 
-int v3_init_shadow_page_state(struct guest_info * info);
+int v3_init_shdw_impl(struct v3_vm_info * vm);
+int v3_deinit_shdw_impl(struct v3_vm_info * vm);
 
-addr_t v3_create_new_shadow_pt32();
+int v3_init_shdw_pg_state(struct guest_info * core);
+int v3_deinit_shdw_pg_state(struct guest_info * core);
 
+
+/* Handler implementations */
 int v3_handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
 int v3_handle_shadow_invlpg(struct guest_info * info);
 
+/* Actions.. */
+int v3_activate_shadow_pt(struct guest_info * info);
+int v3_invalidate_shadow_pts(struct guest_info * info);
+
+
+/* Utility functions for shadow paging implementations */
+int v3_inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
+int v3_is_guest_pf(pt_access_status_t guest_access, pt_access_status_t shadow_access);
+
+
+
+
+
+int V3_init_shdw_paging();
+int V3_deinit_shdw_paging();
+
+#define register_shdw_pg_impl(impl)					\
+    static struct v3_shdw_pg_impl * _v3_shdw_pg_impl			\
+    __attribute__((used))						\
+	__attribute__((unused, __section__ ("_v3_shdw_pg_impls"),	\
+		       aligned(sizeof(addr_t))))			\
+	= impl;
 
 
 
-int v3_replace_shdw_page(struct guest_info * info, addr_t location, void * new_page, void* old_page);
-int v3_replace_shdw_page32(struct guest_info * info, addr_t location, pte32_t * new_page, pte32_t * old_page); 
 
 #endif // ! __V3VEE__