Changeset 97028 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 6, 2022 9:57:05 AM (2 years ago)

Author:

vboxsync

Message:

DevHPET: More fixes and optimizations. FS_PER_DAY overflowed after r153962, missing input check before calilng hpetTicksToNs in info handler. bugref:10301

File:

• trunk/src/VBox/Devices/PC/DevHPET.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -101 +101 @@
 #define FS_PER_NS                   1000000
 
-/**
- * Femtoseconds in a day. Still fits within uint64_t.
- */
-#define FS_PER_DAY                  (1000000000ULL * 60 * 60 * 24 * FS_PER_NS)
-
-/**
- * Number of HPET ticks in 100 years, ICH9 frequency.
- */
-#define HPET_TICKS_IN_100YR_ICH9    (FS_PER_DAY / HPET_CLK_PERIOD_ICH9 * 365 * 100)
-
-/**
- * Number of HPET ticks in 100 years, made-up PIIX frequency.
- */
-#define HPET_TICKS_IN_100YR_PIIX    (FS_PER_DAY / HPET_CLK_PERIOD_PIIX * 365 * 100)
+/** Number of HPET ticks per second (Hz), ICH9 frequency.
+ * Value: 14318179 */
+#define HPET_TICKS_PER_SEC_ICH9     ((RT_NS_1SEC * FS_PER_NS) / HPET_CLK_PERIOD_ICH9)
+
+/** Number of HPET ticks per second (Hz), made-up PIIX frequency.
+ * Value: 100000000   */
+#define HPET_TICKS_PER_SEC_PIIX     ((RT_NS_1SEC * FS_PER_NS) / HPET_CLK_PERIOD_PIIX)
+
+/** Number of HPET ticks in 100 years, ICH9 frequency.
+ * Value: 45153809294400000 (0x00A06B26'7B3F9A00) */
+#define HPET_TICKS_IN_100YR_ICH9    (HPET_TICKS_PER_SEC_ICH9 * RT_SEC_1DAY_64 * 365 * 100)
+
+/**  Number of HPET ticks in 100 years, made-up PIIX frequency.
+ * Value: 315360000000000000 (0x0460623F'C85E0000) */
+#define HPET_TICKS_IN_100YR_PIIX    (HPET_TICKS_PER_SEC_PIIX * RT_SEC_1DAY_64 * 365 * 100)
 
 /** @name Interrupt type
@@ -385 +386 @@
 }
 
+
+/**
+ * @note The caller shall do overflow checks! See @bugref{10301}.
+ */
 DECLINLINE(uint64_t) hpetTicksToNs(PHPET pThis, uint64_t value)
 {
@@ -465 +470 @@
                                            uint64_t fConfig, uint64_t uPeriod)
 {
-    if ((fConfig & HPET_TN_PERIODIC) && uPeriod && (uPeriod < UINT32_MAX))
+    if (   (fConfig & HPET_TN_PERIODIC)
+        && uPeriod > 0
+        && uPeriod < (pThis->fIch9 ? HPET_TICKS_PER_SEC_ICH9 : HPET_TICKS_PER_SEC_PIIX) / 10 /* 100 ns */)
     {
         uint64_t const nsPeriod = hpetTicksToNs(pThis, uPeriod);
-        if (nsPeriod < RT_NS_100MS)
-            PDMDevHlpTimerSetFrequencyHint(pDevIns, pHpetTimer->hTimer, RT_NS_1SEC / (uint32_t)nsPeriod);
+        PDMDevHlpTimerSetFrequencyHint(pDevIns, pHpetTimer->hTimer, RT_NS_1SEC / (uint32_t)nsPeriod);
     }
 }
@@ -1451 +1457 @@
                         pThis->aTimers[i].u64Cmp,
                         pThis->aTimers[i].u64Period,
-                        hpetTicksToNs(pThis, pThis->aTimers[i].u64Period),
+                        pThis->aTimers[i].u64Period < (pThis->fIch9 ? HPET_TICKS_IN_100YR_ICH9 : HPET_TICKS_IN_100YR_PIIX)
+                        ? hpetTicksToNs(pThis, pThis->aTimers[i].u64Period) : UINT64_MAX,
                         pThis->aTimers[i].u64Config,
                         hpetR3TimerGetIrq(pThis, &pThis->aTimers[i], pThis->aTimers[i].u64Config),