From: Peter Dinda <pdinda@northwestern.edu>
Date: Wed, 16 Nov 2011 17:10:50 +0000 (-0600)
Subject: Merge branch 'devel' of newskysaw.cs.northwestern.edu:/home/palacios/palacios into... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=5e3bb26339e3a3ca09c057b28ab24463669053c8;hp=639f3d3bd42dd2218bcd994e423f3a5569ed7051

Merge branch 'devel' of newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel
---

diff --git a/linux_module/iface-file.c b/linux_module/iface-file.c
index 5489764..1df1d6d 100644
--- a/linux_module/iface-file.c
+++ b/linux_module/iface-file.c
@@ -128,7 +128,7 @@ static int palacios_file_mkdir(const char * pathname, unsigned short perms, int
 	struct nameidata nd;
 
 	// I'm not 100% sure about the version here, but it was around this time that the API changed
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35) 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37) 
 	ret = kern_path_parent(pathname, &nd);
 #else 
 
diff --git a/palacios/include/palacios/vmm_telemetry.h b/palacios/include/palacios/vmm_telemetry.h
index 2fb5bc2..a9fd4b7 100644
--- a/palacios/include/palacios/vmm_telemetry.h
+++ b/palacios/include/palacios/vmm_telemetry.h
@@ -59,8 +59,9 @@ void v3_deinit_core_telemetry(struct guest_info * core);
 void v3_telemetry_start_exit(struct guest_info * info);
 void v3_telemetry_end_exit(struct guest_info * info, uint_t exit_code);
 
+void v3_print_core_telemetry(struct guest_info * core);
 void v3_print_global_telemetry(struct v3_vm_info * vm);
-void v3_print_core_telemetry(struct guest_info * vm);
+void v3_print_telemetry(struct v3_vm_info * vm, struct guest_info * core);
 
 
 void v3_add_telemetry_cb(struct v3_vm_info * vm, 
diff --git a/palacios/src/devices/ne2k.c b/palacios/src/devices/ne2k.c
index d4e8852..b4796f7 100644
--- a/palacios/src/devices/ne2k.c
+++ b/palacios/src/devices/ne2k.c
@@ -1115,7 +1115,7 @@ static int register_dev(struct ne2k_state * nic_state)
 	}
 
 	bars[0].type = PCI_BAR_IO;
-	bars[0].default_base_port = NIC_REG_BASE_PORT;
+	bars[0].default_base_port = -1;
 	bars[0].num_ports = 256;
 
 	bars[0].io_read = ne2k_pci_read;
diff --git a/palacios/src/devices/rtl8139.c b/palacios/src/devices/rtl8139.c
index 176d053..33a5cfa 100644
--- a/palacios/src/devices/rtl8139.c
+++ b/palacios/src/devices/rtl8139.c
@@ -1713,7 +1713,7 @@ static int register_dev(struct rtl8139_state * nic_state)  {
     }
 
     bars[0].type = PCI_BAR_IO;
-    bars[0].default_base_port = 0xc100;
+    bars[0].default_base_port = -1;
     bars[0].num_ports = 0x100;
 
     bars[0].io_read = rtl8139_ioport_read;
diff --git a/palacios/src/palacios/vmm_telemetry.c b/palacios/src/palacios/vmm_telemetry.c
index 4ddea67..d12a5a7 100644
--- a/palacios/src/palacios/vmm_telemetry.c
+++ b/palacios/src/palacios/vmm_telemetry.c
@@ -204,8 +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_global_telemetry(info->vm_info);
-	v3_print_core_telemetry(info);
+	v3_print_telemetry(info->vm_info, info);
     }
 }
 
@@ -234,10 +233,31 @@ static int free_callback(struct v3_vm_info * vm, struct telemetry_cb * cb) {
 }
 
 
-void v3_print_core_telemetry(struct guest_info * core ) {
+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);
+}
+
+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));
-    
+
     V3_Print("Exit information for Core %d\n", core->vcpu_id);
     
     if (!node) { 
@@ -249,8 +269,8 @@ void v3_print_core_telemetry(struct guest_info * core ) {
 	 evt = rb_entry(node, struct exit_event, tree_node);
 	 const char * code_str = vmexit_code_to_str(evt->exit_code);
 	    
-	 V3_Print("%s:%sCnt=%u,%sAvg. Time=%u\n", 
-		  code_str,
+	 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",
@@ -259,17 +279,24 @@ void v3_print_core_telemetry(struct guest_info * core ) {
     return;
 }
 
-void v3_print_global_telemetry(struct v3_vm_info * vm) {
+void v3_print_core_telemetry(struct guest_info * core ) {
+    struct v3_vm_info *vm = core->vm_info;
     struct v3_telemetry_state * telemetry = &(vm->telemetry);
-    uint64_t invoke_tsc = 0;
     char hdr_buf[32];
+    
+    telemetry_header(vm, hdr_buf, 32);
+    telemetry->invoke_cnt++; // XXX this increment isn't atomic and probably should be
 
-    rdtscll(invoke_tsc);
-
-    snprintf(hdr_buf, 32, "telem.%d>", telemetry->invoke_cnt++);
+    print_telemetry_start(vm, hdr_buf);
+    print_core_telemetry(core, hdr_buf);
+    print_telemetry_end(vm, hdr_buf);
 
-    V3_Print("%stelemetry window tsc cnt: %d\n", hdr_buf, (uint32_t)(invoke_tsc - telemetry->prev_tsc));
+    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;
@@ -278,8 +305,32 @@ void v3_print_global_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;
 }
diff --git a/palacios/src/palacios/vmx_msr.c b/palacios/src/palacios/vmx_msr.c
index f470c37..ae64331 100644
--- a/palacios/src/palacios/vmx_msr.c
+++ b/palacios/src/palacios/vmx_msr.c
@@ -51,6 +51,12 @@ static int update_map(struct v3_vm_info * vm, uint_t msr, int hook_reads, int ho
     uint8_t write_val = (hook_writes) ? 0x1 : 0x0;
     uint8_t * bitmap = (uint8_t *)(vm->msr_map.arch_data);
 
+    if (index == -1) {
+	//	0rintError("Error updating MSR Map failed bitmap index for (0x%x)\n", msr);
+	// MSRs not in the bitmap covered range will always trigger exits, so we don't need to worry about them here.
+	return 0;
+    }
+
     *(bitmap + major) &= ~(mask << minor);
     *(bitmap + major) |= (read_val << minor);