Changeset 85543 in vbox for trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c

Timestamp:

Jul 30, 2020 9:06:35 AM (5 years ago)

Author:

vboxsync

Message:

reverted r139610

File:

• trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c (modified) (5 diffs)

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;
-# 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
+    int rc;
+    RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
 
     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
 
     /*
@@ -427 +402 @@
          * 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;
@@ -436 +417 @@
         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)
@@ -470 +468 @@
         else
             rc = VERR_CPU_IPE_1;
+
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+        free_cpumask_var(DstCpuMask);
+# endif
     }
     /*
@@ -479 +481 @@
     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;