X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=396f6ce7387dba4f57c560d22774164f95f3d21f;hb=4931bc084ced4bcb172c7bcb197ab55b1c9bdf80;hp=93038c6197daa62753c301600b2e4791979b50b4;hpb=32c76af496b981656d6976d95ba26e05c1b73bf7;p=palacios.git

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index 93038c6..396f6ce 100644
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -24,7 +24,7 @@
 #include <palacios/vmm_decoder.h>
 #include <palacios/vm_guest_mem.h>
 
-#ifndef CONFIG_DEBUG_IO
+#ifndef V3_CONFIG_DEBUG_IO
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -46,10 +46,20 @@ static int update_map(struct v3_vm_info * vm, uint16_t port, int hook_read, int
 
 
 int v3_init_svm_io_map(struct v3_vm_info * vm) {
+    void *temp;
+
     vm->io_map.update_map = update_map;
 
-    vm->io_map.arch_data = V3_VAddr(V3_AllocPages(3));
-    memset(vm->io_map.arch_data, 0, PAGE_SIZE_4KB * 3);
+    temp = V3_AllocPages(3); // need not be shadow-safe, not exposed to guest
+    
+    if (!temp) { 
+	PrintError(vm, VCORE_NONE,  "Cannot allocate io bitmap\n");
+	return -1;
+    }
+
+    vm->io_map.arch_data = V3_VAddr(temp);
+
+    memset(vm->io_map.arch_data, 0xff, PAGE_SIZE_4KB * 3);
 
 
     v3_refresh_io_map(vm);
@@ -57,6 +67,13 @@ int v3_init_svm_io_map(struct v3_vm_info * vm) {
     return 0;
 }
 
+int v3_deinit_svm_io_map(struct v3_vm_info * vm) {
+    if (vm->io_map.arch_data) { 
+	V3_FreePages(V3_PAddr(vm->io_map.arch_data), 3);
+    }
+    return 0;
+}
+
 
 
 // This should package up an IO request and call vmm_handle_io
@@ -64,13 +81,6 @@ int v3_handle_svm_io_in(struct guest_info * core, struct svm_io_info * io_info)
     struct v3_io_hook * hook = v3_get_io_hook(core->vm_info, io_info->port);
     int read_size = 0;
 
-    if (hook == NULL) {
-	PrintError("Hook Not present for in on port 0x%x\n", io_info->port);
-	// error, we should not have exited on this port
-	return -1;
-    }
-
-
     if (io_info->sz8) { 
 	read_size = 1;
     } else if (io_info->sz16) {
@@ -79,13 +89,21 @@ int v3_handle_svm_io_in(struct guest_info * core, struct svm_io_info * io_info)
 	read_size = 4;
     }
 
-    PrintDebug("IN of %d bytes on port %d (0x%x)\n", read_size, io_info->port, io_info->port);
+    PrintDebug(core->vm_info, core, "IN of %d bytes on port %d (0x%x)\n", read_size, io_info->port, io_info->port);
 
-    if (hook->read(core, io_info->port, &(core->vm_regs.rax), read_size, hook->priv_data) != read_size) {
-	// not sure how we handle errors.....
-	PrintError("Read Failure for in on port 0x%x\n", io_info->port);
-	return -1;
+    if (hook == NULL) {
+	PrintDebug(core->vm_info, core, "IN operation on unhooked IO port 0x%x - returning zero\n", io_info->port);
+	core->vm_regs.rax >>= 8*read_size;
+	core->vm_regs.rax <<= 8*read_size;
+
+    } else {
+	if (hook->read(core, io_info->port, &(core->vm_regs.rax), read_size, hook->priv_data) != read_size) {
+	    // not sure how we handle errors.....
+	    PrintError(core->vm_info, core, "Read Failure for in on port 0x%x\n", io_info->port);
+	    return -1;
+	}
     }
+    
 
     return 0;
 }
@@ -116,18 +134,10 @@ int v3_handle_svm_io_ins(struct guest_info * core, struct svm_io_info * io_info)
     if (flags->df) {
 	direction = -1;
     }
-
-
-    if (hook == NULL) {
-	PrintError("Hook Not present for ins on port 0x%x\n", io_info->port);
-	// error, we should not have exited on this port
-	return -1;
-    }
-
-
+    
 
     if (v3_gva_to_hva(core, get_addr_linear(core, core->rip, &(core->segments.cs)), &inst_ptr) == -1) {
-	PrintError("Can't access instruction\n");
+	PrintError(core->vm_info, core, "Can't access instruction\n");
 	return -1;
     }
 
@@ -158,7 +168,7 @@ int v3_handle_svm_io_ins(struct guest_info * core, struct svm_io_info * io_info)
     }
 
 
-    PrintDebug("INS on  port %d (0x%x)\n", io_info->port, io_info->port);
+    PrintDebug(core->vm_info, core, "INS on  port %d (0x%x)\n", io_info->port, io_info->port);
 
     if (io_info->sz8) {
 	read_size = 1;
@@ -167,7 +177,7 @@ int v3_handle_svm_io_ins(struct guest_info * core, struct svm_io_info * io_info)
     } else if (io_info->sz32) {
 	read_size = 4;
     } else {
-	PrintError("io_info Invalid Size\n");
+	PrintError(core->vm_info, core, "io_info Invalid Size\n");
 	return -1;
     }
 
@@ -182,9 +192,9 @@ int v3_handle_svm_io_ins(struct guest_info * core, struct svm_io_info * io_info)
 	// This value should be set depending on the host register size...
 	mask = get_gpr_mask(core);
 
-	PrintDebug("INS io_info invalid address size, mask=0x%p, io_info=0x%p\n",
+	PrintDebug(core->vm_info, core, "INS io_info invalid address size, mask=0x%p, io_info=0x%p\n",
 		   (void *)(addr_t)mask, (void *)(addr_t)(io_info));
-	// PrintDebug("INS Aborted... Check implementation\n");
+	// PrintDebug(core->vm_info, core, "INS Aborted... Check implementation\n");
 	//return -1;
     }
 
@@ -193,27 +203,32 @@ int v3_handle_svm_io_ins(struct guest_info * core, struct svm_io_info * io_info)
 	//rep_num = info->vm_regs.rcx;
     }
 
