Changeset 85542 in vbox for trunk

Timestamp:

Jul 30, 2020 9:05:38 AM (4 years ago)

Author:

vboxsync

Message:

IPRT/mp-r0drv-linux.c: Move the cpu set allocation & initialization out of the block running with preemption disabled. This hope to fix being on the wrong CPU when re-enabling preemption (seen once this morning after running supdrvTscMeasureDeltaOne, possibly involving the calling CPU).

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.cpp (modified) (3 diffs)
• HostDrivers/Support/SUPDrvInternal.h (modified) (1 diff)
• HostDrivers/Support/SUPLibLdr.cpp (modified) (2 diffs)
• Runtime/r0drv/linux/mp-r0drv-linux.c (modified) (5 diffs)

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

@@ -5255 +5255 @@
                                           pImage->paSegments[iSeg].fProt);
             }
+        if (iSeg >= pImage->cSegments)
+        {
+            supdrvLdrUnlock(pDevExt);
+            return supdrvLdrLoadError(VERR_INVALID_PARAMETER, pReq,
+                                      "Bad entry point %p given for %s: no matching segment found (RVA %#zx)!",
+                                      pv, pszSymbol, uRva);
+        }
 
         if (pImage->fNative)
@@ -5335 +5342 @@
     }
 
+    /*
+     * Copy the segments before we start using supdrvLdrValidatePointer for entrypoint validation.
+     */
+    pImage->cSegments = pReq->u.In.cSegments;
+    {
+        size_t  cbSegments = pImage->cSegments * sizeof(SUPLDRSEG);
+        pImage->paSegments = (PSUPLDRSEG)RTMemDup(&pReq->u.In.abImage[pReq->u.In.offSegments], cbSegments);
+        if (pImage->paSegments) /* Align the last segment size to avoid upsetting RTR0MemObjProtect. */ /** @todo relax RTR0MemObjProtect */
+            pImage->paSegments[pImage->cSegments - 1].cb = RT_ALIGN_32(pImage->paSegments[pImage->cSegments - 1].cb, PAGE_SIZE);
+        else
+        {
+            supdrvLdrUnlock(pDevExt);
+            return supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for segment table: %#x", cbSegments);
+        }
+        SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING);
+    }
+
+    /*
+     * Validate entrypoints.
+     */
     switch (pReq->u.In.eEPType)
     {
@@ -5404 +5431 @@
             if (!pImage->paSymbols)
                 rc = supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for symbol table: %#x", cbSymbols);
-            SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING);
-        }
-
-        pImage->cSegments = pReq->u.In.cSegments;
-        if (RT_SUCCESS(rc))
-        {
-            size_t  cbSegments = pImage->cSegments * sizeof(SUPLDRSEG);
-            pImage->paSegments = (PSUPLDRSEG)RTMemDup(&pReq->u.In.abImage[pReq->u.In.offSegments], cbSegments);
-            if (pImage->paSegments) /* Align the last segment size to avoid upsetting RTR0MemObjProtect. */ /** @todo relax RTR0MemObjProtect */
-                pImage->paSegments[pImage->cSegments - 1].cb = RT_ALIGN_32(pImage->paSegments[pImage->cSegments - 1].cb, PAGE_SIZE);
-            else
-                rc = supdrvLdrLoadError(VERR_NO_MEMORY, pReq, "Out of memory for segment table: %#x", cbSegments);
             SUPDRV_CHECK_SMAP_CHECK(pDevExt, RT_NOTHING);
         }

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

@@ -146 +146 @@
 #endif
 
-#if 0 /*defined(RT_OS_LINUX)*/ /** @todo make everyone do this */
+#if defined(RT_OS_LINUX) /** @todo make everyone do this */
 /** Use the RTR0MemObj API rather than the RTMemExecAlloc for the images.
  * This is a good idea in general, but a necessity for @bugref{9801}. */

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

@@ -359 +359 @@
     RT_NOREF(hLdrMod);
 
+    Log2(("supLoadModuleCompileSegmentsCB: %RTptr/%RTptr LB %RTptr/%RTptr prot %#x %s\n",
+          pSeg->LinkAddress, pSeg->RVA, pSeg->cbMapped, pSeg->cb, pSeg->fProt, pSeg->pszName));
+
     /* Ignore segments not part of the loaded image. */
     if (pSeg->RVA == NIL_RTLDRADDR || pSeg->cbMapped == 0)
