1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
|
--- src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c.orig 2018-10-15 14:31:31 UTC
+++ src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c
@@ -36,6 +36,15 @@
#include <iprt/cpuset.h>
#include "r0drv/mp-r0drv.h"
+#if __FreeBSD_version >= 700000 && __FreeBSD_version < 900000
+#define cpuset_t cpumask_t
+#define all_cpus (~(cpumask_t)0)
+#define CPU_CLR(n, p) do { *(p) &= ~((cpumask_t)1 << (n)); } while (0)
+#define CPU_SETOF(n, p) do { *(p) = (cpumask_t)1 << (n); } while (0)
+#endif
+#if __FreeBSD_version < 1200028
+#define smp_no_rendezvous_barrier smp_no_rendevous_barrier
+#endif
RTDECL(RTCPUID) RTMpCpuId(void)
{
@@ -143,7 +152,9 @@ RTDECL(RTCPUID) RTMpGetOnlineCount(void)
static void rtmpOnAllFreeBSDWrapper(void *pvArg)
{
PRTMPARGS pArgs = (PRTMPARGS)pvArg;
+ IPRT_FREEBSD_SAVE_EFL_AC();
pArgs->pfnWorker(curcpu, pArgs->pvUser1, pArgs->pvUser2);
+ IPRT_FREEBSD_RESTORE_EFL_AC();
}
@@ -155,7 +166,9 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *p
Args.pvUser2 = pvUser2;
Args.idCpu = NIL_RTCPUID;
Args.cHits = 0;
- smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+ IPRT_FREEBSD_SAVE_EFL_AC();
+ smp_rendezvous(NULL, rtmpOnAllFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;
}
@@ -171,7 +184,11 @@ static void rtmpOnOthersFreeBSDWrapper(void *pvArg)
PRTMPARGS pArgs = (PRTMPARGS)pvArg;
RTCPUID idCpu = curcpu;
if (pArgs->idCpu != idCpu)
+ {
+ IPRT_FREEBSD_SAVE_EFL_AC();
pArgs->pfnWorker(idCpu, pArgs->pvUser1, pArgs->pvUser2);
+ IPRT_FREEBSD_RESTORE_EFL_AC();
+ }
}
@@ -180,10 +197,8 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
/* Will panic if no rendezvousing cpus, so check up front. */
if (RTMpGetOnlineCount() > 1)
{
-#if __FreeBSD_version >= 900000
- cpuset_t Mask;
-#elif __FreeBSD_version >= 700000
- cpumask_t Mask;
+#if __FreeBSD_version >= 700000
+ cpuset_t Cpus;
#endif
RTMPARGS Args;
@@ -192,17 +207,15 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void
Args.pvUser2 = pvUser2;
Args.idCpu = RTMpCpuId();
Args.cHits = 0;
+ IPRT_FREEBSD_SAVE_EFL_AC();
#if __FreeBSD_version >= 700000
-# if __FreeBSD_version >= 900000
- Mask = all_cpus;
- CPU_CLR(curcpu, &Mask);
-# else
- Mask = ~(cpumask_t)curcpu;
-# endif
- smp_rendezvous_cpus(Mask, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+ Cpus = all_cpus;
+ CPU_CLR(curcpu, &Cpus);
+ smp_rendezvous_cpus(Cpus, NULL, rtmpOnOthersFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
#else
smp_rendezvous(NULL, rtmpOnOthersFreeBSDWrapper, NULL, &Args);
#endif
+ IPRT_FREEBSD_RESTORE_EFL_AC();
}
return VINF_SUCCESS;
}
@@ -220,18 +233,18 @@ static void rtmpOnSpecificFreeBSDWrapper(void *pvArg)
RTCPUID idCpu = curcpu;
if (pArgs->idCpu == idCpu)
{
+ IPRT_FREEBSD_SAVE_EFL_AC();
pArgs->pfnWorker(idCpu, pArgs->pvUser1, pArgs->pvUser2);
ASMAtomicIncU32(&pArgs->cHits);
+ IPRT_FREEBSD_RESTORE_EFL_AC();
}
}
RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
{
-#if __FreeBSD_version >= 900000
- cpuset_t Mask;
-#elif __FreeBSD_version >= 700000
- cpumask_t Mask;
+#if __FreeBSD_version >= 700000
+ cpuset_t Cpus;
#endif
RTMPARGS Args;
@@ -244,16 +257,14 @@ RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKE
Args.pvUser2 = pvUser2;
Args.idCpu = idCpu;
Args.cHits = 0;
+ IPRT_FREEBSD_SAVE_EFL_AC();
#if __FreeBSD_version >= 700000
-# if __FreeBSD_version >= 900000
- CPU_SETOF(idCpu, &Mask);
-# else
- Mask = (cpumask_t)1 << idCpu;
-# endif
- smp_rendezvous_cpus(Mask, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendevous_barrier, &Args);
+ CPU_SETOF(idCpu, &Cpus);
+ smp_rendezvous_cpus(Cpus, NULL, rtmpOnSpecificFreeBSDWrapper, smp_no_rendezvous_barrier, &Args);
#else
smp_rendezvous(NULL, rtmpOnSpecificFreeBSDWrapper, NULL, &Args);
#endif
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return Args.cHits == 1
? VINF_SUCCESS
: VERR_CPU_NOT_FOUND;
@@ -273,22 +284,16 @@ static void rtmpFreeBSDPokeCallback(void *pvArg)
RTDECL(int) RTMpPokeCpu(RTCPUID idCpu)
{
-#if __FreeBSD_version >= 900000
- cpuset_t Mask;
-#elif __FreeBSD_version >= 700000
- cpumask_t Mask;
-#endif
+ cpuset_t Cpus;
/* Will panic if no rendezvousing cpus, so make sure the cpu is online. */
if (!RTMpIsCpuOnline(idCpu))
return VERR_CPU_NOT_FOUND;
-# if __FreeBSD_version >= 900000
- CPU_SETOF(idCpu, &Mask);
-# else
- Mask = (cpumask_t)1 << idCpu;
-# endif
- smp_rendezvous_cpus(Mask, NULL, rtmpFreeBSDPokeCallback, smp_no_rendevous_barrier, NULL);
+ IPRT_FREEBSD_SAVE_EFL_AC();
+ CPU_SETOF(idCpu, &Cpus);
+ smp_rendezvous_cpus(Cpus, NULL, rtmpFreeBSDPokeCallback, smp_no_rendezvous_barrier, NULL);
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;
}
|
