X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_io.c;h=33022f02436fe9e9b725deb0d9508020e878136c;hb=88a9fe78672db5f5672dc20a92253e508bd3b7e1;hp=dd027c6075ef51fdf2333a44c3a474e8063770d2;hpb=40be15894eccfbb51e42bcfe550aaf8d9841bc3a;p=palacios.git diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c index dd027c6..33022f0 100644 --- a/palacios/src/palacios/svm_io.c +++ b/palacios/src/palacios/svm_io.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include @@ -15,11 +15,11 @@ int handle_svm_io_in(struct guest_info * info) { uint_t read_size = 0; if (hook == NULL) { + PrintDebug("Hook Not present for in on port %x\n", io_info->port); // error, we should not have exited on this port return -1; } - //PrintDebug("IN on port %d (0x%x)\n", io_info->port, io_info->port); if (io_info->sz8) { read_size = 1; @@ -29,9 +29,11 @@ int handle_svm_io_in(struct guest_info * info) { read_size = 4; } + 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) != read_size) { + 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); return -1; } @@ -55,7 +57,7 @@ int handle_svm_io_ins(struct guest_info * info) { vmm_io_hook_t * hook = get_io_hook(&(info->io_map), io_info->port); uint_t read_size = 0; - addr_t base_addr = guest_state->es.base ; + addr_t dst_addr = 0; uint_t rep_num = 1; ullong_t mask = 0; @@ -73,21 +75,61 @@ 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); // error, we should not have exited on this port return -1; } - //PrintDebug("INS on port %d (0x%x)\n", io_info->port, io_info->port); + struct v3_segment *theseg = &(info->segments.es); // default is ES + + addr_t inst_ptr; - if (io_info->sz8) { + if (guest_va_to_host_pa(info,get_addr_linear(info,info->rip,&(info->segments.cs)),&inst_ptr)==-1) { + PrintDebug("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) { read_size = 1; } else if (io_info->sz16) { read_size = 2; } else if (io_info->sz32) { read_size = 4; + } else { + PrintDebug("io_info Invalid Size\n"); + return -1; } - + if (io_info->addr16) { mask = 0xffff; } else if (io_info->addr32) { @@ -95,26 +137,37 @@ int handle_svm_io_ins(struct guest_info * info) { } else if (io_info->addr64) { mask = 0xffffffffffffffffLL; } else { - // should never happen - return -1; + // This value should be set depending on the host register size... + mask = get_gpr_mask(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; } if (io_info->rep) { - rep_num = info->vm_regs.rcx & mask; + // rep_num = info->vm_regs.rcx & mask; + rep_num = info->vm_regs.rcx; } + PrintDebug("INS size=%d for %d steps\n", read_size, rep_num); while (rep_num > 0) { addr_t host_addr; - dst_addr = get_addr_linear(info, info->vm_regs.rdi & mask, base_addr); + 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"); + return -1; } - if (hook->read(io_info->port, (char*)host_addr, read_size) != read_size) { + 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); return -1; } @@ -141,11 +194,11 @@ int handle_svm_io_out(struct guest_info * info) { uint_t write_size = 0; if (hook == NULL) { + PrintDebug("Hook Not present for out on port %x\n", io_info->port); // error, we should not have exited on this port return -1; } - //PrintDebug("OUT on port %d (0x%x)\n", io_info->port, io_info->port); if (io_info->sz8) { write_size = 1; @@ -155,9 +208,11 @@ int handle_svm_io_out(struct guest_info * info) { write_size = 4; } + 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) != write_size) { + 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); return -1; } @@ -174,12 +229,13 @@ 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); uint_t write_size = 0; - addr_t base_addr = guest_state->ds.base; + addr_t dst_addr = 0; uint_t rep_num = 1; ullong_t mask = 0; @@ -197,11 +253,12 @@ 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); // 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("OUTS on port %d (0x%x)\n", io_info->port, io_info->port); if (io_info->sz8) { write_size = 1; @@ -219,25 +276,72 @@ int handle_svm_io_outs(struct guest_info * info) { } else if (io_info->addr64) { mask = 0xffffffffffffffffLL; } else { + // This value should be set depending on the host register size... + mask = get_gpr_mask(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 - return -1; + //PrintDebug("Invalid Address length\n"); + //return -1; } if (io_info->rep) { 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) { + PrintDebug("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), base_addr); + + + + 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... } - if (hook->write(io_info->port, (char*)host_addr, write_size) != write_size) { + 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); return -1; }