-
-    PrintDebug("INS size=%d for %d steps\n", read_size, rep_num);
+    PrintDebug(core->vm_info, core, "INS size=%d for %d steps\n", read_size, rep_num);
 
     while (rep_num > 0) {
 	addr_t host_addr;
 	dst_addr = get_addr_linear(core, (core->vm_regs.rdi & mask), theseg);
     
-	//	PrintDebug("Writing 0x%p\n", (void *)dst_addr);
+	//	PrintDebug(core->vm_info, core, "Writing 0x%p\n", (void *)dst_addr);
 
 	if (v3_gva_to_hva(core, dst_addr, &host_addr) == -1) {
 	    // either page fault or gpf...
-	    PrintError("Could not convert Guest VA to host VA\n");
+	    PrintError(core->vm_info, core, "Could not convert Guest VA to host VA\n");
 	    return -1;
 	}
 
-	if (hook->read(core, io_info->port, (char *)host_addr, read_size, hook->priv_data) != read_size) {
-	    // not sure how we handle errors.....
-	    PrintError("Read Failure for ins on port 0x%x\n", io_info->port);
-	    return -1;
+	if (hook == NULL) {
+	    PrintDebug(core->vm_info, core, "INS operation on unhooked IO port 0x%x - returning zeros\n", io_info->port);
+	    memset((char*)host_addr,0,read_size);
+	    
+	} else {
+	    if (hook->read(core, io_info->port, (char *)host_addr, read_size, hook->priv_data) != read_size) {
+		// not sure how we handle errors.....
+		PrintError(core->vm_info, core, "Read Failure for ins on port 0x%x\n", io_info->port);
+		return -1;
+	    }
 	}
-
+    
 	core->vm_regs.rdi += (read_size * direction);
 
 	if (io_info->rep) {
@@ -230,13 +245,6 @@ int v3_handle_svm_io_out(struct guest_info * core, struct svm_io_info * io_info)
     struct v3_io_hook * hook = v3_get_io_hook(core->vm_info, io_info->port);
     int write_size = 0;
 
-    if (hook == NULL) {
-	PrintError("Hook Not present for out on port 0x%x\n", io_info->port);
-	// error, we should not have exited on this port
-	return -1;
-    }
-
-
     if (io_info->sz8) { 
 	write_size = 1;
     } else if (io_info->sz16) {
@@ -245,13 +253,18 @@ int v3_handle_svm_io_out(struct guest_info * core, struct svm_io_info * io_info)
 	write_size = 4;
     }
 
-    PrintDebug("OUT of %d bytes on  port %d (0x%x)\n", write_size, io_info->port, io_info->port);
+    PrintDebug(core->vm_info, core, "OUT of %d bytes on  port %d (0x%x)\n", write_size, io_info->port, io_info->port);
 
-    if (hook->write(core, io_info->port, &(core->vm_regs.rax), write_size, hook->priv_data) != write_size) {
-	// not sure how we handle errors.....
-	PrintError("Write Failure for out on port 0x%x\n", io_info->port);
-	return -1;
+    if (hook == NULL) {
+	PrintDebug(core->vm_info, core, "OUT operation on unhooked IO port 0x%x - ignored\n", io_info->port);
+    } else {
+	if (hook->write(core, io_info->port, &(core->vm_regs.rax), write_size, hook->priv_data) != write_size) {
+	    // not sure how we handle errors.....
+	    PrintError(core->vm_info, core, "Write Failure for out on port 0x%x\n", io_info->port);
+	    return -1;
+	}
     }
+    
 
     return 0;
 }
@@ -269,7 +282,7 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
     uint_t rep_num = 1;
     ullong_t mask = 0;
     addr_t inst_ptr;
-    struct v3_segment * theseg = &(core->segments.es); // default is ES
+    struct v3_segment * theseg = &(core->segments.ds); // default is DS
 
     // This is kind of hacky...
     // direction can equal either 1 or -1
@@ -281,14 +294,7 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
 	direction = -1;
     }
 
-
-    if (hook == NULL) {
-	PrintError("Hook Not present for outs on port 0x%x\n", io_info->port);
-	// error, we should not have exited on this port
-	return -1;
-    }
-
-    PrintDebug("OUTS on  port %d (0x%x)\n", io_info->port, io_info->port);
+    PrintDebug(core->vm_info, core, "OUTS on  port %d (0x%x)\n", io_info->port, io_info->port);
 
     if (io_info->sz8) { 
 	write_size = 1;
@@ -309,12 +315,12 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
 	// This value should be set depending on the host register size...
 	mask = get_gpr_mask(core);
 
-	PrintDebug("OUTS io_info invalid address size, mask=0%p, io_info=0x%p\n",
+	PrintDebug(core->vm_info, core, "OUTS io_info invalid address size, mask=0%p, io_info=0x%p\n",
 		   (void *)(addr_t)mask, (void *)(addr_t)io_info);
-	// PrintDebug("INS Aborted... Check implementation\n");
+	// PrintDebug(core->vm_info, core, "INS Aborted... Check implementation\n");
 	//return -1;
 	// should never happen
-	//PrintDebug("Invalid Address length\n");
+	//PrintDebug(core->vm_info, core, "Invalid Address length\n");
 	//return -1;
     }
 
@@ -326,7 +332,7 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
 
 
     if (v3_gva_to_hva(core, get_addr_linear(core, core->rip, &(core->segments.cs)), &inst_ptr) == -1) {
-	PrintError("Can't access instruction\n");
+	PrintError(core->vm_info, core, "Can't access instruction\n");
 	return -1;
     }
 
@@ -356,7 +362,7 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
 	inst_ptr++;
     }
 
-    PrintDebug("OUTS size=%d for %d steps\n", write_size, rep_num);
+    PrintDebug(core->vm_info, core, "OUTS size=%d for %d steps\n", write_size, rep_num);
 
     while (rep_num > 0) {
 	addr_t host_addr = 0;
@@ -364,15 +370,20 @@ int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info
 	dst_addr = get_addr_linear(core, (core->vm_regs.rsi & mask), theseg);
     
 	if (v3_gva_to_hva(core, dst_addr, &host_addr) == -1) {
-	    PrintError("Could not translate outs dest addr, either page fault or gpf...\n");
+	    PrintError(core->vm_info, core, "Could not translate outs dest addr, either page fault or gpf...\n");
 	    return -1;
 	}
 
-	if (hook->write(core, io_info->port, (char*)host_addr, write_size, hook->priv_data) != write_size) {
-	    // not sure how we handle errors.....
-	    PrintError("Write Failure for outs on port 0x%x\n", io_info->port);
-	    return -1;
+	if (hook == NULL) {
+	    PrintDebug(core->vm_info, core, "OUTS operation on unhooked IO port 0x%x - ignored\n", io_info->port);
+	} else {
+	    if (hook->write(core, io_info->port, (char*)host_addr, write_size, hook->priv_data) != write_size) {
+		// not sure how we handle errors.....
+		PrintError(core->vm_info, core, "Write Failure for outs on port 0x%x\n", io_info->port);
+		return -1;
+	    }
 	}
+	
 
 	core->vm_regs.rsi += write_size * direction;