diff options
author | glebius <glebius@FreeBSD.org> | 2006-01-30 13:45:15 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2006-01-30 13:45:15 +0000 |
commit | 19f8b36e662bea1b79c01dab7717540417040328 (patch) | |
tree | 411b1579c38fee9f7f11cf8181e2190d0215dd36 /sys/conf/options | |
parent | a388ebb962934fe140e9559cc12ca537afae2187 (diff) | |
download | FreeBSD-src-19f8b36e662bea1b79c01dab7717540417040328.zip FreeBSD-src-19f8b36e662bea1b79c01dab7717540417040328.tar.gz |
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>
Diffstat (limited to 'sys/conf/options')
-rw-r--r-- | sys/conf/options | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/conf/options b/sys/conf/options index 494256f..d5c9df6 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -385,6 +385,8 @@ TCPDEBUG TCP_SIGNATURE opt_inet.h TCP_SACK_DEBUG opt_tcp_sack.h TCP_DROP_SYNFIN opt_tcp_input.h +DEV_VLAN opt_vlan.h +VLAN_ARRAY opt_vlan.h XBONEHACK # Netgraph(4). Use option NETGRAPH to enable the base netgraph code. |