Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Fixed up formatting of telemetry prints that work around the
[palacios.git] / palacios / src / palacios / vmm_telemetry.c
index 16088a2..d12a5a7 100644 (file)
@@ -24,8 +24,8 @@
 #include <palacios/vmm_sprintf.h>
 
 
-#ifdef CONFIG_TELEMETRY_GRANULARITY
-#define DEFAULT_GRANULARITY CONFIG_TELEMETRY_GRANULARITY
+#ifdef V3_CONFIG_TELEMETRY_GRANULARITY
+#define DEFAULT_GRANULARITY V3_CONFIG_TELEMETRY_GRANULARITY
 #else 
 #define DEFAULT_GRANULARITY 50000
 #endif
@@ -50,6 +50,10 @@ struct exit_event {
 };
 
 
+static int free_callback(struct v3_vm_info * vm, struct telemetry_cb * cb);
+static int free_exit(struct guest_info * core, struct exit_event * event);
+
+
 void v3_init_telemetry(struct v3_vm_info * vm) {
     struct v3_telemetry_state * telemetry = &(vm->telemetry);
 
@@ -61,6 +65,16 @@ void v3_init_telemetry(struct v3_vm_info * vm) {
     INIT_LIST_HEAD(&(telemetry->cb_list));
 }
 
+void v3_deinit_telemetry(struct v3_vm_info * vm) {
+    struct telemetry_cb * cb = NULL;
+    struct telemetry_cb * tmp = NULL;
+
+    list_for_each_entry_safe(cb, tmp, &(vm->telemetry.cb_list), cb_node) {
+       free_callback(vm, cb);
+    }
+}
+
+
 void v3_init_core_telemetry(struct guest_info * core) {
     struct v3_core_telemetry * telemetry = &(core->core_telem);
 
@@ -72,6 +86,18 @@ void v3_init_core_telemetry(struct guest_info * core) {
     telemetry->exit_root.rb_node = NULL;
 }
 
+void v3_deinit_core_telemetry(struct guest_info * core) {
+    struct rb_node * node = v3_rb_first(&(core->core_telem.exit_root));
+    struct exit_event * evt = NULL;
+
+    while (node) {
+       evt = rb_entry(node, struct exit_event, tree_node);
+       node = v3_rb_next(node);
+
+       free_exit(core, evt);
+    }
+}
+
 
 
 static inline struct exit_event * __insert_event(struct guest_info * info, 
@@ -141,6 +167,15 @@ static inline struct exit_event * create_exit(uint_t exit_code) {
     return evt;
 }
 
+
+
+static int free_exit(struct guest_info * core, struct exit_event * evt) {
+    v3_rb_erase(&(evt->tree_node), &(core->core_telem.exit_root));
+    V3_Free(evt);
+    return 0;
+}
+
+
 void v3_telemetry_start_exit(struct guest_info * info) {
     rdtscll(info->core_telem.vmm_start_tsc);
 }
@@ -169,7 +204,7 @@ void v3_telemetry_end_exit(struct guest_info * info, uint_t exit_code) {
 
     // check if the exit count has expired
     if ((telemetry->exit_cnt % telemetry->vm_telem->granularity) == 0) {
-       v3_print_telemetry(info->vm_info);
+       v3_print_telemetry(info->vm_info, info);
     }
 }
 
@@ -190,42 +225,78 @@ void v3_add_telemetry_cb(struct v3_vm_info * vm,
 
 
 
-void v3_print_telemetry(struct v3_vm_info * vm) {
-    struct v3_telemetry_state * telemetry = &(vm->telemetry);
-    uint64_t invoke_tsc = 0;
-    char hdr_buf[32];
-    int i;
+static int free_callback(struct v3_vm_info * vm, struct telemetry_cb * cb) {
+    list_del(&(cb->cb_node));
+    V3_Free(cb);
+
+    return 0;
+}
 
-    rdtscll(invoke_tsc);
 
-    snprintf(hdr_buf, 32, "telem.%d>", telemetry->invoke_cnt++);
+static void telemetry_header(struct v3_vm_info *vm, char *hdr_buf, int len)
+{
+    struct v3_telemetry_state * telemetry = &(vm->telemetry);
+    snprintf(hdr_buf, len, "telem.%d>", telemetry->invoke_cnt);
+}
 
+static void print_telemetry_start(struct v3_vm_info *vm, char *hdr_buf)
+{
+    struct v3_telemetry_state * telemetry = &(vm->telemetry);
+    uint64_t invoke_tsc = 0;
+    rdtscll(invoke_tsc);
     V3_Print("%stelemetry window tsc cnt: %d\n", hdr_buf, (uint32_t)(invoke_tsc - telemetry->prev_tsc));
+    telemetry->prev_tsc = invoke_tsc;
+}
 
+static void print_telemetry_end(struct v3_vm_info *vm, char *hdr_buf)
+{
+    V3_Print("%s Telemetry done\n", hdr_buf);
+}
 
-    // Exit Telemetry
-    for (i = 0; i < vm->num_cores; i++) {
-       struct guest_info * core = &(vm->cores[i]);
-       struct exit_event * evt = NULL;
-       struct rb_node * node = v3_rb_first(&(core->core_telem.exit_root));
-       
-       V3_Print("Exit information for Core %d\n", core->cpu_id);
+static void print_core_telemetry(struct guest_info * core, char *hdr_buf)
+{
+    struct exit_event * evt = NULL;
+    struct rb_node * node = v3_rb_first(&(core->core_telem.exit_root));
 
-       do {
-           evt = rb_entry(node, struct exit_event, tree_node);
-           const char * code_str = vmexit_code_to_str(evt->exit_code);
-           
-           V3_Print("%s%s:%sCnt=%u,%sAvg. Time=%u\n", 
-                    hdr_buf,
-                    code_str,
-                    (strlen(code_str) > 13) ? "\t" : "\t\t",
-                    evt->cnt,
-                    (evt->cnt >= 100) ? "\t" : "\t\t",
-                    (uint32_t)(evt->handler_time / evt->cnt));
-       } while ((node = v3_rb_next(node)));
+    V3_Print("Exit information for Core %d\n", core->vcpu_id);
+    
+    if (!node) { 
+       V3_Print("No information yet for this core\n");
+       return;
     }
 
+    do {
+        evt = rb_entry(node, struct exit_event, tree_node);
+        const char * code_str = vmexit_code_to_str(evt->exit_code);
+           
+        V3_Print("%s%s:%sCnt=%u,%sAvg. Time=%u\n", 
+                 hdr_buf, code_str,
+                 (strlen(code_str) > 13) ? "\t" : "\t\t",
+                 evt->cnt,
+                 (evt->cnt >= 100) ? "\t" : "\t\t",
+                 (uint32_t)(evt->handler_time / evt->cnt));
+    } while ((node = v3_rb_next(node)));
+    return;
+}
 
+void v3_print_core_telemetry(struct guest_info * core ) {
+    struct v3_vm_info *vm = core->vm_info;
+    struct v3_telemetry_state * telemetry = &(vm->telemetry);
+    char hdr_buf[32];
+    
+    telemetry_header(vm, hdr_buf, 32);
+    telemetry->invoke_cnt++; // XXX this increment isn't atomic and probably should be
+
+    print_telemetry_start(vm, hdr_buf);
+    print_core_telemetry(core, hdr_buf);
+    print_telemetry_end(vm, hdr_buf);
+
+    return;
+}
+
+static void telemetry_callbacks(struct v3_vm_info * vm, char *hdr_buf)
+{
+    struct v3_telemetry_state * telemetry = &(vm->telemetry);
     // Registered callbacks
     {
        struct telemetry_cb * cb = NULL;
@@ -234,9 +305,32 @@ void v3_print_telemetry(struct v3_vm_info * vm) {
            cb->telemetry_fn(vm, cb->private_data, hdr_buf);
        }
     }
+}
 
-    telemetry->prev_tsc = invoke_tsc;
+void v3_print_global_telemetry(struct v3_vm_info * vm) {
+    struct v3_telemetry_state * telemetry = &(vm->telemetry);
+    char hdr_buf[32];
 
-    V3_Print("%s Telemetry done\n", hdr_buf);
+    telemetry_header(vm, hdr_buf, 32);
+    telemetry->invoke_cnt++; // XXX this increment isn't atomic and probably should be
+
+    print_telemetry_start( vm, hdr_buf );
+    telemetry_callbacks( vm, hdr_buf );
+    print_telemetry_end( vm, hdr_buf );
+}
+
+void v3_print_telemetry(struct v3_vm_info * vm, struct guest_info * core )
+{
+    struct v3_telemetry_state * telemetry = &(vm->telemetry);
+    char hdr_buf[32];
+    
+    telemetry_header(vm, hdr_buf, 32);
+    telemetry->invoke_cnt++; // XXX this increment isn't atomic and probably should be
+
+    print_telemetry_start(vm, hdr_buf);
+    print_core_telemetry(core, hdr_buf);
+    telemetry_callbacks(vm, hdr_buf);
+    print_telemetry_end(vm, hdr_buf);
 
+    return;
 }