epoch(9): allocate net epochs earlier in boot

1 files changed, 10 insertions, 2 deletions

diff --git a/sys/net/if.c b/sys/net/if.c
index 598fc2a8ad8a..3a8f8f0098cd 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -900,12 +900,20 @@ if_attach_internal(struct ifnet *ifp, int vmove, struct if_clone *ifc)
 }
 
 static void
-if_attachdomain(void *dummy)
+if_epochalloc(void *dummy __unused)
 {
-	struct ifnet *ifp;
 
 	net_epoch_preempt = epoch_alloc(EPOCH_PREEMPT);
 	net_epoch = epoch_alloc(0);
+}
+SYSINIT(ifepochalloc, SI_SUB_TASKQ + 1, SI_ORDER_ANY,
+    if_epochalloc, NULL);
+
+static void
+if_attachdomain(void *dummy)
+{
+	struct ifnet *ifp;
+
 	TAILQ_FOREACH(ifp, &V_ifnet, if_link)
 		if_attachdomain1(ifp);
 }