Changeset 99674 in vbox for trunk/src/VBox/VMM

Timestamp:

May 8, 2023 1:27:47 PM (20 months ago)

Author:

vboxsync

Message:

VMM/PDMQueue: Fix PDMQueueAllocEx() to respect the multiple of 32 cBits input parameter requirement (mainly to fix the tstPDMQueue on ARM which uses a different ASMBitFirstSet() implementation which is not as forgiving), and a small fix to the testcase itself to not crash when allocating an item failed, which is counted as an error anyway

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PDMAllQueue.cpp (modified) (1 diff)
• testcase/tstPDMQueue.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp

@@ -172 +172 @@
     for (;;)
     {
-        int32_t iBit = ASMBitFirstSet(pQueue->bmAlloc, cItems);
+        /*
+         * ASMBitFirstSet() mandates a cBits to be a multiple of 32 while cItems can be less (but the bitmap)
+         * is aligned to 64 bytes and correctly initialized so only the number of items allocated are valid
+         * and can be marked as free.
+         */
+        int32_t iBit = ASMBitFirstSet(pQueue->bmAlloc, RT_ALIGN(cItems, 32));
         if (iBit >= 0)
         {

trunk/src/VBox/VMM/testcase/tstPDMQueue.cpp

@@ -313 +313 @@
     PTEST1ITEM pMyItem = (PTEST1ITEM)PDMQueueAlloc(pVM, hQueue, pVM);
     RTTEST_CHECK(g_hTest, pMyItem);
-    pMyItem->iSeqNo = 1;
-    RTTEST_CHECK_RC(g_hTest, PDMQueueInsert(pVM, hQueue, pVM, &pMyItem->Core), VINF_SUCCESS);
-
-    PDMR3QueueFlushAll(pVM);
-    RTTEST_CHECK(g_hTest, g_cTest1Callbacks == 1);
+    if (pMyItem)
+    {
+        pMyItem->iSeqNo = 1;
+        RTTEST_CHECK_RC(g_hTest, PDMQueueInsert(pVM, hQueue, pVM, &pMyItem->Core), VINF_SUCCESS);
+
+        PDMR3QueueFlushAll(pVM);
+        RTTEST_CHECK(g_hTest, g_cTest1Callbacks == 1);
+    }
 
     /*