Changeset 53212 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2014 6:22:21 PM (10 years ago)

Author:

vboxsync

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

96760

Message:

HostDrivers/Support: Add infrastructure for delta-adjusted TSC reads from all contexts.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (6 diffs)
• SUPDrvIOC.h (modified) (2 diffs)
• SUPLib.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -158 +158 @@
 static int                  supdrvIOCtl_MsrProber(PSUPDRVDEVEXT pDevExt, PSUPMSRPROBER pReq);
 static int                  supdrvIOCtl_TscDeltaMeasure(PSUPDRVDEVEXT pDevExt, PSUPTSCDELTAMEASURE pReq);
+static int                  supdrvIOCtl_TscRead(PSUPDRVDEVEXT pDevExt, PSUPTSCREAD pReq);
 static int                  supdrvGipCreate(PSUPDRVDEVEXT pDevExt);
 static void                 supdrvGipDestroy(PSUPDRVDEVEXT pDevExt);
@@ -2256 +2257 @@
         }
 
+        case SUP_CTL_CODE_NO_SIZE(SUP_IOCTL_TSC_READ):
+        {
+            /* validate */
+            PSUPTSCREAD pReq = (PSUPTSCREAD)pReqHdr;
+            REQ_CHECK_SIZES(SUP_IOCTL_TSC_READ);
+
+            pReqHdr->rc = supdrvIOCtl_TscRead(pDevExt, pReq);
+            return 0;
+        }
+
         default:
             Log(("Unknown IOCTL %#lx\n", (long)uIOCtl));
@@ -5910 +5921 @@
 
 
+#if 0
 /**
  * Measures the nominal TSC frequency.
@@ -6024 +6036 @@
     return VERR_SUPDRV_TSC_FREQ_MEASUREMENT_FAILED;
 }
+#endif
 
 
@@ -7345 +7358 @@
         u32UpdateIntervalTSC >>= 1;
 
-        /* Value chosen for a 2GHz Athlon64 running linux 2.6.10/11, . */
+        /* Value chosen for a 2GHz Athlon64 running linux 2.6.10/11. */
         u32UpdateIntervalTSCSlack = u32UpdateIntervalTSC >> 14;
     }
@@ -7603 +7616 @@
 }
 
+
+/**
+ * Reads the TSC and TSC-delta atomically, applies the TSC delta.
+ *
+ * @returns VBox status code.
+ * @param   pDevExt         Pointer to the device instance data.
+ * @param   pReq            Pointer to the TSC-read request.
+ */
+static int supdrvIOCtl_TscRead(PSUPDRVDEVEXT pDevExt, PSUPTSCREAD pReq)
+{
+    uint64_t uTsc;
+    uint16_t idApic;
+    int16_t cTries;
+    PSUPGLOBALINFOPAGE pGip;
+    int rc;
+
+    /*
+     * Validate.
+     */
+    AssertReturn(pDevExt, VERR_INVALID_PARAMETER);
+    AssertReturn(pReq, VERR_INVALID_PARAMETER);
+    AssertReturn(pDevExt->pGip, VERR_INVALID_PARAMETER);
+    pGip = pDevExt->pGip;
+
+    cTries = 4;
+    while (cTries-- > 0)
+    {
+        rc = SUPReadTsc(&uTsc, &idApic);
+        if (RT_SUCCESS(rc))
+        {
+            pReq->u.Out.u64AdjustedTsc = uTsc;
+            pReq->u.Out.idApic = idApic;
+            return VINF_SUCCESS;
+        }
+        else
+        {
+            int rc2;
+
+            /* If we failed to have a delta, measurement the delta and retry. */
+            AssertReturn(idApic < RT_ELEMENTS(pGip->aiCpuFromApicId), VERR_INVALID_CPU_ID);
+            uint16_t iCpu = pGip->aiCpuFromApicId[idApic];
+            AssertMsgReturn(iCpu < pGip->cCpus, ("iCpu=%u cCpus=%u\n", iCpu, pGip->cCpus), VERR_WRONG_ORDER);
+
+            rc2 = supdrvMeasureTscDeltaOne(pDevExt, iCpu);
+            if (RT_SUCCESS(rc2))
+                AssertReturn(pGip->aCPUs[iCpu].i64TSCDelta != INT64_MAX, VERR_INTERNAL_ERROR_2);
+        }
+    }
+
+    return rc;
+}
+

trunk/src/VBox/HostDrivers/Support/SUPDrvIOC.h

@@ -215 +215 @@
  *          - (none).
  */
-#define SUPDRV_IOC_VERSION                              0x001c0000
+#define SUPDRV_IOC_VERSION                              0x001c0001
 
 /** SUP_IOCTL_COOKIE. */
@@ -1508 +1508 @@
 /** @} */
 
+/** @name SUP_IOCTL_TSC_READ
+ * Reads the TSC and TSC-delta atomically and returns the delta-adjusted TSC
+ * value.
+ *
+ * @{
+ */
+#define SUP_IOCTL_TSC_READ                              SUP_CTL_CODE_SIZE(37, SUP_IOCTL_TSC_READ_SIZE)
+#define SUP_IOCTL_TSC_READ_SIZE                         sizeof(SUPTSCREAD)
+#define SUP_IOCTL_TSC_READ_SIZE_IN                      sizeof(SUPTSCREAD)
+#define SUP_IOCTL_TSC_READ_SIZE_OUT                     sizeof(SUPREQHDR)
+typedef struct SUPTSCREAD
+{
+    /** The header. */
+    SUPREQHDR               Hdr;
+
+    /** Input/output union. */
+    union
+    {
+        struct
+        {
+            /** The TSC after applying the relevant delta. */
+            uint64_t        u64AdjustedTsc;
+            /** The APIC Id of the CPU where the TSC was read. */
+            uint16_t        idApic;
+            /** Padding for future. */
+            uint64_t        auPadding[3];
+        } Out;
+    } u;
+} SUPTSCREAD, *PSUPTSCREAD;
+AssertCompileMemberAlignment(SUPTSCREAD, u, 8);
+/** @} */
 
 #pragma pack()                          /* paranoia */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -279 +279 @@
         strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
-        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x001b0000
-                                   ? 0x001b0001
+        const uint32_t uMinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x001c0000
+                                   ? 0x001c0001
                                    : SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = uMinVersion;
@@ -2199 +2199 @@
 }
 
+
+SUPR3DECL(int) SUPR3ReadTsc(uint64_t *puTsc, uint16_t *pidApic)
+{
+    AssertReturn(puTsc, VERR_INVALID_PARAMETER);
+
+    SUPTSCREAD Req;
+    Req.Hdr.u32Cookie        = g_u32Cookie;
+    Req.Hdr.u32SessionCookie = g_u32SessionCookie;
+    Req.Hdr.cbIn             = SUP_IOCTL_TSC_READ_SIZE_IN;
+    Req.Hdr.cbOut            = SUP_IOCTL_TSC_READ_SIZE_OUT;
+    Req.Hdr.fFlags           = SUPREQHDR_FLAGS_DEFAULT;
+    Req.Hdr.rc               = VERR_INTERNAL_ERROR;
+
+    int rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_TSC_DELTA_MEASURE, &Req, SUP_IOCTL_TSC_DELTA_MEASURE_SIZE);
+    if (RT_SUCCESS(rc))
+    {
+        rc = Req.Hdr.rc;
+        *puTsc = Req.u.Out.u64AdjustedTsc;
+        if (pidApic)
+            *pidApic = Req.u.Out.idApic;
+    }
+    return rc;
+}
+