2006-05-25 23:00:12 +00:00
|
|
|
/*
|
|
|
|
* Bridge netlink control interface
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Stephen Hemminger <shemminger@osdl.org>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2011-04-04 14:03:32 +00:00
|
|
|
#include <linux/etherdevice.h>
|
2007-03-22 18:59:03 +00:00
|
|
|
#include <net/rtnetlink.h>
|
2007-09-17 18:56:21 +00:00
|
|
|
#include <net/net_namespace.h>
|
2007-11-30 13:21:31 +00:00
|
|
|
#include <net/sock.h>
|
2013-02-13 12:00:12 +00:00
|
|
|
#include <uapi/linux/if_bridge.h>
|
2011-04-04 14:03:32 +00:00
|
|
|
|
2006-05-25 23:00:12 +00:00
|
|
|
#include "br_private.h"
|
2011-11-25 00:16:37 +00:00
|
|
|
#include "br_private_stp.h"
|
2017-02-01 06:59:54 +00:00
|
|
|
#include "br_private_tunnel.h"
|
2006-05-25 23:00:12 +00: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 17:00:11 +00:00
|
|
|
static int __get_num_vlan_infos(struct net_bridge_vlan_group *vg,
|
2015-09-30 18:16:53 +00:00
|
|
|
u32 filter_mask)
|
2015-02-26 07:55:40 +00: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 17:00:11 +00:00
|
|
|
struct net_bridge_vlan *v;
|
|
|
|
u16 vid_range_start = 0, vid_range_end = 0, vid_range_flags = 0;
|
2015-09-30 18:16:53 +00:00
|
|
|
u16 flags, pvid;
|
2015-02-26 07:55:40 +00:00
|
|
|
int num_vlans = 0;
|
|
|
|
|
|
|
|
if (!(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED))
|
|
|
|
return 0;
|
|
|
|
|
2015-09-30 18:16:53 +00:00
|
|
|
pvid = br_get_pvid(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 17:00:11 +00:00
|
|
|
/* Count number of vlan infos */
|
2015-10-02 13:05:10 +00:00
|
|
|
list_for_each_entry_rcu(v, &vg->vlan_list, vlist) {
|
2015-02-26 07:55:40 +00:00
|
|
|
flags = 0;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 17:00:11 +00:00
|
|
|
/* only a context, bridge vlan not activated */
|
|
|
|
if (!br_vlan_should_use(v))
|
|
|
|
continue;
|
|
|
|
if (v->vid == pvid)
|
2015-02-26 07:55:40 +00:00
|
|
|
flags |= BRIDGE_VLAN_INFO_PVID;
|
|
|
|
|
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 17:00:11 +00:00
|
|
|
if (v->flags & BRIDGE_VLAN_INFO_UNTAGGED)
|
2015-02-26 07:55:40 +00:00
|
|
|
flags |= BRIDGE_VLAN_INFO_UNTAGGED;
|
|
|
|
|
|
|
|
if (vid_range_start == 0) {
|
|
|
|
goto initvars;
|
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 17:00:11 +00:00
|
|
|
} else if ((v->vid - vid_range_end) == 1 &&
|
2015-02-26 07:55:40 +00:00
|
|
|
flags == vid_range_flags) {
|
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 17:00:11 +00:00
|
|
|
vid_range_end = v->vid;
|
2015-02-26 07:55:40 +00:00
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
if ((vid_range_end - vid_range_start) > 0)
|
|
|
|
num_vlans += 2;
|
|
|
|
else
|
|
|
|
num_vlans += 1;
|
|
|
|
}
|
|
|
|
initvars:
|
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 17:00:11 +00:00
|
|
|
vid_range_start = v->vid;
|
|
|
|
vid_range_end = v->vid;
|
2015-02-26 07:55:40 +00:00
|
|
|
vid_range_flags = flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (vid_range_start != 0) {
|
|
|
|
if ((vid_range_end - vid_range_start) > 0)
|
|
|
|
num_vlans += 2;
|
|
|
|
else
|
|
|
|
num_vlans += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return num_vlans;
|
|
|
|
}
|
|
|
|
|
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 17:00:11 +00:00
|
|
|
static int br_get_num_vlan_infos(struct net_bridge_vlan_group *vg,
|
2015-09-30 18:16:53 +00:00
|
|
|
u32 filter_mask)
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 17:00:11 +00:00
|
|
|
{
|
2015-10-02 13:05:10 +00:00
|
|
|
int num_vlans;
|
|
|
|
|
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 17:00:11 +00:00
|
|
|
if (!vg)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (filter_mask & RTEXT_FILTER_BRVLAN)
|
|
|
|
return vg->num_vlans;
|
|
|
|
|
2015-10-02 13:05:10 +00:00
|
|
|
rcu_read_lock();
|
|
|
|
num_vlans = __get_num_vlan_infos(vg, filter_mask);
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return num_vlans;
|
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 17:00:11 +00:00
|
|
|
}
|
|
|
|
|
2015-02-26 07:55:40 +00:00
|
|
|
static size_t br_get_link_af_size_filtered(const struct net_device *dev,
|
|
|
|
u32 filter_mask)
|
2015-02-22 04:21:51 +00: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 17:00:11 +00:00
|
|
|
struct net_bridge_vlan_group *vg = NULL;
|
2017-02-01 06:59:54 +00:00
|
|
|
struct net_bridge_port *p = NULL;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 17:00:11 +00:00
|
|
|
struct net_bridge *br;
|
2015-02-26 07:55:40 +00:00
|
|
|
int num_vlan_infos;
|
2017-02-01 06:59:54 +00:00
|
|
|
size_t vinfo_sz = 0;
|
2015-02-22 04:21:51 +00:00
|
|
|
|
2015-03-03 15:02:16 +00:00
|
|
|
rcu_read_lock();
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 17:00:11 +00:00
|
|
|
if (br_port_exists(dev)) {
|
|
|
|
p = br_port_get_rcu(dev);
|
2015-10-12 19:47:02 +00:00
|
|
|
vg = nbp_vlan_group_rcu(p);
|
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 17:00:11 +00:00
|
|
|
} else if (dev->priv_flags & IFF_EBRIDGE) {
|
|
|
|
br = netdev_priv(dev);
|
2015-10-12 19:47:02 +00:00
|
|
|
vg = br_vlan_group_rcu(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 17:00:11 +00:00
|
|
|
}
|
2015-09-30 18:16:53 +00:00
|
|
|
num_vlan_infos = br_get_num_vlan_infos(vg, filter_mask);
|
2015-03-03 15:02:16 +00:00
|
|
|
rcu_read_unlock();
|
2015-02-22 04:21:51 +00:00
|
|
|
|
2017-02-01 06:59:54 +00:00
|
|
|
if (p && (p->flags & BR_VLAN_TUNNEL))
|
|
|
|
vinfo_sz += br_get_vlan_tunnel_info_size(vg);
|
|
|
|
|
2015-02-22 04:21:51 +00:00
|
|
|
/* Each VLAN is returned in bridge_vlan_info along with flags */
|
2017-02-01 06:59:54 +00:00
|
|
|
vinfo_sz += num_vlan_infos * nla_total_size(sizeof(struct bridge_vlan_info));
|
|
|
|
|
|
|
|
return vinfo_sz;
|
2015-02-22 04:21:51 +00:00
|
|
|
}
|
|
|
|
|
2012-11-13 07:53:05 +00:00
|
|
|
static inline size_t br_port_info_size(void)
|
|
|
|
{
|
|
|
|
return nla_total_size(1) /* IFLA_BRPORT_STATE */
|
|
|
|
+ nla_total_size(2) /* IFLA_BRPORT_PRIORITY */
|
|
|
|
+ nla_total_size(4) /* IFLA_BRPORT_COST */
|
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_MODE */
|
2012-11-13 07:53:07 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_GUARD */
|
2012-11-13 07:53:08 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_PROTECT */
|
2013-03-11 13:52:17 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_FAST_LEAVE */
|
2017-01-21 20:01:32 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_MCAST_TO_UCAST */
|
2013-06-05 14:08:00 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_LEARNING */
|
2013-06-05 14:08:01 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_UNICAST_FLOOD */
|
2017-05-05 14:36:53 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_MCAST_FLOOD */
|
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_BCAST_FLOOD */
|
2015-08-04 17:06:32 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP */
|
2015-08-04 17:06:33 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_PROXYARP_WIFI */
|
2017-02-01 06:59:54 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_VLAN_TUNNEL */
|
2017-10-07 05:12:37 +00:00
|
|
|
+ nla_total_size(1) /* IFLA_BRPORT_NEIGH_SUPPRESS */
|
2015-10-06 12:11:55 +00:00
|
|
|
+ nla_total_size(sizeof(struct ifla_bridge_id)) /* IFLA_BRPORT_ROOT_ID */
|
2015-10-06 12:11:56 +00:00
|
|
|
+ nla_total_size(sizeof(struct ifla_bridge_id)) /* IFLA_BRPORT_BRIDGE_ID */
|
2015-10-06 12:11:57 +00:00
|
|
|
+ nla_total_size(sizeof(u16)) /* IFLA_BRPORT_DESIGNATED_PORT */
|
|
|
|
+ nla_total_size(sizeof(u16)) /* IFLA_BRPORT_DESIGNATED_COST */
|
2015-10-06 12:11:58 +00:00
|
|
|
+ nla_total_size(sizeof(u16)) /* IFLA_BRPORT_ID */
|
|
|
|
+ nla_total_size(sizeof(u16)) /* IFLA_BRPORT_NO */
|
2015-10-06 12:11:59 +00:00
|
|
|
+ nla_total_size(sizeof(u8)) /* IFLA_BRPORT_TOPOLOGY_CHANGE_ACK */
|
|
|
|
+ nla_total_size(sizeof(u8)) /* IFLA_BRPORT_CONFIG_PENDING */
|
2016-04-25 08:25:18 +00:00
|
|
|
+ nla_total_size_64bit(sizeof(u64)) /* IFLA_BRPORT_MESSAGE_AGE_TIMER */
|
|
|
|
+ nla_total_size_64bit(sizeof(u64)) /* IFLA_BRPORT_FORWARD_DELAY_TIMER */
|
|
|
|
+ nla_total_size_64bit(sizeof(u64)) /* IFLA_BRPORT_HOLD_TIMER */
|
2015-10-06 12:12:02 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
+ nla_total_size(sizeof(u8)) /* IFLA_BRPORT_MULTICAST_ROUTER */
|
|
|
|
#endif
|
2017-09-27 13:12:44 +00:00
|
|
|
+ nla_total_size(sizeof(u16)) /* IFLA_BRPORT_GROUP_FWD_MASK */
|
2012-11-13 07:53:05 +00:00
|
|
|
+ 0;
|
|
|
|
}
|
|
|
|
|
2015-02-26 07:55:40 +00:00
|
|
|
static inline size_t br_nlmsg_size(struct net_device *dev, u32 filter_mask)
|
2006-11-10 22:10:15 +00:00
|
|
|
{
|
|
|
|
return NLMSG_ALIGN(sizeof(struct ifinfomsg))
|
2012-11-13 07:53:05 +00:00
|
|
|
+ nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */
|
|
|
|
+ nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */
|
|
|
|
+ nla_total_size(4) /* IFLA_MASTER */
|
|
|
|
+ nla_total_size(4) /* IFLA_MTU */
|
|
|
|
+ nla_total_size(4) /* IFLA_LINK */
|
|
|
|
+ nla_total_size(1) /* IFLA_OPERSTATE */
|
2015-02-22 04:21:51 +00:00
|
|
|
+ nla_total_size(br_port_info_size()) /* IFLA_PROTINFO */
|
2015-02-26 07:55:40 +00:00
|
|
|
+ nla_total_size(br_get_link_af_size_filtered(dev,
|
|
|
|
filter_mask)); /* IFLA_AF_SPEC */
|
2012-11-13 07:53:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int br_port_fill_attrs(struct sk_buff *skb,
|
|
|
|
const struct net_bridge_port *p)
|
|
|
|
{
|
|
|
|
u8 mode = !!(p->flags & BR_HAIRPIN_MODE);
|
2015-10-06 12:12:00 +00:00
|
|
|
u64 timerval;
|
2012-11-13 07:53:05 +00:00
|
|
|
|
|
|
|
if (nla_put_u8(skb, IFLA_BRPORT_STATE, p->state) ||
|
|
|
|
nla_put_u16(skb, IFLA_BRPORT_PRIORITY, p->priority) ||
|
|
|
|
nla_put_u32(skb, IFLA_BRPORT_COST, p->path_cost) ||
|
2012-11-13 07:53:07 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_MODE, mode) ||
|
2012-11-13 07:53:08 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_GUARD, !!(p->flags & BR_BPDU_GUARD)) ||
|
2016-08-31 13:36:52 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_PROTECT,
|
|
|
|
!!(p->flags & BR_ROOT_BLOCK)) ||
|
|
|
|
nla_put_u8(skb, IFLA_BRPORT_FAST_LEAVE,
|
|
|
|
!!(p->flags & BR_MULTICAST_FAST_LEAVE)) ||
|
2017-01-21 20:01:32 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_MCAST_TO_UCAST,
|
|
|
|
!!(p->flags & BR_MULTICAST_TO_UNICAST)) ||
|
2013-06-05 14:08:01 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_LEARNING, !!(p->flags & BR_LEARNING)) ||
|
2016-08-31 13:36:52 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_UNICAST_FLOOD,
|
|
|
|
!!(p->flags & BR_FLOOD)) ||
|
|
|
|
nla_put_u8(skb, IFLA_BRPORT_MCAST_FLOOD,
|
|
|
|
!!(p->flags & BR_MCAST_FLOOD)) ||
|
2017-04-26 13:48:09 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_BCAST_FLOOD,
|
|
|
|
!!(p->flags & BR_BCAST_FLOOD)) ||
|
2015-03-04 10:54:21 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_PROXYARP, !!(p->flags & BR_PROXYARP)) ||
|
|
|
|
nla_put_u8(skb, IFLA_BRPORT_PROXYARP_WIFI,
|
2015-10-06 12:11:55 +00:00
|
|
|
!!(p->flags & BR_PROXYARP_WIFI)) ||
|
|
|
|
nla_put(skb, IFLA_BRPORT_ROOT_ID, sizeof(struct ifla_bridge_id),
|
2015-10-06 12:11:56 +00:00
|
|
|
&p->designated_root) ||
|
|
|
|
nla_put(skb, IFLA_BRPORT_BRIDGE_ID, sizeof(struct ifla_bridge_id),
|
2015-10-06 12:11:57 +00:00
|
|
|
&p->designated_bridge) ||
|
|
|
|
nla_put_u16(skb, IFLA_BRPORT_DESIGNATED_PORT, p->designated_port) ||
|
2015-10-06 12:11:58 +00:00
|
|
|
nla_put_u16(skb, IFLA_BRPORT_DESIGNATED_COST, p->designated_cost) ||
|
|
|
|
nla_put_u16(skb, IFLA_BRPORT_ID, p->port_id) ||
|
2015-10-06 12:11:59 +00:00
|
|
|
nla_put_u16(skb, IFLA_BRPORT_NO, p->port_no) ||
|
|
|
|
nla_put_u8(skb, IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,
|
|
|
|
p->topology_change_ack) ||
|
2017-02-01 06:59:54 +00:00
|
|
|
nla_put_u8(skb, IFLA_BRPORT_CONFIG_PENDING, p->config_pending) ||
|
|
|
|
nla_put_u8(skb, IFLA_BRPORT_VLAN_TUNNEL, !!(p->flags &
|
2017-09-27 13:12:44 +00:00
|
|
|
BR_VLAN_TUNNEL)) ||
|
2017-10-07 05:12:37 +00:00
|
|
|
nla_put_u16(skb, IFLA_BRPORT_GROUP_FWD_MASK, p->group_fwd_mask) ||
|
|
|
|
nla_put_u8(skb, IFLA_BRPORT_NEIGH_SUPPRESS,
|
|
|
|
!!(p->flags & BR_NEIGH_SUPPRESS)))
|
2012-11-13 07:53:05 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
|
2015-10-06 12:12:00 +00:00
|
|
|
timerval = br_timer_value(&p->message_age_timer);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BRPORT_MESSAGE_AGE_TIMER, timerval,
|
|
|
|
IFLA_BRPORT_PAD))
|
2015-10-06 12:12:00 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
timerval = br_timer_value(&p->forward_delay_timer);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BRPORT_FORWARD_DELAY_TIMER, timerval,
|
|
|
|
IFLA_BRPORT_PAD))
|
2015-10-06 12:12:00 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
timerval = br_timer_value(&p->hold_timer);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BRPORT_HOLD_TIMER, timerval,
|
|
|
|
IFLA_BRPORT_PAD))
|
2015-10-06 12:12:00 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
|
2015-10-06 12:12:02 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
if (nla_put_u8(skb, IFLA_BRPORT_MULTICAST_ROUTER,
|
|
|
|
p->multicast_router))
|
|
|
|
return -EMSGSIZE;
|
|
|
|
#endif
|
|
|
|
|
2012-11-13 07:53:05 +00:00
|
|
|
return 0;
|
2006-11-10 22:10:15 +00:00
|
|
|
}
|
|
|
|
|
2015-01-10 15:31:14 +00:00
|
|
|
static int br_fill_ifvlaninfo_range(struct sk_buff *skb, u16 vid_start,
|
|
|
|
u16 vid_end, u16 flags)
|
|
|
|
{
|
|
|
|
struct bridge_vlan_info vinfo;
|
|
|
|
|
|
|
|
if ((vid_end - vid_start) > 0) {
|
|
|
|
/* add range to skb */
|
|
|
|
vinfo.vid = vid_start;
|
|
|
|
vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_BEGIN;
|
|
|
|
if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,
|
|
|
|
sizeof(vinfo), &vinfo))
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
|
|
|
vinfo.vid = vid_end;
|
|
|
|
vinfo.flags = flags | BRIDGE_VLAN_INFO_RANGE_END;
|
|
|
|
if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,
|
|
|
|
sizeof(vinfo), &vinfo))
|
|
|
|
goto nla_put_failure;
|
|
|
|
} else {
|
|
|
|
vinfo.vid = vid_start;
|
|
|
|
vinfo.flags = flags;
|
|
|
|
if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,
|
|
|
|
sizeof(vinfo), &vinfo))
|
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int br_fill_ifvlaninfo_compressed(struct sk_buff *skb,
|
2015-09-30 18:16:53 +00:00
|
|
|
struct net_bridge_vlan_group *vg)
|
2015-01-10 15:31:14 +00: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 17:00:11 +00:00
|
|
|
struct net_bridge_vlan *v;
|
|
|
|
u16 vid_range_start = 0, vid_range_end = 0, vid_range_flags = 0;
|
2015-09-30 18:16:53 +00:00
|
|
|
u16 flags, pvid;
|
2015-01-10 15:31:14 +00:00
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
/* Pack IFLA_BRIDGE_VLAN_INFO's for every vlan
|
|
|
|
* and mark vlan info with begin and end flags
|
|
|
|
* if vlaninfo represents a range
|
|
|
|
*/
|
2015-09-30 18:16:53 +00:00
|
|
|
pvid = br_get_pvid(vg);
|
2015-10-12 19:47:03 +00:00
|
|
|
list_for_each_entry_rcu(v, &vg->vlan_list, vlist) {
|
2015-01-10 15:31:14 +00:00
|
|
|
flags = 0;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 17:00:11 +00:00
|
|
|
if (!br_vlan_should_use(v))
|
|
|
|
continue;
|
|
|
|
if (v->vid == pvid)
|
2015-01-10 15:31:14 +00:00
|
|
|
flags |= BRIDGE_VLAN_INFO_PVID;
|
|
|
|
|
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 17:00:11 +00:00
|
|
|
if (v->flags & BRIDGE_VLAN_INFO_UNTAGGED)
|
2015-01-10 15:31:14 +00:00
|
|
|
flags |= BRIDGE_VLAN_INFO_UNTAGGED;
|
|
|
|
|
|
|
|
if (vid_range_start == 0) {
|
|
|
|
goto initvars;
|
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 17:00:11 +00:00
|
|
|
} else if ((v->vid - vid_range_end) == 1 &&
|
2015-01-10 15:31:14 +00:00
|
|
|
flags == vid_range_flags) {
|
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 17:00:11 +00:00
|
|
|
vid_range_end = v->vid;
|
2015-01-10 15:31:14 +00:00
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
err = br_fill_ifvlaninfo_range(skb, vid_range_start,
|
|
|
|
vid_range_end,
|
|
|
|
vid_range_flags);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
initvars:
|
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 17:00:11 +00:00
|
|
|
vid_range_start = v->vid;
|
|
|
|
vid_range_end = v->vid;
|
2015-01-10 15:31:14 +00:00
|
|
|
vid_range_flags = flags;
|
|
|
|
}
|
|
|
|
|
2015-01-13 00:25:28 +00:00
|
|
|
if (vid_range_start != 0) {
|
|
|
|
/* Call it once more to send any left over vlans */
|
|
|
|
err = br_fill_ifvlaninfo_range(skb, vid_range_start,
|
|
|
|
vid_range_end,
|
|
|
|
vid_range_flags);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2015-01-10 15:31:14 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int br_fill_ifvlaninfo(struct sk_buff *skb,
|
2015-09-30 18:16:53 +00:00
|
|
|
struct net_bridge_vlan_group *vg)
|
2015-01-10 15:31:14 +00:00
|
|
|
{
|
|
|
|
struct bridge_vlan_info vinfo;
|
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 17:00:11 +00:00
|
|
|
struct net_bridge_vlan *v;
|
2015-09-30 18:16:53 +00:00
|
|
|
u16 pvid;
|
2015-01-10 15:31:14 +00:00
|
|
|
|
2015-09-30 18:16:53 +00:00
|
|
|
pvid = br_get_pvid(vg);
|
2015-10-12 19:47:03 +00:00
|
|
|
list_for_each_entry_rcu(v, &vg->vlan_list, vlist) {
|
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 17:00:11 +00:00
|
|
|
if (!br_vlan_should_use(v))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
vinfo.vid = v->vid;
|
2015-01-10 15:31:14 +00:00
|
|
|
vinfo.flags = 0;
|
bridge: vlan: add per-vlan struct and move to rhashtables
This patch changes the bridge vlan implementation to use rhashtables
instead of bitmaps. The main motivation behind this change is that we
need extensible per-vlan structures (both per-port and global) so more
advanced features can be introduced and the vlan support can be
extended. I've tried to break this up but the moment net_port_vlans is
changed and the whole API goes away, thus this is a larger patch.
A few short goals of this patch are:
- Extensible per-vlan structs stored in rhashtables and a sorted list
- Keep user-visible behaviour (compressed vlans etc)
- Keep fastpath ingress/egress logic the same (optimizations to come
later)
Here's a brief list of some of the new features we'd like to introduce:
- per-vlan counters
- vlan ingress/egress mapping
- per-vlan igmp configuration
- vlan priorities
- avoid fdb entries replication (e.g. local fdb scaling issues)
The structure is kept single for both global and per-port entries so to
avoid code duplication where possible and also because we'll soon introduce
"port0 / aka bridge as port" which should simplify things further
(thanks to Vlad for the suggestion!).
Now we have per-vlan global rhashtable (bridge-wide) and per-vlan port
rhashtable, if an entry is added to a port it'll get a pointer to its
global context so it can be quickly accessed later. There's also a
sorted vlan list which is used for stable walks and some user-visible
behaviour such as the vlan ranges, also for error paths.
VLANs are stored in a "vlan group" which currently contains the
rhashtable, sorted vlan list and the number of "real" vlan entries.
A good side-effect of this change is that it resembles how hw keeps
per-vlan data.
One important note after this change is that if a VLAN is being looked up
in the bridge's rhashtable for filtering purposes (or to check if it's an
existing usable entry, not just a global context) then the new helper
br_vlan_should_use() needs to be used if the vlan is found. In case the
lookup is done only with a port's vlan group, then this check can be
skipped.
Things tested so far:
- basic vlan ingress/egress
- pvids
- untagged vlans
- undef CONFIG_BRIDGE_VLAN_FILTERING
- adding/deleting vlans in different scenarios (with/without global ctx,
while transmitting traffic, in ranges etc)
- loading/removing the module while having/adding/deleting vlans
- extracting bridge vlan information (user ABI), compressed requests
- adding/deleting fdbs on vlans
- bridge mac change, promisc mode
- default pvid change
- kmemleak ON during the whole time
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-09-25 17:00:11 +00:00
|
|
|
if (v->vid == pvid)
|
2015-01-10 15:31:14 +00:00
|
|
|
vinfo.flags |= BRIDGE_VLAN_INFO_PVID;
|
|
|
|
|
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 17:00:11 +00:00
|
|
|
if (v->flags & BRIDGE_VLAN_INFO_UNTAGGED)
|
2015-01-10 15:31:14 +00:00
|
|
|
vinfo.flags |= BRIDGE_VLAN_INFO_UNTAGGED;
|
|
|
|
|
|
|
|
if (nla_put(skb, IFLA_BRIDGE_VLAN_INFO,
|
|
|
|
sizeof(vinfo), &vinfo))
|
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
2006-05-25 23:00:12 +00:00
|
|
|
/*
|
|
|
|
* Create one netlink message for one interface
|
|
|
|
* Contains port and master info as well as carrier and bridge state.
|
|
|
|
*/
|
2013-02-13 12:00:13 +00:00
|
|
|
static int br_fill_ifinfo(struct sk_buff *skb,
|
2017-11-01 10:18:13 +00:00
|
|
|
const struct net_bridge_port *port,
|
2013-02-13 12:00:13 +00:00
|
|
|
u32 pid, u32 seq, int event, unsigned int flags,
|
|
|
|
u32 filter_mask, const struct net_device *dev)
|
2006-05-25 23:00:12 +00:00
|
|
|
{
|
2017-11-01 10:18:13 +00:00
|
|
|
u8 operstate = netif_running(dev) ? dev->operstate : IF_OPER_DOWN;
|
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 17:00:11 +00:00
|
|
|
struct net_bridge *br;
|
2006-11-21 00:20:22 +00:00
|
|
|
struct ifinfomsg *hdr;
|
2006-05-25 23:00:12 +00:00
|
|
|
struct nlmsghdr *nlh;
|
|
|
|
|
2013-02-13 12:00:13 +00:00
|
|
|
if (port)
|
|
|
|
br = port->br;
|
|
|
|
else
|
|
|
|
br = netdev_priv(dev);
|
|
|
|
|
2010-05-10 09:31:09 +00:00
|
|
|
br_debug(br, "br_fill_info event %d port %s master %s\n",
|
|
|
|
event, dev->name, br->dev->name);
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2006-11-21 00:20:22 +00:00
|
|
|
nlh = nlmsg_put(skb, pid, seq, event, sizeof(*hdr), flags);
|
|
|
|
if (nlh == NULL)
|
2007-02-01 07:16:40 +00:00
|
|
|
return -EMSGSIZE;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2006-11-21 00:20:22 +00:00
|
|
|
hdr = nlmsg_data(nlh);
|
|
|
|
hdr->ifi_family = AF_BRIDGE;
|
|
|
|
hdr->__ifi_pad = 0;
|
|
|
|
hdr->ifi_type = dev->type;
|
|
|
|
hdr->ifi_index = dev->ifindex;
|
|
|
|
hdr->ifi_flags = dev_get_flags(dev);
|
|
|
|
hdr->ifi_change = 0;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2012-04-02 00:49:54 +00:00
|
|
|
if (nla_put_string(skb, IFLA_IFNAME, dev->name) ||
|
|
|
|
nla_put_u32(skb, IFLA_MASTER, br->dev->ifindex) ||
|
|
|
|
nla_put_u32(skb, IFLA_MTU, dev->mtu) ||
|
|
|
|
nla_put_u8(skb, IFLA_OPERSTATE, operstate) ||
|
|
|
|
(dev->addr_len &&
|
|
|
|
nla_put(skb, IFLA_ADDRESS, dev->addr_len, dev->dev_addr)) ||
|
2015-04-02 15:07:00 +00:00
|
|
|
(dev->ifindex != dev_get_iflink(dev) &&
|
|
|
|
nla_put_u32(skb, IFLA_LINK, dev_get_iflink(dev))))
|
2012-04-02 00:49:54 +00:00
|
|
|
goto nla_put_failure;
|
2012-11-13 07:53:05 +00:00
|
|
|
|
2013-02-13 12:00:13 +00:00
|
|
|
if (event == RTM_NEWLINK && port) {
|
2012-11-13 07:53:05 +00:00
|
|
|
struct nlattr *nest
|
|
|
|
= nla_nest_start(skb, IFLA_PROTINFO | NLA_F_NESTED);
|
|
|
|
|
|
|
|
if (nest == NULL || br_port_fill_attrs(skb, port) < 0)
|
|
|
|
goto nla_put_failure;
|
|
|
|
nla_nest_end(skb, nest);
|
|
|
|
}
|
|
|
|
|
2013-02-13 12:00:13 +00:00
|
|
|
/* Check if the VID information is requested */
|
2015-01-10 15:31:14 +00:00
|
|
|
if ((filter_mask & RTEXT_FILTER_BRVLAN) ||
|
|
|
|
(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED)) {
|
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 17:00:11 +00:00
|
|
|
struct net_bridge_vlan_group *vg;
|
2015-01-10 15:31:14 +00:00
|
|
|
struct nlattr *af;
|
|
|
|
int err;
|
2013-02-13 12:00:13 +00:00
|
|
|
|
2015-10-12 19:47:03 +00:00
|
|
|
/* RCU needed because of the VLAN locking rules (rcu || rtnl) */
|
|
|
|
rcu_read_lock();
|
2015-09-30 18:16:53 +00:00
|
|
|
if (port)
|
2015-10-12 19:47:03 +00:00
|
|
|
vg = nbp_vlan_group_rcu(port);
|
2015-09-30 18:16:53 +00:00
|
|
|
else
|
2015-10-12 19:47:03 +00:00
|
|
|
vg = br_vlan_group_rcu(br);
|
2013-02-13 12:00:13 +00:00
|
|
|
|
2015-10-12 19:47:03 +00:00
|
|
|
if (!vg || !vg->num_vlans) {
|
|
|
|
rcu_read_unlock();
|
2013-02-13 12:00:13 +00:00
|
|
|
goto done;
|
2015-10-12 19:47:03 +00:00
|
|
|
}
|
2013-02-13 12:00:13 +00:00
|
|
|
af = nla_nest_start(skb, IFLA_AF_SPEC);
|
2015-10-12 19:47:03 +00:00
|
|
|
if (!af) {
|
|
|
|
rcu_read_unlock();
|
2013-02-13 12:00:13 +00:00
|
|
|
goto nla_put_failure;
|
2015-10-12 19:47:03 +00:00
|
|
|
}
|
2015-01-10 15:31:14 +00:00
|
|
|
if (filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED)
|
2015-09-30 18:16:53 +00:00
|
|
|
err = br_fill_ifvlaninfo_compressed(skb, vg);
|
2015-01-10 15:31:14 +00:00
|
|
|
else
|
2015-09-30 18:16:53 +00:00
|
|
|
err = br_fill_ifvlaninfo(skb, vg);
|
2017-02-01 06:59:54 +00:00
|
|
|
|
|
|
|
if (port && (port->flags & BR_VLAN_TUNNEL))
|
|
|
|
err = br_fill_vlan_tunnel_info(skb, vg);
|
2015-10-12 19:47:03 +00:00
|
|
|
rcu_read_unlock();
|
2015-01-10 15:31:14 +00:00
|
|
|
if (err)
|
|
|
|
goto nla_put_failure;
|
2013-02-13 12:00:13 +00:00
|
|
|
nla_nest_end(skb, af);
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
2015-01-16 21:09:00 +00:00
|
|
|
nlmsg_end(skb, nlh);
|
|
|
|
return 0;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2006-11-21 00:20:22 +00:00
|
|
|
nla_put_failure:
|
2007-02-01 07:16:40 +00:00
|
|
|
nlmsg_cancel(skb, nlh);
|
|
|
|
return -EMSGSIZE;
|
2006-05-25 23:00:12 +00:00
|
|
|
}
|
|
|
|
|
2017-11-01 10:18:13 +00:00
|
|
|
/* Notify listeners of a change in bridge or port information */
|
|
|
|
void br_ifinfo_notify(int event, const struct net_bridge *br,
|
|
|
|
const struct net_bridge_port *port)
|
2006-05-25 23:00:12 +00:00
|
|
|
{
|
2017-11-01 10:18:13 +00:00
|
|
|
u32 filter = RTEXT_FILTER_BRVLAN_COMPRESSED;
|
|
|
|
struct net_device *dev;
|
2006-05-25 23:00:12 +00:00
|
|
|
struct sk_buff *skb;
|
2006-08-15 07:36:28 +00:00
|
|
|
int err = -ENOBUFS;
|
2017-11-01 10:18:13 +00:00
|
|
|
struct net *net;
|
|
|
|
u16 port_no = 0;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2017-11-01 10:18:13 +00:00
|
|
|
if (WARN_ON(!port && !br))
|
2013-02-13 12:00:12 +00:00
|
|
|
return;
|
|
|
|
|
2017-11-01 10:18:13 +00:00
|
|
|
if (port) {
|
|
|
|
dev = port->dev;
|
|
|
|
br = port->br;
|
|
|
|
port_no = port->port_no;
|
|
|
|
} else {
|
|
|
|
dev = br->dev;
|
|
|
|
}
|
|
|
|
|
|
|
|
net = dev_net(dev);
|
|
|
|
br_debug(br, "port %u(%s) event %d\n", port_no, dev->name, event);
|
2010-05-10 09:31:09 +00:00
|
|
|
|
2017-11-01 10:18:13 +00:00
|
|
|
skb = nlmsg_new(br_nlmsg_size(dev, filter), GFP_ATOMIC);
|
2006-08-15 07:36:28 +00:00
|
|
|
if (skb == NULL)
|
|
|
|
goto errout;
|
|
|
|
|
2017-11-01 10:18:13 +00:00
|
|
|
err = br_fill_ifinfo(skb, port, 0, 0, event, 0, filter, dev);
|
2007-02-01 07:16:40 +00:00
|
|
|
if (err < 0) {
|
|
|
|
/* -EMSGSIZE implies BUG in br_nlmsg_size() */
|
|
|
|
WARN_ON(err == -EMSGSIZE);
|
|
|
|
kfree_skb(skb);
|
|
|
|
goto errout;
|
|
|
|
}
|
2009-02-25 07:18:28 +00:00
|
|
|
rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
|
|
|
|
return;
|
2006-08-15 07:36:28 +00:00
|
|
|
errout:
|
2013-12-19 05:28:10 +00:00
|
|
|
rtnl_set_sk_err(net, RTNLGRP_LINK, err);
|
2006-05-25 23:00:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Dump information about all ports, in response to GETLINK
|
|
|
|
*/
|
2012-10-24 08:12:57 +00:00
|
|
|
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
|
2015-04-28 16:33:49 +00:00
|
|
|
struct net_device *dev, u32 filter_mask, int nlflags)
|
2006-05-25 23:00:12 +00:00
|
|
|
{
|
2013-09-14 14:42:27 +00:00
|
|
|
struct net_bridge_port *port = br_port_get_rtnl(dev);
|
2012-10-24 08:12:57 +00:00
|
|
|
|
2015-01-10 15:31:14 +00:00
|
|
|
if (!port && !(filter_mask & RTEXT_FILTER_BRVLAN) &&
|
|
|
|
!(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED))
|
2015-01-21 09:22:35 +00:00
|
|
|
return 0;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2015-04-28 16:33:49 +00:00
|
|
|
return br_fill_ifinfo(skb, port, pid, seq, RTM_NEWLINK, nlflags,
|
2015-01-21 09:22:35 +00:00
|
|
|
filter_mask, dev);
|
2006-05-25 23:00:12 +00:00
|
|
|
}
|
|
|
|
|
2015-01-10 15:31:12 +00:00
|
|
|
static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p,
|
2017-10-27 10:19:36 +00:00
|
|
|
int cmd, struct bridge_vlan_info *vinfo, bool *changed)
|
2015-01-10 15:31:12 +00:00
|
|
|
{
|
2017-10-27 10:19:37 +00:00
|
|
|
bool curr_change;
|
2015-01-10 15:31:12 +00:00
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case RTM_SETLINK:
|
|
|
|
if (p) {
|
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 17:00:11 +00:00
|
|
|
/* if the MASTER flag is set this will act on the global
|
|
|
|
* per-VLAN entry as well
|
|
|
|
*/
|
2017-10-27 10:19:37 +00:00
|
|
|
err = nbp_vlan_add(p, vinfo->vid, vinfo->flags,
|
|
|
|
&curr_change);
|
2015-01-10 15:31:12 +00:00
|
|
|
} else {
|
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 17:00:11 +00:00
|
|
|
vinfo->flags |= BRIDGE_VLAN_INFO_BRENTRY;
|
2017-10-27 10:19:37 +00:00
|
|
|
err = br_vlan_add(br, vinfo->vid, vinfo->flags,
|
|
|
|
&curr_change);
|
2015-01-10 15:31:12 +00:00
|
|
|
}
|
2017-10-27 10:19:37 +00:00
|
|
|
if (curr_change)
|
2017-10-27 10:19:36 +00:00
|
|
|
*changed = true;
|
2015-01-10 15:31:12 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case RTM_DELLINK:
|
|
|
|
if (p) {
|
2017-10-27 10:19:36 +00:00
|
|
|
if (!nbp_vlan_delete(p, vinfo->vid))
|
|
|
|
*changed = true;
|
|
|
|
|
|
|
|
if ((vinfo->flags & BRIDGE_VLAN_INFO_MASTER) &&
|
|
|
|
!br_vlan_delete(p->br, vinfo->vid))
|
|
|
|
*changed = true;
|
|
|
|
} else if (!br_vlan_delete(br, vinfo->vid)) {
|
|
|
|
*changed = true;
|
2015-01-10 15:31:12 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
2013-02-13 12:00:12 +00:00
|
|
|
|
2017-02-01 06:59:54 +00:00
|
|
|
static int br_process_vlan_info(struct net_bridge *br,
|
|
|
|
struct net_bridge_port *p, int cmd,
|
|
|
|
struct bridge_vlan_info *vinfo_curr,
|
2017-10-27 10:19:36 +00:00
|
|
|
struct bridge_vlan_info **vinfo_last,
|
|
|
|
bool *changed)
|
2017-02-01 06:59:54 +00:00
|
|
|
{
|
|
|
|
if (!vinfo_curr->vid || vinfo_curr->vid >= VLAN_VID_MASK)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (vinfo_curr->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
|
|
|
|
/* check if we are already processing a range */
|
|
|
|
if (*vinfo_last)
|
|
|
|
return -EINVAL;
|
|
|
|
*vinfo_last = vinfo_curr;
|
|
|
|
/* don't allow range of pvids */
|
|
|
|
if ((*vinfo_last)->flags & BRIDGE_VLAN_INFO_PVID)
|
|
|
|
return -EINVAL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*vinfo_last) {
|
|
|
|
struct bridge_vlan_info tmp_vinfo;
|
|
|
|
int v, err;
|
|
|
|
|
|
|
|
if (!(vinfo_curr->flags & BRIDGE_VLAN_INFO_RANGE_END))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (vinfo_curr->vid <= (*vinfo_last)->vid)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
memcpy(&tmp_vinfo, *vinfo_last,
|
|
|
|
sizeof(struct bridge_vlan_info));
|
|
|
|
for (v = (*vinfo_last)->vid; v <= vinfo_curr->vid; v++) {
|
|
|
|
tmp_vinfo.vid = v;
|
2017-10-27 10:19:36 +00:00
|
|
|
err = br_vlan_info(br, p, cmd, &tmp_vinfo, changed);
|
2017-02-01 06:59:54 +00:00
|
|
|
if (err)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*vinfo_last = NULL;
|
|
|
|
|
2017-10-19 17:17:32 +00:00
|
|
|
return err;
|
2017-02-01 06:59:54 +00:00
|
|
|
}
|
|
|
|
|
2017-10-27 10:19:36 +00:00
|
|
|
return br_vlan_info(br, p, cmd, vinfo_curr, changed);
|
2017-02-01 06:59:54 +00:00
|
|
|
}
|
|
|
|
|
2013-02-13 12:00:12 +00:00
|
|
|
static int br_afspec(struct net_bridge *br,
|
|
|
|
struct net_bridge_port *p,
|
|
|
|
struct nlattr *af_spec,
|
2017-10-27 10:19:36 +00:00
|
|
|
int cmd, bool *changed)
|
2013-02-13 12:00:12 +00:00
|
|
|
{
|
2017-02-01 06:59:54 +00:00
|
|
|
struct bridge_vlan_info *vinfo_curr = NULL;
|
|
|
|
struct bridge_vlan_info *vinfo_last = NULL;
|
2015-01-10 15:31:12 +00:00
|
|
|
struct nlattr *attr;
|
2017-02-01 06:59:54 +00:00
|
|
|
struct vtunnel_info tinfo_last = {};
|
|
|
|
struct vtunnel_info tinfo_curr = {};
|
|
|
|
int err = 0, rem;
|
2013-02-13 12:00:12 +00:00
|
|
|
|
2015-01-10 15:31:12 +00:00
|
|
|
nla_for_each_nested(attr, af_spec, rem) {
|
2017-02-01 06:59:54 +00:00
|
|
|
err = 0;
|
|
|
|
switch (nla_type(attr)) {
|
|
|
|
case IFLA_BRIDGE_VLAN_TUNNEL_INFO:
|
2017-06-05 22:26:24 +00:00
|
|
|
if (!p || !(p->flags & BR_VLAN_TUNNEL))
|
2015-01-10 15:31:12 +00:00
|
|
|
return -EINVAL;
|
2017-02-01 06:59:54 +00:00
|
|
|
err = br_parse_vlan_tunnel_info(attr, &tinfo_curr);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
err = br_process_vlan_tunnel_info(br, p, cmd,
|
|
|
|
&tinfo_curr,
|
2017-10-27 10:19:36 +00:00
|
|
|
&tinfo_last,
|
|
|
|
changed);
|
2017-02-01 06:59:54 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
break;
|
|
|
|
case IFLA_BRIDGE_VLAN_INFO:
|
|
|
|
if (nla_len(attr) != sizeof(struct bridge_vlan_info))
|
2015-10-11 10:49:56 +00:00
|
|
|
return -EINVAL;
|
2017-02-01 06:59:54 +00:00
|
|
|
vinfo_curr = nla_data(attr);
|
|
|
|
err = br_process_vlan_info(br, p, cmd, vinfo_curr,
|
2017-10-27 10:19:36 +00:00
|
|
|
&vinfo_last, changed);
|
2017-02-01 06:59:54 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
break;
|
2015-01-10 15:31:12 +00:00
|
|
|
}
|
2013-02-13 12:00:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-09-05 13:51:30 +00:00
|
|
|
static const struct nla_policy br_port_policy[IFLA_BRPORT_MAX + 1] = {
|
2012-11-13 07:53:05 +00:00
|
|
|
[IFLA_BRPORT_STATE] = { .type = NLA_U8 },
|
|
|
|
[IFLA_BRPORT_COST] = { .type = NLA_U32 },
|
|
|
|
[IFLA_BRPORT_PRIORITY] = { .type = NLA_U16 },
|
|
|
|
[IFLA_BRPORT_MODE] = { .type = NLA_U8 },
|
2012-11-13 07:53:07 +00:00
|
|
|
[IFLA_BRPORT_GUARD] = { .type = NLA_U8 },
|
2012-11-13 07:53:08 +00:00
|
|
|
[IFLA_BRPORT_PROTECT] = { .type = NLA_U8 },
|
2014-11-26 12:42:19 +00:00
|
|
|
[IFLA_BRPORT_FAST_LEAVE]= { .type = NLA_U8 },
|
2013-06-05 14:08:00 +00:00
|
|
|
[IFLA_BRPORT_LEARNING] = { .type = NLA_U8 },
|
2013-06-05 14:08:01 +00:00
|
|
|
[IFLA_BRPORT_UNICAST_FLOOD] = { .type = NLA_U8 },
|
2015-08-04 17:06:32 +00:00
|
|
|
[IFLA_BRPORT_PROXYARP] = { .type = NLA_U8 },
|
2015-08-04 17:06:33 +00:00
|
|
|
[IFLA_BRPORT_PROXYARP_WIFI] = { .type = NLA_U8 },
|
2015-10-06 12:12:02 +00:00
|
|
|
[IFLA_BRPORT_MULTICAST_ROUTER] = { .type = NLA_U8 },
|
2017-01-21 20:01:32 +00:00
|
|
|
[IFLA_BRPORT_MCAST_TO_UCAST] = { .type = NLA_U8 },
|
2017-05-05 14:36:53 +00:00
|
|
|
[IFLA_BRPORT_MCAST_FLOOD] = { .type = NLA_U8 },
|
|
|
|
[IFLA_BRPORT_BCAST_FLOOD] = { .type = NLA_U8 },
|
2017-11-13 16:30:55 +00:00
|
|
|
[IFLA_BRPORT_VLAN_TUNNEL] = { .type = NLA_U8 },
|
2017-09-27 13:12:44 +00:00
|
|
|
[IFLA_BRPORT_GROUP_FWD_MASK] = { .type = NLA_U16 },
|
2017-10-30 10:56:33 +00:00
|
|
|
[IFLA_BRPORT_NEIGH_SUPPRESS] = { .type = NLA_U8 },
|
2012-11-13 07:53:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Change the state of the port and notify spanning tree */
|
|
|
|
static int br_set_port_state(struct net_bridge_port *p, u8 state)
|
|
|
|
{
|
|
|
|
if (state > BR_STATE_BLOCKING)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* if kernel STP is running, don't allow changes */
|
|
|
|
if (p->br->stp_enabled == BR_KERNEL_STP)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2012-12-28 18:15:22 +00:00
|
|
|
/* if device is not up, change is not allowed
|
|
|
|
* if link is not present, only allowable state is disabled
|
|
|
|
*/
|
2012-11-13 07:53:05 +00:00
|
|
|
if (!netif_running(p->dev) ||
|
2012-12-28 18:15:22 +00:00
|
|
|
(!netif_oper_up(p->dev) && state != BR_STATE_DISABLED))
|
2012-11-13 07:53:05 +00:00
|
|
|
return -ENETDOWN;
|
|
|
|
|
2014-09-30 23:13:19 +00:00
|
|
|
br_set_state(p, state);
|
2012-11-13 07:53:05 +00:00
|
|
|
br_port_state_selection(p->br);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set/clear or port flags based on attribute */
|
2017-06-08 06:44:11 +00:00
|
|
|
static int br_set_port_flag(struct net_bridge_port *p, struct nlattr *tb[],
|
|
|
|
int attrtype, unsigned long mask)
|
2012-11-13 07:53:05 +00:00
|
|
|
{
|
2017-06-08 06:44:11 +00:00
|
|
|
unsigned long flags;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!tb[attrtype])
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (nla_get_u8(tb[attrtype]))
|
|
|
|
flags = p->flags | mask;
|
|
|
|
else
|
|
|
|
flags = p->flags & ~mask;
|
|
|
|
|
|
|
|
err = br_switchdev_set_port_flag(p, flags, mask);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
p->flags = flags;
|
|
|
|
return 0;
|
2012-11-13 07:53:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Process bridge protocol info on port */
|
|
|
|
static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])
|
|
|
|
{
|
2014-05-16 13:59:16 +00:00
|
|
|
unsigned long old_flags = p->flags;
|
2017-02-01 06:59:54 +00:00
|
|
|
bool br_vlan_tunnel_old = false;
|
|
|
|
int err;
|
2012-11-13 07:53:05 +00:00
|
|
|
|
2017-06-08 06:44:11 +00:00
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_MODE, BR_HAIRPIN_MODE);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE, BR_MULTICAST_FAST_LEAVE);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_PROTECT, BR_ROOT_BLOCK);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_LEARNING, BR_LEARNING);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_UNICAST_FLOOD, BR_FLOOD);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_MCAST_TO_UCAST, BR_MULTICAST_TO_UNICAST);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_BCAST_FLOOD, BR_BCAST_FLOOD);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP, BR_PROXYARP);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_PROXYARP_WIFI, BR_PROXYARP_WIFI);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2012-11-13 07:53:05 +00:00
|
|
|
|
2017-02-01 06:59:54 +00:00
|
|
|
br_vlan_tunnel_old = (p->flags & BR_VLAN_TUNNEL) ? true : false;
|
2017-06-08 06:44:11 +00:00
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_VLAN_TUNNEL, BR_VLAN_TUNNEL);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2017-02-01 06:59:54 +00:00
|
|
|
if (br_vlan_tunnel_old && !(p->flags & BR_VLAN_TUNNEL))
|
|
|
|
nbp_vlan_tunnel_info_flush(p);
|
|
|
|
|
2012-11-13 07:53:05 +00:00
|
|
|
if (tb[IFLA_BRPORT_COST]) {
|
|
|
|
err = br_stp_set_path_cost(p, nla_get_u32(tb[IFLA_BRPORT_COST]));
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tb[IFLA_BRPORT_PRIORITY]) {
|
|
|
|
err = br_stp_set_port_priority(p, nla_get_u16(tb[IFLA_BRPORT_PRIORITY]));
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tb[IFLA_BRPORT_STATE]) {
|
|
|
|
err = br_set_port_state(p, nla_get_u8(tb[IFLA_BRPORT_STATE]));
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2014-05-16 13:59:16 +00:00
|
|
|
|
2015-10-06 12:12:01 +00:00
|
|
|
if (tb[IFLA_BRPORT_FLUSH])
|
|
|
|
br_fdb_delete_by_port(p->br, p, 0, 0);
|
|
|
|
|
2015-10-06 12:12:02 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
if (tb[IFLA_BRPORT_MULTICAST_ROUTER]) {
|
|
|
|
u8 mcast_router = nla_get_u8(tb[IFLA_BRPORT_MULTICAST_ROUTER]);
|
|
|
|
|
|
|
|
err = br_multicast_set_port_router(p, mcast_router);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif
|
2017-09-27 13:12:44 +00:00
|
|
|
|
|
|
|
if (tb[IFLA_BRPORT_GROUP_FWD_MASK]) {
|
|
|
|
u16 fwd_mask = nla_get_u16(tb[IFLA_BRPORT_GROUP_FWD_MASK]);
|
|
|
|
|
|
|
|
if (fwd_mask & BR_GROUPFWD_MACPAUSE)
|
|
|
|
return -EINVAL;
|
|
|
|
p->group_fwd_mask = fwd_mask;
|
|
|
|
}
|
|
|
|
|
2017-10-07 05:12:37 +00:00
|
|
|
err = br_set_port_flag(p, tb, IFLA_BRPORT_NEIGH_SUPPRESS,
|
|
|
|
BR_NEIGH_SUPPRESS);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2014-05-16 13:59:16 +00:00
|
|
|
br_port_flags_change(p, old_flags ^ p->flags);
|
2012-11-13 07:53:05 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Change state and parameters on port. */
|
2015-01-30 06:40:12 +00:00
|
|
|
int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
|
2006-05-25 23:00:12 +00:00
|
|
|
{
|
2017-11-01 10:18:13 +00:00
|
|
|
struct net_bridge *br = (struct net_bridge *)netdev_priv(dev);
|
|
|
|
struct nlattr *tb[IFLA_BRPORT_MAX + 1];
|
|
|
|
struct net_bridge_port *p;
|
2006-11-21 00:20:22 +00:00
|
|
|
struct nlattr *protinfo;
|
2013-02-13 12:00:12 +00:00
|
|
|
struct nlattr *afspec;
|
2017-10-27 10:19:36 +00:00
|
|
|
bool changed = false;
|
2015-05-10 16:47:59 +00:00
|
|
|
int err = 0;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2013-03-28 06:21:22 +00:00
|
|
|
protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_PROTINFO);
|
|
|
|
afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
|
2013-02-13 12:00:12 +00:00
|
|
|
if (!protinfo && !afspec)
|
2012-11-13 07:53:05 +00:00
|
|
|
return 0;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2010-11-15 06:38:14 +00:00
|
|
|
p = br_port_get_rtnl(dev);
|
2013-02-13 12:00:12 +00:00
|
|
|
/* We want to accept dev as bridge itself if the AF_SPEC
|
2013-12-08 20:15:44 +00:00
|
|
|
* is set to see if someone is setting vlan info on the bridge
|
2013-02-13 12:00:12 +00:00
|
|
|
*/
|
2013-03-24 03:26:47 +00:00
|
|
|
if (!p && !afspec)
|
2010-11-15 06:38:13 +00:00
|
|
|
return -EINVAL;
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2013-02-13 12:00:12 +00:00
|
|
|
if (p && protinfo) {
|
|
|
|
if (protinfo->nla_type & NLA_F_NESTED) {
|
2017-04-12 12:34:07 +00:00
|
|
|
err = nla_parse_nested(tb, IFLA_BRPORT_MAX, protinfo,
|
|
|
|
br_port_policy, NULL);
|
2013-02-13 12:00:12 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
spin_lock_bh(&p->br->lock);
|
|
|
|
err = br_setport(p, tb);
|
|
|
|
spin_unlock_bh(&p->br->lock);
|
|
|
|
} else {
|
2013-12-08 20:15:44 +00:00
|
|
|
/* Binary compatibility with old RSTP */
|
2013-02-13 12:00:12 +00:00
|
|
|
if (nla_len(protinfo) < sizeof(u8))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
spin_lock_bh(&p->br->lock);
|
|
|
|
err = br_set_port_state(p, nla_get_u8(protinfo));
|
|
|
|
spin_unlock_bh(&p->br->lock);
|
|
|
|
}
|
2012-11-13 07:53:05 +00:00
|
|
|
if (err)
|
2013-02-13 12:00:12 +00:00
|
|
|
goto out;
|
2017-10-27 10:19:36 +00:00
|
|
|
changed = true;
|
2013-02-13 12:00:12 +00:00
|
|
|
}
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2017-11-01 10:18:13 +00:00
|
|
|
if (afspec)
|
|
|
|
err = br_afspec(br, p, afspec, RTM_SETLINK, &changed);
|
2011-11-25 00:16:37 +00:00
|
|
|
|
2017-10-27 10:19:36 +00:00
|
|
|
if (changed)
|
2017-11-01 10:18:13 +00:00
|
|
|
br_ifinfo_notify(RTM_NEWLINK, br, p);
|
2013-02-13 12:00:12 +00:00
|
|
|
out:
|
2012-11-13 07:53:05 +00:00
|
|
|
return err;
|
2006-05-25 23:00:12 +00:00
|
|
|
}
|
|
|
|
|
2013-02-13 12:00:12 +00:00
|
|
|
/* Delete port information */
|
2015-01-30 06:40:12 +00:00
|
|
|
int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
|
2013-02-13 12:00:12 +00:00
|
|
|
{
|
2017-11-01 10:18:13 +00:00
|
|
|
struct net_bridge *br = (struct net_bridge *)netdev_priv(dev);
|
2013-02-13 12:00:12 +00:00
|
|
|
struct net_bridge_port *p;
|
2017-11-01 10:18:13 +00:00
|
|
|
struct nlattr *afspec;
|
2017-10-27 10:19:36 +00:00
|
|
|
bool changed = false;
|
2015-05-10 16:48:03 +00:00
|
|
|
int err = 0;
|
2013-02-13 12:00:12 +00:00
|
|
|
|
2013-03-28 06:21:22 +00:00
|
|
|
afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
|
2013-02-13 12:00:12 +00:00
|
|
|
if (!afspec)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
/* We want to accept dev as bridge itself as well */
|
|
|
|
if (!p && !(dev->priv_flags & IFF_EBRIDGE))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2017-11-01 10:18:13 +00:00
|
|
|
err = br_afspec(br, p, afspec, RTM_DELLINK, &changed);
|
2017-10-27 10:19:36 +00:00
|
|
|
if (changed)
|
bridge: fix setlink/dellink notifications
problems with bridge getlink/setlink notifications today:
- bridge setlink generates two notifications to userspace
- one from the bridge driver
- one from rtnetlink.c (rtnl_bridge_notify)
- dellink generates one notification from rtnetlink.c. Which
means bridge setlink and dellink notifications are not
consistent
- Looking at the code it appears,
If both BRIDGE_FLAGS_MASTER and BRIDGE_FLAGS_SELF were set,
the size calculation in rtnl_bridge_notify can be wrong.
Example: if you set both BRIDGE_FLAGS_MASTER and BRIDGE_FLAGS_SELF
in a setlink request to rocker dev, rtnl_bridge_notify will
allocate skb for one set of bridge attributes, but,
both the bridge driver and rocker dev will try to add
attributes resulting in twice the number of attributes
being added to the skb. (rocker dev calls ndo_dflt_bridge_getlink)
There are multiple options:
1) Generate one notification including all attributes from master and self:
But, I don't think it will work, because both master and self may use
the same attributes/policy. Cannot pack the same set of attributes in a
single notification from both master and slave (duplicate attributes).
2) Generate one notification from master and the other notification from
self (This seems to be ideal):
For master: the master driver will send notification (bridge in this
example)
For self: the self driver will send notification (rocker in the above
example. It can use helpers from rtnetlink.c to do so. Like the
ndo_dflt_bridge_getlink api).
This patch implements 2) (leaving the 'rtnl_bridge_notify' around to be used
with 'self').
v1->v2 :
- rtnl_bridge_notify is now called only for self,
so, remove 'BRIDGE_FLAGS_SELF' check and cleanup a few things
- rtnl_bridge_dellink used to always send a RTM_NEWLINK msg
earlier. So, I have changed the notification from br_dellink to
go as RTM_NEWLINK
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-15 04:02:25 +00:00
|
|
|
/* Send RTM_NEWLINK because userspace
|
|
|
|
* expects RTM_NEWLINK for vlan dels
|
|
|
|
*/
|
2017-11-01 10:18:13 +00:00
|
|
|
br_ifinfo_notify(RTM_NEWLINK, br, p);
|
2013-02-13 12:00:12 +00:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
2017-06-25 21:56:01 +00:00
|
|
|
|
|
|
|
static int br_validate(struct nlattr *tb[], struct nlattr *data[],
|
|
|
|
struct netlink_ext_ack *extack)
|
2011-04-04 14:03:32 +00:00
|
|
|
{
|
|
|
|
if (tb[IFLA_ADDRESS]) {
|
|
|
|
if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
|
|
|
|
return -EINVAL;
|
|
|
|
if (!is_valid_ether_addr(nla_data(tb[IFLA_ADDRESS])))
|
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
}
|
|
|
|
|
2015-08-27 06:32:26 +00:00
|
|
|
if (!data)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
if (data[IFLA_BR_VLAN_PROTOCOL]) {
|
|
|
|
switch (nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL])) {
|
|
|
|
case htons(ETH_P_8021Q):
|
|
|
|
case htons(ETH_P_8021AD):
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -EPROTONOSUPPORT;
|
|
|
|
}
|
|
|
|
}
|
2017-05-17 07:29:12 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_VLAN_DEFAULT_PVID]) {
|
|
|
|
__u16 defpvid = nla_get_u16(data[IFLA_BR_VLAN_DEFAULT_PVID]);
|
|
|
|
|
|
|
|
if (defpvid >= VLAN_VID_MASK)
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2015-08-27 06:32:26 +00:00
|
|
|
#endif
|
|
|
|
|
2011-04-04 14:03:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-09-05 13:51:30 +00:00
|
|
|
static int br_port_slave_changelink(struct net_device *brdev,
|
|
|
|
struct net_device *dev,
|
|
|
|
struct nlattr *tb[],
|
2017-06-25 21:56:02 +00:00
|
|
|
struct nlattr *data[],
|
|
|
|
struct netlink_ext_ack *extack)
|
2014-09-05 13:51:30 +00:00
|
|
|
{
|
2015-07-22 11:03:40 +00:00
|
|
|
struct net_bridge *br = netdev_priv(brdev);
|
|
|
|
int ret;
|
|
|
|
|
2014-09-05 13:51:30 +00:00
|
|
|
if (!data)
|
|
|
|
return 0;
|
2015-07-22 11:03:40 +00:00
|
|
|
|
|
|
|
spin_lock_bh(&br->lock);
|
|
|
|
ret = br_setport(br_port_get_rtnl(dev), data);
|
|
|
|
spin_unlock_bh(&br->lock);
|
|
|
|
|
|
|
|
return ret;
|
2014-09-05 13:51:30 +00:00
|
|
|
}
|
|
|
|
|
2014-09-05 13:51:29 +00:00
|
|
|
static int br_port_fill_slave_info(struct sk_buff *skb,
|
|
|
|
const struct net_device *brdev,
|
|
|
|
const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return br_port_fill_attrs(skb, br_port_get_rtnl(dev));
|
|
|
|
}
|
|
|
|
|
|
|
|
static size_t br_port_get_slave_size(const struct net_device *brdev,
|
|
|
|
const struct net_device *dev)
|
|
|
|
{
|
|
|
|
return br_port_info_size();
|
|
|
|
}
|
|
|
|
|
2014-09-05 13:51:32 +00:00
|
|
|
static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = {
|
|
|
|
[IFLA_BR_FORWARD_DELAY] = { .type = NLA_U32 },
|
|
|
|
[IFLA_BR_HELLO_TIME] = { .type = NLA_U32 },
|
|
|
|
[IFLA_BR_MAX_AGE] = { .type = NLA_U32 },
|
2015-03-18 09:06:58 +00:00
|
|
|
[IFLA_BR_AGEING_TIME] = { .type = NLA_U32 },
|
|
|
|
[IFLA_BR_STP_STATE] = { .type = NLA_U32 },
|
|
|
|
[IFLA_BR_PRIORITY] = { .type = NLA_U16 },
|
2015-08-07 16:40:45 +00:00
|
|
|
[IFLA_BR_VLAN_FILTERING] = { .type = NLA_U8 },
|
2015-08-27 06:32:26 +00:00
|
|
|
[IFLA_BR_VLAN_PROTOCOL] = { .type = NLA_U16 },
|
2015-10-04 12:23:28 +00:00
|
|
|
[IFLA_BR_GROUP_FWD_MASK] = { .type = NLA_U16 },
|
2015-10-04 12:23:35 +00:00
|
|
|
[IFLA_BR_GROUP_ADDR] = { .type = NLA_BINARY,
|
|
|
|
.len = ETH_ALEN },
|
2015-10-04 12:23:37 +00:00
|
|
|
[IFLA_BR_MCAST_ROUTER] = { .type = NLA_U8 },
|
2015-10-04 12:23:38 +00:00
|
|
|
[IFLA_BR_MCAST_SNOOPING] = { .type = NLA_U8 },
|
2015-10-04 12:23:39 +00:00
|
|
|
[IFLA_BR_MCAST_QUERY_USE_IFADDR] = { .type = NLA_U8 },
|
2015-10-04 12:23:40 +00:00
|
|
|
[IFLA_BR_MCAST_QUERIER] = { .type = NLA_U8 },
|
2015-10-04 12:23:41 +00:00
|
|
|
[IFLA_BR_MCAST_HASH_ELASTICITY] = { .type = NLA_U32 },
|
2015-10-04 12:23:42 +00:00
|
|
|
[IFLA_BR_MCAST_HASH_MAX] = { .type = NLA_U32 },
|
2015-10-04 12:23:43 +00:00
|
|
|
[IFLA_BR_MCAST_LAST_MEMBER_CNT] = { .type = NLA_U32 },
|
2015-10-04 12:23:44 +00:00
|
|
|
[IFLA_BR_MCAST_STARTUP_QUERY_CNT] = { .type = NLA_U32 },
|
2015-10-04 12:23:45 +00:00
|
|
|
[IFLA_BR_MCAST_LAST_MEMBER_INTVL] = { .type = NLA_U64 },
|
|
|
|
[IFLA_BR_MCAST_MEMBERSHIP_INTVL] = { .type = NLA_U64 },
|
|
|
|
[IFLA_BR_MCAST_QUERIER_INTVL] = { .type = NLA_U64 },
|
|
|
|
[IFLA_BR_MCAST_QUERY_INTVL] = { .type = NLA_U64 },
|
|
|
|
[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL] = { .type = NLA_U64 },
|
|
|
|
[IFLA_BR_MCAST_STARTUP_QUERY_INTVL] = { .type = NLA_U64 },
|
2015-10-04 12:23:46 +00:00
|
|
|
[IFLA_BR_NF_CALL_IPTABLES] = { .type = NLA_U8 },
|
|
|
|
[IFLA_BR_NF_CALL_IP6TABLES] = { .type = NLA_U8 },
|
|
|
|
[IFLA_BR_NF_CALL_ARPTABLES] = { .type = NLA_U8 },
|
2015-10-04 12:23:47 +00:00
|
|
|
[IFLA_BR_VLAN_DEFAULT_PVID] = { .type = NLA_U16 },
|
2016-04-30 08:25:28 +00:00
|
|
|
[IFLA_BR_VLAN_STATS_ENABLED] = { .type = NLA_U8 },
|
2016-06-28 14:57:06 +00:00
|
|
|
[IFLA_BR_MCAST_STATS_ENABLED] = { .type = NLA_U8 },
|
2016-11-21 12:03:24 +00:00
|
|
|
[IFLA_BR_MCAST_IGMP_VERSION] = { .type = NLA_U8 },
|
2016-11-21 12:03:25 +00:00
|
|
|
[IFLA_BR_MCAST_MLD_VERSION] = { .type = NLA_U8 },
|
2014-09-05 13:51:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
|
2017-06-25 21:56:00 +00:00
|
|
|
struct nlattr *data[],
|
|
|
|
struct netlink_ext_ack *extack)
|
2014-09-05 13:51:32 +00:00
|
|
|
{
|
|
|
|
struct net_bridge *br = netdev_priv(brdev);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!data)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (data[IFLA_BR_FORWARD_DELAY]) {
|
|
|
|
err = br_set_forward_delay(br, nla_get_u32(data[IFLA_BR_FORWARD_DELAY]));
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_HELLO_TIME]) {
|
|
|
|
err = br_set_hello_time(br, nla_get_u32(data[IFLA_BR_HELLO_TIME]));
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_MAX_AGE]) {
|
|
|
|
err = br_set_max_age(br, nla_get_u32(data[IFLA_BR_MAX_AGE]));
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-03-18 09:06:58 +00:00
|
|
|
if (data[IFLA_BR_AGEING_TIME]) {
|
2015-10-09 02:23:19 +00:00
|
|
|
err = br_set_ageing_time(br, nla_get_u32(data[IFLA_BR_AGEING_TIME]));
|
|
|
|
if (err)
|
|
|
|
return err;
|
2015-03-18 09:06:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_STP_STATE]) {
|
|
|
|
u32 stp_enabled = nla_get_u32(data[IFLA_BR_STP_STATE]);
|
|
|
|
|
|
|
|
br_stp_set_enabled(br, stp_enabled);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_PRIORITY]) {
|
|
|
|
u32 priority = nla_get_u16(data[IFLA_BR_PRIORITY]);
|
|
|
|
|
|
|
|
br_stp_set_bridge_priority(br, priority);
|
|
|
|
}
|
|
|
|
|
2015-08-07 16:40:45 +00:00
|
|
|
if (data[IFLA_BR_VLAN_FILTERING]) {
|
|
|
|
u8 vlan_filter = nla_get_u8(data[IFLA_BR_VLAN_FILTERING]);
|
|
|
|
|
|
|
|
err = __br_vlan_filter_toggle(br, vlan_filter);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-08-27 06:32:26 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
if (data[IFLA_BR_VLAN_PROTOCOL]) {
|
|
|
|
__be16 vlan_proto = nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL]);
|
|
|
|
|
|
|
|
err = __br_vlan_set_proto(br, vlan_proto);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2015-10-04 12:23:47 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_VLAN_DEFAULT_PVID]) {
|
|
|
|
__u16 defpvid = nla_get_u16(data[IFLA_BR_VLAN_DEFAULT_PVID]);
|
|
|
|
|
|
|
|
err = __br_vlan_set_default_pvid(br, defpvid);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2016-04-30 08:25:28 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_VLAN_STATS_ENABLED]) {
|
|
|
|
__u8 vlan_stats = nla_get_u8(data[IFLA_BR_VLAN_STATS_ENABLED]);
|
|
|
|
|
|
|
|
err = br_vlan_set_stats(br, vlan_stats);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2015-08-27 06:32:26 +00:00
|
|
|
#endif
|
|
|
|
|
2015-10-04 12:23:28 +00:00
|
|
|
if (data[IFLA_BR_GROUP_FWD_MASK]) {
|
|
|
|
u16 fwd_mask = nla_get_u16(data[IFLA_BR_GROUP_FWD_MASK]);
|
|
|
|
|
|
|
|
if (fwd_mask & BR_GROUPFWD_RESTRICTED)
|
|
|
|
return -EINVAL;
|
|
|
|
br->group_fwd_mask = fwd_mask;
|
|
|
|
}
|
|
|
|
|
2015-10-04 12:23:35 +00:00
|
|
|
if (data[IFLA_BR_GROUP_ADDR]) {
|
|
|
|
u8 new_addr[ETH_ALEN];
|
|
|
|
|
|
|
|
if (nla_len(data[IFLA_BR_GROUP_ADDR]) != ETH_ALEN)
|
|
|
|
return -EINVAL;
|
|
|
|
memcpy(new_addr, nla_data(data[IFLA_BR_GROUP_ADDR]), ETH_ALEN);
|
|
|
|
if (!is_link_local_ether_addr(new_addr))
|
|
|
|
return -EINVAL;
|
|
|
|
if (new_addr[5] == 1 || /* 802.3x Pause address */
|
|
|
|
new_addr[5] == 2 || /* 802.3ad Slow protocols */
|
|
|
|
new_addr[5] == 3) /* 802.1X PAE address */
|
|
|
|
return -EINVAL;
|
|
|
|
spin_lock_bh(&br->lock);
|
|
|
|
memcpy(br->group_addr, new_addr, sizeof(br->group_addr));
|
|
|
|
spin_unlock_bh(&br->lock);
|
|
|
|
br->group_addr_set = true;
|
|
|
|
br_recalculate_fwd_mask(br);
|
|
|
|
}
|
|
|
|
|
2015-10-04 12:23:36 +00:00
|
|
|
if (data[IFLA_BR_FDB_FLUSH])
|
|
|
|
br_fdb_flush(br);
|
|
|
|
|
2015-10-04 12:23:37 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
if (data[IFLA_BR_MCAST_ROUTER]) {
|
|
|
|
u8 multicast_router = nla_get_u8(data[IFLA_BR_MCAST_ROUTER]);
|
|
|
|
|
|
|
|
err = br_multicast_set_router(br, multicast_router);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2015-10-04 12:23:38 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_SNOOPING]) {
|
|
|
|
u8 mcast_snooping = nla_get_u8(data[IFLA_BR_MCAST_SNOOPING]);
|
|
|
|
|
|
|
|
err = br_multicast_toggle(br, mcast_snooping);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2015-10-04 12:23:39 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_QUERY_USE_IFADDR]) {
|
|
|
|
u8 val;
|
|
|
|
|
|
|
|
val = nla_get_u8(data[IFLA_BR_MCAST_QUERY_USE_IFADDR]);
|
|
|
|
br->multicast_query_use_ifaddr = !!val;
|
|
|
|
}
|
2015-10-04 12:23:40 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_QUERIER]) {
|
|
|
|
u8 mcast_querier = nla_get_u8(data[IFLA_BR_MCAST_QUERIER]);
|
|
|
|
|
|
|
|
err = br_multicast_set_querier(br, mcast_querier);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2015-10-04 12:23:41 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_HASH_ELASTICITY]) {
|
|
|
|
u32 val = nla_get_u32(data[IFLA_BR_MCAST_HASH_ELASTICITY]);
|
|
|
|
|
|
|
|
br->hash_elasticity = val;
|
|
|
|
}
|
2015-10-04 12:23:42 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_HASH_MAX]) {
|
|
|
|
u32 hash_max = nla_get_u32(data[IFLA_BR_MCAST_HASH_MAX]);
|
|
|
|
|
|
|
|
err = br_multicast_set_hash_max(br, hash_max);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2015-10-04 12:23:43 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_LAST_MEMBER_CNT]) {
|
|
|
|
u32 val = nla_get_u32(data[IFLA_BR_MCAST_LAST_MEMBER_CNT]);
|
|
|
|
|
|
|
|
br->multicast_last_member_count = val;
|
|
|
|
}
|
2015-10-04 12:23:44 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_STARTUP_QUERY_CNT]) {
|
|
|
|
u32 val = nla_get_u32(data[IFLA_BR_MCAST_STARTUP_QUERY_CNT]);
|
|
|
|
|
|
|
|
br->multicast_startup_query_count = val;
|
|
|
|
}
|
2015-10-04 12:23:45 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_LAST_MEMBER_INTVL]) {
|
|
|
|
u64 val = nla_get_u64(data[IFLA_BR_MCAST_LAST_MEMBER_INTVL]);
|
|
|
|
|
|
|
|
br->multicast_last_member_interval = clock_t_to_jiffies(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_MEMBERSHIP_INTVL]) {
|
|
|
|
u64 val = nla_get_u64(data[IFLA_BR_MCAST_MEMBERSHIP_INTVL]);
|
|
|
|
|
|
|
|
br->multicast_membership_interval = clock_t_to_jiffies(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_QUERIER_INTVL]) {
|
|
|
|
u64 val = nla_get_u64(data[IFLA_BR_MCAST_QUERIER_INTVL]);
|
|
|
|
|
|
|
|
br->multicast_querier_interval = clock_t_to_jiffies(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_QUERY_INTVL]) {
|
|
|
|
u64 val = nla_get_u64(data[IFLA_BR_MCAST_QUERY_INTVL]);
|
|
|
|
|
|
|
|
br->multicast_query_interval = clock_t_to_jiffies(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL]) {
|
|
|
|
u64 val = nla_get_u64(data[IFLA_BR_MCAST_QUERY_RESPONSE_INTVL]);
|
|
|
|
|
|
|
|
br->multicast_query_response_interval = clock_t_to_jiffies(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_STARTUP_QUERY_INTVL]) {
|
|
|
|
u64 val = nla_get_u64(data[IFLA_BR_MCAST_STARTUP_QUERY_INTVL]);
|
|
|
|
|
|
|
|
br->multicast_startup_query_interval = clock_t_to_jiffies(val);
|
|
|
|
}
|
2016-06-28 14:57:06 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_STATS_ENABLED]) {
|
|
|
|
__u8 mcast_stats;
|
|
|
|
|
|
|
|
mcast_stats = nla_get_u8(data[IFLA_BR_MCAST_STATS_ENABLED]);
|
|
|
|
br->multicast_stats_enabled = !!mcast_stats;
|
|
|
|
}
|
2016-11-21 12:03:24 +00:00
|
|
|
|
|
|
|
if (data[IFLA_BR_MCAST_IGMP_VERSION]) {
|
|
|
|
__u8 igmp_version;
|
|
|
|
|
|
|
|
igmp_version = nla_get_u8(data[IFLA_BR_MCAST_IGMP_VERSION]);
|
|
|
|
err = br_multicast_set_igmp_version(br, igmp_version);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
2016-11-21 12:03:25 +00:00
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
if (data[IFLA_BR_MCAST_MLD_VERSION]) {
|
|
|
|
__u8 mld_version;
|
|
|
|
|
|
|
|
mld_version = nla_get_u8(data[IFLA_BR_MCAST_MLD_VERSION]);
|
|
|
|
err = br_multicast_set_mld_version(br, mld_version);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif
|
2015-10-04 12:23:37 +00:00
|
|
|
#endif
|
2015-10-04 12:23:46 +00:00
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
|
|
|
|
if (data[IFLA_BR_NF_CALL_IPTABLES]) {
|
|
|
|
u8 val = nla_get_u8(data[IFLA_BR_NF_CALL_IPTABLES]);
|
|
|
|
|
|
|
|
br->nf_call_iptables = val ? true : false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_NF_CALL_IP6TABLES]) {
|
|
|
|
u8 val = nla_get_u8(data[IFLA_BR_NF_CALL_IP6TABLES]);
|
|
|
|
|
|
|
|
br->nf_call_ip6tables = val ? true : false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data[IFLA_BR_NF_CALL_ARPTABLES]) {
|
|
|
|
u8 val = nla_get_u8(data[IFLA_BR_NF_CALL_ARPTABLES]);
|
|
|
|
|
|
|
|
br->nf_call_arptables = val ? true : false;
|
|
|
|
}
|
|
|
|
#endif
|
2015-10-04 12:23:37 +00:00
|
|
|
|
2014-09-05 13:51:32 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-01-20 17:12:17 +00:00
|
|
|
static int br_dev_newlink(struct net *src_net, struct net_device *dev,
|
2017-06-25 21:55:59 +00:00
|
|
|
struct nlattr *tb[], struct nlattr *data[],
|
|
|
|
struct netlink_ext_ack *extack)
|
2017-01-20 17:12:17 +00:00
|
|
|
{
|
|
|
|
struct net_bridge *br = netdev_priv(dev);
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (tb[IFLA_ADDRESS]) {
|
|
|
|
spin_lock_bh(&br->lock);
|
|
|
|
br_stp_change_bridge_id(br, nla_data(tb[IFLA_ADDRESS]));
|
|
|
|
spin_unlock_bh(&br->lock);
|
|
|
|
}
|
|
|
|
|
2017-04-10 11:59:28 +00:00
|
|
|
err = register_netdevice(dev);
|
2017-01-20 17:12:17 +00:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2017-06-25 21:56:00 +00:00
|
|
|
err = br_changelink(dev, tb, data, extack);
|
2017-04-10 11:59:28 +00:00
|
|
|
if (err)
|
|
|
|
unregister_netdevice(dev);
|
|
|
|
return err;
|
2017-01-20 17:12:17 +00:00
|
|
|
}
|
|
|
|
|
2014-09-05 13:51:31 +00:00
|
|
|
static size_t br_get_size(const struct net_device *brdev)
|
|
|
|
{
|
|
|
|
return nla_total_size(sizeof(u32)) + /* IFLA_BR_FORWARD_DELAY */
|
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_HELLO_TIME */
|
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_MAX_AGE */
|
2015-03-18 09:06:58 +00:00
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_AGEING_TIME */
|
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_STP_STATE */
|
|
|
|
nla_total_size(sizeof(u16)) + /* IFLA_BR_PRIORITY */
|
2015-08-07 16:40:45 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_VLAN_FILTERING */
|
2015-08-27 06:32:26 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
|
|
|
nla_total_size(sizeof(__be16)) + /* IFLA_BR_VLAN_PROTOCOL */
|
2015-10-04 12:23:47 +00:00
|
|
|
nla_total_size(sizeof(u16)) + /* IFLA_BR_VLAN_DEFAULT_PVID */
|
2016-04-30 08:25:28 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_VLAN_STATS_ENABLED */
|
2015-08-27 06:32:26 +00:00
|
|
|
#endif
|
2015-10-04 12:23:28 +00:00
|
|
|
nla_total_size(sizeof(u16)) + /* IFLA_BR_GROUP_FWD_MASK */
|
2015-10-04 12:23:29 +00:00
|
|
|
nla_total_size(sizeof(struct ifla_bridge_id)) + /* IFLA_BR_ROOT_ID */
|
2015-10-04 12:23:30 +00:00
|
|
|
nla_total_size(sizeof(struct ifla_bridge_id)) + /* IFLA_BR_BRIDGE_ID */
|
2015-10-04 12:23:31 +00:00
|
|
|
nla_total_size(sizeof(u16)) + /* IFLA_BR_ROOT_PORT */
|
2015-10-04 12:23:32 +00:00
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_ROOT_PATH_COST */
|
2015-10-04 12:23:44 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_TOPOLOGY_CHANGE */
|
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_TOPOLOGY_CHANGE_DETECTED */
|
2016-04-25 08:25:18 +00:00
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_HELLO_TIMER */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_TCN_TIMER */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_TOPOLOGY_CHANGE_TIMER */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_GC_TIMER */
|
2015-10-04 12:23:35 +00:00
|
|
|
nla_total_size(ETH_ALEN) + /* IFLA_BR_GROUP_ADDR */
|
2015-10-04 12:23:37 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_ROUTER */
|
2015-10-04 12:23:38 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_SNOOPING */
|
2015-10-04 12:23:39 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_QUERY_USE_IFADDR */
|
2015-10-04 12:23:40 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_QUERIER */
|
2016-06-28 14:57:06 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_STATS_ENABLED */
|
2015-10-04 12:23:44 +00:00
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_MCAST_HASH_ELASTICITY */
|
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_MCAST_HASH_MAX */
|
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_MCAST_LAST_MEMBER_CNT */
|
|
|
|
nla_total_size(sizeof(u32)) + /* IFLA_BR_MCAST_STARTUP_QUERY_CNT */
|
2016-04-25 08:25:18 +00:00
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_MCAST_LAST_MEMBER_INTVL */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_MCAST_MEMBERSHIP_INTVL */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_MCAST_QUERIER_INTVL */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_MCAST_QUERY_INTVL */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_MCAST_QUERY_RESPONSE_INTVL */
|
|
|
|
nla_total_size_64bit(sizeof(u64)) + /* IFLA_BR_MCAST_STARTUP_QUERY_INTVL */
|
2016-11-21 12:03:24 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_IGMP_VERSION */
|
2016-11-21 12:03:25 +00:00
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_MCAST_MLD_VERSION */
|
2015-10-04 12:23:46 +00:00
|
|
|
#endif
|
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
|
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_NF_CALL_IPTABLES */
|
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_NF_CALL_IP6TABLES */
|
|
|
|
nla_total_size(sizeof(u8)) + /* IFLA_BR_NF_CALL_ARPTABLES */
|
2015-10-04 12:23:37 +00:00
|
|
|
#endif
|
2014-09-05 13:51:31 +00:00
|
|
|
0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
|
|
|
|
{
|
|
|
|
struct net_bridge *br = netdev_priv(brdev);
|
|
|
|
u32 forward_delay = jiffies_to_clock_t(br->forward_delay);
|
|
|
|
u32 hello_time = jiffies_to_clock_t(br->hello_time);
|
|
|
|
u32 age_time = jiffies_to_clock_t(br->max_age);
|
2015-03-18 09:06:58 +00:00
|
|
|
u32 ageing_time = jiffies_to_clock_t(br->ageing_time);
|
|
|
|
u32 stp_enabled = br->stp_enabled;
|
|
|
|
u16 priority = (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1];
|
2017-05-26 06:37:23 +00:00
|
|
|
u8 vlan_enabled = br_vlan_enabled(br->dev);
|
2015-10-05 10:11:21 +00:00
|
|
|
u64 clockval;
|
|
|
|
|
|
|
|
clockval = br_timer_value(&br->hello_timer);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_HELLO_TIMER, clockval, IFLA_BR_PAD))
|
2015-10-05 10:11:21 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
clockval = br_timer_value(&br->tcn_timer);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_TCN_TIMER, clockval, IFLA_BR_PAD))
|
2015-10-05 10:11:21 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
clockval = br_timer_value(&br->topology_change_timer);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_TOPOLOGY_CHANGE_TIMER, clockval,
|
|
|
|
IFLA_BR_PAD))
|
2015-10-05 10:11:21 +00:00
|
|
|
return -EMSGSIZE;
|
2017-02-04 17:05:07 +00:00
|
|
|
clockval = br_timer_value(&br->gc_work.timer);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_GC_TIMER, clockval, IFLA_BR_PAD))
|
2015-10-05 10:11:21 +00:00
|
|
|
return -EMSGSIZE;
|
2014-09-05 13:51:31 +00:00
|
|
|
|
|
|
|
if (nla_put_u32(skb, IFLA_BR_FORWARD_DELAY, forward_delay) ||
|
|
|
|
nla_put_u32(skb, IFLA_BR_HELLO_TIME, hello_time) ||
|
2015-03-18 09:06:58 +00:00
|
|
|
nla_put_u32(skb, IFLA_BR_MAX_AGE, age_time) ||
|
|
|
|
nla_put_u32(skb, IFLA_BR_AGEING_TIME, ageing_time) ||
|
|
|
|
nla_put_u32(skb, IFLA_BR_STP_STATE, stp_enabled) ||
|
2015-08-07 16:40:45 +00:00
|
|
|
nla_put_u16(skb, IFLA_BR_PRIORITY, priority) ||
|
2015-10-04 12:23:28 +00:00
|
|
|
nla_put_u8(skb, IFLA_BR_VLAN_FILTERING, vlan_enabled) ||
|
2015-10-05 10:11:21 +00:00
|
|
|
nla_put_u16(skb, IFLA_BR_GROUP_FWD_MASK, br->group_fwd_mask) ||
|
|
|
|
nla_put(skb, IFLA_BR_BRIDGE_ID, sizeof(struct ifla_bridge_id),
|
|
|
|
&br->bridge_id) ||
|
|
|
|
nla_put(skb, IFLA_BR_ROOT_ID, sizeof(struct ifla_bridge_id),
|
|
|
|
&br->designated_root) ||
|
2015-10-04 12:23:32 +00:00
|
|
|
nla_put_u16(skb, IFLA_BR_ROOT_PORT, br->root_port) ||
|
2015-10-04 12:23:33 +00:00
|
|
|
nla_put_u32(skb, IFLA_BR_ROOT_PATH_COST, br->root_path_cost) ||
|
|
|
|
nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE, br->topology_change) ||
|
|
|
|
nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE_DETECTED,
|
2015-10-04 12:23:34 +00:00
|
|
|
br->topology_change_detected) ||
|
2015-10-04 12:23:35 +00:00
|
|
|
nla_put(skb, IFLA_BR_GROUP_ADDR, ETH_ALEN, br->group_addr))
|
2014-09-05 13:51:31 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
|
2015-08-27 06:32:26 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_VLAN_FILTERING
|
2015-10-04 12:23:47 +00:00
|
|
|
if (nla_put_be16(skb, IFLA_BR_VLAN_PROTOCOL, br->vlan_proto) ||
|
2016-04-30 08:25:28 +00:00
|
|
|
nla_put_u16(skb, IFLA_BR_VLAN_DEFAULT_PVID, br->default_pvid) ||
|
|
|
|
nla_put_u8(skb, IFLA_BR_VLAN_STATS_ENABLED, br->vlan_stats_enabled))
|
2015-08-27 06:32:26 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
#endif
|
2015-10-04 12:23:37 +00:00
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
2015-10-04 12:23:38 +00:00
|
|
|
if (nla_put_u8(skb, IFLA_BR_MCAST_ROUTER, br->multicast_router) ||
|
2015-10-04 12:23:39 +00:00
|
|
|
nla_put_u8(skb, IFLA_BR_MCAST_SNOOPING, !br->multicast_disabled) ||
|
|
|
|
nla_put_u8(skb, IFLA_BR_MCAST_QUERY_USE_IFADDR,
|
2015-10-04 12:23:40 +00:00
|
|
|
br->multicast_query_use_ifaddr) ||
|
2015-10-04 12:23:41 +00:00
|
|
|
nla_put_u8(skb, IFLA_BR_MCAST_QUERIER, br->multicast_querier) ||
|
2016-06-28 14:57:06 +00:00
|
|
|
nla_put_u8(skb, IFLA_BR_MCAST_STATS_ENABLED,
|
|
|
|
br->multicast_stats_enabled) ||
|
2015-10-04 12:23:41 +00:00
|
|
|
nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY,
|
2015-10-04 12:23:42 +00:00
|
|
|
br->hash_elasticity) ||
|
2015-10-04 12:23:43 +00:00
|
|
|
nla_put_u32(skb, IFLA_BR_MCAST_HASH_MAX, br->hash_max) ||
|
|
|
|
nla_put_u32(skb, IFLA_BR_MCAST_LAST_MEMBER_CNT,
|
2015-10-04 12:23:44 +00:00
|
|
|
br->multicast_last_member_count) ||
|
|
|
|
nla_put_u32(skb, IFLA_BR_MCAST_STARTUP_QUERY_CNT,
|
2016-11-21 12:03:24 +00:00
|
|
|
br->multicast_startup_query_count) ||
|
|
|
|
nla_put_u8(skb, IFLA_BR_MCAST_IGMP_VERSION,
|
|
|
|
br->multicast_igmp_version))
|
2015-10-04 12:23:37 +00:00
|
|
|
return -EMSGSIZE;
|
2016-11-21 12:03:25 +00:00
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
|
if (nla_put_u8(skb, IFLA_BR_MCAST_MLD_VERSION,
|
|
|
|
br->multicast_mld_version))
|
|
|
|
return -EMSGSIZE;
|
|
|
|
#endif
|
2015-10-04 12:23:45 +00:00
|
|
|
clockval = jiffies_to_clock_t(br->multicast_last_member_interval);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_LAST_MEMBER_INTVL, clockval,
|
|
|
|
IFLA_BR_PAD))
|
2015-10-04 12:23:45 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
clockval = jiffies_to_clock_t(br->multicast_membership_interval);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_MEMBERSHIP_INTVL, clockval,
|
|
|
|
IFLA_BR_PAD))
|
2015-10-04 12:23:45 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
clockval = jiffies_to_clock_t(br->multicast_querier_interval);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_QUERIER_INTVL, clockval,
|
|
|
|
IFLA_BR_PAD))
|
2015-10-04 12:23:45 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
clockval = jiffies_to_clock_t(br->multicast_query_interval);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_QUERY_INTVL, clockval,
|
|
|
|
IFLA_BR_PAD))
|
2015-10-04 12:23:45 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
clockval = jiffies_to_clock_t(br->multicast_query_response_interval);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_QUERY_RESPONSE_INTVL, clockval,
|
|
|
|
IFLA_BR_PAD))
|
2015-10-04 12:23:45 +00:00
|
|
|
return -EMSGSIZE;
|
|
|
|
clockval = jiffies_to_clock_t(br->multicast_startup_query_interval);
|
2016-04-25 08:25:18 +00:00
|
|
|
if (nla_put_u64_64bit(skb, IFLA_BR_MCAST_STARTUP_QUERY_INTVL, clockval,
|
|
|
|
IFLA_BR_PAD))
|
2015-10-04 12:23:45 +00:00
|
|
|
return -EMSGSIZE;
|
2015-10-04 12:23:37 +00:00
|
|
|
#endif
|
2015-10-04 12:23:46 +00:00
|
|
|
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
|
|
|
|
if (nla_put_u8(skb, IFLA_BR_NF_CALL_IPTABLES,
|
|
|
|
br->nf_call_iptables ? 1 : 0) ||
|
|
|
|
nla_put_u8(skb, IFLA_BR_NF_CALL_IP6TABLES,
|
|
|
|
br->nf_call_ip6tables ? 1 : 0) ||
|
|
|
|
nla_put_u8(skb, IFLA_BR_NF_CALL_ARPTABLES,
|
|
|
|
br->nf_call_arptables ? 1 : 0))
|
|
|
|
return -EMSGSIZE;
|
|
|
|
#endif
|
2015-10-04 12:23:37 +00:00
|
|
|
|
2014-09-05 13:51:31 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-08-17 10:53:09 +00:00
|
|
|
static size_t br_get_linkxstats_size(const struct net_device *dev, int attr)
|
2016-04-30 08:25:29 +00:00
|
|
|
{
|
2016-08-17 10:53:09 +00:00
|
|
|
struct net_bridge_port *p = NULL;
|
2016-04-30 08:25:29 +00:00
|
|
|
struct net_bridge_vlan_group *vg;
|
|
|
|
struct net_bridge_vlan *v;
|
2016-08-17 10:53:09 +00:00
|
|
|
struct net_bridge *br;
|
2016-04-30 08:25:29 +00:00
|
|
|
int numvls = 0;
|
|
|
|
|
2016-08-17 10:53:09 +00:00
|
|
|
switch (attr) {
|
|
|
|
case IFLA_STATS_LINK_XSTATS:
|
|
|
|
br = netdev_priv(dev);
|
|
|
|
vg = br_vlan_group(br);
|
|
|
|
break;
|
|
|
|
case IFLA_STATS_LINK_XSTATS_SLAVE:
|
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
if (!p)
|
|
|
|
return 0;
|
|
|
|
br = p->br;
|
|
|
|
vg = nbp_vlan_group(p);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-06-28 14:57:06 +00:00
|
|
|
if (vg) {
|
|
|
|
/* we need to count all, even placeholder entries */
|
|
|
|
list_for_each_entry(v, &vg->vlan_list, vlist)
|
|
|
|
numvls++;
|
|
|
|
}
|
2016-04-30 08:25:29 +00:00
|
|
|
|
|
|
|
return numvls * nla_total_size(sizeof(struct bridge_vlan_xstats)) +
|
2016-06-28 14:57:06 +00:00
|
|
|
nla_total_size(sizeof(struct br_mcast_stats)) +
|
2016-04-30 08:25:29 +00:00
|
|
|
nla_total_size(0);
|
|
|
|
}
|
|
|
|
|
2016-08-17 10:53:09 +00:00
|
|
|
static int br_fill_linkxstats(struct sk_buff *skb,
|
|
|
|
const struct net_device *dev,
|
|
|
|
int *prividx, int attr)
|
2016-06-28 14:57:05 +00:00
|
|
|
{
|
2016-08-17 10:53:09 +00:00
|
|
|
struct nlattr *nla __maybe_unused;
|
|
|
|
struct net_bridge_port *p = NULL;
|
|
|
|
struct net_bridge_vlan_group *vg;
|
|
|
|
struct net_bridge_vlan *v;
|
|
|
|
struct net_bridge *br;
|
|
|
|
struct nlattr *nest;
|
|
|
|
int vl_idx = 0;
|
2016-06-28 14:57:05 +00:00
|
|
|
|
|
|
|
switch (attr) {
|
|
|
|
case IFLA_STATS_LINK_XSTATS:
|
2016-08-17 10:53:09 +00:00
|
|
|
br = netdev_priv(dev);
|
|
|
|
vg = br_vlan_group(br);
|
2016-06-28 14:57:05 +00:00
|
|
|
break;
|
|
|
|
case IFLA_STATS_LINK_XSTATS_SLAVE:
|
2016-08-17 10:53:09 +00:00
|
|
|
p = br_port_get_rtnl(dev);
|
|
|
|
if (!p)
|
|
|
|
return 0;
|
|
|
|
br = p->br;
|
|
|
|
vg = nbp_vlan_group(p);
|
2016-06-28 14:57:05 +00:00
|
|
|
break;
|
2016-08-17 10:53:09 +00:00
|
|
|
default:
|
|
|
|
return -EINVAL;
|
2016-06-28 14:57:05 +00:00
|
|
|
}
|
|
|
|
|
2016-04-30 08:25:29 +00:00
|
|
|
nest = nla_nest_start(skb, LINK_XSTATS_TYPE_BRIDGE);
|
|
|
|
if (!nest)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
2016-06-28 14:57:06 +00:00
|
|
|
if (vg) {
|
2016-08-25 12:27:51 +00:00
|
|
|
u16 pvid;
|
|
|
|
|
|
|
|
pvid = br_get_pvid(vg);
|
2016-06-28 14:57:06 +00:00
|
|
|
list_for_each_entry(v, &vg->vlan_list, vlist) {
|
|
|
|
struct bridge_vlan_xstats vxi;
|
|
|
|
struct br_vlan_stats stats;
|
|
|
|
|
|
|
|
if (++vl_idx < *prividx)
|
|
|
|
continue;
|
|
|
|
memset(&vxi, 0, sizeof(vxi));
|
|
|
|
vxi.vid = v->vid;
|
2016-08-17 10:53:10 +00:00
|
|
|
vxi.flags = v->flags;
|
2016-08-25 12:27:51 +00:00
|
|
|
if (v->vid == pvid)
|
|
|
|
vxi.flags |= BRIDGE_VLAN_INFO_PVID;
|
2016-06-28 14:57:06 +00:00
|
|
|
br_vlan_get_stats(v, &stats);
|
|
|
|
vxi.rx_bytes = stats.rx_bytes;
|
|
|
|
vxi.rx_packets = stats.rx_packets;
|
|
|
|
vxi.tx_bytes = stats.tx_bytes;
|
|
|
|
vxi.tx_packets = stats.tx_packets;
|
|
|
|
|
|
|
|
if (nla_put(skb, BRIDGE_XSTATS_VLAN, sizeof(vxi), &vxi))
|
|
|
|
goto nla_put_failure;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
|
|
|
|
if (++vl_idx >= *prividx) {
|
|
|
|
nla = nla_reserve_64bit(skb, BRIDGE_XSTATS_MCAST,
|
|
|
|
sizeof(struct br_mcast_stats),
|
|
|
|
BRIDGE_XSTATS_PAD);
|
|
|
|
if (!nla)
|
2016-04-30 08:25:29 +00:00
|
|
|
goto nla_put_failure;
|
2016-08-17 10:53:09 +00:00
|
|
|
br_multicast_get_stats(br, p, nla_data(nla));
|
2016-04-30 08:25:29 +00:00
|
|
|
}
|
2016-06-28 14:57:06 +00:00
|
|
|
#endif
|
2016-04-30 08:25:29 +00:00
|
|
|
nla_nest_end(skb, nest);
|
|
|
|
*prividx = 0;
|
2016-06-28 14:57:06 +00:00
|
|
|
|
2016-04-30 08:25:29 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
nla_nest_end(skb, nest);
|
|
|
|
*prividx = vl_idx;
|
|
|
|
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
2015-02-26 07:55:40 +00:00
|
|
|
|
2015-01-29 11:15:03 +00:00
|
|
|
static struct rtnl_af_ops br_af_ops __read_mostly = {
|
2013-02-13 12:00:13 +00:00
|
|
|
.family = AF_BRIDGE,
|
2015-10-19 16:23:28 +00:00
|
|
|
.get_link_af_size = br_get_link_af_size_filtered,
|
2013-02-13 12:00:13 +00:00
|
|
|
};
|
|
|
|
|
2012-06-26 05:48:45 +00:00
|
|
|
struct rtnl_link_ops br_link_ops __read_mostly = {
|
2014-09-05 13:51:29 +00:00
|
|
|
.kind = "bridge",
|
|
|
|
.priv_size = sizeof(struct net_bridge),
|
|
|
|
.setup = br_dev_setup,
|
2015-08-19 18:29:35 +00:00
|
|
|
.maxtype = IFLA_BR_MAX,
|
2014-09-05 13:51:32 +00:00
|
|
|
.policy = br_policy,
|
2014-09-05 13:51:29 +00:00
|
|
|
.validate = br_validate,
|
|
|
|
.newlink = br_dev_newlink,
|
2014-09-05 13:51:32 +00:00
|
|
|
.changelink = br_changelink,
|
2014-09-05 13:51:29 +00:00
|
|
|
.dellink = br_dev_delete,
|
2014-09-05 13:51:31 +00:00
|
|
|
.get_size = br_get_size,
|
|
|
|
.fill_info = br_fill_info,
|
2016-04-30 08:25:29 +00:00
|
|
|
.fill_linkxstats = br_fill_linkxstats,
|
|
|
|
.get_linkxstats_size = br_get_linkxstats_size,
|
2014-09-05 13:51:30 +00:00
|
|
|
|
|
|
|
.slave_maxtype = IFLA_BRPORT_MAX,
|
|
|
|
.slave_policy = br_port_policy,
|
|
|
|
.slave_changelink = br_port_slave_changelink,
|
2014-09-05 13:51:29 +00:00
|
|
|
.get_slave_size = br_port_get_slave_size,
|
|
|
|
.fill_slave_info = br_port_fill_slave_info,
|
2011-04-04 14:03:32 +00:00
|
|
|
};
|
2006-05-25 23:00:12 +00:00
|
|
|
|
2007-03-22 18:59:03 +00:00
|
|
|
int __init br_netlink_init(void)
|
2006-05-25 23:00:12 +00:00
|
|
|
{
|
2013-01-02 09:41:25 +00:00
|
|
|
int err;
|
|
|
|
|
|
|
|
br_mdb_init();
|
2013-12-30 18:41:32 +00:00
|
|
|
rtnl_af_register(&br_af_ops);
|
2013-01-02 09:41:25 +00:00
|
|
|
|
2013-02-13 12:00:13 +00:00
|
|
|
err = rtnl_link_register(&br_link_ops);
|
|
|
|
if (err)
|
|
|
|
goto out_af;
|
|
|
|
|
2013-01-02 09:41:25 +00:00
|
|
|
return 0;
|
2013-02-13 12:00:13 +00:00
|
|
|
|
|
|
|
out_af:
|
|
|
|
rtnl_af_unregister(&br_af_ops);
|
2013-01-02 09:41:25 +00:00
|
|
|
br_mdb_uninit();
|
|
|
|
return err;
|
2006-05-25 23:00:12 +00:00
|
|
|
}
|
|
|
|
|
2014-09-18 09:29:03 +00:00
|
|
|
void br_netlink_fini(void)
|
2006-05-25 23:00:12 +00:00
|
|
|
{
|
2013-01-02 09:41:25 +00:00
|
|
|
br_mdb_uninit();
|
2013-02-13 12:00:13 +00:00
|
|
|
rtnl_af_unregister(&br_af_ops);
|
2011-04-04 14:03:32 +00:00
|
|
|
rtnl_link_unregister(&br_link_ops);
|
2006-05-25 23:00:12 +00:00
|
|
|
}
|