+    {
+        Log2(("supLoadModuleCompileSegmentsCB: -> skipped\n"));
         return VINF_SUCCESS;
+    }
 
     /* We currently ASSUME that all relevant segments are in ascending RVA order. */
@@ -374 +380 @@
     AssertReturn(pSeg->RVA      < _1G, VERR_INTERNAL_ERROR_3);
     uint32_t uRvaSeg  = (uint32_t)pSeg->RVA;
-    Log2(("supLoadModuleCompileSegmentsCB: %RTptr/%RTptr LB %RTptr/%RTptr prot %#x %s\n",
-          pSeg->LinkAddress, pSeg->RVA, pSeg->cbMapped, pSeg->cb, pSeg->fProt, pSeg->pszName));
 
     /*

trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c

@@ -383 +383 @@
 #ifdef CONFIG_SMP
     IPRT_LINUX_SAVE_EFL_AC();
-    int rc;
-    RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+    int                     rc;
+    RTTHREADPREEMPTSTATE    PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) /* 2.6.28 introduces CONFIG_CPUMASK_OFFSTACK */
+    cpumask_var_t           DstCpuMask;
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+    cpumask_t               DstCpuMask;
+# endif
 
     AssertReturn(idCpu1 != idCpu2, VERR_INVALID_PARAMETER);
     AssertReturn(!(fFlags & RTMPON_F_VALID_MASK), VERR_INVALID_FLAGS);
+
+    /*
+     * Prepare the CPU mask before we disable preemption.
+     */
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+    if (!zalloc_cpumask_var(&DstCpuMask, GFP_KERNEL))
+        return VERR_NO_MEMORY;
+    cpumask_set_cpu(idCpu1, DstCpuMask);
+    cpumask_set_cpu(idCpu2, DstCpuMask);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+    if (!alloc_cpumask_var(&DstCpuMask, GFP_KERNEL))
+        return VERR_NO_MEMORY;
+    cpumask_clear(DstCpuMask);
+    cpumask_set_cpu(idCpu1, DstCpuMask);
+    cpumask_set_cpu(idCpu2, DstCpuMask);
+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+    cpus_clear(DstCpuMask);
+    cpu_set(idCpu1, DstCpuMask);
+    cpu_set(idCpu2, DstCpuMask);
+# endif
 
     /*
@@ -402 +427 @@
          * call wait ourselves.
          */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-        /* 2.6.28 introduces CONFIG_CPUMASK_OFFSTACK */
-        cpumask_var_t DstCpuMask;
-# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-        cpumask_t   DstCpuMask;
-# endif
         RTCPUID     idCpuSelf = RTMpCpuId();
         bool const  fCallSelf = idCpuSelf == idCpu1 || idCpuSelf == idCpu2;
@@ -417 +436 @@
         Args.idCpu2  = idCpu2;
         Args.cHits   = 0;
-
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
-        if (!zalloc_cpumask_var(&DstCpuMask, GFP_KERNEL))
-            return VERR_NO_MEMORY;
-        cpumask_set_cpu(idCpu1, DstCpuMask);
-        cpumask_set_cpu(idCpu2, DstCpuMask);
-# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-        if (!alloc_cpumask_var(&DstCpuMask, GFP_KERNEL))
-            return VERR_NO_MEMORY;
-        cpumask_clear(DstCpuMask);
-        cpumask_set_cpu(idCpu1, DstCpuMask);
-        cpumask_set_cpu(idCpu2, DstCpuMask);
-# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
-        cpus_clear(DstCpuMask);
-        cpu_set(idCpu1, DstCpuMask);
-        cpu_set(idCpu2, DstCpuMask);
-# endif
 
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
@@ -468 +470 @@
         else
             rc = VERR_CPU_IPE_1;
-
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-        free_cpumask_var(DstCpuMask);
-# endif
     }
     /*
@@ -481 +479 @@
     else
         rc = VERR_CPU_NOT_FOUND;
+
     RTThreadPreemptRestore(&PreemptState);;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+    free_cpumask_var(DstCpuMask);
+# endif
     IPRT_LINUX_RESTORE_EFL_AC();
     return rc;