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/netatalk | |
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/netatalk')
-rw-r--r-- | sys/netatalk/aarp.c | 2 | ||||
-rw-r--r-- | sys/netatalk/ddp_input.c | 3 | ||||
-rw-r--r-- | sys/netatalk/ddp_pcb.c | 6 | ||||
-rw-r--r-- | sys/netatalk/ddp_usrreq.c | 6 |
4 files changed, 11 insertions, 6 deletions
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c index 022ce5e..1de5638 100644 --- a/sys/netatalk/aarp.c +++ b/sys/netatalk/aarp.c @@ -312,6 +312,8 @@ at_aarpinput( struct arpcom *ac, struct mbuf *m) int op; u_short net; + GIANT_REQUIRED; + ea = mtod( m, struct ether_aarp *); /* Check to see if from my hardware address */ diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c index 2f7ad83..1d2051e 100644 --- a/sys/netatalk/ddp_input.c +++ b/sys/netatalk/ddp_input.c @@ -39,6 +39,7 @@ static void ddp_input(struct mbuf *, struct ifnet *, struct elaphdr *, int); void at2intr(struct mbuf *m) { + GIANT_REQUIRED; /* * Phase 2 packet handling @@ -66,6 +67,8 @@ at1intr(struct mbuf *m) elhp = mtod(m, struct elaphdr *); m_adj(m, SZ_ELAPHDR); + GIANT_REQUIRED; + if (elhp->el_type == ELAP_DDPEXTEND) { ddp_input(m, m->m_pkthdr.rcvif, NULL, 1); } else { diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c index cf7b35b..69b8958 100644 --- a/sys/netatalk/ddp_pcb.c +++ b/sys/netatalk/ddp_pcb.c @@ -553,9 +553,9 @@ ddp_init(void) mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF); mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF); mtx_init(&aarpintrq.ifq_mtx, "aarp_inq", NULL, MTX_DEF); - netisr_register(NETISR_ATALK1, at1intr, &atintrq1); - netisr_register(NETISR_ATALK2, at2intr, &atintrq2); - netisr_register(NETISR_AARP, aarpintr, &aarpintrq); + netisr_register(NETISR_ATALK1, at1intr, &atintrq1, 0); + netisr_register(NETISR_ATALK2, at2intr, &atintrq2, 0); + netisr_register(NETISR_AARP, aarpintr, &aarpintrq, 0); } #if 0 diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c index cf7b35b..69b8958 100644 --- a/sys/netatalk/ddp_usrreq.c +++ b/sys/netatalk/ddp_usrreq.c @@ -553,9 +553,9 @@ ddp_init(void) mtx_init(&atintrq1.ifq_mtx, "at1_inq", NULL, MTX_DEF); mtx_init(&atintrq2.ifq_mtx, "at2_inq", NULL, MTX_DEF); mtx_init(&aarpintrq.ifq_mtx, "aarp_inq", NULL, MTX_DEF); - netisr_register(NETISR_ATALK1, at1intr, &atintrq1); - netisr_register(NETISR_ATALK2, at2intr, &atintrq2); - netisr_register(NETISR_AARP, aarpintr, &aarpintrq); + netisr_register(NETISR_ATALK1, at1intr, &atintrq1, 0); + netisr_register(NETISR_ATALK2, at2intr, &atintrq2, 0); + netisr_register(NETISR_AARP, aarpintr, &aarpintrq, 0); } #if 0 |