bridge: Add support for per-{Port, VLAN} neighbor suppression
Subsystems (2)
cover bridge: Add support for per-{Port, VLAN} neighbor suppression
See kernel merge commit 25c800b21058 ("Merge branch 'bridge-neigh-suppression'") for background and motivation.
Patch #1 adds support for a new "bridge vlan" option, "neigh_suppress".
Patch #2 adds support for a new "bridge link" option, "neigh_vlan_suppress".
Ido Schimmel (2):
bridge: vlan: Add support for neigh_suppress option
bridge: link: Add support for neigh_vlan_suppress option
bridge/link.c | 19 +++++++++++++++++++ bridge/vlan.c | 18 ++++++++++++++++++ ip/iplink_bridge_slave.c | 10 ++++++++++ man/man8/bridge.8 | 19 ++++++++++++++++++- man/man8/ip-link.8.in | 8 ++++++++ 5 files changed, 73 insertions(+), 1 deletion(-)
Signature · 1 line
2.40.0
PATCH 1/2 bridge: vlan: Add support for neigh_suppress option
Add support for the per-VLAN neigh_suppress option. Example:
# bridge vlan set vid 10 dev swp1 neigh_suppress on
# bridge -d -j -p vlan show dev swp1 vid 10
[ {
"ifname": "swp1",
"vlans": [ {
"vlan": 10,
"state": "forwarding",
"mcast_router": 1,
"neigh_suppress": true
} ]
} ]
# bridge -d vlan show dev swp1 vid 10
port vlan-id
swp1 10
state forwarding mcast_router 1 neigh_suppress on # bridge vlan set vid 10 dev swp1 neigh_suppress off
# bridge -d -j -p vlan show dev swp1 vid 10
[ {
"ifname": "swp1",
"vlans": [ {
"vlan": 10,
"state": "forwarding",
"mcast_router": 1,
"neigh_suppress": false
} ]
} ]
# bridge -d vlan show dev swp1 vid 10
port vlan-id
swp1 10
state forwarding mcast_router 1 neigh_suppress off--- bridge/vlan.c | 18 ++++++++++++++++++ man/man8/bridge.8 | 11 ++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-)
bridge/vlan.c +18 -0
@@ -38,6 +38,7 @@ static void usage(void)" bridge vlan { set } vid VLAN_ID dev DEV [ state STP_STATE ]\n" " [ mcast_router MULTICAST_ROUTER ]\n" " [ mcast_max_groups MAX_GROUPS ]\n" +" [ neigh_suppress {on | off} ]\n" " bridge vlan { show } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan { tunnelshow } [ dev DEV ] [ vid VLAN_ID ]\n" " bridge vlan global { set } vid VLAN_ID dev DEV\n"
@@ -354,6 +355,18 @@ static int vlan_option_set(int argc, char **argv)addattr32 (&req.n,sizeof (req),BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS , max_groups); + }else if (strcmp (*argv,"neigh_suppress" ) ==0 ) { +bool neigh_suppress; +int ret; + +NEXT_ARG (); + neigh_suppress =parse_on_off ("neigh_suppress" , *argv, + &ret); +if (ret) +return ret; +addattr8 (&req.n,sizeof (req), +BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS , + neigh_suppress); }else {if (matches (*argv,"help" ) ==0 )NEXT_ARG ();
@@ -1041,6 +1054,11 @@ static void print_vlan_opts(struct rtattr *a, int ifindex)print_uint (PRINT_ANY ,"mcast_max_groups" ,"mcast_max_groups %u " ,rta_getattr_u32 (vattr)); } +if (vtb[BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS ]) { + vattr = vtb[BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS ]; +print_on_off (PRINT_ANY ,"neigh_suppress" ,"neigh_suppress %s " , +rta_getattr_u8 (vattr)); + }print_nl ();if (show_stats)__print_one_vlan_stats (&vstats);
man/man8/bridge.8 +10 -1
@@ -184,7 +184,8 @@ bridge \- show / manipulate bridge addresses and devices .B mcast_max_groups .IR MAX_GROUPS " ] [ " .B mcast_router -.IR MULTICAST_ROUTER " ]" +.IR MULTICAST_ROUTER " ] [ " +.BR neigh_suppress " { " on " | " off " } ]" .ti -8 .BR "bridge vlan" " [ " show " | " tunnelshow " ] [ "
@@ -1204,6 +1205,14 @@ may be either enable multicast traffic forwarding. This mode is available only for ports. .sp +.TP +.BR "neigh_suppress on " or " neigh_suppress off " +Controls whether neigh discovery (arp and nd) proxy and suppression is enabled +for a given VLAN on a given port. By default this flag is off. + +Note that this option only takes effect when \fBbridge link\fR option +\fBneigh_vlan_suppress\fR is enabled for a given port. + .SS bridge vlan show - list vlan configuration. This command displays the current VLAN filter table.
Signature · 1 line
2.40.0
Re: [PATCH iproute2-next 1/2] bridge: vlan: Add support for neigh_suppress option
Quoted 34 lines · Ido Schimmel
Add support for the per-VLAN
neigh_suppressoption. Example:# bridge vlan set vid 10 dev swp1 neigh_suppress on # bridge -d -j -p vlan show dev swp1 vid 10 [ { "ifname": "swp1", "vlans": [ { "vlan": 10, "state": "forwarding", "mcast_router": 1, "neigh_suppress": true } ] } ] # bridge -d vlan show dev swp1 vid 10 port vlan-id swp1 10 state forwarding mcast_router 1 neigh_suppress on# bridge vlan set vid 10 dev swp1 neigh_suppress off # bridge -d -j -p vlan show dev swp1 vid 10 [ { "ifname": "swp1", "vlans": [ { "vlan": 10, "state": "forwarding", "mcast_router": 1, "neigh_suppress": false } ] } ] # bridge -d vlan show dev swp1 vid 10 port vlan-id swp1 10 state forwarding mcast_router 1 neigh_suppress off
Quoted 6 lines
Signed-off-by Ido Schimmel <[email protected]>--- bridge/vlan.c | 18 ++++++++++++++++++ man/man8/bridge.8 | 11 ++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-)
PATCH 2/2 bridge: link: Add support for neigh_vlan_suppress option
In reply to Ido SchimmelAdd support for the per-port neigh_vlan_suppress option. Example:
# bridge link set dev swp1 neigh_vlan_suppress on
# bridge -d -j -p link show dev swp1
[ {
"ifindex": 62,
"ifname": "swp1",
"flags": [ "BROADCAST","NOARP","UP","LOWER_UP" ],
"mtu": 1500,
"master": "br0",
"state": "forwarding",
"priority": 32,
"cost": 100,
"hairpin": false,
"guard": false,
"root_block": false,
"fastleave": false,
"learning": true,
"flood": true,
"mcast_flood": true,
"bcast_flood": true,
"mcast_router": 1,
"mcast_to_unicast": false,
"neigh_suppress": false,
"neigh_vlan_suppress": true,
"vlan_tunnel": false,
"isolated": false,
"locked": false,
"mab": false,
"mcast_n_groups": 0,
"mcast_max_groups": 0
} ]
# bridge -d link show dev swp1
62: swp1: <BROADCAST,NOARP,UP,LOWER_UP> mtu 1500 master br0 state forwarding priority 32 cost 100
hairpin off guard off root_block off fastleave off learning on flood on mcast_flood on bcast_flood on mcast_router 1 mcast_to_unicast off neigh_suppress off neigh_vlan_suppress on vlan_tunnel off isolated off locked off mab off mcast_n_groups 0 mcast_max_groups 0 # bridge link set dev swp1 neigh_vlan_suppress off
# bridge -d -j -p link show dev swp1
[ {
"ifindex": 62,
"ifname": "swp1",
"flags": [ "BROADCAST","NOARP","UP","LOWER_UP" ],
"mtu": 1500,
"master": "br0",
"state": "forwarding",
"priority": 32,
"cost": 100,
"hairpin": false,
"guard": false,
"root_block": false,
"fastleave": false,
"learning": true,
"flood": true,
"mcast_flood": true,
"bcast_flood": true,
"mcast_router": 1,
"mcast_to_unicast": false,
"neigh_suppress": false,
"neigh_vlan_suppress": false,
"vlan_tunnel": false,
"isolated": false,
"locked": false,
"mab": false,
"mcast_n_groups": 0,
"mcast_max_groups": 0
} ]
# bridge -d link show dev swp1
62: swp1: <BROADCAST,NOARP,UP,LOWER_UP> mtu 1500 master br0 state forwarding priority 32 cost 100
hairpin off guard off root_block off fastleave off learning on flood on mcast_flood on bcast_flood on mcast_router 1 mcast_to_unicast off neigh_suppress off neigh_vlan_suppress off vlan_tunnel off isolated off locked off mab off mcast_n_groups 0 mcast_max_groups 0--- bridge/link.c | 19 +++++++++++++++++++ ip/iplink_bridge_slave.c | 10 ++++++++++ man/man8/bridge.8 | 8 ++++++++ man/man8/ip-link.8.in | 8 ++++++++ 4 files changed, 45 insertions(+)
bridge/link.c +19 -0
@@ -165,6 +165,14 @@ static void print_protinfo(FILE *fp, struct rtattr *attr)if (prtb[IFLA_BRPORT_NEIGH_SUPPRESS ])print_on_off (PRINT_ANY ,"neigh_suppress" ,"neigh_suppress %s " ,rta_getattr_u8 (prtb[IFLA_BRPORT_NEIGH_SUPPRESS ])); +if (prtb[IFLA_BRPORT_NEIGH_VLAN_SUPPRESS ]) { +struct rtattr *at; + + at = prtb[IFLA_BRPORT_NEIGH_VLAN_SUPPRESS ]; +print_on_off (PRINT_ANY ,"neigh_vlan_suppress" , +"neigh_vlan_suppress %s " , +rta_getattr_u8 (at)); + }if (prtb[IFLA_BRPORT_VLAN_TUNNEL ])print_on_off (PRINT_ANY ,"vlan_tunnel" ,"vlan_tunnel %s " ,rta_getattr_u8 (prtb[IFLA_BRPORT_VLAN_TUNNEL ]));
@@ -296,6 +304,7 @@ static void usage(void)" [ mcast_to_unicast {on | off} ]\n" " [ mcast_max_groups MAX_GROUPS ]\n" " [ neigh_suppress {on | off} ]\n" +" [ neigh_vlan_suppress {on | off} ]\n" " [ vlan_tunnel {on | off} ]\n" " [ isolated {on | off} ]\n" " [ locked {on | off} ]\n"
@@ -322,6 +331,7 @@ static int brlink_modify(int argc, char **argv)char *d =NULL ;int backup_port_idx =-1 ;__s8 neigh_suppress =-1 ; +__s8 neigh_vlan_suppress =-1 ;__s8 learning =-1 ;__s8 learning_sync =-1 ;__s8 flood =-1 ;
@@ -447,6 +457,12 @@ static int brlink_modify(int argc, char **argv) neigh_suppress =parse_on_off ("neigh_suppress" , *argv, &ret);if (ret)return ret; + }else if (strcmp (*argv,"neigh_vlan_suppress" ) ==0 ) { +NEXT_ARG (); + neigh_vlan_suppress =parse_on_off ("neigh_vlan_suppress" , + *argv, &ret); +if (ret) +return ret; }else if (strcmp (*argv,"vlan_tunnel" ) ==0 ) {NEXT_ARG (); vlan_tunnel =parse_on_off ("vlan_tunnel" , *argv, &ret);
@@ -544,6 +560,9 @@ static int brlink_modify(int argc, char **argv)if (neigh_suppress !=-1 )addattr8 (&req.n,sizeof (req),IFLA_BRPORT_NEIGH_SUPPRESS , neigh_suppress); +if (neigh_vlan_suppress !=-1 ) +addattr8 (&req.n,sizeof (req),IFLA_BRPORT_NEIGH_VLAN_SUPPRESS , + neigh_vlan_suppress);if (vlan_tunnel !=-1 )addattr8 (&req.n,sizeof (req),IFLA_BRPORT_VLAN_TUNNEL , vlan_tunnel);
ip/iplink_bridge_slave.c +10 -0
@@ -37,6 +37,7 @@ static void print_explain(FILE *f)" [ mcast_to_unicast {on | off} ]\n" " [ group_fwd_mask MASK ]\n" " [ neigh_suppress {on | off} ]\n" +" [ neigh_vlan_suppress {on | off} ]\n" " [ vlan_tunnel {on | off} ]\n" " [ isolated {on | off} ]\n" " [ locked {on | off} ]\n"
@@ -261,6 +262,11 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,print_on_off (PRINT_ANY ,"neigh_suppress" ,"neigh_suppress %s " ,rta_getattr_u8 (tb[IFLA_BRPORT_NEIGH_SUPPRESS ])); +if (tb[IFLA_BRPORT_NEIGH_VLAN_SUPPRESS ]) +print_on_off (PRINT_ANY ,"neigh_vlan_suppress" , +"neigh_vlan_suppress %s " , +rta_getattr_u8 (tb[IFLA_BRPORT_NEIGH_VLAN_SUPPRESS ])); +if (tb[IFLA_BRPORT_GROUP_FWD_MASK ]) {char convbuf[256 ];__u16 fwd_mask;
@@ -393,6 +399,10 @@ static int bridge_slave_parse_opt(struct link_util *lu, int argc, char **argv,NEXT_ARG ();bridge_slave_parse_on_off ("neigh_suppress" , *argv, n,IFLA_BRPORT_NEIGH_SUPPRESS ); + }else if (strcmp (*argv,"neigh_vlan_suppress" ) ==0 ) { +NEXT_ARG (); +bridge_slave_parse_on_off ("neigh_vlan_suppress" , *argv, + n,IFLA_BRPORT_NEIGH_VLAN_SUPPRESS ); }else if (matches (*argv,"group_fwd_mask" ) ==0 ) {__u16 mask;
man/man8/bridge.8 +8 -0
@@ -53,6 +53,7 @@ bridge \- show / manipulate bridge addresses and devices .IR MULTICAST_ROUTER " ] [" .BR mcast_to_unicast " { " on " | " off " } ] [ " .BR neigh_suppress " { " on " | " off " } ] [ " +.BR neigh_vlan_suppress " { " on " | " off " } ] [ " .BR vlan_tunnel " { " on " | " off " } ] [ " .BR isolated " { " on " | " off " } ] [ " .BR locked " { " on " | " off " } ] [ "
@@ -590,6 +591,13 @@ only deliver reports to STAs running a multicast router. Controls whether neigh discovery (arp and nd) proxy and suppression is enabled on the port. By default this flag is off. +.TP +.BR "neigh_vlan_suppress on " or " neigh_vlan_suppress off " +Controls whether per-VLAN neigh discovery (arp and nd) proxy and suppression is +enabled on the port. When on, the \fBbridge link\fR option \fBneigh_suppress\fR +has no effect and the per-VLAN state is set using the \fBbridge vlan\fR option +\fBneigh_suppress\fR. By default this flag is off. + .TP .BR "vlan_tunnel on " or " vlan_tunnel off " Controls whether vlan to tunnel mapping is enabled on the port. By
man/man8/ip-link.8.in +8 -0
@@ -2517,6 +2517,8 @@ the following additional arguments are supported: ] [ .BR neigh_suppress " { " on " | " off " }" ] [ +.BR neigh_vlan_suppress " { " on " | " off " }" +] [ .BR vlan_tunnel " { " on " | " off " }" ] [ .BR isolated " { " on " | " off " }"
@@ -2622,6 +2624,12 @@ this port). - controls whether neigh discovery (arp and nd) proxy and suppression is enabled on the port. By default this flag is off. +.BR neigh_vlan_suppress " { " on " | " off " }" +- controls whether per-VLAN neigh discovery (arp and nd) proxy and suppression +is enabled on the port. When on, the \fBbridge link\fR option +\fBneigh_suppress\fR has no effect and the per-VLAN state is set using the +\fBbridge vlan\fR option \fBneigh_suppress\fR. By default this flag is off. + .BR vlan_tunnel " { " on " | " off " }" - controls whether vlan to tunnel mapping is enabled on the port. By default this flag is off.
Signature · 1 line
2.40.0
Re: [PATCH iproute2-next 2/2] bridge: link: Add support for neigh_vlan_suppress option
Quoted 70 lines · Ido Schimmel
Add support for the per-port
neigh_vlan_suppressoption. Example:# bridge link set dev swp1 neigh_vlan_suppress on # bridge -d -j -p link show dev swp1 [ { "ifindex": 62, "ifname": "swp1", "flags": [ "BROADCAST","NOARP","UP","LOWER_UP" ], "mtu": 1500, "master": "br0", "state": "forwarding", "priority": 32, "cost": 100, "hairpin": false, "guard": false, "root_block": false, "fastleave": false, "learning": true, "flood": true, "mcast_flood": true, "bcast_flood": true, "mcast_router": 1, "mcast_to_unicast": false, "neigh_suppress": false, "neigh_vlan_suppress": true, "vlan_tunnel": false, "isolated": false, "locked": false, "mab": false, "mcast_n_groups": 0, "mcast_max_groups": 0 } ] # bridge -d link show dev swp1 62: swp1: <BROADCAST,NOARP,UP,LOWER_UP> mtu 1500 master br0 state forwarding priority 32 cost 100 hairpin off guard off root_block off fastleave off learning on flood on mcast_flood on bcast_flood on mcast_router 1 mcast_to_unicast off neigh_suppress off neigh_vlan_suppress on vlan_tunnel off isolated off locked off mab off mcast_n_groups 0 mcast_max_groups 0# bridge link set dev swp1 neigh_vlan_suppress off # bridge -d -j -p link show dev swp1 [ { "ifindex": 62, "ifname": "swp1", "flags": [ "BROADCAST","NOARP","UP","LOWER_UP" ], "mtu": 1500, "master": "br0", "state": "forwarding", "priority": 32, "cost": 100, "hairpin": false, "guard": false, "root_block": false, "fastleave": false, "learning": true, "flood": true, "mcast_flood": true, "bcast_flood": true, "mcast_router": 1, "mcast_to_unicast": false, "neigh_suppress": false, "neigh_vlan_suppress": false, "vlan_tunnel": false, "isolated": false, "locked": false, "mab": false, "mcast_n_groups": 0, "mcast_max_groups": 0 } ] # bridge -d link show dev swp1 62: swp1: <BROADCAST,NOARP,UP,LOWER_UP> mtu 1500 master br0 state forwarding priority 32 cost 100 hairpin off guard off root_block off fastleave off learning on flood on mcast_flood on bcast_flood on mcast_router 1 mcast_to_unicast off neigh_suppress off neigh_vlan_suppress off vlan_tunnel off isolated off locked off mab off mcast_n_groups 0 mcast_max_groups 0
Quoted 8 lines
Signed-off-by Ido Schimmel <[email protected]>--- bridge/link.c | 19 +++++++++++++++++++ ip/iplink_bridge_slave.c | 10 ++++++++++ man/man8/bridge.8 | 8 ++++++++ man/man8/ip-link.8.in | 8 ++++++++ 4 files changed, 45 insertions(+)
This series was applied to iproute2/iproute2-next.git (main) by David Ahern <[email protected]>:
Hello:
This series was applied to iproute2/iproute2-next.git (main) by David Ahern <[email protected]>:
Quoted 9 lines · On Mon, 24 Apr 2023 19:09:49 +0300 you wrote:
See kernel merge commit
25c800b21058("Merge branch 'bridge-neigh-suppression'") for background and motivation.Patch #1 adds support for a new "bridge vlan" option, "
neigh_suppress".Patch #2 adds support for a new "bridge link" option, "
neigh_vlan_suppress".[...]
Here is the summary with links:
- [iproute2-next,1/2] bridge: vlan: Add support for neigh_suppress option
https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=5fe0aeb88427 - [iproute2-next,2/2] bridge: link: Add support for neigh_vlan_suppress option https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=9c7bdc9f3328
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html