X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=9293329f7bae6a93bb6f60d87d7aa27332793e9b;hb=2f4952e76f4fadb1abd32626b57b6d9b272003cc;hp=7b816a5906e01ca75387aa90b28d2b5a2d2ec1b1;hpb=aace4c114e63de21c289c69a9b498a19f79dab80;p=palacios.git

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index 7b816a5..9293329 100644
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -31,31 +31,45 @@
 
 struct guest_info;
 
-struct vm_time {
+
+/* Per-VM time information */
+struct v3_time {
+    int flags;
+    uint32_t td_num, td_denom; 
+};
+#define V3_TIME_SLAVE_HOST (1 << 0)
+#define V3_TIME_TSC_PASSTHROUGH (1 << 1)
+
+/* Per-core time information */
+struct vm_core_time {
     uint32_t host_cpu_freq;    // in kHZ 
     uint32_t guest_cpu_freq;   // can be lower than host CPU freq!
 
-    sint64_t guest_host_offset;// Offset of monotonic guest time from host time
-    sint64_t tsc_guest_offset; // Offset of guest TSC from monotonic guest time
+    // Multipliers for TSC speed and performance speed
+    uint32_t clock_ratio_num, clock_ratio_denom;
+    uint32_t ipc_ratio_num, ipc_ratio_denom;
+
+    uint64_t guest_cycles;
+    sint64_t tsc_guest_offset; // Offset of guest TSC from guest cycles
 
-    uint64_t last_update;      // Last time (in monotonic guest time) the 
+    uint64_t last_update;      // Last time (in guest cycles) the 
                                // timers were updated
 
-    uint64_t initial_time;     // Time when VMM started. 
-    uint64_t enter_time;       // Host time the guest was last entered
-    uint64_t exit_time;        // Host time the the VM was exited to
+    uint64_t initial_host_time;// Host time when VMM started. 
     struct v3_msr tsc_aux;     // Auxilliary MSR for RDTSCP
 
+    int flags;
+	
     // Installed Timers slaved off of the guest monotonic TSC
     uint_t num_timers;
     struct list_head timers;
 
-    // Installed timeout handlers, and the time (in monotonic guest time) of hte 
-    // next timeout.
-    uint64_t next_timeout; 
-    struct list_head timeout_hooks;
 };
 
+#define VM_TIME_SLAVE_HOST (1 << 0)
+#define VM_TIME_TSC_PASSTHROUGH (1 << 1)
+#define VM_TIME_TRAP_RDTSC (1 << 2)
+
 struct v3_timer_ops {
     void (*update_timer)(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data);
     void (*advance_timer)(struct guest_info * info, void * private_data);
@@ -70,13 +84,7 @@ struct v3_timer {
     struct list_head timer_link;
 };
 
-typedef void (*v3_timeout_callback_t)(struct guest_info * info, void * priv_data);
-struct v3_timeout_hook {
-    void * private_data;
-    v3_timeout_callback_t callback;
-    
-    struct list_head hook_link;
-};
+
 
 // Basic functions for handling passage of time in palacios
 void v3_init_time_core(struct guest_info * core);
@@ -87,11 +95,7 @@ void v3_deinit_time_vm(struct v3_vm_info * vm);
 
 int v3_start_time(struct guest_info * core);
 
-int v3_time_enter_vm(struct guest_info * core);
-int v3_time_exit_vm(struct guest_info * core);
-
-int v3_adjust_time(struct guest_info * core);
-int v3_offset_time(struct guest_info * core, sint64_t offset);
+int v3_advance_time(struct guest_info * core, uint64_t * guest_cycles);
 
 // Basic functions for attaching timers to the passage of time - these timers 
 // should eventually specify their accuracy and resolution.
@@ -99,48 +103,26 @@ struct v3_timer * v3_add_timer(struct guest_info * info, struct v3_timer_ops * o
 int v3_remove_timer(struct guest_info * info, struct v3_timer * timer);
 void v3_update_timers(struct guest_info * info);
 
-// Functions for handling one-shot timeouts in Palacios. Note that only one
-// timeout is every currently outstanding (the soonest scheduled one!), and that
-// all hooks are called on any timeout. If a hook gets called before the desired
-// timeout time, that hook should reschedule its own timeout if desired.
-struct v3_timeout_hook * v3_add_timeout_hook(struct guest_info * info, v3_timeout_callback_t callback, void * priv_data);
-int v3_remove_timeout_hook(struct guest_info * info, struct v3_timeout_hook * hook);
-int v3_schedule_timeout(struct guest_info * info, ullong_t cycles);
-int v3_check_timeout(struct guest_info * info);
-
 // Functions to return the different notions of time in Palacios.
-static inline uint64_t v3_get_host_time(struct vm_time *t) {
+static inline uint64_t v3_get_host_time(struct vm_core_time *t) {
     uint64_t tmp;
     rdtscll(tmp);
     return tmp;
 }
 
 // Returns *monotonic* guest time.
-static inline uint64_t v3_compute_guest_time(struct vm_time *t, uint64_t ht) {
-#ifdef V3_CONFIG_TIME_HIDE_VM_COST
-    V3_ASSERT(t->exit_time);
-    return t->exit_time + t->guest_host_offset;
-#else
-    return ht + t->guest_host_offset;
-#endif
-}
-
-static inline uint64_t v3_get_guest_time(struct vm_time *t) {
-    return v3_compute_guest_time(t, v3_get_host_time(t));
-}
-
-// Returns the TSC value seen by the guest
-static inline uint64_t v3_compute_guest_tsc(struct vm_time *t, uint64_t ht) {
-    return v3_compute_guest_time(t, ht) + t->tsc_guest_offset;
+static inline uint64_t v3_get_guest_time(struct vm_core_time *t) {
+    return t->guest_cycles;
 }
 
-static inline uint64_t v3_get_guest_tsc(struct vm_time *t) {
-    return v3_compute_guest_tsc(t, v3_get_host_time(t));
+static inline uint64_t v3_get_guest_tsc(struct vm_core_time *t) {
+    return v3_get_guest_time(t) + t->tsc_guest_offset;
 }
 
 // Returns offset of guest TSC from host TSC
-static inline sint64_t v3_tsc_host_offset(struct vm_time *time_state) {
-    return time_state->guest_host_offset + time_state->tsc_guest_offset;
+static inline sint64_t v3_tsc_host_offset(struct vm_core_time *time_state) {
+    uint64_t host_time = v3_get_host_time(time_state);
+    return (sint64_t)v3_get_guest_tsc(time_state) - (sint64_t)host_time;
 }
 
 // Functions for handling exits on the TSC when fully virtualizing