Changeset 58390 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Oct 23, 2015 12:35:35 PM (9 years ago)

Author:

vboxsync

Message:

VMM/GIM: Implement Hyper-V debug receive thread optimization. Added a few statistics to GIM.
Fixed a bug in Windows guests' debug DHCP handling.

Location:

trunk/src/VBox/VMM/include

Files:

• GIMHvInternal.h (modified) (3 diffs)
• GIMInternal.h (modified) (4 diffs)

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

@@ -713 +713 @@
 /** The undocumented bit for MSR_GIM_HV_DEBUG_OPTIONS_MSR that makes it all
  *  work. */
-#define GIM_HV_DEBUG_OPTIONS_MSR_ENABLE           RT_BIT(2)
+#define GIM_HV_DEBUG_OPTIONS_USE_HYPERCALLS       RT_BIT(2)
 
 /** Guest will perform the HvPostDebugData hypercall until completion. */
@@ -1047 +1047 @@
     /** Whether we're posing as the Microsoft virtualization service. */
     bool                        fIsInterfaceVs;
-    bool                        afAlignment0[6];
-    /** The auto IP address last chosen by the guest after failed ARP queries. */
+    /** Whether debugging support is enabled. */
+    bool                        fDbgEnabled;
+    /** Whether we should suggest a hypercall-based debug interface to the guest. */
+    bool                        fDbgHypercallInterface;
+    bool                        afAlignment0[4];
+    /** The action to take while sending replies. */
+    GIMHVDEBUGREPLY             enmDbgReply;
+    /** The IP address chosen by/assigned to the guest. */
     RTNETADDRIPV4               DbgGuestIp4Addr;
-    /** The action to take while sending replies. */
-    GIMHVDEBUGREPLY             enmDebugReply;
     /** Transaction ID for the BOOTP+DHCP sequence. */
-    uint32_t                    uBootpXId;
-    /** Padding. */
-    uint32_t                    uAlignment0;
+    uint32_t                    uDbgBootpXId;
+    /** The source UDP port used by the guest while sending debug packets. */
+    uint16_t                    uUdpGuestSrcPort;
+    /** The destination UDP port used by the guest while sending debug packets. */
+    uint16_t                    uUdpGuestDstPort;
     /** Debug send buffer MSR. */
-    uint64_t                    uDebugSendBufferMsr;
+    uint64_t                    uDbgSendBufferMsr;
     /** Debug receive buffer MSR. */
-    uint64_t                    uDebugRecvBufferMsr;
+    uint64_t                    uDbgRecvBufferMsr;
     /** Debug pending buffer MSR. */
-    uint64_t                    uDebugPendingBufferMsr;
+    uint64_t                    uDbgPendingBufferMsr;
     /** Debug status MSR. */
-    uint64_t                    uDebugStatusMsr;
+    uint64_t                    uDbgStatusMsr;
+    /** Intermediate debug I/O buffer. */
+    R3PTRTYPE(void *)           pvDbgBuffer;
     /** @} */
 
@@ -1113 +1121 @@
 VMMR3_INT_DECL(int)             gimR3HvSave(PVM pVM, PSSMHANDLE pSSM);
 VMMR3_INT_DECL(int)             gimR3HvLoad(PVM pVM, PSSMHANDLE pSSM, uint32_t uSSMVersion);
+VMMR3_INT_DECL(int)             gimR3HvGetDebugSetup(PVM pVM, PGIMDEBUGSETUP pDbgSetup);
 
 VMMR3_INT_DECL(int)             gimR3HvDisableTscPage(PVM pVM);

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

@@ -54 +54 @@
     /** Pointer to the GIM device - R3 ptr. */
     R3PTRTYPE(PPDMDEVINS)            pDevInsR3;
