2c4f67981e
(1) bpf peer attaches to interface netif0 (2) Packet is received by netif0 (3) ifp->if_bpf pointer is checked and handed off to bpf (4) bpf peer detaches from netif0 resulting in ifp->if_bpf being initialized to NULL. (5) ifp->if_bpf is dereferenced by bpf machinery (6) Kaboom This race condition likely explains the various different kernel panics reported around sending SIGINT to tcpdump or dhclient processes. But really this race can result in kernel panics anywhere you have frequent bpf attach and detach operations with high packet per second load. Summary of changes: - Remove the bpf interface's "driverp" member - When we attach bpf interfaces, we now set the ifp->if_bpf member to the bpf interface structure. Once this is done, ifp->if_bpf should never be NULL. [1] - Introduce bpf_peers_present function, an inline operation which will do a lockless read bpf peer list associated with the interface. It should be noted that the bpf code will pickup the bpf_interface lock before adding or removing bpf peers. This should serialize the access to the bpf descriptor list, removing the race. - Expose the bpf_if structure in bpf.h so that the bpf_peers_present function can use it. This also removes the struct bpf_if; hack that was there. - Adjust all consumers of the raw if_bpf structure to use bpf_peers_present Now what happens is: (1) Packet is received by netif0 (2) Check to see if bpf descriptor list is empty (3) Pickup the bpf interface lock (4) Hand packet off to process From the attach/detach side: (1) Pickup the bpf interface lock (2) Add/remove from bpf descriptor list Now that we are storing the bpf interface structure with the ifnet, there is is no need to walk the bpf interface list to locate the correct bpf interface. We now simply look up the interface, and initialize the pointer. This has a nice side effect of changing a bpf interface attach operation from O(N) (where N is the number of bpf interfaces), to O(1). [1] From now on, we can no longer check ifp->if_bpf to tell us whether or not we have any bpf peers that might be interested in receiving packets. In collaboration with: sam@ MFC after: 1 month
147 lines
5.3 KiB
C
147 lines
5.3 KiB
C
/*-
|
|
* Copyright (c) 1990, 1991, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from the Stanford/CMU enet packet filter,
|
|
* (net/enet.c) distributed as part of 4.3BSD, and code contributed
|
|
* to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
|
|
* Berkeley Laboratory.
|
|
*
|
|
* 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.
|
|
* 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.
|
|
*
|
|
* @(#)bpfdesc.h 8.1 (Berkeley) 6/10/93
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _NET_BPFDESC_H_
|
|
#define _NET_BPFDESC_H_
|
|
|
|
#include <sys/callout.h>
|
|
#include <sys/selinfo.h>
|
|
#include <sys/queue.h>
|
|
#include <sys/conf.h>
|
|
#include <net/if.h>
|
|
|
|
/*
|
|
* Descriptor associated with each open bpf file.
|
|
*/
|
|
struct bpf_d {
|
|
LIST_ENTRY(bpf_d) bd_next; /* Linked list of descriptors */
|
|
/*
|
|
* Buffer slots: two mbuf clusters buffer the incoming packets.
|
|
* The model has three slots. Sbuf is always occupied.
|
|
* sbuf (store) - Receive interrupt puts packets here.
|
|
* hbuf (hold) - When sbuf is full, put cluster here and
|
|
* wakeup read (replace sbuf with fbuf).
|
|
* fbuf (free) - When read is done, put cluster here.
|
|
* On receiving, if sbuf is full and fbuf is 0, packet is dropped.
|
|
*/
|
|
caddr_t bd_sbuf; /* store slot */
|
|
caddr_t bd_hbuf; /* hold slot */
|
|
caddr_t bd_fbuf; /* free slot */
|
|
int bd_slen; /* current length of store buffer */
|
|
int bd_hlen; /* current length of hold buffer */
|
|
|
|
int bd_bufsize; /* absolute length of buffers */
|
|
|
|
struct bpf_if * bd_bif; /* interface descriptor */
|
|
u_long bd_rtout; /* Read timeout in 'ticks' */
|
|
struct bpf_insn *bd_rfilter; /* read filter code */
|
|
struct bpf_insn *bd_wfilter; /* write filter code */
|
|
#ifdef BPF_JITTER
|
|
bpf_jit_filter *bd_bfilter; /* binary filter code */
|
|
#endif
|
|
u_long bd_rcount; /* number of packets received */
|
|
u_long bd_dcount; /* number of packets dropped */
|
|
|
|
u_char bd_promisc; /* true if listening promiscuously */
|
|
u_char bd_state; /* idle, waiting, or timed out */
|
|
u_char bd_immediate; /* true to return on packet arrival */
|
|
int bd_hdrcmplt; /* false to fill in src lladdr automatically */
|
|
int bd_seesent; /* true if bpf should see sent packets */
|
|
int bd_async; /* non-zero if packet reception should generate signal */
|
|
int bd_sig; /* signal to send upon packet reception */
|
|
struct sigio * bd_sigio; /* information for async I/O */
|
|
#if BSD < 199103
|
|
u_char bd_selcoll; /* true if selects collide */
|
|
int bd_timedout;
|
|
struct thread * bd_selthread; /* process that last selected us */
|
|
#else
|
|
u_char bd_pad; /* explicit alignment */
|
|
struct selinfo bd_sel; /* bsd select info */
|
|
#endif
|
|
struct mtx bd_mtx; /* mutex for this descriptor */
|
|
struct callout bd_callout; /* for BPF timeouts with select */
|
|
struct label *bd_label; /* MAC label for descriptor */
|
|
u_long bd_fcount; /* number of packets which matched filter */
|
|
pid_t bd_pid; /* PID which created descriptor */
|
|
int bd_locked; /* true if descriptor is locked */
|
|
};
|
|
|
|
/* Values for bd_state */
|
|
#define BPF_IDLE 0 /* no select in progress */
|
|
#define BPF_WAITING 1 /* waiting for read timeout in select */
|
|
#define BPF_TIMED_OUT 2 /* read timeout has expired in select */
|
|
|
|
#define BPFD_LOCK(bd) mtx_lock(&(bd)->bd_mtx)
|
|
#define BPFD_UNLOCK(bd) mtx_unlock(&(bd)->bd_mtx)
|
|
#define BPFD_LOCK_ASSERT(bd) do { \
|
|
mtx_assert(&(bd)->bd_mtx, MA_OWNED); \
|
|
NET_ASSERT_GIANT(); \
|
|
} while (0)
|
|
|
|
/* Test whether a BPF is ready for read(). */
|
|
#define bpf_ready(bd) \
|
|
((bd)->bd_hlen != 0 || \
|
|
(((bd)->bd_immediate || (bd)->bd_state == BPF_TIMED_OUT) && \
|
|
(bd)->bd_slen != 0))
|
|
|
|
/*
|
|
* External representation of the bpf descriptor
|
|
*/
|
|
struct xbpf_d {
|
|
u_char bd_promisc;
|
|
u_char bd_immediate;
|
|
int bd_hdrcmplt;
|
|
int bd_seesent;
|
|
int bd_async;
|
|
u_long bd_rcount;
|
|
u_long bd_dcount;
|
|
u_long bd_fcount;
|
|
int bd_sig;
|
|
int bd_slen;
|
|
int bd_hlen;
|
|
int bd_bufsize;
|
|
pid_t bd_pid;
|
|
char bd_ifname[IFNAMSIZ];
|
|
int bd_locked;
|
|
};
|
|
|
|
#define BPFIF_LOCK(bif) mtx_lock(&(bif)->bif_mtx)
|
|
#define BPFIF_UNLOCK(bif) mtx_unlock(&(bif)->bif_mtx)
|
|
|
|
#endif
|