X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest_mem.c;h=caf8a8985ecb9175d136444e1cd03b5d8425d073;hb=3db6f4c76bd6412d0154b7693c1516d792486b13;hp=9a7fe63cca38c7029602292aeeab90e7e009ba99;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.releases.git

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index 9a7fe63..caf8a89 100644
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -64,7 +64,7 @@ int v3_hpa_to_hva(addr_t hpa, addr_t * hva) {
 }
 
 int v3_gpa_to_hpa(struct guest_info * info, addr_t gpa, addr_t * hpa) {
-    struct v3_mem_region * reg = v3_get_mem_region(info->vm_info, info->cpu_id, gpa);
+    struct v3_mem_region * reg = v3_get_mem_region(info->vm_info, info->vcpu_id, gpa);
 
     if (reg == NULL) {
 	PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (NULL REGION)\n", 
@@ -73,8 +73,9 @@ int v3_gpa_to_hpa(struct guest_info * info, addr_t gpa, addr_t * hpa) {
     }
     
     if (reg->flags.alloced == 0) {
-	PrintError("In GPA->HPA: Tried to translate physical address of non allocated page (addr=%p)\n", 
-		   (void *)gpa);
+	//PrintError("In GPA->HPA: Tried to translate physical address of non allocated page (addr=%p)\n", 
+	//	   (void *)gpa);
+    //v3_print_mem_map(info->vm_info);
 	return -1;
     }
 	
@@ -132,8 +133,8 @@ int v3_gpa_to_hva(struct guest_info * guest_info, addr_t gpa, addr_t * hva) {
     *hva = 0;
 
     if (v3_gpa_to_hpa(guest_info, gpa, &hpa) != 0) {
-	PrintError("In GPA->HVA: Invalid GPA(%p)->HPA lookup\n", 
-		   (void *)gpa);
+	//	PrintError("In GPA->HVA: Invalid GPA(%p)->HPA lookup\n", 
+	//	   (void *)gpa);
 	return -1;
     }
   
@@ -167,15 +168,15 @@ int v3_gva_to_gpa(struct guest_info * guest_info, addr_t gva, addr_t * gpa) {
     switch (guest_info->cpu_mode) {
 	case PROTECTED:
 	    if (v3_translate_guest_pt_32(guest_info, guest_cr3, gva, gpa) == -1) {
-		PrintDebug("Could not translate addr (%p) through 32 bit guest PT at %p\n", 
-			   (void *)gva, (void *)(addr_t)guest_cr3);
+		/*PrintDebug("Could not translate addr (%p) through 32 bit guest PT at %p\n", 
+			   (void *)gva, (void *)(addr_t)guest_cr3);*/
 		return -1;
 	    }
 	    break;
 	case PROTECTED_PAE:
 	    if (v3_translate_guest_pt_32pae(guest_info, guest_cr3, gva, gpa) == -1) {
-		PrintDebug("Could not translate addr (%p) through 32 bitpae guest PT at %p\n", 
-			   (void *)gva, (void *)(addr_t)guest_cr3);
+		/*PrintDebug("Could not translate addr (%p) through 32 bitpae guest PT at %p\n", 
+			   (void *)gva, (void *)(addr_t)guest_cr3);*/
 		return -1;
 	    }
 	    break;
@@ -183,8 +184,8 @@ int v3_gva_to_gpa(struct guest_info * guest_info, addr_t gva, addr_t * gpa) {
 	case LONG_32_COMPAT:
 	case LONG_16_COMPAT:
 	    if (v3_translate_guest_pt_64(guest_info, guest_cr3, gva, gpa) == -1) {
-		PrintDebug("Could not translate addr (%p) through 64 bit guest PT at %p\n", 
-			   (void *)gva, (void *)(addr_t)guest_cr3);
+		/*PrintDebug("Could not translate addr (%p) through 64 bit guest PT at %p\n", 
+			   (void *)gva, (void *)(addr_t)guest_cr3);*/
 		return -1;
 	    }
 	    break;
@@ -265,8 +266,8 @@ int v3_gva_to_hva(struct guest_info * guest_info, addr_t gva, addr_t * hva) {
     *hva = 0;
 
     if (v3_gva_to_gpa(guest_info, gva, &gpa) != 0) {
-	PrintError("In GVA->HVA: Invalid GVA(%p)->GPA lookup\n", 
-		   (void *)gva);
+	/*PrintError("In GVA->HVA: Invalid GVA(%p)->GPA lookup\n", 
+		   (void *)gva);*/
 	return -1;
     }
 
@@ -316,6 +317,56 @@ int v3_hva_to_gva(struct guest_info * guest_info, addr_t hva, addr_t * gva) {
 
 
 
+/* KCH: currently only checks if we can perform a user-mode write
+   return 1 on success */
+int v3_gva_can_access(struct guest_info * core, addr_t gva) {
+
+    v3_reg_t guest_cr3 = 0;
+    pf_error_t access_type;
+    pt_access_status_t access_status;
+
+    access_type.write = 1;
+    access_type.user = 1;
+    
+    if (core->mem_mode == PHYSICAL_MEM) {
+        return -1;
+    }
+    
+    if (core->shdw_pg_mode == SHADOW_PAGING) {
+        guest_cr3 = core->shdw_pg_state.guest_cr3;
+    } else {
+        guest_cr3 = core->ctrl_regs.cr3;
+    }
+    
+    // guest is in paged mode
+    switch (core->cpu_mode) {
+    case PROTECTED:
+        if (v3_check_guest_pt_32(core, guest_cr3, gva, access_type, &access_status) == -1) {
+            return -1;
+        }
+        break;
+    case PROTECTED_PAE:
+        if (v3_check_guest_pt_32pae(core, guest_cr3, gva, access_type, &access_status) == -1) {
+            return -1;
+        }
+        break;
+    case LONG:
+    case LONG_32_COMPAT:
+    case LONG_16_COMPAT:
+        if (v3_check_guest_pt_64(core, guest_cr3, gva, access_type, &access_status) == -1) {
+            return -1;
+        }
+        break;
+    default:
+        return -1;
+    }
+
+    if (access_status != PT_ACCESS_OK) {
+        return 0;
+    } else {
+        return 1;
+    }
+}