Changeset 47123 in vbox for trunk/include/VBox/vmm

Timestamp:

Jul 12, 2013 3:31:44 PM (12 years ago)

Author:

vboxsync

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

87217

Message:

VMM/HM: Dispatch host NMIs on Intel. Added separate STAM counter for host NMIs with the necessary changes to old, new VT-x, AMD-V code.

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (7 diffs)
• vm.h (modified) (2 diffs)
• vm.mac (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1527 +1527 @@
 
 
-#if RT_INLINE_ASM_GNU_STYLE
-# define __STR(x)   #x
-# define STR(x)     __STR(x)
-#endif
-
-
 /** @defgroup grp_vmx_asm   vmx assembly helpers
  * @ingroup grp_vmx
@@ -1547 +1541 @@
  */
 DECLASM(int) VMXRestoreHostState(uint32_t fRestoreHostFlags, PVMXRESTOREHOST pRestoreHost);
+
+
+/**
+ * Dispatches an NMI to the host.
+ */
+DECLASM(int) VMXDispatchHostNmi(void);
 
 
@@ -1568 +1568 @@
        "ja       2f                                             \n\t"
        "je       1f                                             \n\t"
-       "movl     $"STR(VERR_VMX_INVALID_VMXON_PTR)", %0         \n\t"
+       "movl     $"RT_XSTR(VERR_VMX_INVALID_VMXON_PTR)", %0     \n\t"
        "jmp      2f                                             \n\t"
        "1:                                                      \n\t"
-       "movl     $"STR(VERR_VMX_VMXON_FAILED)", %0              \n\t"
+       "movl     $"RT_XSTR(VERR_VMX_VMXON_FAILED)", %0          \n\t"
        "2:                                                      \n\t"
        "add      $8, %%esp                                      \n\t"
@@ -1648 +1648 @@
        ".byte   0x66, 0x0F, 0xC7, 0x34, 0x24  # VMCLEAR [esp]   \n\t"
        "jnc     1f                                              \n\t"
-       "movl    $"STR(VERR_VMX_INVALID_VMCS_PTR)", %0           \n\t"
+       "movl    $"RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0       \n\t"
        "1:                                                      \n\t"
        "add     $8, %%esp                                       \n\t"
@@ -1696 +1696 @@
        ".byte   0x0F, 0xC7, 0x34, 0x24  # VMPTRLD [esp]         \n\t"
        "jnc     1f                                              \n\t"
-       "movl    $"STR(VERR_VMX_INVALID_VMCS_PTR)", %0           \n\t"
+       "movl    $"RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0       \n\t"
        "1:                                                      \n\t"
        "add     $8, %%esp                                       \n\t"
@@ -1750 +1750 @@
        "ja     2f                                               \n\t"
        "je     1f                                               \n\t"
-       "movl   $"STR(VERR_VMX_INVALID_VMCS_PTR)", %0            \n\t"
+       "movl   $"RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0        \n\t"
        "jmp    2f                                               \n\t"
        "1:                                                      \n\t"
-       "movl   $"STR(VERR_VMX_INVALID_VMCS_FIELD)", %0          \n\t"
+       "movl   $"RT_XSTR(VERR_VMX_INVALID_VMCS_FIELD)", %0      \n\t"
        "2:                                                      \n\t"
        :"=rm"(rc)
@@ -1854 +1854 @@
 # if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__ (
-       "movl   $"STR(VINF_SUCCESS)", %0                          \n\t"
+       "movl   $"RT_XSTR(VINF_SUCCESS)", %0                      \n\t"
        ".byte  0x0F, 0x78, 0xc2        # VMREAD eax, edx         \n\t"
        "ja     2f                                                \n\t"
        "je     1f                                                \n\t"
-       "movl   $"STR(VERR_VMX_INVALID_VMCS_PTR)", %0             \n\t"
+       "movl   $"RT_XSTR(VERR_VMX_INVALID_VMCS_PTR)", %0         \n\t"
        "jmp    2f                                                \n\t"
        "1:                                                       \n\t"
-       "movl   $"STR(VERR_VMX_INVALID_VMCS_FIELD)", %0           \n\t"
+       "movl   $"RT_XSTR(VERR_VMX_INVALID_VMCS_FIELD)", %0       \n\t"
        "2:                                                       \n\t"
        :"=&r"(rc),

trunk/include/VBox/vmm/vm.h

@@ -149 +149 @@
         struct HMCPU    s;
 #endif
-        uint8_t             padding[5504];      /* multiple of 64 */
+        uint8_t             padding[5568];      /* multiple of 64 */
     } hm;
 
@@ -226 +226 @@
 
     /** Align the following members on page boundary. */
-    uint8_t                 abAlignment2[256];
+    uint8_t                 abAlignment2[192];
 
     /** PGM part. */

trunk/include/VBox/vmm/vm.mac

@@ -135 +135 @@
 
     .cpum                   resb 3584
-    .hm                     resb 5504
+    .hm                     resb 5568
     .em                     resb 1472
     .iem                    resb 3072