2019-05-27 00:55:01 -06:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Linux ethernet bridge
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Lennert Buytenhek <buytenh@gnu.org>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _BR_PRIVATE_H
|
|
|
|
#define _BR_PRIVATE_H
|
|
|
|
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/if_bridge.h>
|
2010-06-10 10:12:50 -06:00
|
|
|
#include <linux/netpoll.h>
|
2010-06-23 14:00:48 -06:00
|
|
|
#include <linux/u64_stats_sync.h>
|
2008-07-30 17:27:55 -06:00
|
|
|
#include <net/route.h>
|
2015-05-30 07:30:16 -06:00
|
|
|
#include <net/ip6_fib.h>
|
2013-02-13 05:00:09 -07: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 11:00:11 -06:00
|
|
|
#include <linux/rhashtable.h>
|
2017-07-04 06:53:05 -06:00
|
|
|
#include <linux/refcount.h>
|
2005-04-16 16:20:36 -06: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)
|
|
|
|
|
2018-12-05 06:14:27 -07:00
|
|
|
#define BR_MULTICAST_DEFAULT_HASH_MAX 4096
|
|
|
|
|
2007-03-21 15:22:44 -06:00
|
|
|
#define BR_VERSION "2.3"
|
|
|
|
|
2011-10-03 12:14:46 -06:00
|
|
|
/* Control of forwarding link local multicast */
|
|
|
|
#define BR_GROUPFWD_DEFAULT 0
|
2015-05-04 14:47:13 -06:00
|
|
|
/* Don't allow forwarding of control protocols like STP, MAC PAUSE and LACP */
|
2017-09-27 07:12:44 -06:00
|
|
|
enum {
|
|
|
|
BR_GROUPFWD_STP = BIT(0),
|
|
|
|
BR_GROUPFWD_MACPAUSE = BIT(1),
|
|
|
|
BR_GROUPFWD_LACP = BIT(2),
|
|
|
|
};
|
|
|
|
|
|
|
|
#define BR_GROUPFWD_RESTRICTED (BR_GROUPFWD_STP | BR_GROUPFWD_MACPAUSE | \
|
|
|
|
BR_GROUPFWD_LACP)
|
2014-06-10 05:59:24 -06: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 12:14:46 -06:00
|
|
|
|
2007-03-21 15:22:44 -06:00
|
|
|
/* Path to usermode spanning tree program */
|
|
|
|
#define BR_STP_PROG "/sbin/bridge-stp"
|
2005-12-21 20:01:30 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
typedef struct bridge_id bridge_id;
|
|
|
|
typedef struct mac_addr mac_addr;
|
|
|
|
typedef __u16 port_id;
|
|
|
|
|
2018-09-26 08:00:59 -06:00
|
|
|
struct bridge_id {
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned char prio[2];
|
2014-02-23 01:05:25 -07:00
|
|
|
unsigned char addr[ETH_ALEN];
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2018-09-26 08:00:59 -06:00
|
|
|
struct mac_addr {
|
2014-02-23 01:05:25 -07:00
|
|
|
unsigned char addr[ETH_ALEN];
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2013-08-30 09:28:17 -06:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
/* our own querier */
|
2014-06-07 10:26:26 -06:00
|
|
|
struct bridge_mcast_own_query {
|
2013-08-30 09:28:17 -06:00
|
|
|
struct timer_list timer;
|
|
|
|
u32 startup_sent;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* other querier */
|
2014-06-07 10:26:26 -06:00
|
|
|
struct bridge_mcast_other_query {
|
2013-08-30 09:28:17 -06:00
|
|
|
struct timer_list timer;
|
|
|
|
unsigned long delay_time;
|
|
|
|
};
|
2014-06-07 10:26:27 -06:00
|
|
|
|
|
|
|
/* selected querier */
|
|
|
|
struct bridge_mcast_querier {
|
|
|
|
struct br_ip addr;
|
2014-06-07 10:26:29 -06:00
|
|
|
struct net_bridge_port __rcu *port;
|
2014-06-07 10:26:27 -06:00
|
|
|
};
|
2016-06-28 08:57:06 -06:00
|
|
|
|
|
|
|
/* IGMP/MLD statistics */
|
|
|
|
struct bridge_mcast_stats {
|
|
|
|
struct br_mcast_stats mstats;
|
|
|
|
struct u64_stats_sync syncp;
|
|
|
|
};
|
2013-08-30 09:28:17 -06:00
|
|
|
#endif
|
|
|
|
|
2016-04-30 02:25:28 -06:00
|
|
|
struct br_vlan_stats {
|
|
|
|
u64 rx_bytes;
|
|
|
|
u64 rx_packets;
|
|
|
|
u64 tx_bytes;
|
|
|
|
u64 tx_packets;
|
|
|
|
struct u64_stats_sync syncp;
|
|
|
|
};
|
|
|
|
|
2017-01-31 23:59:54 -07:00
|
|
|
struct br_tunnel_info {
|
|
|
|
__be64 tunnel_id;
|
|
|
|
struct metadata_dst *tunnel_dst;
|
|
|
|
};
|
|
|
|
|
2018-11-16 09:50:01 -07:00
|
|
|
/* private vlan flags */
|
|
|
|
enum {
|
|
|
|
BR_VLFLAG_PER_PORT_STATS = BIT(0),
|
2019-01-08 09:48:11 -07:00
|
|
|
BR_VLFLAG_ADDED_BY_SWITCHDEV = BIT(1),
|
2018-11-16 09:50:01 -07:00
|
|
|
};
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
/**
|
|
|
|
* struct net_bridge_vlan - per-vlan entry
|
|
|
|
*
|
|
|
|
* @vnode: rhashtable member
|
|
|
|
* @vid: VLAN id
|
|
|
|
* @flags: bridge vlan flags
|
2018-11-16 09:50:01 -07:00
|
|
|
* @priv_flags: private (in-kernel) bridge vlan flags
|
2020-01-24 04:40:22 -07:00
|
|
|
* @state: STP state (e.g. blocking, learning, forwarding)
|
2016-04-30 02:25:28 -06: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 11:00:11 -06: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-01-31 23:59:54 -07: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 11:00:11 -06:00
|
|
|
u16 vid;
|
|
|
|
u16 flags;
|
2018-11-16 09:50:01 -07:00
|
|
|
u16 priv_flags;
|
2020-01-24 04:40:22 -07:00
|
|
|
u8 state;
|
2016-04-30 02:25:28 -06:00
|
|
|
struct br_vlan_stats __percpu *stats;
|
2013-02-13 05:00:09 -07: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 11:00:11 -06:00
|
|
|
struct net_bridge *br;
|
|
|
|
struct net_bridge_port *port;
|
|
|
|
};
|
|
|
|
union {
|
2017-07-04 06:53:05 -06:00
|
|
|
refcount_t refcnt;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
struct net_bridge_vlan *brvlan;
|
|
|
|
};
|
2017-01-31 23:59:54 -07: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 11:00:11 -06:00
|
|
|
struct list_head vlist;
|
|
|
|
|
2013-02-13 05:00:09 -07: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 11:00:11 -06: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 12:16:53 -06:00
|
|
|
* @pvid: PVID VLAN id
|
2020-01-24 04:40:22 -07:00
|
|
|
* @pvid_state: PVID's STP state (e.g. forwarding, learning, blocking)
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
*
|
|
|
|
* 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-01-31 23:59:54 -07: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 11:00:11 -06:00
|
|
|
struct list_head vlan_list;
|
2013-02-13 05:00:13 -07:00
|
|
|
u16 num_vlans;
|
2015-09-30 12:16:53 -06:00
|
|
|
u16 pvid;
|
2020-01-24 04:40:22 -07:00
|
|
|
u8 pvid_state;
|
2013-02-13 05:00:09 -07:00
|
|
|
};
|
|
|
|
|
2019-10-29 05:45:53 -06:00
|
|
|
/* bridge fdb flags */
|
|
|
|
enum {
|
|
|
|
BR_FDB_LOCAL,
|
2019-10-29 05:45:54 -06:00
|
|
|
BR_FDB_STATIC,
|
2019-10-29 05:45:55 -06:00
|
|
|
BR_FDB_STICKY,
|
2019-10-29 05:45:56 -06:00
|
|
|
BR_FDB_ADDED_BY_USER,
|
2019-10-29 05:45:57 -06:00
|
|
|
BR_FDB_ADDED_BY_EXT_LEARN,
|
2019-10-29 05:45:58 -06:00
|
|
|
BR_FDB_OFFLOADED,
|
2019-10-29 05:45:53 -06:00
|
|
|
};
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_key {
|
|
|
|
mac_addr addr;
|
|
|
|
u16 vlan_id;
|
|
|
|
};
|
|
|
|
|
2017-02-04 10:05:08 -07:00
|
|
|
struct net_bridge_fdb_entry {
|
2017-12-12 07:02:50 -07:00
|
|
|
struct rhash_head rhnode;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct net_bridge_port *dst;
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
struct net_bridge_fdb_key key;
|
|
|
|
struct hlist_node fdb_node;
|
2019-10-29 05:45:53 -06:00
|
|
|
unsigned long flags;
|
2017-02-04 10:05:08 -07: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-27 15:19:20 -06:00
|
|
|
struct rcu_head rcu;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2016-02-03 01:57:05 -07:00
|
|
|
#define MDB_PG_FLAGS_PERMANENT BIT(0)
|
|
|
|
#define MDB_PG_FLAGS_OFFLOAD BIT(1)
|
2019-07-30 06:20:41 -06:00
|
|
|
#define MDB_PG_FLAGS_FAST_LEAVE BIT(2)
|
2016-02-03 01:57:05 -07:00
|
|
|
|
2010-02-27 12:41:45 -07:00
|
|
|
struct net_bridge_port_group {
|
|
|
|
struct net_bridge_port *port;
|
2010-11-14 23:38:10 -07:00
|
|
|
struct net_bridge_port_group __rcu *next;
|
2010-02-27 12:41:45 -07:00
|
|
|
struct hlist_node mglist;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
struct timer_list timer;
|
2010-04-17 21:42:07 -06:00
|
|
|
struct br_ip addr;
|
2016-02-03 01:57:05 -07:00
|
|
|
unsigned char flags;
|
2017-01-21 13:01:32 -07:00
|
|
|
unsigned char eth_addr[ETH_ALEN];
|
2010-02-27 12:41:45 -07:00
|
|
|
};
|
|
|
|
|
2018-09-26 08:00:59 -06:00
|
|
|
struct net_bridge_mdb_entry {
|
2018-12-05 06:14:24 -07:00
|
|
|
struct rhash_head rhnode;
|
2010-02-27 12:41:45 -07:00
|
|
|
struct net_bridge *br;
|
2010-11-14 23:38:10 -07:00
|
|
|
struct net_bridge_port_group __rcu *ports;
|
2010-02-27 12:41:45 -07:00
|
|
|
struct rcu_head rcu;
|
|
|
|
struct timer_list timer;
|
2010-04-17 21:42:07 -06:00
|
|
|
struct br_ip addr;
|
2017-11-09 15:10:57 -07:00
|
|
|
bool host_joined;
|
2018-12-05 06:14:24 -07:00
|
|
|
struct hlist_node mdb_node;
|
2010-02-27 12:41:45 -07:00
|
|
|
};
|
|
|
|
|
2017-02-04 10:05:06 -07:00
|
|
|
struct net_bridge_port {
|
2005-04-16 16:20:36 -06:00
|
|
|
struct net_bridge *br;
|
|
|
|
struct net_device *dev;
|
|
|
|
struct list_head list;
|
|
|
|
|
2017-02-04 10:05:06 -07:00
|
|
|
unsigned long flags;
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
struct net_bridge_vlan_group __rcu *vlgrp;
|
|
|
|
#endif
|
2018-07-23 02:16:59 -06:00
|
|
|
struct net_bridge_port __rcu *backup_port;
|
2017-02-04 10:05:06 -07:00
|
|
|
|
2005-04-16 16:20:36 -06: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 01:47:06 -06:00
|
|
|
unsigned long designated_age;
|
2005-04-16 16:20:36 -06: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 00:55:16 -06:00
|
|
|
|
2010-02-27 12:41:45 -07:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
2014-06-07 10:26:26 -06:00
|
|
|
struct bridge_mcast_own_query ip4_own_query;
|
2013-08-30 09:28:17 -06:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
2014-06-07 10:26:26 -06:00
|
|
|
struct bridge_mcast_own_query ip6_own_query;
|
2013-08-30 09:28:17 -06:00
|
|
|
#endif /* IS_ENABLED(CONFIG_IPV6) */
|
2010-02-27 12:41:45 -07:00
|
|
|
unsigned char multicast_router;
|
2016-06-28 08:57:06 -06:00
|
|
|
struct bridge_mcast_stats __percpu *mcast_stats;
|
2010-02-27 12:41:45 -07:00
|
|
|
struct timer_list multicast_router_timer;
|
|
|
|
struct hlist_head mglist;
|
|
|
|
struct hlist_node rlist;
|
|
|
|
#endif
|
2010-05-10 03:31:11 -06:00
|
|
|
|
|
|
|
#ifdef CONFIG_SYSFS
|
|
|
|
char sysfs_name[IFNAMSIZ];
|
|
|
|
#endif
|
2010-06-10 10:12:50 -06:00
|
|
|
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
struct netpoll *np;
|
|
|
|
#endif
|
2016-08-25 10:42:37 -06:00
|
|
|
#ifdef CONFIG_NET_SWITCHDEV
|
|
|
|
int offload_fwd_mark;
|
|
|
|
#endif
|
2017-09-27 07:12:44 -06:00
|
|
|
u16 group_fwd_mask;
|
2018-07-23 02:16:59 -06:00
|
|
|
u16 backup_redirected_cnt;
|
2019-12-11 18:07:10 -07:00
|
|
|
|
|
|
|
struct bridge_stp_xstats stp_xstats;
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2018-07-20 15:56:54 -06:00
|
|
|
#define kobj_to_brport(obj) container_of(obj, struct net_bridge_port, kobj)
|
|
|
|
|
2014-05-16 07:59:16 -06:00
|
|
|
#define br_auto_port(p) ((p)->flags & BR_AUTO_MASK)
|
2014-05-16 07:59:18 -06:00
|
|
|
#define br_promisc_port(p) ((p)->flags & BR_PROMISC)
|
2014-05-16 07:59:16 -06:00
|
|
|
|
2010-11-14 23:38:13 -07:00
|
|
|
static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
|
|
|
|
{
|
2013-09-14 08:42:28 -06:00
|
|
|
return rcu_dereference(dev->rx_handler_data);
|
2010-11-14 23:38:13 -07:00
|
|
|
}
|
|
|
|
|
2013-09-14 08:42:27 -06:00
|
|
|
static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device *dev)
|
2010-11-14 23:38:13 -07:00
|
|
|
{
|
2019-03-29 07:38:19 -06:00
|
|
|
return netif_is_bridge_port(dev) ?
|
2010-11-14 23:38:14 -07:00
|
|
|
rtnl_dereference(dev->rx_handler_data) : NULL;
|
2010-11-14 23:38:13 -07:00
|
|
|
}
|
|
|
|
|
2017-06-08 00:44:12 -06:00
|
|
|
static inline struct net_bridge_port *br_port_get_rtnl_rcu(const struct net_device *dev)
|
|
|
|
{
|
2019-03-29 07:38:19 -06:00
|
|
|
return netif_is_bridge_port(dev) ?
|
2017-06-08 00:44:12 -06:00
|
|
|
rcu_dereference_rtnl(dev->rx_handler_data) : NULL;
|
|
|
|
}
|
|
|
|
|
2018-09-26 08:01:00 -06:00
|
|
|
enum net_bridge_opts {
|
|
|
|
BROPT_VLAN_ENABLED,
|
|
|
|
BROPT_VLAN_STATS_ENABLED,
|
2018-09-26 08:01:01 -06:00
|
|
|
BROPT_NF_CALL_IPTABLES,
|
|
|
|
BROPT_NF_CALL_IP6TABLES,
|
|
|
|
BROPT_NF_CALL_ARPTABLES,
|
2018-09-26 08:01:02 -06:00
|
|
|
BROPT_GROUP_ADDR_SET,
|
2018-09-26 08:01:03 -06:00
|
|
|
BROPT_MULTICAST_ENABLED,
|
2018-09-26 08:01:04 -06:00
|
|
|
BROPT_MULTICAST_QUERIER,
|
|
|
|
BROPT_MULTICAST_QUERY_USE_IFADDR,
|
|
|
|
BROPT_MULTICAST_STATS_ENABLED,
|
|
|
|
BROPT_HAS_IPV6_ADDR,
|
2018-09-26 08:01:05 -06:00
|
|
|
BROPT_NEIGH_SUPPRESS_ENABLED,
|
2018-09-26 08:01:06 -06:00
|
|
|
BROPT_MTU_SET_BY_USER,
|
2018-10-12 04:41:16 -06:00
|
|
|
BROPT_VLAN_STATS_PER_PORT,
|
2018-11-23 19:34:21 -07:00
|
|
|
BROPT_NO_LL_LEARN,
|
2019-04-18 11:35:33 -06:00
|
|
|
BROPT_VLAN_BRIDGE_BINDING,
|
2018-09-26 08:01:00 -06:00
|
|
|
};
|
|
|
|
|
2017-02-04 10:05:06 -07:00
|
|
|
struct net_bridge {
|
2005-04-16 16:20:36 -06:00
|
|
|
spinlock_t lock;
|
2017-02-04 10:05:06 -07:00
|
|
|
spinlock_t hash_lock;
|
2005-04-16 16:20:36 -06:00
|
|
|
struct list_head port_list;
|
|
|
|
struct net_device *dev;
|
2014-01-03 22:57:59 -07:00
|
|
|
struct pcpu_sw_netstats __percpu *stats;
|
2018-09-26 08:01:00 -06:00
|
|
|
unsigned long options;
|
2017-02-04 10:05:06 -07:00
|
|
|
/* These fields are accessed on each packet */
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
__be16 vlan_proto;
|
|
|
|
u16 default_pvid;
|
|
|
|
struct net_bridge_vlan_group __rcu *vlgrp;
|
|
|
|
#endif
|
|
|
|
|
2017-12-12 07:02:50 -07:00
|
|
|
struct rhashtable fdb_hash_tbl;
|
2014-09-18 03:29:03 -06:00
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
|
2015-05-30 07:30:16 -06:00
|
|
|
union {
|
|
|
|
struct rtable fake_rtable;
|
|
|
|
struct rt6_info fake_rt6_info;
|
|
|
|
};
|
2008-07-30 17:27:55 -06:00
|
|
|
#endif
|
2011-10-03 12:14:46 -06:00
|
|
|
u16 group_fwd_mask;
|
2014-06-10 05:59:24 -06:00
|
|
|
u16 group_fwd_mask_required;
|
2011-10-03 12:14:46 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* STP */
|
|
|
|
bridge_id designated_root;
|
|
|
|
bridge_id bridge_id;
|
2017-02-04 10:05:06 -07:00
|
|
|
unsigned char topology_change;
|
|
|
|
unsigned char topology_change_detected;
|
|
|
|
u16 root_port;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long max_age;
|
|
|
|
unsigned long hello_time;
|
|
|
|
unsigned long forward_delay;
|
|
|
|
unsigned long ageing_time;
|
2016-12-10 11:44:29 -07:00
|
|
|
unsigned long bridge_max_age;
|
2005-04-16 16:20:36 -06:00
|
|
|
unsigned long bridge_hello_time;
|
|
|
|
unsigned long bridge_forward_delay;
|
2016-12-10 11:44:29 -07:00
|
|
|
unsigned long bridge_ageing_time;
|
2018-09-26 08:01:07 -06:00
|
|
|
u32 root_path_cost;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2006-03-20 23:59:21 -07:00
|
|
|
u8 group_addr[ETH_ALEN];
|
2007-03-21 15:22:44 -06: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 12:41:45 -07:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
|
|
|
|
u32 hash_max;
|
|
|
|
|
|
|
|
u32 multicast_last_member_count;
|
|
|
|
u32 multicast_startup_query_count;
|
|
|
|
|
2016-11-21 05:03:24 -07:00
|
|
|
u8 multicast_igmp_version;
|
2018-09-26 08:01:04 -06:00
|
|
|
u8 multicast_router;
|
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
u8 multicast_mld_version;
|
|
|
|
#endif
|
2018-09-26 08:01:07 -06:00
|
|
|
spinlock_t multicast_lock;
|
2010-02-27 12:41:45 -07: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;
|
|
|
|
|
2018-12-05 06:14:24 -07:00
|
|
|
struct rhashtable mdb_hash_tbl;
|
|
|
|
|
|
|
|
struct hlist_head mdb_list;
|
2010-02-27 12:41:45 -07:00
|
|
|
struct hlist_head router_list;
|
|
|
|
|
|
|
|
struct timer_list multicast_router_timer;
|
2014-06-07 10:26:26 -06:00
|
|
|
struct bridge_mcast_other_query ip4_other_query;
|
|
|
|
struct bridge_mcast_own_query ip4_own_query;
|
2014-06-07 10:26:27 -06:00
|
|
|
struct bridge_mcast_querier ip4_querier;
|
2016-06-28 08:57:06 -06:00
|
|
|
struct bridge_mcast_stats __percpu *mcast_stats;
|
2013-08-30 09:28:17 -06:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
2014-06-07 10:26:26 -06:00
|
|
|
struct bridge_mcast_other_query ip6_other_query;
|
|
|
|
struct bridge_mcast_own_query ip6_own_query;
|
2014-06-07 10:26:27 -06:00
|
|
|
struct bridge_mcast_querier ip6_querier;
|
2013-08-30 09:28:17 -06:00
|
|
|
#endif /* IS_ENABLED(CONFIG_IPV6) */
|
2010-02-27 12:41:45 -07:00
|
|
|
#endif
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
struct timer_list hello_timer;
|
|
|
|
struct timer_list tcn_timer;
|
|
|
|
struct timer_list topology_change_timer;
|
2017-02-04 10:05:07 -07:00
|
|
|
struct delayed_work gc_work;
|
2007-12-17 12:54:39 -07:00
|
|
|
struct kobject *ifobj;
|
2014-05-16 07:59:16 -06:00
|
|
|
u32 auto_cnt;
|
2016-08-25 10:42:37 -06:00
|
|
|
|
|
|
|
#ifdef CONFIG_NET_SWITCHDEV
|
|
|
|
int offload_fwd_mark;
|
|
|
|
#endif
|
2017-12-12 07:02:50 -07:00
|
|
|
struct hlist_head fdb_list;
|
2020-04-26 07:22:00 -06:00
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_MRP)
|
|
|
|
struct list_head __rcu mrp_list;
|
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
2010-02-27 12:41:40 -07:00
|
|
|
struct br_input_skb_cb {
|
|
|
|
struct net_device *brdev;
|
2014-10-04 22:00:22 -06:00
|
|
|
|
netfilter: bridge: add connection tracking system
This patch adds basic connection tracking support for the bridge,
including initial IPv4 support.
This patch register two hooks to deal with the bridge forwarding path,
one from the bridge prerouting hook to call nf_conntrack_in(); and
another from the bridge postrouting hook to confirm the entry.
The conntrack bridge prerouting hook defragments packets before passing
them to nf_conntrack_in() to look up for an existing entry, otherwise a
new entry is allocated and it is attached to the skbuff. The conntrack
bridge postrouting hook confirms new conntrack entries, ie. if this is
the first packet seen, then it adds the entry to the hashtable and (if
needed) it refragments the skbuff into the original fragments, leaving
the geometry as is if possible. Exceptions are linearized skbuffs, eg.
skbuffs that are passed up to nfqueue and conntrack helpers, as well as
cloned skbuff for the local delivery (eg. tcpdump), also in case of
bridge port flooding (cloned skbuff too).
The packet defragmentation is done through the ip_defrag() call. This
forces us to save the bridge control buffer, reset the IP control buffer
area and then restore it after call. This function also bumps the IP
fragmentation statistics, it would be probably desiderable to have
independent statistics for the bridge defragmentation/refragmentation.
The maximum fragment length is stored in the control buffer and it is
used to refragment the skbuff from the postrouting path.
The new fraglist splitter and fragment transformer APIs are used to
implement the bridge refragmentation code. The br_ip_fragment() function
drops the packet in case the maximum fragment size seen is larger than
the output port MTU.
This patchset follows the principle that conntrack should not drop
packets, so users can do it through policy via invalid state matching.
Like br_netfilter, there is no refragmentation for packets that are
passed up for local delivery, ie. prerouting -> input path. There are
calls to nf_reset() already in several spots in the stack since time ago
already, eg. af_packet, that show that skbuff fraglist handling from the
netif_rx path is supported already.
The helpers are called from the postrouting hook, before confirmation,
from there we may see packet floods to bridge ports. Then, although
unlikely, this may result in exercising the helpers many times for each
clone. It would be good to explore how to pass all the packets in a list
to the conntrack hook to do this handle only once for this case.
Thanks to Florian Westphal for handing me over an initial patchset
version to add support for conntrack bridge.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-05-29 05:25:37 -06:00
|
|
|
u16 frag_max_size;
|
2010-03-15 15:51:18 -06:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
2019-04-11 08:36:40 -06:00
|
|
|
u8 igmp;
|
|
|
|
u8 mrouters_only:1;
|
2010-03-15 15:51:18 -06:00
|
|
|
#endif
|
2019-04-11 08:36:40 -06:00
|
|
|
u8 proxyarp_replied:1;
|
|
|
|
u8 src_port_isolated:1;
|
2014-09-12 14:26:16 -06:00
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
2019-04-11 08:36:40 -06:00
|
|
|
u8 vlan_filtered:1;
|
2014-09-12 14:26:16 -06:00
|
|
|
#endif
|
2019-04-11 08:36:42 -06:00
|
|
|
#ifdef CONFIG_NETFILTER_FAMILY_BRIDGE
|
|
|
|
u8 br_netfilter_broute:1;
|
|
|
|
#endif
|
2016-08-25 10:42:37 -06:00
|
|
|
|
|
|
|
#ifdef CONFIG_NET_SWITCHDEV
|
|
|
|
int offload_fwd_mark;
|
|
|
|
#endif
|
2010-02-27 12:41:40 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
#define BR_INPUT_SKB_CB(__skb) ((struct br_input_skb_cb *)(__skb)->cb)
|
|
|
|
|
2010-03-15 15:51:18 -06: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 03:31:09 -06: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-16 16:20:36 -06: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 11:00:11 -06: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 07:05:13 -06: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 11:00:11 -06: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;
|
|
|
|
}
|
|
|
|
|
2019-11-04 02:36:51 -07:00
|
|
|
static inline bool nbp_state_should_learn(const struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
return p->state == BR_STATE_LEARNING || p->state == BR_STATE_FORWARDING;
|
|
|
|
}
|
|
|
|
|
2020-01-14 10:56:08 -07:00
|
|
|
static inline bool br_vlan_valid_id(u16 vid, struct netlink_ext_ack *extack)
|
2020-01-14 10:56:07 -07:00
|
|
|
{
|
2020-01-14 10:56:08 -07:00
|
|
|
bool ret = vid > 0 && vid < VLAN_VID_MASK;
|
|
|
|
|
|
|
|
if (!ret)
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Vlan id is invalid");
|
|
|
|
|
|
|
|
return ret;
|
2020-01-14 10:56:07 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool br_vlan_valid_range(const struct bridge_vlan_info *cur,
|
2020-01-14 10:56:08 -07:00
|
|
|
const struct bridge_vlan_info *last,
|
|
|
|
struct netlink_ext_ack *extack)
|
2020-01-14 10:56:07 -07:00
|
|
|
{
|
|
|
|
/* pvid flag is not allowed in ranges */
|
2020-01-14 10:56:08 -07:00
|
|
|
if (cur->flags & BRIDGE_VLAN_INFO_PVID) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Pvid isn't allowed in a range");
|
2020-01-14 10:56:07 -07:00
|
|
|
return false;
|
2020-01-14 10:56:08 -07:00
|
|
|
}
|
2020-01-14 10:56:07 -07:00
|
|
|
|
|
|
|
/* when cur is the range end, check if:
|
|
|
|
* - it has range start flag
|
|
|
|
* - range ids are invalid (end is equal to or before start)
|
|
|
|
*/
|
|
|
|
if (last) {
|
2020-01-14 10:56:08 -07:00
|
|
|
if (cur->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Found a new vlan range start while processing one");
|
2020-01-14 10:56:07 -07:00
|
|
|
return false;
|
2020-01-14 10:56:08 -07:00
|
|
|
} else if (!(cur->flags & BRIDGE_VLAN_INFO_RANGE_END)) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Vlan range end flag is missing");
|
2020-01-14 10:56:07 -07:00
|
|
|
return false;
|
2020-01-14 10:56:08 -07:00
|
|
|
} else if (cur->vid <= last->vid) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "End vlan id is less than or equal to start vlan id");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check for required range flags */
|
|
|
|
if (!(cur->flags & (BRIDGE_VLAN_INFO_RANGE_BEGIN |
|
|
|
|
BRIDGE_VLAN_INFO_RANGE_END))) {
|
|
|
|
NL_SET_ERR_MSG_MOD(extack, "Both vlan range flags are missing");
|
|
|
|
return false;
|
2020-01-14 10:56:07 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-01-14 10:56:14 -07:00
|
|
|
static inline int br_afspec_cmd_to_rtm(int cmd)
|
|
|
|
{
|
|
|
|
switch (cmd) {
|
|
|
|
case RTM_SETLINK:
|
|
|
|
return RTM_NEWVLAN;
|
|
|
|
case RTM_DELLINK:
|
|
|
|
return RTM_DELVLAN;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-09-26 08:01:00 -06:00
|
|
|
static inline int br_opt_get(const struct net_bridge *br,
|
|
|
|
enum net_bridge_opts opt)
|
|
|
|
{
|
|
|
|
return test_bit(opt, &br->options);
|
|
|
|
}
|
|
|
|
|
2018-11-23 19:34:20 -07:00
|
|
|
int br_boolopt_toggle(struct net_bridge *br, enum br_boolopt_id opt, bool on,
|
|
|
|
struct netlink_ext_ack *extack);
|
|
|
|
int br_boolopt_get(const struct net_bridge *br, enum br_boolopt_id opt);
|
|
|
|
int br_boolopt_multi_toggle(struct net_bridge *br,
|
|
|
|
struct br_boolopt_multi *bm,
|
|
|
|
struct netlink_ext_ack *extack);
|
|
|
|
void br_boolopt_multi_get(const struct net_bridge *br,
|
|
|
|
struct br_boolopt_multi *bm);
|
2018-09-26 08:01:00 -06:00
|
|
|
void br_opt_toggle(struct net_bridge *br, enum net_bridge_opts opt, bool on);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* br_device.c */
|
2013-10-18 14:48:22 -06: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 03:31:08 -06:00
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
2010-06-10 10:12:50 -06:00
|
|
|
static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
2020-05-07 10:32:21 -06:00
|
|
|
netpoll_send_skb(p->np, skb);
|
2010-06-10 10:12:50 -06:00
|
|
|
}
|
|
|
|
|
2014-03-27 16:36:38 -06:00
|
|
|
int br_netpoll_enable(struct net_bridge_port *p);
|
2013-10-18 14:48:22 -06:00
|
|
|
void br_netpoll_disable(struct net_bridge_port *p);
|
2010-05-10 03:31:08 -06:00
|
|
|
#else
|
2010-06-15 22:43:48 -06:00
|
|
|
static inline void br_netpoll_send_skb(const struct net_bridge_port *p,
|
2010-06-10 10:12:50 -06:00
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
}
|
2010-05-10 03:31:08 -06:00
|
|
|
|
2014-03-27 16:36:38 -06:00
|
|
|
static inline int br_netpoll_enable(struct net_bridge_port *p)
|
2010-06-10 10:12:50 -06:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_netpoll_disable(struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
}
|
2010-05-10 03:31:08 -06:00
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br_fdb.c */
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_fdb_init(void);
|
|
|
|
void br_fdb_fini(void);
|
2017-12-12 07:02:50 -07:00
|
|
|
int br_fdb_hash_init(struct net_bridge *br);
|
|
|
|
void br_fdb_hash_fini(struct net_bridge *br);
|
2013-10-18 14:48:22 -06:00
|
|
|
void br_fdb_flush(struct net_bridge *br);
|
2014-02-07 00:48:25 -07:00
|
|
|
void br_fdb_find_delete_local(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
const unsigned char *addr, u16 vid);
|
2013-10-18 14:48:22 -06: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 10:05:07 -07:00
|
|
|
void br_fdb_cleanup(struct work_struct *work);
|
2013-10-18 14:48:22 -06:00
|
|
|
void br_fdb_delete_by_port(struct net_bridge *br,
|
2015-06-23 06:28:16 -06:00
|
|
|
const struct net_bridge_port *p, u16 vid, int do_all);
|
2017-02-13 06:59:09 -07:00
|
|
|
struct net_bridge_fdb_entry *br_fdb_find_rcu(struct net_bridge *br,
|
|
|
|
const unsigned char *addr,
|
|
|
|
__u16 vid);
|
2013-10-18 14:48:22 -06: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,
|
2019-11-01 06:46:37 -06:00
|
|
|
const unsigned char *addr, u16 vid, unsigned long flags);
|
2013-10-18 14:48:22 -06:00
|
|
|
|
|
|
|
int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
|
2014-11-28 06:34:15 -07:00
|
|
|
struct net_device *dev, const unsigned char *addr, u16 vid);
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], struct net_device *dev,
|
2019-01-16 16:06:50 -07:00
|
|
|
const unsigned char *addr, u16 vid, u16 nlh_flags,
|
|
|
|
struct netlink_ext_ack *extack);
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
2016-08-30 22:56:45 -06:00
|
|
|
struct net_device *dev, struct net_device *fdev, int *idx);
|
2018-12-15 23:35:09 -07:00
|
|
|
int br_fdb_get(struct sk_buff *skb, struct nlattr *tb[], struct net_device *dev,
|
|
|
|
const unsigned char *addr, u16 vid, u32 portid, u32 seq,
|
|
|
|
struct netlink_ext_ack *extack);
|
2014-05-16 07:59:17 -06: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-15 15:49:37 -07:00
|
|
|
int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
|
2018-05-03 06:43:53 -06:00
|
|
|
const unsigned char *addr, u16 vid,
|
|
|
|
bool swdev_notify);
|
2015-01-15 15:49:37 -07:00
|
|
|
int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
|
2018-05-03 06:43:53 -06:00
|
|
|
const unsigned char *addr, u16 vid,
|
|
|
|
bool swdev_notify);
|
2017-06-08 00:44:15 -06:00
|
|
|
void br_fdb_offloaded_set(struct net_bridge *br, struct net_bridge_port *p,
|
2018-10-17 02:53:29 -06:00
|
|
|
const unsigned char *addr, u16 vid, bool offloaded);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br_forward.c */
|
2016-08-31 07:36:51 -06:00
|
|
|
enum br_pkt_type {
|
|
|
|
BR_PKT_UNICAST,
|
|
|
|
BR_PKT_MULTICAST,
|
|
|
|
BR_PKT_BROADCAST
|
|
|
|
};
|
2015-09-15 19:04:18 -06:00
|
|
|
int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb);
|
2016-07-13 21:10:01 -06:00
|
|
|
void br_forward(const struct net_bridge_port *to, struct sk_buff *skb,
|
2016-07-13 21:10:02 -06:00
|
|
|
bool local_rcv, bool local_orig);
|
2015-09-15 19:04:18 -06:00
|
|
|
int br_forward_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
|
2016-07-13 21:10:02 -06:00
|
|
|
void br_flood(struct net_bridge *br, struct sk_buff *skb,
|
2016-08-31 07:36:51 -06:00
|
|
|
enum br_pkt_type pkt_type, bool local_rcv, bool local_orig);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2018-05-24 02:56:48 -06:00
|
|
|
/* return true if both source port and dest port are isolated */
|
|
|
|
static inline bool br_skb_isolated(const struct net_bridge_port *to,
|
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return BR_INPUT_SKB_CB(skb)->src_port_isolated &&
|
|
|
|
(to->flags & BR_ISOLATED);
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* br_if.c */
|
2018-05-03 04:47:24 -06:00
|
|
|
void br_port_carrier_check(struct net_bridge_port *p, bool *notified);
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_add_bridge(struct net *net, const char *name);
|
|
|
|
int br_del_bridge(struct net *net, const char *name);
|
2017-10-04 18:48:50 -06:00
|
|
|
int br_add_if(struct net_bridge *br, struct net_device *dev,
|
|
|
|
struct netlink_ext_ack *extack);
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_del_if(struct net_bridge *br, struct net_device *dev);
|
2018-03-30 04:46:19 -06:00
|
|
|
void br_mtu_auto_adjust(struct net_bridge *br);
|
2013-10-18 14:48:22 -06:00
|
|
|
netdev_features_t br_features_recompute(struct net_bridge *br,
|
|
|
|
netdev_features_t features);
|
2014-05-16 07:59:16 -06:00
|
|
|
void br_port_flags_change(struct net_bridge_port *port, unsigned long mask);
|
2014-05-16 07:59:20 -06:00
|
|
|
void br_manage_promisc(struct net_bridge *br);
|
2018-07-23 02:16:59 -06:00
|
|
|
int nbp_backup_change(struct net_bridge_port *p, struct net_device *backup_dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br_input.c */
|
2015-09-15 19:04:18 -06:00
|
|
|
int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb);
|
2020-05-10 10:37:40 -06:00
|
|
|
rx_handler_func_t *br_get_rx_handler(const struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2013-12-05 08:27:37 -07:00
|
|
|
static inline bool br_rx_handler_check_rcu(const struct net_device *dev)
|
|
|
|
{
|
2020-05-10 10:37:40 -06:00
|
|
|
return rcu_dereference(dev->rx_handler) == br_get_rx_handler(dev);
|
2013-12-05 08:27:37 -07:00
|
|
|
}
|
|
|
|
|
2018-04-29 01:56:08 -06:00
|
|
|
static inline bool br_rx_handler_check_rtnl(const struct net_device *dev)
|
|
|
|
{
|
2020-05-10 10:37:40 -06:00
|
|
|
return rcu_dereference_rtnl(dev->rx_handler) == br_get_rx_handler(dev);
|
2018-04-29 01:56:08 -06:00
|
|
|
}
|
|
|
|
|
2013-12-05 08:27:37 -07:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2018-04-29 01:56:08 -06:00
|
|
|
static inline struct net_bridge_port *
|
|
|
|
br_port_get_check_rtnl(const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return br_rx_handler_check_rtnl(dev) ? br_port_get_rtnl_rcu(dev) : NULL;
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* br_ioctl.c */
|
2013-10-18 14:48:22 -06: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-16 16:20:36 -06:00
|
|
|
|
2010-02-27 12:41:45 -07:00
|
|
|
/* br_multicast.c */
|
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_multicast_rcv(struct net_bridge *br, struct net_bridge_port *port,
|
2013-11-04 11:48:30 -07:00
|
|
|
struct sk_buff *skb, u16 vid);
|
2013-10-18 14:48:22 -06:00
|
|
|
struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
|
|
|
|
struct sk_buff *skb, u16 vid);
|
2016-06-28 08:57:06 -06:00
|
|
|
int br_multicast_add_port(struct net_bridge_port *port);
|
2013-10-18 14:48:22 -06: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 08:16:51 -06:00
|
|
|
void br_multicast_dev_del(struct net_bridge *br);
|
2016-07-13 21:10:02 -06:00
|
|
|
void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
|
|
|
|
struct sk_buff *skb, bool local_rcv, bool local_orig);
|
2013-10-18 14:48:22 -06: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 05:03:24 -07:00
|
|
|
int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val);
|
2016-11-21 05:03:25 -07:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val);
|
|
|
|
#endif
|
2013-10-18 14:48:22 -06:00
|
|
|
struct net_bridge_mdb_entry *
|
2018-12-05 06:14:24 -07:00
|
|
|
br_mdb_ip_get(struct net_bridge *br, struct br_ip *dst);
|
2013-10-18 14:48:22 -06:00
|
|
|
struct net_bridge_mdb_entry *
|
2018-12-05 06:14:24 -07:00
|
|
|
br_multicast_new_group(struct net_bridge *br, struct br_ip *group);
|
2013-10-18 14:48:22 -06:00
|
|
|
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 13:01:32 -07:00
|
|
|
unsigned char flags, const unsigned char *src);
|
2018-12-05 06:14:24 -07:00
|
|
|
int br_mdb_hash_init(struct net_bridge *br);
|
|
|
|
void br_mdb_hash_fini(struct net_bridge *br);
|
2016-04-21 04:52:45 -06: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 06:00:53 -06:00
|
|
|
void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,
|
|
|
|
int type);
|
2016-06-28 08:57:06 -06:00
|
|
|
void br_multicast_count(struct net_bridge *br, const struct net_bridge_port *p,
|
2016-07-06 13:12:21 -06:00
|
|
|
const struct sk_buff *skb, u8 type, u8 dir);
|
2016-06-28 08:57:06 -06:00
|
|
|
int br_multicast_init_stats(struct net_bridge *br);
|
2017-04-10 05:59:27 -06:00
|
|
|
void br_multicast_uninit_stats(struct net_bridge *br);
|
2016-06-28 08:57:06 -06:00
|
|
|
void br_multicast_get_stats(const struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
struct br_mcast_stats *dest);
|
2018-12-05 06:14:24 -07:00
|
|
|
void br_mdb_init(void);
|
|
|
|
void br_mdb_uninit(void);
|
2019-08-17 05:22:13 -06:00
|
|
|
void br_multicast_host_join(struct net_bridge_mdb_entry *mp, bool notify);
|
|
|
|
void br_multicast_host_leave(struct net_bridge_mdb_entry *mp, bool notify);
|
2010-03-01 02:53:04 -07:00
|
|
|
|
2012-12-11 15:23:08 -07:00
|
|
|
#define mlock_dereference(X, br) \
|
|
|
|
rcu_dereference_protected(X, lockdep_is_held(&br->multicast_lock))
|
|
|
|
|
2010-03-01 02:53:04 -07: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-07-31 17:06:20 -06:00
|
|
|
|
2013-08-30 09:28:17 -06:00
|
|
|
static inline bool
|
|
|
|
__br_multicast_querier_exists(struct net_bridge *br,
|
2016-06-24 04:35:18 -06:00
|
|
|
struct bridge_mcast_other_query *querier,
|
|
|
|
const bool is_ipv6)
|
2013-07-31 17:06:20 -06:00
|
|
|
{
|
2016-06-24 04:35:18 -06:00
|
|
|
bool own_querier_enabled;
|
|
|
|
|
2018-09-26 08:01:04 -06:00
|
|
|
if (br_opt_get(br, BROPT_MULTICAST_QUERIER)) {
|
|
|
|
if (is_ipv6 && !br_opt_get(br, BROPT_HAS_IPV6_ADDR))
|
2016-06-24 04:35:18 -06:00
|
|
|
own_querier_enabled = false;
|
|
|
|
else
|
|
|
|
own_querier_enabled = true;
|
|
|
|
} else {
|
|
|
|
own_querier_enabled = false;
|
|
|
|
}
|
|
|
|
|
2013-08-30 09:28:17 -06:00
|
|
|
return time_is_before_jiffies(querier->delay_time) &&
|
2016-06-24 04:35:18 -06:00
|
|
|
(own_querier_enabled || timer_pending(&querier->timer));
|
2013-08-30 09:28:17 -06: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 04:35:18 -06:00
|
|
|
return __br_multicast_querier_exists(br,
|
|
|
|
&br->ip4_other_query, false);
|
2013-08-30 09:28:17 -06:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
case (htons(ETH_P_IPV6)):
|
2016-06-24 04:35:18 -06:00
|
|
|
return __br_multicast_querier_exists(br,
|
|
|
|
&br->ip6_other_query, true);
|
2013-08-30 09:28:17 -06:00
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
2013-07-31 17:06:20 -06:00
|
|
|
}
|
2016-06-28 08:57:06 -06:00
|
|
|
|
|
|
|
static inline int br_multicast_igmp_type(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return BR_INPUT_SKB_CB(skb)->igmp;
|
|
|
|
}
|
2010-02-27 12:41:45 -07:00
|
|
|
#else
|
|
|
|
static inline int br_multicast_rcv(struct net_bridge *br,
|
|
|
|
struct net_bridge_port *port,
|
2013-10-28 13:45:07 -06:00
|
|
|
struct sk_buff *skb,
|
|
|
|
u16 vid)
|
2010-02-27 12:41:45 -07:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,
|
2013-03-06 20:05:33 -07:00
|
|
|
struct sk_buff *skb, u16 vid)
|
2010-02-27 12:41:45 -07:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2016-06-28 08:57:06 -06:00
|
|
|
static inline int br_multicast_add_port(struct net_bridge_port *port)
|
2010-02-27 12:41:45 -07:00
|
|
|
{
|
2016-06-28 08:57:06 -06:00
|
|
|
return 0;
|
2010-02-27 12:41:45 -07: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 12:41:46 -07:00
|
|
|
|
2015-07-20 15:03:45 -06:00
|
|
|
static inline void br_multicast_dev_del(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-07-13 21:10:02 -06: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 12:41:46 -07:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2010-02-27 12:41:45 -07:00
|
|
|
static inline bool br_multicast_is_router(struct net_bridge *br)
|
|
|
|
{
|
2018-01-18 16:37:45 -07:00
|
|
|
return false;
|
2010-02-27 12:41:45 -07:00
|
|
|
}
|
2016-07-13 21:10:02 -06:00
|
|
|
|
2013-08-30 09:28:17 -06:00
|
|
|
static inline bool br_multicast_querier_exists(struct net_bridge *br,
|
|
|
|
struct ethhdr *eth)
|
2013-07-31 17:06:20 -06:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
2016-07-13 21:10:02 -06:00
|
|
|
|
2013-01-03 04:30:43 -07:00
|
|
|
static inline void br_mdb_init(void)
|
|
|
|
{
|
|
|
|
}
|
2016-07-13 21:10:02 -06:00
|
|
|
|
2013-01-03 04:30:43 -07:00
|
|
|
static inline void br_mdb_uninit(void)
|
|
|
|
{
|
|
|
|
}
|
2016-06-28 08:57:06 -06:00
|
|
|
|
2018-12-05 06:14:24 -07:00
|
|
|
static inline int br_mdb_hash_init(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_mdb_hash_fini(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-06-28 08:57:06 -06:00
|
|
|
static inline void br_multicast_count(struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
2016-07-06 13:12:21 -06:00
|
|
|
const struct sk_buff *skb,
|
|
|
|
u8 type, u8 dir)
|
2016-06-28 08:57:06 -06:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int br_multicast_init_stats(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-04-10 05:59:27 -06:00
|
|
|
static inline void br_multicast_uninit_stats(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-06-28 08:57:06 -06:00
|
|
|
static inline int br_multicast_igmp_type(const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2010-03-01 02:53:04 -07:00
|
|
|
#endif
|
2010-02-27 12:41:45 -07:00
|
|
|
|
2013-02-13 05:00:09 -07:00
|
|
|
/* br_vlan.c */
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
2015-09-30 12:16:53 -06:00
|
|
|
bool br_allowed_ingress(const struct net_bridge *br,
|
|
|
|
struct net_bridge_vlan_group *vg, struct sk_buff *skb,
|
2020-01-24 04:40:22 -07:00
|
|
|
u16 *vid, u8 *state);
|
2015-09-30 12:16:53 -06:00
|
|
|
bool br_allowed_egress(struct net_bridge_vlan_group *vg,
|
2013-10-18 14:48:22 -06:00
|
|
|
const struct sk_buff *skb);
|
2014-05-26 00:15:53 -06:00
|
|
|
bool br_should_learn(struct net_bridge_port *p, struct sk_buff *skb, u16 *vid);
|
2013-10-18 14:48:22 -06:00
|
|
|
struct sk_buff *br_handle_vlan(struct net_bridge *br,
|
2017-01-31 23:59:55 -07: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 11:00:11 -06:00
|
|
|
struct net_bridge_vlan_group *vg,
|
2013-10-18 14:48:22 -06:00
|
|
|
struct sk_buff *skb);
|
2017-10-27 04:19:37 -06:00
|
|
|
int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags,
|
2018-12-12 10:02:50 -07:00
|
|
|
bool *changed, struct netlink_ext_ack *extack);
|
2013-10-18 14:48:22 -06:00
|
|
|
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 11:00:11 -06:00
|
|
|
struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid);
|
2014-06-10 05:59:25 -06:00
|
|
|
void br_recalculate_fwd_mask(struct net_bridge *br);
|
2015-08-07 10:40:45 -06:00
|
|
|
int __br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val);
|
2015-08-27 00:32:26 -06:00
|
|
|
int __br_vlan_set_proto(struct net_bridge *br, __be16 proto);
|
2014-06-10 05:59:25 -06:00
|
|
|
int br_vlan_set_proto(struct net_bridge *br, unsigned long val);
|
2016-04-30 02:25:28 -06:00
|
|
|
int br_vlan_set_stats(struct net_bridge *br, unsigned long val);
|
2018-10-12 04:41:16 -06:00
|
|
|
int br_vlan_set_stats_per_port(struct net_bridge *br, unsigned long val);
|
2014-10-03 09:29:18 -06:00
|
|
|
int br_vlan_init(struct net_bridge *br);
|
2014-10-03 09:29:16 -06:00
|
|
|
int br_vlan_set_default_pvid(struct net_bridge *br, unsigned long val);
|
2018-12-12 10:02:50 -07:00
|
|
|
int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid,
|
|
|
|
struct netlink_ext_ack *extack);
|
2017-10-27 04:19:37 -06:00
|
|
|
int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,
|
2018-12-12 10:02:50 -07:00
|
|
|
bool *changed, struct netlink_ext_ack *extack);
|
2013-10-18 14:48:22 -06:00
|
|
|
int nbp_vlan_delete(struct net_bridge_port *port, u16 vid);
|
|
|
|
void nbp_vlan_flush(struct net_bridge_port *port);
|
2018-12-12 10:02:50 -07:00
|
|
|
int nbp_vlan_init(struct net_bridge_port *port, struct netlink_ext_ack *extack);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
int nbp_get_num_vlan_infos(struct net_bridge_port *p, u32 filter_mask);
|
2016-04-30 02:25:29 -06:00
|
|
|
void br_vlan_get_stats(const struct net_bridge_vlan *v,
|
|
|
|
struct br_vlan_stats *stats);
|
2019-04-18 11:35:33 -06:00
|
|
|
void br_vlan_port_event(struct net_bridge_port *p, unsigned long event);
|
2019-08-02 04:57:36 -06:00
|
|
|
int br_vlan_bridge_event(struct net_device *dev, unsigned long event,
|
|
|
|
void *ptr);
|
2020-01-14 10:56:09 -07:00
|
|
|
void br_vlan_rtnl_init(void);
|
|
|
|
void br_vlan_rtnl_uninit(void);
|
2020-01-14 10:56:13 -07:00
|
|
|
void br_vlan_notify(const struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
u16 vid, u16 vid_range,
|
|
|
|
int cmd);
|
2020-01-24 04:40:21 -07:00
|
|
|
bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr,
|
|
|
|
const struct net_bridge_vlan *range_end);
|
2013-02-13 05:00:10 -07:00
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
static inline struct net_bridge_vlan_group *br_vlan_group(
|
|
|
|
const struct net_bridge *br)
|
2013-02-13 05:00:10 -07:00
|
|
|
{
|
2015-10-12 13:47:02 -06:00
|
|
|
return rtnl_dereference(br->vlgrp);
|
2013-02-13 05:00:10 -07:00
|
|
|
}
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
static inline struct net_bridge_vlan_group *nbp_vlan_group(
|
|
|
|
const struct net_bridge_port *p)
|
2013-02-13 05:00:10 -07:00
|
|
|
{
|
2015-10-12 13:47:02 -06: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 05:00:10 -07: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 11:00:11 -06:00
|
|
|
if (skb_vlan_tag_present(skb)) {
|
2018-11-08 16:18:03 -07:00
|
|
|
*vid = skb_vlan_tag_get_id(skb);
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
} else {
|
2013-02-13 05:00:10 -07:00
|
|
|
*vid = 0;
|
|
|
|
err = -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
2013-02-13 05:00:14 -07:00
|
|
|
|
2015-09-30 12:16:53 -06: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 11:00:11 -06:00
|
|
|
{
|
2015-09-30 12:16:53 -06: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 11:00:11 -06:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
smp_rmb();
|
2015-09-30 12:16:53 -06:00
|
|
|
return vg->pvid;
|
2013-02-13 05:00:14 -07:00
|
|
|
}
|
|
|
|
|
2020-01-14 10:56:09 -07:00
|
|
|
static inline u16 br_vlan_flags(const struct net_bridge_vlan *v, u16 pvid)
|
|
|
|
{
|
|
|
|
return v->vid == pvid ? v->flags | BRIDGE_VLAN_INFO_PVID : v->flags;
|
|
|
|
}
|
2013-02-13 05:00:09 -07:00
|
|
|
#else
|
2015-09-30 12:16:53 -06:00
|
|
|
static inline bool br_allowed_ingress(const struct net_bridge *br,
|
|
|
|
struct net_bridge_vlan_group *vg,
|
2013-02-13 05:00:14 -07:00
|
|
|
struct sk_buff *skb,
|
2020-01-24 04:40:22 -07:00
|
|
|
u16 *vid, u8 *state)
|
2013-02-13 05:00:10 -07: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 11:00:11 -06:00
|
|
|
static inline bool br_allowed_egress(struct net_bridge_vlan_group *vg,
|
2013-02-13 05:00:11 -07:00
|
|
|
const struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-05-26 00:15:53 -06:00
|
|
|
static inline bool br_should_learn(struct net_bridge_port *p,
|
|
|
|
struct sk_buff *skb, u16 *vid)
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-02-13 05:00:14 -07:00
|
|
|
static inline struct sk_buff *br_handle_vlan(struct net_bridge *br,
|
2017-01-31 23:59:55 -07: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 11:00:11 -06:00
|
|
|
struct net_bridge_vlan_group *vg,
|
2013-02-13 05:00:14 -07:00
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|
2017-10-27 04:19:37 -06:00
|
|
|
static inline int br_vlan_add(struct net_bridge *br, u16 vid, u16 flags,
|
2018-12-12 10:02:50 -07:00
|
|
|
bool *changed, struct netlink_ext_ack *extack)
|
2013-02-13 05:00:09 -07:00
|
|
|
{
|
2017-10-27 04:19:37 -06:00
|
|
|
*changed = false;
|
2013-02-13 05:00:09 -07: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 05:59:25 -06:00
|
|
|
static inline void br_recalculate_fwd_mask(struct net_bridge *br)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2014-10-03 09:29:18 -06:00
|
|
|
static inline int br_vlan_init(struct net_bridge *br)
|
2014-06-10 05:59:23 -06:00
|
|
|
{
|
2014-10-03 09:29:18 -06:00
|
|
|
return 0;
|
2014-06-10 05:59:23 -06:00
|
|
|
}
|
|
|
|
|
2017-10-27 04:19:37 -06:00
|
|
|
static inline int nbp_vlan_add(struct net_bridge_port *port, u16 vid, u16 flags,
|
2018-12-12 10:02:50 -07:00
|
|
|
bool *changed, struct netlink_ext_ack *extack)
|
2013-02-13 05:00:09 -07:00
|
|
|
{
|
2017-10-27 04:19:37 -06:00
|
|
|
*changed = false;
|
2013-02-13 05:00:09 -07: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 11:00:11 -06:00
|
|
|
static inline struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg,
|
|
|
|
u16 vid)
|
2013-02-13 05:00:10 -07:00
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-12-12 10:02:50 -07:00
|
|
|
static inline int nbp_vlan_init(struct net_bridge_port *port,
|
|
|
|
struct netlink_ext_ack *extack)
|
2013-02-13 05:00:19 -07:00
|
|
|
{
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
return 0;
|
2013-02-13 05:00:19 -07:00
|
|
|
}
|
|
|
|
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 11:00:11 -06:00
|
|
|
static inline u16 br_vlan_get_tag(const struct sk_buff *skb, u16 *tag)
|
2014-10-03 09:29:18 -06:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-09-30 12:16:53 -06:00
|
|
|
static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg)
|
2013-02-13 05:00:14 -07:00
|
|
|
{
|
2014-10-03 09:29:17 -06:00
|
|
|
return 0;
|
2013-02-13 05:00:14 -07:00
|
|
|
}
|
2014-05-16 07:59:20 -06:00
|
|
|
|
2015-08-07 10:40:45 -06: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 11:00:11 -06: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 13:47:02 -06: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 02:25:29 -06:00
|
|
|
|
|
|
|
static inline void br_vlan_get_stats(const struct net_bridge_vlan *v,
|
|
|
|
struct br_vlan_stats *stats)
|
|
|
|
{
|
|
|
|
}
|
2019-04-18 11:35:33 -06:00
|
|
|
|
|
|
|
static inline void br_vlan_port_event(struct net_bridge_port *p,
|
|
|
|
unsigned long event)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2019-08-02 04:57:36 -06:00
|
|
|
static inline int br_vlan_bridge_event(struct net_device *dev,
|
|
|
|
unsigned long event, void *ptr)
|
2019-04-18 11:35:33 -06:00
|
|
|
{
|
2019-08-02 04:57:36 -06:00
|
|
|
return 0;
|
2019-04-18 11:35:33 -06:00
|
|
|
}
|
2020-01-14 10:56:09 -07:00
|
|
|
|
|
|
|
static inline void br_vlan_rtnl_init(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_vlan_rtnl_uninit(void)
|
|
|
|
{
|
|
|
|
}
|
2020-01-14 10:56:13 -07:00
|
|
|
|
|
|
|
static inline void br_vlan_notify(const struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
u16 vid, u16 vid_range,
|
|
|
|
int cmd)
|
|
|
|
{
|
|
|
|
}
|
2013-02-13 05:00:09 -07:00
|
|
|
#endif
|
|
|
|
|
2020-01-24 04:40:20 -07:00
|
|
|
/* br_vlan_options.c */
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
2020-03-17 06:08:33 -06:00
|
|
|
bool br_vlan_opts_eq_range(const struct net_bridge_vlan *v_curr,
|
|
|
|
const struct net_bridge_vlan *range_end);
|
2020-01-24 04:40:20 -07:00
|
|
|
bool br_vlan_opts_fill(struct sk_buff *skb, const struct net_bridge_vlan *v);
|
|
|
|
size_t br_vlan_opts_nl_size(void);
|
2020-01-24 04:40:21 -07:00
|
|
|
int br_vlan_process_options(const struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *p,
|
|
|
|
struct net_bridge_vlan *range_start,
|
|
|
|
struct net_bridge_vlan *range_end,
|
|
|
|
struct nlattr **tb,
|
|
|
|
struct netlink_ext_ack *extack);
|
2020-01-24 04:40:22 -07:00
|
|
|
|
|
|
|
/* vlan state manipulation helpers using *_ONCE to annotate lock-free access */
|
|
|
|
static inline u8 br_vlan_get_state(const struct net_bridge_vlan *v)
|
|
|
|
{
|
|
|
|
return READ_ONCE(v->state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_vlan_set_state(struct net_bridge_vlan *v, u8 state)
|
|
|
|
{
|
|
|
|
WRITE_ONCE(v->state, state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u8 br_vlan_get_pvid_state(const struct net_bridge_vlan_group *vg)
|
|
|
|
{
|
|
|
|
return READ_ONCE(vg->pvid_state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_vlan_set_pvid_state(struct net_bridge_vlan_group *vg,
|
|
|
|
u8 state)
|
|
|
|
{
|
|
|
|
WRITE_ONCE(vg->pvid_state, state);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* learn_allow is true at ingress and false at egress */
|
|
|
|
static inline bool br_vlan_state_allowed(u8 state, bool learn_allow)
|
|
|
|
{
|
|
|
|
switch (state) {
|
|
|
|
case BR_STATE_LEARNING:
|
|
|
|
return learn_allow;
|
|
|
|
case BR_STATE_FORWARDING:
|
|
|
|
return true;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2020-01-24 04:40:20 -07:00
|
|
|
#endif
|
|
|
|
|
2015-03-10 03:27:18 -06: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-16 16:20:36 -06:00
|
|
|
/* br_netfilter.c */
|
2014-09-18 03:29:03 -06:00
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
|
|
|
|
int br_nf_core_init(void);
|
|
|
|
void br_nf_core_fini(void);
|
2013-10-18 14:48:22 -06:00
|
|
|
void br_netfilter_rtable_init(struct net_bridge *);
|
2006-05-25 16:59:33 -06:00
|
|
|
#else
|
2014-09-18 03:29:03 -06:00
|
|
|
static inline int br_nf_core_init(void) { return 0; }
|
|
|
|
static inline void br_nf_core_fini(void) {}
|
2008-07-30 17:27:55 -06:00
|
|
|
#define br_netfilter_rtable_init(x)
|
2006-05-25 16:59:33 -06:00
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br_stp.c */
|
2014-09-30 17:13:19 -06:00
|
|
|
void br_set_state(struct net_bridge_port *p, unsigned int state);
|
2013-10-18 14:48:22 -06: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-16 16:20:36 -06:00
|
|
|
|
2013-10-18 14:48:22 -06: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 11:44:27 -07:00
|
|
|
int __set_ageing_time(struct net_device *dev, unsigned long t);
|
2016-07-21 10:42:19 -06:00
|
|
|
int br_set_ageing_time(struct net_bridge *br, clock_t ageing_time);
|
2011-04-04 08:03:33 -06:00
|
|
|
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/* br_stp_if.c */
|
2013-10-18 14:48:22 -06:00
|
|
|
void br_stp_enable_bridge(struct net_bridge *br);
|
|
|
|
void br_stp_disable_bridge(struct net_bridge *br);
|
2020-04-26 07:22:08 -06:00
|
|
|
int br_stp_set_enabled(struct net_bridge *br, unsigned long val,
|
|
|
|
struct netlink_ext_ack *extack);
|
2013-10-18 14:48:22 -06:00
|
|
|
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-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br_stp_bpdu.c */
|
2008-07-05 22:25:56 -06:00
|
|
|
struct stp_proto;
|
2013-10-18 14:48:22 -06:00
|
|
|
void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb,
|
|
|
|
struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br_stp_timer.c */
|
2013-10-18 14:48:22 -06: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-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br.c */
|
2011-12-11 19:58:25 -07:00
|
|
|
#if IS_ENABLED(CONFIG_ATM_LANE)
|
2009-06-04 23:35:28 -06:00
|
|
|
extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr);
|
|
|
|
#endif
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2020-04-26 07:22:07 -06:00
|
|
|
/* br_mrp.c */
|
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_MRP)
|
|
|
|
int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,
|
|
|
|
struct nlattr *attr, int cmd, struct netlink_ext_ack *extack);
|
|
|
|
int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb);
|
|
|
|
bool br_mrp_enabled(struct net_bridge *br);
|
|
|
|
void br_mrp_port_del(struct net_bridge *br, struct net_bridge_port *p);
|
|
|
|
#else
|
|
|
|
static inline int br_mrp_parse(struct net_bridge *br, struct net_bridge_port *p,
|
|
|
|
struct nlattr *attr, int cmd,
|
|
|
|
struct netlink_ext_ack *extack)
|
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int br_mrp_process(struct net_bridge_port *p, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline bool br_mrp_enabled(struct net_bridge *br)
|
|
|
|
{
|
2020-05-06 00:16:16 -06:00
|
|
|
return false;
|
2020-04-26 07:22:07 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void br_mrp_port_del(struct net_bridge *br,
|
|
|
|
struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-05-25 17:00:12 -06:00
|
|
|
/* br_netlink.c */
|
2012-06-25 23:48:45 -06:00
|
|
|
extern struct rtnl_link_ops br_link_ops;
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_netlink_init(void);
|
|
|
|
void br_netlink_fini(void);
|
2017-11-01 04:18:13 -06:00
|
|
|
void br_ifinfo_notify(int event, const struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *port);
|
2018-12-12 10:02:48 -07:00
|
|
|
int br_setlink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags,
|
|
|
|
struct netlink_ext_ack *extack);
|
2015-01-29 23:40:12 -07:00
|
|
|
int br_dellink(struct net_device *dev, struct nlmsghdr *nlmsg, u16 flags);
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, struct net_device *dev,
|
2015-04-28 10:33:49 -06:00
|
|
|
u32 filter_mask, int nlflags);
|
2020-01-14 10:56:10 -07:00
|
|
|
int br_process_vlan_info(struct net_bridge *br,
|
|
|
|
struct net_bridge_port *p, int cmd,
|
|
|
|
struct bridge_vlan_info *vinfo_curr,
|
|
|
|
struct bridge_vlan_info **vinfo_last,
|
|
|
|
bool *changed,
|
|
|
|
struct netlink_ext_ack *extack);
|
2006-05-25 17:00:12 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#ifdef CONFIG_SYSFS
|
|
|
|
/* br_sysfs_if.c */
|
2010-01-18 18:58:23 -07:00
|
|
|
extern const struct sysfs_ops brport_sysfs_ops;
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_sysfs_addif(struct net_bridge_port *p);
|
|
|
|
int br_sysfs_renameif(struct net_bridge_port *p);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* br_sysfs_br.c */
|
2013-10-18 14:48:22 -06:00
|
|
|
int br_sysfs_addbr(struct net_device *dev);
|
|
|
|
void br_sysfs_delbr(struct net_device *dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
2012-11-03 16:02:30 -06: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-16 16:20:36 -06:00
|
|
|
#endif /* CONFIG_SYSFS */
|
|
|
|
|
2016-08-25 10:42:37 -06: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);
|
2017-06-08 00:44:11 -06:00
|
|
|
int br_switchdev_set_port_flag(struct net_bridge_port *p,
|
|
|
|
unsigned long flags,
|
|
|
|
unsigned long mask);
|
2017-06-08 00:44:14 -06:00
|
|
|
void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,
|
|
|
|
int type);
|
2018-12-12 10:02:50 -07:00
|
|
|
int br_switchdev_port_vlan_add(struct net_device *dev, u16 vid, u16 flags,
|
|
|
|
struct netlink_ext_ack *extack);
|
2018-05-29 18:56:03 -06:00
|
|
|
int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid);
|
2017-09-03 08:44:13 -06:00
|
|
|
|
|
|
|
static inline void br_switchdev_frame_unmark(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
skb->offload_fwd_mark = 0;
|
|
|
|
}
|
2016-08-25 10:42:37 -06:00
|
|
|
#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;
|
|
|
|
}
|
2017-06-08 00:44:11 -06:00
|
|
|
|
|
|
|
static inline int br_switchdev_set_port_flag(struct net_bridge_port *p,
|
|
|
|
unsigned long flags,
|
|
|
|
unsigned long mask)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2017-06-08 00:44:14 -06:00
|
|
|
|
2018-05-29 18:56:03 -06:00
|
|
|
static inline int br_switchdev_port_vlan_add(struct net_device *dev,
|
2018-12-12 10:02:50 -07:00
|
|
|
u16 vid, u16 flags,
|
|
|
|
struct netlink_ext_ack *extack)
|
2018-05-29 18:56:03 -06:00
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int br_switchdev_port_vlan_del(struct net_device *dev, u16 vid)
|
|
|
|
{
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
2017-06-08 00:44:14 -06:00
|
|
|
static inline void
|
|
|
|
br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
|
|
|
|
{
|
|
|
|
}
|
2017-09-03 08:44:13 -06:00
|
|
|
|
|
|
|
static inline void br_switchdev_frame_unmark(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
}
|
2016-08-25 10:42:37 -06:00
|
|
|
#endif /* CONFIG_NET_SWITCHDEV */
|
|
|
|
|
2017-10-06 23:12:38 -06:00
|
|
|
/* br_arp_nd_proxy.c */
|
2017-10-06 23:12:37 -06:00
|
|
|
void br_recalculate_neigh_suppress_enabled(struct net_bridge *br);
|
2017-10-06 23:12:38 -06:00
|
|
|
void br_do_proxy_suppress_arp(struct sk_buff *skb, struct net_bridge *br,
|
|
|
|
u16 vid, struct net_bridge_port *p);
|
2017-10-06 23:12:39 -06:00
|
|
|
void br_do_suppress_nd(struct sk_buff *skb, struct net_bridge *br,
|
|
|
|
u16 vid, struct net_bridge_port *p, struct nd_msg *msg);
|
|
|
|
struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *m);
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|