X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=d67fd9fc4543a9e1ab71d635e19607166b69dc2f;hb=95290c36e27daf208b8e61e6c6f26325db8b6b4d;hp=24fe22d3d5792898ed15e901a42d91d159797626;hpb=651e3672545ee1d510231995dfbc184d98c3686b;p=palacios.git diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h index 24fe22d..d67fd9f 100644 --- a/palacios/include/palacios/vm_guest.h +++ b/palacios/include/palacios/vm_guest.h @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -34,115 +35,30 @@ #include #include #include - +#include +#include #ifdef CONFIG_TELEMETRY #include #endif -#ifdef CONFIG_SYMBIOTIC_SWAP -#include -#endif - - - - - - - -struct v3_gprs { - v3_reg_t rdi; - v3_reg_t rsi; - v3_reg_t rbp; - v3_reg_t rsp; - v3_reg_t rbx; - v3_reg_t rdx; - v3_reg_t rcx; - v3_reg_t rax; - - v3_reg_t r8; - v3_reg_t r9; - v3_reg_t r10; - v3_reg_t r11; - v3_reg_t r12; - v3_reg_t r13; - v3_reg_t r14; - v3_reg_t r15; - -} __attribute__((packed)); - - -struct v3_ctrl_regs { - v3_reg_t cr0; - v3_reg_t cr2; - v3_reg_t cr3; - v3_reg_t cr4; - v3_reg_t cr8; - v3_reg_t rflags; - v3_reg_t efer; -}; - - - -struct v3_dbg_regs { - v3_reg_t dr0; - v3_reg_t dr1; - v3_reg_t dr2; - v3_reg_t dr3; - v3_reg_t dr6; - v3_reg_t dr7; -}; - -struct v3_segment { - uint16_t selector; - uint_t limit; - uint64_t base; - uint_t type : 4; - uint_t system : 1; - uint_t dpl : 2; - uint_t present : 1; - uint_t avail : 1; - uint_t long_mode : 1; - uint_t db : 1; - uint_t granularity : 1; - uint_t unusable : 1; -} __attribute__((packed)); - - -struct v3_segments { - struct v3_segment cs; - struct v3_segment ds; - struct v3_segment es; - struct v3_segment fs; - struct v3_segment gs; - struct v3_segment ss; - struct v3_segment ldtr; - struct v3_segment gdtr; - struct v3_segment idtr; - struct v3_segment tr; -}; - #ifdef CONFIG_SYMBIOTIC -#include +#include +struct v3_sym_core_state; #endif #include -struct shadow_page_state; struct v3_intr_state; -#ifdef CONFIG_SYMBIOTIC_SWAP -struct v3_sym_swap_state; -#endif - -#ifdef CONFIG_SYMBIOTIC -struct v3_sym_state; -#endif +/* per-core state */ struct guest_info { + char exec_name[256]; + uint64_t rip; uint_t cpl; @@ -150,20 +66,30 @@ struct guest_info { struct vm_time time_state; v3_paging_mode_t shdw_pg_mode; - struct shadow_page_state shdw_pg_state; + struct v3_shdw_pg_state shdw_pg_state; addr_t direct_map_pt; + + union { + uint32_t flags; + struct { + uint8_t use_large_pages : 1; /* Enable virtual page tables to use large pages */ + uint8_t use_giant_pages : 1; /* Enable virtual page tables to use giant (1GB) pages */ + uint32_t rsvd : 30; + } __attribute__((packed)); + } __attribute__((packed)); - // This structure is how we get interrupts for the guest + + /* This structure is how we get interrupts for the guest */ struct v3_intr_core_state intr_core_state; - // This structure is how we get exceptions for the guest + /* This structure is how we get exceptions for the guest */ struct v3_excp_state excp_state; v3_cpu_mode_t cpu_mode; v3_mem_mode_t mem_mode; - uint_t addr_width; + struct v3_gprs vm_regs; struct v3_ctrl_regs ctrl_regs; @@ -182,25 +108,44 @@ struct guest_info { #endif - // struct v3_core_dev_mgr core_dev_mgr; + /* struct v3_core_dev_mgr core_dev_mgr; */ void * decoder_state; +#ifdef CONFIG_SYMBIOTIC + /* Symbiotic state */ + struct v3_sym_core_state sym_core_state; +#endif + + /* Per-core config tree data. */ + v3_cfg_tree_t * core_cfg_data; struct v3_vm_info * vm_info; - // the logical cpu this guest context is executing on - int cpu_id; -}; + v3_core_operating_mode_t core_run_state; + /* the logical cpu on which this core runs */ + uint32_t cpu_id; + +}; + +/* shared state across cores */ struct v3_vm_info { + char name[128]; + v3_vm_class_t vm_class; - addr_t mem_size; // In bytes for now + addr_t mem_size; /* In bytes for now */ + uint32_t mem_align; struct v3_mem_map mem_map; + v3_paging_size_t paging_size; // for nested paging + + struct v3_mem_hooks mem_hooks; + + struct v3_shdw_impl_state shdw_impl; struct v3_io_map io_map; struct v3_msr_map msr_map; @@ -210,7 +155,8 @@ struct v3_vm_info { struct v3_intr_routers intr_routers; - // device_map + + /* device_map */ struct vmm_dev_mgr dev_mgr; struct v3_host_events host_event_hooks; @@ -219,16 +165,16 @@ struct v3_vm_info { v3_vm_operating_mode_t run_state; -#ifdef CONFIG_SYMBIOTIC - // Symbiotic state - struct v3_sym_state sym_state; -#ifdef CONFIG_SYMBIOTIC_SWAP - struct v3_sym_swap_state swap_state; -#endif -#endif + struct v3_extensions extensions; + +#ifdef CONFIG_SYMBIOTIC + /* Symbiotic state */ + struct v3_sym_vm_state sym_vm_state; +#endif + #ifdef CONFIG_TELEMETRY uint_t enable_telemetry; struct v3_telemetry_state telemetry; @@ -236,13 +182,20 @@ struct v3_vm_info { uint64_t yield_cycle_period; + + void * host_priv_data; + int num_cores; - struct guest_info cores[0]; + // JRL: This MUST be the last entry... + struct guest_info cores[0]; }; +int v3_init_vm(struct v3_vm_info * vm); +int v3_init_core(struct guest_info * core); - +int v3_free_vm_internal(struct v3_vm_info * vm); +int v3_free_core(struct guest_info * core); uint_t v3_get_addr_width(struct guest_info * info); @@ -264,6 +217,8 @@ void v3_print_GPRs(struct guest_info * info); void v3_print_stack(struct guest_info * info); -#endif // ! __V3VEE__ +#endif /* ! __V3VEE__ */ + +void v3_print_guest_state_all(struct v3_vm_info * vm); #endif