2005-01-07 01:45:51 +00:00
|
|
|
/*-
|
1996-07-10 19:44:30 +00:00
|
|
|
* Copyright (c) 1982, 1986, 1988, 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.
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2007-10-07 20:44:24 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
1998-01-08 23:42:31 +00:00
|
|
|
#include "opt_inet.h"
|
2012-01-22 02:16:31 +00:00
|
|
|
#include "opt_inet6.h"
|
2009-02-03 11:00:43 +00:00
|
|
|
#include "opt_sctp.h"
|
1998-01-08 23:42:31 +00:00
|
|
|
#ifndef INET
|
2012-01-22 10:41:58 +00:00
|
|
|
#error "IPDIVERT requires INET"
|
1998-01-08 23:42:31 +00:00
|
|
|
#endif
|
|
|
|
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/param.h>
|
2000-08-03 14:09:52 +00:00
|
|
|
#include <sys/kernel.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/lock.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/malloc.h>
|
|
|
|
#include <sys/mbuf.h>
|
2004-10-19 21:14:57 +00:00
|
|
|
#include <sys/module.h>
|
|
|
|
#include <sys/kernel.h>
|
2006-11-06 13:42:10 +00:00
|
|
|
#include <sys/priv.h>
|
2001-11-08 02:13:18 +00:00
|
|
|
#include <sys/proc.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/protosw.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <sys/socket.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <sys/socketvar.h>
|
2000-08-03 14:09:52 +00:00
|
|
|
#include <sys/sysctl.h>
|
2010-01-07 10:39:15 +00:00
|
|
|
#include <net/vnet.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
#include <net/if.h>
|
Over the past couple of years, there have been a number of reports relating
the use of divert sockets to dead locks. A number of LORs have been reported
between divert and a number of other network subsystems including: IPSEC, Pfil,
multicast, ipfw and others. Other dead locks could occur because of recursive
entry into the IP stack. This change should take care of most if not all of
these issues.
A summary of the changes follow:
- We disallow multicast operations on divert sockets. It really doesn't make
semantic sense to allow this, since typically you would set multicast
parameters on multicast end points.
NOTE: As a part of this change, we actually dis-allow multicast options on
any socket that IS a divert socket OR IS NOT a SOCK_RAW or SOCK_DGRAM family
- We check to see if there are any socket options that have been specified on
the socket, and if there was (which is very un-common and also probably
doesnt make sense to support) we duplicate the mbuf carrying the options.
- We then drop the INP/INFO locks over the call to ip_output(). It should be
noted that since we no longer support multicast operations on divert sockets
and we have duplicated any socket options, we no longer need the reference
to the pcb to be coherent.
- Finally, we replaced the call to ip_input() to use netisr queuing. This
should remove the recursive entry into the IP stack from divert.
By dropping the locks over the call to ip_output() we eliminate all the lock
ordering issues above. By switching over to netisr on the inbound path,
we can no longer recursively enter the ip_input() code via divert.
I have tested this change by using the following command:
ipfwpcap -r 8000 - | tcpdump -r - -nn -v
This should exercise the input and re-injection (outbound) path, which is
very similar to the work load performed by natd(8). Additionally, I have
run some ospf daemons which have a heavy reliance on raw sockets and
multicast.
Approved by: re@ (kensmith)
MFC after: 1 month
LOR: 163
LOR: 181
LOR: 202
LOR: 203
Discussed with: julian, andre et al (on freebsd-net)
In collaboration with: bms [1], rwatson [2]
[1] bms helped out with the multicast decisions
[2] rwatson submitted the original netisr patches and came up with some
of the original ideas on how to combat this issue.
2007-08-06 22:06:36 +00:00
|
|
|
#include <net/netisr.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/in_pcb.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <netinet/in_systm.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <netinet/in_var.h>
|
2002-04-30 01:54:54 +00:00
|
|
|
#include <netinet/ip.h>
|
1996-07-10 19:44:30 +00:00
|
|
|
#include <netinet/ip_var.h>
|
2011-06-27 12:21:11 +00:00
|
|
|
#ifdef INET6
|
|
|
|
#include <netinet/ip6.h>
|
|
|
|
#include <netinet6/ip6_var.h>
|
|
|
|
#endif
|
2009-02-03 11:00:43 +00:00
|
|
|
#ifdef SCTP
|
|
|
|
#include <netinet/sctp_crc32.h>
|
|
|
|
#endif
|
1996-07-10 19:44:30 +00:00
|
|
|
|
2006-10-22 11:52:19 +00:00
|
|
|
#include <security/mac/mac_framework.h>
|
|
|
|
|
1996-07-10 19:44:30 +00:00
|
|
|
/*
|
|
|
|
* Divert sockets
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate enough space to hold a full IP packet
|
|
|
|
*/
|
|
|
|
#define DIVSNDQ (65536 + 100)
|
|
|
|
#define DIVRCVQ (65536 + 100)
|
|
|
|
|
|
|
|
/*
|
2010-01-07 10:39:15 +00:00
|
|
|
* Divert sockets work in conjunction with ipfw or other packet filters,
|
|
|
|
* see the divert(4) manpage for features.
|
|
|
|
* Packets are selected by the packet filter and tagged with an
|
|
|
|
* MTAG_IPFW_RULE tag carrying the 'divert port' number (as set by
|
|
|
|
* the packet filter) and information on the matching filter rule for
|
|
|
|
* subsequent reinjection. The divert_port is used to put the packet
|
|
|
|
* on the corresponding divert socket, while the rule number is passed
|
|
|
|
* up (at least partially) as the sin_port in the struct sockaddr.
|
1998-05-25 10:37:48 +00:00
|
|
|
*
|
2010-01-07 10:39:15 +00:00
|
|
|
* Packets written to the divert socket carry in sin_addr a
|
|
|
|
* destination address, and in sin_port the number of the filter rule
|
|
|
|
* after which to continue processing.
|
|
|
|
* If the destination address is INADDR_ANY, the packet is treated as
|
|
|
|
* as outgoing and sent to ip_output(); otherwise it is treated as
|
|
|
|
* incoming and sent to ip_input().
|
|
|
|
* Further, sin_zero carries some information on the interface,
|
|
|
|
* which can be used in the reinject -- see comments in the code.
|
1999-12-06 00:43:07 +00:00
|
|
|
*
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
* On reinjection, processing in ip_input() and ip_output()
|
|
|
|
* will be exactly the same as for the original packet, except that
|
2010-01-07 10:39:15 +00:00
|
|
|
* packet filter processing will start at the rule number after the one
|
|
|
|
* written in the sin_port (ipfw does not allow a rule #0, so sin_port=0
|
|
|
|
* will apply the entire ruleset to the packet).
|
1996-07-10 19:44:30 +00:00
|
|
|
*/
|
|
|
|
|
2004-10-19 21:14:57 +00:00
|
|
|
/* Internal variables. */
|
2010-11-22 19:32:54 +00:00
|
|
|
static VNET_DEFINE(struct inpcbhead, divcb);
|
|
|
|
static VNET_DEFINE(struct inpcbinfo, divcbinfo);
|
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual
network stack memory allocator. Modify vnet to use the allocator
instead of monolithic global container structures (vinet, ...). This
change solves many binary compatibility problems associated with
VIMAGE, and restores ELF symbols for virtualized global variables.
Each virtualized global variable exists as a "reference copy", and also
once per virtual network stack. Virtualized global variables are
tagged at compile-time, placing the in a special linker set, which is
loaded into a contiguous region of kernel memory. Virtualized global
variables in the base kernel are linked as normal, but those in modules
are copied and relocated to a reserved portion of the kernel's vnet
region with the help of a the kernel linker.
Virtualized global variables exist in per-vnet memory set up when the
network stack instance is created, and are initialized statically from
the reference copy. Run-time access occurs via an accessor macro, which
converts from the current vnet and requested symbol to a per-vnet
address. When "options VIMAGE" is not compiled into the kernel, normal
global ELF symbols will be used instead and indirection is avoided.
This change restores static initialization for network stack global
variables, restores support for non-global symbols and types, eliminates
the need for many subsystem constructors, eliminates large per-subsystem
structures that caused many binary compatibility issues both for
monitoring applications (netstat) and kernel modules, removes the
per-function INIT_VNET_*() macros throughout the stack, eliminates the
need for vnet_symmap ksym(2) munging, and eliminates duplicate
definitions of virtualized globals under VIMAGE_GLOBALS.
Bump __FreeBSD_version and update UPDATING.
Portions submitted by: bz
Reviewed by: bz, zec
Discussed with: gnn, jamie, jeff, jhb, julian, sam
Suggested by: peter
Approved by: re (kensmith)
2009-07-14 22:48:30 +00:00
|
|
|
|
2009-07-16 21:13:04 +00:00
|
|
|
#define V_divcb VNET(divcb)
|
|
|
|
#define V_divcbinfo VNET(divcbinfo)
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
static u_long div_sendspace = DIVSNDQ; /* XXX sysctl ? */
|
|
|
|
static u_long div_recvspace = DIVRCVQ; /* XXX sysctl ? */
|
|
|
|
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
static eventhandler_tag ip_divert_event_tag;
|
|
|
|
|
1996-07-10 19:44:30 +00:00
|
|
|
/*
|
|
|
|
* Initialize divert connection block queue.
|
|
|
|
*/
|
2006-04-21 09:25:40 +00:00
|
|
|
static void
|
|
|
|
div_zone_change(void *tag)
|
|
|
|
{
|
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
uma_zone_set_max(V_divcbinfo.ipi_zone, maxsockets);
|
2006-04-21 09:25:40 +00:00
|
|
|
}
|
|
|
|
|
2006-07-18 22:34:27 +00:00
|
|
|
static int
|
|
|
|
div_inpcb_init(void *mem, int size, int flags)
|
|
|
|
{
|
2006-12-29 14:58:18 +00:00
|
|
|
struct inpcb *inp = mem;
|
|
|
|
|
2006-07-18 22:34:27 +00:00
|
|
|
INP_LOCK_INIT(inp, "inp", "divinp");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
div_inpcb_fini(void *mem, int size)
|
|
|
|
{
|
2006-12-29 14:58:18 +00:00
|
|
|
struct inpcb *inp = mem;
|
|
|
|
|
2006-07-18 22:34:27 +00:00
|
|
|
INP_LOCK_DESTROY(inp);
|
|
|
|
}
|
|
|
|
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
static void
|
1996-07-10 19:44:30 +00:00
|
|
|
div_init(void)
|
|
|
|
{
|
2007-05-10 15:58:48 +00:00
|
|
|
|
1996-07-10 19:44:30 +00:00
|
|
|
/*
|
2010-03-14 18:59:11 +00:00
|
|
|
* XXX We don't use the hash list for divert IP, but it's easier to
|
|
|
|
* allocate one-entry hash lists than it is to check all over the
|
|
|
|
* place for hashbase == NULL.
|
1996-07-10 19:44:30 +00:00
|
|
|
*/
|
2010-03-14 18:59:11 +00:00
|
|
|
in_pcbinfo_init(&V_divcbinfo, "div", &V_divcb, 1, 1, "divcb",
|
Implement a CPU-affine TCP and UDP connection lookup data structure,
struct inpcbgroup. pcbgroups, or "connection groups", supplement the
existing inpcbinfo connection hash table, which when pcbgroups are
enabled, might now be thought of more usefully as a per-protocol
4-tuple reservation table.
Connections are assigned to connection groups base on a hash of their
4-tuple; wildcard sockets require special handling, and are members
of all connection groups. During a connection lookup, a
per-connection group lock is employed rather than the global pcbinfo
lock. By aligning connection groups with input path processing,
connection groups take on an effective CPU affinity, especially when
aligned with RSS work placement (see a forthcoming commit for
details). This eliminates cache line migration associated with
global, protocol-layer data structures in steady state TCP and UDP
processing (with the exception of protocol-layer statistics; further
commit to follow).
Elements of this approach were inspired by Willman, Rixner, and Cox's
2006 USENIX paper, "An Evaluation of Network Stack Parallelization
Strategies in Modern Operating Systems". However, there are also
significant differences: we maintain the inpcb lock, rather than using
the connection group lock for per-connection state.
Likewise, the focus of this implementation is alignment with NIC
packet distribution strategies such as RSS, rather than pure software
strategies. Despite that focus, software distribution is supported
through the parallel netisr implementation, and works well in
configurations where the number of hardware threads is greater than
the number of NIC input queues, such as in the RMI XLR threaded MIPS
architecture.
Another important difference is the continued maintenance of existing
hash tables as "reservation tables" -- these are useful both to
distinguish the resource allocation aspect of protocol name management
and the more common-case lookup aspect. In configurations where
connection tables are aligned with hardware hashes, it is desirable to
use the traditional lookup tables for loopback or encapsulated traffic
rather than take the expense of hardware hashes that are hard to
implement efficiently in software (such as RSS Toeplitz).
Connection group support is enabled by compiling "options PCBGROUP"
into your kernel configuration; for the time being, this is an
experimental feature, and hence is not enabled by default.
Subject to the limited MFCability of change dependencies in inpcb,
and its change to the inpcbinfo init function signature, this change
in principle could be merged to FreeBSD 8.x.
Reviewed by: bz
Sponsored by: Juniper Networks, Inc.
2011-06-06 12:55:02 +00:00
|
|
|
div_inpcb_init, div_inpcb_fini, UMA_ZONE_NOFREE,
|
|
|
|
IPI_HASHFIELDS_NONE);
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
div_destroy(void)
|
|
|
|
{
|
|
|
|
|
2010-03-14 18:59:11 +00:00
|
|
|
in_pcbinfo_destroy(&V_divcbinfo);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-10-29 16:46:13 +00:00
|
|
|
* IPPROTO_DIVERT is not in the real IP protocol number space; this
|
|
|
|
* function should never be called. Just in case, drop any packets.
|
1996-07-10 19:44:30 +00:00
|
|
|
*/
|
2010-01-04 19:01:22 +00:00
|
|
|
static void
|
2001-09-03 20:03:55 +00:00
|
|
|
div_input(struct mbuf *m, int off)
|
1999-12-06 00:43:07 +00:00
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
|
2009-08-02 19:43:32 +00:00
|
|
|
KMOD_IPSTAT_INC(ips_noproto);
|
1999-12-06 00:43:07 +00:00
|
|
|
m_freem(m);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Divert a packet by passing it up to the divert socket at port 'port'.
|
|
|
|
*
|
|
|
|
* Setup generic address and protocol structures for div_input routine,
|
|
|
|
* then pass them along with mbuf chain.
|
|
|
|
*/
|
2004-10-19 21:14:57 +00:00
|
|
|
static void
|
2004-02-25 19:55:29 +00:00
|
|
|
divert_packet(struct mbuf *m, int incoming)
|
1996-07-10 19:44:30 +00:00
|
|
|
{
|
1997-06-02 05:02:37 +00:00
|
|
|
struct ip *ip;
|
|
|
|
struct inpcb *inp;
|
|
|
|
struct socket *sa;
|
1999-12-06 00:43:07 +00:00
|
|
|
u_int16_t nport;
|
2003-09-05 00:00:51 +00:00
|
|
|
struct sockaddr_in divsrc;
|
2004-02-25 19:55:29 +00:00
|
|
|
struct m_tag *mtag;
|
1996-07-10 19:44:30 +00:00
|
|
|
|
2010-01-04 19:01:22 +00:00
|
|
|
mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL);
|
2004-02-25 19:55:29 +00:00
|
|
|
if (mtag == NULL) {
|
|
|
|
m_freem(m);
|
|
|
|
return;
|
|
|
|
}
|
1997-06-02 05:02:37 +00:00
|
|
|
/* Assure header */
|
|
|
|
if (m->m_len < sizeof(struct ip) &&
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
(m = m_pullup(m, sizeof(struct ip))) == 0)
|
1997-06-02 05:02:37 +00:00
|
|
|
return;
|
|
|
|
ip = mtod(m, struct ip *);
|
1996-07-10 19:44:30 +00:00
|
|
|
|
2004-08-03 12:31:38 +00:00
|
|
|
/* Delayed checksums are currently not compatible with divert. */
|
|
|
|
if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
|
|
|
|
in_delayed_cksum(m);
|
|
|
|
m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
|
|
|
|
}
|
2009-02-03 11:00:43 +00:00
|
|
|
#ifdef SCTP
|
|
|
|
if (m->m_pkthdr.csum_flags & CSUM_SCTP) {
|
2010-03-12 22:58:52 +00:00
|
|
|
sctp_delayed_cksum(m, (uint32_t)(ip->ip_hl << 2));
|
2009-02-03 11:00:43 +00:00
|
|
|
m->m_pkthdr.csum_flags &= ~CSUM_SCTP;
|
|
|
|
}
|
|
|
|
#endif
|
2010-01-04 19:01:22 +00:00
|
|
|
bzero(&divsrc, sizeof(divsrc));
|
|
|
|
divsrc.sin_len = sizeof(divsrc);
|
|
|
|
divsrc.sin_family = AF_INET;
|
|
|
|
/* record matching rule, in host format */
|
|
|
|
divsrc.sin_port = ((struct ipfw_rule_ref *)(mtag+1))->rulenum;
|
1998-07-06 09:06:58 +00:00
|
|
|
/*
|
1999-12-06 00:43:07 +00:00
|
|
|
* Record receive interface address, if any.
|
1998-07-06 09:06:58 +00:00
|
|
|
* But only for incoming packets.
|
|
|
|
*/
|
1999-12-06 00:43:07 +00:00
|
|
|
if (incoming) {
|
1996-07-10 19:44:30 +00:00
|
|
|
struct ifaddr *ifa;
|
2009-04-19 22:29:16 +00:00
|
|
|
struct ifnet *ifp;
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-06-02 05:02:37 +00:00
|
|
|
/* Sanity check */
|
2003-04-08 14:25:47 +00:00
|
|
|
M_ASSERTPKTHDR(m);
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1998-05-25 08:44:31 +00:00
|
|
|
/* Find IP address for receive interface */
|
2009-04-19 22:29:16 +00:00
|
|
|
ifp = m->m_pkthdr.rcvif;
|
2009-06-26 00:46:50 +00:00
|
|
|
if_addr_rlock(ifp);
|
2009-04-19 22:29:16 +00:00
|
|
|
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
|
1996-07-10 19:44:30 +00:00
|
|
|
if (ifa->ifa_addr->sa_family != AF_INET)
|
|
|
|
continue;
|
|
|
|
divsrc.sin_addr =
|
|
|
|
((struct sockaddr_in *) ifa->ifa_addr)->sin_addr;
|
|
|
|
break;
|
|
|
|
}
|
2009-06-26 00:46:50 +00:00
|
|
|
if_addr_runlock(ifp);
|
1998-06-12 01:54:29 +00:00
|
|
|
}
|
1998-07-06 09:06:58 +00:00
|
|
|
/*
|
|
|
|
* Record the incoming interface name whenever we have one.
|
|
|
|
*/
|
1998-06-12 01:54:29 +00:00
|
|
|
if (m->m_pkthdr.rcvif) {
|
1998-05-25 08:44:31 +00:00
|
|
|
/*
|
|
|
|
* Hide the actual interface name in there in the
|
|
|
|
* sin_zero array. XXX This needs to be moved to a
|
|
|
|
* different sockaddr type for divert, e.g.
|
|
|
|
* sockaddr_div with multiple fields like
|
|
|
|
* sockaddr_dl. Presently we have only 7 bytes
|
|
|
|
* but that will do for now as most interfaces
|
|
|
|
* are 4 or less + 2 or less bytes for unit.
|
|
|
|
* There is probably a faster way of doing this,
|
|
|
|
* possibly taking it from the sockaddr_dl on the iface.
|
|
|
|
* This solves the problem of a P2P link and a LAN interface
|
|
|
|
* having the same address, which can result in the wrong
|
|
|
|
* interface being assigned to the packet when fed back
|
|
|
|
* into the divert socket. Theoretically if the daemon saves
|
|
|
|
* and re-uses the sockaddr_in as suggested in the man pages,
|
|
|
|
* this iface name will come along for the ride.
|
|
|
|
* (see div_output for the other half of this.)
|
|
|
|
*/
|
2003-10-31 18:32:15 +00:00
|
|
|
strlcpy(divsrc.sin_zero, m->m_pkthdr.rcvif->if_xname,
|
|
|
|
sizeof(divsrc.sin_zero));
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Put packet on socket queue, if any */
|
|
|
|
sa = NULL;
|
2010-01-04 19:01:22 +00:00
|
|
|
nport = htons((u_int16_t)(((struct ipfw_rule_ref *)(mtag+1))->info));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_RLOCK(&V_divcbinfo);
|
|
|
|
LIST_FOREACH(inp, &V_divcb, inp_list) {
|
2003-09-05 00:00:51 +00:00
|
|
|
/* XXX why does only one socket match? */
|
|
|
|
if (inp->inp_lport == nport) {
|
2008-07-27 20:48:22 +00:00
|
|
|
INP_RLOCK(inp);
|
1996-07-10 19:44:30 +00:00
|
|
|
sa = inp->inp_socket;
|
Reduce the number of unnecessary unlock-relocks on socket buffer mutexes
associated with performing a wakeup on the socket buffer:
- When performing an sbappend*() followed by a so[rw]wakeup(), explicitly
acquire the socket buffer lock and use the _locked() variants of both
calls. Note that the _locked() sowakeup() versions unlock the mutex on
return. This is done in uipc_send(), divert_packet(), mroute
socket_send(), raw_append(), tcp_reass(), tcp_input(), and udp_append().
- When the socket buffer lock is dropped before a sowakeup(), remove the
explicit unlock and use the _locked() sowakeup() variant. This is done
in soisdisconnecting(), soisdisconnected() when setting the can't send/
receive flags and dropping data, and in uipc_rcvd() which adjusting
back-pressure on the sockets.
For UNIX domain sockets running mpsafe with a contention-intensive SMP
mysql benchmark, this results in a 1.6% query rate improvement due to
reduce mutex costs.
2004-06-26 19:10:39 +00:00
|
|
|
SOCKBUF_LOCK(&sa->so_rcv);
|
|
|
|
if (sbappendaddr_locked(&sa->so_rcv,
|
2003-09-05 00:00:51 +00:00
|
|
|
(struct sockaddr *)&divsrc, m,
|
Reduce the number of unnecessary unlock-relocks on socket buffer mutexes
associated with performing a wakeup on the socket buffer:
- When performing an sbappend*() followed by a so[rw]wakeup(), explicitly
acquire the socket buffer lock and use the _locked() variants of both
calls. Note that the _locked() sowakeup() versions unlock the mutex on
return. This is done in uipc_send(), divert_packet(), mroute
socket_send(), raw_append(), tcp_reass(), tcp_input(), and udp_append().
- When the socket buffer lock is dropped before a sowakeup(), remove the
explicit unlock and use the _locked() sowakeup() variant. This is done
in soisdisconnecting(), soisdisconnected() when setting the can't send/
receive flags and dropping data, and in uipc_rcvd() which adjusting
back-pressure on the sockets.
For UNIX domain sockets running mpsafe with a contention-intensive SMP
mysql benchmark, this results in a 1.6% query rate improvement due to
reduce mutex costs.
2004-06-26 19:10:39 +00:00
|
|
|
(struct mbuf *)0) == 0) {
|
|
|
|
SOCKBUF_UNLOCK(&sa->so_rcv);
|
2004-06-27 21:54:34 +00:00
|
|
|
sa = NULL; /* force mbuf reclaim below */
|
Reduce the number of unnecessary unlock-relocks on socket buffer mutexes
associated with performing a wakeup on the socket buffer:
- When performing an sbappend*() followed by a so[rw]wakeup(), explicitly
acquire the socket buffer lock and use the _locked() variants of both
calls. Note that the _locked() sowakeup() versions unlock the mutex on
return. This is done in uipc_send(), divert_packet(), mroute
socket_send(), raw_append(), tcp_reass(), tcp_input(), and udp_append().
- When the socket buffer lock is dropped before a sowakeup(), remove the
explicit unlock and use the _locked() sowakeup() variant. This is done
in soisdisconnecting(), soisdisconnected() when setting the can't send/
receive flags and dropping data, and in uipc_rcvd() which adjusting
back-pressure on the sockets.
For UNIX domain sockets running mpsafe with a contention-intensive SMP
mysql benchmark, this results in a 1.6% query rate improvement due to
reduce mutex costs.
2004-06-26 19:10:39 +00:00
|
|
|
} else
|
|
|
|
sorwakeup_locked(sa);
|
2008-04-21 12:03:59 +00:00
|
|
|
INP_RUNLOCK(inp);
|
2003-09-05 00:00:51 +00:00
|
|
|
break;
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_RUNLOCK(&V_divcbinfo);
|
2003-09-05 00:00:51 +00:00
|
|
|
if (sa == NULL) {
|
1996-07-10 19:44:30 +00:00
|
|
|
m_freem(m);
|
2009-08-02 19:43:32 +00:00
|
|
|
KMOD_IPSTAT_INC(ips_noproto);
|
|
|
|
KMOD_IPSTAT_DEC(ips_delivered);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Deliver packet back into the IP processing machinery.
|
|
|
|
*
|
|
|
|
* If no address specified, or address is 0.0.0.0, send to ip_output();
|
|
|
|
* otherwise, send to ip_input() and mark as having been received on
|
|
|
|
* the interface with that address.
|
|
|
|
*/
|
|
|
|
static int
|
2007-05-10 15:58:48 +00:00
|
|
|
div_output(struct socket *so, struct mbuf *m, struct sockaddr_in *sin,
|
|
|
|
struct mbuf *control)
|
1996-07-10 19:44:30 +00:00
|
|
|
{
|
2011-06-27 12:21:11 +00:00
|
|
|
struct ip *const ip = mtod(m, struct ip *);
|
2004-10-03 00:26:35 +00:00
|
|
|
struct m_tag *mtag;
|
2010-01-04 19:01:22 +00:00
|
|
|
struct ipfw_rule_ref *dt;
|
1996-07-10 19:44:30 +00:00
|
|
|
int error = 0;
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
|
2005-05-13 11:44:37 +00:00
|
|
|
/*
|
|
|
|
* An mbuf may hasn't come from userland, but we pretend
|
|
|
|
* that it has.
|
|
|
|
*/
|
2004-11-12 22:17:42 +00:00
|
|
|
m->m_pkthdr.rcvif = NULL;
|
2005-05-13 11:44:37 +00:00
|
|
|
m->m_nextpkt = NULL;
|
2008-11-19 19:19:30 +00:00
|
|
|
M_SETFIB(m, so->so_fibnum);
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
if (control)
|
|
|
|
m_freem(control); /* XXX */
|
|
|
|
|
2010-01-04 19:01:22 +00:00
|
|
|
mtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL);
|
|
|
|
if (mtag == NULL) {
|
|
|
|
/* this should be normal */
|
|
|
|
mtag = m_tag_alloc(MTAG_IPFW_RULE, 0,
|
|
|
|
sizeof(struct ipfw_rule_ref), M_NOWAIT | M_ZERO);
|
2004-11-12 22:17:42 +00:00
|
|
|
if (mtag == NULL) {
|
|
|
|
error = ENOBUFS;
|
|
|
|
goto cantsend;
|
|
|
|
}
|
|
|
|
m_tag_prepend(m, mtag);
|
2010-01-04 19:01:22 +00:00
|
|
|
}
|
|
|
|
dt = (struct ipfw_rule_ref *)(mtag+1);
|
2004-10-03 00:26:35 +00:00
|
|
|
|
1998-06-12 01:54:29 +00:00
|
|
|
/* Loopback avoidance and state recovery */
|
1998-05-25 07:41:23 +00:00
|
|
|
if (sin) {
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
int i;
|
1998-06-12 01:54:29 +00:00
|
|
|
|
2010-01-04 19:01:22 +00:00
|
|
|
/* set the starting point. We provide a non-zero slot,
|
|
|
|
* but a non_matching chain_id to skip that info and use
|
|
|
|
* the rulenum/rule_id.
|
|
|
|
*/
|
|
|
|
dt->slot = 1; /* dummy, chain_id is invalid */
|
|
|
|
dt->chain_id = 0;
|
|
|
|
dt->rulenum = sin->sin_port+1; /* host format ? */
|
|
|
|
dt->rule_id = 0;
|
1998-06-12 01:54:29 +00:00
|
|
|
/*
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
* Find receive interface with the given name, stuffed
|
|
|
|
* (if it exists) in the sin_zero[] field.
|
|
|
|
* The name is user supplied data so don't trust its size
|
|
|
|
* or that it is zero terminated.
|
1998-06-12 01:54:29 +00:00
|
|
|
*/
|
2003-01-28 22:44:12 +00:00
|
|
|
for (i = 0; i < sizeof(sin->sin_zero) && sin->sin_zero[i]; i++)
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
;
|
|
|
|
if ( i > 0 && i < sizeof(sin->sin_zero))
|
1998-06-12 01:54:29 +00:00
|
|
|
m->m_pkthdr.rcvif = ifunit(sin->sin_zero);
|
1998-05-25 10:37:48 +00:00
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
/* Reinject packet into the system as incoming or outgoing */
|
|
|
|
if (!sin || sin->sin_addr.s_addr == 0) {
|
2011-06-27 12:21:11 +00:00
|
|
|
struct mbuf *options = NULL;
|
2003-11-08 23:09:42 +00:00
|
|
|
struct inpcb *inp;
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
|
2010-01-04 19:01:22 +00:00
|
|
|
dt->info |= IPFW_IS_DIVERT | IPFW_INFO_OUT;
|
2003-11-08 23:09:42 +00:00
|
|
|
inp = sotoinpcb(so);
|
2008-04-21 12:03:59 +00:00
|
|
|
INP_RLOCK(inp);
|
2011-06-27 12:21:11 +00:00
|
|
|
switch (ip->ip_v) {
|
|
|
|
case IPVERSION:
|
|
|
|
/*
|
|
|
|
* Don't allow both user specified and setsockopt
|
|
|
|
* options, and don't allow packet length sizes that
|
|
|
|
* will crash.
|
|
|
|
*/
|
|
|
|
if ((((ip->ip_hl << 2) != sizeof(struct ip)) &&
|
|
|
|
inp->inp_options != NULL) ||
|
|
|
|
((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
|
|
|
|
error = EINVAL;
|
|
|
|
INP_RUNLOCK(inp);
|
|
|
|
goto cantsend;
|
|
|
|
}
|
|
|
|
|
2003-11-08 23:09:42 +00:00
|
|
|
/* Convert fields to host order for ip_output() */
|
|
|
|
ip->ip_len = ntohs(ip->ip_len);
|
|
|
|
ip->ip_off = ntohs(ip->ip_off);
|
2011-06-27 12:21:11 +00:00
|
|
|
break;
|
|
|
|
#ifdef INET6
|
|
|
|
case IPV6_VERSION >> 4:
|
|
|
|
{
|
|
|
|
struct ip6_hdr *const ip6 = mtod(m, struct ip6_hdr *);
|
|
|
|
|
|
|
|
/* Don't allow packet length sizes that will crash */
|
|
|
|
if (((u_short)ntohs(ip6->ip6_plen) > m->m_pkthdr.len)) {
|
|
|
|
error = EINVAL;
|
|
|
|
INP_RUNLOCK(inp);
|
|
|
|
goto cantsend;
|
|
|
|
}
|
|
|
|
|
|
|
|
ip6->ip6_plen = ntohs(ip6->ip6_plen);
|
2011-08-01 13:41:38 +00:00
|
|
|
break;
|
2011-06-27 12:21:11 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
error = EINVAL;
|
|
|
|
INP_RUNLOCK(inp);
|
|
|
|
goto cantsend;
|
|
|
|
}
|
2003-11-08 23:09:42 +00:00
|
|
|
|
2011-06-27 12:21:11 +00:00
|
|
|
/* Send packet to output processing */
|
|
|
|
KMOD_IPSTAT_INC(ips_rawout); /* XXX */
|
2003-11-08 23:09:42 +00:00
|
|
|
|
2004-06-22 03:58:50 +00:00
|
|
|
#ifdef MAC
|
2011-06-27 12:21:11 +00:00
|
|
|
mac_inpcb_create_mbuf(inp, m);
|
2004-06-22 03:58:50 +00:00
|
|
|
#endif
|
2011-06-27 12:21:11 +00:00
|
|
|
/*
|
|
|
|
* Get ready to inject the packet into ip_output().
|
|
|
|
* Just in case socket options were specified on the
|
|
|
|
* divert socket, we duplicate them. This is done
|
|
|
|
* to avoid having to hold the PCB locks over the call
|
|
|
|
* to ip_output(), as doing this results in a number of
|
|
|
|
* lock ordering complexities.
|
|
|
|
*
|
|
|
|
* Note that we set the multicast options argument for
|
|
|
|
* ip_output() to NULL since it should be invariant that
|
|
|
|
* they are not present.
|
|
|
|
*/
|
|
|
|
KASSERT(inp->inp_moptions == NULL,
|
|
|
|
("multicast options set on a divert socket"));
|
|
|
|
/*
|
|
|
|
* XXXCSJP: It is unclear to me whether or not it makes
|
|
|
|
* sense for divert sockets to have options. However,
|
|
|
|
* for now we will duplicate them with the INP locks
|
|
|
|
* held so we can use them in ip_output() without
|
|
|
|
* requring a reference to the pcb.
|
|
|
|
*/
|
|
|
|
if (inp->inp_options != NULL) {
|
|
|
|
options = m_dup(inp->inp_options, M_NOWAIT);
|
|
|
|
if (options == NULL) {
|
|
|
|
INP_RUNLOCK(inp);
|
|
|
|
error = ENOBUFS;
|
|
|
|
goto cantsend;
|
Over the past couple of years, there have been a number of reports relating
the use of divert sockets to dead locks. A number of LORs have been reported
between divert and a number of other network subsystems including: IPSEC, Pfil,
multicast, ipfw and others. Other dead locks could occur because of recursive
entry into the IP stack. This change should take care of most if not all of
these issues.
A summary of the changes follow:
- We disallow multicast operations on divert sockets. It really doesn't make
semantic sense to allow this, since typically you would set multicast
parameters on multicast end points.
NOTE: As a part of this change, we actually dis-allow multicast options on
any socket that IS a divert socket OR IS NOT a SOCK_RAW or SOCK_DGRAM family
- We check to see if there are any socket options that have been specified on
the socket, and if there was (which is very un-common and also probably
doesnt make sense to support) we duplicate the mbuf carrying the options.
- We then drop the INP/INFO locks over the call to ip_output(). It should be
noted that since we no longer support multicast operations on divert sockets
and we have duplicated any socket options, we no longer need the reference
to the pcb to be coherent.
- Finally, we replaced the call to ip_input() to use netisr queuing. This
should remove the recursive entry into the IP stack from divert.
By dropping the locks over the call to ip_output() we eliminate all the lock
ordering issues above. By switching over to netisr on the inbound path,
we can no longer recursively enter the ip_input() code via divert.
I have tested this change by using the following command:
ipfwpcap -r 8000 - | tcpdump -r - -nn -v
This should exercise the input and re-injection (outbound) path, which is
very similar to the work load performed by natd(8). Additionally, I have
run some ospf daemons which have a heavy reliance on raw sockets and
multicast.
Approved by: re@ (kensmith)
MFC after: 1 month
LOR: 163
LOR: 181
LOR: 202
LOR: 203
Discussed with: julian, andre et al (on freebsd-net)
In collaboration with: bms [1], rwatson [2]
[1] bms helped out with the multicast decisions
[2] rwatson submitted the original netisr patches and came up with some
of the original ideas on how to combat this issue.
2007-08-06 22:06:36 +00:00
|
|
|
}
|
2011-06-27 12:21:11 +00:00
|
|
|
}
|
|
|
|
INP_RUNLOCK(inp);
|
|
|
|
|
|
|
|
switch (ip->ip_v) {
|
|
|
|
case IPVERSION:
|
Over the past couple of years, there have been a number of reports relating
the use of divert sockets to dead locks. A number of LORs have been reported
between divert and a number of other network subsystems including: IPSEC, Pfil,
multicast, ipfw and others. Other dead locks could occur because of recursive
entry into the IP stack. This change should take care of most if not all of
these issues.
A summary of the changes follow:
- We disallow multicast operations on divert sockets. It really doesn't make
semantic sense to allow this, since typically you would set multicast
parameters on multicast end points.
NOTE: As a part of this change, we actually dis-allow multicast options on
any socket that IS a divert socket OR IS NOT a SOCK_RAW or SOCK_DGRAM family
- We check to see if there are any socket options that have been specified on
the socket, and if there was (which is very un-common and also probably
doesnt make sense to support) we duplicate the mbuf carrying the options.
- We then drop the INP/INFO locks over the call to ip_output(). It should be
noted that since we no longer support multicast operations on divert sockets
and we have duplicated any socket options, we no longer need the reference
to the pcb to be coherent.
- Finally, we replaced the call to ip_input() to use netisr queuing. This
should remove the recursive entry into the IP stack from divert.
By dropping the locks over the call to ip_output() we eliminate all the lock
ordering issues above. By switching over to netisr on the inbound path,
we can no longer recursively enter the ip_input() code via divert.
I have tested this change by using the following command:
ipfwpcap -r 8000 - | tcpdump -r - -nn -v
This should exercise the input and re-injection (outbound) path, which is
very similar to the work load performed by natd(8). Additionally, I have
run some ospf daemons which have a heavy reliance on raw sockets and
multicast.
Approved by: re@ (kensmith)
MFC after: 1 month
LOR: 163
LOR: 181
LOR: 202
LOR: 203
Discussed with: julian, andre et al (on freebsd-net)
In collaboration with: bms [1], rwatson [2]
[1] bms helped out with the multicast decisions
[2] rwatson submitted the original netisr patches and came up with some
of the original ideas on how to combat this issue.
2007-08-06 22:06:36 +00:00
|
|
|
error = ip_output(m, options, NULL,
|
2011-06-27 12:21:11 +00:00
|
|
|
((so->so_options & SO_DONTROUTE) ? IP_ROUTETOIF : 0)
|
|
|
|
| IP_ALLOWBROADCAST | IP_RAWOUTPUT, NULL, NULL);
|
|
|
|
break;
|
|
|
|
#ifdef INET6
|
|
|
|
case IPV6_VERSION >> 4:
|
|
|
|
error = ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL);
|
|
|
|
break;
|
|
|
|
#endif
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
2011-06-27 12:21:11 +00:00
|
|
|
if (options != NULL)
|
|
|
|
m_freem(options);
|
1996-07-10 19:44:30 +00:00
|
|
|
} else {
|
2010-01-04 19:01:22 +00:00
|
|
|
dt->info |= IPFW_IS_DIVERT | IPFW_INFO_IN;
|
1998-06-12 01:54:29 +00:00
|
|
|
if (m->m_pkthdr.rcvif == NULL) {
|
1999-02-08 05:48:46 +00:00
|
|
|
/*
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
* No luck with the name, check by IP address.
|
|
|
|
* Clear the port and the ifname to make sure
|
|
|
|
* there are no distractions for ifa_ifwithaddr.
|
1999-02-08 05:48:46 +00:00
|
|
|
*/
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
struct ifaddr *ifa;
|
|
|
|
|
1999-02-08 05:48:46 +00:00
|
|
|
bzero(sin->sin_zero, sizeof(sin->sin_zero));
|
|
|
|
sin->sin_port = 0;
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
ifa = ifa_ifwithaddr((struct sockaddr *) sin);
|
|
|
|
if (ifa == NULL) {
|
1998-05-25 08:44:31 +00:00
|
|
|
error = EADDRNOTAVAIL;
|
|
|
|
goto cantsend;
|
|
|
|
}
|
|
|
|
m->m_pkthdr.rcvif = ifa->ifa_ifp;
|
2009-06-23 20:19:09 +00:00
|
|
|
ifa_free(ifa);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
2004-06-22 03:58:50 +00:00
|
|
|
#ifdef MAC
|
2007-10-24 19:04:04 +00:00
|
|
|
mac_socket_create_mbuf(so, m);
|
2004-06-22 03:58:50 +00:00
|
|
|
#endif
|
Over the past couple of years, there have been a number of reports relating
the use of divert sockets to dead locks. A number of LORs have been reported
between divert and a number of other network subsystems including: IPSEC, Pfil,
multicast, ipfw and others. Other dead locks could occur because of recursive
entry into the IP stack. This change should take care of most if not all of
these issues.
A summary of the changes follow:
- We disallow multicast operations on divert sockets. It really doesn't make
semantic sense to allow this, since typically you would set multicast
parameters on multicast end points.
NOTE: As a part of this change, we actually dis-allow multicast options on
any socket that IS a divert socket OR IS NOT a SOCK_RAW or SOCK_DGRAM family
- We check to see if there are any socket options that have been specified on
the socket, and if there was (which is very un-common and also probably
doesnt make sense to support) we duplicate the mbuf carrying the options.
- We then drop the INP/INFO locks over the call to ip_output(). It should be
noted that since we no longer support multicast operations on divert sockets
and we have duplicated any socket options, we no longer need the reference
to the pcb to be coherent.
- Finally, we replaced the call to ip_input() to use netisr queuing. This
should remove the recursive entry into the IP stack from divert.
By dropping the locks over the call to ip_output() we eliminate all the lock
ordering issues above. By switching over to netisr on the inbound path,
we can no longer recursively enter the ip_input() code via divert.
I have tested this change by using the following command:
ipfwpcap -r 8000 - | tcpdump -r - -nn -v
This should exercise the input and re-injection (outbound) path, which is
very similar to the work load performed by natd(8). Additionally, I have
run some ospf daemons which have a heavy reliance on raw sockets and
multicast.
Approved by: re@ (kensmith)
MFC after: 1 month
LOR: 163
LOR: 181
LOR: 202
LOR: 203
Discussed with: julian, andre et al (on freebsd-net)
In collaboration with: bms [1], rwatson [2]
[1] bms helped out with the multicast decisions
[2] rwatson submitted the original netisr patches and came up with some
of the original ideas on how to combat this issue.
2007-08-06 22:06:36 +00:00
|
|
|
/* Send packet to input processing via netisr */
|
2011-06-27 12:21:11 +00:00
|
|
|
switch (ip->ip_v) {
|
|
|
|
case IPVERSION:
|
|
|
|
netisr_queue_src(NETISR_IP, (uintptr_t)so, m);
|
|
|
|
break;
|
|
|
|
#ifdef INET6
|
|
|
|
case IPV6_VERSION >> 4:
|
|
|
|
netisr_queue_src(NETISR_IPV6, (uintptr_t)so, m);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
error = EINVAL;
|
|
|
|
goto cantsend;
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
|
2011-06-27 12:21:11 +00:00
|
|
|
return (error);
|
1996-07-10 19:44:30 +00:00
|
|
|
|
|
|
|
cantsend:
|
|
|
|
m_freem(m);
|
2011-06-27 12:21:11 +00:00
|
|
|
return (error);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
2001-09-12 08:38:13 +00:00
|
|
|
div_attach(struct socket *so, int proto, struct thread *td)
|
1996-07-10 19:44:30 +00:00
|
|
|
{
|
1997-05-24 17:23:11 +00:00
|
|
|
struct inpcb *inp;
|
2003-09-05 00:00:51 +00:00
|
|
|
int error;
|
1997-05-24 17:23:11 +00:00
|
|
|
|
|
|
|
inp = sotoinpcb(so);
|
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
2006-04-01 16:20:54 +00:00
|
|
|
KASSERT(inp == NULL, ("div_attach: inp != NULL"));
|
2006-11-06 13:42:10 +00:00
|
|
|
if (td != NULL) {
|
|
|
|
error = priv_check(td, PRIV_NETINET_DIVERT);
|
|
|
|
if (error)
|
|
|
|
return (error);
|
|
|
|
}
|
1999-12-22 19:13:38 +00:00
|
|
|
error = soreserve(so, div_sendspace, div_recvspace);
|
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
2006-04-01 16:20:54 +00:00
|
|
|
if (error)
|
1999-12-22 19:13:38 +00:00
|
|
|
return error;
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WLOCK(&V_divcbinfo);
|
|
|
|
error = in_pcballoc(so, &V_divcbinfo);
|
2003-09-05 00:00:51 +00:00
|
|
|
if (error) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WUNLOCK(&V_divcbinfo);
|
1997-05-24 17:23:11 +00:00
|
|
|
return error;
|
2003-09-05 00:00:51 +00:00
|
|
|
}
|
1997-05-24 17:23:11 +00:00
|
|
|
inp = (struct inpcb *)so->so_pcb;
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WUNLOCK(&V_divcbinfo);
|
1997-05-24 17:23:11 +00:00
|
|
|
inp->inp_ip_p = proto;
|
2000-08-03 14:09:52 +00:00
|
|
|
inp->inp_vflag |= INP_IPV4;
|
1997-05-24 17:23:11 +00:00
|
|
|
inp->inp_flags |= INP_HDRINCL;
|
2008-04-17 21:38:18 +00:00
|
|
|
INP_WUNLOCK(inp);
|
1997-05-24 17:23:11 +00:00
|
|
|
return 0;
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
Chance protocol switch method pru_detach() so that it returns void
rather than an error. Detaches do not "fail", they other occur or
the protocol flags SS_PROTOREF to take ownership of the socket.
soclose() no longer looks at so_pcb to see if it's NULL, relying
entirely on the protocol to decide whether it's time to free the
socket or not using SS_PROTOREF. so_pcb is now entirely owned and
managed by the protocol code. Likewise, no longer test so_pcb in
other socket functions, such as soreceive(), which have no business
digging into protocol internals.
Protocol detach routines no longer try to free the socket on detach,
this is performed in the socket code if the protocol permits it.
In rts_detach(), no longer test for rp != NULL in detach, and
likewise in other protocols that don't permit a NULL so_pcb, reduce
the incidence of testing for it during detach.
netinet and netinet6 are not fully updated to this change, which
will be in an upcoming commit. In their current state they may leak
memory or panic.
MFC after: 3 months
2006-04-01 15:42:02 +00:00
|
|
|
static void
|
1997-05-24 17:23:11 +00:00
|
|
|
div_detach(struct socket *so)
|
|
|
|
{
|
|
|
|
struct inpcb *inp;
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
inp = sotoinpcb(so);
|
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
2006-04-01 16:20:54 +00:00
|
|
|
KASSERT(inp != NULL, ("div_detach: inp == NULL"));
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WLOCK(&V_divcbinfo);
|
2008-04-17 21:38:18 +00:00
|
|
|
INP_WLOCK(inp);
|
1997-05-24 17:23:11 +00:00
|
|
|
in_pcbdetach(inp);
|
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
2006-04-01 16:20:54 +00:00
|
|
|
in_pcbfree(inp);
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WUNLOCK(&V_divcbinfo);
|
1997-05-24 17:23:11 +00:00
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
2001-09-12 08:38:13 +00:00
|
|
|
div_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
|
1997-05-24 17:23:11 +00:00
|
|
|
{
|
|
|
|
struct inpcb *inp;
|
|
|
|
int error;
|
|
|
|
|
1997-06-01 15:58:44 +00:00
|
|
|
inp = sotoinpcb(so);
|
2006-04-03 09:01:17 +00:00
|
|
|
KASSERT(inp != NULL, ("div_bind: inp == NULL"));
|
2002-06-23 09:13:46 +00:00
|
|
|
/* in_pcbbind assumes that nam is a sockaddr_in
|
2000-05-02 23:53:46 +00:00
|
|
|
* and in_pcbbind requires a valid address. Since divert
|
|
|
|
* sockets don't we need to make sure the address is
|
|
|
|
* filled in properly.
|
|
|
|
* XXX -- divert should not be abusing in_pcbind
|
|
|
|
* and should probably have its own family.
|
|
|
|
*/
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
if (nam->sa_family != AF_INET)
|
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
2006-04-01 16:20:54 +00:00
|
|
|
return EAFNOSUPPORT;
|
|
|
|
((struct sockaddr_in *)nam)->sin_addr.s_addr = INADDR_ANY;
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WLOCK(&V_divcbinfo);
|
2008-04-17 21:38:18 +00:00
|
|
|
INP_WLOCK(inp);
|
2011-06-04 16:26:02 +00:00
|
|
|
INP_HASH_WLOCK(&V_divcbinfo);
|
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
2006-04-01 16:20:54 +00:00
|
|
|
error = in_pcbbind(inp, nam, td->td_ucred);
|
2011-06-04 16:26:02 +00:00
|
|
|
INP_HASH_WUNLOCK(&V_divcbinfo);
|
2008-04-17 21:38:18 +00:00
|
|
|
INP_WUNLOCK(inp);
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WUNLOCK(&V_divcbinfo);
|
2000-08-30 14:43:02 +00:00
|
|
|
return error;
|
1997-05-24 17:23:11 +00:00
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
|
|
|
div_shutdown(struct socket *so)
|
|
|
|
{
|
2003-11-08 23:09:42 +00:00
|
|
|
struct inpcb *inp;
|
|
|
|
|
|
|
|
inp = sotoinpcb(so);
|
Update in_pcb-derived basic socket types following changes to
pru_abort(), pru_detach(), and in_pcbdetach():
- Universally support and enforce the invariant that so_pcb is
never NULL, converting dozens of unnecessary NULL checks into
assertions, and eliminating dozens of unnecessary error handling
cases in protocol code.
- In some cases, eliminate unnecessary pcbinfo locking, as it is no
longer required to ensure so_pcb != NULL. For example, in protocol
shutdown methods, and in raw IP send.
- Abort and detach protocol switch methods no longer return failures,
nor attempt to free sockets, as the socket layer does this.
- Invoke in_pcbfree() after in_pcbdetach() in order to free the
detached in_pcb structure for a socket.
MFC after: 3 months
2006-04-01 16:20:54 +00:00
|
|
|
KASSERT(inp != NULL, ("div_shutdown: inp == NULL"));
|
2008-04-17 21:38:18 +00:00
|
|
|
INP_WLOCK(inp);
|
1997-05-24 17:23:11 +00:00
|
|
|
socantsendmore(so);
|
2008-04-17 21:38:18 +00:00
|
|
|
INP_WUNLOCK(inp);
|
1997-05-24 17:23:11 +00:00
|
|
|
return 0;
|
|
|
|
}
|
1996-07-10 19:44:30 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
static int
|
1997-09-13 15:40:55 +00:00
|
|
|
div_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
|
2007-05-10 15:58:48 +00:00
|
|
|
struct mbuf *control, struct thread *td)
|
1997-05-24 17:23:11 +00:00
|
|
|
{
|
Step 1.5 of importing the network stack virtualization infrastructure
from the vimage project, as per plan established at devsummit 08/08:
http://wiki.freebsd.org/Image/Notes200808DevSummit
Introduce INIT_VNET_*() initializer macros, VNET_FOREACH() iterator
macros, and CURVNET_SET() context setting macros, all currently
resolving to NOPs.
Prepare for virtualization of selected SYSCTL objects by introducing a
family of SYSCTL_V_*() macros, currently resolving to their global
counterparts, i.e. SYSCTL_V_INT() == SYSCTL_INT().
Move selected #defines from sys/sys/vimage.h to newly introduced header
files specific to virtualized subsystems (sys/net/vnet.h,
sys/netinet/vinet.h etc.).
All the changes are verified to have zero functional impact at this
point in time by doing MD5 comparision between pre- and post-change
object files(*).
(*) netipsec/keysock.c did not validate depending on compile time options.
Implemented by: julian, bz, brooks, zec
Reviewed by: julian, bz, brooks, kris, rwatson, ...
Approved by: julian (mentor)
Obtained from: //depot/projects/vimage-commit2/...
X-MFC after: never
Sponsored by: NLnet Foundation, The FreeBSD Foundation
2008-10-02 15:37:58 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
/* Packet must have a header (but that's about it) */
|
1999-12-22 19:13:38 +00:00
|
|
|
if (m->m_len < sizeof (struct ip) &&
|
1997-05-24 17:23:11 +00:00
|
|
|
(m = m_pullup(m, sizeof (struct ip))) == 0) {
|
2009-08-02 19:43:32 +00:00
|
|
|
KMOD_IPSTAT_INC(ips_toosmall);
|
1996-07-10 19:44:30 +00:00
|
|
|
m_freem(m);
|
1997-05-24 17:23:11 +00:00
|
|
|
return EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Send packet */
|
Remove (almost all) global variables that were used to hold
packet forwarding state ("annotations") during ip processing.
The code is considerably cleaner now.
The variables removed by this change are:
ip_divert_cookie used by divert sockets
ip_fw_fwd_addr used for transparent ip redirection
last_pkt used by dynamic pipes in dummynet
Removal of the first two has been done by carrying the annotations
into volatile structs prepended to the mbuf chains, and adding
appropriate code to add/remove annotations in the routines which
make use of them, i.e. ip_input(), ip_output(), tcp_input(),
bdg_forward(), ether_demux(), ether_output_frame(), div_output().
On passing, remove a bug in divert handling of fragmented packet.
Now it is the fragment at offset 0 which sets the divert status of
the whole packet, whereas formerly it was the last incoming fragment
to decide.
Removal of last_pkt required a change in the interface of ip_fw_chk()
and dummynet_io(). On passing, use the same mechanism for dummynet
annotations and for divert/forward annotations.
option IPFIREWALL_FORWARD is effectively useless, the code to
implement it is very small and is now in by default to avoid the
obfuscation of conditionally compiled code.
NOTES:
* there is at least one global variable left, sro_fwd, in ip_output().
I am not sure if/how this can be removed.
* I have deliberately avoided gratuitous style changes in this commit
to avoid cluttering the diffs. Minor stule cleanup will likely be
necessary
* this commit only focused on the IP layer. I am sure there is a
number of global variables used in the TCP and maybe UDP stack.
* despite the number of files touched, there are absolutely no API's
or data structures changed by this commit (except the interfaces of
ip_fw_chk() and dummynet_io(), which are internal anyways), so
an MFC is quite safe and unintrusive (and desirable, given the
improved readability of the code).
MFC after: 10 days
2002-06-22 11:51:02 +00:00
|
|
|
return div_output(so, m, (struct sockaddr_in *)nam, control);
|
1996-07-10 19:44:30 +00:00
|
|
|
}
|
1997-05-24 17:23:11 +00:00
|
|
|
|
2010-01-04 19:01:22 +00:00
|
|
|
static void
|
2003-11-08 23:09:42 +00:00
|
|
|
div_ctlinput(int cmd, struct sockaddr *sa, void *vip)
|
|
|
|
{
|
|
|
|
struct in_addr faddr;
|
|
|
|
|
|
|
|
faddr = ((struct sockaddr_in *)sa)->sin_addr;
|
|
|
|
if (sa->sa_family != AF_INET || faddr.s_addr == INADDR_ANY)
|
|
|
|
return;
|
2003-11-20 20:07:39 +00:00
|
|
|
if (PRC_IS_REDIRECT(cmd))
|
|
|
|
return;
|
2003-11-08 23:09:42 +00:00
|
|
|
}
|
|
|
|
|
2000-08-03 14:09:52 +00:00
|
|
|
static int
|
|
|
|
div_pcblist(SYSCTL_HANDLER_ARGS)
|
|
|
|
{
|
2003-09-05 00:00:51 +00:00
|
|
|
int error, i, n;
|
2000-08-03 14:09:52 +00:00
|
|
|
struct inpcb *inp, **inp_list;
|
|
|
|
inp_gen_t gencnt;
|
|
|
|
struct xinpgen xig;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The process of preparing the TCB list is too time-consuming and
|
|
|
|
* resource-intensive to repeat twice on every request.
|
|
|
|
*/
|
|
|
|
if (req->oldptr == 0) {
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
n = V_divcbinfo.ipi_count;
|
2010-08-17 16:41:16 +00:00
|
|
|
n += imax(n / 8, 10);
|
|
|
|
req->oldidx = 2 * (sizeof xig) + n * sizeof(struct xinpcb);
|
2000-08-03 14:09:52 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (req->newptr != 0)
|
|
|
|
return EPERM;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* OK, now we're committed to doing something.
|
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_RLOCK(&V_divcbinfo);
|
|
|
|
gencnt = V_divcbinfo.ipi_gencnt;
|
|
|
|
n = V_divcbinfo.ipi_count;
|
|
|
|
INP_INFO_RUNLOCK(&V_divcbinfo);
|
2003-09-05 00:00:51 +00:00
|
|
|
|
2004-02-26 00:27:04 +00:00
|
|
|
error = sysctl_wire_old_buffer(req,
|
|
|
|
2 * sizeof(xig) + n*sizeof(struct xinpcb));
|
|
|
|
if (error != 0)
|
|
|
|
return (error);
|
2000-08-03 14:09:52 +00:00
|
|
|
|
|
|
|
xig.xig_len = sizeof xig;
|
|
|
|
xig.xig_count = n;
|
|
|
|
xig.xig_gen = gencnt;
|
|
|
|
xig.xig_sogen = so_gencnt;
|
|
|
|
error = SYSCTL_OUT(req, &xig, sizeof xig);
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
|
2003-02-19 05:47:46 +00:00
|
|
|
inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK);
|
2000-08-03 14:09:52 +00:00
|
|
|
if (inp_list == 0)
|
|
|
|
return ENOMEM;
|
|
|
|
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_RLOCK(&V_divcbinfo);
|
|
|
|
for (inp = LIST_FIRST(V_divcbinfo.ipi_listhead), i = 0; inp && i < n;
|
2001-02-04 13:13:25 +00:00
|
|
|
inp = LIST_NEXT(inp, inp_list)) {
|
2010-03-17 18:28:27 +00:00
|
|
|
INP_WLOCK(inp);
|
2003-09-05 00:00:51 +00:00
|
|
|
if (inp->inp_gencnt <= gencnt &&
|
2010-03-17 18:28:27 +00:00
|
|
|
cr_canseeinpcb(req->td->td_ucred, inp) == 0) {
|
|
|
|
in_pcbref(inp);
|
2000-08-03 14:09:52 +00:00
|
|
|
inp_list[i++] = inp;
|
2010-03-17 18:28:27 +00:00
|
|
|
}
|
|
|
|
INP_WUNLOCK(inp);
|
2000-08-03 14:09:52 +00:00
|
|
|
}
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_RUNLOCK(&V_divcbinfo);
|
2000-08-03 14:09:52 +00:00
|
|
|
n = i;
|
|
|
|
|
|
|
|
error = 0;
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
inp = inp_list[i];
|
2008-04-21 12:03:59 +00:00
|
|
|
INP_RLOCK(inp);
|
2000-08-03 14:09:52 +00:00
|
|
|
if (inp->inp_gencnt <= gencnt) {
|
|
|
|
struct xinpcb xi;
|
2005-05-06 02:50:00 +00:00
|
|
|
bzero(&xi, sizeof(xi));
|
2000-08-03 14:09:52 +00:00
|
|
|
xi.xi_len = sizeof xi;
|
|
|
|
/* XXX should avoid extra copy */
|
|
|
|
bcopy(inp, &xi.xi_inp, sizeof *inp);
|
|
|
|
if (inp->inp_socket)
|
|
|
|
sotoxsocket(inp->inp_socket, &xi.xi_socket);
|
2008-04-21 12:03:59 +00:00
|
|
|
INP_RUNLOCK(inp);
|
2000-08-03 14:09:52 +00:00
|
|
|
error = SYSCTL_OUT(req, &xi, sizeof xi);
|
2006-07-18 22:34:27 +00:00
|
|
|
} else
|
2008-04-21 12:03:59 +00:00
|
|
|
INP_RUNLOCK(inp);
|
2000-08-03 14:09:52 +00:00
|
|
|
}
|
2010-03-17 18:28:27 +00:00
|
|
|
INP_INFO_WLOCK(&V_divcbinfo);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
inp = inp_list[i];
|
Decompose the current single inpcbinfo lock into two locks:
- The existing ipi_lock continues to protect the global inpcb list and
inpcb counter. This lock is now relegated to a small number of
allocation and free operations, and occasional operations that walk
all connections (including, awkwardly, certain UDP multicast receive
operations -- something to revisit).
- A new ipi_hash_lock protects the two inpcbinfo hash tables for
looking up connections and bound sockets, manipulated using new
INP_HASH_*() macros. This lock, combined with inpcb locks, protects
the 4-tuple address space.
Unlike the current ipi_lock, ipi_hash_lock follows the individual inpcb
connection locks, so may be acquired while manipulating a connection on
which a lock is already held, avoiding the need to acquire the inpcbinfo
lock preemptively when a binding change might later be required. As a
result, however, lookup operations necessarily go through a reference
acquire while holding the lookup lock, later acquiring an inpcb lock --
if required.
A new function in_pcblookup() looks up connections, and accepts flags
indicating how to return the inpcb. Due to lock order changes, callers
no longer need acquire locks before performing a lookup: the lookup
routine will acquire the ipi_hash_lock as needed. In the future, it will
also be able to use alternative lookup and locking strategies
transparently to callers, such as pcbgroup lookup. New lookup flags are,
supplementing the existing INPLOOKUP_WILDCARD flag:
INPLOOKUP_RLOCKPCB - Acquire a read lock on the returned inpcb
INPLOOKUP_WLOCKPCB - Acquire a write lock on the returned inpcb
Callers must pass exactly one of these flags (for the time being).
Some notes:
- All protocols are updated to work within the new regime; especially,
TCP, UDPv4, and UDPv6. pcbinfo ipi_lock acquisitions are largely
eliminated, and global hash lock hold times are dramatically reduced
compared to previous locking.
- The TCP syncache still relies on the pcbinfo lock, something that we
may want to revisit.
- Support for reverting to the FreeBSD 7.x locking strategy in TCP input
is no longer available -- hash lookup locks are now held only very
briefly during inpcb lookup, rather than for potentially extended
periods. However, the pcbinfo ipi_lock will still be acquired if a
connection state might change such that a connection is added or
removed.
- Raw IP sockets continue to use the pcbinfo ipi_lock for protection,
due to maintaining their own hash tables.
- The interface in6_pcblookup_hash_locked() is maintained, which allows
callers to acquire hash locks and perform one or more lookups atomically
with 4-tuple allocation: this is required only for TCPv6, as there is no
in6_pcbconnect_setup(), which there should be.
- UDPv6 locking remains significantly more conservative than UDPv4
locking, which relates to source address selection. This needs
attention, as it likely significantly reduces parallelism in this code
for multithreaded socket use (such as in BIND).
- In the UDPv4 and UDPv6 multicast cases, we need to revisit locking
somewhat, as they relied on ipi_lock to stablise 4-tuple matches, which
is no longer sufficient. A second check once the inpcb lock is held
should do the trick, keeping the general case from requiring the inpcb
lock for every inpcb visited.
- This work reminds us that we need to revisit locking of the v4/v6 flags,
which may be accessed lock-free both before and after this change.
- Right now, a single lock name is used for the pcbhash lock -- this is
undesirable, and probably another argument is required to take care of
this (or a char array name field in the pcbinfo?).
This is not an MFC candidate for 8.x due to its impact on lookup and
locking semantics. It's possible some of these issues could be worked
around with compatibility wrappers, if necessary.
Reviewed by: bz
Sponsored by: Juniper Networks, Inc.
2011-05-30 09:43:55 +00:00
|
|
|
INP_RLOCK(inp);
|
|
|
|
if (!in_pcbrele_rlocked(inp))
|
|
|
|
INP_RUNLOCK(inp);
|
2010-03-17 18:28:27 +00:00
|
|
|
}
|
|
|
|
INP_INFO_WUNLOCK(&V_divcbinfo);
|
|
|
|
|
2000-08-03 14:09:52 +00:00
|
|
|
if (!error) {
|
|
|
|
/*
|
|
|
|
* Give the user an updated idea of our state.
|
|
|
|
* If the generation differs from what we told
|
|
|
|
* her before, she knows that something happened
|
|
|
|
* while we were processing this request, and it
|
|
|
|
* might be necessary to retry.
|
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_RLOCK(&V_divcbinfo);
|
|
|
|
xig.xig_gen = V_divcbinfo.ipi_gencnt;
|
2000-08-03 14:09:52 +00:00
|
|
|
xig.xig_sogen = so_gencnt;
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
xig.xig_count = V_divcbinfo.ipi_count;
|
|
|
|
INP_INFO_RUNLOCK(&V_divcbinfo);
|
2000-08-03 14:09:52 +00:00
|
|
|
error = SYSCTL_OUT(req, &xig, sizeof xig);
|
|
|
|
}
|
|
|
|
free(inp_list, M_TEMP);
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2004-10-19 21:14:57 +00:00
|
|
|
#ifdef SYSCTL_NODE
|
2011-11-07 15:43:11 +00:00
|
|
|
static SYSCTL_NODE(_net_inet, IPPROTO_DIVERT, divert, CTLFLAG_RW, 0,
|
|
|
|
"IPDIVERT");
|
2011-01-18 21:14:13 +00:00
|
|
|
SYSCTL_PROC(_net_inet_divert, OID_AUTO, pcblist, CTLTYPE_OPAQUE | CTLFLAG_RD,
|
|
|
|
NULL, 0, div_pcblist, "S,xinpcb", "List of active divert sockets");
|
2004-10-19 21:14:57 +00:00
|
|
|
#endif
|
2000-08-03 14:09:52 +00:00
|
|
|
|
1997-05-24 17:23:11 +00:00
|
|
|
struct pr_usrreqs div_usrreqs = {
|
2004-11-08 14:44:54 +00:00
|
|
|
.pru_attach = div_attach,
|
|
|
|
.pru_bind = div_bind,
|
|
|
|
.pru_control = in_control,
|
|
|
|
.pru_detach = div_detach,
|
2007-05-11 10:20:51 +00:00
|
|
|
.pru_peeraddr = in_getpeeraddr,
|
2004-11-08 14:44:54 +00:00
|
|
|
.pru_send = div_send,
|
|
|
|
.pru_shutdown = div_shutdown,
|
2007-05-11 10:20:51 +00:00
|
|
|
.pru_sockaddr = in_getsockaddr,
|
2004-11-11 19:02:01 +00:00
|
|
|
.pru_sosetlabel = in_pcbsosetlabel
|
1997-05-24 17:23:11 +00:00
|
|
|
};
|
2004-10-19 21:14:57 +00:00
|
|
|
|
|
|
|
struct protosw div_protosw = {
|
2005-11-09 13:29:16 +00:00
|
|
|
.pr_type = SOCK_RAW,
|
|
|
|
.pr_protocol = IPPROTO_DIVERT,
|
|
|
|
.pr_flags = PR_ATOMIC|PR_ADDR,
|
|
|
|
.pr_input = div_input,
|
|
|
|
.pr_ctlinput = div_ctlinput,
|
|
|
|
.pr_ctloutput = ip_ctloutput,
|
|
|
|
.pr_init = div_init,
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
#ifdef VIMAGE
|
|
|
|
.pr_destroy = div_destroy,
|
|
|
|
#endif
|
2005-11-09 13:29:16 +00:00
|
|
|
.pr_usrreqs = &div_usrreqs
|
2004-10-19 21:14:57 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
div_modevent(module_t mod, int type, void *unused)
|
|
|
|
{
|
|
|
|
int err = 0;
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
#ifndef VIMAGE
|
2004-10-19 21:14:57 +00:00
|
|
|
int n;
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
#endif
|
2004-10-19 21:14:57 +00:00
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case MOD_LOAD:
|
|
|
|
/*
|
|
|
|
* Protocol will be initialized by pf_proto_register().
|
|
|
|
* We don't have to register ip_protox because we are not
|
|
|
|
* a true IP protocol that goes over the wire.
|
|
|
|
*/
|
|
|
|
err = pf_proto_register(PF_INET, &div_protosw);
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
if (err != 0)
|
|
|
|
return (err);
|
2004-10-19 21:14:57 +00:00
|
|
|
ip_divert_ptr = divert_packet;
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
ip_divert_event_tag = EVENTHANDLER_REGISTER(maxsockets_change,
|
|
|
|
div_zone_change, NULL, EVENTHANDLER_PRI_ANY);
|
2004-10-19 21:14:57 +00:00
|
|
|
break;
|
2004-10-22 19:12:01 +00:00
|
|
|
case MOD_QUIESCE:
|
|
|
|
/*
|
|
|
|
* IPDIVERT may normally not be unloaded because of the
|
|
|
|
* potential race conditions. Tell kldunload we can't be
|
|
|
|
* unloaded unless the unload is forced.
|
|
|
|
*/
|
|
|
|
err = EPERM;
|
|
|
|
break;
|
2004-10-19 21:14:57 +00:00
|
|
|
case MOD_UNLOAD:
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
#ifdef VIMAGE
|
|
|
|
err = EPERM;
|
|
|
|
break;
|
|
|
|
#else
|
2004-10-19 21:14:57 +00:00
|
|
|
/*
|
2004-10-22 19:12:01 +00:00
|
|
|
* Forced unload.
|
|
|
|
*
|
2004-10-19 21:14:57 +00:00
|
|
|
* Module ipdivert can only be unloaded if no sockets are
|
|
|
|
* connected. Maybe this can be changed later to forcefully
|
|
|
|
* disconnect any open sockets.
|
2004-10-19 21:35:42 +00:00
|
|
|
*
|
2004-10-19 22:08:13 +00:00
|
|
|
* XXXRW: Note that there is a slight race here, as a new
|
|
|
|
* socket open request could be spinning on the lock and then
|
|
|
|
* we destroy the lock.
|
2004-10-19 21:14:57 +00:00
|
|
|
*/
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WLOCK(&V_divcbinfo);
|
|
|
|
n = V_divcbinfo.ipi_count;
|
2004-10-19 21:14:57 +00:00
|
|
|
if (n != 0) {
|
|
|
|
err = EBUSY;
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WUNLOCK(&V_divcbinfo);
|
2004-10-19 21:14:57 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
ip_divert_ptr = NULL;
|
|
|
|
err = pf_proto_unregister(PF_INET, IPPROTO_DIVERT, SOCK_RAW);
|
Commit step 1 of the vimage project, (network stack)
virtualization work done by Marko Zec (zec@).
This is the first in a series of commits over the course
of the next few weeks.
Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.
We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.
Obtained from: //depot/projects/vimage-commit2/...
Reviewed by: brooks, des, ed, mav, julian,
jamie, kris, rwatson, zec, ...
(various people I forgot, different versions)
md5 (with a bit of help)
Sponsored by: NLnet Foundation, The FreeBSD Foundation
X-MFC after: never
V_Commit_Message_Reviewed_By: more people than the patch
2008-08-17 23:27:27 +00:00
|
|
|
INP_INFO_WUNLOCK(&V_divcbinfo);
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
div_destroy();
|
|
|
|
EVENTHANDLER_DEREGISTER(maxsockets_change, ip_divert_event_tag);
|
2004-10-19 21:14:57 +00:00
|
|
|
break;
|
Introduce a div_destroy() function which takes over per-vnet cleanup tasks
from the existing modevent / MOD_UNLOAD handler, and register div_destroy()
in protosw as per-vnet .pr_destroy() handler for options VIMAGE builds. In
nooptions VIMAGE builds, div_destroy() will be invoked from the modevent
handler, resulting in effectively identical operation as it was prior this
change. div_destroy() also tears down hashtables used by ipdivert, which
were previously left behind on ipdivert kldunloads.
For options VIMAGE builds only, temporarily disable kldunloading of ipdivert,
because without introducing additional locking logic it is impossible to
atomically check whether all ipdivert instances in all vnets are idle, and
proceed with cleanup without opening a race window for a vnet to open an
ipdivert socket while ipdivert tear-down is in progress.
While here, staticize div_init(), because it is not used outside of
ip_divert.c.
In cooperation with: julian
Approved by: re (rwatson), julian (mentor)
MFC after: 3 days
2009-08-24 10:06:02 +00:00
|
|
|
#endif /* !VIMAGE */
|
2004-10-19 21:14:57 +00:00
|
|
|
default:
|
2004-10-22 19:12:01 +00:00
|
|
|
err = EOPNOTSUPP;
|
2004-10-19 21:14:57 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static moduledata_t ipdivertmod = {
|
|
|
|
"ipdivert",
|
|
|
|
div_modevent,
|
2012-10-10 08:36:38 +00:00
|
|
|
0
|
2004-10-19 21:14:57 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
DECLARE_MODULE(ipdivert, ipdivertmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY);
|
2010-01-04 19:01:22 +00:00
|
|
|
MODULE_DEPEND(ipdivert, ipfw, 2, 2, 2);
|
2004-10-19 21:14:57 +00:00
|
|
|
MODULE_VERSION(ipdivert, 1);
|