2019-05-27 00:55:01 -06:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Forwarding database
|
|
|
|
* Linux ethernet bridge
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Lennert Buytenhek <buytenh@gnu.org>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/init.h>
|
2008-05-12 13:21:05 -06:00
|
|
|
#include <linux/rculist.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/times.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/jhash.h>
|
2007-03-21 14:42:33 -06:00
|
|
|
#include <linux/random.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2011-07-26 17:09:06 -06:00
|
|
|
#include <linux/atomic.h>
|
2007-03-21 14:42:33 -06:00
|
|
|
#include <asm/unaligned.h>
|
2013-02-13 05:00:16 -07:00
|
|
|
#include <linux/if_vlan.h>
|
2015-06-14 12:33:11 -06:00
|
|
|
#include <net/switchdev.h>
|
2017-08-29 14:16:57 -06:00
|
|
|
#include <trace/events/bridge.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include "br_private.h"
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
static const struct rhashtable_params br_fdb_rht_params = {
|
|
|
|
.head_offset = offsetof(struct net_bridge_fdb_entry, rhnode),
|
|
|
|
.key_offset = offsetof(struct net_bridge_fdb_entry, key),
|
|
|
|
.key_len = sizeof(struct net_bridge_fdb_key),
|
|
|
|
.automatic_shrinking = true,
|
|
|
|
};
|
|
|
|
|
2006-12-06 21:33:20 -07:00
|
|
|
static struct kmem_cache *br_fdb_cache __read_mostly;
|
2005-04-16 16:20:36 -06:00
|
|
|
static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
2013-02-13 05:00:19 -07:00
|
|
|
const unsigned char *addr, u16 vid);
|
2011-12-08 00:17:41 -07:00
|
|
|
static void fdb_notify(struct net_bridge *br,
|
2018-05-03 06:43:53 -06:00
|
|
|
const struct net_bridge_fdb_entry *, int, bool);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-04-07 03:57:07 -06:00
|
|
|
int __init br_fdb_init(void)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
br_fdb_cache = kmem_cache_create("bridge_fdb_cache",
|
|
|
|
sizeof(struct net_bridge_fdb_entry),
|
|
|
|
0,
|
2007-07-19 19:11:58 -06:00
|
|
|
SLAB_HWCACHE_ALIGN, NULL);
|
2007-04-07 03:57:07 -06:00
|
|
|
if (!br_fdb_cache)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2007-12-05 22:35:23 -07:00
|
|
|
void br_fdb_fini(void)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
kmem_cache_destroy(br_fdb_cache);
|
|
|
|
}
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
int br_fdb_hash_init(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return rhashtable_init(&br->fdb_hash_tbl, &br_fdb_rht_params);
|
|
|
|
}
|
|
|
|
|
|
|
|
void br_fdb_hash_fini(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
rhashtable_destroy(&br->fdb_hash_tbl);
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* if topology_changing then use forward_delay (default 15 sec)
|
|
|
|
* otherwise keep longer (default 5 minutes)
|
|
|
|
*/
|
2007-03-21 14:42:33 -06:00
|
|
|
static inline unsigned long hold_time(const struct net_bridge *br)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
return br->topology_change ? br->forward_delay : br->ageing_time;
|
|
|
|
}
|
|
|
|
|
2007-03-21 14:42:33 -06:00
|
|
|
static inline int has_expired(const struct net_bridge *br,
|
2005-04-16 16:20:36 -06:00
|
|
|
const struct net_bridge_fdb_entry *fdb)
|
|
|
|
{
|
2019-10-29 05:45:54 -06:00
|
|
|
return !test_bit(BR_FDB_STATIC, &fdb->flags) &&
|
2019-10-29 05:45:57 -06:00
|
|
|
!test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags) &&
|
2019-10-29 05:45:54 -06:00
|
|
|
time_before_eq(fdb->updated + hold_time(br), jiffies);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2009-06-04 23:35:28 -06:00
|
|
|
static void fdb_rcu_free(struct rcu_head *head)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *ent
|
|
|
|
= container_of(head, struct net_bridge_fdb_entry, rcu);
|
|
|
|
kmem_cache_free(br_fdb_cache, ent);
|
|
|
|
}
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
static struct net_bridge_fdb_entry *fdb_find_rcu(struct rhashtable *tbl,
|
2017-02-13 06:59:09 -07:00
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
|
|
|
{
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_key key;
|
2017-02-13 06:59:09 -07:00
|
|
|
|
2017-02-13 06:59:10 -07:00
|
|
|
WARN_ON_ONCE(!rcu_read_lock_held());
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
key.vlan_id = vid;
|
|
|
|
memcpy(key.addr.addr, addr, sizeof(key.addr.addr));
|
2017-02-13 06:59:09 -07:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
return rhashtable_lookup(tbl, &key, br_fdb_rht_params);
|
2017-02-13 06:59:09 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* requires bridge hash_lock */
|
|
|
|
static struct net_bridge_fdb_entry *br_fdb_find(struct net_bridge *br,
|
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
2017-03-16 11:32:42 -06:00
|
|
|
lockdep_assert_held_once(&br->hash_lock);
|
2017-02-13 06:59:10 -07:00
|
|
|
|
2017-02-13 06:59:09 -07:00
|
|
|
rcu_read_lock();
|
2017-12-12 07:02:50 -07:00
|
|
|
fdb = fdb_find_rcu(&br->fdb_hash_tbl, addr, vid);
|
2017-02-13 06:59:09 -07:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return fdb;
|
|
|
|
}
|
|
|
|
|
2018-04-29 01:56:08 -06:00
|
|
|
struct net_device *br_fdb_find_port(const struct net_device *br_dev,
|
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
struct net_device *dev = NULL;
|
|
|
|
struct net_bridge *br;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
if (!netif_is_bridge_master(br_dev))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
br = netdev_priv(br_dev);
|
2018-06-08 07:11:47 -06:00
|
|
|
rcu_read_lock();
|
|
|
|
f = br_fdb_find_rcu(br, addr, vid);
|
2018-04-29 01:56:08 -06:00
|
|
|
if (f && f->dst)
|
|
|
|
dev = f->dst->dev;
|
2018-06-08 07:11:47 -06:00
|
|
|
rcu_read_unlock();
|
2018-04-29 01:56:08 -06:00
|
|
|
|
|
|
|
return dev;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(br_fdb_find_port);
|
|
|
|
|
2017-02-13 06:59:09 -07:00
|
|
|
struct net_bridge_fdb_entry *br_fdb_find_rcu(struct net_bridge *br,
|
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
|
|
|
{
|
2017-12-12 07:02:50 -07:00
|
|
|
return fdb_find_rcu(&br->fdb_hash_tbl, addr, vid);
|
2017-02-13 06:59:09 -07:00
|
|
|
}
|
|
|
|
|
2014-05-16 07:59:19 -06:00
|
|
|
/* When a static FDB entry is added, the mac address from the entry is
|
|
|
|
* added to the bridge private HW address list and all required ports
|
|
|
|
* are then updated with the new information.
|
|
|
|
* Called under RTNL.
|
|
|
|
*/
|
2014-11-28 06:34:12 -07:00
|
|
|
static void fdb_add_hw_addr(struct net_bridge *br, const unsigned char *addr)
|
2014-05-16 07:59:19 -06:00
|
|
|
{
|
|
|
|
int err;
|
2014-06-18 02:07:16 -06:00
|
|
|
struct net_bridge_port *p;
|
2014-05-16 07:59:19 -06:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
list_for_each_entry(p, &br->port_list, list) {
|
|
|
|
if (!br_promisc_port(p)) {
|
|
|
|
err = dev_uc_add(p->dev, addr);
|
|
|
|
if (err)
|
|
|
|
goto undo;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
undo:
|
2014-06-18 02:07:16 -06:00
|
|
|
list_for_each_entry_continue_reverse(p, &br->port_list, list) {
|
|
|
|
if (!br_promisc_port(p))
|
|
|
|
dev_uc_del(p->dev, addr);
|
2014-05-16 07:59:19 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* When a static FDB entry is deleted, the HW address from that entry is
|
|
|
|
* also removed from the bridge private HW address list and updates all
|
|
|
|
* the ports with needed information.
|
|
|
|
* Called under RTNL.
|
|
|
|
*/
|
2014-11-28 06:34:12 -07:00
|
|
|
static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
|
2014-05-16 07:59:19 -06:00
|
|
|
{
|
|
|
|
struct net_bridge_port *p;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
list_for_each_entry(p, &br->port_list, list) {
|
|
|
|
if (!br_promisc_port(p))
|
|
|
|
dev_uc_del(p->dev, addr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-03 06:43:53 -06:00
|
|
|
static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f,
|
|
|
|
bool swdev_notify)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2017-08-29 14:16:57 -06:00
|
|
|
trace_fdb_delete(br, f);
|
|
|
|
|
2019-10-29 05:45:54 -06:00
|
|
|
if (test_bit(BR_FDB_STATIC, &f->flags))
|
2017-12-12 07:02:50 -07:00
|
|
|
fdb_del_hw_addr(br, f->key.addr.addr);
|
2014-05-16 07:59:19 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
hlist_del_init_rcu(&f->fdb_node);
|
|
|
|
rhashtable_remove_fast(&br->fdb_hash_tbl, &f->rhnode,
|
|
|
|
br_fdb_rht_params);
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_notify(br, f, RTM_DELNEIGH, swdev_notify);
|
2009-06-04 23:35:28 -06:00
|
|
|
call_rcu(&f->rcu, fdb_rcu_free);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2014-02-07 00:48:23 -07:00
|
|
|
/* Delete a local entry if no other port had the same address. */
|
|
|
|
static void fdb_delete_local(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
struct net_bridge_fdb_entry *f)
|
|
|
|
{
|
2017-12-12 07:02:50 -07:00
|
|
|
const unsigned char *addr = f->key.addr.addr;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan_group *vg;
|
|
|
|
const struct net_bridge_vlan *v;
|
2014-02-07 00:48:23 -07:00
|
|
|
struct net_bridge_port *op;
|
2017-12-12 07:02:50 -07:00
|
|
|
u16 vid = f->key.vlan_id;
|
2014-02-07 00:48:23 -07:00
|
|
|
|
|
|
|
/* Maybe another port has same hw addr? */
|
|
|
|
list_for_each_entry(op, &br->port_list, list) {
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
vg = nbp_vlan_group(op);
|
2014-02-07 00:48:23 -07:00
|
|
|
if (op != p && ether_addr_equal(op->dev->dev_addr, addr) &&
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
(!vid || br_vlan_find(vg, vid))) {
|
2014-02-07 00:48:23 -07:00
|
|
|
f->dst = op;
|
2019-10-29 05:45:56 -06:00
|
|
|
clear_bit(BR_FDB_ADDED_BY_USER, &f->flags);
|
2014-02-07 00:48:23 -07:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
vg = br_vlan_group(br);
|
|
|
|
v = br_vlan_find(vg, vid);
|
2014-02-07 00:48:23 -07:00
|
|
|
/* Maybe bridge device has same hw addr? */
|
|
|
|
if (p && ether_addr_equal(br->dev->dev_addr, addr) &&
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
(!vid || (v && br_vlan_should_use(v)))) {
|
2014-02-07 00:48:23 -07:00
|
|
|
f->dst = NULL;
|
2019-10-29 05:45:56 -06:00
|
|
|
clear_bit(BR_FDB_ADDED_BY_USER, &f->flags);
|
2014-02-07 00:48:23 -07:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_delete(br, f, true);
|
2014-02-07 00:48:23 -07:00
|
|
|
}
|
|
|
|
|
2014-02-07 00:48:25 -07:00
|
|
|
void br_fdb_find_delete_local(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 vid)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
2017-02-13 06:59:09 -07:00
|
|
|
f = br_fdb_find(br, addr, vid);
|
2019-10-29 05:45:53 -06:00
|
|
|
if (f && test_bit(BR_FDB_LOCAL, &f->flags) &&
|
2019-10-29 05:45:56 -06:00
|
|
|
!test_bit(BR_FDB_ADDED_BY_USER, &f->flags) && f->dst == p)
|
2014-02-07 00:48:25 -07:00
|
|
|
fdb_delete_local(br, p, f);
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr)
|
|
|
|
{
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan_group *vg;
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_entry *f;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct net_bridge *br = p->br;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan *v;
|
2007-02-09 07:24:35 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
vg = nbp_vlan_group(p);
|
2017-12-12 07:02:50 -07:00
|
|
|
hlist_for_each_entry(f, &br->fdb_list, fdb_node) {
|
2019-10-29 05:45:53 -06:00
|
|
|
if (f->dst == p && test_bit(BR_FDB_LOCAL, &f->flags) &&
|
2019-10-29 05:45:56 -06:00
|
|
|
!test_bit(BR_FDB_ADDED_BY_USER, &f->flags)) {
|
2017-12-12 07:02:50 -07:00
|
|
|
/* delete old one */
|
|
|
|
fdb_delete_local(br, p, f);
|
|
|
|
|
|
|
|
/* if this port has no vlan information
|
|
|
|
* configured, we can safely be done at
|
|
|
|
* this point.
|
|
|
|
*/
|
|
|
|
if (!vg || !vg->num_vlans)
|
|
|
|
goto insert;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-07 00:48:19 -07:00
|
|
|
insert:
|
|
|
|
/* insert new address, may fail if invalid address or dup. */
|
|
|
|
fdb_insert(br, p, newaddr, 0);
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
if (!vg || !vg->num_vlans)
|
2014-02-07 00:48:19 -07:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
/* Now add entries for every VLAN configured on the port.
|
|
|
|
* This function runs under RTNL so the bitmap will not change
|
|
|
|
* from under us.
|
|
|
|
*/
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
list_for_each_entry(v, &vg->vlan_list, vlist)
|
|
|
|
fdb_insert(br, p, newaddr, v->vid);
|
2014-02-07 00:48:19 -07:00
|
|
|
|
2013-02-13 05:00:19 -07:00
|
|
|
done:
|
2005-04-16 16:20:36 -06:00
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
|
|
|
|
2011-12-08 00:17:49 -07:00
|
|
|
void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr)
|
|
|
|
{
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan_group *vg;
|
2011-12-08 00:17:49 -07:00
|
|
|
struct net_bridge_fdb_entry *f;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan *v;
|
2011-12-08 00:17:49 -07:00
|
|
|
|
2014-02-07 00:48:26 -07:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
2011-12-08 00:17:49 -07:00
|
|
|
/* If old entry was unassociated with any port, then delete it. */
|
2017-02-13 06:59:09 -07:00
|
|
|
f = br_fdb_find(br, br->dev->dev_addr, 0);
|
2019-10-29 05:45:53 -06:00
|
|
|
if (f && test_bit(BR_FDB_LOCAL, &f->flags) &&
|
2019-10-29 05:45:56 -06:00
|
|
|
!f->dst && !test_bit(BR_FDB_ADDED_BY_USER, &f->flags))
|
2014-02-07 00:48:23 -07:00
|
|
|
fdb_delete_local(br, NULL, f);
|
2011-12-08 00:17:49 -07:00
|
|
|
|
2013-02-13 05:00:19 -07:00
|
|
|
fdb_insert(br, NULL, newaddr, 0);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
vg = br_vlan_group(br);
|
|
|
|
if (!vg || !vg->num_vlans)
|
|
|
|
goto out;
|
2013-02-13 05:00:19 -07:00
|
|
|
/* Now remove and add entries for every VLAN configured on the
|
|
|
|
* bridge. This function runs under RTNL so the bitmap will not
|
|
|
|
* change from under us.
|
|
|
|
*/
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
list_for_each_entry(v, &vg->vlan_list, vlist) {
|
2016-06-07 04:14:17 -06:00
|
|
|
if (!br_vlan_should_use(v))
|
|
|
|
continue;
|
2017-02-13 06:59:09 -07:00
|
|
|
f = br_fdb_find(br, br->dev->dev_addr, v->vid);
|
2019-10-29 05:45:53 -06:00
|
|
|
if (f && test_bit(BR_FDB_LOCAL, &f->flags) &&
|
2019-10-29 05:45:56 -06:00
|
|
|
!f->dst && !test_bit(BR_FDB_ADDED_BY_USER, &f->flags))
|
2014-02-07 00:48:23 -07:00
|
|
|
fdb_delete_local(br, NULL, f);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
fdb_insert(br, NULL, newaddr, v->vid);
|
2013-02-13 05:00:19 -07:00
|
|
|
}
|
2014-02-07 00:48:26 -07:00
|
|
|
out:
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
2011-12-08 00:17:49 -07:00
|
|
|
}
|
|
|
|
|
2017-02-04 10:05:07 -07:00
|
|
|
void br_fdb_cleanup(struct work_struct *work)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2017-02-04 10:05:07 -07:00
|
|
|
struct net_bridge *br = container_of(work, struct net_bridge,
|
|
|
|
gc_work.work);
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_entry *f = NULL;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long delay = hold_time(br);
|
2017-02-04 10:05:07 -07:00
|
|
|
unsigned long work_delay = delay;
|
|
|
|
unsigned long now = jiffies;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
/* this part is tricky, in order to avoid blocking learning and
|
|
|
|
* consequently forwarding, we rely on rcu to delete objects with
|
|
|
|
* delayed freeing allowing us to continue traversing
|
|
|
|
*/
|
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(f, &br->fdb_list, fdb_node) {
|
|
|
|
unsigned long this_timer;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2019-10-29 05:45:54 -06:00
|
|
|
if (test_bit(BR_FDB_STATIC, &f->flags) ||
|
2019-10-29 05:45:57 -06:00
|
|
|
test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &f->flags))
|
2017-02-04 10:05:07 -07:00
|
|
|
continue;
|
2017-12-12 07:02:50 -07:00
|
|
|
this_timer = f->updated + delay;
|
|
|
|
if (time_after(this_timer, now)) {
|
|
|
|
work_delay = min(work_delay, this_timer - now);
|
|
|
|
} else {
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
if (!hlist_unhashed(&f->fdb_node))
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_delete(br, f, true);
|
2017-12-12 07:02:50 -07:00
|
|
|
spin_unlock_bh(&br->hash_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
2017-12-12 07:02:50 -07:00
|
|
|
rcu_read_unlock();
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2017-02-04 10:05:07 -07:00
|
|
|
/* Cleanup minimum 10 milliseconds apart */
|
|
|
|
work_delay = max_t(unsigned long, work_delay, msecs_to_jiffies(10));
|
|
|
|
mod_delayed_work(system_long_wq, &br->gc_work, work_delay);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2007-04-09 13:57:54 -06:00
|
|
|
/* Completely flush all dynamic entries in forwarding database.*/
|
|
|
|
void br_fdb_flush(struct net_bridge *br)
|
|
|
|
{
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
struct hlist_node *tmp;
|
2007-04-09 13:57:54 -06:00
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
2017-12-12 07:02:50 -07:00
|
|
|
hlist_for_each_entry_safe(f, tmp, &br->fdb_list, fdb_node) {
|
2019-10-29 05:45:54 -06:00
|
|
|
if (!test_bit(BR_FDB_STATIC, &f->flags))
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_delete(br, f, true);
|
2007-04-09 13:57:54 -06:00
|
|
|
}
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
2006-10-12 15:45:38 -06:00
|
|
|
|
2011-03-30 19:57:33 -06:00
|
|
|
/* Flush all entries referring to a specific port.
|
2007-04-09 13:57:54 -06:00
|
|
|
* if do_all is set also flush static entries
|
2015-06-23 06:28:16 -06:00
|
|
|
* if vid is set delete all entries that match the vlan_id
|
2007-04-09 13:57:54 -06:00
|
|
|
*/
|
2006-10-12 15:45:38 -06:00
|
|
|
void br_fdb_delete_by_port(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
2015-06-23 06:28:16 -06:00
|
|
|
u16 vid,
|
2006-10-12 15:45:38 -06:00
|
|
|
int do_all)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
struct hlist_node *tmp;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
2017-12-12 07:02:50 -07:00
|
|
|
hlist_for_each_entry_safe(f, tmp, &br->fdb_list, fdb_node) {
|
|
|
|
if (f->dst != p)
|
|
|
|
continue;
|
2007-02-09 07:24:35 -07:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
if (!do_all)
|
2019-10-29 05:45:54 -06:00
|
|
|
if (test_bit(BR_FDB_STATIC, &f->flags) ||
|
|
|
|
(vid && f->key.vlan_id != vid))
|
2005-04-16 16:20:36 -06:00
|
|
|
continue;
|
|
|
|
|
2019-10-29 05:45:53 -06:00
|
|
|
if (test_bit(BR_FDB_LOCAL, &f->flags))
|
2017-12-12 07:02:50 -07:00
|
|
|
fdb_delete_local(br, p, f);
|
|
|
|
else
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_delete(br, f, true);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
|
|
|
|
2011-12-11 19:58:25 -07:00
|
|
|
#if IS_ENABLED(CONFIG_ATM_LANE)
|
2009-06-04 23:35:28 -06:00
|
|
|
/* Interface used by ATM LANE hook to test
|
|
|
|
* if an addr is on some other bridge port */
|
|
|
|
int br_fdb_test_addr(struct net_device *dev, unsigned char *addr)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
2010-11-14 23:38:13 -07:00
|
|
|
struct net_bridge_port *port;
|
2009-06-04 23:35:28 -06:00
|
|
|
int ret;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
rcu_read_lock();
|
2010-11-14 23:38:13 -07:00
|
|
|
port = br_port_get_rcu(dev);
|
|
|
|
if (!port)
|
|
|
|
ret = 0;
|
|
|
|
else {
|
2017-02-13 06:59:09 -07:00
|
|
|
fdb = br_fdb_find_rcu(port->br, addr, 0);
|
2011-12-08 00:17:49 -07:00
|
|
|
ret = fdb && fdb->dst && fdb->dst->dev != dev &&
|
2010-11-14 23:38:13 -07:00
|
|
|
fdb->dst->state == BR_STATE_FORWARDING;
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
2009-06-04 23:35:28 -06:00
|
|
|
return ret;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2009-06-04 23:35:28 -06:00
|
|
|
#endif /* CONFIG_ATM_LANE */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
2007-02-09 07:24:35 -07:00
|
|
|
* Fill buffer with forwarding table records in
|
2005-04-16 16:20:36 -06:00
|
|
|
* the API format.
|
|
|
|
*/
|
|
|
|
int br_fdb_fillbuf(struct net_bridge *br, void *buf,
|
|
|
|
unsigned long maxnum, unsigned long skip)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *f;
|
2017-12-12 07:02:50 -07:00
|
|
|
struct __fdb_entry *fe = buf;
|
|
|
|
int num = 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
memset(buf, 0, maxnum*sizeof(struct __fdb_entry));
|
|
|
|
|
|
|
|
rcu_read_lock();
|
2017-12-12 07:02:50 -07:00
|
|
|
hlist_for_each_entry_rcu(f, &br->fdb_list, fdb_node) {
|
|
|
|
if (num >= maxnum)
|
|
|
|
break;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
if (has_expired(br, f))
|
|
|
|
continue;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
/* ignore pseudo entry for local MAC address */
|
|
|
|
if (!f->dst)
|
|
|
|
continue;
|
2011-12-08 00:17:49 -07:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
if (skip) {
|
|
|
|
--skip;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
/* convert from internal format to API */
|
|
|
|
memcpy(fe->mac_addr, f->key.addr.addr, ETH_ALEN);
|
2008-05-02 17:53:33 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
/* due to ABI compat need to split into hi/lo */
|
|
|
|
fe->port_no = f->dst->port_no;
|
|
|
|
fe->port_hi = f->dst->port_no >> 8;
|
2008-05-02 17:53:33 -06:00
|
|
|
|
2019-10-29 05:45:53 -06:00
|
|
|
fe->is_local = test_bit(BR_FDB_LOCAL, &f->flags);
|
2019-10-29 05:45:54 -06:00
|
|
|
if (!test_bit(BR_FDB_STATIC, &f->flags))
|
2017-12-12 07:02:50 -07:00
|
|
|
fe->ageing_timer_value = jiffies_delta_to_clock_t(jiffies - f->updated);
|
|
|
|
++fe;
|
|
|
|
++num;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,
|
2005-04-16 16:20:36 -06:00
|
|
|
struct net_bridge_port *source,
|
2013-02-13 05:00:16 -07:00
|
|
|
const unsigned char *addr,
|
2015-10-27 08:52:56 -06:00
|
|
|
__u16 vid,
|
2019-10-29 05:45:59 -06:00
|
|
|
unsigned long flags)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
|
|
|
fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC);
|
|
|
|
if (fdb) {
|
2017-12-12 07:02:50 -07:00
|
|
|
memcpy(fdb->key.addr.addr, addr, ETH_ALEN);
|
2005-04-16 16:20:36 -06:00
|
|
|
fdb->dst = source;
|
2017-12-12 07:02:50 -07:00
|
|
|
fdb->key.vlan_id = vid;
|
2019-10-29 05:45:59 -06:00
|
|
|
fdb->flags = flags;
|
2011-04-04 08:03:28 -06:00
|
|
|
fdb->updated = fdb->used = jiffies;
|
2017-12-12 07:02:50 -07:00
|
|
|
if (rhashtable_lookup_insert_fast(&br->fdb_hash_tbl,
|
|
|
|
&fdb->rhnode,
|
|
|
|
br_fdb_rht_params)) {
|
|
|
|
kmem_cache_free(br_fdb_cache, fdb);
|
|
|
|
fdb = NULL;
|
|
|
|
} else {
|
|
|
|
hlist_add_head_rcu(&fdb->fdb_node, &br->fdb_list);
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
return fdb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
2013-02-13 05:00:19 -07:00
|
|
|
const unsigned char *addr, u16 vid)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
|
|
|
if (!is_valid_ether_addr(addr))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-02-13 06:59:09 -07:00
|
|
|
fdb = br_fdb_find(br, addr, vid);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (fdb) {
|
2007-02-09 07:24:35 -07:00
|
|
|
/* it is okay to have multiple ports with same
|
2005-04-16 16:20:36 -06:00
|
|
|
* address, just use the first one.
|
|
|
|
*/
|
2019-10-29 05:45:53 -06:00
|
|
|
if (test_bit(BR_FDB_LOCAL, &fdb->flags))
|
2005-04-16 16:20:36 -06:00
|
|
|
return 0;
|
2016-10-11 17:12:56 -06:00
|
|
|
br_warn(br, "adding interface %s with same address as a received packet (addr:%pM, vlan:%u)\n",
|
|
|
|
source ? source->dev->name : br->dev->name, addr, vid);
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_delete(br, fdb, true);
|
2007-02-09 07:24:35 -07:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2019-10-29 05:45:59 -06:00
|
|
|
fdb = fdb_create(br, source, addr, vid,
|
|
|
|
BIT(BR_FDB_LOCAL) | BIT(BR_FDB_STATIC));
|
2011-04-04 08:03:27 -06:00
|
|
|
if (!fdb)
|
2005-04-16 16:20:36 -06:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2014-11-28 06:34:12 -07:00
|
|
|
fdb_add_hw_addr(br, addr);
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH, true);
|
2005-04-16 16:20:36 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-04-04 08:03:27 -06:00
|
|
|
/* Add entry for local address of interface */
|
2005-04-16 16:20:36 -06:00
|
|
|
int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
2013-02-13 05:00:19 -07:00
|
|
|
const unsigned char *addr, u16 vid)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
2013-02-13 05:00:19 -07:00
|
|
|
ret = fdb_insert(br, source, addr, vid);
|
2005-04-16 16:20:36 -06:00
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
|
2019-11-01 06:46:37 -06:00
|
|
|
const unsigned char *addr, u16 vid, unsigned long flags)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
2014-05-29 01:27:16 -06:00
|
|
|
bool fdb_modified = false;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* some users want to always flood. */
|
|
|
|
if (hold_time(br) == 0)
|
|
|
|
return;
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
fdb = fdb_find_rcu(&br->fdb_hash_tbl, addr, vid);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (likely(fdb)) {
|
|
|
|
/* attempt to update an entry for a local interface */
|
2019-10-29 05:45:53 -06:00
|
|
|
if (unlikely(test_bit(BR_FDB_LOCAL, &fdb->flags))) {
|
2007-02-09 07:24:35 -07:00
|
|
|
if (net_ratelimit())
|
2016-10-11 17:12:56 -06:00
|
|
|
br_warn(br, "received packet on %s with own address as source address (addr:%pM, vlan:%u)\n",
|
|
|
|
source->dev->name, addr, vid);
|
2005-04-16 16:20:36 -06:00
|
|
|
} else {
|
2017-02-07 09:46:46 -07:00
|
|
|
unsigned long now = jiffies;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* fastpath: update of existing entry */
|
2019-10-29 05:45:55 -06:00
|
|
|
if (unlikely(source != fdb->dst &&
|
|
|
|
!test_bit(BR_FDB_STICKY, &fdb->flags))) {
|
2014-05-29 01:27:16 -06:00
|
|
|
fdb->dst = source;
|
|
|
|
fdb_modified = true;
|
2017-04-28 13:39:07 -06:00
|
|
|
/* Take over HW learned entry */
|
2019-11-01 06:46:39 -06:00
|
|
|
if (unlikely(test_bit(BR_FDB_ADDED_BY_EXT_LEARN,
|
|
|
|
&fdb->flags)))
|
|
|
|
clear_bit(BR_FDB_ADDED_BY_EXT_LEARN,
|
|
|
|
&fdb->flags);
|
2014-05-29 01:27:16 -06:00
|
|
|
}
|
2017-02-07 09:46:46 -07:00
|
|
|
if (now != fdb->updated)
|
|
|
|
fdb->updated = now;
|
2019-11-01 06:46:37 -06:00
|
|
|
if (unlikely(test_bit(BR_FDB_ADDED_BY_USER, &flags)))
|
2019-10-29 05:45:56 -06:00
|
|
|
set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
|
2017-08-30 23:18:13 -06:00
|
|
|
if (unlikely(fdb_modified)) {
|
2019-11-01 06:46:37 -06:00
|
|
|
trace_br_fdb_update(br, source, addr, vid, flags);
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH, true);
|
2017-08-30 23:18:13 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
} else {
|
2006-03-20 23:58:36 -07:00
|
|
|
spin_lock(&br->hash_lock);
|
2019-11-01 06:46:37 -06:00
|
|
|
fdb = fdb_create(br, source, addr, vid, flags);
|
2017-12-12 07:02:50 -07:00
|
|
|
if (fdb) {
|
2019-11-01 06:46:37 -06:00
|
|
|
trace_br_fdb_update(br, source, addr, vid, flags);
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH, true);
|
2011-12-06 06:02:24 -07:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
/* else we lose race and someone else inserts
|
|
|
|
* it first, don't bother updating
|
|
|
|
*/
|
2006-03-20 23:58:36 -07:00
|
|
|
spin_unlock(&br->hash_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
2011-04-04 08:03:30 -06:00
|
|
|
|
2015-10-08 11:38:52 -06:00
|
|
|
static int fdb_to_nud(const struct net_bridge *br,
|
|
|
|
const struct net_bridge_fdb_entry *fdb)
|
2011-04-04 08:03:30 -06:00
|
|
|
{
|
2019-10-29 05:45:53 -06:00
|
|
|
if (test_bit(BR_FDB_LOCAL, &fdb->flags))
|
2011-04-04 08:03:30 -06:00
|
|
|
return NUD_PERMANENT;
|
2019-10-29 05:45:54 -06:00
|
|
|
else if (test_bit(BR_FDB_STATIC, &fdb->flags))
|
2011-04-04 08:03:30 -06:00
|
|
|
return NUD_NOARP;
|
2015-10-08 11:38:52 -06:00
|
|
|
else if (has_expired(br, fdb))
|
2011-04-04 08:03:30 -06:00
|
|
|
return NUD_STALE;
|
|
|
|
else
|
|
|
|
return NUD_REACHABLE;
|
|
|
|
}
|
|
|
|
|
2011-12-08 00:17:41 -07:00
|
|
|
static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br,
|
2011-04-04 08:03:30 -06:00
|
|
|
const struct net_bridge_fdb_entry *fdb,
|
2012-09-07 14:12:54 -06:00
|
|
|
u32 portid, u32 seq, int type, unsigned int flags)
|
2011-04-04 08:03:30 -06:00
|
|
|
{
|
|
|
|
unsigned long now = jiffies;
|
|
|
|
struct nda_cacheinfo ci;
|
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
struct ndmsg *ndm;
|
|
|
|
|
2012-09-07 14:12:54 -06:00
|
|
|
nlh = nlmsg_put(skb, portid, seq, type, sizeof(*ndm), flags);
|
2011-04-04 08:03:30 -06:00
|
|
|
if (nlh == NULL)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
ndm = nlmsg_data(nlh);
|
|
|
|
ndm->ndm_family = AF_BRIDGE;
|
|
|
|
ndm->ndm_pad1 = 0;
|
|
|
|
ndm->ndm_pad2 = 0;
|
2017-06-08 00:44:15 -06:00
|
|
|
ndm->ndm_flags = 0;
|
2011-04-04 08:03:30 -06:00
|
|
|
ndm->ndm_type = 0;
|
2011-12-08 00:17:49 -07:00
|
|
|
ndm->ndm_ifindex = fdb->dst ? fdb->dst->dev->ifindex : br->dev->ifindex;
|
2015-10-08 11:38:52 -06:00
|
|
|
ndm->ndm_state = fdb_to_nud(br, fdb);
|
2011-04-04 08:03:30 -06:00
|
|
|
|
2019-10-29 05:45:58 -06:00
|
|
|
if (test_bit(BR_FDB_OFFLOADED, &fdb->flags))
|
2017-06-08 00:44:15 -06:00
|
|
|
ndm->ndm_flags |= NTF_OFFLOADED;
|
2019-10-29 05:45:57 -06:00
|
|
|
if (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags))
|
2017-06-08 00:44:15 -06:00
|
|
|
ndm->ndm_flags |= NTF_EXT_LEARNED;
|
2019-10-29 05:45:55 -06:00
|
|
|
if (test_bit(BR_FDB_STICKY, &fdb->flags))
|
2018-09-11 00:39:53 -06:00
|
|
|
ndm->ndm_flags |= NTF_STICKY;
|
2017-06-08 00:44:15 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
if (nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->key.addr))
|
2012-04-01 18:49:54 -06:00
|
|
|
goto nla_put_failure;
|
2014-05-27 23:39:37 -06:00
|
|
|
if (nla_put_u32(skb, NDA_MASTER, br->dev->ifindex))
|
|
|
|
goto nla_put_failure;
|
2011-04-04 08:03:30 -06:00
|
|
|
ci.ndm_used = jiffies_to_clock_t(now - fdb->used);
|
|
|
|
ci.ndm_confirmed = 0;
|
|
|
|
ci.ndm_updated = jiffies_to_clock_t(now - fdb->updated);
|
|
|
|
ci.ndm_refcnt = 0;
|
2012-04-01 18:49:54 -06:00
|
|
|
if (nla_put(skb, NDA_CACHEINFO, sizeof(ci), &ci))
|
|
|
|
goto nla_put_failure;
|
2013-02-13 05:00:18 -07:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
if (fdb->key.vlan_id && nla_put(skb, NDA_VLAN, sizeof(u16),
|
|
|
|
&fdb->key.vlan_id))
|
2013-02-13 05:00:18 -07:00
|
|
|
goto nla_put_failure;
|
|
|
|
|
2015-01-16 14:09:00 -07:00
|
|
|
nlmsg_end(skb, nlh);
|
|
|
|
return 0;
|
2011-04-04 08:03:30 -06:00
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
nlmsg_cancel(skb, nlh);
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline size_t fdb_nlmsg_size(void)
|
|
|
|
{
|
|
|
|
return NLMSG_ALIGN(sizeof(struct ndmsg))
|
|
|
|
+ nla_total_size(ETH_ALEN) /* NDA_LLADDR */
|
2014-05-27 23:39:37 -06:00
|
|
|
+ nla_total_size(sizeof(u32)) /* NDA_MASTER */
|
2013-02-13 05:00:18 -07:00
|
|
|
+ nla_total_size(sizeof(u16)) /* NDA_VLAN */
|
2011-04-04 08:03:30 -06:00
|
|
|
+ nla_total_size(sizeof(struct nda_cacheinfo));
|
|
|
|
}
|
|
|
|
|
2011-12-08 00:17:41 -07:00
|
|
|
static void fdb_notify(struct net_bridge *br,
|
2018-05-03 06:43:53 -06:00
|
|
|
const struct net_bridge_fdb_entry *fdb, int type,
|
|
|
|
bool swdev_notify)
|
2011-04-04 08:03:30 -06:00
|
|
|
{
|
2011-12-08 00:17:41 -07:00
|
|
|
struct net *net = dev_net(br->dev);
|
2011-04-04 08:03:30 -06:00
|
|
|
struct sk_buff *skb;
|
|
|
|
int err = -ENOBUFS;
|
|
|
|
|
2018-05-03 06:43:53 -06:00
|
|
|
if (swdev_notify)
|
|
|
|
br_switchdev_fdb_notify(fdb, type);
|
2017-06-08 00:44:14 -06:00
|
|
|
|
2011-04-04 08:03:30 -06:00
|
|
|
skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC);
|
|
|
|
if (skb == NULL)
|
|
|
|
goto errout;
|
|
|
|
|
2011-12-08 00:17:41 -07:00
|
|
|
err = fdb_fill_info(skb, br, fdb, 0, 0, type, 0);
|
2011-04-04 08:03:30 -06:00
|
|
|
if (err < 0) {
|
|
|
|
/* -EMSGSIZE implies BUG in fdb_nlmsg_size() */
|
|
|
|
WARN_ON(err == -EMSGSIZE);
|
|
|
|
kfree_skb(skb);
|
|
|
|
goto errout;
|
|
|
|
}
|
|
|
|
rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC);
|
|
|
|
return;
|
|
|
|
errout:
|
2013-12-18 22:28:10 -07:00
|
|
|
rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
|
2011-04-04 08:03:30 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Dump information about entries, in response to GETNEIGH */
|
2012-04-15 00:43:56 -06:00
|
|
|
int br_fdb_dump(struct sk_buff *skb,
|
|
|
|
struct netlink_callback *cb,
|
|
|
|
struct net_device *dev,
|
2014-07-10 05:01:58 -06:00
|
|
|
struct net_device *filter_dev,
|
2016-08-30 22:56:45 -06:00
|
|
|
int *idx)
|
2011-04-04 08:03:30 -06:00
|
|
|
{
|
2012-04-15 00:43:56 -06:00
|
|
|
struct net_bridge *br = netdev_priv(dev);
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_entry *f;
|
2016-08-30 22:56:45 -06:00
|
|
|
int err = 0;
|
2011-04-04 08:03:30 -06:00
|
|
|
|
2012-04-15 00:43:56 -06:00
|
|
|
if (!(dev->priv_flags & IFF_EBRIDGE))
|
2017-12-12 07:02:50 -07:00
|
|
|
return err;
|
2011-04-04 08:03:30 -06:00
|
|
|
|
2016-08-30 22:56:45 -06:00
|
|
|
if (!filter_dev) {
|
|
|
|
err = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
|
|
|
|
if (err < 0)
|
2017-12-12 07:02:50 -07:00
|
|
|
return err;
|
2016-08-30 22:56:45 -06:00
|
|
|
}
|
2015-01-05 10:29:21 -07:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(f, &br->fdb_list, fdb_node) {
|
|
|
|
if (*idx < cb->args[2])
|
|
|
|
goto skip;
|
|
|
|
if (filter_dev && (!f->dst || f->dst->dev != filter_dev)) {
|
|
|
|
if (filter_dev != dev)
|
2012-04-15 00:43:56 -06:00
|
|
|
goto skip;
|
2017-12-12 07:02:50 -07:00
|
|
|
/* !f->dst is a special case for bridge
|
|
|
|
* It means the MAC belongs to the bridge
|
|
|
|
* Therefore need a little more filtering
|
|
|
|
* we only want to dump the !f->dst case
|
|
|
|
*/
|
|
|
|
if (f->dst)
|
2015-01-05 10:29:21 -07:00
|
|
|
goto skip;
|
2011-04-04 08:03:30 -06:00
|
|
|
}
|
2017-12-12 07:02:50 -07:00
|
|
|
if (!filter_dev && f->dst)
|
|
|
|
goto skip;
|
|
|
|
|
|
|
|
err = fdb_fill_info(skb, br, f,
|
|
|
|
NETLINK_CB(cb->skb).portid,
|
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
RTM_NEWNEIGH,
|
|
|
|
NLM_F_MULTI);
|
|
|
|
if (err < 0)
|
|
|
|
break;
|
|
|
|
skip:
|
|
|
|
*idx += 1;
|
2011-04-04 08:03:30 -06:00
|
|
|
}
|
2017-12-12 07:02:50 -07:00
|
|
|
rcu_read_unlock();
|
2011-04-04 08:03:30 -06:00
|
|
|
|
2016-08-30 22:56:45 -06:00
|
|
|
return err;
|
2011-04-04 08:03:30 -06:00
|
|
|
}
|
2011-04-04 08:03:31 -06:00
|
|
|
|
2018-12-15 23:35:09 -07:00
|
|
|
int br_fdb_get(struct sk_buff *skb,
|
|
|
|
struct nlattr *tb[],
|
|
|
|
struct net_device *dev,
|
|
|
|
const unsigned char *addr,
|
|
|
|
u16 vid, u32 portid, u32 seq,
|
|
|
|
struct netlink_ext_ack *extack)
|
|
|
|
{
|
|
|
|
struct net_bridge *br = netdev_priv(dev);
|
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
f = br_fdb_find_rcu(br, addr, vid);
|
|
|
|
if (!f) {
|
|
|
|
NL_SET_ERR_MSG(extack, "Fdb entry not found");
|
|
|
|
err = -ENOENT;
|
|
|
|
goto errout;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = fdb_fill_info(skb, br, f, portid, seq,
|
|
|
|
RTM_NEWNEIGH, 0);
|
|
|
|
errout:
|
|
|
|
rcu_read_unlock();
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-11-09 11:30:08 -07:00
|
|
|
/* Update (create or replace) forwarding database entry */
|
2016-08-03 20:11:19 -06:00
|
|
|
static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,
|
2018-09-11 00:39:53 -06:00
|
|
|
const u8 *addr, u16 state, u16 flags, u16 vid,
|
|
|
|
u8 ndm_flags)
|
2011-04-04 08:03:31 -06:00
|
|
|
{
|
2019-10-29 05:45:55 -06:00
|
|
|
bool is_sticky = !!(ndm_flags & NTF_STICKY);
|
2011-04-04 08:03:31 -06:00
|
|
|
struct net_bridge_fdb_entry *fdb;
|
2013-04-22 06:56:49 -06:00
|
|
|
bool modified = false;
|
2011-04-04 08:03:31 -06:00
|
|
|
|
2015-05-25 07:39:31 -06:00
|
|
|
/* If the port cannot learn allow only local and static entries */
|
2016-08-03 20:11:19 -06:00
|
|
|
if (source && !(state & NUD_PERMANENT) && !(state & NUD_NOARP) &&
|
2015-05-25 07:39:31 -06:00
|
|
|
!(source->state == BR_STATE_LEARNING ||
|
|
|
|
source->state == BR_STATE_FORWARDING))
|
|
|
|
return -EPERM;
|
|
|
|
|
2016-08-03 20:11:19 -06:00
|
|
|
if (!source && !(state & NUD_PERMANENT)) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH %s without NUD_PERMANENT\n",
|
|
|
|
br->dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2018-09-11 00:39:53 -06:00
|
|
|
if (is_sticky && (state & NUD_PERMANENT))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-02-13 06:59:09 -07:00
|
|
|
fdb = br_fdb_find(br, addr, vid);
|
2011-09-30 08:37:27 -06:00
|
|
|
if (fdb == NULL) {
|
|
|
|
if (!(flags & NLM_F_CREATE))
|
|
|
|
return -ENOENT;
|
2011-04-04 08:03:31 -06:00
|
|
|
|
2019-10-29 05:45:59 -06:00
|
|
|
fdb = fdb_create(br, source, addr, vid, 0);
|
2011-09-30 08:37:27 -06:00
|
|
|
if (!fdb)
|
|
|
|
return -ENOMEM;
|
2013-04-22 06:56:49 -06:00
|
|
|
|
|
|
|
modified = true;
|
2011-09-30 08:37:27 -06:00
|
|
|
} else {
|
|
|
|
if (flags & NLM_F_EXCL)
|
|
|
|
return -EEXIST;
|
2013-04-22 06:56:49 -06:00
|
|
|
|
|
|
|
if (fdb->dst != source) {
|
|
|
|
fdb->dst = source;
|
|
|
|
modified = true;
|
|
|
|
}
|
2011-11-09 11:30:08 -07:00
|
|
|
}
|
|
|
|
|
2015-10-08 11:38:52 -06:00
|
|
|
if (fdb_to_nud(br, fdb) != state) {
|
2014-05-16 07:59:19 -06:00
|
|
|
if (state & NUD_PERMANENT) {
|
2019-10-29 05:45:53 -06:00
|
|
|
set_bit(BR_FDB_LOCAL, &fdb->flags);
|
2019-10-29 05:45:54 -06:00
|
|
|
if (!test_and_set_bit(BR_FDB_STATIC, &fdb->flags))
|
2014-11-28 06:34:12 -07:00
|
|
|
fdb_add_hw_addr(br, addr);
|
2014-05-16 07:59:19 -06:00
|
|
|
} else if (state & NUD_NOARP) {
|
2019-10-29 05:45:53 -06:00
|
|
|
clear_bit(BR_FDB_LOCAL, &fdb->flags);
|
2019-10-29 05:45:54 -06:00
|
|
|
if (!test_and_set_bit(BR_FDB_STATIC, &fdb->flags))
|
2014-11-28 06:34:12 -07:00
|
|
|
fdb_add_hw_addr(br, addr);
|
2014-05-16 07:59:19 -06:00
|
|
|
} else {
|
2019-10-29 05:45:53 -06:00
|
|
|
clear_bit(BR_FDB_LOCAL, &fdb->flags);
|
2019-10-29 05:45:54 -06:00
|
|
|
if (test_and_clear_bit(BR_FDB_STATIC, &fdb->flags))
|
2014-11-28 06:34:12 -07:00
|
|
|
fdb_del_hw_addr(br, addr);
|
2014-05-16 07:59:19 -06:00
|
|
|
}
|
2011-09-30 08:37:27 -06:00
|
|
|
|
2013-04-22 06:56:49 -06:00
|
|
|
modified = true;
|
|
|
|
}
|
2018-09-11 00:39:53 -06:00
|
|
|
|
2019-10-29 05:45:55 -06:00
|
|
|
if (is_sticky != test_bit(BR_FDB_STICKY, &fdb->flags)) {
|
|
|
|
change_bit(BR_FDB_STICKY, &fdb->flags);
|
2018-09-11 00:39:53 -06:00
|
|
|
modified = true;
|
|
|
|
}
|
|
|
|
|
2019-10-29 05:45:56 -06:00
|
|
|
set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
|
2013-04-22 06:56:49 -06:00
|
|
|
|
|
|
|
fdb->used = jiffies;
|
|
|
|
if (modified) {
|
|
|
|
fdb->updated = jiffies;
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH, true);
|
2011-09-30 08:37:27 -06:00
|
|
|
}
|
2011-04-04 08:03:31 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-08-03 20:11:19 -06:00
|
|
|
static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br,
|
|
|
|
struct net_bridge_port *p, const unsigned char *addr,
|
|
|
|
u16 nlh_flags, u16 vid)
|
2013-02-13 05:00:18 -07:00
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (ndm->ndm_flags & NTF_USE) {
|
2016-08-03 20:11:19 -06:00
|
|
|
if (!p) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH %s with NTF_USE is not supported\n",
|
|
|
|
br->dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2019-11-04 02:36:51 -07:00
|
|
|
if (!nbp_state_should_learn(p))
|
|
|
|
return 0;
|
|
|
|
|
2015-06-06 07:49:00 -06:00
|
|
|
local_bh_disable();
|
2013-02-13 05:00:18 -07:00
|
|
|
rcu_read_lock();
|
2019-11-01 06:46:37 -06:00
|
|
|
br_fdb_update(br, p, addr, vid, BIT(BR_FDB_ADDED_BY_USER));
|
2013-02-13 05:00:18 -07:00
|
|
|
rcu_read_unlock();
|
2015-06-06 07:49:00 -06:00
|
|
|
local_bh_enable();
|
2017-03-23 04:27:13 -06:00
|
|
|
} else if (ndm->ndm_flags & NTF_EXT_LEARNED) {
|
2018-05-03 06:43:53 -06:00
|
|
|
err = br_fdb_external_learn_add(br, p, addr, vid, true);
|
2013-02-13 05:00:18 -07:00
|
|
|
} else {
|
2016-08-03 20:11:19 -06:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
err = fdb_add_entry(br, p, addr, ndm->ndm_state,
|
2018-09-11 00:39:53 -06:00
|
|
|
nlh_flags, vid, ndm->ndm_flags);
|
2016-08-03 20:11:19 -06:00
|
|
|
spin_unlock_bh(&br->hash_lock);
|
2013-02-13 05:00:18 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-04-04 08:03:31 -06:00
|
|
|
/* Add new permanent fdb entry with RTM_NEWNEIGH */
|
2012-10-01 06:32:33 -06:00
|
|
|
int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
|
|
|
struct net_device *dev,
|
2019-01-16 16:06:50 -07:00
|
|
|
const unsigned char *addr, u16 vid, u16 nlh_flags,
|
|
|
|
struct netlink_ext_ack *extack)
|
2011-04-04 08:03:31 -06:00
|
|
|
{
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan_group *vg;
|
2015-10-08 11:38:52 -06:00
|
|
|
struct net_bridge_port *p = NULL;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan *v;
|
2015-10-08 11:38:52 -06:00
|
|
|
struct net_bridge *br = NULL;
|
2012-04-15 00:43:56 -06:00
|
|
|
int err = 0;
|
2011-04-04 08:03:31 -06:00
|
|
|
|
2017-08-29 14:16:57 -06:00
|
|
|
trace_br_fdb_add(ndm, dev, addr, vid, nlh_flags);
|
|
|
|
|
2011-11-09 11:30:08 -07:00
|
|
|
if (!(ndm->ndm_state & (NUD_PERMANENT|NUD_NOARP|NUD_REACHABLE))) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH with invalid state %#x\n", ndm->ndm_state);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2013-06-25 10:34:36 -06:00
|
|
|
if (is_zero_ether_addr(addr)) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH with invalid ether address\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2015-10-08 11:38:52 -06:00
|
|
|
if (dev->priv_flags & IFF_EBRIDGE) {
|
|
|
|
br = netdev_priv(dev);
|
|
|
|
vg = br_vlan_group(br);
|
|
|
|
} else {
|
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
if (!p) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH %s not a bridge port\n",
|
|
|
|
dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2016-08-03 20:11:19 -06:00
|
|
|
br = p->br;
|
2015-10-08 11:38:52 -06:00
|
|
|
vg = nbp_vlan_group(p);
|
2011-04-04 08:03:31 -06:00
|
|
|
}
|
|
|
|
|
2014-11-28 06:34:15 -07:00
|
|
|
if (vid) {
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
v = br_vlan_find(vg, vid);
|
2015-10-08 11:38:52 -06:00
|
|
|
if (!v || !br_vlan_should_use(v)) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH with unconfigured vlan %d on %s\n", vid, dev->name);
|
2013-02-13 05:00:18 -07:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* VID was specified, so use it. */
|
2016-08-03 20:11:19 -06:00
|
|
|
err = __br_fdb_add(ndm, br, p, addr, nlh_flags, vid);
|
2011-11-09 11:30:08 -07:00
|
|
|
} else {
|
2016-08-03 20:11:19 -06:00
|
|
|
err = __br_fdb_add(ndm, br, p, addr, nlh_flags, 0);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
if (err || !vg || !vg->num_vlans)
|
2013-02-13 05:00:18 -07:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* We have vlans configured on this port and user didn't
|
|
|
|
* specify a VLAN. To be nice, add/update entry for every
|
|
|
|
* vlan on this port.
|
|
|
|
*/
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
list_for_each_entry(v, &vg->vlan_list, vlist) {
|
2015-10-08 11:38:52 -06:00
|
|
|
if (!br_vlan_should_use(v))
|
|
|
|
continue;
|
2016-08-03 20:11:19 -06:00
|
|
|
err = __br_fdb_add(ndm, br, p, addr, nlh_flags, v->vid);
|
2013-02-13 05:00:18 -07:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
}
|
2011-11-09 11:30:08 -07:00
|
|
|
}
|
2011-04-04 08:03:31 -06:00
|
|
|
|
2013-02-13 05:00:18 -07:00
|
|
|
out:
|
2011-04-04 08:03:31 -06:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2017-02-13 06:59:11 -07:00
|
|
|
static int fdb_delete_by_addr_and_port(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
2015-06-09 04:34:13 -06:00
|
|
|
const u8 *addr, u16 vlan)
|
2011-04-04 08:03:31 -06:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
2017-02-13 06:59:09 -07:00
|
|
|
fdb = br_fdb_find(br, addr, vlan);
|
2015-06-09 04:34:13 -06:00
|
|
|
if (!fdb || fdb->dst != p)
|
2011-04-04 08:03:31 -06:00
|
|
|
return -ENOENT;
|
|
|
|
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_delete(br, fdb, true);
|
2017-02-13 06:59:11 -07:00
|
|
|
|
2011-04-04 08:03:31 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-02-13 06:59:11 -07:00
|
|
|
static int __br_fdb_delete(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
2013-02-13 05:00:18 -07:00
|
|
|
const unsigned char *addr, u16 vid)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2017-02-13 06:59:11 -07:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
err = fdb_delete_by_addr_and_port(br, p, addr, vid);
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
2013-02-13 05:00:18 -07:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-04-04 08:03:31 -06:00
|
|
|
/* Remove neighbor entry with RTM_DELNEIGH */
|
2013-02-13 05:00:18 -07:00
|
|
|
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
|
|
|
struct net_device *dev,
|
2014-11-28 06:34:15 -07:00
|
|
|
const unsigned char *addr, u16 vid)
|
2011-04-04 08:03:31 -06:00
|
|
|
{
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan_group *vg;
|
2015-10-08 11:38:52 -06:00
|
|
|
struct net_bridge_port *p = NULL;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan *v;
|
2017-02-13 06:59:11 -07:00
|
|
|
struct net_bridge *br;
|
2011-04-04 08:03:31 -06:00
|
|
|
int err;
|
2013-02-13 05:00:18 -07:00
|
|
|
|
2015-10-08 11:38:52 -06:00
|
|
|
if (dev->priv_flags & IFF_EBRIDGE) {
|
|
|
|
br = netdev_priv(dev);
|
|
|
|
vg = br_vlan_group(br);
|
|
|
|
} else {
|
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
if (!p) {
|
|
|
|
pr_info("bridge: RTM_DELNEIGH %s not a bridge port\n",
|
|
|
|
dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
vg = nbp_vlan_group(p);
|
2017-02-13 06:59:11 -07:00
|
|
|
br = p->br;
|
2011-04-04 08:03:31 -06:00
|
|
|
}
|
|
|
|
|
2014-11-28 06:34:15 -07:00
|
|
|
if (vid) {
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
v = br_vlan_find(vg, vid);
|
|
|
|
if (!v) {
|
2015-10-08 11:38:52 -06:00
|
|
|
pr_info("bridge: RTM_DELNEIGH with unconfigured vlan %d on %s\n", vid, dev->name);
|
2013-02-13 05:00:18 -07:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2011-04-04 08:03:31 -06:00
|
|
|
|
2017-02-13 06:59:11 -07:00
|
|
|
err = __br_fdb_delete(br, p, addr, vid);
|
2013-02-13 05:00:18 -07:00
|
|
|
} else {
|
2015-02-09 04:16:17 -07:00
|
|
|
err = -ENOENT;
|
2017-02-13 06:59:11 -07:00
|
|
|
err &= __br_fdb_delete(br, p, addr, 0);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
if (!vg || !vg->num_vlans)
|
2017-02-13 06:59:11 -07:00
|
|
|
return err;
|
2013-02-13 05:00:18 -07:00
|
|
|
|
2015-10-08 11:38:52 -06:00
|
|
|
list_for_each_entry(v, &vg->vlan_list, vlist) {
|
|
|
|
if (!br_vlan_should_use(v))
|
|
|
|
continue;
|
2017-02-13 06:59:11 -07:00
|
|
|
err &= __br_fdb_delete(br, p, addr, v->vid);
|
2015-10-08 11:38:52 -06:00
|
|
|
}
|
2013-02-13 05:00:18 -07:00
|
|
|
}
|
2017-02-13 06:59:11 -07:00
|
|
|
|
2011-04-04 08:03:31 -06:00
|
|
|
return err;
|
|
|
|
}
|
2014-05-16 07:59:17 -06:00
|
|
|
|
|
|
|
int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p)
|
|
|
|
{
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_entry *f, *tmp;
|
2018-02-01 03:25:27 -07:00
|
|
|
int err = 0;
|
2014-05-16 07:59:17 -06:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
/* the key here is that static entries change only under rtnl */
|
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(f, &br->fdb_list, fdb_node) {
|
|
|
|
/* We only care for static entries */
|
2019-10-29 05:45:54 -06:00
|
|
|
if (!test_bit(BR_FDB_STATIC, &f->flags))
|
2017-12-12 07:02:50 -07:00
|
|
|
continue;
|
|
|
|
err = dev_uc_add(p->dev, f->key.addr.addr);
|
|
|
|
if (err)
|
|
|
|
goto rollback;
|
2014-05-16 07:59:17 -06:00
|
|
|
}
|
2017-12-12 07:02:50 -07:00
|
|
|
done:
|
|
|
|
rcu_read_unlock();
|
2014-05-16 07:59:17 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
return err;
|
2014-05-16 07:59:17 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
rollback:
|
|
|
|
hlist_for_each_entry_rcu(tmp, &br->fdb_list, fdb_node) {
|
|
|
|
/* We only care for static entries */
|
2019-10-29 05:45:54 -06:00
|
|
|
if (!test_bit(BR_FDB_STATIC, &tmp->flags))
|
2017-12-12 07:02:50 -07:00
|
|
|
continue;
|
|
|
|
if (tmp == f)
|
|
|
|
break;
|
|
|
|
dev_uc_del(p->dev, tmp->key.addr.addr);
|
2014-05-16 07:59:17 -06:00
|
|
|
}
|
2017-12-12 07:02:50 -07:00
|
|
|
|
|
|
|
goto done;
|
2014-05-16 07:59:17 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p)
|
|
|
|
{
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_entry *f;
|
2014-05-16 07:59:17 -06:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
rcu_read_lock();
|
|
|
|
hlist_for_each_entry_rcu(f, &br->fdb_list, fdb_node) {
|
|
|
|
/* We only care for static entries */
|
2019-10-29 05:45:54 -06:00
|
|
|
if (!test_bit(BR_FDB_STATIC, &f->flags))
|
2017-12-12 07:02:50 -07:00
|
|
|
continue;
|
2014-05-16 07:59:17 -06:00
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
dev_uc_del(p->dev, f->key.addr.addr);
|
2014-05-16 07:59:17 -06:00
|
|
|
}
|
2017-12-12 07:02:50 -07:00
|
|
|
rcu_read_unlock();
|
2014-05-16 07:59:17 -06:00
|
|
|
}
|
2014-11-28 06:34:21 -07:00
|
|
|
|
2015-01-15 15:49:37 -07:00
|
|
|
int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
|
2018-05-03 06:43:53 -06:00
|
|
|
const unsigned char *addr, u16 vid,
|
|
|
|
bool swdev_notify)
|
2014-11-28 06:34:21 -07:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
2017-07-03 16:14:59 -06:00
|
|
|
bool modified = false;
|
2014-11-28 06:34:21 -07:00
|
|
|
int err = 0;
|
|
|
|
|
2017-08-29 14:16:57 -06:00
|
|
|
trace_br_fdb_external_learn_add(br, p, addr, vid);
|
|
|
|
|
2014-11-28 06:34:21 -07:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
2017-02-13 06:59:09 -07:00
|
|
|
fdb = br_fdb_find(br, addr, vid);
|
2014-11-28 06:34:21 -07:00
|
|
|
if (!fdb) {
|
2019-11-01 06:46:38 -06:00
|
|
|
unsigned long flags = BIT(BR_FDB_ADDED_BY_EXT_LEARN);
|
|
|
|
|
|
|
|
if (swdev_notify)
|
|
|
|
flags |= BIT(BR_FDB_ADDED_BY_USER);
|
|
|
|
fdb = fdb_create(br, p, addr, vid, flags);
|
2014-11-28 06:34:21 -07:00
|
|
|
if (!fdb) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);
|
2017-07-03 16:14:59 -06:00
|
|
|
} else {
|
2014-11-28 06:34:21 -07:00
|
|
|
fdb->updated = jiffies;
|
2017-07-03 16:14:59 -06:00
|
|
|
|
|
|
|
if (fdb->dst != p) {
|
|
|
|
fdb->dst = p;
|
|
|
|
modified = true;
|
|
|
|
}
|
|
|
|
|
2019-10-29 05:45:57 -06:00
|
|
|
if (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags)) {
|
2017-07-03 16:14:59 -06:00
|
|
|
/* Refresh entry */
|
|
|
|
fdb->used = jiffies;
|
2019-10-29 05:45:56 -06:00
|
|
|
} else if (!test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags)) {
|
2017-07-03 16:14:59 -06:00
|
|
|
/* Take over SW learned entry */
|
2019-10-29 05:45:57 -06:00
|
|
|
set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags);
|
2017-07-03 16:14:59 -06:00
|
|
|
modified = true;
|
|
|
|
}
|
|
|
|
|
2019-01-18 08:58:00 -07:00
|
|
|
if (swdev_notify)
|
2019-10-29 05:45:56 -06:00
|
|
|
set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
|
2019-01-18 08:58:00 -07:00
|
|
|
|
2017-07-03 16:14:59 -06:00
|
|
|
if (modified)
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);
|
2014-11-28 06:34:21 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
err_unlock:
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-01-15 15:49:37 -07:00
|
|
|
int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
|
2018-05-03 06:43:53 -06:00
|
|
|
const unsigned char *addr, u16 vid,
|
|
|
|
bool swdev_notify)
|
2014-11-28 06:34:21 -07:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
2017-02-13 06:59:09 -07:00
|
|
|
fdb = br_fdb_find(br, addr, vid);
|
2019-10-29 05:45:57 -06:00
|
|
|
if (fdb && test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags))
|
2018-05-03 06:43:53 -06:00
|
|
|
fdb_delete(br, fdb, swdev_notify);
|
2014-11-28 06:34:21 -07:00
|
|
|
else
|
|
|
|
err = -ENOENT;
|
|
|
|
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
2017-06-08 00:44:15 -06:00
|
|
|
|
|
|
|
void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,
|
2018-10-17 02:53:29 -06:00
|
|
|
const unsigned char *addr, u16 vid, bool offloaded)
|
2017-06-08 00:44:15 -06:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
fdb = br_fdb_find(br, addr, vid);
|
2019-10-29 05:45:58 -06:00
|
|
|
if (fdb && offloaded != test_bit(BR_FDB_OFFLOADED, &fdb->flags))
|
|
|
|
change_bit(BR_FDB_OFFLOADED, &fdb->flags);
|
2017-06-08 00:44:15 -06:00
|
|
|
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
2018-12-07 12:55:07 -07:00
|
|
|
|
|
|
|
void br_fdb_clear_offload(const struct net_device *dev, u16 vid)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
struct net_bridge_port *p;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
if (!p)
|
|
|
|
return;
|
|
|
|
|
|
|
|
spin_lock_bh(&p->br->hash_lock);
|
|
|
|
hlist_for_each_entry(f, &p->br->fdb_list, fdb_node) {
|
|
|
|
if (f->dst == p && f->key.vlan_id == vid)
|
2019-10-29 05:45:58 -06:00
|
|
|
clear_bit(BR_FDB_OFFLOADED, &f->flags);
|
2018-12-07 12:55:07 -07:00
|
|
|
}
|
|
|
|
spin_unlock_bh(&p->br->hash_lock);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(br_fdb_clear_offload);
|