a0067d7b89
Packets are received inside USB bulk transfer callbacks, which run at splusb() (actually splbio()). The packet input queues are meant to be manipulated at splimp(). However the locking apparently breaks down under certain circumstances and the input queues can get trampled. There's a similar problem with if_ppp, which is driven by hardware/tty interrupts from the serial driver, but which must also manipulate the packet input queues at splimp(). The fix there is to use a netisr, and that's the fix I used here. (I can hear you groaning back there. Hush up.) The usb_ethersubr module maintains a single queue of its own. When a packet is received in the USB callback routine, it's placed on this queue with usb_ether_input(). This routine also schedules a soft net interrupt with schednetisr(). The ISR routine then runs later, at splnet, outside of the USB callback/interrupt context, and passes the packet to ether_input(), hopefully in a safe manner. The reason this is implemented as a separate module is that there are a limited number of NETISRs that we can use, and snarfing one up for each driver that needs it is wasteful (there will be three once I get the CATC driver done). It also reduces code duplication to a certain small extent. Unfortunately, it also needs to be linked in with the usb.ko module in order for the USB ethernet drivers to share it. Also removed some uneeded includes from if_aue.c and if_kue.c Fix suggested by: peter Not rejected as a hairbrained idea by: n_hibma
97 lines
3.7 KiB
C
97 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 1980, 1986, 1989, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* @(#)netisr.h 8.1 (Berkeley) 6/10/93
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _NET_NETISR_H_
|
|
#define _NET_NETISR_H_
|
|
|
|
/*
|
|
* The networking code runs off software interrupts.
|
|
*
|
|
* You can switch into the network by doing splnet() and return by splx().
|
|
* The software interrupt level for the network is higher than the software
|
|
* level for the clock (so you can enter the network in routines called
|
|
* at timeout time).
|
|
*/
|
|
#if defined(vax) || defined(tahoe)
|
|
#define setsoftnet() mtpr(SIRR, 12)
|
|
#endif
|
|
|
|
/*
|
|
* Each ``pup-level-1'' input queue has a bit in a ``netisr'' status
|
|
* word which is used to de-multiplex a single software
|
|
* interrupt used for scheduling the network code to calls
|
|
* on the lowest level routine of each protocol.
|
|
*/
|
|
#define NETISR_RAW 0 /* same as AF_UNSPEC */
|
|
#define NETISR_IP 2 /* same as AF_INET */
|
|
#define NETISR_IMP 3 /* same as AF_IMPLINK */
|
|
#define NETISR_NS 6 /* same as AF_NS */
|
|
#define NETISR_ISO 7 /* same as AF_ISO */
|
|
#define NETISR_CCITT 10 /* same as AF_CCITT */
|
|
#define NETISR_ATALK 16 /* same as AF_APPLETALK */
|
|
#define NETISR_ARP 18 /* same as AF_LINK */
|
|
#define NETISR_IPX 23 /* same as AF_IPX */
|
|
#define NETISR_USB 25 /* USB soft interrupt */
|
|
#define NETISR_ISDN 26 /* same as AF_E164 */
|
|
#define NETISR_PPP 27 /* PPP soft interrupt */
|
|
#define NETISR_IPV6 28 /* same as AF_INET6 */
|
|
#define NETISR_NATM 29 /* same as AF_NATM */
|
|
#define NETISR_NETGRAPH 31 /* same as AF_NETGRAPH */
|
|
|
|
#define schednetisr(anisr) { netisr |= 1<<(anisr); setsoftnet(); }
|
|
|
|
#ifndef LOCORE
|
|
#ifdef _KERNEL
|
|
extern volatile unsigned int netisr; /* scheduling bits for network */
|
|
|
|
typedef void netisr_t __P((void));
|
|
|
|
struct netisrtab {
|
|
int nit_num;
|
|
netisr_t *nit_isr;
|
|
};
|
|
|
|
int register_netisr __P((int, netisr_t *));
|
|
void netisr_sysinit __P((void *));
|
|
|
|
#define NETISR_SET(num, isr) \
|
|
static struct netisrtab nisr_##num = { num, isr }; \
|
|
SYSINIT(nisr_##num, SI_SUB_CPU, SI_ORDER_ANY, netisr_sysinit, &nisr_##num)
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|