diff options
author | sam <sam@FreeBSD.org> | 2003-11-08 22:28:40 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2003-11-08 22:28:40 +0000 |
commit | 7f3b205cb834636e3bbf0bb354cccd5c98ee1db4 (patch) | |
tree | 2ce18b56605a2424ffb613d7f2ee4678a34df3a4 /sys/netinet/ip_input.c | |
parent | db66506d6cab556d613d20d13ef3403ca934395c (diff) | |
download | FreeBSD-src-7f3b205cb834636e3bbf0bb354cccd5c98ee1db4.zip FreeBSD-src-7f3b205cb834636e3bbf0bb354cccd5c98ee1db4.tar.gz |
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
Diffstat (limited to 'sys/netinet/ip_input.c')
-rw-r--r-- | sys/netinet/ip_input.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 26cc060..2f2dc96 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -334,7 +334,7 @@ ip_init() #endif ipintrq.ifq_maxlen = ipqmaxlen; mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF); - netisr_register(NETISR_IP, ip_input, &ipintrq); + netisr_register(NETISR_IP, ip_input, &ipintrq, NETISR_MPSAFE); } /* @@ -1009,6 +1009,7 @@ DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/ * Switch out to protocol's input routine. */ ipstat.ips_delivered++; + NET_PICKUP_GIANT(); if (args.next_hop && ip->ip_p == IPPROTO_TCP) { /* TCP needs IPFORWARD info if available */ struct m_hdr tag; @@ -1022,6 +1023,7 @@ DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/ (struct mbuf *)&tag, hlen); } else (*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen); + NET_DROP_GIANT(); return; bad: m_freem(m); |