X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=1aa76ae6133863b3f6091bcfaf1ce9c538f305e2;hb=642821b60b7f80206b51a18542628438aa891c70;hp=1ec4a60a7b37d1c326fddd76e29f4dcd1e517e9e;hpb=4290e5f20a4ea5e5f32cb8228ac4d7446dc1021b;p=palacios.git

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index 1ec4a60..1aa76ae 100644
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -17,6 +17,7 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
+
 #include <palacios/svm_io.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_ctrl_regs.h>
@@ -29,8 +30,8 @@
 #endif
 
 
-static int update_map(struct guest_info * info, uint16_t port, int hook_read, int hook_write) {
-    uchar_t * bitmap = (uint8_t *)(info->io_map.arch_data);;
+static int update_map(struct v3_vm_info * vm, uint16_t port, int hook_read, int hook_write) {
+    uchar_t * bitmap = (uint8_t *)(vm->io_map.arch_data);;
     int major = port / 8;
     int minor = port % 8;
 
@@ -44,23 +45,28 @@ static int update_map(struct guest_info * info, uint16_t port, int hook_read, in
 }
 
 
-int v3_init_svm_io_map(struct guest_info * info) {
-    info->io_map.update_map = update_map;
+int v3_init_svm_io_map(struct v3_vm_info * vm) {
+    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);
 
-    info->io_map.arch_data = V3_VAddr(V3_AllocPages(3));
-    memset(info->io_map.arch_data, 0, PAGE_SIZE_4KB * 3);
 
+    v3_refresh_io_map(vm);
 
-    v3_refresh_io_map(info);
+    return 0;
+}
 
+int v3_deinit_svm_io_map(struct v3_vm_info * vm) {
+    V3_FreePages(V3_PAddr(vm->io_map.arch_data), 3);
     return 0;
 }
 
 
 
 // This should package up an IO request and call vmm_handle_io
-int v3_handle_svm_io_in(struct guest_info * info, struct svm_io_info * io_info) {
-    struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port);
+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) {
@@ -80,7 +86,7 @@ int v3_handle_svm_io_in(struct guest_info * info, struct svm_io_info * io_info)
 
     PrintDebug("IN of %d bytes on port %d (0x%x)\n", read_size, io_info->port, io_info->port);
 
-    if (hook->read(io_info->port, &(info->vm_regs.rax), read_size, hook->priv_data) != read_size) {
+    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;
@@ -96,13 +102,13 @@ int v3_handle_svm_io_in(struct guest_info * info, struct svm_io_info * io_info)
 /* We might not handle wrap around of the RDI register correctly...
  * In that if we do wrap around the effect will manifest in the higher bits of the register
  */
-int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info) {
-    struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port);
+int v3_handle_svm_io_ins(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;
     addr_t dst_addr = 0;
     uint_t rep_num = 1;
     ullong_t mask = 0;
-    struct v3_segment * theseg = &(info->segments.es); // default is ES
+    struct v3_segment * theseg = &(core->segments.es); // default is ES
     addr_t inst_ptr;
 
 
@@ -110,7 +116,7 @@ int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info)
     // direction can equal either 1 or -1
     // We will multiply the final added offset by this value to go the correct direction
     int direction = 1;
-    struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags);  
+    struct rflags * flags = (struct rflags *)&(core->ctrl_regs.rflags);  
 
     if (flags->df) {
 	direction = -1;
@@ -125,7 +131,7 @@ int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info)
 
 
 
-    if (guest_va_to_host_va(info, get_addr_linear(info, info->rip, &(info->segments.cs)), &inst_ptr) == -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");
 	return -1;
     }
@@ -133,22 +139,22 @@ int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info)
     while (is_prefix_byte(*((char *)inst_ptr))) {
 	switch (*((char *)inst_ptr)) {
 	    case PREFIX_CS_OVERRIDE:
-		theseg = &(info->segments.cs);
+		theseg = &(core->segments.cs);
 		break;
 	    case PREFIX_SS_OVERRIDE:
-		theseg = &(info->segments.ss);
+		theseg = &(core->segments.ss);
 		break;
 	    case PREFIX_DS_OVERRIDE:
-		theseg = &(info->segments.ds);
+		theseg = &(core->segments.ds);
 		break;
 	    case PREFIX_ES_OVERRIDE:
-		theseg = &(info->segments.es);
+		theseg = &(core->segments.es);
 		break;
 	    case PREFIX_FS_OVERRIDE:
-		theseg = &(info->segments.fs);
+		theseg = &(core->segments.fs);
 		break;
 	    case PREFIX_GS_OVERRIDE:
-		theseg = &(info->segments.gs);
+		theseg = &(core->segments.gs);
 		break;
 	    default:
 		break;
@@ -179,7 +185,7 @@ int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info)
 	mask = 0xffffffffffffffffLL;
     } else {
 	// This value should be set depending on the host register size...
-	mask = get_gpr_mask(info);
+	mask = get_gpr_mask(core);
 
 	PrintDebug("INS io_info invalid address size, mask=0x%p, io_info=0x%p\n",
 		   (void *)(addr_t)mask, (void *)(addr_t)(io_info));
@@ -188,7 +194,7 @@ int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info)
     }
 
     if (io_info->rep) {
-	rep_num = info->vm_regs.rcx & mask;
+	rep_num = core->vm_regs.rcx & mask;
 	//rep_num = info->vm_regs.rcx;
     }
 
@@ -197,26 +203,26 @@ int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info)
 
     while (rep_num > 0) {
 	addr_t host_addr;
-	dst_addr = get_addr_linear(info, (info->vm_regs.rdi & mask), theseg);
+	dst_addr = get_addr_linear(core, (core->vm_regs.rdi & mask), theseg);
     
 	//	PrintDebug("Writing 0x%p\n", (void *)dst_addr);
 
-	if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) {
+	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");
 	    return -1;
 	}
 
