2005-04-17 02:20:36 +04:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _BR_PRIVATE_H
|
|
|
|
#define _BR_PRIVATE_H
|
|
|
|
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/if_bridge.h>
|
2010-06-10 20:12:50 +04:00
|
|
|
#include <linux/netpoll.h>
|
2010-06-24 00:00:48 +04:00
|
|
|
#include <linux/u64_stats_sync.h>
|
2008-07-31 03:27:55 +04:00
|
|
|
#include <net/route.h>
|
2015-05-30 16:30:16 +03:00
|
|
|
#include <net/ip6_fib.h>
|
2013-02-13 16:00:09 +04:00
|
|
|
#include <linux/if_vlan.h>
|
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 20:00:11 +03:00
|
|
|
#include <linux/rhashtable.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#define BR_HASH_BITS 8
|
|
|
|
#define BR_HASH_SIZE (1 << BR_HASH_BITS)
|
|
|
|
|
|
|
|
#define BR_HOLD_TIME (1*HZ)
|
|
|
|
|
|
|
|
#define BR_PORT_BITS 10
|
|
|
|
#define BR_MAX_PORTS (1<<BR_PORT_BITS)
|
|
|
|
|
2007-03-22 00:22:44 +03:00
|
|
|
#define BR_VERSION "2.3"
|
|
|
|
|
2011-10-03 22:14:46 +04:00
|
|
|
/* Control of forwarding link local multicast */
|
|
|
|
#define BR_GROUPFWD_DEFAULT 0
|
2015-05-04 23:47:13 +03:00
|
|
|
/* Don't allow forwarding of control protocols like STP, MAC PAUSE and LACP */
|
|
|
|
#define BR_GROUPFWD_RESTRICTED 0x0007u
|
2014-06-10 15:59:24 +04:00
|
|
|
/* The Nearest Customer Bridge Group Address, 01-80-C2-00-00-[00,0B,0C,0D,0F] */
|
|
|
|
#define BR_GROUPFWD_8021AD 0xB801u
|
2011-10-03 22:14:46 +04:00
|
|
|
|
2007-03-22 00:22:44 +03:00
|
|
|
/* Path to usermode spanning tree program */
|
|
|
|
#define BR_STP_PROG "/sbin/bridge-stp"
|
2005-12-22 06:01:30 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
typedef struct bridge_id bridge_id;
|
|
|
|
typedef struct mac_addr mac_addr;
|
|
|
|
typedef __u16 port_id;
|
|
|
|
|
|
|
|
struct bridge_id
|
|
|
|
{
|
|
|
|
unsigned char prio[2];
|
2014-02-23 12:05:25 +04:00
|
|
|
unsigned char addr[ETH_ALEN];
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
struct mac_addr
|
|
|
|
{
|
2014-02-23 12:05:25 +04:00
|
|
|
unsigned char addr[ETH_ALEN];
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2013-08-30 19:28:17 +04:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
/* our own querier */
|
2014-06-07 20:26:26 +04:00
|
|
|
struct bridge_mcast_own_query {
|
2013-08-30 19:28:17 +04:00
|
|
|
struct timer_list timer;
|
|
|
|
u32 startup_sent;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* other querier */
|
2014-06-07 20:26:26 +04:00
|
|
|
struct bridge_mcast_other_query {
|
2013-08-30 19:28:17 +04:00
|
|
|
struct timer_list timer;
|
|
|
|
unsigned long delay_time;
|
|
|
|
};
|
2014-06-07 20:26:27 +04:00
|
|
|
|
|
|
|
/* selected querier */
|
|
|
|
struct bridge_mcast_querier {
|
|
|
|
struct br_ip addr;
|
2014-06-07 20:26:29 +04:00
|
|
|
struct net_bridge_port __rcu *port;
|
2014-06-07 20:26:27 +04:00
|
|
|
};
|
2016-06-28 17:57:06 +03:00
|
|
|
|
|
|
|
/* IGMP/MLD statistics */
|
|
|
|
struct bridge_mcast_stats {
|
|
|
|
struct br_mcast_stats mstats;
|
|
|
|
struct u64_stats_sync syncp;
|
|
|
|
};
|
2013-08-30 19:28:17 +04:00
|
|
|
#endif
|
|
|
|
|
2016-04-30 11:25:28 +03:00
|
|
|
struct br_vlan_stats {
|
|
|
|
u64 rx_bytes;
|
|
|
|
u64 rx_packets;
|
|
|
|
u64 tx_bytes;
|
|
|
|
u64 tx_packets;
|
|
|
|
struct u64_stats_sync syncp;
|
|
|
|
};
|
|
|
|
|
2017-02-01 09:59:54 +03:00
|
|
|
struct br_tunnel_info {
|
|
|
|
__be64 tunnel_id;
|
|
|
|
struct metadata_dst *tunnel_dst;
|
|
|
|
};
|
|
|
|
|
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 20:00:11 +03:00
|
|
|
/**
|
|
|
|
* struct net_bridge_vlan - per-vlan entry
|
|
|
|
*
|
|
|
|
* @vnode: rhashtable member
|
|
|
|
* @vid: VLAN id
|
|
|
|
* @flags: bridge vlan flags
|
2016-04-30 11:25:28 +03:00
|
|
|
* @stats: per-cpu VLAN statistics
|
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 20:00:11 +03:00
|
|
|
* @br: if MASTER flag set, this points to a bridge struct
|
|
|
|
* @port: if MASTER flag unset, this points to a port struct
|
|
|
|
* @refcnt: if MASTER flag set, this is bumped for each port referencing it
|
|
|
|
* @brvlan: if MASTER flag unset, this points to the global per-VLAN context
|
|
|
|
* for this VLAN entry
|
|
|
|
* @vlist: sorted list of VLAN entries
|
|
|
|
* @rcu: used for entry destruction
|
|
|
|
*
|
|
|
|
* This structure is shared between the global per-VLAN entries contained in
|
|
|
|
* the bridge rhashtable and the local per-port per-VLAN entries contained in
|
|
|
|
* the port's rhashtable. The union entries should be interpreted depending on
|
|
|
|
* the entry flags that are set.
|
|
|
|
*/
|
|
|
|
struct net_bridge_vlan {
|
|
|
|
struct rhash_head vnode;
|
2017-02-01 09:59:54 +03:00
|
|
|
struct rhash_head tnode;
|
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 20:00:11 +03:00
|
|
|
u16 vid;
|
|
|
|
u16 flags;
|
2016-04-30 11:25:28 +03:00
|
|
|
struct br_vlan_stats __percpu *stats;
|
2013-02-13 16:00:09 +04:00
|
|
|
union {
|
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 20:00:11 +03:00
|
|
|
struct net_bridge *br;
|
|
|
|
struct net_bridge_port *port;
|
|
|
|
};
|
|
|
|
union {
|
|
|
|
atomic_t refcnt;
|
|
|
|
struct net_bridge_vlan *brvlan;
|
|
|
|
};
|
2017-02-01 09:59:54 +03:00
|
|
|
|
|
|
|
struct br_tunnel_info tinfo;
|
|
|
|
|
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 20:00:11 +03:00
|
|
|
struct list_head vlist;
|
|
|
|
|
2013-02-13 16:00:09 +04:00
|
|
|
struct rcu_head rcu;
|
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 20:00:11 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* struct net_bridge_vlan_group
|
|
|
|
*
|
|
|
|
* @vlan_hash: VLAN entry rhashtable
|
|
|
|
* @vlan_list: sorted VLAN entry list
|
|
|
|
* @num_vlans: number of total VLAN entries
|
2015-09-30 21:16:53 +03:00
|
|
|
* @pvid: PVID VLAN id
|
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 20:00:11 +03:00
|
|
|
*
|
|
|
|
* IMPORTANT: Be careful when checking if there're VLAN entries using list
|
|
|
|
* primitives because the bridge can have entries in its list which
|
|
|
|
* are just for global context but not for filtering, i.e. they have
|
|
|
|
* the master flag set but not the brentry flag. If you have to check
|
|
|
|
* if there're "real" entries in the bridge please test @num_vlans
|
|
|
|
*/
|
|
|
|
struct net_bridge_vlan_group {
|
|
|
|
struct rhashtable vlan_hash;
|
2017-02-01 09:59:54 +03:00
|
|
|
struct rhashtable tunnel_hash;
|
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 20:00:11 +03:00
|
|
|
struct list_head vlan_list;
|
2013-02-13 16:00:13 +04:00
|
|
|
u16 num_vlans;
|
2015-09-30 21:16:53 +03:00
|
|
|
u16 pvid;
|
2013-02-13 16:00:09 +04:00
|
|
|
};
|
|
|
|
|
2017-02-04 20:05:08 +03:00
|
|
|
struct net_bridge_fdb_entry {
|
2005-04-17 02:20:36 +04:00
|
|
|
struct hlist_node hlist;
|
|
|
|
struct net_bridge_port *dst;
|
|
|
|
|
|
|
|
mac_addr addr;
|
bridge: fdb: rearrange net_bridge_fdb_entry
While looking into fixing the local entries scalability issue I noticed
that the structure is badly arranged because vlan_id would fall in a
second cache line while keeping rcu which is used only when deleting
in the first, so re-arrange the structure and push rcu to the end so we
can get 16 bytes which can be used for other fields (by pushing rcu
fully in the second 64 byte chunk). With this change all the core
necessary information when doing fdb lookups will be available in a
single cache line.
pahole before (note vlan_id):
struct net_bridge_fdb_entry {
struct hlist_node hlist; /* 0 16 */
struct net_bridge_port * dst; /* 16 8 */
struct callback_head rcu; /* 24 16 */
long unsigned int updated; /* 40 8 */
long unsigned int used; /* 48 8 */
mac_addr addr; /* 56 6 */
unsigned char is_local:1; /* 62: 7 1 */
unsigned char is_static:1; /* 62: 6 1 */
unsigned char added_by_user:1; /* 62: 5 1 */
unsigned char added_by_external_learn:1; /* 62: 4 1 */
/* XXX 4 bits hole, try to pack */
/* XXX 1 byte hole, try to pack */
/* --- cacheline 1 boundary (64 bytes) --- */
__u16 vlan_id; /* 64 2 */
/* size: 72, cachelines: 2, members: 11 */
/* sum members: 65, holes: 1, sum holes: 1 */
/* bit holes: 1, sum bit holes: 4 bits */
/* padding: 6 */
/* last cacheline: 8 bytes */
}
pahole after (note vlan_id):
struct net_bridge_fdb_entry {
struct hlist_node hlist; /* 0 16 */
struct net_bridge_port * dst; /* 16 8 */
long unsigned int updated; /* 24 8 */
long unsigned int used; /* 32 8 */
mac_addr addr; /* 40 6 */
__u16 vlan_id; /* 46 2 */
unsigned char is_local:1; /* 48: 7 1 */
unsigned char is_static:1; /* 48: 6 1 */
unsigned char added_by_user:1; /* 48: 5 1 */
unsigned char added_by_external_learn:1; /* 48: 4 1 */
/* XXX 4 bits hole, try to pack */
/* XXX 7 bytes hole, try to pack */
struct callback_head rcu; /* 56 16 */
/* --- cacheline 1 boundary (64 bytes) was 8 bytes ago --- */
/* size: 72, cachelines: 2, members: 11 */
/* sum members: 65, holes: 1, sum holes: 7 */
/* bit holes: 1, sum bit holes: 4 bits */
/* last cacheline: 8 bytes */
}
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-08-28 00:19:20 +03:00
|
|
|
__u16 vlan_id;
|
2014-11-28 16:34:14 +03:00
|
|
|
unsigned char is_local:1,
|
|
|
|
is_static:1,
|
2014-11-28 16:34:21 +03:00
|
|
|
added_by_user:1,
|
|
|
|
added_by_external_learn:1;
|
2017-02-04 20:05:08 +03:00
|
|
|
|
|
|
|
/* write-heavy members should not affect lookups */
|
|
|
|
unsigned long updated ____cacheline_aligned_in_smp;
|
|
|
|
unsigned long used;
|
|
|
|
|
bridge: fdb: rearrange net_bridge_fdb_entry
While looking into fixing the local entries scalability issue I noticed
that the structure is badly arranged because vlan_id would fall in a
second cache line while keeping rcu which is used only when deleting
in the first, so re-arrange the structure and push rcu to the end so we
can get 16 bytes which can be used for other fields (by pushing rcu
fully in the second 64 byte chunk). With this change all the core
necessary information when doing fdb lookups will be available in a
single cache line.
pahole before (note vlan_id):
struct net_bridge_fdb_entry {
struct hlist_node hlist; /* 0 16 */
struct net_bridge_port * dst; /* 16 8 */
struct callback_head rcu; /* 24 16 */
long unsigned int updated; /* 40 8 */
long unsigned int used; /* 48 8 */
mac_addr addr; /* 56 6 */
unsigned char is_local:1; /* 62: 7 1 */
unsigned char is_static:1; /* 62: 6 1 */
unsigned char added_by_user:1; /* 62: 5 1 */
unsigned char added_by_external_learn:1; /* 62: 4 1 */
/* XXX 4 bits hole, try to pack */
/* XXX 1 byte hole, try to pack */
/* --- cacheline 1 boundary (64 bytes) --- */
__u16 vlan_id; /* 64 2 */
/* size: 72, cachelines: 2, members: 11 */
/* sum members: 65, holes: 1, sum holes: 1 */
/* bit holes: 1, sum bit holes: 4 bits */
/* padding: 6 */
/* last cacheline: 8 bytes */
}
pahole after (note vlan_id):
struct net_bridge_fdb_entry {
struct hlist_node hlist; /* 0 16 */
struct net_bridge_port * dst; /* 16 8 */
long unsigned int updated; /* 24 8 */
long unsigned int used; /* 32 8 */
mac_addr addr; /* 40 6 */
__u16 vlan_id; /* 46 2 */
unsigned char is_local:1; /* 48: 7 1 */
unsigned char is_static:1; /* 48: 6 1 */
unsigned char added_by_user:1; /* 48: 5 1 */
unsigned char added_by_external_learn:1; /* 48: 4 1 */
/* XXX 4 bits hole, try to pack */
/* XXX 7 bytes hole, try to pack */
struct callback_head rcu; /* 56 16 */
/* --- cacheline 1 boundary (64 bytes) was 8 bytes ago --- */
/* size: 72, cachelines: 2, members: 11 */
/* sum members: 65, holes: 1, sum holes: 7 */
/* bit holes: 1, sum bit holes: 4 bits */
/* last cacheline: 8 bytes */
}
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-08-28 00:19:20 +03:00
|
|
|
struct rcu_head rcu;
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2016-02-03 11:57:05 +03:00
|
|
|
#define MDB_PG_FLAGS_PERMANENT BIT(0)
|
|
|
|
#define MDB_PG_FLAGS_OFFLOAD BIT(1)
|
|
|
|
|
2010-02-27 22:41:45 +03:00
|
|
|
struct net_bridge_port_group {
|
|
|
|
struct net_bridge_port *port;
|
2010-11-15 09:38:10 +03:00
|
|
|
struct net_bridge_port_group __rcu *next;
|
2010-02-27 22:41:45 +03:00
|
|
|
struct hlist_node mglist;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
struct timer_list timer;
|
2010-04-18 07:42:07 +04:00
|
|
|
struct br_ip addr;
|
2016-02-03 11:57:05 +03:00
|
|
|
unsigned char flags;
|
2017-01-21 23:01:32 +03:00
|
|
|
unsigned char eth_addr[ETH_ALEN];
|
2010-02-27 22:41:45 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
struct net_bridge_mdb_entry
|
|
|
|
{
|
|
|
|
struct hlist_node hlist[2];
|
|
|
|
struct net_bridge *br;
|
2010-11-15 09:38:10 +03:00
|
|
|
struct net_bridge_port_group __rcu *ports;
|
2010-02-27 22:41:45 +03:00
|
|
|
struct rcu_head rcu;
|
|
|
|
struct timer_list timer;
|
2010-04-18 07:42:07 +04:00
|
|
|
struct br_ip addr;
|
2011-02-12 12:05:42 +03:00
|
|
|
bool mglist;
|
2010-02-27 22:41:45 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
struct net_bridge_mdb_htable
|
|
|
|
{
|
|
|
|
struct hlist_head *mhash;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
struct net_bridge_mdb_htable *old;
|
|
|
|
u32 size;
|
|
|
|
u32 max;
|
|
|
|
u32 secret;
|
|
|
|
u32 ver;
|
|
|
|
};
|
|
|
|
|
2017-02-04 20:05:06 +03:00
|
|
|
struct net_bridge_port {
|
2005-04-17 02:20:36 +04:00
|
|
|
struct net_bridge *br;
|
|
|
|
struct net_device *dev;
|
|
|
|
struct list_head list;
|
|
|
|
|
2017-02-04 20:05:06 +03:00
|
|
|
unsigned long flags;
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
struct net_bridge_vlan_group __rcu *vlgrp;
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* STP */
|
|
|
|
u8 priority;
|
|
|
|
u8 state;
|
|
|
|
u16 port_no;
|
|
|
|
unsigned char topology_change_ack;
|
|
|
|
unsigned char config_pending;
|
|
|
|
port_id port_id;
|
|
|
|
port_id designated_port;
|
|
|
|
bridge_id designated_root;
|
|
|
|
bridge_id designated_bridge;
|
|
|
|
u32 path_cost;
|
|
|
|
u32 designated_cost;
|
2011-07-22 11:47:06 +04:00
|
|
|
unsigned long designated_age;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
struct timer_list forward_delay_timer;
|
|
|
|
struct timer_list hold_timer;
|
|
|
|
struct timer_list message_age_timer;
|
|
|
|
struct kobject kobj;
|
|
|
|
struct rcu_head rcu;
|
2009-08-13 10:55:16 +04:00
|
|
|
|
2010-02-27 22:41:45 +03:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
2014-06-07 20:26:26 +04:00
|
|
|
struct bridge_mcast_own_query ip4_own_query;
|
2013-08-30 19:28:17 +04:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
2014-06-07 20:26:26 +04:00
|
|
|
struct bridge_mcast_own_query ip6_own_query;
|
2013-08-30 19:28:17 +04:00
|
|
|
#endif /* IS_ENABLED(CONFIG_IPV6) */
|
2010-02-27 22:41:45 +03:00
|
|
|
unsigned char multicast_router;
|
2016-06-28 17:57:06 +03:00
|
|
|
struct bridge_mcast_stats __percpu *mcast_stats;
|
2010-02-27 22:41:45 +03:00
|
|
|
struct timer_list multicast_router_timer;
|
|
|
|
struct hlist_head mglist;
|
|
|
|
struct hlist_node rlist;
|
|
|
|
#endif
|
2010-05-10 13:31:11 +04:00
|
|
|
|
|
|
|
#ifdef CONFIG_SYSFS
|
|
|
|
char sysfs_name[IFNAMSIZ];
|
|
|
|
#endif
|
2010-06-10 20:12:50 +04:00
|
|
|
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
struct netpoll *np;
|
|
|
|
#endif
|
2016-08-25 19:42:37 +03:00
|
|
|
#ifdef CONFIG_NET_SWITCHDEV
|
|
|
|
int offload_fwd_mark;
|
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2014-05-16 17:59:16 +04:00
|
|
|
#define br_auto_port(p) ((p)->flags & BR_AUTO_MASK)
|
2014-05-16 17:59:18 +04:00
|
|
|
#define br_promisc_port(p) ((p)->flags & BR_PROMISC)
|
2014-05-16 17:59:16 +04:00
|
|
|
|
2010-06-15 10:50:45 +04:00
|
|
|
#define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT)
|
|
|
|
|
2010-11-15 09:38:13 +03:00
|
|
|
static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
|
|
|
|
{
|
2013-09-14 18:42:28 +04:00
|
|
|
return rcu_dereference(dev->rx_handler_data);
|
2010-11-15 09:38:13 +03:00
|
|
|
}
|
|
|
|
|
2013-09-14 18:42:27 +04:00
|
|
|
static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device *dev)
|
2010-11-15 09:38:13 +03:00
|
|
|
{
|
2010-11-15 09:38:14 +03:00
|
|
|
return br_port_exists(dev) ?
|
|
|
|
rtnl_dereference(dev->rx_handler_data) : NULL;
|
2010-11-15 09:38:13 +03:00
|
|
|
}
|
|
|
|
|
2017-02-04 20:05:06 +03:00
|
|
|
struct net_bridge {
|
2005-04-17 02:20:36 +04:00
|
|
|
spinlock_t lock;
|
2017-02-04 20:05:06 +03:00
|
|
|
spinlock_t hash_lock;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct list_head port_list;
|
|
|
|
struct net_device *dev;
|
2014-01-04 09:57:59 +04:00
|
|
|
struct pcpu_sw_netstats __percpu *stats;
|
2017-02-04 20:05:06 +03:00
|
|
|
/* These fields are accessed on each packet */
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
u8 vlan_enabled;
|
|
|
|
u8 vlan_stats_enabled;
|
|
|
|
__be16 vlan_proto;
|
|
|
|
u16 default_pvid;
|
|
|
|
struct net_bridge_vlan_group __rcu *vlgrp;
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
struct hlist_head hash[BR_HASH_SIZE];
|
2014-09-18 13:29:03 +04:00
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
|
2015-05-30 16:30:16 +03:00
|
|
|
union {
|
|
|
|
struct rtable fake_rtable;
|
|
|
|
struct rt6_info fake_rt6_info;
|
|
|
|
};
|
2010-07-02 11:32:57 +04:00
|
|
|
bool nf_call_iptables;
|
|
|
|
bool nf_call_ip6tables;
|
|
|
|
bool nf_call_arptables;
|
2008-07-31 03:27:55 +04:00
|
|
|
#endif
|
2011-10-03 22:14:46 +04:00
|
|
|
u16 group_fwd_mask;
|
2014-06-10 15:59:24 +04:00
|
|
|
u16 group_fwd_mask_required;
|
2011-10-03 22:14:46 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* STP */
|
|
|
|
bridge_id designated_root;
|
|
|
|
bridge_id bridge_id;
|
|
|
|
u32 root_path_cost;
|
2017-02-04 20:05:06 +03:00
|
|
|
unsigned char topology_change;
|
|
|
|
unsigned char topology_change_detected;
|
|
|
|
u16 root_port;
|
2005-04-17 02:20:36 +04:00
|
|
|
unsigned long max_age;
|
|
|
|
unsigned long hello_time;
|
|
|
|
unsigned long forward_delay;
|
|
|
|
unsigned long ageing_time;
|
2016-12-10 21:44:29 +03:00
|
|
|
unsigned long bridge_max_age;
|
2005-04-17 02:20:36 +04:00
|
|
|
unsigned long bridge_hello_time;
|
|
|
|
unsigned long bridge_forward_delay;
|
2016-12-10 21:44:29 +03:00
|
|
|
unsigned long bridge_ageing_time;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-03-21 09:59:21 +03:00
|
|
|
u8 group_addr[ETH_ALEN];
|
2014-06-10 15:59:25 +04:00
|
|
|
bool group_addr_set;
|
2007-03-22 00:22:44 +03:00
|
|
|
|
|
|
|
enum {
|
|
|
|
BR_NO_STP, /* no spanning tree */
|
|
|
|
BR_KERNEL_STP, /* old STP in kernel */
|
|
|
|
BR_USER_STP, /* new RSTP in userspace */
|
|
|
|
} stp_enabled;
|
|
|
|
|
2010-02-27 22:41:45 +03:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
unsigned char multicast_router;
|
|
|
|
|
|
|
|
u8 multicast_disabled:1;
|
2012-04-13 06:37:42 +04:00
|
|
|
u8 multicast_querier:1;
|
2013-05-22 01:52:54 +04:00
|
|
|
u8 multicast_query_use_ifaddr:1;
|
2016-06-24 13:35:18 +03:00
|
|
|
u8 has_ipv6_addr:1;
|
2016-06-28 17:57:06 +03:00
|
|
|
u8 multicast_stats_enabled:1;
|
2010-02-27 22:41:45 +03:00
|
|
|
|
|
|
|
u32 hash_elasticity;
|
|
|
|
u32 hash_max;
|
|
|
|
|
|
|
|
u32 multicast_last_member_count;
|
|
|
|
u32 multicast_startup_query_count;
|
|
|
|
|
2016-11-21 15:03:24 +03:00
|
|
|
u8 multicast_igmp_version;
|
|
|
|
|
2010-02-27 22:41:45 +03:00
|
|
|
unsigned long multicast_last_member_interval;
|
|
|
|
unsigned long multicast_membership_interval;
|
|
|
|
unsigned long multicast_querier_interval;
|
|
|
|
unsigned long multicast_query_interval;
|
|
|
|
unsigned long multicast_query_response_interval;
|
|
|
|
unsigned long multicast_startup_query_interval;
|
|
|
|
|
|
|
|
spinlock_t multicast_lock;
|
2010-11-15 09:38:10 +03:00
|
|
|
struct net_bridge_mdb_htable __rcu *mdb;
|
2010-02-27 22:41:45 +03:00
|
|
|
struct hlist_head router_list;
|
|
|
|
|
|
|
|
struct timer_list multicast_router_timer;
|
2014-06-07 20:26:26 +04:00
|
|
|
struct bridge_mcast_other_query ip4_other_query;
|
|
|
|
struct bridge_mcast_own_query ip4_own_query;
|
2014-06-07 20:26:27 +04:00
|
|
|
struct bridge_mcast_querier ip4_querier;
|
2016-06-28 17:57:06 +03:00
|
|
|
struct bridge_mcast_stats __percpu *mcast_stats;
|
2013-08-30 19:28:17 +04:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
2014-06-07 20:26:26 +04:00
|
|
|
struct bridge_mcast_other_query ip6_other_query;
|
|
|
|
struct bridge_mcast_own_query ip6_own_query;
|
2014-06-07 20:26:27 +04:00
|
|
|
struct bridge_mcast_querier ip6_querier;
|
2016-11-21 15:03:25 +03:00
|
|
|
u8 multicast_mld_version;
|
2013-08-30 19:28:17 +04:00
|
|
|
#endif /* IS_ENABLED(CONFIG_IPV6) */
|
2010-02-27 22:41:45 +03:00
|
|
|
#endif
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
struct timer_list hello_timer;
|
|
|
|
struct timer_list tcn_timer;
|
|
|
|
struct timer_list topology_change_timer;
|
2017-02-04 20:05:07 +03:00
|
|
|
struct delayed_work gc_work;
|
2007-12-17 22:54:39 +03:00
|
|
|
struct kobject *ifobj;
|
2014-05-16 17:59:16 +04:00
|
|
|
u32 auto_cnt;
|
2016-08-25 19:42:37 +03:00
|
|
|
|
|
|
|
#ifdef CONFIG_NET_SWITCHDEV
|
|
|
|
int offload_fwd_mark;
|
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
};
|
|
|
|
|
2010-02-27 22:41:40 +03:00
|
|
|
struct br_input_skb_cb {
|
|
|
|
struct net_device *brdev;
|
2014-10-05 08:00:22 +04:00
|
|
|
|
2010-03-16 00:51:18 +03:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
2010-02-27 22:41:45 +03:00
|
|
|
int igmp;
|
|
|
|
int mrouters_only;
|
2010-03-16 00:51:18 +03:00
|
|
|
#endif
|
2014-10-05 08:00:22 +04:00
|
|
|
|
2015-03-04 13:54:21 +03:00
|
|
|
bool proxyarp_replied;
|
2014-10-05 08:00:22 +04:00
|
|
|
|
2014-09-13 00:26:16 +04:00
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
bool vlan_filtered;
|
|
|
|
#endif
|
2016-08-25 19:42:37 +03:00
|
|
|
|
|
|
|
#ifdef CONFIG_NET_SWITCHDEV
|
|
|
|
int offload_fwd_mark;
|
|
|
|
#endif
|
2010-02-27 22:41:40 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
#define BR_INPUT_SKB_CB(__skb) ((struct br_input_skb_cb *)(__skb)->cb)
|
|
|
|
|
2010-03-16 00:51:18 +03:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
# define BR_INPUT_SKB_CB_MROUTERS_ONLY(__skb) (BR_INPUT_SKB_CB(__skb)->mrouters_only)
|
|
|
|
#else
|
|
|
|
# define BR_INPUT_SKB_CB_MROUTERS_ONLY(__skb) (0)
|
|
|
|
#endif
|
|
|
|
|
2010-05-10 13:31:09 +04:00
|
|
|
#define br_printk(level, br, format, args...) \
|
|
|
|
printk(level "%s: " format, (br)->dev->name, ##args)
|
|
|
|
|
|
|
|
#define br_err(__br, format, args...) \
|
|
|
|
br_printk(KERN_ERR, __br, format, ##args)
|
|
|
|
#define br_warn(__br, format, args...) \
|
|
|
|
br_printk(KERN_WARNING, __br, format, ##args)
|
|
|
|
#define br_notice(__br, format, args...) \
|
|
|
|
br_printk(KERN_NOTICE, __br, format, ##args)
|
|
|
|
#define br_info(__br, format, args...) \
|
|
|
|
br_printk(KERN_INFO, __br, format, ##args)
|
|
|
|
|
|
|
|
#define br_debug(br, format, args...) \
|
|
|
|
pr_debug("%s: " format, (br)->dev->name, ##args)
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* called under bridge lock */
|
|
|
|
static inline int br_is_root_bridge(const struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return !memcmp(&br->bridge_id, &br->designated_root, 8);
|
|
|
|
}
|
|
|
|
|
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 20:00:11 +03:00
|
|
|
/* check if a VLAN entry is global */
|
|
|
|
static inline bool br_vlan_is_master(const struct net_bridge_vlan *v)
|
|
|
|
{
|
|
|
|
return v->flags & BRIDGE_VLAN_INFO_MASTER;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check if a VLAN entry is used by the bridge */
|
|
|
|
static inline bool br_vlan_is_brentry(const struct net_bridge_vlan *v)
|
|
|
|
{
|
|
|
|
return v->flags & BRIDGE_VLAN_INFO_BRENTRY;
|
|
|
|
}
|
|
|
|
|
2015-10-02 16:05:13 +03:00
|
|
|
/* check if we should use the vlan entry, returns false if it's only context */
|
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 20:00:11 +03:00
|
|
|
static inline bool br_vlan_should_use(const struct net_bridge_vlan *v)
|
|
|
|
{
|
|
|
|
if (br_vlan_is_master(v)) {
|
|
|
|
if (br_vlan_is_brentry(v))
|
|
|
|
return true;
|
|
|
|
else
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* br_device.c */
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_dev_setup(struct net_device *dev);
|
|
|
|
void br_dev_delete(struct net_device *dev, struct list_head *list);
|
|
|
|
netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev);
|
2010-05-10 13:31:08 +04:00
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
2010-06-10 20:12:50 +04:00
|
|
|
static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct netpoll *np = p->np;
|
|
|
|
|
|
|
|
if (np)
|
|
|
|
netpoll_send_skb(np, skb);
|
|
|
|
}
|
|
|
|
|
2014-03-28 02:36:38 +04:00
|
|
|
int br_netpoll_enable(struct net_bridge_port *p);
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_netpoll_disable(struct net_bridge_port *p);
|
2010-05-10 13:31:08 +04:00
|
|
|
#else
|
2010-06-16 08:43:48 +04:00
|
|
|
static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
|
2010-06-10 20:12:50 +04:00
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
}
|
2010-05-10 13:31:08 +04:00
|
|
|
|
2014-03-28 02:36:38 +04:00
|
|
|
static inline int br_netpoll_enable(struct net_bridge_port *p)
|
2010-06-10 20:12:50 +04:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_netpoll_disable(struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
}
|
2010-05-10 13:31:08 +04:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_fdb.c */
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_fdb_init(void);
|
|
|
|
void br_fdb_fini(void);
|
|
|
|
void br_fdb_flush(struct net_bridge *br);
|
2014-02-07 11:48:25 +04:00
|
|
|
void br_fdb_find_delete_local(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 vid);
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr);
|
|
|
|
void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr);
|
2017-02-04 20:05:07 +03:00
|
|
|
void br_fdb_cleanup(struct work_struct *work);
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_fdb_delete_by_port(struct net_bridge *br,
|
2015-06-23 15:28:16 +03:00
|
|
|
const struct net_bridge_port *p, u16 vid, int do_all);
|
2017-02-13 16:59:09 +03:00
|
|
|
struct net_bridge_fdb_entry *br_fdb_find_rcu(struct net_bridge *br,
|
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid);
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_fdb_test_addr(struct net_device *dev, unsigned char *addr);
|
|
|
|
int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count,
|
|
|
|
unsigned long off);
|
|
|
|
int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
|
|
|
|
const unsigned char *addr, u16 vid);
|
|
|
|
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 11:48:18 +04:00
|
|
|
const unsigned char *addr, u16 vid, bool added_by_user);
|
2013-10-19 00:48:22 +04:00
|
|
|
|
|
|
|
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
2014-11-28 16:34:15 +03:00
|
|
|
struct net_device *dev, const unsigned char *addr, u16 vid);
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev,
|
2014-11-28 16:34:15 +03:00
|
|
|
const unsigned char *addr, u16 vid, u16 nlh_flags);
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
2016-08-31 07:56:45 +03:00
|
|
|
struct net_device *dev, struct net_device *fdev, int *idx);
|
2014-05-16 17:59:17 +04:00
|
|
|
int br_fdb_sync_static(struct net_bridge *br, struct net_bridge_port *p);
|
|
|
|
void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p);
|
2015-01-16 01:49:37 +03:00
|
|
|
int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 vid);
|
|
|
|
int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 vid);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_forward.c */
|
2016-08-31 16:36:51 +03:00
|
|
|
enum br_pkt_type {
|
|
|
|
BR_PKT_UNICAST,
|
|
|
|
BR_PKT_MULTICAST,
|
|
|
|
BR_PKT_BROADCAST
|
|
|
|
};
|
2015-09-16 04:04:18 +03:00
|
|
|
int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb);
|
2016-07-14 06:10:01 +03:00
|
|
|
void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
|
2016-07-14 06:10:02 +03:00
|
|
|
bool local_rcv, bool local_orig);
|
2015-09-16 04:04:18 +03:00
|
|
|
int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
|
2016-07-14 06:10:02 +03:00
|
|
|
void br_flood(struct net_bridge *br, struct sk_buff *skb,
|
2016-08-31 16:36:51 +03:00
|
|
|
enum br_pkt_type pkt_type, bool local_rcv, bool local_orig);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_if.c */
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_port_carrier_check(struct net_bridge_port *p);
|
|
|
|
int br_add_bridge(struct net *net, const char *name);
|
|
|
|
int br_del_bridge(struct net *net, const char *name);
|
|
|
|
int br_add_if(struct net_bridge *br, struct net_device *dev);
|
|
|
|
int br_del_if(struct net_bridge *br, struct net_device *dev);
|
|
|
|
int br_min_mtu(const struct net_bridge *br);
|
|
|
|
netdev_features_t br_features_recompute(struct net_bridge *br,
|
|
|
|
netdev_features_t features);
|
2014-05-16 17:59:16 +04:00
|
|
|
void br_port_flags_change(struct net_bridge_port *port, unsigned long mask);
|
2014-05-16 17:59:20 +04:00
|
|
|
void br_manage_promisc(struct net_bridge *br);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_input.c */
|
2015-09-16 04:04:18 +03:00
|
|
|
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
|
2013-10-19 00:48:22 +04:00
|
|
|
rx_handler_result_t br_handle_frame(struct sk_buff **pskb);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2013-12-05 19:27:37 +04:00
|
|
|
static inline bool br_rx_handler_check_rcu(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return rcu_dereference(dev->rx_handler) == br_handle_frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_port *br_port_get_check_rcu(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return br_rx_handler_check_rcu(dev) ? br_port_get_rcu(dev) : NULL;
|
|
|
|
}
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* br_ioctl.c */
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
|
|
|
|
int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd,
|
|
|
|
void __user *arg);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2010-02-27 22:41:45 +03:00
|
|
|
/* br_multicast.c */
|
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
2012-12-10 06:15:35 +04:00
|
|
|
extern unsigned int br_mdb_rehash_seq;
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,
|
2013-11-04 22:48:30 +04:00
|
|
|
struct sk_buff *skb, u16 vid);
|
2013-10-19 00:48:22 +04:00
|
|
|
struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
|
|
|
|
struct sk_buff *skb, u16 vid);
|
2016-06-28 17:57:06 +03:00
|
|
|
int br_multicast_add_port(struct net_bridge_port *port);
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_multicast_del_port(struct net_bridge_port *port);
|
|
|
|
void br_multicast_enable_port(struct net_bridge_port *port);
|
|
|
|
void br_multicast_disable_port(struct net_bridge_port *port);
|
|
|
|
void br_multicast_init(struct net_bridge *br);
|
|
|
|
void br_multicast_open(struct net_bridge *br);
|
|
|
|
void br_multicast_stop(struct net_bridge *br);
|
2015-07-15 17:16:51 +03:00
|
|
|
void br_multicast_dev_del(struct net_bridge *br);
|
2016-07-14 06:10:02 +03:00
|
|
|
void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
|
|
|
|
struct sk_buff *skb, bool local_rcv, bool local_orig);
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_multicast_set_router(struct net_bridge *br, unsigned long val);
|
|
|
|
int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val);
|
|
|
|
int br_multicast_toggle(struct net_bridge *br, unsigned long val);
|
|
|
|
int br_multicast_set_querier(struct net_bridge *br, unsigned long val);
|
|
|
|
int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val);
|
2016-11-21 15:03:24 +03:00
|
|
|
int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val);
|
2016-11-21 15:03:25 +03:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val);
|
|
|
|
#endif
|
2013-10-19 00:48:22 +04:00
|
|
|
struct net_bridge_mdb_entry *
|
|
|
|
br_mdb_ip_get(struct net_bridge_mdb_htable *mdb, struct br_ip *dst);
|
|
|
|
struct net_bridge_mdb_entry *
|
|
|
|
br_multicast_new_group(struct net_bridge *br, struct net_bridge_port *port,
|
|
|
|
struct br_ip *group);
|
|
|
|
void br_multicast_free_pg(struct rcu_head *head);
|
|
|
|
struct net_bridge_port_group *
|
|
|
|
br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,
|
|
|
|
struct net_bridge_port_group __rcu *next,
|
2017-01-21 23:01:32 +03:00
|
|
|
unsigned char flags, const unsigned char *src);
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_mdb_init(void);
|
|
|
|
void br_mdb_uninit(void);
|
2016-04-21 13:52:45 +03:00
|
|
|
void br_mdb_notify(struct net_device *dev, struct net_bridge_port *port,
|
|
|
|
struct br_ip *group, int type, u8 flags);
|
2015-07-23 15:00:53 +03:00
|
|
|
void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,
|
|
|
|
int type);
|
2016-06-28 17:57:06 +03:00
|
|
|
void br_multicast_count(struct net_bridge *br, const struct net_bridge_port *p,
|
2016-07-06 22:12:21 +03:00
|
|
|
const struct sk_buff *skb, u8 type, u8 dir);
|
2016-06-28 17:57:06 +03:00
|
|
|
int br_multicast_init_stats(struct net_bridge *br);
|
|
|
|
void br_multicast_get_stats(const struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
struct br_mcast_stats *dest);
|
2010-03-01 12:53:04 +03:00
|
|
|
|
2012-12-12 02:23:08 +04:00
|
|
|
#define mlock_dereference(X, br) \
|
|
|
|
rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))
|
|
|
|
|
2010-03-01 12:53:04 +03:00
|
|
|
static inline bool br_multicast_is_router(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return br->multicast_router == 2 ||
|
|
|
|
(br->multicast_router == 1 &&
|
|
|
|
timer_pending(&br->multicast_router_timer));
|
|
|
|
}
|
2013-08-01 03:06:20 +04:00
|
|
|
|
2013-08-30 19:28:17 +04:00
|
|
|
static inline bool
|
|
|
|
__br_multicast_querier_exists(struct net_bridge *br,
|
2016-06-24 13:35:18 +03:00
|
|
|
struct bridge_mcast_other_query *querier,
|
|
|
|
const bool is_ipv6)
|
2013-08-01 03:06:20 +04:00
|
|
|
{
|
2016-06-24 13:35:18 +03:00
|
|
|
bool own_querier_enabled;
|
|
|
|
|
|
|
|
if (br->multicast_querier) {
|
|
|
|
if (is_ipv6 && !br->has_ipv6_addr)
|
|
|
|
own_querier_enabled = false;
|
|
|
|
else
|
|
|
|
own_querier_enabled = true;
|
|
|
|
} else {
|
|
|
|
own_querier_enabled = false;
|
|
|
|
}
|
|
|
|
|
2013-08-30 19:28:17 +04:00
|
|
|
return time_is_before_jiffies(querier->delay_time) &&
|
2016-06-24 13:35:18 +03:00
|
|
|
(own_querier_enabled || timer_pending(&querier->timer));
|
2013-08-30 19:28:17 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool br_multicast_querier_exists(struct net_bridge *br,
|
|
|
|
struct ethhdr *eth)
|
|
|
|
{
|
|
|
|
switch (eth->h_proto) {
|
|
|
|
case (htons(ETH_P_IP)):
|
2016-06-24 13:35:18 +03:00
|
|
|
return __br_multicast_querier_exists(br,
|
|
|
|
&br->ip4_other_query, false);
|
2013-08-30 19:28:17 +04:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
case (htons(ETH_P_IPV6)):
|
2016-06-24 13:35:18 +03:00
|
|
|
return __br_multicast_querier_exists(br,
|
|
|
|
&br->ip6_other_query, true);
|
2013-08-30 19:28:17 +04:00
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
2013-08-01 03:06:20 +04:00
|
|
|
}
|
2016-06-28 17:57:06 +03:00
|
|
|
|
|
|
|
static inline int br_multicast_igmp_type(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return BR_INPUT_SKB_CB(skb)->igmp;
|
|
|
|
}
|
2010-02-27 22:41:45 +03:00
|
|
|
#else
|
|
|
|
static inline int br_multicast_rcv(struct net_bridge *br,
|
|
|
|
struct net_bridge_port *port,
|
2013-10-28 23:45:07 +04:00
|
|
|
struct sk_buff *skb,
|
|
|
|
u16 vid)
|
2010-02-27 22:41:45 +03:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
|
2013-03-07 07:05:33 +04:00
|
|
|
struct sk_buff *skb, u16 vid)
|
2010-02-27 22:41:45 +03:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-06-28 17:57:06 +03:00
|
|
|
static inline int br_multicast_add_port(struct net_bridge_port *port)
|
2010-02-27 22:41:45 +03:00
|
|
|
{
|
2016-06-28 17:57:06 +03:00
|
|
|
return 0;
|
2010-02-27 22:41:45 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_multicast_del_port(struct net_bridge_port *port)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_multicast_enable_port(struct net_bridge_port *port)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_multicast_disable_port(struct net_bridge_port *port)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_multicast_init(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_multicast_open(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_multicast_stop(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
2010-02-27 22:41:46 +03:00
|
|
|
|
2015-07-21 00:03:45 +03:00
|
|
|
static inline void br_multicast_dev_del(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-07-14 06:10:02 +03:00
|
|
|
static inline void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
|
|
|
|
struct sk_buff *skb,
|
|
|
|
bool local_rcv, bool local_orig)
|
2010-02-27 22:41:46 +03:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2010-02-27 22:41:45 +03:00
|
|
|
static inline bool br_multicast_is_router(struct net_bridge *br)
|
|
|
|
{
|
2010-03-01 12:53:04 +03:00
|
|
|
return 0;
|
2010-02-27 22:41:45 +03:00
|
|
|
}
|
2016-07-14 06:10:02 +03:00
|
|
|
|
2013-08-30 19:28:17 +04:00
|
|
|
static inline bool br_multicast_querier_exists(struct net_bridge *br,
|
|
|
|
struct ethhdr *eth)
|
2013-08-01 03:06:20 +04:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2016-07-14 06:10:02 +03:00
|
|
|
|
2013-01-03 15:30:43 +04:00
|
|
|
static inline void br_mdb_init(void)
|
|
|
|
{
|
|
|
|
}
|
2016-07-14 06:10:02 +03:00
|
|
|
|
2013-01-03 15:30:43 +04:00
|
|
|
static inline void br_mdb_uninit(void)
|
|
|
|
{
|
|
|
|
}
|
2016-06-28 17:57:06 +03:00
|
|
|
|
|
|
|
static inline void br_multicast_count(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
2016-07-06 22:12:21 +03:00
|
|
|
const struct sk_buff *skb,
|
|
|
|
u8 type, u8 dir)
|
2016-06-28 17:57:06 +03:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int br_multicast_init_stats(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int br_multicast_igmp_type(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2010-03-01 12:53:04 +03:00
|
|
|
#endif
|
2010-02-27 22:41:45 +03:00
|
|
|
|
2013-02-13 16:00:09 +04:00
|
|
|
/* br_vlan.c */
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
2015-09-30 21:16:53 +03:00
|
|
|
bool br_allowed_ingress(const struct net_bridge *br,
|
|
|
|
struct net_bridge_vlan_group *vg, struct sk_buff *skb,
|
|
|
|
u16 *vid);
|
|
|
|
bool br_allowed_egress(struct net_bridge_vlan_group *vg,
|
2013-10-19 00:48:22 +04:00
|
|
|
const struct sk_buff *skb);
|
2014-05-26 10:15:53 +04:00
|
|
|
bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid);
|
2013-10-19 00:48:22 +04:00
|
|
|
struct sk_buff *br_handle_vlan(struct net_bridge *br,
|
2017-02-01 09:59:55 +03:00
|
|
|
const struct net_bridge_port *port,
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
struct net_bridge_vlan_group *vg,
|
2013-10-19 00:48:22 +04:00
|
|
|
struct sk_buff *skb);
|
|
|
|
int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags);
|
|
|
|
int br_vlan_delete(struct net_bridge *br, u16 vid);
|
|
|
|
void br_vlan_flush(struct net_bridge *br);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid);
|
2014-06-10 15:59:25 +04:00
|
|
|
void br_recalculate_fwd_mask(struct net_bridge *br);
|
2015-08-07 19:40:45 +03:00
|
|
|
int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);
|
2015-08-27 09:32:26 +03:00
|
|
|
int __br_vlan_set_proto(struct net_bridge *br, __be16 proto);
|
2014-06-10 15:59:25 +04:00
|
|
|
int br_vlan_set_proto(struct net_bridge *br, unsigned long val);
|
2016-04-30 11:25:28 +03:00
|
|
|
int br_vlan_set_stats(struct net_bridge *br, unsigned long val);
|
2014-10-03 19:29:18 +04:00
|
|
|
int br_vlan_init(struct net_bridge *br);
|
2014-10-03 19:29:16 +04:00
|
|
|
int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val);
|
2015-10-04 15:23:47 +03:00
|
|
|
int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid);
|
2013-10-19 00:48:22 +04:00
|
|
|
int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags);
|
|
|
|
int nbp_vlan_delete(struct net_bridge_port *port, u16 vid);
|
|
|
|
void nbp_vlan_flush(struct net_bridge_port *port);
|
2014-10-03 19:29:18 +04:00
|
|
|
int nbp_vlan_init(struct net_bridge_port *port);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
int nbp_get_num_vlan_infos(struct net_bridge_port *p, u32 filter_mask);
|
2016-04-30 11:25:29 +03:00
|
|
|
void br_vlan_get_stats(const struct net_bridge_vlan *v,
|
|
|
|
struct br_vlan_stats *stats);
|
2013-02-13 16:00:10 +04:00
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
static inline struct net_bridge_vlan_group *br_vlan_group(
|
|
|
|
const struct net_bridge *br)
|
2013-02-13 16:00:10 +04:00
|
|
|
{
|
2015-10-12 22:47:02 +03:00
|
|
|
return rtnl_dereference(br->vlgrp);
|
2013-02-13 16:00:10 +04:00
|
|
|
}
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
static inline struct net_bridge_vlan_group *nbp_vlan_group(
|
|
|
|
const struct net_bridge_port *p)
|
2013-02-13 16:00:10 +04:00
|
|
|
{
|
2015-10-12 22:47:02 +03:00
|
|
|
return rtnl_dereference(p->vlgrp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_vlan_group *br_vlan_group_rcu(
|
|
|
|
const struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return rcu_dereference(br->vlgrp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_vlan_group *nbp_vlan_group_rcu(
|
|
|
|
const struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
return rcu_dereference(p->vlgrp);
|
2013-02-13 16:00:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Since bridge now depends on 8021Q module, but the time bridge sees the
|
|
|
|
* skb, the vlan tag will always be present if the frame was tagged.
|
|
|
|
*/
|
|
|
|
static inline int br_vlan_get_tag(const struct sk_buff *skb, u16 *vid)
|
|
|
|
{
|
|
|
|
int err = 0;
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
if (skb_vlan_tag_present(skb)) {
|
2015-01-13 19:13:44 +03:00
|
|
|
*vid = skb_vlan_tag_get(skb) & VLAN_VID_MASK;
|
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 20:00:11 +03:00
|
|
|
} else {
|
2013-02-13 16:00:10 +04:00
|
|
|
*vid = 0;
|
|
|
|
err = -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
2013-02-13 16:00:14 +04:00
|
|
|
|
2015-09-30 21:16:53 +03:00
|
|
|
static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg)
|
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 20:00:11 +03:00
|
|
|
{
|
2015-09-30 21:16:53 +03:00
|
|
|
if (!vg)
|
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 20:00:11 +03:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
smp_rmb();
|
2015-09-30 21:16:53 +03:00
|
|
|
return vg->pvid;
|
2013-02-13 16:00:14 +04:00
|
|
|
}
|
|
|
|
|
2014-05-16 17:59:20 +04:00
|
|
|
static inline int br_vlan_enabled(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return br->vlan_enabled;
|
|
|
|
}
|
2013-02-13 16:00:09 +04:00
|
|
|
#else
|
2015-09-30 21:16:53 +03:00
|
|
|
static inline bool br_allowed_ingress(const struct net_bridge *br,
|
|
|
|
struct net_bridge_vlan_group *vg,
|
2013-02-13 16:00:14 +04:00
|
|
|
struct sk_buff *skb,
|
|
|
|
u16 *vid)
|
2013-02-13 16:00:10 +04:00
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
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 20:00:11 +03:00
|
|
|
static inline bool br_allowed_egress(struct net_bridge_vlan_group *vg,
|
2013-02-13 16:00:11 +04:00
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-05-26 10:15:53 +04:00
|
|
|
static inline bool br_should_learn(struct net_bridge_port *p,
|
|
|
|
struct sk_buff *skb, u16 *vid)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-02-13 16:00:14 +04:00
|
|
|
static inline struct sk_buff *br_handle_vlan(struct net_bridge *br,
|
2017-02-01 09:59:55 +03:00
|
|
|
const struct net_bridge_port *port,
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
struct net_bridge_vlan_group *vg,
|
2013-02-13 16:00:14 +04:00
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
2013-02-13 16:00:15 +04:00
|
|
|
static inline int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags)
|
2013-02-13 16:00:09 +04:00
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int br_vlan_delete(struct net_bridge *br, u16 vid)
|
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_vlan_flush(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-06-10 15:59:25 +04:00
|
|
|
static inline void br_recalculate_fwd_mask(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-10-03 19:29:18 +04:00
|
|
|
static inline int br_vlan_init(struct net_bridge *br)
|
2014-06-10 15:59:23 +04:00
|
|
|
{
|
2014-10-03 19:29:18 +04:00
|
|
|
return 0;
|
2014-06-10 15:59:23 +04:00
|
|
|
}
|
|
|
|
|
2013-02-13 16:00:15 +04:00
|
|
|
static inline int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags)
|
2013-02-13 16:00:09 +04:00
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int nbp_vlan_delete(struct net_bridge_port *port, u16 vid)
|
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void nbp_vlan_flush(struct net_bridge_port *port)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
static inline struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg,
|
|
|
|
u16 vid)
|
2013-02-13 16:00:10 +04:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
static inline int nbp_vlan_init(struct net_bridge_port *port)
|
2013-02-13 16:00:19 +04:00
|
|
|
{
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
return 0;
|
2013-02-13 16:00:19 +04:00
|
|
|
}
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 20:00:11 +03:00
|
|
|
static inline u16 br_vlan_get_tag(const struct sk_buff *skb, u16 *tag)
|
2014-10-03 19:29:18 +04:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-30 21:16:53 +03:00
|
|
|
static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg)
|
2013-02-13 16:00:14 +04:00
|
|
|
{
|
2014-10-03 19:29:17 +04:00
|
|
|
return 0;
|
2013-02-13 16:00:14 +04:00
|
|
|
}
|
2014-05-16 17:59:20 +04:00
|
|
|
|
2014-05-18 21:30:28 +04:00
|
|
|
static inline int br_vlan_enabled(struct net_bridge *br)
|
2014-05-16 17:59:20 +04:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2015-08-07 19:40:45 +03:00
|
|
|
|
|
|
|
static inline int __br_vlan_filter_toggle(struct net_bridge *br,
|
|
|
|
unsigned long val)
|
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
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 20:00:11 +03:00
|
|
|
|
|
|
|
static inline int nbp_get_num_vlan_infos(struct net_bridge_port *p,
|
|
|
|
u32 filter_mask)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_vlan_group *br_vlan_group(
|
|
|
|
const struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_vlan_group *nbp_vlan_group(
|
|
|
|
const struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
2015-10-12 22:47:02 +03:00
|
|
|
|
|
|
|
static inline struct net_bridge_vlan_group *br_vlan_group_rcu(
|
|
|
|
const struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_vlan_group *nbp_vlan_group_rcu(
|
|
|
|
const struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
2016-04-30 11:25:29 +03:00
|
|
|
|
|
|
|
static inline void br_vlan_get_stats(const struct net_bridge_vlan *v,
|
|
|
|
struct br_vlan_stats *stats)
|
|
|
|
{
|
|
|
|
}
|
2013-02-13 16:00:09 +04:00
|
|
|
#endif
|
|
|
|
|
2015-03-10 12:27:18 +03:00
|
|
|
struct nf_br_ops {
|
|
|
|
int (*br_dev_xmit_hook)(struct sk_buff *skb);
|
|
|
|
};
|
|
|
|
extern const struct nf_br_ops __rcu *nf_br_ops;
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* br_netfilter.c */
|
2014-09-18 13:29:03 +04:00
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
|
|
|
|
int br_nf_core_init(void);
|
|
|
|
void br_nf_core_fini(void);
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_netfilter_rtable_init(struct net_bridge *);
|
2006-05-26 02:59:33 +04:00
|
|
|
#else
|
2014-09-18 13:29:03 +04:00
|
|
|
static inline int br_nf_core_init(void) { return 0; }
|
|
|
|
static inline void br_nf_core_fini(void) {}
|
2008-07-31 03:27:55 +04:00
|
|
|
#define br_netfilter_rtable_init(x)
|
2006-05-26 02:59:33 +04:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_stp.c */
|
2014-10-01 03:13:19 +04:00
|
|
|
void br_set_state(struct net_bridge_port *p, unsigned int state);
|
2013-10-19 00:48:22 +04:00
|
|
|
struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no);
|
|
|
|
void br_init_port(struct net_bridge_port *p);
|
|
|
|
void br_become_designated_port(struct net_bridge_port *p);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2013-10-19 00:48:22 +04:00
|
|
|
void __br_set_forward_delay(struct net_bridge *br, unsigned long t);
|
|
|
|
int br_set_forward_delay(struct net_bridge *br, unsigned long x);
|
|
|
|
int br_set_hello_time(struct net_bridge *br, unsigned long x);
|
|
|
|
int br_set_max_age(struct net_bridge *br, unsigned long x);
|
2016-12-10 21:44:27 +03:00
|
|
|
int __set_ageing_time(struct net_device *dev, unsigned long t);
|
2016-07-21 19:42:19 +03:00
|
|
|
int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time);
|
2011-04-04 18:03:33 +04:00
|
|
|
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* br_stp_if.c */
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_stp_enable_bridge(struct net_bridge *br);
|
|
|
|
void br_stp_disable_bridge(struct net_bridge *br);
|
|
|
|
void br_stp_set_enabled(struct net_bridge *br, unsigned long val);
|
|
|
|
void br_stp_enable_port(struct net_bridge_port *p);
|
|
|
|
void br_stp_disable_port(struct net_bridge_port *p);
|
|
|
|
bool br_stp_recalculate_bridge_id(struct net_bridge *br);
|
|
|
|
void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *a);
|
|
|
|
void br_stp_set_bridge_priority(struct net_bridge *br, u16 newprio);
|
|
|
|
int br_stp_set_port_priority(struct net_bridge_port *p, unsigned long newprio);
|
|
|
|
int br_stp_set_path_cost(struct net_bridge_port *p, unsigned long path_cost);
|
|
|
|
ssize_t br_show_bridge_id(char *buf, const struct bridge_id *id);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_stp_bpdu.c */
|
2008-07-06 08:25:56 +04:00
|
|
|
struct stp_proto;
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
|
|
|
|
struct net_device *dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_stp_timer.c */
|
2013-10-19 00:48:22 +04:00
|
|
|
void br_stp_timer_init(struct net_bridge *br);
|
|
|
|
void br_stp_port_timer_init(struct net_bridge_port *p);
|
|
|
|
unsigned long br_timer_value(const struct timer_list *timer);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br.c */
|
2011-12-12 06:58:25 +04:00
|
|
|
#if IS_ENABLED(CONFIG_ATM_LANE)
|
2009-06-05 09:35:28 +04:00
|
|
|
extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr);
|
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2006-05-26 03:00:12 +04:00
|
|
|
/* br_netlink.c */
|
2012-06-26 09:48:45 +04:00
|
|
|
extern struct rtnl_link_ops br_link_ops;
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_netlink_init(void);
|
|
|
|
void br_netlink_fini(void);
|
|
|
|
void br_ifinfo_notify(int event, struct net_bridge_port *port);
|
2015-01-30 09:40:12 +03:00
|
|
|
int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);
|
|
|
|
int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev,
|
2015-04-28 19:33:49 +03:00
|
|
|
u32 filter_mask, int nlflags);
|
2006-05-26 03:00:12 +04:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#ifdef CONFIG_SYSFS
|
|
|
|
/* br_sysfs_if.c */
|
2010-01-19 04:58:23 +03:00
|
|
|
extern const struct sysfs_ops brport_sysfs_ops;
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_sysfs_addif(struct net_bridge_port *p);
|
|
|
|
int br_sysfs_renameif(struct net_bridge_port *p);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* br_sysfs_br.c */
|
2013-10-19 00:48:22 +04:00
|
|
|
int br_sysfs_addbr(struct net_device *dev);
|
|
|
|
void br_sysfs_delbr(struct net_device *dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
2012-11-04 02:02:30 +04:00
|
|
|
static inline int br_sysfs_addif(struct net_bridge_port *p) { return 0; }
|
|
|
|
static inline int br_sysfs_renameif(struct net_bridge_port *p) { return 0; }
|
|
|
|
static inline int br_sysfs_addbr(struct net_device *dev) { return 0; }
|
|
|
|
static inline void br_sysfs_delbr(struct net_device *dev) { return; }
|
2005-04-17 02:20:36 +04:00
|
|
|
#endif /* CONFIG_SYSFS */
|
|
|
|
|
2016-08-25 19:42:37 +03:00
|
|
|
/* br_switchdev.c */
|
|
|
|
#ifdef CONFIG_NET_SWITCHDEV
|
|
|
|
int nbp_switchdev_mark_set(struct net_bridge_port *p);
|
|
|
|
void nbp_switchdev_frame_mark(const struct net_bridge_port *p,
|
|
|
|
struct sk_buff *skb);
|
|
|
|
bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p,
|
|
|
|
const struct sk_buff *skb);
|
|
|
|
#else
|
|
|
|
static inline int nbp_switchdev_mark_set(struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void nbp_switchdev_frame_mark(const struct net_bridge_port *p,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool nbp_switchdev_allowed_egress(const struct net_bridge_port *p,
|
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NET_SWITCHDEV */
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#endif
|