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
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
|
--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c.orig 2022-01-13 18:57:38 UTC
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
@@ -52,6 +52,7 @@
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/ethernet.h>
+#include <net/if_vlan_var.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
@@ -73,6 +74,7 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
+#include "freebsd/the-freebsd-kernel.h"
static int vboxnetflt_modevent(struct module *, int, void *);
static ng_constructor_t ng_vboxnetflt_constructor;
@@ -149,6 +151,7 @@ MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
*/
MODULE_VERSION(vboxnetflt, 1);
MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
+MODULE_DEPEND(ng_vboxnetflt, ng_ether, 1, 1, 1);
/**
* The (common) global data.
@@ -181,8 +184,6 @@ static int vboxnetflt_modevent(struct module *pMod, in
printf("vboxNetFltInitGlobalsAndIdc failed %d\n", rc);
return RTErrConvertToErrno(rc);
}
- /* No MODULE_VERSION in ng_ether so we can't MODULE_DEPEND it */
- kern_kldload(curthread, "ng_ether", NULL);
break;
case MOD_UNLOAD:
@@ -361,7 +362,14 @@ static int ng_vboxnetflt_rcvdata(hook_p hook, item_p i
{
if (mtag != NULL || !fActive)
{
+#if __FreeBSD_version >= 1300049
+ struct epoch_tracker et;
+ NET_EPOCH_ENTER(et);
+#endif
ether_demux(ifp, m);
+#if __FreeBSD_version >= 1300049
+ NET_EPOCH_EXIT(et);
+#endif
if (fActive)
vboxNetFltRelease(pThis, true /*fBusy*/);
VBOXCURVNET_RESTORE();
@@ -436,6 +444,8 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
struct ifnet *ifp = pThis->u.s.ifp;
unsigned int cSegs = 0;
bool fDropIt = false, fActive;
+ bool is_vl_tagged = false;
+ uint16_t vl_tag;
PINTNETSG pSG;
VBOXCURVNET_SET(ifp->if_vnet);
@@ -448,6 +458,19 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
if (m == NULL)
break;
+ /* Prepend a VLAN header for consumption by the virtual switch */
+ if (m->m_flags & M_VLANTAG) {
+ vl_tag = m->m_pkthdr.ether_vtag;
+ is_vl_tagged = true;
+
+ m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
+ if (m == NULL) {
+ printf("vboxflt: unable to prepend VLAN header\n");
+ break;
+ }
+ m->m_flags &= ~M_VLANTAG;
+ }
+
for (m0 = m; m0 != NULL; m0 = m0->m_next)
if (m0->m_len > 0)
cSegs++;
@@ -462,10 +485,39 @@ static void vboxNetFltFreeBSDinput(void *arg, int pend
vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, NULL /* pvIf */, pSG, INTNETTRUNKDIR_WIRE);
RTMemTmpFree(pSG);
+
+ /* Restore the VLAN flags before re-injecting the packet */
+ if (is_vl_tagged && !fDropIt) {
+ struct ether_vlan_header *vl_hdr;
+
+ /* This shouldn't fail, as the header was just prepended */
+ if (m->m_len < sizeof(*vl_hdr) && (m = m_pullup(m, sizeof(*vl_hdr))) == NULL) {
+ printf("vboxflt: unable to pullup VLAN header\n");
+ m_freem(m);
+ break;
+ }
+
+ /* Copy the MAC dhost/shost over the 802.1q field */
+ vl_hdr = mtod(m, struct ether_vlan_header *);
+ bcopy((char *)vl_hdr, (char *)vl_hdr + ETHER_VLAN_ENCAP_LEN, ETHER_HDR_LEN - ETHER_TYPE_LEN);
+ m_adj(m, ETHER_VLAN_ENCAP_LEN);
+
+ m->m_pkthdr.ether_vtag = vl_tag;
+ m->m_flags |= M_VLANTAG;
+ }
+
if (fDropIt)
m_freem(m);
- else
+ else {
+#if __FreeBSD_version >= 1300049
+ struct epoch_tracker et;
+ NET_EPOCH_ENTER(et);
+#endif
ether_demux(ifp, m);
+#if __FreeBSD_version >= 1300049
+ NET_EPOCH_EXIT(et);
+#endif
+ }
}
vboxNetFltRelease(pThis, true /* fBusy */);
VBOXCURVNET_RESTORE();
@@ -521,6 +573,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
*/
int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, uint32_t fDst)
{
+ IPRT_FREEBSD_SAVE_EFL_AC();
NOREF(pvIfData);
void (*input_f)(struct ifnet *, struct mbuf *);
@@ -537,10 +590,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
{
m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
if (m == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;
+ }
m = m_pullup(m, ETHER_HDR_LEN);
if (m == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;
+ }
m->m_flags |= M_PKTHDR;
ether_output_frame(ifp, m);
@@ -550,10 +609,16 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
{
m = vboxNetFltFreeBSDSGMBufFromSG(pThis, pSG);
if (m == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;
+ }
m = m_pullup(m, ETHER_HDR_LEN);
if (m == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;
+ }
/*
* Delivering packets to the host will be captured by the
* input hook. Tag the packet with a mbuf tag so that we
@@ -564,6 +629,7 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
if (mtag == NULL)
{
m_freem(m);
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_NO_MEMORY;
}
@@ -571,9 +637,17 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *p
m_tag_prepend(m, mtag);
m->m_flags |= M_PKTHDR;
m->m_pkthdr.rcvif = ifp;
+#if __FreeBSD_version >= 1300049
+ struct epoch_tracker et;
+ NET_EPOCH_ENTER(et);
+#endif
ifp->if_input(ifp, m);
+#if __FreeBSD_version >= 1300049
+ NET_EPOCH_EXIT(et);
+#endif
}
VBOXCURVNET_RESTORE();
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;
}
@@ -586,6 +660,7 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, void *pvContext)
{
+ IPRT_FREEBSD_SAVE_EFL_AC();
char nam[NG_NODESIZ];
struct ifnet *ifp;
node_p node;
@@ -594,7 +669,10 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
NOREF(pvContext);
ifp = ifunit(pThis->szName);
if (ifp == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VERR_INTNET_FLT_IF_NOT_FOUND;
+ }
/* Create a new netgraph node for this instance */
if (ng_make_node_common(&ng_vboxnetflt_typestruct, &node) != 0)
@@ -638,12 +716,14 @@ int vboxNetFltOsInitInstance(PVBOXNETFLTINS pThis, voi
vboxNetFltRelease(pThis, true /*fBusy*/);
}
VBOXCURVNET_RESTORE();
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return VINF_SUCCESS;
}
bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThis)
{
+ IPRT_FREEBSD_SAVE_EFL_AC();
struct ifnet *ifp, *ifp0;
ifp = ASMAtomicUoReadPtrT(&pThis->u.s.ifp, struct ifnet *);
@@ -660,6 +740,7 @@ bool vboxNetFltOsMaybeRediscovered(PVBOXNETFLTINS pThi
pThis->u.s.node = NULL;
}
VBOXCURVNET_RESTORE();
+ IPRT_FREEBSD_RESTORE_EFL_AC();
if (ifp0 != NULL)
{
@@ -672,6 +753,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
{
+ IPRT_FREEBSD_SAVE_EFL_AC();
taskqueue_drain(taskqueue_fast, &pThis->u.s.tskin);
taskqueue_drain(taskqueue_fast, &pThis->u.s.tskout);
@@ -684,6 +766,7 @@ void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
ng_rmnode_self(pThis->u.s.node);
VBOXCURVNET_RESTORE();
pThis->u.s.node = NULL;
+ IPRT_FREEBSD_RESTORE_EFL_AC();
}
int vboxNetFltOsPreInitInstance(PVBOXNETFLTINS pThis)
@@ -697,6 +780,7 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, bool fActive)
{
+ IPRT_FREEBSD_SAVE_EFL_AC();
struct ifnet *ifp;
struct ifreq ifreq;
int error;
@@ -730,7 +814,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
sizeof(struct ngm_connect), M_NOWAIT);
if (msg == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return;
+ }
con = (struct ngm_connect *)msg->data;
snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:", ifp->if_xname);
strlcpy(con->ourhook, "lower", NG_HOOKSIZ);
@@ -744,7 +831,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_CONNECT,
sizeof(struct ngm_connect), M_NOWAIT);
if (msg == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return;
+ }
con = (struct ngm_connect *)msg->data;
snprintf(con->path, NG_PATHSIZ, "vboxnetflt_%s:",
ifp->if_xname);
@@ -767,7 +857,10 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
sizeof(struct ngm_rmhook), M_NOWAIT);
if (msg == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return;
+ }
rm = (struct ngm_rmhook *)msg->data;
strlcpy(rm->ourhook, "input", NG_HOOKSIZ);
NG_SEND_MSG_PATH(error, node, msg, path, 0);
@@ -778,12 +871,16 @@ void vboxNetFltPortOsSetActive(PVBOXNETFLTINS pThis, b
NG_MKMESSAGE(msg, NGM_GENERIC_COOKIE, NGM_RMHOOK,
sizeof(struct ngm_rmhook), M_NOWAIT);
if (msg == NULL)
+ {
+ IPRT_FREEBSD_RESTORE_EFL_AC();
return;
+ }
rm = (struct ngm_rmhook *)msg->data;
strlcpy(rm->ourhook, "output", NG_HOOKSIZ);
NG_SEND_MSG_PATH(error, node, msg, path, 0);
}
VBOXCURVNET_RESTORE();
+ IPRT_FREEBSD_RESTORE_EFL_AC();
}
int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
|
