X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=1ec4a60a7b37d1c326fddd76e29f4dcd1e517e9e;hb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84;hp=ab62acdb5a3e2f62f779ede8daceb35123b28b15;hpb=fb18e4a36e92a1da066737f3d9b072259020e3f8;p=palacios.git diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c index ab62acd..1ec4a60 100644 --- a/palacios/src/palacios/svm_io.c +++ b/palacios/src/palacios/svm_io.c @@ -23,26 +23,48 @@ #include #include -#ifndef DEBUG_IO +#ifndef CONFIG_DEBUG_IO #undef PrintDebug #define PrintDebug(fmt, args...) #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);; + int major = port / 8; + int minor = port % 8; + if ((hook_read == 0) && (hook_write == 0)) { + *(bitmap + major) &= ~(0x1 << minor); + } else { + *(bitmap + major) |= (0x1 << minor); + } + + return 0; +} -// This should package up an IO request and call vmm_handle_io -int v3_handle_svm_io_in(struct guest_info * info) { - vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data)); - // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1); +int v3_init_svm_io_map(struct guest_info * info) { + info->io_map.update_map = update_map; + + 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(info); + + 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 read_size = 0; if (hook == NULL) { - PrintError("Hook Not present for in on port %x\n", io_info->port); + 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; } @@ -60,12 +82,10 @@ int v3_handle_svm_io_in(struct guest_info * info) { if (hook->read(io_info->port, &(info->vm_regs.rax), read_size, hook->priv_data) != read_size) { // not sure how we handle errors..... - PrintError("Read Failure for in on port %x\n", io_info->port); + PrintError("Read Failure for in on port 0x%x\n", io_info->port); return -1; } - info->rip = ctrl_area->exit_info2; - return 0; } @@ -76,18 +96,13 @@ int v3_handle_svm_io_in(struct guest_info * 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) { - vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data)); - vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - - struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1); - +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 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 = &(info->segments.es); // default is ES addr_t inst_ptr; @@ -95,7 +110,7 @@ int v3_handle_svm_io_ins(struct guest_info * 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 *)&(guest_state->rflags); + struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags); if (flags->df) { direction = -1; @@ -103,7 +118,7 @@ int v3_handle_svm_io_ins(struct guest_info * info) { if (hook == NULL) { - PrintError("Hook Not present for ins on port %x\n", io_info->port); + 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; } @@ -115,8 +130,8 @@ int v3_handle_svm_io_ins(struct guest_info * info) { return -1; } - while (is_prefix_byte(*((char*)inst_ptr))) { - switch (*((char*)inst_ptr)) { + while (is_prefix_byte(*((char *)inst_ptr))) { + switch (*((char *)inst_ptr)) { case PREFIX_CS_OVERRIDE: theseg = &(info->segments.cs); break; @@ -182,9 +197,9 @@ int v3_handle_svm_io_ins(struct guest_info * 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(info, (info->vm_regs.rdi & mask), theseg); - PrintDebug("Writing 0x%p\n", (void *)dst_addr); + // PrintDebug("Writing 0x%p\n", (void *)dst_addr); if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) { // either page fault or gpf... @@ -192,13 +207,13 @@ int v3_handle_svm_io_ins(struct guest_info * info) { return -1; } - if (hook->read(io_info->port, (char*)host_addr, read_size, hook->priv_data) != read_size) { + if (hook->read(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 %x\n", io_info->port); + PrintError("Read Failure for ins on port 0x%x\n", io_info->port); return -1; } - info->vm_regs.rdi += read_size * direction; + info->vm_regs.rdi += (read_size * direction); if (io_info->rep) { info->vm_regs.rcx--; @@ -207,22 +222,15 @@ int v3_handle_svm_io_ins(struct guest_info * info) { rep_num--; } - - info->rip = ctrl_area->exit_info2; - return 0; } -int v3_handle_svm_io_out(struct guest_info * info) { - vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data)); - // vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1); - +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 write_size = 0; if (hook == NULL) { - PrintError("Hook Not present for out on port %x\n", io_info->port); + 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; } @@ -240,12 +248,10 @@ int v3_handle_svm_io_out(struct guest_info * info) { if (hook->write(io_info->port, &(info->vm_regs.rax), write_size, hook->priv_data) != write_size) { // not sure how we handle errors..... - PrintError("Write Failure for out on port %x\n", io_info->port); + PrintError("Write Failure for out on port 0x%x\n", io_info->port); return -1; } - info->rip = ctrl_area->exit_info2; - return 0; } @@ -254,13 +260,8 @@ int v3_handle_svm_io_out(struct guest_info * 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) { - vmcb_ctrl_t * ctrl_area = GET_VMCB_CTRL_AREA((vmcb_t *)(info->vmm_data)); - vmcb_saved_state_t * guest_state = GET_VMCB_SAVE_STATE_AREA((vmcb_t*)(info->vmm_data)); - - - struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1); - +int v3_handle_svm_io_outs(struct guest_info * info, struct svm_io_info * io_info) { + struct v3_io_hook * hook = v3_get_io_hook(info, io_info->port); int write_size = 0; addr_t dst_addr = 0; @@ -273,7 +274,7 @@ int v3_handle_svm_io_outs(struct guest_info * 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 *)&(guest_state->rflags); + struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags); if (flags->df) { direction = -1; @@ -281,7 +282,7 @@ int v3_handle_svm_io_outs(struct guest_info * info) { if (hook == NULL) { - PrintError("Hook Not present for outs on port %x\n", io_info->port); + 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; } @@ -323,13 +324,13 @@ int v3_handle_svm_io_outs(struct guest_info * info) { - if (guest_va_to_host_va(info,get_addr_linear(info,info->rip,&(info->segments.cs)),&inst_ptr)==-1) { + if (guest_va_to_host_va(info, get_addr_linear(info, info->rip, &(info->segments.cs)), &inst_ptr) == -1) { PrintError("Can't access instruction\n"); return -1; } - while (is_prefix_byte(*((char*)inst_ptr))) { - switch (*((char*)inst_ptr)) { + while (is_prefix_byte(*((char *)inst_ptr))) { + switch (*((char *)inst_ptr)) { case PREFIX_CS_OVERRIDE: theseg = &(info->segments.cs); break; @@ -367,7 +368,7 @@ int v3_handle_svm_io_outs(struct guest_info * info) { if (hook->write(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 %x\n", io_info->port); + PrintError("Write Failure for outs on port 0x%x\n", io_info->port); return -1; } @@ -380,9 +381,5 @@ int v3_handle_svm_io_outs(struct guest_info * info) { rep_num--; } - - info->rip = ctrl_area->exit_info2; - - return 0; }