X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_guest.h;h=84468b233529441ca67e87db35b4f923d64c6ae1;hb=de5c2110458436a9300aa0a171dbbe83e415ee4d;hp=44987059576d7d3bcaca247c5e75f1e4a0aa76b4;hpb=8a8e371fd9be4513214a0013063d87ecbc5582c1;p=palacios.git diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h index 4498705..84468b2 100644 --- a/palacios/include/palacios/vm_guest.h +++ b/palacios/include/palacios/vm_guest.h @@ -24,8 +24,10 @@ #include #include +#include #include #include +#include #include #include #include @@ -34,138 +36,286 @@ #include #include #include - - -#ifdef CONFIG_TELEMETRY +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#ifdef V3_CONFIG_TELEMETRY #include #endif +#ifdef V3_CONFIG_PMU_TELEMETRY +#include +#endif +#ifdef V3_CONFIG_PWRSTAT_TELEMETRY +#include +#endif - - - -#ifdef CONFIG_SYMBIOTIC +#ifdef V3_CONFIG_SYMBIOTIC #include struct v3_sym_core_state; #endif -#include +#ifdef V3_CONFIG_MEM_TRACK +#include +#endif +#ifdef V3_CONFIG_MULTIBOOT +#include +#endif -struct v3_intr_state; +#ifdef V3_CONFIG_HVM +#include +#endif + +#ifdef V3_CONFIG_CACHEPART +#include +#endif +#include +struct v3_intr_state; +/* per-core state */ struct guest_info { + char exec_name[256]; + uint64_t rip; uint_t cpl; - struct vm_time time_state; + struct vm_core_time time_state; + struct v3_core_timeouts timeouts; + void * sched_priv_data; + + // Resource constraints/etc for the thread running this core + v3_resource_control_t resource_control; v3_paging_mode_t shdw_pg_mode; + // arch-independent state of shadow pager struct v3_shdw_pg_state shdw_pg_state; + // arch-indepedent state of the passthrough pager addr_t direct_map_pt; + // arch-independent state of the nested pager (currently none) + // struct v3_nested_pg_state nested_pg_state; + // per-core state of the swapper (currently none) + //#ifdef V3_CONFIG_SWAPPING + // struct v3_swap_impl_state swap_impl; + //#endif + + 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; struct v3_dbg_regs dbg_regs; struct v3_segments segments; + struct v3_msrs msrs; + struct v3_fp_state fp_state; + // the arch-dependent state (SVM or VMX) void * vmm_data; uint64_t yield_start_cycle; uint64_t num_exits; -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY struct v3_core_telemetry core_telem; #endif +#ifdef V3_CONFIG_PMU_TELEMETRY + struct v3_core_pmu_telemetry pmu_telem; +#endif + +#ifdef V3_CONFIG_PWRSTAT_TELEMETRY + struct v3_core_pwrstat_telemetry pwrstat_telem; +#endif + +#ifdef V3_CONFIG_MEM_TRACK + struct v3_core_mem_track memtrack_state; +#endif + +#ifdef V3_CONFIG_HVM + struct v3_core_hvm hvm_state; +#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 +#ifdef V3_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; + + void * core_thread; /* thread struct for virtual core */ + /* the logical cpu on which this core runs */ + uint32_t pcpu_id; + + /* The virtual core # of this cpu (what the guest sees this core as) */ + uint32_t vcpu_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 + // Resource control for whole VM - determined early and used + // when building the VM, then cloned to each core + v3_resource_control_t resource_control; + + struct v3_fw_cfg_state fw_cfg_state; + + // This is always the total RAM (addresses 0...mem_size) + // in the VM. + // With an HVM, this is partitioned as per hvm_state + addr_t mem_size; /* In bytes for now */ + uint32_t mem_align; struct v3_mem_map mem_map; + struct v3_mem_hooks mem_hooks; + // arch-indepentent state of shadow pager struct v3_shdw_impl_state shdw_impl; + // arch-independent state of passthrough pager (currently none) + struct v3_passthrough_impl_state passthrough_impl; + // arch-independent state of the nested pager + struct v3_nested_impl_state nested_impl; +#ifdef V3_CONFIG_SWAPPING + // swapping state, if enabled + struct v3_swap_impl_state swap_state; +#endif + + void * sched_priv_data; struct v3_io_map io_map; struct v3_msr_map msr_map; struct v3_cpuid_map cpuid_map; + struct v3_exit_map exit_map; + struct v3_event_map event_map; v3_hypercall_map_t hcall_map; struct v3_intr_routers intr_routers; - // device_map + + /* device_map */ struct vmm_dev_mgr dev_mgr; + struct v3_time time_state; + struct v3_host_events host_event_hooks; struct v3_config * cfg_data; v3_vm_operating_mode_t run_state; -#ifdef CONFIG_SYMBIOTIC - // Symbiotic state - struct v3_sym_vm_state sym_vm_state; -#endif + struct v3_barrier barrier; + + struct v3_extensions extensions; + struct v3_perf_options perf_options; -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_SYMBIOTIC + /* Symbiotic state */ + struct v3_sym_vm_state sym_vm_state; +#endif + +#ifdef V3_CONFIG_TELEMETRY uint_t enable_telemetry; struct v3_telemetry_state telemetry; #endif +#ifdef V3_CONFIG_MEM_TRACK + struct v3_vm_mem_track memtrack_state; +#endif + +#ifdef V3_CONFIG_MULTIBOOT + struct v3_vm_multiboot mb_state; +#endif + +#ifdef V3_CONFIG_HVM + struct v3_vm_hvm hvm_state; +#endif + + // used to implement reset of regular VM and ROS + v3_counting_barrier_t reset_barrier; + +#ifdef V3_CONFIG_CACHEPART + v3_cachepart_t cachepart_state; +#endif + + uint64_t yield_cycle_period; + + void * host_priv_data; + + // This is always the total number of vcores in the VM + // With an HVM, these are partitioned as per hvm_state int num_cores; - struct guest_info cores[0]; + int avail_cores; // Available logical cores + + // 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); v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info); @@ -175,17 +325,10 @@ v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info); const uchar_t * v3_cpu_mode_to_str(v3_cpu_mode_t mode); const uchar_t * v3_mem_mode_to_str(v3_mem_mode_t mode); -int v3_translate_segment(struct guest_info * info, uint16_t selector, struct v3_segment * seg); - -void v3_print_guest_state(struct guest_info * info); -void v3_print_segments(struct v3_segments * segs); -void v3_print_ctrl_regs(struct guest_info * info); -void v3_print_GPRs(struct guest_info * info); +#endif /* ! __V3VEE__ */ -void v3_print_stack(struct guest_info * info); -#endif // ! __V3VEE__ #endif