2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* Forwarding database
|
|
|
|
* Linux ethernet bridge
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Lennert Buytenhek <buytenh@gnu.org>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/init.h>
|
2008-05-13 03:21:05 +08:00
|
|
|
#include <linux/rculist.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/spinlock.h>
|
|
|
|
#include <linux/times.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/jhash.h>
|
2007-03-22 04:42:33 +08: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 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2011-07-27 07:09:06 +08:00
|
|
|
#include <linux/atomic.h>
|
2007-03-22 04:42:33 +08:00
|
|
|
#include <asm/unaligned.h>
|
2013-02-13 20:00:16 +08:00
|
|
|
#include <linux/if_vlan.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include "br_private.h"
|
|
|
|
|
2006-12-07 12:33:20 +08:00
|
|
|
static struct kmem_cache *br_fdb_cache __read_mostly;
|
2014-02-07 15:48:25 +08:00
|
|
|
static struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
|
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid);
|
2005-04-17 06:20:36 +08:00
|
|
|
static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
2013-02-13 20:00:19 +08:00
|
|
|
const unsigned char *addr, u16 vid);
|
2011-12-08 15:17:41 +08:00
|
|
|
static void fdb_notify(struct net_bridge *br,
|
|
|
|
const struct net_bridge_fdb_entry *, int);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-03-22 04:42:33 +08:00
|
|
|
static u32 fdb_salt __read_mostly;
|
|
|
|
|
2007-04-07 17:57:07 +08:00
|
|
|
int __init br_fdb_init(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
br_fdb_cache = kmem_cache_create("bridge_fdb_cache",
|
|
|
|
sizeof(struct net_bridge_fdb_entry),
|
|
|
|
0,
|
2007-07-20 09:11:58 +08:00
|
|
|
SLAB_HWCACHE_ALIGN, NULL);
|
2007-04-07 17:57:07 +08:00
|
|
|
if (!br_fdb_cache)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2007-03-22 04:42:33 +08:00
|
|
|
get_random_bytes(&fdb_salt, sizeof(fdb_salt));
|
2007-04-07 17:57:07 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-12-06 13:35:23 +08:00
|
|
|
void br_fdb_fini(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
kmem_cache_destroy(br_fdb_cache);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* if topology_changing then use forward_delay (default 15 sec)
|
|
|
|
* otherwise keep longer (default 5 minutes)
|
|
|
|
*/
|
2007-03-22 04:42:33 +08:00
|
|
|
static inline unsigned long hold_time(const struct net_bridge *br)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
return br->topology_change ? br->forward_delay : br->ageing_time;
|
|
|
|
}
|
|
|
|
|
2007-03-22 04:42:33 +08:00
|
|
|
static inline int has_expired(const struct net_bridge *br,
|
2005-04-17 06:20:36 +08:00
|
|
|
const struct net_bridge_fdb_entry *fdb)
|
|
|
|
{
|
2009-11-30 08:55:45 +08:00
|
|
|
return !fdb->is_static &&
|
2011-04-04 22:03:28 +08:00
|
|
|
time_before_eq(fdb->updated + hold_time(br), jiffies);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2013-02-13 20:00:16 +08:00
|
|
|
static inline int br_mac_hash(const unsigned char *mac, __u16 vid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2013-02-13 20:00:16 +08:00
|
|
|
/* use 1 byte of OUI and 3 bytes of NIC */
|
2007-03-22 04:42:33 +08:00
|
|
|
u32 key = get_unaligned((u32 *)(mac + 2));
|
2013-02-13 20:00:16 +08:00
|
|
|
return jhash_2words(key, vid, fdb_salt) & (BR_HASH_SIZE - 1);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2009-06-05 13:35:28 +08: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);
|
|
|
|
}
|
|
|
|
|
2014-05-16 21:59:19 +08: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 21:34:12 +08:00
|
|
|
static void fdb_add_hw_addr(struct net_bridge *br, const unsigned char *addr)
|
2014-05-16 21:59:19 +08:00
|
|
|
{
|
|
|
|
int err;
|
2014-06-18 16:07:16 +08:00
|
|
|
struct net_bridge_port *p;
|
2014-05-16 21:59:19 +08: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 16:07:16 +08: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 21:59:19 +08: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 21:34:12 +08:00
|
|
|
static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
|
2014-05-16 21:59:19 +08: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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-08 15:17:41 +08:00
|
|
|
static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2014-05-16 21:59:19 +08:00
|
|
|
if (f->is_static)
|
2014-11-28 21:34:12 +08:00
|
|
|
fdb_del_hw_addr(br, f->addr.addr);
|
2014-05-16 21:59:19 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
hlist_del_rcu(&f->hlist);
|
2011-12-08 15:17:41 +08:00
|
|
|
fdb_notify(br, f, RTM_DELNEIGH);
|
2009-06-05 13:35:28 +08:00
|
|
|
call_rcu(&f->rcu, fdb_rcu_free);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2014-02-07 15:48:23 +08: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)
|
|
|
|
{
|
|
|
|
const unsigned char *addr = f->addr.addr;
|
|
|
|
u16 vid = f->vlan_id;
|
|
|
|
struct net_bridge_port *op;
|
|
|
|
|
|
|
|
/* Maybe another port has same hw addr? */
|
|
|
|
list_for_each_entry(op, &br->port_list, list) {
|
|
|
|
if (op != p && ether_addr_equal(op->dev->dev_addr, addr) &&
|
|
|
|
(!vid || nbp_vlan_find(op, vid))) {
|
|
|
|
f->dst = op;
|
2014-02-07 15:48:24 +08:00
|
|
|
f->added_by_user = 0;
|
2014-02-07 15:48:23 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Maybe bridge device has same hw addr? */
|
|
|
|
if (p && ether_addr_equal(br->dev->dev_addr, addr) &&
|
|
|
|
(!vid || br_vlan_find(br, vid))) {
|
|
|
|
f->dst = NULL;
|
2014-02-07 15:48:24 +08:00
|
|
|
f->added_by_user = 0;
|
2014-02-07 15:48:23 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
fdb_delete(br, f);
|
|
|
|
}
|
|
|
|
|
2014-02-07 15:48:25 +08:00
|
|
|
void br_fdb_find_delete_local(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 vid)
|
|
|
|
{
|
|
|
|
struct hlist_head *head = &br->hash[br_mac_hash(addr, vid)];
|
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
f = fdb_find(head, addr, vid);
|
|
|
|
if (f && f->is_local && !f->added_by_user && f->dst == p)
|
|
|
|
fdb_delete_local(br, p, f);
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr)
|
|
|
|
{
|
|
|
|
struct net_bridge *br = p->br;
|
2014-02-07 15:48:19 +08:00
|
|
|
struct net_port_vlans *pv = nbp_get_vlan_info(p);
|
|
|
|
bool no_vlan = !pv;
|
2005-04-17 06:20:36 +08:00
|
|
|
int i;
|
2014-02-07 15:48:19 +08:00
|
|
|
u16 vid;
|
2007-02-09 22:24:35 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
/* Search all chains since old address/hash is unknown */
|
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
struct hlist_node *h;
|
|
|
|
hlist_for_each(h, &br->hash[i]) {
|
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
|
|
|
|
f = hlist_entry(h, struct net_bridge_fdb_entry, hlist);
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
if (f->dst == p && f->is_local && !f->added_by_user) {
|
2005-04-17 06:20:36 +08:00
|
|
|
/* delete old one */
|
2014-02-07 15:48:23 +08:00
|
|
|
fdb_delete_local(br, p, f);
|
|
|
|
|
2013-02-13 20:00:19 +08:00
|
|
|
/* if this port has no vlan information
|
|
|
|
* configured, we can safely be done at
|
|
|
|
* this point.
|
|
|
|
*/
|
|
|
|
if (no_vlan)
|
2014-02-07 15:48:19 +08:00
|
|
|
goto insert;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-07 15:48:19 +08:00
|
|
|
insert:
|
|
|
|
/* insert new address, may fail if invalid address or dup. */
|
|
|
|
fdb_insert(br, p, newaddr, 0);
|
|
|
|
|
|
|
|
if (no_vlan)
|
|
|
|
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.
|
|
|
|
*/
|
|
|
|
for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID)
|
|
|
|
fdb_insert(br, p, newaddr, vid);
|
|
|
|
|
2013-02-13 20:00:19 +08:00
|
|
|
done:
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
|
|
|
|
2011-12-08 15:17:49 +08:00
|
|
|
void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *f;
|
2013-02-13 20:00:19 +08:00
|
|
|
struct net_port_vlans *pv;
|
|
|
|
u16 vid = 0;
|
2011-12-08 15:17:49 +08:00
|
|
|
|
2014-02-07 15:48:26 +08:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
2011-12-08 15:17:49 +08:00
|
|
|
/* If old entry was unassociated with any port, then delete it. */
|
2013-02-13 20:00:16 +08:00
|
|
|
f = __br_fdb_get(br, br->dev->dev_addr, 0);
|
2011-12-08 15:17:49 +08:00
|
|
|
if (f && f->is_local && !f->dst)
|
2014-02-07 15:48:23 +08:00
|
|
|
fdb_delete_local(br, NULL, f);
|
2011-12-08 15:17:49 +08:00
|
|
|
|
2013-02-13 20:00:19 +08:00
|
|
|
fdb_insert(br, NULL, newaddr, 0);
|
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*/
|
|
|
|
pv = br_get_vlan_info(br);
|
|
|
|
if (!pv)
|
2014-02-07 15:48:26 +08:00
|
|
|
goto out;
|
2013-02-13 20:00:19 +08:00
|
|
|
|
2013-08-20 16:10:18 +08:00
|
|
|
for_each_set_bit_from(vid, pv->vlan_bitmap, VLAN_N_VID) {
|
2013-02-13 20:00:19 +08:00
|
|
|
f = __br_fdb_get(br, br->dev->dev_addr, vid);
|
|
|
|
if (f && f->is_local && !f->dst)
|
2014-02-07 15:48:23 +08:00
|
|
|
fdb_delete_local(br, NULL, f);
|
2013-02-13 20:00:19 +08:00
|
|
|
fdb_insert(br, NULL, newaddr, vid);
|
|
|
|
}
|
2014-02-07 15:48:26 +08:00
|
|
|
out:
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
2011-12-08 15:17:49 +08:00
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
void br_fdb_cleanup(unsigned long _data)
|
|
|
|
{
|
|
|
|
struct net_bridge *br = (struct net_bridge *)_data;
|
|
|
|
unsigned long delay = hold_time(br);
|
2010-06-15 14:14:12 +08:00
|
|
|
unsigned long next_timer = jiffies + br->ageing_time;
|
2005-04-17 06:20:36 +08:00
|
|
|
int i;
|
|
|
|
|
2012-01-16 12:35:50 +08:00
|
|
|
spin_lock(&br->hash_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
struct net_bridge_fdb_entry *f;
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
struct hlist_node *n;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry_safe(f, n, &br->hash[i], hlist) {
|
2007-05-31 16:20:45 +08:00
|
|
|
unsigned long this_timer;
|
2015-02-05 15:52:44 +08:00
|
|
|
if (f->is_static)
|
2007-05-31 16:20:45 +08:00
|
|
|
continue;
|
2011-04-04 22:03:28 +08:00
|
|
|
this_timer = f->updated + delay;
|
2007-05-31 16:20:45 +08:00
|
|
|
if (time_before_eq(this_timer, jiffies))
|
2011-12-08 15:17:41 +08:00
|
|
|
fdb_delete(br, f);
|
2008-03-21 06:54:58 +08:00
|
|
|
else if (time_before(this_timer, next_timer))
|
2007-05-31 16:20:45 +08:00
|
|
|
next_timer = this_timer;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2012-01-16 12:35:50 +08:00
|
|
|
spin_unlock(&br->hash_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2010-06-15 14:14:12 +08:00
|
|
|
mod_timer(&br->gc_timer, round_jiffies_up(next_timer));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-04-10 03:57:54 +08:00
|
|
|
/* Completely flush all dynamic entries in forwarding database.*/
|
|
|
|
void br_fdb_flush(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
struct net_bridge_fdb_entry *f;
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
struct hlist_node *n;
|
|
|
|
hlist_for_each_entry_safe(f, n, &br->hash[i], hlist) {
|
2007-04-10 03:57:54 +08:00
|
|
|
if (!f->is_static)
|
2011-12-08 15:17:41 +08:00
|
|
|
fdb_delete(br, f);
|
2007-04-10 03:57:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
2006-10-13 05:45:38 +08:00
|
|
|
|
2011-03-31 09:57:33 +08:00
|
|
|
/* Flush all entries referring to a specific port.
|
2007-04-10 03:57:54 +08:00
|
|
|
* if do_all is set also flush static entries
|
|
|
|
*/
|
2006-10-13 05:45:38 +08:00
|
|
|
void br_fdb_delete_by_port(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
int do_all)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
struct hlist_node *h, *g;
|
2007-02-09 22:24:35 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
hlist_for_each_safe(h, g, &br->hash[i]) {
|
|
|
|
struct net_bridge_fdb_entry *f
|
|
|
|
= hlist_entry(h, struct net_bridge_fdb_entry, hlist);
|
2007-02-09 22:24:35 +08:00
|
|
|
if (f->dst != p)
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
|
|
|
|
2006-10-13 05:45:38 +08:00
|
|
|
if (f->is_static && !do_all)
|
|
|
|
continue;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-02-07 15:48:24 +08:00
|
|
|
if (f->is_local)
|
|
|
|
fdb_delete_local(br, p, f);
|
|
|
|
else
|
|
|
|
fdb_delete(br, f);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
}
|
|
|
|
|
2010-07-27 16:26:30 +08:00
|
|
|
/* No locking or refcounting, assumes caller has rcu_read_lock */
|
2005-04-17 06:20:36 +08:00
|
|
|
struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
|
2013-02-13 20:00:16 +08:00
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry_rcu(fdb,
|
2013-02-13 20:00:16 +08:00
|
|
|
&br->hash[br_mac_hash(addr, vid)], hlist) {
|
|
|
|
if (ether_addr_equal(fdb->addr.addr, addr) &&
|
|
|
|
fdb->vlan_id == vid) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (unlikely(has_expired(br, fdb)))
|
|
|
|
break;
|
|
|
|
return fdb;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-12-12 10:58:25 +08:00
|
|
|
#if IS_ENABLED(CONFIG_ATM_LANE)
|
2009-06-05 13:35:28 +08: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-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
2010-11-15 14:38:13 +08:00
|
|
|
struct net_bridge_port *port;
|
2009-06-05 13:35:28 +08:00
|
|
|
int ret;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
rcu_read_lock();
|
2010-11-15 14:38:13 +08:00
|
|
|
port = br_port_get_rcu(dev);
|
|
|
|
if (!port)
|
|
|
|
ret = 0;
|
|
|
|
else {
|
2013-02-13 20:00:16 +08:00
|
|
|
fdb = __br_fdb_get(port->br, addr, 0);
|
2011-12-08 15:17:49 +08:00
|
|
|
ret = fdb && fdb->dst && fdb->dst->dev != dev &&
|
2010-11-15 14:38:13 +08:00
|
|
|
fdb->dst->state == BR_STATE_FORWARDING;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
rcu_read_unlock();
|
|
|
|
|
2009-06-05 13:35:28 +08:00
|
|
|
return ret;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2009-06-05 13:35:28 +08:00
|
|
|
#endif /* CONFIG_ATM_LANE */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
2007-02-09 22:24:35 +08:00
|
|
|
* Fill buffer with forwarding table records in
|
2005-04-17 06:20:36 +08:00
|
|
|
* the API format.
|
|
|
|
*/
|
|
|
|
int br_fdb_fillbuf(struct net_bridge *br, void *buf,
|
|
|
|
unsigned long maxnum, unsigned long skip)
|
|
|
|
{
|
|
|
|
struct __fdb_entry *fe = buf;
|
|
|
|
int i, num = 0;
|
|
|
|
struct net_bridge_fdb_entry *f;
|
|
|
|
|
|
|
|
memset(buf, 0, maxnum*sizeof(struct __fdb_entry));
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
|
2005-04-17 06:20:36 +08:00
|
|
|
if (num >= maxnum)
|
|
|
|
goto out;
|
|
|
|
|
2007-02-09 22:24:35 +08:00
|
|
|
if (has_expired(br, f))
|
2005-04-17 06:20:36 +08:00
|
|
|
continue;
|
|
|
|
|
2011-12-08 15:17:49 +08:00
|
|
|
/* ignore pseudo entry for local MAC address */
|
|
|
|
if (!f->dst)
|
|
|
|
continue;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (skip) {
|
|
|
|
--skip;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* convert from internal format to API */
|
|
|
|
memcpy(fe->mac_addr, f->addr.addr, ETH_ALEN);
|
2008-05-03 07:53:33 +08:00
|
|
|
|
|
|
|
/* due to ABI compat need to split into hi/lo */
|
2005-04-17 06:20:36 +08:00
|
|
|
fe->port_no = f->dst->port_no;
|
2008-05-03 07:53:33 +08:00
|
|
|
fe->port_hi = f->dst->port_no >> 8;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
fe->is_local = f->is_local;
|
|
|
|
if (!f->is_static)
|
2012-08-09 05:13:53 +08:00
|
|
|
fe->ageing_timer_value = jiffies_delta_to_clock_t(jiffies - f->updated);
|
2005-04-17 06:20:36 +08:00
|
|
|
++fe;
|
|
|
|
++num;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return num;
|
|
|
|
}
|
|
|
|
|
2011-04-04 22:03:29 +08:00
|
|
|
static struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
|
2013-02-13 20:00:16 +08:00
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
2011-04-04 22:03:29 +08:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry(fdb, head, hlist) {
|
2013-02-13 20:00:16 +08:00
|
|
|
if (ether_addr_equal(fdb->addr.addr, addr) &&
|
|
|
|
fdb->vlan_id == vid)
|
2011-04-04 22:03:29 +08:00
|
|
|
return fdb;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct net_bridge_fdb_entry *fdb_find_rcu(struct hlist_head *head,
|
2013-02-13 20:00:16 +08:00
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry_rcu(fdb, head, hlist) {
|
2013-02-13 20:00:16 +08:00
|
|
|
if (ether_addr_equal(fdb->addr.addr, addr) &&
|
|
|
|
fdb->vlan_id == vid)
|
2005-04-17 06:20:36 +08:00
|
|
|
return fdb;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head,
|
|
|
|
struct net_bridge_port *source,
|
2013-02-13 20:00:16 +08:00
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
|
|
|
fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC);
|
|
|
|
if (fdb) {
|
|
|
|
memcpy(fdb->addr.addr, addr, ETH_ALEN);
|
|
|
|
fdb->dst = source;
|
2013-02-13 20:00:16 +08:00
|
|
|
fdb->vlan_id = vid;
|
2011-04-04 22:03:27 +08:00
|
|
|
fdb->is_local = 0;
|
|
|
|
fdb->is_static = 0;
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
fdb->added_by_user = 0;
|
2014-11-28 21:34:21 +08:00
|
|
|
fdb->added_by_external_learn = 0;
|
2011-04-04 22:03:28 +08:00
|
|
|
fdb->updated = fdb->used = jiffies;
|
2011-02-05 05:02:36 +08:00
|
|
|
hlist_add_head_rcu(&fdb->hlist, head);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
return fdb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
2013-02-13 20:00:19 +08:00
|
|
|
const unsigned char *addr, u16 vid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2013-02-13 20:00:19 +08:00
|
|
|
struct hlist_head *head = &br->hash[br_mac_hash(addr, vid)];
|
2005-04-17 06:20:36 +08:00
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
|
|
|
if (!is_valid_ether_addr(addr))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-02-13 20:00:19 +08:00
|
|
|
fdb = fdb_find(head, addr, vid);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (fdb) {
|
2007-02-09 22:24:35 +08:00
|
|
|
/* it is okay to have multiple ports with same
|
2005-04-17 06:20:36 +08:00
|
|
|
* address, just use the first one.
|
|
|
|
*/
|
2007-02-09 22:24:35 +08:00
|
|
|
if (fdb->is_local)
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
2010-05-10 17:31:09 +08:00
|
|
|
br_warn(br, "adding interface %s with same address "
|
2005-04-17 06:20:36 +08:00
|
|
|
"as a received packet\n",
|
2013-03-23 10:27:50 +08:00
|
|
|
source ? source->dev->name : br->dev->name);
|
2011-12-08 15:17:41 +08:00
|
|
|
fdb_delete(br, fdb);
|
2007-02-09 22:24:35 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2013-02-13 20:00:19 +08:00
|
|
|
fdb = fdb_create(head, source, addr, vid);
|
2011-04-04 22:03:27 +08:00
|
|
|
if (!fdb)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2011-04-04 22:03:27 +08:00
|
|
|
fdb->is_local = fdb->is_static = 1;
|
2014-11-28 21:34:12 +08:00
|
|
|
fdb_add_hw_addr(br, addr);
|
2011-12-08 15:17:41 +08:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-04-04 22:03:27 +08:00
|
|
|
/* Add entry for local address of interface */
|
2005-04-17 06:20:36 +08:00
|
|
|
int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
2013-02-13 20:00:19 +08:00
|
|
|
const unsigned char *addr, u16 vid)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
spin_lock_bh(&br->hash_lock);
|
2013-02-13 20:00:19 +08:00
|
|
|
ret = fdb_insert(br, source, addr, vid);
|
2005-04-17 06:20:36 +08:00
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
const unsigned char *addr, u16 vid, bool added_by_user)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2013-02-13 20:00:16 +08:00
|
|
|
struct hlist_head *head = &br->hash[br_mac_hash(addr, vid)];
|
2005-04-17 06:20:36 +08:00
|
|
|
struct net_bridge_fdb_entry *fdb;
|
2014-05-29 15:27:16 +08:00
|
|
|
bool fdb_modified = false;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* some users want to always flood. */
|
|
|
|
if (hold_time(br) == 0)
|
|
|
|
return;
|
|
|
|
|
2007-08-31 13:15:35 +08:00
|
|
|
/* ignore packets unless we are using this port */
|
|
|
|
if (!(source->state == BR_STATE_LEARNING ||
|
|
|
|
source->state == BR_STATE_FORWARDING))
|
|
|
|
return;
|
|
|
|
|
2013-02-13 20:00:16 +08:00
|
|
|
fdb = fdb_find_rcu(head, addr, vid);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (likely(fdb)) {
|
|
|
|
/* attempt to update an entry for a local interface */
|
|
|
|
if (unlikely(fdb->is_local)) {
|
2007-02-09 22:24:35 +08:00
|
|
|
if (net_ratelimit())
|
2010-05-10 17:31:09 +08:00
|
|
|
br_warn(br, "received packet on %s with "
|
|
|
|
"own address as source address\n",
|
|
|
|
source->dev->name);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
|
|
|
/* fastpath: update of existing entry */
|
2014-05-29 15:27:16 +08:00
|
|
|
if (unlikely(source != fdb->dst)) {
|
|
|
|
fdb->dst = source;
|
|
|
|
fdb_modified = true;
|
|
|
|
}
|
2011-04-04 22:03:28 +08:00
|
|
|
fdb->updated = jiffies;
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
if (unlikely(added_by_user))
|
|
|
|
fdb->added_by_user = 1;
|
2014-05-29 15:27:16 +08:00
|
|
|
if (unlikely(fdb_modified))
|
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
} else {
|
2006-03-21 14:58:36 +08:00
|
|
|
spin_lock(&br->hash_lock);
|
2013-02-13 20:00:16 +08:00
|
|
|
if (likely(!fdb_find(head, addr, vid))) {
|
|
|
|
fdb = fdb_create(head, source, addr, vid);
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
if (fdb) {
|
|
|
|
if (unlikely(added_by_user))
|
|
|
|
fdb->added_by_user = 1;
|
2011-12-08 15:17:41 +08:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH);
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
}
|
2011-12-06 21:02:24 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
/* else we lose race and someone else inserts
|
|
|
|
* it first, don't bother updating
|
|
|
|
*/
|
2006-03-21 14:58:36 +08:00
|
|
|
spin_unlock(&br->hash_lock);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
}
|
2011-04-04 22:03:30 +08:00
|
|
|
|
|
|
|
static int fdb_to_nud(const struct net_bridge_fdb_entry *fdb)
|
|
|
|
{
|
|
|
|
if (fdb->is_local)
|
|
|
|
return NUD_PERMANENT;
|
|
|
|
else if (fdb->is_static)
|
|
|
|
return NUD_NOARP;
|
|
|
|
else if (has_expired(fdb->dst->br, fdb))
|
|
|
|
return NUD_STALE;
|
|
|
|
else
|
|
|
|
return NUD_REACHABLE;
|
|
|
|
}
|
|
|
|
|
2011-12-08 15:17:41 +08:00
|
|
|
static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br,
|
2011-04-04 22:03:30 +08:00
|
|
|
const struct net_bridge_fdb_entry *fdb,
|
2012-09-08 04:12:54 +08:00
|
|
|
u32 portid, u32 seq, int type, unsigned int flags)
|
2011-04-04 22:03:30 +08:00
|
|
|
{
|
|
|
|
unsigned long now = jiffies;
|
|
|
|
struct nda_cacheinfo ci;
|
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
struct ndmsg *ndm;
|
|
|
|
|
2012-09-08 04:12:54 +08:00
|
|
|
nlh = nlmsg_put(skb, portid, seq, type, sizeof(*ndm), flags);
|
2011-04-04 22:03:30 +08:00
|
|
|
if (nlh == NULL)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
ndm = nlmsg_data(nlh);
|
|
|
|
ndm->ndm_family = AF_BRIDGE;
|
|
|
|
ndm->ndm_pad1 = 0;
|
|
|
|
ndm->ndm_pad2 = 0;
|
2014-11-28 21:34:21 +08:00
|
|
|
ndm->ndm_flags = fdb->added_by_external_learn ? NTF_EXT_LEARNED : 0;
|
2011-04-04 22:03:30 +08:00
|
|
|
ndm->ndm_type = 0;
|
2011-12-08 15:17:49 +08:00
|
|
|
ndm->ndm_ifindex = fdb->dst ? fdb->dst->dev->ifindex : br->dev->ifindex;
|
2011-04-04 22:03:30 +08:00
|
|
|
ndm->ndm_state = fdb_to_nud(fdb);
|
|
|
|
|
2012-04-02 08:49:54 +08:00
|
|
|
if (nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->addr))
|
|
|
|
goto nla_put_failure;
|
2014-05-28 13:39:37 +08:00
|
|
|
if (nla_put_u32(skb, NDA_MASTER, br->dev->ifindex))
|
|
|
|
goto nla_put_failure;
|
2011-04-04 22:03:30 +08: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-02 08:49:54 +08:00
|
|
|
if (nla_put(skb, NDA_CACHEINFO, sizeof(ci), &ci))
|
|
|
|
goto nla_put_failure;
|
2013-02-13 20:00:18 +08:00
|
|
|
|
2014-07-30 12:31:51 +08:00
|
|
|
if (fdb->vlan_id && nla_put(skb, NDA_VLAN, sizeof(u16), &fdb->vlan_id))
|
2013-02-13 20:00:18 +08:00
|
|
|
goto nla_put_failure;
|
|
|
|
|
2015-01-17 05:09:00 +08:00
|
|
|
nlmsg_end(skb, nlh);
|
|
|
|
return 0;
|
2011-04-04 22:03:30 +08: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-28 13:39:37 +08:00
|
|
|
+ nla_total_size(sizeof(u32)) /* NDA_MASTER */
|
2013-02-13 20:00:18 +08:00
|
|
|
+ nla_total_size(sizeof(u16)) /* NDA_VLAN */
|
2011-04-04 22:03:30 +08:00
|
|
|
+ nla_total_size(sizeof(struct nda_cacheinfo));
|
|
|
|
}
|
|
|
|
|
2011-12-08 15:17:41 +08:00
|
|
|
static void fdb_notify(struct net_bridge *br,
|
|
|
|
const struct net_bridge_fdb_entry *fdb, int type)
|
2011-04-04 22:03:30 +08:00
|
|
|
{
|
2011-12-08 15:17:41 +08:00
|
|
|
struct net *net = dev_net(br->dev);
|
2011-04-04 22:03:30 +08:00
|
|
|
struct sk_buff *skb;
|
|
|
|
int err = -ENOBUFS;
|
|
|
|
|
|
|
|
skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC);
|
|
|
|
if (skb == NULL)
|
|
|
|
goto errout;
|
|
|
|
|
2011-12-08 15:17:41 +08:00
|
|
|
err = fdb_fill_info(skb, br, fdb, 0, 0, type, 0);
|
2011-04-04 22:03:30 +08: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-19 13:28:10 +08:00
|
|
|
rtnl_set_sk_err(net, RTNLGRP_NEIGH, err);
|
2011-04-04 22:03:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Dump information about entries, in response to GETNEIGH */
|
2012-04-15 14:43:56 +08:00
|
|
|
int br_fdb_dump(struct sk_buff *skb,
|
|
|
|
struct netlink_callback *cb,
|
|
|
|
struct net_device *dev,
|
2014-07-10 19:01:58 +08:00
|
|
|
struct net_device *filter_dev,
|
2012-04-15 14:43:56 +08:00
|
|
|
int idx)
|
2011-04-04 22:03:30 +08:00
|
|
|
{
|
2012-04-15 14:43:56 +08:00
|
|
|
struct net_bridge *br = netdev_priv(dev);
|
|
|
|
int i;
|
2011-04-04 22:03:30 +08:00
|
|
|
|
2012-04-15 14:43:56 +08:00
|
|
|
if (!(dev->priv_flags & IFF_EBRIDGE))
|
|
|
|
goto out;
|
2011-04-04 22:03:30 +08:00
|
|
|
|
2015-01-06 01:29:21 +08:00
|
|
|
if (!filter_dev)
|
|
|
|
idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
|
|
|
|
|
2012-04-15 14:43:56 +08:00
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
struct net_bridge_fdb_entry *f;
|
2011-04-04 22:03:30 +08:00
|
|
|
|
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c]
[akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c]
[akpm@linux-foundation.org: checkpatch fixes]
[akpm@linux-foundation.org: fix warnings]
[akpm@linux-foudnation.org: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <peter.senna@gmail.com>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-02-28 09:06:00 +08:00
|
|
|
hlist_for_each_entry_rcu(f, &br->hash[i], hlist) {
|
2012-04-15 14:43:56 +08:00
|
|
|
if (idx < cb->args[0])
|
|
|
|
goto skip;
|
|
|
|
|
2014-07-10 19:01:59 +08:00
|
|
|
if (filter_dev &&
|
|
|
|
(!f->dst || f->dst->dev != filter_dev)) {
|
|
|
|
if (filter_dev != dev)
|
|
|
|
goto skip;
|
2015-01-06 01:29:21 +08:00
|
|
|
/* !f->dst is a special case for bridge
|
2014-07-10 19:01:59 +08:00
|
|
|
* 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)
|
|
|
|
goto skip;
|
|
|
|
}
|
2015-01-06 01:29:21 +08:00
|
|
|
if (!filter_dev && f->dst)
|
|
|
|
goto skip;
|
2014-07-10 19:01:58 +08:00
|
|
|
|
2012-04-15 14:43:56 +08:00
|
|
|
if (fdb_fill_info(skb, br, f,
|
2012-09-08 04:12:54 +08:00
|
|
|
NETLINK_CB(cb->skb).portid,
|
2012-04-15 14:43:56 +08:00
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
RTM_NEWNEIGH,
|
|
|
|
NLM_F_MULTI) < 0)
|
|
|
|
break;
|
2011-04-04 22:03:30 +08:00
|
|
|
skip:
|
2012-04-15 14:43:56 +08:00
|
|
|
++idx;
|
2011-04-04 22:03:30 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-15 14:43:56 +08:00
|
|
|
out:
|
|
|
|
return idx;
|
2011-04-04 22:03:30 +08:00
|
|
|
}
|
2011-04-04 22:03:31 +08:00
|
|
|
|
2011-11-10 02:30:08 +08:00
|
|
|
/* Update (create or replace) forwarding database entry */
|
2011-04-04 22:03:31 +08:00
|
|
|
static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr,
|
2013-02-13 20:00:16 +08:00
|
|
|
__u16 state, __u16 flags, __u16 vid)
|
2011-04-04 22:03:31 +08:00
|
|
|
{
|
|
|
|
struct net_bridge *br = source->br;
|
2013-02-13 20:00:16 +08:00
|
|
|
struct hlist_head *head = &br->hash[br_mac_hash(addr, vid)];
|
2011-04-04 22:03:31 +08:00
|
|
|
struct net_bridge_fdb_entry *fdb;
|
2013-04-22 20:56:49 +08:00
|
|
|
bool modified = false;
|
2011-04-04 22:03:31 +08:00
|
|
|
|
2013-02-13 20:00:16 +08:00
|
|
|
fdb = fdb_find(head, addr, vid);
|
2011-09-30 22:37:27 +08:00
|
|
|
if (fdb == NULL) {
|
|
|
|
if (!(flags & NLM_F_CREATE))
|
|
|
|
return -ENOENT;
|
2011-04-04 22:03:31 +08:00
|
|
|
|
2013-02-13 20:00:16 +08:00
|
|
|
fdb = fdb_create(head, source, addr, vid);
|
2011-09-30 22:37:27 +08:00
|
|
|
if (!fdb)
|
|
|
|
return -ENOMEM;
|
2013-04-22 20:56:49 +08:00
|
|
|
|
|
|
|
modified = true;
|
2011-09-30 22:37:27 +08:00
|
|
|
} else {
|
|
|
|
if (flags & NLM_F_EXCL)
|
|
|
|
return -EEXIST;
|
2013-04-22 20:56:49 +08:00
|
|
|
|
|
|
|
if (fdb->dst != source) {
|
|
|
|
fdb->dst = source;
|
|
|
|
modified = true;
|
|
|
|
}
|
2011-11-10 02:30:08 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fdb_to_nud(fdb) != state) {
|
2014-05-16 21:59:19 +08:00
|
|
|
if (state & NUD_PERMANENT) {
|
|
|
|
fdb->is_local = 1;
|
|
|
|
if (!fdb->is_static) {
|
|
|
|
fdb->is_static = 1;
|
2014-11-28 21:34:12 +08:00
|
|
|
fdb_add_hw_addr(br, addr);
|
2014-05-16 21:59:19 +08:00
|
|
|
}
|
|
|
|
} else if (state & NUD_NOARP) {
|
|
|
|
fdb->is_local = 0;
|
|
|
|
if (!fdb->is_static) {
|
|
|
|
fdb->is_static = 1;
|
2014-11-28 21:34:12 +08:00
|
|
|
fdb_add_hw_addr(br, addr);
|
2014-05-16 21:59:19 +08:00
|
|
|
}
|
|
|
|
} else {
|
2011-11-10 02:30:08 +08:00
|
|
|
fdb->is_local = 0;
|
2014-05-16 21:59:19 +08:00
|
|
|
if (fdb->is_static) {
|
|
|
|
fdb->is_static = 0;
|
2014-11-28 21:34:12 +08:00
|
|
|
fdb_del_hw_addr(br, addr);
|
2014-05-16 21:59:19 +08:00
|
|
|
}
|
|
|
|
}
|
2011-09-30 22:37:27 +08:00
|
|
|
|
2013-04-22 20:56:49 +08:00
|
|
|
modified = true;
|
|
|
|
}
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
fdb->added_by_user = 1;
|
2013-04-22 20:56:49 +08:00
|
|
|
|
|
|
|
fdb->used = jiffies;
|
|
|
|
if (modified) {
|
|
|
|
fdb->updated = jiffies;
|
2011-12-08 15:17:41 +08:00
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH);
|
2011-09-30 22:37:27 +08:00
|
|
|
}
|
2011-04-04 22:03:31 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 nlh_flags, u16 vid)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (ndm->ndm_flags & NTF_USE) {
|
|
|
|
rcu_read_lock();
|
bridge: Fix the way to find old local fdb entries in br_fdb_changeaddr
br_fdb_changeaddr() assumes that there is at most one local entry per port
per vlan. It used to be true, but since commit 36fd2b63e3b4 ("bridge: allow
creating/deleting fdb entries via netlink"), it has not been so.
Therefore, the function might fail to search a correct previous address
to be deleted and delete an arbitrary local entry if user has added local
entries manually.
Example of problematic case:
ip link set eth0 address ee:ff:12:34:56:78
brctl addif br0 eth0
bridge fdb add 12:34:56:78:90:ab dev eth0 master
ip link set eth0 address aa:bb:cc:dd:ee:ff
Then, the address 12:34:56:78:90:ab might be deleted instead of
ee:ff:12:34:56:78, the original mac address of eth0.
Address this issue by introducing a new flag, added_by_user, to struct
net_bridge_fdb_entry.
Note that br_fdb_delete_by_port() has to set added_by_user to 0 in cases
like:
ip link set eth0 address 12:34:56:78:90:ab
ip link set eth1 address aa:bb:cc:dd:ee:ff
brctl addif br0 eth0
bridge fdb add aa:bb:cc:dd:ee:ff dev eth0 master
brctl addif br0 eth1
brctl delif br0 eth0
In this case, kernel should delete the user-added entry aa:bb:cc:dd:ee:ff,
but it also should have been added by "brctl addif br0 eth1" originally,
so we don't delete it and treat it a new kernel-created entry.
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-07 15:48:18 +08:00
|
|
|
br_fdb_update(p->br, p, addr, vid, true);
|
2013-02-13 20:00:18 +08:00
|
|
|
rcu_read_unlock();
|
|
|
|
} else {
|
|
|
|
spin_lock_bh(&p->br->hash_lock);
|
|
|
|
err = fdb_add_entry(p, addr, ndm->ndm_state,
|
|
|
|
nlh_flags, vid);
|
|
|
|
spin_unlock_bh(&p->br->hash_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-04-04 22:03:31 +08:00
|
|
|
/* Add new permanent fdb entry with RTM_NEWNEIGH */
|
2012-10-01 20:32:33 +08:00
|
|
|
int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
|
|
|
struct net_device *dev,
|
2014-11-28 21:34:15 +08:00
|
|
|
const unsigned char *addr, u16 vid, u16 nlh_flags)
|
2011-04-04 22:03:31 +08:00
|
|
|
{
|
|
|
|
struct net_bridge_port *p;
|
2012-04-15 14:43:56 +08:00
|
|
|
int err = 0;
|
2013-02-13 20:00:18 +08:00
|
|
|
struct net_port_vlans *pv;
|
2011-04-04 22:03:31 +08:00
|
|
|
|
2011-11-10 02:30:08 +08: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-26 00:34:36 +08:00
|
|
|
if (is_zero_ether_addr(addr)) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH with invalid ether address\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2011-04-04 22:03:31 +08:00
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
if (p == NULL) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH %s not a bridge port\n",
|
|
|
|
dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
pv = nbp_get_vlan_info(p);
|
2014-11-28 21:34:15 +08:00
|
|
|
if (vid) {
|
2013-02-13 20:00:18 +08:00
|
|
|
if (!pv || !test_bit(vid, pv->vlan_bitmap)) {
|
|
|
|
pr_info("bridge: RTM_NEWNEIGH with unconfigured "
|
|
|
|
"vlan %d on port %s\n", vid, dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* VID was specified, so use it. */
|
|
|
|
err = __br_fdb_add(ndm, p, addr, nlh_flags, vid);
|
2011-11-10 02:30:08 +08:00
|
|
|
} else {
|
2015-02-09 19:16:17 +08:00
|
|
|
err = __br_fdb_add(ndm, p, addr, nlh_flags, 0);
|
|
|
|
if (err || !pv)
|
2013-02-13 20:00:18 +08: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.
|
|
|
|
*/
|
2013-08-20 16:10:18 +08:00
|
|
|
for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID) {
|
2013-02-13 20:00:18 +08:00
|
|
|
err = __br_fdb_add(ndm, p, addr, nlh_flags, vid);
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
}
|
2011-11-10 02:30:08 +08:00
|
|
|
}
|
2011-04-04 22:03:31 +08:00
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
out:
|
2011-04-04 22:03:31 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-02-07 15:48:25 +08:00
|
|
|
static int fdb_delete_by_addr(struct net_bridge *br, const u8 *addr, u16 vlan)
|
2011-04-04 22:03:31 +08:00
|
|
|
{
|
2013-02-13 20:00:18 +08:00
|
|
|
struct hlist_head *head = &br->hash[br_mac_hash(addr, vlan)];
|
2011-04-04 22:03:31 +08:00
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
fdb = fdb_find(head, addr, vlan);
|
2011-04-04 22:03:31 +08:00
|
|
|
if (!fdb)
|
|
|
|
return -ENOENT;
|
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
fdb_delete(br, fdb);
|
2011-04-04 22:03:31 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
static int __br_fdb_delete(struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 vid)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
spin_lock_bh(&p->br->hash_lock);
|
|
|
|
err = fdb_delete_by_addr(p->br, addr, vid);
|
|
|
|
spin_unlock_bh(&p->br->hash_lock);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-04-04 22:03:31 +08:00
|
|
|
/* Remove neighbor entry with RTM_DELNEIGH */
|
2013-02-13 20:00:18 +08:00
|
|
|
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
|
|
|
struct net_device *dev,
|
2014-11-28 21:34:15 +08:00
|
|
|
const unsigned char *addr, u16 vid)
|
2011-04-04 22:03:31 +08:00
|
|
|
{
|
|
|
|
struct net_bridge_port *p;
|
|
|
|
int err;
|
2013-02-13 20:00:18 +08:00
|
|
|
struct net_port_vlans *pv;
|
|
|
|
|
2011-04-04 22:03:31 +08:00
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
if (p == NULL) {
|
|
|
|
pr_info("bridge: RTM_DELNEIGH %s not a bridge port\n",
|
|
|
|
dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
pv = nbp_get_vlan_info(p);
|
2014-11-28 21:34:15 +08:00
|
|
|
if (vid) {
|
2013-02-13 20:00:18 +08:00
|
|
|
if (!pv || !test_bit(vid, pv->vlan_bitmap)) {
|
|
|
|
pr_info("bridge: RTM_DELNEIGH with unconfigured "
|
|
|
|
"vlan %d on port %s\n", vid, dev->name);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2011-04-04 22:03:31 +08:00
|
|
|
|
2013-02-13 20:00:18 +08:00
|
|
|
err = __br_fdb_delete(p, addr, vid);
|
|
|
|
} else {
|
2015-02-09 19:16:17 +08:00
|
|
|
err = -ENOENT;
|
|
|
|
err &= __br_fdb_delete(p, addr, 0);
|
|
|
|
if (!pv)
|
2013-02-13 20:00:18 +08: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.
|
|
|
|
*/
|
2013-08-20 16:10:18 +08:00
|
|
|
for_each_set_bit(vid, pv->vlan_bitmap, VLAN_N_VID) {
|
2013-02-13 20:00:18 +08:00
|
|
|
err &= __br_fdb_delete(p, addr, vid);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out:
|
2011-04-04 22:03:31 +08:00
|
|
|
return err;
|
|
|
|
}
|
2014-05-16 21:59:17 +08:00
|
|
|
|
|
|
|
int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb, *tmp;
|
|
|
|
int i;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
hlist_for_each_entry(fdb, &br->hash[i], hlist) {
|
|
|
|
/* We only care for static entries */
|
|
|
|
if (!fdb->is_static)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
err = dev_uc_add(p->dev, fdb->addr.addr);
|
|
|
|
if (err)
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
rollback:
|
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
hlist_for_each_entry(tmp, &br->hash[i], hlist) {
|
|
|
|
/* If we reached the fdb that failed, we can stop */
|
|
|
|
if (tmp == fdb)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* We only care for static entries */
|
|
|
|
if (!tmp->is_static)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
dev_uc_del(p->dev, tmp->addr.addr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
|
|
|
for (i = 0; i < BR_HASH_SIZE; i++) {
|
|
|
|
hlist_for_each_entry_rcu(fdb, &br->hash[i], hlist) {
|
|
|
|
/* We only care for static entries */
|
|
|
|
if (!fdb->is_static)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
dev_uc_del(p->dev, fdb->addr.addr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-11-28 21:34:21 +08:00
|
|
|
|
2015-01-16 06:49:37 +08:00
|
|
|
int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
|
2014-11-28 21:34:21 +08:00
|
|
|
const unsigned char *addr, u16 vid)
|
|
|
|
{
|
|
|
|
struct hlist_head *head;
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
int err = 0;
|
|
|
|
|
2015-01-16 06:49:37 +08:00
|
|
|
ASSERT_RTNL();
|
2014-11-28 21:34:21 +08:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
head = &br->hash[br_mac_hash(addr, vid)];
|
|
|
|
fdb = fdb_find(head, addr, vid);
|
|
|
|
if (!fdb) {
|
|
|
|
fdb = fdb_create(head, p, addr, vid);
|
|
|
|
if (!fdb) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto err_unlock;
|
|
|
|
}
|
|
|
|
fdb->added_by_external_learn = 1;
|
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH);
|
|
|
|
} else if (fdb->added_by_external_learn) {
|
|
|
|
/* Refresh entry */
|
|
|
|
fdb->updated = fdb->used = jiffies;
|
|
|
|
} else if (!fdb->added_by_user) {
|
|
|
|
/* Take over SW learned entry */
|
|
|
|
fdb->added_by_external_learn = 1;
|
|
|
|
fdb->updated = jiffies;
|
|
|
|
fdb_notify(br, fdb, RTM_NEWNEIGH);
|
|
|
|
}
|
|
|
|
|
|
|
|
err_unlock:
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-01-16 06:49:37 +08:00
|
|
|
int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
|
2014-11-28 21:34:21 +08:00
|
|
|
const unsigned char *addr, u16 vid)
|
|
|
|
{
|
|
|
|
struct hlist_head *head;
|
|
|
|
struct net_bridge_fdb_entry *fdb;
|
|
|
|
int err = 0;
|
|
|
|
|
2015-01-16 06:49:37 +08:00
|
|
|
ASSERT_RTNL();
|
2014-11-28 21:34:21 +08:00
|
|
|
spin_lock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
head = &br->hash[br_mac_hash(addr, vid)];
|
|
|
|
fdb = fdb_find(head, addr, vid);
|
|
|
|
if (fdb && fdb->added_by_external_learn)
|
|
|
|
fdb_delete(br, fdb);
|
|
|
|
else
|
|
|
|
err = -ENOENT;
|
|
|
|
|
|
|
|
spin_unlock_bh(&br->hash_lock);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|