2005-01-07 01:45:51 +00:00
|
|
|
/*-
|
1998-03-18 01:40:12 +00:00
|
|
|
* Copyright 1998 Massachusetts Institute of Technology
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, and distribute this software and
|
|
|
|
* its documentation for any purpose and without fee is hereby
|
|
|
|
* granted, provided that both the above copyright notice and this
|
|
|
|
* permission notice appear in all copies, that both the above
|
|
|
|
* copyright notice and this permission notice appear in all
|
|
|
|
* supporting documentation, and that the name of M.I.T. not be used
|
|
|
|
* in advertising or publicity pertaining to distribution of the
|
|
|
|
* software without specific, written prior permission. M.I.T. makes
|
|
|
|
* no representations about the suitability of this software for any
|
|
|
|
* purpose. It is provided "as is" without express or implied
|
|
|
|
* warranty.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS
|
|
|
|
* ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
|
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
|
|
|
|
* SHALL M.I.T. 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if_vlan.c - pseudo-device driver for IEEE 802.1Q virtual LANs.
|
2014-09-18 05:43:19 +00:00
|
|
|
* Might be extended some day to also handle IEEE 802.1p priority
|
|
|
|
* tagging. This is sort of sneaky in the implementation, since
|
1998-03-18 01:40:12 +00:00
|
|
|
* we need to pretend to be enough of an Ethernet implementation
|
|
|
|
* to make arp work. The way we do this is by telling everyone
|
|
|
|
* that we are an Ethernet, and then catch the packets that
|
2011-11-28 19:35:08 +00:00
|
|
|
* ether_output() sends to us via if_transmit(), rewrite them for
|
|
|
|
* use by the real outgoing interface, and ask it to send them.
|
1998-03-18 01:40:12 +00:00
|
|
|
*/
|
|
|
|
|
2010-02-21 00:07:45 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2013-04-18 20:13:33 +00:00
|
|
|
#include "opt_inet.h"
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#include "opt_vlan.h"
|
1998-03-18 01:40:12 +00:00
|
|
|
|
|
|
|
#include <sys/param.h>
|
2013-10-28 07:29:16 +00:00
|
|
|
#include <sys/eventhandler.h>
|
1998-03-18 01:40:12 +00:00
|
|
|
#include <sys/kernel.h>
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#include <sys/lock.h>
|
1999-03-15 01:17:26 +00:00
|
|
|
#include <sys/malloc.h>
|
1998-03-18 01:40:12 +00:00
|
|
|
#include <sys/mbuf.h>
|
2001-01-31 07:58:58 +00:00
|
|
|
#include <sys/module.h>
|
2014-09-13 18:41:24 +00:00
|
|
|
#include <sys/rmlock.h>
|
1999-03-15 01:17:26 +00:00
|
|
|
#include <sys/queue.h>
|
1998-03-18 01:40:12 +00:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/sockio.h>
|
|
|
|
#include <sys/sysctl.h>
|
|
|
|
#include <sys/systm.h>
|
2011-03-21 09:40:01 +00:00
|
|
|
#include <sys/sx.h>
|
1998-03-18 01:40:12 +00:00
|
|
|
|
|
|
|
#include <net/bpf.h>
|
|
|
|
#include <net/ethernet.h>
|
|
|
|
#include <net/if.h>
|
2013-10-26 17:58:36 +00:00
|
|
|
#include <net/if_var.h>
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
#include <net/if_clone.h>
|
1998-03-18 01:40:12 +00:00
|
|
|
#include <net/if_dl.h>
|
|
|
|
#include <net/if_types.h>
|
|
|
|
#include <net/if_vlan_var.h>
|
2008-12-02 21:37:28 +00:00
|
|
|
#include <net/vnet.h>
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2013-04-18 20:13:33 +00:00
|
|
|
#ifdef INET
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/if_ether.h>
|
|
|
|
#endif
|
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#define VLAN_DEF_HWIDTH 4
|
2006-01-31 16:41:05 +00:00
|
|
|
#define VLAN_IFFLAGS (IFF_BROADCAST | IFF_MULTICAST)
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
|
2006-12-30 21:10:25 +00:00
|
|
|
#define UP_AND_RUNNING(ifp) \
|
|
|
|
((ifp)->if_flags & IFF_UP && (ifp)->if_drv_flags & IFF_DRV_RUNNING)
|
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
LIST_HEAD(ifvlanhead, ifvlan);
|
|
|
|
|
|
|
|
struct ifvlantrunk {
|
|
|
|
struct ifnet *parent; /* parent interface of this trunk */
|
2014-09-13 18:41:24 +00:00
|
|
|
struct rmlock lock;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#ifdef VLAN_ARRAY
|
2006-06-21 07:29:44 +00:00
|
|
|
#define VLAN_ARRAY_SIZE (EVL_VLID_MASK + 1)
|
|
|
|
struct ifvlan *vlans[VLAN_ARRAY_SIZE]; /* static table */
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#else
|
|
|
|
struct ifvlanhead *hash; /* dynamic hash-list table */
|
|
|
|
uint16_t hmask;
|
|
|
|
uint16_t hwidth;
|
|
|
|
#endif
|
|
|
|
int refcnt;
|
|
|
|
};
|
2001-09-05 21:10:28 +00:00
|
|
|
|
2002-11-14 23:43:16 +00:00
|
|
|
struct vlan_mc_entry {
|
2011-03-21 09:40:01 +00:00
|
|
|
struct sockaddr_dl mc_addr;
|
2002-11-14 23:43:16 +00:00
|
|
|
SLIST_ENTRY(vlan_mc_entry) mc_entries;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ifvlan {
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
struct ifvlantrunk *ifv_trunk;
|
2005-06-10 16:49:24 +00:00
|
|
|
struct ifnet *ifv_ifp;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#define TRUNK(ifv) ((ifv)->ifv_trunk)
|
|
|
|
#define PARENT(ifv) ((ifv)->ifv_trunk->parent)
|
2014-09-16 21:48:48 +00:00
|
|
|
void *ifv_cookie;
|
2005-10-03 02:24:21 +00:00
|
|
|
int ifv_pflags; /* special flags we have set on parent */
|
2002-11-14 23:43:16 +00:00
|
|
|
struct ifv_linkmib {
|
|
|
|
int ifvm_encaplen; /* encapsulation length */
|
|
|
|
int ifvm_mtufudge; /* MTU fudged by this much */
|
|
|
|
int ifvm_mintu; /* min transmission unit */
|
2006-08-15 16:56:43 +00:00
|
|
|
uint16_t ifvm_proto; /* encapsulation ethertype */
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
uint16_t ifvm_tag; /* tag to apply on packets leaving if */
|
2002-11-14 23:43:16 +00:00
|
|
|
} ifv_mib;
|
2006-06-29 07:30:39 +00:00
|
|
|
SLIST_HEAD(, vlan_mc_entry) vlan_mc_listhead;
|
2007-03-12 12:27:30 +00:00
|
|
|
#ifndef VLAN_ARRAY
|
2002-11-14 23:43:16 +00:00
|
|
|
LIST_ENTRY(ifvlan) ifv_list;
|
2007-03-12 12:27:30 +00:00
|
|
|
#endif
|
2002-11-14 23:43:16 +00:00
|
|
|
};
|
2006-08-15 16:56:43 +00:00
|
|
|
#define ifv_proto ifv_mib.ifvm_proto
|
2012-01-12 18:39:37 +00:00
|
|
|
#define ifv_vid ifv_mib.ifvm_tag
|
2002-11-14 23:43:16 +00:00
|
|
|
#define ifv_encaplen ifv_mib.ifvm_encaplen
|
|
|
|
#define ifv_mtufudge ifv_mib.ifvm_mtufudge
|
|
|
|
#define ifv_mintu ifv_mib.ifvm_mintu
|
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
/* Special flags we should propagate to parent. */
|
2005-10-03 02:24:21 +00:00
|
|
|
static struct {
|
|
|
|
int flag;
|
|
|
|
int (*func)(struct ifnet *, int);
|
|
|
|
} vlan_pflags[] = {
|
|
|
|
{IFF_PROMISC, ifpromisc},
|
|
|
|
{IFF_ALLMULTI, if_allmulti},
|
|
|
|
{0, NULL}
|
|
|
|
};
|
2002-11-14 23:43:16 +00:00
|
|
|
|
1999-04-07 23:26:43 +00:00
|
|
|
SYSCTL_DECL(_net_link);
|
2011-11-07 15:43:11 +00:00
|
|
|
static SYSCTL_NODE(_net_link, IFT_L2VLAN, vlan, CTLFLAG_RW, 0,
|
|
|
|
"IEEE 802.1Q VLAN");
|
|
|
|
static SYSCTL_NODE(_net_link_vlan, PF_LINK, link, CTLFLAG_RW, 0,
|
|
|
|
"for consistency");
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2014-10-02 05:56:17 +00:00
|
|
|
static VNET_DEFINE(int, soft_pad);
|
|
|
|
#define V_soft_pad VNET(soft_pad)
|
|
|
|
SYSCTL_INT(_net_link_vlan, OID_AUTO, soft_pad, CTLFLAG_RW | CTLFLAG_VNET,
|
|
|
|
&VNET_NAME(soft_pad), 0, "pad short frames before tagging");
|
2006-08-11 17:09:27 +00:00
|
|
|
|
2012-10-16 13:37:54 +00:00
|
|
|
static const char vlanname[] = "vlan";
|
|
|
|
static MALLOC_DEFINE(M_VLAN, vlanname, "802.1Q Virtual LAN Interface");
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2006-06-21 07:29:44 +00:00
|
|
|
static eventhandler_tag ifdetach_tag;
|
2010-01-18 20:34:00 +00:00
|
|
|
static eventhandler_tag iflladdr_tag;
|
2006-06-21 07:29:44 +00:00
|
|
|
|
2003-09-05 20:58:59 +00:00
|
|
|
/*
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
* We have a global mutex, that is used to serialize configuration
|
|
|
|
* changes and isn't used in normal packet delivery.
|
|
|
|
*
|
2015-03-20 14:16:26 +00:00
|
|
|
* We also have a per-trunk rmlock(9), that is locked shared on packet
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
* processing and exclusive when configuration is changed.
|
|
|
|
*
|
|
|
|
* The VLAN_ARRAY substitutes the dynamic hash with a static array
|
2006-08-25 08:25:35 +00:00
|
|
|
* with 4096 entries. In theory this can give a boost in processing,
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
* however on practice it does not. Probably this is because array
|
|
|
|
* is too big to fit into CPU cache.
|
2003-09-05 20:58:59 +00:00
|
|
|
*/
|
2011-03-21 09:40:01 +00:00
|
|
|
static struct sx ifv_lock;
|
|
|
|
#define VLAN_LOCK_INIT() sx_init(&ifv_lock, "vlan_global")
|
|
|
|
#define VLAN_LOCK_DESTROY() sx_destroy(&ifv_lock)
|
|
|
|
#define VLAN_LOCK_ASSERT() sx_assert(&ifv_lock, SA_LOCKED)
|
|
|
|
#define VLAN_LOCK() sx_xlock(&ifv_lock)
|
|
|
|
#define VLAN_UNLOCK() sx_xunlock(&ifv_lock)
|
2014-09-13 18:41:24 +00:00
|
|
|
#define TRUNK_LOCK_INIT(trunk) rm_init(&(trunk)->lock, vlanname)
|
|
|
|
#define TRUNK_LOCK_DESTROY(trunk) rm_destroy(&(trunk)->lock)
|
|
|
|
#define TRUNK_LOCK(trunk) rm_wlock(&(trunk)->lock)
|
|
|
|
#define TRUNK_UNLOCK(trunk) rm_wunlock(&(trunk)->lock)
|
|
|
|
#define TRUNK_LOCK_ASSERT(trunk) rm_assert(&(trunk)->lock, RA_WLOCKED)
|
|
|
|
#define TRUNK_RLOCK(trunk) rm_rlock(&(trunk)->lock, &tracker)
|
|
|
|
#define TRUNK_RUNLOCK(trunk) rm_runlock(&(trunk)->lock, &tracker)
|
|
|
|
#define TRUNK_LOCK_RASSERT(trunk) rm_assert(&(trunk)->lock, RA_RLOCKED)
|
|
|
|
#define TRUNK_LOCK_READER struct rm_priotracker tracker
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
|
|
|
|
#ifndef VLAN_ARRAY
|
|
|
|
static void vlan_inithash(struct ifvlantrunk *trunk);
|
|
|
|
static void vlan_freehash(struct ifvlantrunk *trunk);
|
|
|
|
static int vlan_inshash(struct ifvlantrunk *trunk, struct ifvlan *ifv);
|
|
|
|
static int vlan_remhash(struct ifvlantrunk *trunk, struct ifvlan *ifv);
|
|
|
|
static void vlan_growhash(struct ifvlantrunk *trunk, int howmuch);
|
|
|
|
static __inline struct ifvlan * vlan_gethash(struct ifvlantrunk *trunk,
|
2012-01-12 18:39:37 +00:00
|
|
|
uint16_t vid);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#endif
|
|
|
|
static void trunk_destroy(struct ifvlantrunk *trunk);
|
2003-09-05 20:58:59 +00:00
|
|
|
|
2006-06-29 07:30:39 +00:00
|
|
|
static void vlan_init(void *foo);
|
2002-11-14 23:43:16 +00:00
|
|
|
static void vlan_input(struct ifnet *ifp, struct mbuf *m);
|
1998-08-23 03:07:17 +00:00
|
|
|
static int vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t addr);
|
2011-11-28 19:35:08 +00:00
|
|
|
static void vlan_qflush(struct ifnet *ifp);
|
2005-10-03 02:24:21 +00:00
|
|
|
static int vlan_setflag(struct ifnet *ifp, int flag, int status,
|
|
|
|
int (*func)(struct ifnet *, int));
|
|
|
|
static int vlan_setflags(struct ifnet *ifp, int status);
|
1999-03-15 01:17:26 +00:00
|
|
|
static int vlan_setmulti(struct ifnet *ifp);
|
2011-11-28 19:35:08 +00:00
|
|
|
static int vlan_transmit(struct ifnet *ifp, struct mbuf *m);
|
2010-05-17 19:36:56 +00:00
|
|
|
static void vlan_unconfig(struct ifnet *ifp);
|
2012-08-20 16:00:33 +00:00
|
|
|
static void vlan_unconfig_locked(struct ifnet *ifp, int departing);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
static int vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t tag);
|
2009-12-31 20:29:58 +00:00
|
|
|
static void vlan_link_state(struct ifnet *ifp);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
static void vlan_capabilities(struct ifvlan *ifv);
|
|
|
|
static void vlan_trunk_capabilities(struct ifnet *ifp);
|
1999-03-15 01:17:26 +00:00
|
|
|
|
2015-03-20 20:42:58 +00:00
|
|
|
static struct ifnet *vlan_clone_match_ethervid(const char *, int *);
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
static int vlan_clone_match(struct if_clone *, const char *);
|
2006-07-09 06:04:01 +00:00
|
|
|
static int vlan_clone_create(struct if_clone *, char *, size_t, caddr_t);
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
static int vlan_clone_destroy(struct if_clone *, struct ifnet *);
|
|
|
|
|
2006-06-21 07:29:44 +00:00
|
|
|
static void vlan_ifdetach(void *arg, struct ifnet *ifp);
|
2010-01-18 20:34:00 +00:00
|
|
|
static void vlan_iflladdr(void *arg, struct ifnet *ifp);
|
2006-06-21 07:29:44 +00:00
|
|
|
|
2012-10-16 13:37:54 +00:00
|
|
|
static struct if_clone *vlan_cloner;
|
2001-09-05 21:10:28 +00:00
|
|
|
|
2010-11-22 23:35:29 +00:00
|
|
|
#ifdef VIMAGE
|
2012-10-16 13:37:54 +00:00
|
|
|
static VNET_DEFINE(struct if_clone *, vlan_cloner);
|
2010-11-22 23:35:29 +00:00
|
|
|
#define V_vlan_cloner VNET(vlan_cloner)
|
|
|
|
#endif
|
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#ifndef VLAN_ARRAY
|
|
|
|
#define HASH(n, m) ((((n) >> 8) ^ ((n) >> 4) ^ (n)) & (m))
|
2006-06-29 07:30:39 +00:00
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
static void
|
|
|
|
vlan_inithash(struct ifvlantrunk *trunk)
|
|
|
|
{
|
|
|
|
int i, n;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The trunk must not be locked here since we call malloc(M_WAITOK).
|
|
|
|
* It is OK in case this function is called before the trunk struct
|
|
|
|
* gets hooked up and becomes visible from other threads.
|
|
|
|
*/
|
|
|
|
|
|
|
|
KASSERT(trunk->hwidth == 0 && trunk->hash == NULL,
|
|
|
|
("%s: hash already initialized", __func__));
|
|
|
|
|
|
|
|
trunk->hwidth = VLAN_DEF_HWIDTH;
|
|
|
|
n = 1 << trunk->hwidth;
|
|
|
|
trunk->hmask = n - 1;
|
|
|
|
trunk->hash = malloc(sizeof(struct ifvlanhead) * n, M_VLAN, M_WAITOK);
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
LIST_INIT(&trunk->hash[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
vlan_freehash(struct ifvlantrunk *trunk)
|
|
|
|
{
|
|
|
|
#ifdef INVARIANTS
|
|
|
|
int i;
|
|
|
|
|
|
|
|
KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__));
|
|
|
|
for (i = 0; i < (1 << trunk->hwidth); i++)
|
|
|
|
KASSERT(LIST_EMPTY(&trunk->hash[i]),
|
|
|
|
("%s: hash table not empty", __func__));
|
|
|
|
#endif
|
|
|
|
free(trunk->hash, M_VLAN);
|
|
|
|
trunk->hash = NULL;
|
|
|
|
trunk->hwidth = trunk->hmask = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
vlan_inshash(struct ifvlantrunk *trunk, struct ifvlan *ifv)
|
|
|
|
{
|
|
|
|
int i, b;
|
|
|
|
struct ifvlan *ifv2;
|
|
|
|
|
|
|
|
TRUNK_LOCK_ASSERT(trunk);
|
|
|
|
KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__));
|
|
|
|
|
|
|
|
b = 1 << trunk->hwidth;
|
2012-01-12 18:39:37 +00:00
|
|
|
i = HASH(ifv->ifv_vid, trunk->hmask);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
LIST_FOREACH(ifv2, &trunk->hash[i], ifv_list)
|
2012-01-12 18:39:37 +00:00
|
|
|
if (ifv->ifv_vid == ifv2->ifv_vid)
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
return (EEXIST);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Grow the hash when the number of vlans exceeds half of the number of
|
|
|
|
* hash buckets squared. This will make the average linked-list length
|
|
|
|
* buckets/2.
|
|
|
|
*/
|
|
|
|
if (trunk->refcnt > (b * b) / 2) {
|
|
|
|
vlan_growhash(trunk, 1);
|
2012-01-12 18:39:37 +00:00
|
|
|
i = HASH(ifv->ifv_vid, trunk->hmask);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
}
|
|
|
|
LIST_INSERT_HEAD(&trunk->hash[i], ifv, ifv_list);
|
|
|
|
trunk->refcnt++;
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
vlan_remhash(struct ifvlantrunk *trunk, struct ifvlan *ifv)
|
|
|
|
{
|
|
|
|
int i, b;
|
|
|
|
struct ifvlan *ifv2;
|
|
|
|
|
|
|
|
TRUNK_LOCK_ASSERT(trunk);
|
|
|
|
KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__));
|
|
|
|
|
|
|
|
b = 1 << trunk->hwidth;
|
2012-01-12 18:39:37 +00:00
|
|
|
i = HASH(ifv->ifv_vid, trunk->hmask);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
LIST_FOREACH(ifv2, &trunk->hash[i], ifv_list)
|
|
|
|
if (ifv2 == ifv) {
|
|
|
|
trunk->refcnt--;
|
|
|
|
LIST_REMOVE(ifv2, ifv_list);
|
|
|
|
if (trunk->refcnt < (b * b) / 2)
|
|
|
|
vlan_growhash(trunk, -1);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
panic("%s: vlan not found\n", __func__);
|
|
|
|
return (ENOENT); /*NOTREACHED*/
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Grow the hash larger or smaller if memory permits.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
vlan_growhash(struct ifvlantrunk *trunk, int howmuch)
|
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
struct ifvlanhead *hash2;
|
|
|
|
int hwidth2, i, j, n, n2;
|
|
|
|
|
|
|
|
TRUNK_LOCK_ASSERT(trunk);
|
|
|
|
KASSERT(trunk->hwidth > 0, ("%s: hwidth not positive", __func__));
|
|
|
|
|
|
|
|
if (howmuch == 0) {
|
|
|
|
/* Harmless yet obvious coding error */
|
|
|
|
printf("%s: howmuch is 0\n", __func__);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
hwidth2 = trunk->hwidth + howmuch;
|
|
|
|
n = 1 << trunk->hwidth;
|
|
|
|
n2 = 1 << hwidth2;
|
|
|
|
/* Do not shrink the table below the default */
|
|
|
|
if (hwidth2 < VLAN_DEF_HWIDTH)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* M_NOWAIT because we're called with trunk mutex held */
|
|
|
|
hash2 = malloc(sizeof(struct ifvlanhead) * n2, M_VLAN, M_NOWAIT);
|
|
|
|
if (hash2 == NULL) {
|
|
|
|
printf("%s: out of memory -- hash size not changed\n",
|
|
|
|
__func__);
|
|
|
|
return; /* We can live with the old hash table */
|
|
|
|
}
|
|
|
|
for (j = 0; j < n2; j++)
|
|
|
|
LIST_INIT(&hash2[j]);
|
|
|
|
for (i = 0; i < n; i++)
|
2007-03-12 12:27:30 +00:00
|
|
|
while ((ifv = LIST_FIRST(&trunk->hash[i])) != NULL) {
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
LIST_REMOVE(ifv, ifv_list);
|
2012-01-12 18:39:37 +00:00
|
|
|
j = HASH(ifv->ifv_vid, n2 - 1);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
LIST_INSERT_HEAD(&hash2[j], ifv, ifv_list);
|
|
|
|
}
|
|
|
|
free(trunk->hash, M_VLAN);
|
|
|
|
trunk->hash = hash2;
|
|
|
|
trunk->hwidth = hwidth2;
|
|
|
|
trunk->hmask = n2 - 1;
|
2007-03-15 14:10:51 +00:00
|
|
|
|
|
|
|
if (bootverbose)
|
|
|
|
if_printf(trunk->parent,
|
|
|
|
"VLAN hash table resized from %d to %d buckets\n", n, n2);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static __inline struct ifvlan *
|
2012-01-12 18:39:37 +00:00
|
|
|
vlan_gethash(struct ifvlantrunk *trunk, uint16_t vid)
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
|
|
|
|
TRUNK_LOCK_RASSERT(trunk);
|
|
|
|
|
2012-01-12 18:39:37 +00:00
|
|
|
LIST_FOREACH(ifv, &trunk->hash[HASH(vid, trunk->hmask)], ifv_list)
|
|
|
|
if (ifv->ifv_vid == vid)
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
return (ifv);
|
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* Debugging code to view the hashtables. */
|
|
|
|
static void
|
|
|
|
vlan_dumphash(struct ifvlantrunk *trunk)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
|
|
|
|
for (i = 0; i < (1 << trunk->hwidth); i++) {
|
|
|
|
printf("%d: ", i);
|
|
|
|
LIST_FOREACH(ifv, &trunk->hash[i], ifv_list)
|
|
|
|
printf("%s ", ifv->ifv_ifp->if_xname);
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif /* 0 */
|
2011-03-21 09:40:01 +00:00
|
|
|
#else
|
|
|
|
|
|
|
|
static __inline struct ifvlan *
|
2012-01-12 18:39:37 +00:00
|
|
|
vlan_gethash(struct ifvlantrunk *trunk, uint16_t vid)
|
2011-03-21 09:40:01 +00:00
|
|
|
{
|
|
|
|
|
2012-01-12 18:39:37 +00:00
|
|
|
return trunk->vlans[vid];
|
2011-03-21 09:40:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static __inline int
|
|
|
|
vlan_inshash(struct ifvlantrunk *trunk, struct ifvlan *ifv)
|
|
|
|
{
|
|
|
|
|
2012-01-12 18:39:37 +00:00
|
|
|
if (trunk->vlans[ifv->ifv_vid] != NULL)
|
2011-03-21 09:40:01 +00:00
|
|
|
return EEXIST;
|
2012-01-12 18:39:37 +00:00
|
|
|
trunk->vlans[ifv->ifv_vid] = ifv;
|
2011-03-21 09:40:01 +00:00
|
|
|
trunk->refcnt++;
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline int
|
|
|
|
vlan_remhash(struct ifvlantrunk *trunk, struct ifvlan *ifv)
|
|
|
|
{
|
|
|
|
|
2012-01-12 18:39:37 +00:00
|
|
|
trunk->vlans[ifv->ifv_vid] = NULL;
|
2011-03-21 09:40:01 +00:00
|
|
|
trunk->refcnt--;
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline void
|
|
|
|
vlan_freehash(struct ifvlantrunk *trunk)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline void
|
|
|
|
vlan_inithash(struct ifvlantrunk *trunk)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#endif /* !VLAN_ARRAY */
|
|
|
|
|
|
|
|
static void
|
|
|
|
trunk_destroy(struct ifvlantrunk *trunk)
|
|
|
|
{
|
|
|
|
VLAN_LOCK_ASSERT();
|
|
|
|
|
|
|
|
TRUNK_LOCK(trunk);
|
|
|
|
vlan_freehash(trunk);
|
|
|
|
trunk->parent->if_vlantrunk = NULL;
|
2006-02-24 17:25:16 +00:00
|
|
|
TRUNK_UNLOCK(trunk);
|
|
|
|
TRUNK_LOCK_DESTROY(trunk);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
free(trunk, M_VLAN);
|
|
|
|
}
|
|
|
|
|
1999-03-15 01:17:26 +00:00
|
|
|
/*
|
|
|
|
* Program our multicast filter. What we're actually doing is
|
|
|
|
* programming the multicast filter of the parent. This has the
|
|
|
|
* side effect of causing the parent interface to receive multicast
|
|
|
|
* traffic that it doesn't really want, which ends up being discarded
|
|
|
|
* later by the upper protocol layers. Unfortunately, there's no way
|
|
|
|
* to avoid this: there really is only one physical interface.
|
|
|
|
*/
|
2001-01-31 07:58:58 +00:00
|
|
|
static int
|
|
|
|
vlan_setmulti(struct ifnet *ifp)
|
1999-03-15 01:17:26 +00:00
|
|
|
{
|
|
|
|
struct ifnet *ifp_p;
|
2014-08-04 00:58:12 +00:00
|
|
|
struct ifmultiaddr *ifma;
|
1999-03-15 01:17:26 +00:00
|
|
|
struct ifvlan *sc;
|
2007-03-12 12:27:30 +00:00
|
|
|
struct vlan_mc_entry *mc;
|
1999-03-15 01:17:26 +00:00
|
|
|
int error;
|
|
|
|
|
|
|
|
/* Find the parent. */
|
|
|
|
sc = ifp->if_softc;
|
2014-08-04 00:58:12 +00:00
|
|
|
TRUNK_LOCK_ASSERT(TRUNK(sc));
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
ifp_p = PARENT(sc);
|
2001-07-24 17:14:37 +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
|
|
|
CURVNET_SET_QUIET(ifp_p->if_vnet);
|
|
|
|
|
1999-03-15 01:17:26 +00:00
|
|
|
/* First, remove any existing filter entries. */
|
2007-03-12 12:27:30 +00:00
|
|
|
while ((mc = SLIST_FIRST(&sc->vlan_mc_listhead)) != NULL) {
|
1999-03-15 01:17:26 +00:00
|
|
|
SLIST_REMOVE_HEAD(&sc->vlan_mc_listhead, mc_entries);
|
2014-08-04 00:58:12 +00:00
|
|
|
(void)if_delmulti(ifp_p, (struct sockaddr *)&mc->mc_addr);
|
2001-09-05 21:10:28 +00:00
|
|
|
free(mc, M_VLAN);
|
1999-03-15 01:17:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now program new ones. */
|
2014-08-04 00:58:12 +00:00
|
|
|
IF_ADDR_WLOCK(ifp);
|
2001-02-06 10:12:15 +00:00
|
|
|
TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
|
1999-03-15 01:17:26 +00:00
|
|
|
if (ifma->ifma_addr->sa_family != AF_LINK)
|
|
|
|
continue;
|
2004-07-04 18:32:54 +00:00
|
|
|
mc = malloc(sizeof(struct vlan_mc_entry), M_VLAN, M_NOWAIT);
|
2014-08-04 00:58:12 +00:00
|
|
|
if (mc == NULL) {
|
|
|
|
IF_ADDR_WUNLOCK(ifp);
|
2004-07-04 18:32:54 +00:00
|
|
|
return (ENOMEM);
|
2014-08-04 00:58:12 +00:00
|
|
|
}
|
2011-03-21 09:40:01 +00:00
|
|
|
bcopy(ifma->ifma_addr, &mc->mc_addr, ifma->ifma_addr->sa_len);
|
|
|
|
mc->mc_addr.sdl_index = ifp_p->if_index;
|
1999-03-15 01:17:26 +00:00
|
|
|
SLIST_INSERT_HEAD(&sc->vlan_mc_listhead, mc, mc_entries);
|
2014-08-04 00:58:12 +00:00
|
|
|
}
|
|
|
|
IF_ADDR_WUNLOCK(ifp);
|
|
|
|
SLIST_FOREACH (mc, &sc->vlan_mc_listhead, mc_entries) {
|
2011-03-21 09:40:01 +00:00
|
|
|
error = if_addmulti(ifp_p, (struct sockaddr *)&mc->mc_addr,
|
2014-08-04 00:58:12 +00:00
|
|
|
NULL);
|
1999-03-15 01:17:26 +00:00
|
|
|
if (error)
|
2004-07-04 16:43:24 +00:00
|
|
|
return (error);
|
1999-03-15 01:17:26 +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
|
|
|
CURVNET_RESTORE();
|
2004-07-04 16:43:24 +00:00
|
|
|
return (0);
|
1999-03-15 01:17:26 +00:00
|
|
|
}
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2010-01-18 20:34:00 +00:00
|
|
|
/*
|
|
|
|
* A handler for parent interface link layer address changes.
|
|
|
|
* If the parent interface link layer address is changed we
|
|
|
|
* should also change it on all children vlans.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
vlan_iflladdr(void *arg __unused, struct ifnet *ifp)
|
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
2010-01-19 04:29:42 +00:00
|
|
|
#ifndef VLAN_ARRAY
|
|
|
|
struct ifvlan *next;
|
|
|
|
#endif
|
2010-01-18 20:34:00 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if it's a trunk interface first of all
|
|
|
|
* to avoid needless locking.
|
|
|
|
*/
|
|
|
|
if (ifp->if_vlantrunk == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
VLAN_LOCK();
|
|
|
|
/*
|
|
|
|
* OK, it's a trunk. Loop over and change all vlan's lladdrs on it.
|
|
|
|
*/
|
|
|
|
#ifdef VLAN_ARRAY
|
|
|
|
for (i = 0; i < VLAN_ARRAY_SIZE; i++)
|
2010-01-19 04:29:42 +00:00
|
|
|
if ((ifv = ifp->if_vlantrunk->vlans[i])) {
|
2010-01-18 20:34:00 +00:00
|
|
|
#else /* VLAN_ARRAY */
|
|
|
|
for (i = 0; i < (1 << ifp->if_vlantrunk->hwidth); i++)
|
2010-01-19 04:29:42 +00:00
|
|
|
LIST_FOREACH_SAFE(ifv, &ifp->if_vlantrunk->hash[i], ifv_list, next) {
|
2010-01-18 20:34:00 +00:00
|
|
|
#endif /* VLAN_ARRAY */
|
2010-01-19 04:29:42 +00:00
|
|
|
VLAN_UNLOCK();
|
2011-03-21 09:40:01 +00:00
|
|
|
if_setlladdr(ifv->ifv_ifp, IF_LLADDR(ifp),
|
|
|
|
ifp->if_addrlen);
|
2010-01-19 04:29:42 +00:00
|
|
|
VLAN_LOCK();
|
|
|
|
}
|
2010-01-18 20:34:00 +00:00
|
|
|
VLAN_UNLOCK();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2006-06-21 07:29:44 +00:00
|
|
|
/*
|
|
|
|
* A handler for network interface departure events.
|
|
|
|
* Track departure of trunks here so that we don't access invalid
|
|
|
|
* pointers or whatever if a trunk is ripped from under us, e.g.,
|
2009-12-29 13:35:18 +00:00
|
|
|
* by ejecting its hot-plug card. However, if an ifnet is simply
|
|
|
|
* being renamed, then there's no need to tear down the state.
|
2006-06-21 07:29:44 +00:00
|
|
|
*/
|
|
|
|
static void
|
|
|
|
vlan_ifdetach(void *arg __unused, struct ifnet *ifp)
|
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if it's a trunk interface first of all
|
|
|
|
* to avoid needless locking.
|
|
|
|
*/
|
|
|
|
if (ifp->if_vlantrunk == NULL)
|
|
|
|
return;
|
|
|
|
|
2009-12-29 13:35:18 +00:00
|
|
|
/* If the ifnet is just being renamed, don't do anything. */
|
|
|
|
if (ifp->if_flags & IFF_RENAMING)
|
|
|
|
return;
|
|
|
|
|
2006-06-21 07:29:44 +00:00
|
|
|
VLAN_LOCK();
|
|
|
|
/*
|
|
|
|
* OK, it's a trunk. Loop over and detach all vlan's on it.
|
|
|
|
* Check trunk pointer after each vlan_unconfig() as it will
|
|
|
|
* free it and set to NULL after the last vlan was detached.
|
|
|
|
*/
|
|
|
|
#ifdef VLAN_ARRAY
|
|
|
|
for (i = 0; i < VLAN_ARRAY_SIZE; i++)
|
|
|
|
if ((ifv = ifp->if_vlantrunk->vlans[i])) {
|
2012-08-20 16:00:33 +00:00
|
|
|
vlan_unconfig_locked(ifv->ifv_ifp, 1);
|
2006-06-21 07:29:44 +00:00
|
|
|
if (ifp->if_vlantrunk == NULL)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#else /* VLAN_ARRAY */
|
|
|
|
restart:
|
|
|
|
for (i = 0; i < (1 << ifp->if_vlantrunk->hwidth); i++)
|
|
|
|
if ((ifv = LIST_FIRST(&ifp->if_vlantrunk->hash[i]))) {
|
2012-08-20 16:00:33 +00:00
|
|
|
vlan_unconfig_locked(ifv->ifv_ifp, 1);
|
2006-06-21 07:29:44 +00:00
|
|
|
if (ifp->if_vlantrunk)
|
|
|
|
goto restart; /* trunk->hwidth can change */
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif /* VLAN_ARRAY */
|
|
|
|
/* Trunk should have been destroyed in vlan_unconfig(). */
|
|
|
|
KASSERT(ifp->if_vlantrunk == NULL, ("%s: purge failed", __func__));
|
|
|
|
VLAN_UNLOCK();
|
|
|
|
}
|
|
|
|
|
2011-03-21 09:40:01 +00:00
|
|
|
/*
|
|
|
|
* Return the trunk device for a virtual interface.
|
|
|
|
*/
|
|
|
|
static struct ifnet *
|
|
|
|
vlan_trunkdev(struct ifnet *ifp)
|
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
|
|
|
|
if (ifp->if_type != IFT_L2VLAN)
|
|
|
|
return (NULL);
|
|
|
|
ifv = ifp->if_softc;
|
|
|
|
ifp = NULL;
|
|
|
|
VLAN_LOCK();
|
|
|
|
if (ifv->ifv_trunk)
|
|
|
|
ifp = PARENT(ifv);
|
|
|
|
VLAN_UNLOCK();
|
|
|
|
return (ifp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2012-01-12 18:39:37 +00:00
|
|
|
* Return the 12-bit VLAN VID for this interface, for use by external
|
|
|
|
* components such as Infiniband.
|
|
|
|
*
|
|
|
|
* XXXRW: Note that the function name here is historical; it should be named
|
|
|
|
* vlan_vid().
|
2011-03-21 09:40:01 +00:00
|
|
|
*/
|
|
|
|
static int
|
2012-01-12 18:39:37 +00:00
|
|
|
vlan_tag(struct ifnet *ifp, uint16_t *vidp)
|
2011-03-21 09:40:01 +00:00
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
|
|
|
|
if (ifp->if_type != IFT_L2VLAN)
|
|
|
|
return (EINVAL);
|
|
|
|
ifv = ifp->if_softc;
|
2012-01-12 18:39:37 +00:00
|
|
|
*vidp = ifv->ifv_vid;
|
2011-03-21 09:40:01 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return a driver specific cookie for this interface. Synchronization
|
|
|
|
* with setcookie must be provided by the driver.
|
|
|
|
*/
|
|
|
|
static void *
|
|
|
|
vlan_cookie(struct ifnet *ifp)
|
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
|
|
|
|
if (ifp->if_type != IFT_L2VLAN)
|
|
|
|
return (NULL);
|
|
|
|
ifv = ifp->if_softc;
|
|
|
|
return (ifv->ifv_cookie);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Store a cookie in our softc that drivers can use to store driver
|
|
|
|
* private per-instance data in.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
vlan_setcookie(struct ifnet *ifp, void *cookie)
|
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
|
|
|
|
if (ifp->if_type != IFT_L2VLAN)
|
|
|
|
return (EINVAL);
|
|
|
|
ifv = ifp->if_softc;
|
|
|
|
ifv->ifv_cookie = cookie;
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2012-01-12 18:39:37 +00:00
|
|
|
* Return the vlan device present at the specific VID.
|
2011-03-21 09:40:01 +00:00
|
|
|
*/
|
|
|
|
static struct ifnet *
|
2012-01-12 18:39:37 +00:00
|
|
|
vlan_devat(struct ifnet *ifp, uint16_t vid)
|
2011-03-21 09:40:01 +00:00
|
|
|
{
|
|
|
|
struct ifvlantrunk *trunk;
|
|
|
|
struct ifvlan *ifv;
|
2014-09-13 18:41:24 +00:00
|
|
|
TRUNK_LOCK_READER;
|
2011-03-21 09:40:01 +00:00
|
|
|
|
|
|
|
trunk = ifp->if_vlantrunk;
|
|
|
|
if (trunk == NULL)
|
|
|
|
return (NULL);
|
|
|
|
ifp = NULL;
|
|
|
|
TRUNK_RLOCK(trunk);
|
2012-01-12 18:39:37 +00:00
|
|
|
ifv = vlan_gethash(trunk, vid);
|
2011-03-21 09:40:01 +00:00
|
|
|
if (ifv)
|
|
|
|
ifp = ifv->ifv_ifp;
|
|
|
|
TRUNK_RUNLOCK(trunk);
|
|
|
|
return (ifp);
|
|
|
|
}
|
|
|
|
|
2002-11-14 23:43:16 +00:00
|
|
|
/*
|
|
|
|
* VLAN support can be loaded as a module. The only place in the
|
|
|
|
* system that's intimately aware of this is ether_input. We hook
|
|
|
|
* into this code through vlan_input_p which is defined there and
|
|
|
|
* set here. Noone else in the system should be aware of this so
|
|
|
|
* we use an explicit reference here.
|
|
|
|
*/
|
|
|
|
extern void (*vlan_input_p)(struct ifnet *, struct mbuf *);
|
|
|
|
|
2005-04-20 12:16:41 +00:00
|
|
|
/* For if_link_state_change() eyes only... */
|
2009-12-31 20:29:58 +00:00
|
|
|
extern void (*vlan_link_state_p)(struct ifnet *);
|
2004-05-03 13:48:35 +00:00
|
|
|
|
2001-01-31 07:58:58 +00:00
|
|
|
static int
|
2004-07-04 16:43:24 +00:00
|
|
|
vlan_modevent(module_t mod, int type, void *data)
|
|
|
|
{
|
2001-09-05 21:10:28 +00:00
|
|
|
|
2004-07-04 16:43:24 +00:00
|
|
|
switch (type) {
|
|
|
|
case MOD_LOAD:
|
2006-06-21 07:29:44 +00:00
|
|
|
ifdetach_tag = EVENTHANDLER_REGISTER(ifnet_departure_event,
|
|
|
|
vlan_ifdetach, NULL, EVENTHANDLER_PRI_ANY);
|
|
|
|
if (ifdetach_tag == NULL)
|
|
|
|
return (ENOMEM);
|
2010-01-18 20:34:00 +00:00
|
|
|
iflladdr_tag = EVENTHANDLER_REGISTER(iflladdr_event,
|
|
|
|
vlan_iflladdr, NULL, EVENTHANDLER_PRI_ANY);
|
|
|
|
if (iflladdr_tag == NULL)
|
|
|
|
return (ENOMEM);
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_LOCK_INIT();
|
2001-09-05 21:10:28 +00:00
|
|
|
vlan_input_p = vlan_input;
|
2004-05-03 13:48:35 +00:00
|
|
|
vlan_link_state_p = vlan_link_state;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
vlan_trunk_cap_p = vlan_trunk_capabilities;
|
2011-03-21 09:40:01 +00:00
|
|
|
vlan_trunkdev_p = vlan_trunkdev;
|
|
|
|
vlan_cookie_p = vlan_cookie;
|
|
|
|
vlan_setcookie_p = vlan_setcookie;
|
|
|
|
vlan_tag_p = vlan_tag;
|
|
|
|
vlan_devat_p = vlan_devat;
|
2010-11-22 23:35:29 +00:00
|
|
|
#ifndef VIMAGE
|
2012-10-16 13:37:54 +00:00
|
|
|
vlan_cloner = if_clone_advanced(vlanname, 0, vlan_clone_match,
|
|
|
|
vlan_clone_create, vlan_clone_destroy);
|
2010-11-22 23:35:29 +00:00
|
|
|
#endif
|
2007-03-12 12:42:14 +00:00
|
|
|
if (bootverbose)
|
|
|
|
printf("vlan: initialized, using "
|
|
|
|
#ifdef VLAN_ARRAY
|
|
|
|
"full-size arrays"
|
|
|
|
#else
|
|
|
|
"hash tables with chaining"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
"\n");
|
2004-07-04 16:43:24 +00:00
|
|
|
break;
|
|
|
|
case MOD_UNLOAD:
|
2010-11-22 23:35:29 +00:00
|
|
|
#ifndef VIMAGE
|
2012-10-16 13:37:54 +00:00
|
|
|
if_clone_detach(vlan_cloner);
|
2010-11-22 23:35:29 +00:00
|
|
|
#endif
|
2006-06-21 07:29:44 +00:00
|
|
|
EVENTHANDLER_DEREGISTER(ifnet_departure_event, ifdetach_tag);
|
2010-01-18 20:34:00 +00:00
|
|
|
EVENTHANDLER_DEREGISTER(iflladdr_event, iflladdr_tag);
|
2001-09-05 21:10:28 +00:00
|
|
|
vlan_input_p = NULL;
|
2004-05-03 13:48:35 +00:00
|
|
|
vlan_link_state_p = NULL;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
vlan_trunk_cap_p = NULL;
|
2011-03-21 09:40:01 +00:00
|
|
|
vlan_trunkdev_p = NULL;
|
|
|
|
vlan_tag_p = NULL;
|
2012-06-19 07:34:13 +00:00
|
|
|
vlan_cookie_p = NULL;
|
|
|
|
vlan_setcookie_p = NULL;
|
2011-03-21 09:40:01 +00:00
|
|
|
vlan_devat_p = NULL;
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_LOCK_DESTROY();
|
2007-03-12 12:42:14 +00:00
|
|
|
if (bootverbose)
|
|
|
|
printf("vlan: unloaded\n");
|
2001-09-05 21:10:28 +00:00
|
|
|
break;
|
2004-07-15 08:26:07 +00:00
|
|
|
default:
|
|
|
|
return (EOPNOTSUPP);
|
2004-07-04 16:43:24 +00:00
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
2001-01-31 07:58:58 +00:00
|
|
|
|
2004-07-04 16:43:24 +00:00
|
|
|
static moduledata_t vlan_mod = {
|
|
|
|
"if_vlan",
|
|
|
|
vlan_modevent,
|
2012-10-10 08:36:38 +00:00
|
|
|
0
|
2004-07-04 16:43:24 +00:00
|
|
|
};
|
2001-01-31 07:58:58 +00:00
|
|
|
|
|
|
|
DECLARE_MODULE(if_vlan, vlan_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
|
2006-02-10 18:38:33 +00:00
|
|
|
MODULE_VERSION(if_vlan, 3);
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2010-11-22 23:35:29 +00:00
|
|
|
#ifdef VIMAGE
|
|
|
|
static void
|
|
|
|
vnet_vlan_init(const void *unused __unused)
|
|
|
|
{
|
|
|
|
|
2012-10-16 13:37:54 +00:00
|
|
|
vlan_cloner = if_clone_advanced(vlanname, 0, vlan_clone_match,
|
|
|
|
vlan_clone_create, vlan_clone_destroy);
|
2010-11-22 23:35:29 +00:00
|
|
|
V_vlan_cloner = vlan_cloner;
|
|
|
|
}
|
|
|
|
VNET_SYSINIT(vnet_vlan_init, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY,
|
|
|
|
vnet_vlan_init, NULL);
|
|
|
|
|
|
|
|
static void
|
|
|
|
vnet_vlan_uninit(const void *unused __unused)
|
|
|
|
{
|
|
|
|
|
2012-10-16 13:37:54 +00:00
|
|
|
if_clone_detach(V_vlan_cloner);
|
2010-11-22 23:35:29 +00:00
|
|
|
}
|
|
|
|
VNET_SYSUNINIT(vnet_vlan_uninit, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST,
|
|
|
|
vnet_vlan_uninit, NULL);
|
|
|
|
#endif
|
|
|
|
|
2015-03-20 20:42:58 +00:00
|
|
|
/*
|
|
|
|
* Check for <etherif>.<vlan> style interface names.
|
|
|
|
*/
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
static struct ifnet *
|
2015-03-20 20:42:58 +00:00
|
|
|
vlan_clone_match_ethervid(const char *name, int *vidp)
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
{
|
2015-03-20 20:42:58 +00:00
|
|
|
char ifname[IFNAMSIZ];
|
|
|
|
char *cp;
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
struct ifnet *ifp;
|
2012-01-12 18:39:37 +00:00
|
|
|
int vid;
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
|
2015-03-20 20:42:58 +00:00
|
|
|
strlcpy(ifname, name, IFNAMSIZ);
|
|
|
|
if ((cp = strchr(ifname, '.')) == NULL)
|
|
|
|
return (NULL);
|
|
|
|
*cp = '\0';
|
|
|
|
if ((ifp = ifunit(ifname)) == NULL)
|
|
|
|
return (NULL);
|
|
|
|
/* Parse VID. */
|
|
|
|
if (*++cp == '\0')
|
|
|
|
return (NULL);
|
|
|
|
vid = 0;
|
|
|
|
for(; *cp >= '0' && *cp <= '9'; cp++)
|
|
|
|
vid = (vid * 10) + (*cp - '0');
|
|
|
|
if (*cp != '\0')
|
|
|
|
return (NULL);
|
|
|
|
if (vidp != NULL)
|
|
|
|
*vidp = vid;
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
|
2004-07-04 16:43:24 +00:00
|
|
|
return (ifp);
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
}
|
|
|
|
|
2001-09-05 21:10:28 +00:00
|
|
|
static int
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
vlan_clone_match(struct if_clone *ifc, const char *name)
|
2001-09-05 21:10:28 +00:00
|
|
|
{
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
const char *cp;
|
|
|
|
|
2015-03-20 20:42:58 +00:00
|
|
|
if (vlan_clone_match_ethervid(name, NULL) != NULL)
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
return (1);
|
|
|
|
|
2012-10-16 13:37:54 +00:00
|
|
|
if (strncmp(vlanname, name, strlen(vlanname)) != 0)
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
return (0);
|
|
|
|
for (cp = name + 4; *cp != '\0'; cp++) {
|
|
|
|
if (*cp < '0' || *cp > '9')
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2006-07-09 06:04:01 +00:00
|
|
|
vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params)
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
{
|
|
|
|
char *dp;
|
|
|
|
int wildcard;
|
|
|
|
int unit;
|
|
|
|
int error;
|
2012-01-12 18:39:37 +00:00
|
|
|
int vid;
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
int ethertag;
|
2001-09-05 21:10:28 +00:00
|
|
|
struct ifvlan *ifv;
|
|
|
|
struct ifnet *ifp;
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
struct ifnet *p;
|
2010-08-06 15:15:26 +00:00
|
|
|
struct ifaddr *ifa;
|
|
|
|
struct sockaddr_dl *sdl;
|
2006-07-09 06:04:01 +00:00
|
|
|
struct vlanreq vlr;
|
2007-03-19 16:58:07 +00:00
|
|
|
static const u_char eaddr[ETHER_ADDR_LEN]; /* 00:00:00:00:00:00 */
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
|
2006-07-09 06:04:01 +00:00
|
|
|
/*
|
|
|
|
* There are 3 (ugh) ways to specify the cloned device:
|
|
|
|
* o pass a parameter block with the clone request.
|
|
|
|
* o specify parameters in the text of the clone device name
|
|
|
|
* o specify no parameters and get an unattached device that
|
|
|
|
* must be configured separately.
|
|
|
|
* The first technique is preferred; the latter two are
|
|
|
|
* supported for backwards compatibilty.
|
2012-01-12 18:39:37 +00:00
|
|
|
*
|
|
|
|
* XXXRW: Note historic use of the word "tag" here. New ioctls may be
|
|
|
|
* called for.
|
2006-07-09 06:04:01 +00:00
|
|
|
*/
|
|
|
|
if (params) {
|
|
|
|
error = copyin(params, &vlr, sizeof(vlr));
|
|
|
|
if (error)
|
|
|
|
return error;
|
|
|
|
p = ifunit(vlr.vlr_parent);
|
|
|
|
if (p == NULL)
|
2015-03-20 21:09:03 +00:00
|
|
|
return (ENXIO);
|
2006-07-09 06:04:01 +00:00
|
|
|
error = ifc_name2unit(name, &unit);
|
|
|
|
if (error != 0)
|
|
|
|
return (error);
|
|
|
|
|
|
|
|
ethertag = 1;
|
2012-01-12 18:39:37 +00:00
|
|
|
vid = vlr.vlr_tag;
|
2006-07-09 06:04:01 +00:00
|
|
|
wildcard = (unit < 0);
|
2015-03-20 20:42:58 +00:00
|
|
|
} else if ((p = vlan_clone_match_ethervid(name, &vid)) != NULL) {
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
ethertag = 1;
|
|
|
|
unit = -1;
|
|
|
|
wildcard = 0;
|
|
|
|
} else {
|
|
|
|
ethertag = 0;
|
|
|
|
|
|
|
|
error = ifc_name2unit(name, &unit);
|
|
|
|
if (error != 0)
|
|
|
|
return (error);
|
|
|
|
|
|
|
|
wildcard = (unit < 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
error = ifc_alloc_unit(ifc, &unit);
|
|
|
|
if (error != 0)
|
|
|
|
return (error);
|
|
|
|
|
|
|
|
/* In the wildcard case, we need to update the name. */
|
|
|
|
if (wildcard) {
|
|
|
|
for (dp = name; *dp != '\0'; dp++);
|
|
|
|
if (snprintf(dp, len - (dp-name), "%d", unit) >
|
|
|
|
len - (dp-name) - 1) {
|
|
|
|
panic("%s: interface name too long", __func__);
|
|
|
|
}
|
|
|
|
}
|
2001-09-05 21:10:28 +00:00
|
|
|
|
2003-02-19 05:47:46 +00:00
|
|
|
ifv = malloc(sizeof(struct ifvlan), M_VLAN, M_WAITOK | M_ZERO);
|
2005-06-10 16:49:24 +00:00
|
|
|
ifp = ifv->ifv_ifp = if_alloc(IFT_ETHER);
|
|
|
|
if (ifp == NULL) {
|
|
|
|
ifc_free_unit(ifc, unit);
|
|
|
|
free(ifv, M_VLAN);
|
|
|
|
return (ENOSPC);
|
|
|
|
}
|
2001-09-05 21:10:28 +00:00
|
|
|
SLIST_INIT(&ifv->vlan_mc_listhead);
|
|
|
|
ifp->if_softc = ifv;
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
/*
|
2005-01-24 15:48:00 +00:00
|
|
|
* Set the name manually rather than using if_initname because
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
* we don't conform to the default naming convention for interfaces.
|
|
|
|
*/
|
|
|
|
strlcpy(ifp->if_xname, name, IFNAMSIZ);
|
2012-10-16 13:37:54 +00:00
|
|
|
ifp->if_dname = vlanname;
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
ifp->if_dunit = unit;
|
2001-09-05 21:10:28 +00:00
|
|
|
/* NB: flags are not set here */
|
|
|
|
ifp->if_linkmib = &ifv->ifv_mib;
|
2004-07-04 16:43:24 +00:00
|
|
|
ifp->if_linkmiblen = sizeof(ifv->ifv_mib);
|
2001-09-05 21:10:28 +00:00
|
|
|
/* NB: mtu is not set here */
|
|
|
|
|
2006-06-29 07:30:39 +00:00
|
|
|
ifp->if_init = vlan_init;
|
2011-11-28 19:35:08 +00:00
|
|
|
ifp->if_transmit = vlan_transmit;
|
|
|
|
ifp->if_qflush = vlan_qflush;
|
2001-09-05 21:10:28 +00:00
|
|
|
ifp->if_ioctl = vlan_ioctl;
|
2006-01-31 16:41:05 +00:00
|
|
|
ifp->if_flags = VLAN_IFFLAGS;
|
2005-06-10 16:49:24 +00:00
|
|
|
ether_ifattach(ifp, eaddr);
|
2001-09-05 21:10:28 +00:00
|
|
|
/* Now undo some of the damage... */
|
2001-10-15 19:21:01 +00:00
|
|
|
ifp->if_baudrate = 0;
|
2002-11-14 23:43:16 +00:00
|
|
|
ifp->if_type = IFT_L2VLAN;
|
|
|
|
ifp->if_hdrlen = ETHER_VLAN_ENCAP_LEN;
|
2010-08-06 15:15:26 +00:00
|
|
|
ifa = ifp->if_addr;
|
|
|
|
sdl = (struct sockaddr_dl *)ifa->ifa_addr;
|
|
|
|
sdl->sdl_type = IFT_L2VLAN;
|
2001-09-05 21:10:28 +00:00
|
|
|
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
if (ethertag) {
|
2012-01-12 18:39:37 +00:00
|
|
|
error = vlan_config(ifv, p, vid);
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
if (error != 0) {
|
|
|
|
/*
|
2012-08-20 16:00:33 +00:00
|
|
|
* Since we've partially failed, we need to back
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
* out all the way, otherwise userland could get
|
|
|
|
* confused. Thus, we destroy the interface.
|
|
|
|
*/
|
|
|
|
ether_ifdetach(ifp);
|
2006-06-29 07:52:30 +00:00
|
|
|
vlan_unconfig(ifp);
|
2011-11-11 22:57:52 +00:00
|
|
|
if_free(ifp);
|
2009-02-13 12:59:54 +00:00
|
|
|
ifc_free_unit(ifc, unit);
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
free(ifv, M_VLAN);
|
|
|
|
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
2005-10-03 02:24:21 +00:00
|
|
|
/* Update flags on the parent, if necessary. */
|
|
|
|
vlan_setflags(ifp, 1);
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
}
|
|
|
|
|
2001-09-05 21:10:28 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
static int
|
|
|
|
vlan_clone_destroy(struct if_clone *ifc, struct ifnet *ifp)
|
2001-09-05 21:10:28 +00:00
|
|
|
{
|
|
|
|
struct ifvlan *ifv = ifp->if_softc;
|
2006-06-29 07:30:39 +00:00
|
|
|
int unit = ifp->if_dunit;
|
2004-07-22 22:50:15 +00:00
|
|
|
|
2006-06-29 07:52:30 +00:00
|
|
|
ether_ifdetach(ifp); /* first, remove it from system-wide lists */
|
|
|
|
vlan_unconfig(ifp); /* now it can be unconfigured and freed */
|
2011-11-11 22:57:52 +00:00
|
|
|
if_free(ifp);
|
2001-09-05 21:10:28 +00:00
|
|
|
free(ifv, M_VLAN);
|
2004-07-22 22:50:15 +00:00
|
|
|
ifc_free_unit(ifc, unit);
|
|
|
|
|
Major overhaul of pseudo-interface cloning. Highlights include:
- Split the code out into if_clone.[ch].
- Locked struct if_clone. [1]
- Add a per-cloner match function rather then simply matching names of
the form <name><unit> and <name>.
- Use the match function to allow creation of <interface>.<tag>
vlan interfaces. The old way is preserved unchanged!
- Also the match function to allow creation of stf(4) interfaces named
stf0, stf, or 6to4. This is the only major user visible change in
that "ifconfig stf" creates the interface stf rather then stf0 and
does not print "stf0" to stdout.
- Allow destroy functions to fail so they can refuse to delete
interfaces. Currently, we forbid the deletion of interfaces which
were created in the init function, particularly lo0, pflog0, and
pfsync0. In the case of lo0 this was a panic implementation so it
does not count as a user visiable change. :-)
- Since most interfaces do not need the new functionality, an family of
wrapper functions, ifc_simple_*(), were created to wrap old style
cloner functions.
- The IF_CLONE_INITIALIZER macro is replaced with a new incompatible
IFC_CLONE_INITIALIZER and ifc_simple consumers use IFC_SIMPLE_DECLARE
instead.
Submitted by: Maurycy Pawlowski-Wieronski <maurycy at fouk.org> [1]
Reviewed by: andre, mlaier
Discussed on: net
2004-06-22 20:13:25 +00:00
|
|
|
return (0);
|
2001-09-05 21:10:28 +00:00
|
|
|
}
|
|
|
|
|
2004-07-04 16:43:24 +00:00
|
|
|
/*
|
|
|
|
* The ifp->if_init entry point for vlan(4) is a no-op.
|
|
|
|
*/
|
1998-03-18 01:40:12 +00:00
|
|
|
static void
|
2006-06-29 07:30:39 +00:00
|
|
|
vlan_init(void *foo __unused)
|
1998-03-18 01:40:12 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2005-11-06 19:43:04 +00:00
|
|
|
/*
|
2011-11-28 19:35:08 +00:00
|
|
|
* The if_transmit method for vlan(4) interface.
|
2005-11-06 19:43:04 +00:00
|
|
|
*/
|
2011-11-28 19:35:08 +00:00
|
|
|
static int
|
|
|
|
vlan_transmit(struct ifnet *ifp, struct mbuf *m)
|
1998-03-18 01:40:12 +00:00
|
|
|
{
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
struct ifnet *p;
|
2011-12-29 18:40:58 +00:00
|
|
|
int error, len, mcast;
|
1998-03-18 01:40:12 +00:00
|
|
|
|
|
|
|
ifv = ifp->if_softc;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
p = PARENT(ifv);
|
2011-12-29 18:40:58 +00:00
|
|
|
len = m->m_pkthdr.len;
|
|
|
|
mcast = (m->m_flags & (M_MCAST | M_BCAST)) ? 1 : 0;
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2011-11-28 19:35:08 +00:00
|
|
|
BPF_MTAP(ifp, m);
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2011-11-28 19:35:08 +00:00
|
|
|
/*
|
|
|
|
* Do not run parent's if_transmit() if the parent is not up,
|
|
|
|
* or parent's driver will cause a system crash.
|
|
|
|
*/
|
|
|
|
if (!UP_AND_RUNNING(p)) {
|
|
|
|
m_freem(m);
|
2015-03-20 14:05:17 +00:00
|
|
|
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
|
2013-06-16 04:40:02 +00:00
|
|
|
return (ENETDOWN);
|
2011-11-28 19:35:08 +00:00
|
|
|
}
|
2001-03-28 15:52:12 +00:00
|
|
|
|
2011-11-28 19:35:08 +00:00
|
|
|
/*
|
|
|
|
* Pad the frame to the minimum size allowed if told to.
|
|
|
|
* This option is in accord with IEEE Std 802.1Q, 2003 Ed.,
|
|
|
|
* paragraph C.4.4.3.b. It can help to work around buggy
|
|
|
|
* bridges that violate paragraph C.4.4.3.a from the same
|
|
|
|
* document, i.e., fail to pad short frames after untagging.
|
|
|
|
* E.g., a tagged frame 66 bytes long (incl. FCS) is OK, but
|
|
|
|
* untagging it will produce a 62-byte frame, which is a runt
|
|
|
|
* and requires padding. There are VLAN-enabled network
|
|
|
|
* devices that just discard such runts instead or mishandle
|
|
|
|
* them somehow.
|
|
|
|
*/
|
2014-10-02 05:56:17 +00:00
|
|
|
if (V_soft_pad && p->if_type == IFT_ETHER) {
|
2011-11-28 19:35:08 +00:00
|
|
|
static char pad[8]; /* just zeros */
|
|
|
|
int n;
|
2006-08-11 17:09:27 +00:00
|
|
|
|
2011-11-28 19:35:08 +00:00
|
|
|
for (n = ETHERMIN + ETHER_HDR_LEN - m->m_pkthdr.len;
|
|
|
|
n > 0; n -= sizeof(pad))
|
|
|
|
if (!m_append(m, min(n, sizeof(pad)), pad))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (n > 0) {
|
|
|
|
if_printf(ifp, "cannot pad short frame\n");
|
2015-03-20 14:05:17 +00:00
|
|
|
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
|
2011-11-28 19:35:08 +00:00
|
|
|
m_freem(m);
|
|
|
|
return (0);
|
1999-03-15 01:17:26 +00:00
|
|
|
}
|
2011-11-28 19:35:08 +00:00
|
|
|
}
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2011-11-28 19:35:08 +00:00
|
|
|
/*
|
|
|
|
* If underlying interface can do VLAN tag insertion itself,
|
|
|
|
* just pass the packet along. However, we need some way to
|
|
|
|
* tell the interface where the packet came from so that it
|
|
|
|
* knows how to find the VLAN tag to use, so we attach a
|
|
|
|
* packet tag that holds it.
|
|
|
|
*/
|
|
|
|
if (p->if_capenable & IFCAP_VLAN_HWTAGGING) {
|
2012-01-12 18:39:37 +00:00
|
|
|
m->m_pkthdr.ether_vtag = ifv->ifv_vid;
|
2011-11-28 19:35:08 +00:00
|
|
|
m->m_flags |= M_VLANTAG;
|
|
|
|
} else {
|
2012-01-12 18:39:37 +00:00
|
|
|
m = ether_vlanencap(m, ifv->ifv_vid);
|
2011-11-28 19:35:08 +00:00
|
|
|
if (m == NULL) {
|
|
|
|
if_printf(ifp, "unable to prepend VLAN header\n");
|
2015-03-20 14:05:17 +00:00
|
|
|
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
|
2011-11-28 19:35:08 +00:00
|
|
|
return (0);
|
|
|
|
}
|
1998-03-18 01:40:12 +00:00
|
|
|
}
|
2011-11-28 19:35:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Send it, precisely as ether_output() would have.
|
|
|
|
*/
|
|
|
|
error = (p->if_transmit)(p, m);
|
2014-09-13 18:13:08 +00:00
|
|
|
if (error == 0) {
|
2015-03-20 14:05:17 +00:00
|
|
|
if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
|
|
|
|
if_inc_counter(ifp, IFCOUNTER_OBYTES, len);
|
|
|
|
if_inc_counter(ifp, IFCOUNTER_OMCASTS, mcast);
|
2011-12-29 18:40:58 +00:00
|
|
|
} else
|
2015-03-20 14:05:17 +00:00
|
|
|
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
|
2011-11-28 19:35:08 +00:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The ifp->if_qflush entry point for vlan(4) is a no-op.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
vlan_qflush(struct ifnet *ifp __unused)
|
|
|
|
{
|
1999-03-15 01:17:26 +00:00
|
|
|
}
|
|
|
|
|
2002-11-14 23:43:16 +00:00
|
|
|
static void
|
|
|
|
vlan_input(struct ifnet *ifp, struct mbuf *m)
|
1999-03-15 01:17:26 +00:00
|
|
|
{
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
struct ifvlantrunk *trunk = ifp->if_vlantrunk;
|
1999-03-15 01:17:26 +00:00
|
|
|
struct ifvlan *ifv;
|
2014-09-13 18:41:24 +00:00
|
|
|
TRUNK_LOCK_READER;
|
2012-01-12 18:39:37 +00:00
|
|
|
uint16_t vid;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
|
|
|
|
KASSERT(trunk != NULL, ("%s: no trunk", __func__));
|
1999-03-15 01:17:26 +00:00
|
|
|
|
2005-09-16 11:44:43 +00:00
|
|
|
if (m->m_flags & M_VLANTAG) {
|
2002-11-14 23:43:16 +00:00
|
|
|
/*
|
2005-09-16 11:58:58 +00:00
|
|
|
* Packet is tagged, but m contains a normal
|
2002-11-14 23:43:16 +00:00
|
|
|
* Ethernet frame; the tag is stored out-of-band.
|
|
|
|
*/
|
2012-01-12 18:39:37 +00:00
|
|
|
vid = EVL_VLANOFTAG(m->m_pkthdr.ether_vtag);
|
2005-02-18 22:31:19 +00:00
|
|
|
m->m_flags &= ~M_VLANTAG;
|
2002-11-14 23:43:16 +00:00
|
|
|
} else {
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
struct ether_vlan_header *evl;
|
|
|
|
|
2005-09-16 11:58:58 +00:00
|
|
|
/*
|
|
|
|
* Packet is tagged in-band as specified by 802.1q.
|
|
|
|
*/
|
2002-11-14 23:43:16 +00:00
|
|
|
switch (ifp->if_type) {
|
|
|
|
case IFT_ETHER:
|
2004-07-04 16:43:24 +00:00
|
|
|
if (m->m_len < sizeof(*evl) &&
|
|
|
|
(m = m_pullup(m, sizeof(*evl))) == NULL) {
|
2002-11-14 23:43:16 +00:00
|
|
|
if_printf(ifp, "cannot pullup VLAN header\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
evl = mtod(m, struct ether_vlan_header *);
|
2012-01-12 18:39:37 +00:00
|
|
|
vid = EVL_VLANOFTAG(ntohs(evl->evl_tag));
|
2006-08-03 09:50:15 +00:00
|
|
|
|
|
|
|
/*
|
2006-12-30 21:10:25 +00:00
|
|
|
* Remove the 802.1q header by copying the Ethernet
|
|
|
|
* addresses over it and adjusting the beginning of
|
|
|
|
* the data in the mbuf. The encapsulated Ethernet
|
|
|
|
* type field is already in place.
|
2006-08-03 09:50:15 +00:00
|
|
|
*/
|
2006-12-30 21:10:25 +00:00
|
|
|
bcopy((char *)evl, (char *)evl + ETHER_VLAN_ENCAP_LEN,
|
|
|
|
ETHER_HDR_LEN - ETHER_TYPE_LEN);
|
|
|
|
m_adj(m, ETHER_VLAN_ENCAP_LEN);
|
2002-11-14 23:43:16 +00:00
|
|
|
break;
|
2006-12-30 21:10:25 +00:00
|
|
|
|
2002-11-14 23:43:16 +00:00
|
|
|
default:
|
2006-08-03 09:50:15 +00:00
|
|
|
#ifdef INVARIANTS
|
2006-08-03 09:59:08 +00:00
|
|
|
panic("%s: %s has unsupported if_type %u",
|
|
|
|
__func__, ifp->if_xname, ifp->if_type);
|
2002-11-14 23:43:16 +00:00
|
|
|
#endif
|
2006-08-03 09:59:08 +00:00
|
|
|
m_freem(m);
|
2014-09-19 10:39:58 +00:00
|
|
|
if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
|
2006-08-03 09:59:08 +00:00
|
|
|
return;
|
2002-11-14 23:43:16 +00:00
|
|
|
}
|
1999-03-15 01:17:26 +00:00
|
|
|
}
|
|
|
|
|
2006-06-21 13:48:34 +00:00
|
|
|
TRUNK_RLOCK(trunk);
|
2012-01-12 18:39:37 +00:00
|
|
|
ifv = vlan_gethash(trunk, vid);
|
2006-12-30 21:10:25 +00:00
|
|
|
if (ifv == NULL || !UP_AND_RUNNING(ifv->ifv_ifp)) {
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
TRUNK_RUNLOCK(trunk);
|
|
|
|
m_freem(m);
|
2014-09-19 10:39:58 +00:00
|
|
|
if_inc_counter(ifp, IFCOUNTER_NOPROTO, 1);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
TRUNK_RUNLOCK(trunk);
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2005-06-10 16:49:24 +00:00
|
|
|
m->m_pkthdr.rcvif = ifv->ifv_ifp;
|
2015-03-25 16:01:46 +00:00
|
|
|
if_inc_counter(ifv->ifv_ifp, IFCOUNTER_IPACKETS, 1);
|
2002-11-14 23:43:16 +00:00
|
|
|
|
|
|
|
/* Pass it back through the parent's input routine. */
|
2005-06-10 16:49:24 +00:00
|
|
|
(*ifp->if_input)(ifv->ifv_ifp, m);
|
1998-03-18 01:40:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2012-01-12 18:39:37 +00:00
|
|
|
vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid)
|
1998-03-18 01:40:12 +00:00
|
|
|
{
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
struct ifvlantrunk *trunk;
|
2005-10-03 02:24:21 +00:00
|
|
|
struct ifnet *ifp;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
int error = 0;
|
1998-03-18 01:40:12 +00:00
|
|
|
|
2015-03-20 21:09:03 +00:00
|
|
|
/*
|
|
|
|
* We can handle non-ethernet hardware types as long as
|
|
|
|
* they handle the tagging and headers themselves.
|
|
|
|
*/
|
2011-03-21 09:40:01 +00:00
|
|
|
if (p->if_type != IFT_ETHER &&
|
|
|
|
(p->if_capenable & IFCAP_VLAN_HWTAGGING) == 0)
|
2004-07-04 16:43:24 +00:00
|
|
|
return (EPROTONOSUPPORT);
|
2006-01-31 16:41:05 +00:00
|
|
|
if ((p->if_flags & VLAN_IFFLAGS) != VLAN_IFFLAGS)
|
|
|
|
return (EPROTONOSUPPORT);
|
2015-03-20 21:09:03 +00:00
|
|
|
/*
|
|
|
|
* Don't let the caller set up a VLAN VID with
|
|
|
|
* anything except VLID bits.
|
|
|
|
* VID numbers 0x0 and 0xFFF are reserved.
|
|
|
|
*/
|
|
|
|
if (vid == 0 || vid == 0xFFF || (vid & ~EVL_VLID_MASK))
|
|
|
|
return (EINVAL);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (ifv->ifv_trunk)
|
2004-07-04 16:43:24 +00:00
|
|
|
return (EBUSY);
|
1998-03-18 01:40:12 +00:00
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (p->if_vlantrunk == NULL) {
|
|
|
|
trunk = malloc(sizeof(struct ifvlantrunk),
|
|
|
|
M_VLAN, M_WAITOK | M_ZERO);
|
2006-02-02 22:11:38 +00:00
|
|
|
vlan_inithash(trunk);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
VLAN_LOCK();
|
|
|
|
if (p->if_vlantrunk != NULL) {
|
|
|
|
/* A race that that is very unlikely to be hit. */
|
2006-02-02 22:11:38 +00:00
|
|
|
vlan_freehash(trunk);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
free(trunk, M_VLAN);
|
|
|
|
goto exists;
|
|
|
|
}
|
|
|
|
TRUNK_LOCK_INIT(trunk);
|
|
|
|
TRUNK_LOCK(trunk);
|
|
|
|
p->if_vlantrunk = trunk;
|
|
|
|
trunk->parent = p;
|
|
|
|
} else {
|
|
|
|
VLAN_LOCK();
|
|
|
|
exists:
|
|
|
|
trunk = p->if_vlantrunk;
|
|
|
|
TRUNK_LOCK(trunk);
|
|
|
|
}
|
|
|
|
|
2012-01-12 18:39:37 +00:00
|
|
|
ifv->ifv_vid = vid; /* must set this before vlan_inshash() */
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
error = vlan_inshash(trunk, ifv);
|
|
|
|
if (error)
|
|
|
|
goto done;
|
2006-08-15 16:56:43 +00:00
|
|
|
ifv->ifv_proto = ETHERTYPE_VLAN;
|
2002-11-14 23:43:16 +00:00
|
|
|
ifv->ifv_encaplen = ETHER_VLAN_ENCAP_LEN;
|
|
|
|
ifv->ifv_mintu = ETHERMIN;
|
2005-10-03 02:24:21 +00:00
|
|
|
ifv->ifv_pflags = 0;
|
2002-11-14 23:43:16 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the parent supports the VLAN_MTU capability,
|
|
|
|
* i.e. can Tx/Rx larger than ETHER_MAX_LEN frames,
|
2004-05-25 14:30:12 +00:00
|
|
|
* use it.
|
2002-11-14 23:43:16 +00:00
|
|
|
*/
|
2004-05-25 14:30:12 +00:00
|
|
|
if (p->if_capenable & IFCAP_VLAN_MTU) {
|
2002-11-14 23:43:16 +00:00
|
|
|
/*
|
2004-05-25 14:30:12 +00:00
|
|
|
* No need to fudge the MTU since the parent can
|
|
|
|
* handle extended frames.
|
2002-11-14 23:43:16 +00:00
|
|
|
*/
|
|
|
|
ifv->ifv_mtufudge = 0;
|
2004-05-25 14:30:12 +00:00
|
|
|
} else {
|
2002-11-14 23:43:16 +00:00
|
|
|
/*
|
|
|
|
* Fudge the MTU by the encapsulation size. This
|
|
|
|
* makes us incompatible with strictly compliant
|
|
|
|
* 802.1Q implementations, but allows us to use
|
|
|
|
* the feature with other NetBSD implementations,
|
|
|
|
* which might still be useful.
|
|
|
|
*/
|
|
|
|
ifv->ifv_mtufudge = ifv->ifv_encaplen;
|
|
|
|
}
|
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
ifv->ifv_trunk = trunk;
|
2005-10-03 02:24:21 +00:00
|
|
|
ifp = ifv->ifv_ifp;
|
2011-03-21 09:40:01 +00:00
|
|
|
/*
|
|
|
|
* Initialize fields from our parent. This duplicates some
|
|
|
|
* work with ether_ifattach() but allows for non-ethernet
|
|
|
|
* interfaces to also work.
|
|
|
|
*/
|
2005-10-03 02:24:21 +00:00
|
|
|
ifp->if_mtu = p->if_mtu - ifv->ifv_mtufudge;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
ifp->if_baudrate = p->if_baudrate;
|
2011-03-21 09:40:01 +00:00
|
|
|
ifp->if_output = p->if_output;
|
|
|
|
ifp->if_input = p->if_input;
|
|
|
|
ifp->if_resolvemulti = p->if_resolvemulti;
|
|
|
|
ifp->if_addrlen = p->if_addrlen;
|
|
|
|
ifp->if_broadcastaddr = p->if_broadcastaddr;
|
|
|
|
|
1998-03-18 01:40:12 +00:00
|
|
|
/*
|
2001-03-28 15:52:12 +00:00
|
|
|
* Copy only a selected subset of flags from the parent.
|
|
|
|
* Other flags are none of our business.
|
1998-03-18 01:40:12 +00:00
|
|
|
*/
|
2006-01-31 16:41:05 +00:00
|
|
|
#define VLAN_COPY_FLAGS (IFF_SIMPLEX)
|
2005-10-03 02:24:21 +00:00
|
|
|
ifp->if_flags &= ~VLAN_COPY_FLAGS;
|
|
|
|
ifp->if_flags |= p->if_flags & VLAN_COPY_FLAGS;
|
|
|
|
#undef VLAN_COPY_FLAGS
|
|
|
|
|
|
|
|
ifp->if_link_state = p->if_link_state;
|
1998-03-18 01:40:12 +00:00
|
|
|
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
vlan_capabilities(ifv);
|
2002-11-14 23:43:16 +00:00
|
|
|
|
1998-03-18 01:40:12 +00:00
|
|
|
/*
|
2011-03-21 09:40:01 +00:00
|
|
|
* Set up our interface address to reflect the underlying
|
1998-03-18 01:40:12 +00:00
|
|
|
* physical interface's.
|
|
|
|
*/
|
2011-03-21 09:40:01 +00:00
|
|
|
bcopy(IF_LLADDR(p), IF_LLADDR(ifp), p->if_addrlen);
|
|
|
|
((struct sockaddr_dl *)ifp->if_addr->ifa_addr)->sdl_alen =
|
|
|
|
p->if_addrlen;
|
2001-07-24 17:14:37 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Configure multicast addresses that may already be
|
|
|
|
* joined on the vlan device.
|
|
|
|
*/
|
2005-10-03 02:24:21 +00:00
|
|
|
(void)vlan_setmulti(ifp); /* XXX: VLAN lock held */
|
2006-08-15 16:40:27 +00:00
|
|
|
|
|
|
|
/* We are ready for operation now. */
|
|
|
|
ifp->if_drv_flags |= IFF_DRV_RUNNING;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
done:
|
|
|
|
TRUNK_UNLOCK(trunk);
|
2008-07-14 18:40:21 +00:00
|
|
|
if (error == 0)
|
2012-01-12 18:39:37 +00:00
|
|
|
EVENTHANDLER_INVOKE(vlan_config, p, ifv->ifv_vid);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
VLAN_UNLOCK();
|
|
|
|
|
|
|
|
return (error);
|
1998-03-18 01:40:12 +00:00
|
|
|
}
|
|
|
|
|
2010-05-17 19:36:56 +00:00
|
|
|
static void
|
1999-03-15 01:17:26 +00:00
|
|
|
vlan_unconfig(struct ifnet *ifp)
|
2006-06-21 07:29:44 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
VLAN_LOCK();
|
2012-08-20 16:00:33 +00:00
|
|
|
vlan_unconfig_locked(ifp, 0);
|
2006-06-21 07:29:44 +00:00
|
|
|
VLAN_UNLOCK();
|
|
|
|
}
|
|
|
|
|
2010-05-17 19:36:56 +00:00
|
|
|
static void
|
2012-08-20 16:00:33 +00:00
|
|
|
vlan_unconfig_locked(struct ifnet *ifp, int departing)
|
1999-03-15 01:17:26 +00:00
|
|
|
{
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
struct ifvlantrunk *trunk;
|
1999-03-15 01:17:26 +00:00
|
|
|
struct vlan_mc_entry *mc;
|
|
|
|
struct ifvlan *ifv;
|
2008-07-14 18:40:21 +00:00
|
|
|
struct ifnet *parent;
|
2012-08-20 16:00:33 +00:00
|
|
|
int error;
|
1999-03-15 01:17:26 +00:00
|
|
|
|
2006-06-21 07:29:44 +00:00
|
|
|
VLAN_LOCK_ASSERT();
|
2003-09-05 20:58:59 +00:00
|
|
|
|
1999-03-15 01:17:26 +00:00
|
|
|
ifv = ifp->if_softc;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
trunk = ifv->ifv_trunk;
|
2008-08-28 22:05:19 +00:00
|
|
|
parent = NULL;
|
1999-03-15 01:17:26 +00:00
|
|
|
|
2008-08-28 22:05:19 +00:00
|
|
|
if (trunk != NULL) {
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
|
|
|
|
TRUNK_LOCK(trunk);
|
2008-08-28 22:05:19 +00:00
|
|
|
parent = trunk->parent;
|
1999-03-15 01:17:26 +00:00
|
|
|
|
2001-07-24 17:14:37 +00:00
|
|
|
/*
|
|
|
|
* Since the interface is being unconfigured, we need to
|
|
|
|
* empty the list of multicast groups that we may have joined
|
|
|
|
* while we were alive from the parent's list.
|
|
|
|
*/
|
2007-03-12 12:27:30 +00:00
|
|
|
while ((mc = SLIST_FIRST(&ifv->vlan_mc_listhead)) != NULL) {
|
2010-05-17 19:36:56 +00:00
|
|
|
/*
|
2012-08-20 16:00:33 +00:00
|
|
|
* If the parent interface is being detached,
|
2012-08-21 19:07:28 +00:00
|
|
|
* all its multicast addresses have already
|
2012-08-20 16:00:33 +00:00
|
|
|
* been removed. Warn about errors if
|
|
|
|
* if_delmulti() does fail, but don't abort as
|
|
|
|
* all callers expect vlan destruction to
|
|
|
|
* succeed.
|
2010-05-17 19:36:56 +00:00
|
|
|
*/
|
2012-08-20 16:00:33 +00:00
|
|
|
if (!departing) {
|
|
|
|
error = if_delmulti(parent,
|
|
|
|
(struct sockaddr *)&mc->mc_addr);
|
|
|
|
if (error)
|
|
|
|
if_printf(ifp,
|
|
|
|
"Failed to delete multicast address from parent: %d\n",
|
|
|
|
error);
|
|
|
|
}
|
2001-07-24 17:14:37 +00:00
|
|
|
SLIST_REMOVE_HEAD(&ifv->vlan_mc_listhead, mc_entries);
|
2001-09-05 21:10:28 +00:00
|
|
|
free(mc, M_VLAN);
|
2001-07-24 17:14:37 +00:00
|
|
|
}
|
2002-11-14 23:43:16 +00:00
|
|
|
|
2005-10-03 02:24:21 +00:00
|
|
|
vlan_setflags(ifp, 0); /* clear special flags on parent */
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
vlan_remhash(trunk, ifv);
|
|
|
|
ifv->ifv_trunk = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if we were the last.
|
|
|
|
*/
|
|
|
|
if (trunk->refcnt == 0) {
|
2014-08-04 00:58:12 +00:00
|
|
|
parent->if_vlantrunk = NULL;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
/*
|
|
|
|
* XXXGL: If some ithread has already entered
|
|
|
|
* vlan_input() and is now blocked on the trunk
|
|
|
|
* lock, then it should preempt us right after
|
|
|
|
* unlock and finish its work. Then we will acquire
|
|
|
|
* lock again in trunk_destroy().
|
|
|
|
*/
|
|
|
|
TRUNK_UNLOCK(trunk);
|
|
|
|
trunk_destroy(trunk);
|
|
|
|
} else
|
|
|
|
TRUNK_UNLOCK(trunk);
|
1999-03-15 01:17:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Disconnect from parent. */
|
2005-10-03 02:24:21 +00:00
|
|
|
if (ifv->ifv_pflags)
|
|
|
|
if_printf(ifp, "%s: ifv_pflags unclean\n", __func__);
|
2006-06-21 07:29:44 +00:00
|
|
|
ifp->if_mtu = ETHERMTU;
|
|
|
|
ifp->if_link_state = LINK_STATE_UNKNOWN;
|
|
|
|
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
|
1999-03-15 01:17:26 +00:00
|
|
|
|
2008-08-28 22:05:19 +00:00
|
|
|
/*
|
|
|
|
* Only dispatch an event if vlan was
|
|
|
|
* attached, otherwise there is nothing
|
|
|
|
* to cleanup anyway.
|
|
|
|
*/
|
|
|
|
if (parent != NULL)
|
2012-01-12 18:39:37 +00:00
|
|
|
EVENTHANDLER_INVOKE(vlan_unconfig, parent, ifv->ifv_vid);
|
1999-03-15 01:17:26 +00:00
|
|
|
}
|
|
|
|
|
2005-10-03 02:24:21 +00:00
|
|
|
/* Handle a reference counted flag that should be set on the parent as well */
|
2002-11-14 23:43:16 +00:00
|
|
|
static int
|
2005-10-03 02:24:21 +00:00
|
|
|
vlan_setflag(struct ifnet *ifp, int flag, int status,
|
|
|
|
int (*func)(struct ifnet *, int))
|
2002-11-14 23:43:16 +00:00
|
|
|
{
|
2005-10-03 02:24:21 +00:00
|
|
|
struct ifvlan *ifv;
|
|
|
|
int error;
|
2002-11-14 23:43:16 +00:00
|
|
|
|
2005-10-03 02:24:21 +00:00
|
|
|
/* XXX VLAN_LOCK_ASSERT(); */
|
|
|
|
|
|
|
|
ifv = ifp->if_softc;
|
|
|
|
status = status ? (ifp->if_flags & flag) : 0;
|
|
|
|
/* Now "status" contains the flag value or 0 */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* See if recorded parent's status is different from what
|
|
|
|
* we want it to be. If it is, flip it. We record parent's
|
|
|
|
* status in ifv_pflags so that we won't clear parent's flag
|
|
|
|
* we haven't set. In fact, we don't clear or set parent's
|
|
|
|
* flags directly, but get or release references to them.
|
|
|
|
* That's why we can be sure that recorded flags still are
|
|
|
|
* in accord with actual parent's flags.
|
|
|
|
*/
|
|
|
|
if (status != (ifv->ifv_pflags & flag)) {
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
error = (*func)(PARENT(ifv), status);
|
2005-10-03 02:24:21 +00:00
|
|
|
if (error)
|
|
|
|
return (error);
|
|
|
|
ifv->ifv_pflags &= ~flag;
|
|
|
|
ifv->ifv_pflags |= status;
|
2002-11-14 23:43:16 +00:00
|
|
|
}
|
2005-10-03 02:24:21 +00:00
|
|
|
return (0);
|
|
|
|
}
|
2002-11-14 23:43:16 +00:00
|
|
|
|
2005-10-03 02:24:21 +00:00
|
|
|
/*
|
|
|
|
* Handle IFF_* flags that require certain changes on the parent:
|
|
|
|
* if "status" is true, update parent's flags respective to our if_flags;
|
|
|
|
* if "status" is false, forcedly clear the flags set on parent.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
vlan_setflags(struct ifnet *ifp, int status)
|
|
|
|
{
|
|
|
|
int error, i;
|
|
|
|
|
|
|
|
for (i = 0; vlan_pflags[i].flag; i++) {
|
|
|
|
error = vlan_setflag(ifp, vlan_pflags[i].flag,
|
|
|
|
status, vlan_pflags[i].func);
|
|
|
|
if (error)
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
return (0);
|
2002-11-14 23:43:16 +00:00
|
|
|
}
|
|
|
|
|
2004-05-03 13:48:35 +00:00
|
|
|
/* Inform all vlans that their parent has changed link state */
|
|
|
|
static void
|
2009-12-31 20:29:58 +00:00
|
|
|
vlan_link_state(struct ifnet *ifp)
|
2004-05-03 13:48:35 +00:00
|
|
|
{
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
struct ifvlantrunk *trunk = ifp->if_vlantrunk;
|
2004-05-03 13:48:35 +00:00
|
|
|
struct ifvlan *ifv;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
TRUNK_LOCK(trunk);
|
|
|
|
#ifdef VLAN_ARRAY
|
2006-06-21 13:48:34 +00:00
|
|
|
for (i = 0; i < VLAN_ARRAY_SIZE; i++)
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (trunk->vlans[i] != NULL) {
|
|
|
|
ifv = trunk->vlans[i];
|
|
|
|
#else
|
2006-10-11 10:06:35 +00:00
|
|
|
for (i = 0; i < (1 << trunk->hwidth); i++)
|
|
|
|
LIST_FOREACH(ifv, &trunk->hash[i], ifv_list) {
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
#endif
|
2006-10-11 10:06:35 +00:00
|
|
|
ifv->ifv_ifp->if_baudrate = trunk->parent->if_baudrate;
|
2005-06-10 16:49:24 +00:00
|
|
|
if_link_state_change(ifv->ifv_ifp,
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
trunk->parent->if_link_state);
|
2006-10-11 10:06:35 +00:00
|
|
|
}
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
TRUNK_UNLOCK(trunk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
vlan_capabilities(struct ifvlan *ifv)
|
|
|
|
{
|
|
|
|
struct ifnet *p = PARENT(ifv);
|
|
|
|
struct ifnet *ifp = ifv->ifv_ifp;
|
2014-09-22 08:27:27 +00:00
|
|
|
struct ifnet_hw_tsomax hw_tsomax;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
|
|
|
|
TRUNK_LOCK_ASSERT(TRUNK(ifv));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the parent interface can do checksum offloading
|
|
|
|
* on VLANs, then propagate its hardware-assisted
|
|
|
|
* checksumming flags. Also assert that checksum
|
|
|
|
* offloading requires hardware VLAN tagging.
|
|
|
|
*/
|
|
|
|
if (p->if_capabilities & IFCAP_VLAN_HWCSUM)
|
|
|
|
ifp->if_capabilities = p->if_capabilities & IFCAP_HWCSUM;
|
|
|
|
|
|
|
|
if (p->if_capenable & IFCAP_VLAN_HWCSUM &&
|
|
|
|
p->if_capenable & IFCAP_VLAN_HWTAGGING) {
|
|
|
|
ifp->if_capenable = p->if_capenable & IFCAP_HWCSUM;
|
2010-02-20 22:47:20 +00:00
|
|
|
ifp->if_hwassist = p->if_hwassist & (CSUM_IP | CSUM_TCP |
|
2014-09-03 08:30:18 +00:00
|
|
|
CSUM_UDP | CSUM_SCTP);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
} else {
|
|
|
|
ifp->if_capenable = 0;
|
|
|
|
ifp->if_hwassist = 0;
|
2004-05-03 13:48:35 +00:00
|
|
|
}
|
2010-02-20 22:47:20 +00:00
|
|
|
/*
|
|
|
|
* If the parent interface can do TSO on VLANs then
|
|
|
|
* propagate the hardware-assisted flag. TSO on VLANs
|
|
|
|
* does not necessarily require hardware VLAN tagging.
|
|
|
|
*/
|
2014-09-22 08:27:27 +00:00
|
|
|
memset(&hw_tsomax, 0, sizeof(hw_tsomax));
|
|
|
|
if_hw_tsomax_common(p, &hw_tsomax);
|
|
|
|
if_hw_tsomax_update(ifp, &hw_tsomax);
|
2010-02-20 22:47:20 +00:00
|
|
|
if (p->if_capabilities & IFCAP_VLAN_HWTSO)
|
|
|
|
ifp->if_capabilities |= p->if_capabilities & IFCAP_TSO;
|
|
|
|
if (p->if_capenable & IFCAP_VLAN_HWTSO) {
|
|
|
|
ifp->if_capenable |= p->if_capenable & IFCAP_TSO;
|
|
|
|
ifp->if_hwassist |= p->if_hwassist & CSUM_TSO;
|
|
|
|
} else {
|
|
|
|
ifp->if_capenable &= ~(p->if_capenable & IFCAP_TSO);
|
|
|
|
ifp->if_hwassist &= ~(p->if_hwassist & CSUM_TSO);
|
|
|
|
}
|
2012-06-19 07:34:13 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the parent interface can offload TCP connections over VLANs then
|
|
|
|
* propagate its TOE capability to the VLAN interface.
|
|
|
|
*
|
|
|
|
* All TOE drivers in the tree today can deal with VLANs. If this
|
|
|
|
* changes then IFCAP_VLAN_TOE should be promoted to a full capability
|
|
|
|
* with its own bit.
|
|
|
|
*/
|
|
|
|
#define IFCAP_VLAN_TOE IFCAP_TOE
|
|
|
|
if (p->if_capabilities & IFCAP_VLAN_TOE)
|
|
|
|
ifp->if_capabilities |= p->if_capabilities & IFCAP_TOE;
|
|
|
|
if (p->if_capenable & IFCAP_VLAN_TOE) {
|
|
|
|
TOEDEV(ifp) = TOEDEV(p);
|
|
|
|
ifp->if_capenable |= p->if_capenable & IFCAP_TOE;
|
|
|
|
}
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
vlan_trunk_capabilities(struct ifnet *ifp)
|
|
|
|
{
|
|
|
|
struct ifvlantrunk *trunk = ifp->if_vlantrunk;
|
|
|
|
struct ifvlan *ifv;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
TRUNK_LOCK(trunk);
|
|
|
|
#ifdef VLAN_ARRAY
|
2006-06-21 13:48:34 +00:00
|
|
|
for (i = 0; i < VLAN_ARRAY_SIZE; i++)
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (trunk->vlans[i] != NULL) {
|
|
|
|
ifv = trunk->vlans[i];
|
|
|
|
#else
|
|
|
|
for (i = 0; i < (1 << trunk->hwidth); i++) {
|
|
|
|
LIST_FOREACH(ifv, &trunk->hash[i], ifv_list)
|
|
|
|
#endif
|
|
|
|
vlan_capabilities(ifv);
|
|
|
|
}
|
|
|
|
TRUNK_UNLOCK(trunk);
|
2004-05-03 13:48:35 +00:00
|
|
|
}
|
|
|
|
|
1998-03-18 01:40:12 +00:00
|
|
|
static int
|
1998-08-23 03:07:17 +00:00
|
|
|
vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
|
1998-03-18 01:40:12 +00:00
|
|
|
{
|
|
|
|
struct ifnet *p;
|
|
|
|
struct ifreq *ifr;
|
2011-03-21 09:40:01 +00:00
|
|
|
struct ifaddr *ifa;
|
1998-03-18 01:40:12 +00:00
|
|
|
struct ifvlan *ifv;
|
2014-08-04 00:58:12 +00:00
|
|
|
struct ifvlantrunk *trunk;
|
1998-03-18 01:40:12 +00:00
|
|
|
struct vlanreq vlr;
|
|
|
|
int error = 0;
|
|
|
|
|
|
|
|
ifr = (struct ifreq *)data;
|
2011-03-21 09:40:01 +00:00
|
|
|
ifa = (struct ifaddr *) data;
|
1998-03-18 01:40:12 +00:00
|
|
|
ifv = ifp->if_softc;
|
|
|
|
|
|
|
|
switch (cmd) {
|
2011-03-21 09:40:01 +00:00
|
|
|
case SIOCSIFADDR:
|
|
|
|
ifp->if_flags |= IFF_UP;
|
|
|
|
#ifdef INET
|
|
|
|
if (ifa->ifa_addr->sa_family == AF_INET)
|
|
|
|
arp_ifinit(ifp, ifa);
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case SIOCGIFADDR:
|
|
|
|
{
|
|
|
|
struct sockaddr *sa;
|
|
|
|
|
|
|
|
sa = (struct sockaddr *)&ifr->ifr_data;
|
|
|
|
bcopy(IF_LLADDR(ifp), sa->sa_data, ifp->if_addrlen);
|
|
|
|
}
|
|
|
|
break;
|
2003-01-22 23:30:26 +00:00
|
|
|
case SIOCGIFMEDIA:
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_LOCK();
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (TRUNK(ifv) != NULL) {
|
2010-03-21 15:00:33 +00:00
|
|
|
p = PARENT(ifv);
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_UNLOCK();
|
2010-03-21 15:00:33 +00:00
|
|
|
error = (*p->if_ioctl)(p, SIOCGIFMEDIA, data);
|
2003-01-22 23:30:26 +00:00
|
|
|
/* Limit the result to the parent's current config. */
|
|
|
|
if (error == 0) {
|
|
|
|
struct ifmediareq *ifmr;
|
|
|
|
|
2004-07-04 16:43:24 +00:00
|
|
|
ifmr = (struct ifmediareq *)data;
|
2003-01-22 23:30:26 +00:00
|
|
|
if (ifmr->ifm_count >= 1 && ifmr->ifm_ulist) {
|
|
|
|
ifmr->ifm_count = 1;
|
|
|
|
error = copyout(&ifmr->ifm_current,
|
2004-07-04 16:43:24 +00:00
|
|
|
ifmr->ifm_ulist,
|
2003-01-22 23:30:26 +00:00
|
|
|
sizeof(int));
|
|
|
|
}
|
|
|
|
}
|
2003-09-05 20:58:59 +00:00
|
|
|
} else {
|
|
|
|
VLAN_UNLOCK();
|
2003-01-22 23:30:26 +00:00
|
|
|
error = EINVAL;
|
2003-09-05 20:58:59 +00:00
|
|
|
}
|
2003-01-22 23:30:26 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SIOCSIFMEDIA:
|
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
|
1998-03-18 01:40:12 +00:00
|
|
|
case SIOCSIFMTU:
|
|
|
|
/*
|
|
|
|
* Set the interface MTU.
|
|
|
|
*/
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_LOCK();
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (TRUNK(ifv) != NULL) {
|
2002-11-14 23:43:16 +00:00
|
|
|
if (ifr->ifr_mtu >
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
(PARENT(ifv)->if_mtu - ifv->ifv_mtufudge) ||
|
2002-11-14 23:43:16 +00:00
|
|
|
ifr->ifr_mtu <
|
|
|
|
(ifv->ifv_mintu - ifv->ifv_mtufudge))
|
|
|
|
error = EINVAL;
|
|
|
|
else
|
|
|
|
ifp->if_mtu = ifr->ifr_mtu;
|
|
|
|
} else
|
1998-03-18 01:40:12 +00:00
|
|
|
error = EINVAL;
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_UNLOCK();
|
1998-03-18 01:40:12 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SIOCSETVLAN:
|
2010-11-22 23:35:29 +00:00
|
|
|
#ifdef VIMAGE
|
2012-01-05 11:24:22 +00:00
|
|
|
/*
|
|
|
|
* XXXRW/XXXBZ: The goal in these checks is to allow a VLAN
|
|
|
|
* interface to be delegated to a jail without allowing the
|
|
|
|
* jail to change what underlying interface/VID it is
|
|
|
|
* associated with. We are not entirely convinced that this
|
2012-01-05 11:42:34 +00:00
|
|
|
* is the right way to accomplish that policy goal.
|
2012-01-05 11:24:22 +00:00
|
|
|
*/
|
2010-11-22 23:35:29 +00:00
|
|
|
if (ifp->if_vnet != ifp->if_home_vnet) {
|
|
|
|
error = EPERM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2004-07-04 16:43:24 +00:00
|
|
|
error = copyin(ifr->ifr_data, &vlr, sizeof(vlr));
|
1998-03-18 01:40:12 +00:00
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
if (vlr.vlr_parent[0] == '\0') {
|
1999-03-15 01:17:26 +00:00
|
|
|
vlan_unconfig(ifp);
|
1998-03-18 01:40:12 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
p = ifunit(vlr.vlr_parent);
|
2009-09-09 03:36:43 +00:00
|
|
|
if (p == NULL) {
|
1998-03-18 01:40:12 +00:00
|
|
|
error = ENOENT;
|
|
|
|
break;
|
|
|
|
}
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
error = vlan_config(ifv, p, vlr.vlr_tag);
|
|
|
|
if (error)
|
1998-03-18 01:40:12 +00:00
|
|
|
break;
|
2002-11-14 23:43:16 +00:00
|
|
|
|
2005-10-03 02:24:21 +00:00
|
|
|
/* Update flags on the parent, if necessary. */
|
|
|
|
vlan_setflags(ifp, 1);
|
1998-03-18 01:40:12 +00:00
|
|
|
break;
|
2004-07-04 16:43:24 +00:00
|
|
|
|
1998-03-18 01:40:12 +00:00
|
|
|
case SIOCGETVLAN:
|
2010-11-22 23:35:29 +00:00
|
|
|
#ifdef VIMAGE
|
|
|
|
if (ifp->if_vnet != ifp->if_home_vnet) {
|
|
|
|
error = EPERM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2004-07-04 16:43:24 +00:00
|
|
|
bzero(&vlr, sizeof(vlr));
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_LOCK();
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (TRUNK(ifv) != NULL) {
|
|
|
|
strlcpy(vlr.vlr_parent, PARENT(ifv)->if_xname,
|
2003-10-31 18:32:15 +00:00
|
|
|
sizeof(vlr.vlr_parent));
|
2012-01-12 18:39:37 +00:00
|
|
|
vlr.vlr_tag = ifv->ifv_vid;
|
1998-03-18 01:40:12 +00:00
|
|
|
}
|
2003-09-05 20:58:59 +00:00
|
|
|
VLAN_UNLOCK();
|
2004-07-04 16:43:24 +00:00
|
|
|
error = copyout(&vlr, ifr->ifr_data, sizeof(vlr));
|
1998-03-18 01:40:12 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SIOCSIFFLAGS:
|
|
|
|
/*
|
2005-10-03 02:24:21 +00:00
|
|
|
* We should propagate selected flags to the parent,
|
|
|
|
* e.g., promiscuous mode.
|
1998-03-18 01:40:12 +00:00
|
|
|
*/
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
if (TRUNK(ifv) != NULL)
|
2005-10-03 02:24:21 +00:00
|
|
|
error = vlan_setflags(ifp, 1);
|
1998-03-18 01:40:12 +00:00
|
|
|
break;
|
2002-11-14 23:43:16 +00:00
|
|
|
|
1999-03-15 01:17:26 +00:00
|
|
|
case SIOCADDMULTI:
|
|
|
|
case SIOCDELMULTI:
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
/*
|
|
|
|
* If we don't have a parent, just remember the membership for
|
|
|
|
* when we do.
|
|
|
|
*/
|
2014-08-04 00:58:12 +00:00
|
|
|
trunk = TRUNK(ifv);
|
|
|
|
if (trunk != NULL) {
|
|
|
|
TRUNK_LOCK(trunk);
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
error = vlan_setmulti(ifp);
|
2014-08-04 00:58:12 +00:00
|
|
|
TRUNK_UNLOCK(trunk);
|
|
|
|
}
|
1999-03-15 01:17:26 +00:00
|
|
|
break;
|
Merge the //depot/user/yar/vlan branch into CVS. It contains some collective
work by yar, thompsa and myself. The checksum offloading part also involves
work done by Mihail Balikov.
The most important changes:
o Instead of global linked list of all vlan softc use a per-trunk
hash. The size of hash is dynamically adjusted, depending on
number of entries. This changes struct ifnet, replacing counter
of vlans with a pointer to trunk structure. This change is an
improvement for setups with big number of VLANs, several interfaces
and several CPUs. It is a small regression for a setup with a single
VLAN interface.
An alternative to dynamic hash is a per-trunk static array with
4096 entries, which is a compile time option - VLAN_ARRAY. In my
experiments the array is not an improvement, probably because such
a big trunk structure doesn't fit into CPU cache.
o Introduce an UMA zone for VLAN tags. Since drivers depend on it,
the zone is declared in kern_mbuf.c, not in optional vlan(4) driver.
This change is a big improvement for any setup utilizing vlan(4).
o Use rwlock(9) instead of mutex(9) for locking. We are the first
ones to do this! :)
o Some drivers can do hardware VLAN tagging + hardware checksum
offloading. Add an infrastructure for this. Whenever vlan(4) is
attached to a parent or parent configuration is changed, the flags
on vlan(4) interface are updated.
In collaboration with: yar, thompsa
In collaboration with: Mihail Balikov <mihail.balikov interbgc.com>
2006-01-30 13:45:15 +00:00
|
|
|
|
2015-02-20 18:39:12 +00:00
|
|
|
case SIOCSIFCAP:
|
|
|
|
VLAN_LOCK();
|
|
|
|
if (TRUNK(ifv) != NULL) {
|
|
|
|
p = PARENT(ifv);
|
|
|
|
VLAN_UNLOCK();
|
|
|
|
if ((p->if_type != IFT_ETHER) &&
|
|
|
|
(ifr->ifr_reqcap & IFCAP_VLAN_HWTAGGING) == 0) {
|
|
|
|
error = EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
error = (*p->if_ioctl)(p, cmd, data);
|
|
|
|
if (error)
|
|
|
|
break;
|
|
|
|
/* Propogate vlan interface capabilities */
|
|
|
|
vlan_trunk_capabilities(p);
|
|
|
|
} else {
|
|
|
|
VLAN_UNLOCK();
|
|
|
|
error = EINVAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-03-18 01:40:12 +00:00
|
|
|
default:
|
2011-03-21 09:40:01 +00:00
|
|
|
error = EINVAL;
|
|
|
|
break;
|
1998-03-18 01:40:12 +00:00
|
|
|
}
|
2004-07-04 16:43:24 +00:00
|
|
|
|
|
|
|
return (error);
|
1998-03-18 01:40:12 +00:00
|
|
|
}
|