-    /** Pointer to the GIM device debug stream - R3 ptr. */
-    R3PTRTYPE(PPDMISTREAM)           pDebugStreamR3;
-#if 0
-    /** Pointer to the provider's ring-3 hypercall handler. */
-    R3PTRTYPE(PFNGIMHYPERCALL)       pfnHypercallR3;
-    /** Pointer to the provider's ring-0 hypercall handler. */
-    R0PTRTYPE(PFNGIMHYPERCALL)       pfnHypercallR0;
-    /** Pointer to the provider's raw-mode context hypercall handler. */
-    RCPTRTYPE(PFNGIMHYPERCALL)       pfnHypercallRC;
+    /** The debug struct - R3 ptr. */
+    R3PTRTYPE(PGIMDEBUG)             pDbgR3;
 
-    /** Pointer to the provider's ring-3 MSR-read handler. */
-    R3PTRTYPE(PFNGIMRDMSR)           pfnReadMsrR3;
-    /** Pointer to the provider's ring-0 MSR-read handler. */
-    R0PTRTYPE(PFNGIMRDMSR)           pfnReadMsrR0;
-    /** Pointer to the provider's raw-mode context MSR-read handler. */
-    RCPTRTYPE(PFNGIMRDMSR)           pfnReadMsrRC;
-
-    /** Pointer to the provider's ring-3 MSR-read handler. */
-    R3PTRTYPE(PFNGIMWDMSR)           pfnWriteMsrR3;
-    /** Pointer to the provider's ring-0 MSR-read handler. */
-    R0PTRTYPE(PFNGIMWDMSR)           pfnWriteMsrRR0;
-    /** Pointer to the provider's raw-mode context MSR-read handler. */
-    RCPTRTYPE(PFNGIMWDMSR)           pfnWriteMsrRRC;
-#endif
-
+    /** The provider specific data. */
     union
     {
@@ -84 +63 @@
         GIMKVM Kvm;
     } u;
+
+    /** Number of hypercalls initiated. */
+    STAMCOUNTER                      StatHypercalls;
+    /** Debug packets sent. */
+    STAMCOUNTER                      StatDbgXmit;
+    /** Debug bytes sent. */
+    STAMCOUNTER                      StatDbgXmitBytes;
+    /** Debug packets received. */
+    STAMCOUNTER                      StatDbgRecv;
+    /** Debug bytes received. */
+    STAMCOUNTER                      StatDbgRecvBytes;
 } GIM;
 /** Pointer to GIM VM instance data. */
 typedef GIM *PGIM;
-
 
 /**
@@ -103 +92 @@
 typedef GIMCPU *PGIMCPU;
 
+/**
+ * Callback when a debug buffer read has completed and before signaling
+ * the next read.
+ *
+ * @param   pVM             The cross context VM structure.
+ */
+typedef DECLCALLBACK(void) FNGIMDEBUGBUFREADCOMPLETED(PVM pVM);
+/** Pointer to GIM debug buffer read completion callback. */
+typedef FNGIMDEBUGBUFREADCOMPLETED *PFNGIMDEBUGBUFREADCOMPLETED;
+
 #ifdef IN_RING3
 VMMR3_INT_DECL(int)           GIMR3Mmio2Unmap(PVM pVM, PGIMMMIO2REGION pRegion);
@@ -109 +108 @@
 VMMR3_INT_DECL(int)           GIMR3Mmio2HandlerPhysicalDeregister(PVM pVM, PGIMMMIO2REGION pRegion);
 
-VMMR3_INT_DECL(int)           GIMR3DebugRead(PVM pVM, void *pvRead, size_t *pcbRead);
+VMMR3_INT_DECL(int)           GIMR3DebugRead(PVM pVM, void *pvRead, size_t *pcbRead, PFNGIMDEBUGBUFREADCOMPLETED pfnReadComplete);
 VMMR3_INT_DECL(int)           GIMR3DebugWrite(PVM pVM, void *pvWrite, size_t *pcbWrite);
 #endif /* IN_RING3 */