-	if (hook->read(io_info->port, (char *)host_addr, read_size, hook->priv_data) != read_size) {
+	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;
 	}
 
-	info->vm_regs.rdi += (read_size * direction);
+	core->vm_regs.rdi += (read_size * direction);
 
 	if (io_info->rep) {
-	    info->vm_regs.rcx--;
+	    core->vm_regs.rcx--;
 	}
 
 	rep_num--;
@@ -225,8 +231,8 @@ int v3_handle_svm_io_ins(struct guest_info * info, struct svm_io_info * io_info)
     return 0;
 }
 
-int v3_handle_svm_io_out(struct guest_info * info, struct svm_io_info * io_info) {
-    struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port);
+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) {
@@ -246,7 +252,7 @@ int v3_handle_svm_io_out(struct guest_info * info, struct svm_io_info * io_info)
 
     PrintDebug("OUT of %d bytes on  port %d (0x%x)\n", write_size, io_info->port, io_info->port);
 
-    if (hook->write(io_info->port, &(info->vm_regs.rax), write_size, hook->priv_data) != write_size) {
+    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;
@@ -260,21 +266,21 @@ int v3_handle_svm_io_out(struct guest_info * info, struct svm_io_info * io_info)
  * In that if we do wrap around the effect will manifest in the higher bits of the register
  */
 
-int v3_handle_svm_io_outs(struct guest_info * info,  struct svm_io_info * io_info) {
+int v3_handle_svm_io_outs(struct guest_info * core, struct svm_io_info * io_info) {
  
-    struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port);
+    struct v3_io_hook * hook = v3_get_io_hook(core->vm_info, io_info->port);
     int write_size = 0;
     addr_t dst_addr = 0;
     uint_t rep_num = 1;
     ullong_t mask = 0;
     addr_t inst_ptr;
-    struct v3_segment * theseg = &(info->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
     // We will multiply the final added offset by this value to go the correct direction
     int direction = 1;
-    struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags);  
+    struct rflags * flags = (struct rflags *)&(core->ctrl_regs.rflags);  
 
     if (flags->df) {
 	direction = -1;
@@ -306,7 +312,7 @@ int v3_handle_svm_io_outs(struct guest_info * info,  struct svm_io_info * io_inf
 	mask = 0xffffffffffffffffLL;
     } else {
 	// This value should be set depending on the host register size...
-	mask = get_gpr_mask(info);
+	mask = get_gpr_mask(core);
 
 	PrintDebug("OUTS io_info invalid address size, mask=0%p, io_info=0x%p\n",
 		   (void *)(addr_t)mask, (void *)(addr_t)io_info);
@@ -318,13 +324,13 @@ int v3_handle_svm_io_outs(struct guest_info * info,  struct svm_io_info * io_inf
     }
 
     if (io_info->rep) {
-	rep_num = info->vm_regs.rcx & mask;
+	rep_num = core->vm_regs.rcx & mask;
     }
 
   
 
 
-    if (guest_va_to_host_va(info, get_addr_linear(info, info->rip, &(info->segments.cs)), &inst_ptr) == -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");
 	return -1;
     }
@@ -332,22 +338,22 @@ int v3_handle_svm_io_outs(struct guest_info * info,  struct svm_io_info * io_inf
     while (is_prefix_byte(*((char *)inst_ptr))) {
 	switch (*((char *)inst_ptr)) {
 	    case PREFIX_CS_OVERRIDE:
-		theseg = &(info->segments.cs);
+		theseg = &(core->segments.cs);
 		break;
 	    case PREFIX_SS_OVERRIDE:
-		theseg = &(info->segments.ss);
+		theseg = &(core->segments.ss);
 		break;
 	    case PREFIX_DS_OVERRIDE:
-		theseg = &(info->segments.ds);
+		theseg = &(core->segments.ds);
 		break;
 	    case PREFIX_ES_OVERRIDE:
-		theseg = &(info->segments.es);
+		theseg = &(core->segments.es);
 		break;
 	    case PREFIX_FS_OVERRIDE:
-		theseg = &(info->segments.fs);
+		theseg = &(core->segments.fs);
 		break;
 	    case PREFIX_GS_OVERRIDE:
-		theseg = &(info->segments.gs);
+		theseg = &(core->segments.gs);
 		break;
 	    default:
 		break;
@@ -358,24 +364,25 @@ int v3_handle_svm_io_outs(struct guest_info * info,  struct svm_io_info * io_inf
     PrintDebug("OUTS size=%d for %d steps\n", write_size, rep_num);
 
     while (rep_num > 0) {
-	addr_t host_addr;
+	addr_t host_addr = 0;
 
-	dst_addr = get_addr_linear(info, (info->vm_regs.rsi & mask), theseg);
+	dst_addr = get_addr_linear(core, (core->vm_regs.rsi & mask), theseg);
     
-	if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) {
-	    // either page fault or gpf...
+	if (v3_gva_to_hva(core, dst_addr, &host_addr) == -1) {
+	    PrintError("Could not translate outs dest addr, either page fault or gpf...\n");
+	    return -1;
 	}
 
-	if (hook->write(io_info->port, (char*)host_addr, write_size, hook->priv_data) != write_size) {
+	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;
 	}
 
-	info->vm_regs.rsi += write_size * direction;
+	core->vm_regs.rsi += write_size * direction;
 
 	if (io_info->rep) {
-	    info->vm_regs.rcx--;
+	    core->vm_regs.rcx--;
 	}
 
 	rep_num--;