X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=40c1b769be0cd3b7121c8e39ed9a95996dc45f9f;hb=783acda8c0173cb6ad0331ca26c69f7a83b2f377;hp=f6e9c62675bb4525ec80f9b03682df7372617a20;hpb=e9bfcdfa725b34d81c48d713adf9d173f3168951;p=palacios.releases.git diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c index f6e9c62..40c1b76 100644 --- a/palacios/src/palacios/svm_io.c +++ b/palacios/src/palacios/svm_io.c @@ -4,6 +4,11 @@ #include #include +#ifndef DEBUG_IO +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif + // This should package up an IO request and call vmm_handle_io int handle_svm_io_in(struct guest_info * info) { @@ -11,11 +16,11 @@ int handle_svm_io_in(struct guest_info * info) { // 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); - vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port); + struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); uint_t read_size = 0; if (hook == NULL) { - PrintDebug("Hook Not present for in on port %x\n", io_info->port); + PrintError("Hook Not present for in on port %x\n", io_info->port); // error, we should not have exited on this port return -1; } @@ -33,7 +38,7 @@ int 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..... - PrintDebug("Read Failure for in on port %x\n", io_info->port); + PrintError("Read Failure for in on port %x\n", io_info->port); return -1; } @@ -55,7 +60,7 @@ int handle_svm_io_ins(struct guest_info * info) { struct svm_io_info * io_info = (struct svm_io_info *)&(ctrl_area->exit_info1); - vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port); + struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); uint_t read_size = 0; addr_t dst_addr = 0; @@ -75,11 +80,47 @@ int handle_svm_io_ins(struct guest_info * info) { if (hook == NULL) { - PrintDebug("Hook Not present for ins on port %x\n", io_info->port); + PrintError("Hook Not present for ins on port %x\n", io_info->port); // error, we should not have exited on this port return -1; } + struct v3_segment *theseg = &(info->segments.es); // default is ES + + addr_t inst_ptr; + + if (guest_va_to_host_pa(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)) { + case PREFIX_CS_OVERRIDE: + theseg = &(info->segments.cs); + break; + case PREFIX_SS_OVERRIDE: + theseg = &(info->segments.ss); + break; + case PREFIX_DS_OVERRIDE: + theseg = &(info->segments.ds); + break; + case PREFIX_ES_OVERRIDE: + theseg = &(info->segments.es); + break; + case PREFIX_FS_OVERRIDE: + theseg = &(info->segments.fs); + break; + case PREFIX_GS_OVERRIDE: + theseg = &(info->segments.gs); + break; + default: + break; + } + inst_ptr++; + } + + PrintDebug("INS on port %d (0x%x)\n", io_info->port, io_info->port); if (io_info->sz8) { @@ -89,7 +130,7 @@ int handle_svm_io_ins(struct guest_info * info) { } else if (io_info->sz32) { read_size = 4; } else { - PrintDebug("io_info Invalid Size\n"); + PrintError("io_info Invalid Size\n"); return -1; } @@ -104,7 +145,7 @@ int handle_svm_io_ins(struct guest_info * info) { // This value should be set depending on the host register size... mask = get_gpr_mask(info); - PrintDebug("INS io_info invalid address size, assuming 32, io_info=0x%x\n",*((uint_t*)(io_info))); + PrintDebug("INS io_info invalid address size, mask=0x%x, io_info=0x%x\n",mask,*((uint_t*)(io_info))); // PrintDebug("INS Aborted... Check implementation\n"); //return -1; } @@ -119,17 +160,19 @@ int 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, &(info->segments.es)); + dst_addr = get_addr_linear(info, info->vm_regs.rdi & mask, theseg); + PrintDebug("Writing 0x%x\n", dst_addr); + if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) { // either page fault or gpf... - PrintDebug("Could not convert Guest VA to host VA\n"); + 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) { // not sure how we handle errors..... - PrintDebug("Read Failure for ins on port %x\n", io_info->port); + PrintError("Read Failure for ins on port %x\n", io_info->port); return -1; } @@ -152,11 +195,11 @@ int handle_svm_io_out(struct guest_info * info) { // 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); - vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port); + struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); uint_t write_size = 0; if (hook == NULL) { - PrintDebug("Hook Not present for out on port %x\n", io_info->port); + PrintError("Hook Not present for out on port %x\n", io_info->port); // error, we should not have exited on this port return -1; } @@ -174,7 +217,7 @@ int 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..... - PrintDebug("Write Failure for out on port %x\n", io_info->port); + PrintError("Write Failure for out on port %x\n", io_info->port); return -1; } @@ -191,10 +234,11 @@ int handle_svm_io_out(struct guest_info * info) { int 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); - vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port); + struct vmm_io_hook * hook = v3_get_io_hook(&(info->io_map), io_info->port); uint_t write_size = 0; addr_t dst_addr = 0; @@ -214,7 +258,7 @@ int handle_svm_io_outs(struct guest_info * info) { if (hook == NULL) { - PrintDebug("Hook Not present for outs on port %x\n", io_info->port); + PrintError("Hook Not present for outs on port %x\n", io_info->port); // error, we should not have exited on this port return -1; } @@ -240,7 +284,7 @@ int handle_svm_io_outs(struct guest_info * info) { // This value should be set depending on the host register size... mask = get_gpr_mask(info); - PrintDebug("OUTS io_info invalid address size, assuming 32, io_info=0x%x\n",*((uint_t*)(io_info))); + PrintDebug("OUTS io_info invalid address size, mask=0x%, io_info=0x%x\n",mask,*((uint_t*)(io_info))); // PrintDebug("INS Aborted... Check implementation\n"); //return -1; // should never happen @@ -252,11 +296,49 @@ int handle_svm_io_outs(struct guest_info * info) { rep_num = info->vm_regs.rcx & mask; } + struct v3_segment *theseg = &(info->segments.es); // default is ES + + addr_t inst_ptr; + + if (guest_va_to_host_pa(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)) { + case PREFIX_CS_OVERRIDE: + theseg = &(info->segments.cs); + break; + case PREFIX_SS_OVERRIDE: + theseg = &(info->segments.ss); + break; + case PREFIX_DS_OVERRIDE: + theseg = &(info->segments.ds); + break; + case PREFIX_ES_OVERRIDE: + theseg = &(info->segments.es); + break; + case PREFIX_FS_OVERRIDE: + theseg = &(info->segments.fs); + break; + case PREFIX_GS_OVERRIDE: + theseg = &(info->segments.gs); + break; + default: + break; + } + inst_ptr++; + } + PrintDebug("OUTS size=%d for %d steps\n", write_size, rep_num); while (rep_num > 0) { addr_t host_addr; - dst_addr = get_addr_linear(info, (info->vm_regs.rsi & mask), &(info->segments.ds)); + + + + dst_addr = get_addr_linear(info, (info->vm_regs.rsi & mask), theseg); if (guest_va_to_host_va(info, dst_addr, &host_addr) == -1) { // either page fault or gpf... @@ -264,7 +346,7 @@ int 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..... - PrintDebug("Write Failure for outs on port %x\n", io_info->port); + PrintError("Write Failure for outs on port %x\n", io_info->port); return -1; }