Changeset 45276 in vbox for trunk/src/VBox/VMM/include/SELMInternal.h

Timestamp:

Apr 2, 2013 8:17:11 AM (12 years ago)

Author:

vboxsync

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

84670

Message:

Ring-1 compression patches, courtesy of trivirt AG:

• main: diff to remove the hwvirt requirement for QNX
• rem: diff for dealing with raw ring 0/1 selectors and general changes to allowed guest execution states
• vmm: changes for using the guest's TSS selector index as our hypervisor TSS selector (makes str safe) (VBOX_WITH_SAFE_STR )
• vmm: changes for dealing with guest ring 1 code (VBOX_WITH_RAW_RING1)
• vmm: change to emulate smsw in RC/R0 (QNX uses this old style instruction a lot so going to qemu for emulation is very expensive)
• vmm: change (hack) to kick out patm virtual handlers in case they conflict with guest GDT/TSS write monitors; we should allow multiple handlers per page, but that change would be rather invasive

File:

• trunk/src/VBox/VMM/include/SELMInternal.h (modified) (5 diffs)

trunk/src/VBox/VMM/include/SELMInternal.h

@@ -25 +25 @@
 #include <VBox/log.h>
 #include <iprt/x86.h>
+#include <VBox/vmm/em.h>
 
 
@@ -33 +34 @@
  * @{
  */
+
+/**
+ * Enable or disable tracking of Shadow GDT/LDT/TSS.
+ * @{
+ */
+#define SELM_TRACK_SHADOW_GDT_CHANGES
+#define SELM_TRACK_SHADOW_LDT_CHANGES
+#define SELM_TRACK_SHADOW_TSS_CHANGES
+/** @} */
+
+/**
+ * Enable or disable tracking of Guest GDT/LDT/TSS.
+ * @{
+ */
+#define SELM_TRACK_GUEST_GDT_CHANGES
+#define SELM_TRACK_GUEST_LDT_CHANGES
+#define SELM_TRACK_GUEST_TSS_CHANGES
+/** @} */
+
 
 /** The number of GDTS allocated for our GDT. (full size) */
@@ -203 +223 @@
 
 void           selmSetRing1Stack(PVM pVM, uint32_t ss, RTGCPTR32 esp);
+#ifdef VBOX_WITH_RAW_RING1
+void           selmSetRing2Stack(PVM pVM, uint32_t ss, RTGCPTR32 esp);
+#endif
 
 RT_C_DECLS_END
@@ -362 +385 @@
  * Converts a guest GDT or LDT entry to a shadow table entry.
  *
+ * @param   pVM                 The VM handle.
  * @param   pDesc       Guest entry on input, shadow entry on return.
  */
-DECL_FORCE_INLINE(void) selmGuestToShadowDesc(PX86DESC pDesc)
+DECL_FORCE_INLINE(void) selmGuestToShadowDesc(PVM pVM, PX86DESC pDesc)
 {
     /*
@@ -391 +415 @@
             pDesc->Gen.u1Available = 1;
         }
+# ifdef VBOX_WITH_RAW_RING1
+        else
+        if (    pDesc->Gen.u2Dpl == 1
+//            &&  EMIsRawRing1Enabled(pVM)
+            &&      (pDesc->Gen.u4Type & (X86_SEL_TYPE_CODE | X86_SEL_TYPE_CONF))
+                !=  (X86_SEL_TYPE_CODE | X86_SEL_TYPE_CONF) )
+        {
+            pDesc->Gen.u2Dpl       = 2;
+            pDesc->Gen.u1Available = 1;
+        }
+# endif
         else
             pDesc->Gen.u1Available = 0;