2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Handle incoming frames
|
|
|
|
* 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 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>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/netfilter_bridge.h>
|
2014-10-23 15:49:17 -06:00
|
|
|
#include <linux/neighbour.h>
|
|
|
|
#include <net/arp.h>
|
2011-07-15 09:47:34 -06:00
|
|
|
#include <linux/export.h>
|
2013-02-13 05:00:10 -07:00
|
|
|
#include <linux/rculist.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
#include "br_private.h"
|
2017-01-31 23:59:55 -07:00
|
|
|
#include "br_private_tunnel.h"
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-11-14 23:38:11 -07:00
|
|
|
/* Hook for brouter */
|
|
|
|
br_should_route_hook_t __rcu *br_should_route_hook __read_mostly;
|
|
|
|
EXPORT_SYMBOL(br_should_route_hook);
|
|
|
|
|
2015-09-15 19:04:18 -06:00
|
|
|
static int
|
|
|
|
br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb)
|
2015-09-15 19:04:15 -06:00
|
|
|
{
|
2017-03-13 10:38:17 -06:00
|
|
|
br_drop_fake_rtable(skb);
|
2015-09-15 19:04:15 -06:00
|
|
|
return netif_receive_skb(skb);
|
|
|
|
}
|
|
|
|
|
2010-02-27 12:41:40 -07:00
|
|
|
static int br_pass_frame_up(struct sk_buff *skb)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2010-02-27 12:41:40 -07:00
|
|
|
struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
|
2010-03-02 06:32:09 -07:00
|
|
|
struct net_bridge *br = netdev_priv(brdev);
|
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;
|
2014-01-03 22:57:59 -07:00
|
|
|
struct pcpu_sw_netstats *brstats = this_cpu_ptr(br->stats);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-06-23 14:00:48 -06:00
|
|
|
u64_stats_update_begin(&brstats->syncp);
|
2010-03-02 06:32:09 -07:00
|
|
|
brstats->rx_packets++;
|
|
|
|
brstats->rx_bytes += skb->len;
|
2010-06-23 14:00:48 -06:00
|
|
|
u64_stats_update_end(&brstats->syncp);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2015-10-12 13:47:02 -06:00
|
|
|
vg = br_vlan_group_rcu(br);
|
2013-02-13 05:00:11 -07:00
|
|
|
/* Bridge is just like any other port. Make sure the
|
|
|
|
* packet is allowed except in promisc modue when someone
|
|
|
|
* may be running packet capture.
|
|
|
|
*/
|
|
|
|
if (!(brdev->flags & IFF_PROMISC) &&
|
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
|
|
|
!br_allowed_egress(vg, skb)) {
|
2013-02-13 05:00:11 -07:00
|
|
|
kfree_skb(skb);
|
|
|
|
return NET_RX_DROP;
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
indev = skb->dev;
|
2008-05-21 15:13:47 -06:00
|
|
|
skb->dev = brdev;
|
2017-01-31 23:59:55 -07:00
|
|
|
skb = br_handle_vlan(br, NULL, vg, skb);
|
2014-03-27 19:51:18 -06:00
|
|
|
if (!skb)
|
|
|
|
return NET_RX_DROP;
|
2016-06-28 08:57:06 -06:00
|
|
|
/* update the multicast stats if the packet is IGMP/MLD */
|
2016-07-06 13:12:21 -06:00
|
|
|
br_multicast_count(br, NULL, skb, br_multicast_igmp_type(skb),
|
2016-06-28 08:57:06 -06:00
|
|
|
BR_MCAST_DIR_TX);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2015-09-15 19:04:16 -06:00
|
|
|
return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN,
|
|
|
|
dev_net(indev), NULL, skb, indev, NULL,
|
2015-09-15 19:04:15 -06:00
|
|
|
br_netif_receive_skb);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2010-07-27 02:26:30 -06:00
|
|
|
/* note: already called with rcu_read_lock */
|
2015-09-15 19:04:18 -06:00
|
|
|
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2010-06-15 00:50:45 -06:00
|
|
|
struct net_bridge_port *p = br_port_get_rcu(skb->dev);
|
2016-08-31 07:36:51 -06:00
|
|
|
enum br_pkt_type pkt_type = BR_PKT_UNICAST;
|
2016-07-13 21:09:59 -06:00
|
|
|
struct net_bridge_fdb_entry *dst = NULL;
|
2010-02-27 12:41:48 -07:00
|
|
|
struct net_bridge_mdb_entry *mdst;
|
2016-08-31 07:36:51 -06:00
|
|
|
bool local_rcv, mcast_hit = false;
|
2016-07-13 21:09:59 -06:00
|
|
|
struct net_bridge *br;
|
2013-02-13 05:00:14 -07:00
|
|
|
u16 vid = 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2006-02-09 18:08:52 -07:00
|
|
|
if (!p || p->state == BR_STATE_DISABLED)
|
|
|
|
goto drop;
|
|
|
|
|
2015-10-12 13:47:02 -06:00
|
|
|
if (!br_allowed_ingress(p->br, nbp_vlan_group_rcu(p), skb, &vid))
|
2014-04-09 02:00:30 -06:00
|
|
|
goto out;
|
2013-02-13 05:00:10 -07:00
|
|
|
|
2016-08-25 10:42:37 -06:00
|
|
|
nbp_switchdev_frame_mark(p, skb);
|
|
|
|
|
2005-05-29 15:15:55 -06:00
|
|
|
/* insert into forwarding database after filtering to avoid spoofing */
|
2006-02-09 18:08:52 -07:00
|
|
|
br = p->br;
|
2013-06-05 08:08:00 -06:00
|
|
|
if (p->flags & BR_LEARNING)
|
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 00:48:18 -07:00
|
|
|
br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, false);
|
2005-05-29 15:15:55 -06:00
|
|
|
|
2016-08-31 07:36:51 -06:00
|
|
|
local_rcv = !!(br->dev->flags & IFF_PROMISC);
|
2019-07-02 06:00:20 -06:00
|
|
|
if (is_multicast_ether_addr(eth_hdr(skb)->h_dest)) {
|
2016-08-31 07:36:51 -06:00
|
|
|
/* by definition the broadcast is also a multicast address */
|
2019-07-02 06:00:20 -06:00
|
|
|
if (is_broadcast_ether_addr(eth_hdr(skb)->h_dest)) {
|
2016-08-31 07:36:51 -06:00
|
|
|
pkt_type = BR_PKT_BROADCAST;
|
|
|
|
local_rcv = true;
|
|
|
|
} else {
|
|
|
|
pkt_type = BR_PKT_MULTICAST;
|
|
|
|
if (br_multicast_rcv(br, p, skb, vid))
|
|
|
|
goto drop;
|
|
|
|
}
|
|
|
|
}
|
2010-02-27 12:41:48 -07:00
|
|
|
|
2006-02-09 18:08:52 -07:00
|
|
|
if (p->state == BR_STATE_LEARNING)
|
|
|
|
goto drop;
|
2005-12-21 20:00:18 -07:00
|
|
|
|
2010-02-27 12:41:40 -07:00
|
|
|
BR_INPUT_SKB_CB(skb)->brdev = br->dev;
|
2018-05-24 02:56:48 -06:00
|
|
|
BR_INPUT_SKB_CB(skb)->src_port_isolated = !!(p->flags & BR_ISOLATED);
|
2010-02-27 12:41:40 -07:00
|
|
|
|
2017-10-06 23:12:38 -06:00
|
|
|
if (IS_ENABLED(CONFIG_INET) &&
|
|
|
|
(skb->protocol == htons(ETH_P_ARP) ||
|
|
|
|
skb->protocol == htons(ETH_P_RARP))) {
|
|
|
|
br_do_proxy_suppress_arp(skb, br, vid, p);
|
2017-10-06 23:12:39 -06:00
|
|
|
} else if (IS_ENABLED(CONFIG_IPV6) &&
|
|
|
|
skb->protocol == htons(ETH_P_IPV6) &&
|
|
|
|
br->neigh_suppress_enabled &&
|
|
|
|
pskb_may_pull(skb, sizeof(struct ipv6hdr) +
|
|
|
|
sizeof(struct nd_msg)) &&
|
|
|
|
ipv6_hdr(skb)->nexthdr == IPPROTO_ICMPV6) {
|
|
|
|
struct nd_msg *msg, _msg;
|
|
|
|
|
|
|
|
msg = br_is_nd_neigh_msg(skb, &_msg);
|
|
|
|
if (msg)
|
|
|
|
br_do_suppress_nd(skb, br, vid, p, msg);
|
2017-10-06 23:12:38 -06:00
|
|
|
}
|
2014-10-23 15:49:17 -06:00
|
|
|
|
2016-08-31 07:36:51 -06:00
|
|
|
switch (pkt_type) {
|
|
|
|
case BR_PKT_MULTICAST:
|
2013-03-06 20:05:33 -07:00
|
|
|
mdst = br_mdb_get(br, skb, vid);
|
2013-07-31 17:06:20 -06:00
|
|
|
if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) &&
|
2013-08-30 09:28:17 -06:00
|
|
|
br_multicast_querier_exists(br, eth_hdr(skb))) {
|
2017-11-09 15:10:57 -07:00
|
|
|
if ((mdst && mdst->host_joined) ||
|
2016-07-13 21:10:00 -06:00
|
|
|
br_multicast_is_router(br)) {
|
2016-07-13 21:10:01 -06:00
|
|
|
local_rcv = true;
|
2016-07-13 21:10:00 -06:00
|
|
|
br->dev->stats.multicast++;
|
|
|
|
}
|
|
|
|
mcast_hit = true;
|
2016-07-13 21:09:59 -06:00
|
|
|
} else {
|
2016-07-13 21:10:01 -06:00
|
|
|
local_rcv = true;
|
2016-07-13 21:10:00 -06:00
|
|
|
br->dev->stats.multicast++;
|
2016-07-13 21:09:59 -06:00
|
|
|
}
|
2016-08-31 07:36:51 -06:00
|
|
|
break;
|
|
|
|
case BR_PKT_UNICAST:
|
2019-07-02 06:00:20 -06:00
|
|
|
dst = br_fdb_find_rcu(br, eth_hdr(skb)->h_dest, vid);
|
2016-08-31 07:36:51 -06:00
|
|
|
default:
|
|
|
|
break;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2016-07-13 21:10:00 -06:00
|
|
|
if (dst) {
|
2017-02-07 09:46:46 -07:00
|
|
|
unsigned long now = jiffies;
|
|
|
|
|
2016-08-31 07:36:51 -06:00
|
|
|
if (dst->is_local)
|
|
|
|
return br_pass_frame_up(skb);
|
|
|
|
|
2017-02-07 09:46:46 -07:00
|
|
|
if (now != dst->used)
|
|
|
|
dst->used = now;
|
2016-07-13 21:10:02 -06:00
|
|
|
br_forward(dst->dst, skb, local_rcv, false);
|
2016-07-13 21:10:00 -06:00
|
|
|
} else {
|
|
|
|
if (!mcast_hit)
|
2016-08-31 07:36:51 -06:00
|
|
|
br_flood(br, skb, pkt_type, local_rcv, false);
|
2016-07-13 21:10:00 -06:00
|
|
|
else
|
2016-07-13 21:10:02 -06:00
|
|
|
br_multicast_flood(mdst, skb, local_rcv, false);
|
2007-09-16 17:20:48 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2016-07-13 21:10:01 -06:00
|
|
|
if (local_rcv)
|
|
|
|
return br_pass_frame_up(skb);
|
2010-02-27 12:41:39 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
out:
|
|
|
|
return 0;
|
2006-02-09 18:08:52 -07:00
|
|
|
drop:
|
|
|
|
kfree_skb(skb);
|
|
|
|
goto out;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2014-09-18 03:29:03 -06:00
|
|
|
EXPORT_SYMBOL_GPL(br_handle_frame_finish);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2016-06-07 03:06:58 -06:00
|
|
|
static void __br_handle_local_finish(struct sk_buff *skb)
|
2006-03-20 23:59:06 -07:00
|
|
|
{
|
2010-06-15 00:50:45 -06:00
|
|
|
struct net_bridge_port *p = br_port_get_rcu(skb->dev);
|
2013-02-13 05:00:16 -07:00
|
|
|
u16 vid = 0;
|
2006-03-20 23:59:06 -07:00
|
|
|
|
2014-05-26 00:15:53 -06:00
|
|
|
/* check if vlan is allowed, to avoid spoofing */
|
|
|
|
if (p->flags & BR_LEARNING && br_should_learn(p, skb, &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 00:48:18 -07:00
|
|
|
br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);
|
2016-06-07 03:06:58 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* note: already called with rcu_read_lock */
|
|
|
|
static int br_handle_local_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
__br_handle_local_finish(skb);
|
2016-03-12 03:14:42 -07:00
|
|
|
|
2019-04-11 04:56:39 -06:00
|
|
|
/* return 1 to signal the okfn() was called so it's ok to use the skb */
|
|
|
|
return 1;
|
2006-03-20 23:59:06 -07:00
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
2007-03-21 14:38:47 -06:00
|
|
|
* Return NULL if skb is handled
|
2010-07-27 02:26:30 -06:00
|
|
|
* note: already called with rcu_read_lock
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2011-03-11 20:14:39 -07:00
|
|
|
rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2010-06-01 15:52:08 -06:00
|
|
|
struct net_bridge_port *p;
|
2011-03-11 20:14:39 -07:00
|
|
|
struct sk_buff *skb = *pskb;
|
2005-04-16 16:20:36 -06:00
|
|
|
const unsigned char *dest = eth_hdr(skb)->h_dest;
|
2010-11-14 23:38:11 -07:00
|
|
|
br_should_route_hook_t *rhook;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2010-08-22 11:35:32 -06:00
|
|
|
if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
|
2011-03-11 20:14:39 -07:00
|
|
|
return RX_HANDLER_PASS;
|
2010-06-01 15:52:08 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
|
2007-03-21 14:42:06 -06:00
|
|
|
goto drop;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-10-14 01:39:01 -06:00
|
|
|
skb = skb_share_check(skb, GFP_ATOMIC);
|
|
|
|
if (!skb)
|
2011-03-11 20:14:39 -07:00
|
|
|
return RX_HANDLER_CONSUMED;
|
2007-10-14 01:39:01 -06:00
|
|
|
|
2010-06-15 00:50:45 -06:00
|
|
|
p = br_port_get_rcu(skb->dev);
|
2017-01-31 23:59:55 -07:00
|
|
|
if (p->flags & BR_VLAN_TUNNEL) {
|
|
|
|
if (br_handle_ingress_vlan_tunnel(skb, p,
|
|
|
|
nbp_vlan_group_rcu(p)))
|
|
|
|
goto drop;
|
|
|
|
}
|
2010-06-01 15:52:08 -06:00
|
|
|
|
2012-11-01 03:11:11 -06:00
|
|
|
if (unlikely(is_link_local_ether_addr(dest))) {
|
2014-06-10 05:59:24 -06:00
|
|
|
u16 fwd_mask = p->br->group_fwd_mask_required;
|
|
|
|
|
2011-10-03 12:14:46 -06:00
|
|
|
/*
|
|
|
|
* See IEEE 802.1D Table 7-10 Reserved addresses
|
|
|
|
*
|
|
|
|
* Assignment Value
|
|
|
|
* Bridge Group Address 01-80-C2-00-00-00
|
|
|
|
* (MAC Control) 802.3 01-80-C2-00-00-01
|
|
|
|
* (Link Aggregation) 802.3 01-80-C2-00-00-02
|
|
|
|
* 802.1X PAE address 01-80-C2-00-00-03
|
|
|
|
*
|
|
|
|
* 802.1AB LLDP 01-80-C2-00-00-0E
|
|
|
|
*
|
|
|
|
* Others reserved for future standardization
|
|
|
|
*/
|
2017-09-27 07:12:44 -06:00
|
|
|
fwd_mask |= p->group_fwd_mask;
|
2011-10-03 12:14:46 -06:00
|
|
|
switch (dest[5]) {
|
|
|
|
case 0x00: /* Bridge Group Address */
|
|
|
|
/* If STP is turned off,
|
|
|
|
then must forward to keep loop detection */
|
2014-06-10 05:59:24 -06:00
|
|
|
if (p->br->stp_enabled == BR_NO_STP ||
|
|
|
|
fwd_mask & (1u << dest[5]))
|
2011-10-03 12:14:46 -06:00
|
|
|
goto forward;
|
2016-06-07 03:06:58 -06:00
|
|
|
*pskb = skb;
|
|
|
|
__br_handle_local_finish(skb);
|
|
|
|
return RX_HANDLER_PASS;
|
2011-10-03 12:14:46 -06:00
|
|
|
|
|
|
|
case 0x01: /* IEEE MAC (Pause) */
|
2007-04-25 23:05:55 -06:00
|
|
|
goto drop;
|
|
|
|
|
2016-07-22 05:56:20 -06:00
|
|
|
case 0x0E: /* 802.1AB LLDP */
|
|
|
|
fwd_mask |= p->br->group_fwd_mask;
|
|
|
|
if (fwd_mask & (1u << dest[5]))
|
|
|
|
goto forward;
|
|
|
|
*pskb = skb;
|
|
|
|
__br_handle_local_finish(skb);
|
|
|
|
return RX_HANDLER_PASS;
|
|
|
|
|
2011-10-03 12:14:46 -06:00
|
|
|
default:
|
|
|
|
/* Allow selective forwarding for most other protocols */
|
2014-06-10 05:59:24 -06:00
|
|
|
fwd_mask |= p->br->group_fwd_mask;
|
|
|
|
if (fwd_mask & (1u << dest[5]))
|
2011-10-03 12:14:46 -06:00
|
|
|
goto forward;
|
|
|
|
}
|
2009-05-15 00:10:13 -06:00
|
|
|
|
2019-04-11 04:56:39 -06:00
|
|
|
/* The else clause should be hit when nf_hook():
|
|
|
|
* - returns < 0 (drop/error)
|
|
|
|
* - returns = 0 (stolen/nf_queue)
|
|
|
|
* Thus return 1 from the okfn() to signal the skb is ok to pass
|
|
|
|
*/
|
|
|
|
if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN,
|
|
|
|
dev_net(skb->dev), NULL, skb, skb->dev, NULL,
|
|
|
|
br_handle_local_finish) == 1) {
|
|
|
|
return RX_HANDLER_PASS;
|
|
|
|
} else {
|
|
|
|
return RX_HANDLER_CONSUMED;
|
|
|
|
}
|
2007-04-25 23:05:55 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-05-15 00:10:13 -06:00
|
|
|
forward:
|
2007-03-21 14:42:06 -06:00
|
|
|
switch (p->state) {
|
|
|
|
case BR_STATE_FORWARDING:
|
2007-11-29 05:58:58 -07:00
|
|
|
rhook = rcu_dereference(br_should_route_hook);
|
2010-11-14 23:38:11 -07:00
|
|
|
if (rhook) {
|
2011-03-11 20:14:39 -07:00
|
|
|
if ((*rhook)(skb)) {
|
|
|
|
*pskb = skb;
|
|
|
|
return RX_HANDLER_PASS;
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
dest = eth_hdr(skb)->h_dest;
|
|
|
|
}
|
2007-03-21 14:42:06 -06:00
|
|
|
/* fall through */
|
|
|
|
case BR_STATE_LEARNING:
|
bridge: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 12:56:49 -06:00
|
|
|
if (ether_addr_equal(p->br->dev->dev_addr, dest))
|
2005-04-16 16:20:36 -06:00
|
|
|
skb->pkt_type = PACKET_HOST;
|
|
|
|
|
2015-09-15 19:04:16 -06:00
|
|
|
NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING,
|
|
|
|
dev_net(skb->dev), NULL, skb, skb->dev, NULL,
|
2005-04-16 16:20:36 -06:00
|
|
|
br_handle_frame_finish);
|
2007-03-21 14:42:06 -06:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
drop:
|
|
|
|
kfree_skb(skb);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2011-03-11 20:14:39 -07:00
|
|
|
return RX_HANDLER_CONSUMED;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|