updated IO and MSRs to allow hooking/unhooking dynamic at runtime

[palacios.git] / palacios / src / palacios / svm_io.c

diff --git a/palacios/src/palacios/svm_io.c b/palacios/src/palacios/svm_io.c
index 99f83a7..4c85ec7 100644 (file)
--- a/palacios/src/palacios/svm_io.c
+++ b/palacios/src/palacios/svm_io.c
@@ -29,6 +29,29 @@
 #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;
+}
+
+
+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);
+
+    return 0;
+}
 
 
 
@@ -87,7 +110,7 @@ int v3_handle_svm_io_ins(struct guest_info * info) {
     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;
 
 
@@ -115,8 +138,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;
@@ -173,8 +196,8 @@ int v3_handle_svm_io_ins(struct guest_info * info) {
     }
 
     if (io_info->rep) {
-       //    rep_num = info->vm_regs.rcx & mask;
-       rep_num = info->vm_regs.rcx;
+       rep_num = info->vm_regs.rcx & mask;
+       //rep_num = info->vm_regs.rcx;
     }
 
 
@@ -182,9 +205,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,17 +215,18 @@ 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);
            return -1;
        }
 
-       info->vm_regs.rdi += read_size * direction;
+       info->vm_regs.rdi += (read_size * direction);
 
-       if (io_info->rep)
+       if (io_info->rep) {
            info->vm_regs.rcx--;
-    
+       }
+
        rep_num--;
     }
 
@@ -322,13 +346,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;