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
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
|
Index: src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c
===================================================================
--- src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c (revision 23391)
+++ src/VBox/HostDrivers/VBoxNetFlt/freebsd/VBoxNetFlt-freebsd.c (working copy)
@@ -43,6 +43,8 @@
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/syscallsubr.h>
+#include <sys/queue.h>
+#include <sys/taskqueue.h>
#include <net/if.h>
#include <net/if_var.h>
@@ -78,8 +80,6 @@
static ng_rcvdata_t ng_vboxnetflt_rcvdata;
static ng_disconnect_t ng_vboxnetflt_disconnect;
static int ng_vboxnetflt_mod_event(module_t mod, int event, void *data);
-static int ng_vboxnetflt_rcv_in(hook_p node, item_p item);
-static int ng_vboxnetflt_rcv_out(hook_p node, item_p item);
/** Netgraph node type */
#define NG_VBOXNETFLT_NODE_TYPE "vboxnetflt"
@@ -112,8 +112,8 @@
{
.version = NG_ABI_VERSION,
.name = NG_VBOXNETFLT_NODE_TYPE,
- .mod_event = vboxnetflt_modevent,
- .constructor = ng_vboxnetflt_constructor,
+ .mod_event = vboxnetflt_modevent,
+ .constructor = ng_vboxnetflt_constructor,
.rcvmsg = ng_vboxnetflt_rcvmsg,
.shutdown = ng_vboxnetflt_shutdown,
.newhook = ng_vboxnetflt_newhook,
@@ -122,7 +122,7 @@
.cmdlist = ng_vboxnetflt_cmdlist,
};
NETGRAPH_INIT(vboxnetflt, &ng_vboxnetflt_typestruct);
-MODULE_VERSION(ng_vboxnetflt, 1);
+MODULE_VERSION(vboxnetflt, 1);
MODULE_DEPEND(ng_vboxnetflt, vboxdrv, 1, 1, 1);
/**
@@ -267,16 +267,12 @@
if (strcmp(name, NG_VBOXNETFLT_HOOK_IN) == 0)
{
#if __FreeBSD_version >= 800000
- NG_HOOK_SET_RCVDATA(hook, ng_vboxnetflt_rcv_in);
NG_HOOK_SET_TO_INBOUND(hook);
#endif
pThis->u.s.input = hook;
}
else if (strcmp(name, NG_VBOXNETFLT_HOOK_OUT) == 0)
{
-#if __FreeBSD_version >= 800000
- NG_HOOK_SET_RCVDATA(hook, ng_vboxnetflt_rcv_out);
-#endif
pThis->u.s.output = hook;
}
else
@@ -310,161 +306,171 @@
/**
* Handle data on netgraph hooks.
+ * Frames processing is deferred to a taskqueue because this might
+ * be called with non-sleepable locks held and code paths inside
+ * the virtual switch might sleep.
*/
static int ng_vboxnetflt_rcvdata(hook_p hook, item_p item)
{
const node_p node = NG_HOOK_NODE(hook);
PVBOXNETFLTINS pThis = NG_NODE_PRIVATE(node);
+ struct ifnet *ifp = pThis->u.s.ifp;
struct mbuf *m;
+ struct m_tag *mtag;
+ bool fActive;
+ fActive = ASMAtomicUoReadBool(&pThis->fActive);
+
+ NGI_GET_M(item, m);
+ NG_FREE_ITEM(item);
+
+ /* Locate tag to see if processing should be skipped for this frame */
+ mtag = m_tag_locate(m, MTAG_VBOX, PACKET_TAG_VBOX, NULL);
+ if (mtag != NULL)
+ {
+ m_tag_unlink(m, mtag);
+ m_tag_free(mtag);
+ }
+
+ /*
+ * Handle incoming hook. This is connected to the
+ * input path of the interface, thus handling incoming frames.
+ */
if (pThis->u.s.input == hook)
- return ng_vboxnetflt_rcv_in(hook, item);
+ {
+ if (mtag != NULL || !fActive)
+ {
+ ether_demux(ifp, m);
+ return (0);
+ }
+ mtx_lock_spin(&pThis->u.s.inq.ifq_mtx);
+ _IF_ENQUEUE(&pThis->u.s.inq, m);
+ mtx_unlock_spin(&pThis->u.s.inq.ifq_mtx);
+ taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskin);
+ }
+ /**
+ * Handle mbufs on the outgoing hook, frames going to the interface
+ */
else if (pThis->u.s.output == hook)
- return ng_vboxnetflt_rcv_out(hook, item);
+ {
+ if (mtag != NULL || !fActive)
+ return ether_output_frame(ifp, m);
+ mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
+ _IF_ENQUEUE(&pThis->u.s.outq, m);
+ mtx_unlock_spin(&pThis->u.s.outq.ifq_mtx);
+ taskqueue_enqueue_fast(taskqueue_fast, &pThis->u.s.tskout);
+ }
else
{
- NGI_GET_M(item, m);
- NG_FREE_ITEM(item);
+ m_freem(m);
}
return (0);
}
+static int ng_vboxnetflt_shutdown(node_p node)
+{
+ PVBOXNETFLTINS pThis = NG_NODE_PRIVATE(node);
+ bool fActive;
+
+ /* Prevent node shutdown if we're active */
+ fActive = ASMAtomicUoReadBool(&pThis->fActive);
+ if (fActive)
+ return (EBUSY);
+ NG_NODE_UNREF(node);
+ return (0);
+}
+
+static int ng_vboxnetflt_disconnect(hook_p hook)
+{
+ return (0);
+}
+
/**
- * Handle incoming hook. This is connected to the
- * input path of the interface, thus handling incoming frames.
+ * Input processing task, handles incoming frames
*/
-static int ng_vboxnetflt_rcv_in(hook_p hook, item_p item)
+static void vboxNetFltFreeBSDinput(void *arg, int pending)
{
+ PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)arg;
struct mbuf *m, *m0;
- struct m_tag *mtag;
- const node_p node = NG_HOOK_NODE(hook);
- PVBOXNETFLTINS pThis = NG_NODE_PRIVATE(node);
struct ifnet *ifp = pThis->u.s.ifp;
- bool fActive, fDropIt = false;
unsigned int cSegs = 0;
+ bool fDropIt = false, fActive;
PINTNETSG pSG;
- NGI_GET_M(item, m);
- NG_FREE_ITEM(item);
-
- fActive = ASMAtomicUoReadBool(&pThis->fActive);
- if (!fActive)
- goto out;
-
- mtag = m_tag_locate(m, MTAG_VBOX, PACKET_TAG_VBOX, NULL);
- if (mtag != NULL)
- {
- m_tag_unlink(m, mtag);
- m_tag_free(mtag);
- goto out;
- }
vboxNetFltRetain(pThis, true /* fBusy */);
-
- for (m0 = m; m0 != NULL; m0 = m0->m_next)
+ for (;;)
{
- if (m0->m_len > 0)
- cSegs++;
- }
+ mtx_lock_spin(&pThis->u.s.inq.ifq_mtx);
+ _IF_DEQUEUE(&pThis->u.s.inq, m);
+ mtx_unlock_spin(&pThis->u.s.inq.ifq_mtx);
+ if (m == NULL)
+ break;
+ for (m0 = m; m0 != NULL; m0 = m0->m_next)
+ if (m0->m_len > 0)
+ cSegs++;
+
#ifdef PADD_RUNT_FRAMES_FROM_HOST
- if (m_length(m, NULL) < 60)
- cSegs++;
+ if (m_length(m, NULL) < 60)
+ cSegs++;
#endif
- /* Create a copy of the mbuf and hand it to the virtual switch */
- pSG = RTMemTmpAlloc(RT_OFFSETOF(INTNETSG, aSegs[cSegs]));
- vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
- fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, INTNETTRUNKDIR_WIRE);
- RTMemTmpFree(pSG);
+ /* Create a copy and deliver to the virtual switch */
+ pSG = RTMemTmpAlloc(RT_OFFSETOF(INTNETSG, aSegs[cSegs]));
+ vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
+ fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, INTNETTRUNKDIR_HOST);
+ RTMemTmpFree(pSG);
+ if (fDropIt)
+ m_freem(m);
+ else
+ ether_demux(ifp, m);
+ }
vboxNetFltRelease(pThis, true /* fBusy */);
-
-out:
- /* Only deliver it to the host stack if the destination weren't a guest */
- if (fDropIt)
- {
- m_freem(m);
- return (0);
- }
- ether_demux(ifp, m);
- return (0);
}
/**
- * Handle mbufs on the outgoing hook, frames going to the interface
+ * Output processing task, handles outgoing frames
*/
-static int ng_vboxnetflt_rcv_out(hook_p hook, item_p item)
+static void vboxNetFltFreeBSDoutput(void *arg, int pending)
{
+ PVBOXNETFLTINS pThis = (PVBOXNETFLTINS)arg;
struct mbuf *m, *m0;
- struct m_tag *mtag;
- const node_p node = NG_HOOK_NODE(hook);
- PVBOXNETFLTINS pThis = NG_NODE_PRIVATE(node);
struct ifnet *ifp = pThis->u.s.ifp;
unsigned int cSegs = 0;
bool fDropIt = false, fActive;
PINTNETSG pSG;
- NGI_GET_M(item, m);
- NG_FREE_ITEM(item);
-
- fActive = ASMAtomicUoReadBool(&pThis->fActive);
- if (!fActive)
- return ether_output_frame(ifp, m);
-
vboxNetFltRetain(pThis, true /* fBusy */);
- /* Pass directly to interface if the packet originated from us */
- mtag = m_tag_locate(m, MTAG_VBOX, PACKET_TAG_VBOX, NULL);
- if (mtag != NULL)
+ for (;;)
{
- m_tag_unlink(m, mtag);
- m_tag_free(mtag);
- goto out;
- }
+ mtx_lock_spin(&pThis->u.s.outq.ifq_mtx);
+ _IF_DEQUEUE(&pThis->u.s.outq, m);
+ mtx_unlock_spin(&pThis->u.s.outq.ifq_mtx);
+ if (m == NULL)
+ break;
- for (m0 = m; m0 != NULL; m0 = m0->m_next)
- {
- if (m0->m_len > 0)
- cSegs++;
- }
+ for (m0 = m; m0 != NULL; m0 = m0->m_next)
+ if (m0->m_len > 0)
+ cSegs++;
#ifdef PADD_RUNT_FRAMES_FROM_HOST
- if (m_length(m, NULL) < 60)
- cSegs++;
+ if (m_length(m, NULL) < 60)
+ cSegs++;
#endif
- /* Create a copy and deliver to the virtual switch */
- pSG = RTMemTmpAlloc(RT_OFFSETOF(INTNETSG, aSegs[cSegs]));
- vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
- fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, INTNETTRUNKDIR_HOST);
- RTMemTmpFree(pSG);
+ /* Create a copy and deliver to the virtual switch */
+ pSG = RTMemTmpAlloc(RT_OFFSETOF(INTNETSG, aSegs[cSegs]));
+ vboxNetFltFreeBSDMBufToSG(pThis, m, pSG, cSegs, 0);
+ fDropIt = pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, INTNETTRUNKDIR_HOST);
+ RTMemTmpFree(pSG);
-out:
+ if (fDropIt)
+ m_freem(m);
+ else
+ ether_output_frame(ifp, m);
+ }
vboxNetFltRelease(pThis, true /* fBusy */);
- if (fDropIt)
- {
- m_freem(m);
- return (0);
- }
-
- return ether_output_frame(ifp, m);
}
-static int ng_vboxnetflt_shutdown(node_p node)
-{
- PVBOXNETFLTINS pThis = NG_NODE_PRIVATE(node);
- bool fActive;
-
- /* Prevent node shutdown if we're active */
- fActive = ASMAtomicUoReadBool(&pThis->fActive);
- if (fActive)
- return (EBUSY);
- NG_NODE_UNREF(node);
- return (0);
-}
-
-static int ng_vboxnetflt_disconnect(hook_p hook)
-{
- return (0);
-}
-
/**
* Called to deliver a frame to either the host, the wire or both.
*/
@@ -536,13 +542,23 @@
/* Create a new netgraph node for this instance */
if (ng_make_node_common(&ng_vboxnetflt_typestruct, &node) != 0)
- return VERR_INTERNAL_ERROR;
+ return VERR_INTERNAL_ERROR;
RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.ifp, ifp);
pThis->u.s.node = node;
bcopy(IF_LLADDR(ifp), &pThis->u.s.Mac, ETHER_ADDR_LEN);
ASMAtomicUoWriteBool(&pThis->fDisconnectedFromHost, false);
+ /* Initialize deferred input queue */
+ bzero(&pThis->u.s.inq, sizeof(struct ifqueue));
+ mtx_init(&pThis->u.s.inq.ifq_mtx, "vboxnetflt inq", NULL, MTX_SPIN);
+ TASK_INIT(&pThis->u.s.tskin, 0, vboxNetFltFreeBSDinput, pThis);
+
+ /* Initialize deferred output queue */
+ bzero(&pThis->u.s.outq, sizeof(struct ifqueue));
+ mtx_init(&pThis->u.s.outq.ifq_mtx, "vboxnetflt outq", NULL, MTX_SPIN);
+ TASK_INIT(&pThis->u.s.tskout, 0, vboxNetFltFreeBSDoutput, pThis);
+
RTSpinlockRelease(pThis->hSpinlock, &Tmp);
NG_NODE_SET_PRIVATE(node, pThis);
@@ -571,7 +587,10 @@
}
if (ifp0 != NULL)
+ {
+ vboxNetFltOsDeleteInstance(pThis);
vboxNetFltOsInitInstance(pThis, NULL);
+ }
return !ASMAtomicUoReadBool(&pThis->fDisconnectedFromHost);
}
@@ -579,6 +598,12 @@
void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
{
+ taskqueue_drain(taskqueue_fast, &pThis->u.s.tskin);
+ taskqueue_drain(taskqueue_fast, &pThis->u.s.tskout);
+
+ mtx_destroy(&pThis->u.s.inq.ifq_mtx);
+ mtx_destroy(&pThis->u.s.outq.ifq_mtx);
+
if (pThis->u.s.node != NULL)
ng_rmnode_self(pThis->u.s.node);
pThis->u.s.node = NULL;
|
