o add a flags parameter to netisr_register that is used to specify

  whether or not the isr needs to hold Giant when running; Giant-less
  operation is also controlled by the setting of debug_mpsafenet
o mark all netisr's except NETISR_IP as needing Giant
o add a GIANT_REQUIRED assertion to the top of netisr's that need Giant
o pickup Giant (when debug_mpsafenet is 1) inside ip_input before
  calling up with a packet
o change netisr handling so swi_net runs w/o Giant; instead we grab
  Giant before invoking handlers based on whether the handler needs Giant
o change netisr handling so that netisr's that are marked MPSAFE may
  have multiple instances active at a time
o add netisr statistics for packets dropped because the isr is inactive

Supported by:	FreeBSD Foundation

2 files changed, 3 insertions, 1 deletions

diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index 87870b0..b9beb03c 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -685,6 +685,8 @@ natmintr(struct mbuf *m)
 	struct socket *so;
 	struct natmpcb *npcb;
 
+	GIANT_REQUIRED;
+
 #ifdef DIAGNOSTIC
 	M_ASSERTPKTHDR(m);
 #endif
diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c
index 5848cc8..535262f 100644
--- a/sys/netnatm/natm_proto.c
+++ b/sys/netnatm/natm_proto.c
@@ -122,7 +122,7 @@ natm_init(void)
 	bzero(&natmintrq, sizeof(natmintrq));
 	natmintrq.ifq_maxlen = natmqmaxlen;
 	mtx_init(&natmintrq.ifq_mtx, "natm_inq", NULL, MTX_DEF);
-	netisr_register(NETISR_NATM, natmintr, &natmintrq);
+	netisr_register(NETISR_NATM, natmintr, &natmintrq, 0);
 }
 
 #if defined(__FreeBSD__)