X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_time.h;h=0377be87acfa39de8dfe926269add0a0d09332c2;hb=69982930e8a2c0e44aeae5a95497fb896dad3da3;hp=11e4eb9486f2c0e7419ffb5b831ef1c9b2996c38;hpb=e70e95962c26832628d586e07f9cd1a2e1852d72;p=palacios.git

diff --git a/palacios/include/palacios/vmm_time.h b/palacios/include/palacios/vmm_time.h
index 11e4eb9..0377be8 100644
--- a/palacios/include/palacios/vmm_time.h
+++ b/palacios/include/palacios/vmm_time.h
@@ -24,39 +24,48 @@
 
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
+#include <palacios/vmm_msr.h>
+#include <palacios/vmm_util.h>
 
 struct guest_info;
 
 struct vm_time {
-  uint32_t cpu_freq; // in kHZ
-
-  // Total number of guest run time cycles
-  ullong_t guest_tsc;
-
-  // Cache value to help calculate the guest_tsc
-  ullong_t cached_host_tsc;
-
-  // The number of cycles pending for notification to the timers
-  //ullong_t pending_cycles;
-
-  // Installed Timers 
-  uint_t num_timers;
-  struct list_head timers;
+    uint32_t cpu_freq;         // in kHZ in terms of guest CPU speed
+                               // which ideally can be different lower than
+                               // host CPU speed!
+         
+    uint32_t time_mult;        // Fields for computing monotonic guest time
+    uint32_t time_div;         // from host (tsc) time
+    sint64_t time_offset;      
+
+    sint64_t tsc_time_offset;  // Offset for computing guest TSC value from
+                               // monotonic guest time
+    
+    uint64_t last_update;      // Last time (in monotonic guest time) the 
+                               // timers were updated
+
+    uint64_t pause_time;       // Cache value to help calculate the guest_tsc
+    
+    struct v3_msr tsc_aux;     // Auxilliary MSR for RDTSCP
+
+    // Installed Timers slaved off of the guest monotonic TSC
+    uint_t num_timers;
+    struct list_head timers;
 };
 
 
 
 
 struct vm_timer_ops {
- void (*update_time)(ullong_t cpu_cycles, ullong_t cpu_freq, void * priv_data);
-
+    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);
 };
 
 struct vm_timer {
-  void * private_data;
-  struct vm_timer_ops * ops;
+    void * private_data;
+    struct vm_timer_ops * ops;
 
-  struct list_head timer_link;
+    struct list_head timer_link;
 };
 
 
@@ -64,15 +73,38 @@ struct vm_timer {
 
 int v3_add_timer(struct guest_info * info, struct vm_timer_ops * ops, void * private_data);
 int v3_remove_timer(struct guest_info * info, struct vm_timer * timer);
-
-
-void v3_update_time(struct guest_info * info, ullong_t cycles);
-
-#endif // !__V3VEE__
+void v3_update_timers(struct guest_info * info);
 
 
 void v3_init_time(struct guest_info * info);
+int v3_start_time(struct guest_info * info);
+int v3_pause_time(struct guest_info * info);
+int v3_resume_time(struct guest_info * info);
+
+// Returns host time
+static inline uint64_t v3_get_host_time(struct vm_time *t) {
+    uint64_t tmp;
+    rdtscll(tmp);
+    return tmp;
+}
+
+// Returns *monotonic* guest time.
+static inline uint64_t v3_get_guest_time(struct vm_time *t) {
+    if (t->pause_time) return t->pause_time;
+    else return v3_get_host_time(t) + t->time_offset;
+}
+
+// Returns the TSC value seen by the guest
+static inline uint64_t v3_get_guest_tsc(struct vm_time *t) {
+    return v3_get_guest_time(t) + t->tsc_time_offset;
+}
+
+#define TSC_MSR     0x10
+#define TSC_AUX_MSR 0xC0000103
+
+int v3_handle_rdtscp(struct guest_info *info);
+int v3_handle_rdtsc(struct guest_info *info);
 
-
+#endif // !__V3VEE__
 
 #endif