pool_setipl for various netinet and netinet6 bits

thank you to everyone who helped reviewed these diffs

ok mpi@

6 files changed, 15 insertions, 6 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index cab6f574d10..63369753745 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.c,v 1.221 2016/08/22 16:01:52 mpi Exp $	*/
+/*	$OpenBSD: if_ether.c,v 1.222 2016/09/06 00:04:15 dlg Exp $	*/
 /*	$NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $	*/
 
 /*
@@ -137,6 +137,7 @@ arp_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt)
 		arpinit_done = 1;
 		pool_init(&arp_pool, sizeof(struct llinfo_arp), 0, 0, 0, "arp",
 		    NULL);
+		pool_setipl(&arp_pool, IPL_SOFTNET);
 
 		timeout_set(&arptimer_to, arptimer, &arptimer_to);
 		timeout_add_sec(&arptimer_to, 1);
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 420ae30b651..a553f443aca 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_pcb.c,v 1.213 2016/08/04 20:46:24 vgross Exp $	*/
+/*	$OpenBSD: in_pcb.c,v 1.214 2016/09/06 00:04:15 dlg Exp $	*/
 /*	$NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $	*/
 
 /*
@@ -257,6 +257,7 @@ in_pcballoc(struct socket *so, struct inpcbtable *table)
 	if (inpcb_pool_initialized == 0) {
 		pool_init(&inpcb_pool, sizeof(struct inpcb), 0, 0, 0,
 		    "inpcbpl", NULL);
+		pool_setipl(&inpcb_pool, IPL_SOFTNET);
 		inpcb_pool_initialized = 1;
 	}
 	inp = pool_get(&inpcb_pool, PR_NOWAIT|PR_ZERO);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index a1b33c6667b..1b454ff3ff5 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.279 2016/07/22 07:39:06 mpi Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.280 2016/09/06 00:04:15 dlg Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -167,7 +167,9 @@ ip_init(void)
 	const u_int16_t defrootonlyports_udp[] = DEFROOTONLYPORTS_UDP;
 
 	pool_init(&ipqent_pool, sizeof(struct ipqent), 0, 0, 0, "ipqe",  NULL);
+	pool_setipl(&ipqent_pool, IPL_SOFTNET);
 	pool_init(&ipq_pool, sizeof(struct ipq), 0, 0, 0, "ipq", NULL);
+	pool_setipl(&ipq_pool, IPL_SOFTNET);
 
 	pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW);
 	if (pr == NULL)
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 60ac0b2a332..33ff65c109b 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.88 2015/10/07 10:50:35 mpi Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.89 2016/09/06 00:04:15 dlg Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -670,6 +670,7 @@ ipsp_acquire_sa(struct ipsec_policy *ipo, union sockaddr_union *gw,
 		ipsec_acquire_pool_initialized = 1;
 		pool_init(&ipsec_acquire_pool, sizeof(struct ipsec_acquire),
 		    0, 0, 0, "ipsec acquire", NULL);
+		pool_setipl(&ipsec_acquire_pool, IPL_SOFTNET);
 	}
 
 	ipa = pool_get(&ipsec_acquire_pool, PR_NOWAIT|PR_ZERO);
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 11ce7055483..50936a0f8fa 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.153 2016/09/03 14:34:13 bluhm Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.154 2016/09/06 00:04:15 dlg Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -142,11 +142,14 @@ tcp_init(void)
 {
 	tcp_iss = 1;		/* wrong */
 	pool_init(&tcpcb_pool, sizeof(struct tcpcb), 0, 0, 0, "tcpcb", NULL);
+	pool_setipl(&tcpcb_pool, IPL_SOFTNET);
 	pool_init(&tcpqe_pool, sizeof(struct tcpqent), 0, 0, 0, "tcpqe", NULL);
+	pool_setipl(&tcpcb_pool, IPL_SOFTNET);
 	pool_sethardlimit(&tcpqe_pool, tcp_reass_limit, NULL, 0);
 #ifdef TCP_SACK
 	pool_init(&sackhl_pool, sizeof(struct sackhole), 0, 0, 0, "sackhl",
 	    NULL);
+	pool_setipl(&sackhl_pool, IPL_SOFTNET);
 	pool_sethardlimit(&sackhl_pool, tcp_sackhole_limit, NULL, 0);
 #endif /* TCP_SACK */
 	in_pcbinit(&tcbtable, TCB_INITIAL_HASH_SIZE);
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 6faced72f2d..216a0fb359c 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.190 2016/08/22 16:01:52 mpi Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.191 2016/09/06 00:04:15 dlg Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -117,6 +117,7 @@ nd6_init(void)
 
 	TAILQ_INIT(&nd6_list);
 	pool_init(&nd6_pool, sizeof(struct llinfo_nd6), 0, 0, 0, "nd6", NULL);
+	pool_setipl(&nd6_pool, IPL_SOFTNET);
 
 	/* initialization of the default router list */
 	TAILQ_INIT(&nd_defrouter);