Changeset 80121 in vbox for trunk/include/VBox

Timestamp:

Aug 5, 2019 6:30:43 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132562

Message:

hmvmxinline.h: Added VBOX_WITH_VMREAD_VMWRITE_NOCHECK and corresponding assembly. Disabled currently only tested on Linux host.

File:

• trunk/include/VBox/vmm/hmvmxinline.h (modified) (10 diffs)

trunk/include/VBox/vmm/hmvmxinline.h

@@ -745 +745 @@
 {
 # if VMX_USE_MSC_INTRINSICS
-     unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u32Val);
+#  ifdef VBOX_WITH_VMREAD_VMWRITE_NOCHECK
+    __vmx_vmwrite(uFieldEnc, u32Val);
+    return VINF_SUCCESS;
+#  else
+    unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u32Val);
      if (RT_LIKELY(rcMsc == 0))
          return VINF_SUCCESS;
      return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+#  endif
 
 # elif RT_INLINE_ASM_GNU_STYLE
-    int rc;
+#  ifdef VBOX_WITH_VMREAD_VMWRITE_NOCHECK
+    __asm__ __volatile__ (
+       ".byte  0x0f, 0x79, 0xc2        # VMWRITE eax, edx       \n\t"
+       :
+       :"a"(uFieldEnc),
+        "d"(u32Val)
+       );
+    return VINF_SUCCESS;
+#  else
+     int rc;
     __asm__ __volatile__ (
        ".byte  0x0f, 0x79, 0xc2        # VMWRITE eax, edx       \n\t"
@@ -767 +781 @@
        );
     return rc;
+#  endif
 
 # elif defined(RT_ARCH_X86)
@@ -873 +888 @@
 {
 # if VMX_USE_MSC_INTRINSICS
+#  ifdef VBOX_WITH_VMREAD_VMWRITE_NOCHECK
+    __vmx_vmwrite(uFieldEnc, u64Val);
+    return VINF_SUCCESS;
+#  else
     unsigned char rcMsc = __vmx_vmwrite(uFieldEnc, u64Val);
     if (RT_LIKELY(rcMsc == 0))
         return VINF_SUCCESS;
     return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+#  endif
 
 # elif RT_INLINE_ASM_GNU_STYLE
+#  ifdef VBOX_WITH_VMREAD_VMWRITE_NOCHECK
+    __asm__ __volatile__ (
+       ".byte  0x0f, 0x79, 0xc2        # VMWRITE eax, edx        \n\t"
+       :
+       :"a"(uFieldEnc),
+        "d"(u64Val)
+       );
+    return VINF_SUCCESS;
+#  else
     int rc;
     __asm__ __volatile__ (
@@ -895 +924 @@
        );
     return rc;
+#  endif
 
 # else
@@ -989 +1019 @@
 {
 # if VMX_USE_MSC_INTRINSICS
+#  ifdef VBOX_WITH_VMREAD_VMWRITE_NOCHECK
+    uint64_t u64Tmp = 0;
+    __vmx_vmread(uFieldEnc, &u64Tmp);
+    *pData = (uint32_t)u64Tmp;
+    return VINF_SUCCESS;
+#  else
     unsigned char rcMsc;
     uint64_t u64Tmp;
@@ -996 +1032 @@
         return VINF_SUCCESS;
     return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+#  endif
 
 # elif RT_INLINE_ASM_GNU_STYLE
+#  ifdef VBOX_WITH_VMREAD_VMWRITE_NOCHECK
+    __asm__ __volatile__ (
+       ".byte  0x0f, 0x78, 0xc2        # VMREAD eax, edx         \n\t"
+       :"=d"(*pData)
+       :"a"(uFieldEnc),
+        "d"(0)
+       );
+    return VINF_SUCCESS;
+#  else
     int rc;
     __asm__ __volatile__ (
@@ -1015 +1061 @@
        );
     return rc;
+#  endif
 
 # elif defined(RT_ARCH_X86)
@@ -1132 +1179 @@
 {
 # if VMX_USE_MSC_INTRINSICS
+#  ifdef VBOX_WITH_VMREAD_NOCHECK
+    __vmx_vmread(uFieldEnc, pData);
+    return VINF_SUCCESS;
+#  else
     unsigned char rcMsc;
     rcMsc = __vmx_vmread(uFieldEnc, pData);
@@ -1137 +1188 @@
         return VINF_SUCCESS;
     return rcMsc == 2 ? VERR_VMX_INVALID_VMCS_PTR : VERR_VMX_INVALID_VMCS_FIELD;
+#  endif
 
 # elif RT_INLINE_ASM_GNU_STYLE
+#  ifdef VBOX_WITH_VMREAD_NOCHECK
+    __asm__ __volatile__ (
+       ".byte  0x0f, 0x78, 0xc2        # VMREAD eax, edx         \n\t"
+       :"=d"(*pData)
+       :"a"(uFieldEnc),
+        "d"(0)
+       );
+    return VINF_SUCCESS;
+#  else
     int rc;
     __asm__ __volatile__ (
@@ -1156 +1217 @@
        );
     return rc;
-
+#  endif
 # else
 #  error "Shouldn't be here..."