team: set slave to promisc if team is already in promisc mode
Subsystems (3)
PATCH 1/1 team: set slave to promisc if team is already in promisc mode
After adding a team interface to bridge, the team interface will enter promisc mode. Then if we add a new slave to team0, the slave will keep promisc off. Fix it by setting slave to promisc on if team master is already in promisc mode, also do the same for allmulti.
--- drivers/net/team/team.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/net/team/team.c +20 -0
@@ -1246,6 +1246,23 @@ static int team_port_add(struct team *team, struct net_device *port_dev, goto err_option_port_add; } +/* set promiscuity level to new slave */ +if (team->dev->flags &IFF_PROMISC ) { + err =dev_set_promiscuity (port_dev,1 ); +if (err) + goto err_set_slave_promisc; + } + +/* set allmulti level to new slave */ +if (team->dev->flags &IFF_ALLMULTI ) { + err =dev_set_allmulti (port_dev,1 ); +if (err) { +if (team->dev->flags &IFF_PROMISC ) +dev_set_promiscuity (port_dev,-1 ); + goto err_set_slave_promisc; + } + } +netif_addr_lock_bh (dev);dev_uc_sync_multiple (port_dev, dev);dev_mc_sync_multiple (port_dev, dev);
@@ -1262,6 +1279,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev,return 0 ; +err_set_slave_promisc: +__team_option_inst_del_port (team, port); + err_option_port_add:team_upper_dev_unlink (team, port);
Signature · 1 line
2.19.2
Quoted 7 lines · Hangbin Liu
After adding a team interface to bridge, the team interface will enter promisc mode. Then if we add a new slave to team0, the slave will keep promisc off. Fix it by setting slave to promisc on if team master is already in promisc mode, also do the same for allmulti.
Fixes 3d249d4ca7d0 ("net: introduce ethernet teaming device")Signed-off-by Hangbin Liu <[email protected]>
Quoted 45 lines
--- drivers/net/team/team.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/net/team/team.c +20
-0@@ -1246,6 +1246,23 @@ static int team_port_add(struct team *team, struct net_device *port_dev, goto err_option_port_add; } +/* set promiscuity level to new slave */ +if (team->dev->flags &IFF_PROMISC ) { + err =dev_set_promiscuity (port_dev,1 ); +if (err) + goto err_set_slave_promisc; + } + +/* set allmulti level to new slave */ +if (team->dev->flags &IFF_ALLMULTI ) { + err =dev_set_allmulti (port_dev,1 ); +if (err) { +if (team->dev->flags &IFF_PROMISC ) +dev_set_promiscuity (port_dev,-1 ); + goto err_set_slave_promisc; + } + } +netif_addr_lock_bh (dev);dev_uc_sync_multiple (port_dev, dev);dev_mc_sync_multiple (port_dev, dev);@@ -1262,6 +1279,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev,return 0 ; +err_set_slave_promisc: +__team_option_inst_del_port (team, port); + err_option_port_add:team_upper_dev_unlink (team, port);Signature · 1 line
2.19.2
PATCH v2 1/1 team: set slave to promisc if team is already in promisc mode
In reply to Hangbin LiuAfter adding a team interface to bridge, the team interface will enter promisc mode. Then if we add a new slave to team0, the slave will keep promisc off. Fix it by setting slave to promisc on if team master is already in promisc mode, also do the same for allmulti.
v2: add promisc and allmulti checking when delete ports
--- drivers/net/team/team.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/net/team/team.c +26 -0
@@ -1246,6 +1246,23 @@ static int team_port_add(struct team *team, struct net_device *port_dev, goto err_option_port_add; } +/* set promiscuity level to new slave */ +if (dev->flags &IFF_PROMISC ) { + err =dev_set_promiscuity (port_dev,1 ); +if (err) + goto err_set_slave_promisc; + } + +/* set allmulti level to new slave */ +if (dev->flags &IFF_ALLMULTI ) { + err =dev_set_allmulti (port_dev,1 ); +if (err) { +if (dev->flags &IFF_PROMISC ) +dev_set_promiscuity (port_dev,-1 ); + goto err_set_slave_promisc; + } + } +netif_addr_lock_bh (dev);dev_uc_sync_multiple (port_dev, dev);dev_mc_sync_multiple (port_dev, dev);
@@ -1262,6 +1279,9 @@ static int team_port_add(struct team *team, struct net_device *port_dev,return 0 ; +err_set_slave_promisc: +__team_option_inst_del_port (team, port); + err_option_port_add:team_upper_dev_unlink (team, port);
@@ -1307,6 +1327,12 @@ static int team_port_del(struct team *team, struct net_device *port_dev)team_port_disable (team, port);list_del_rcu (&port->list); + +if (dev->flags &IFF_PROMISC ) +dev_set_promiscuity (port_dev,-1 ); +if (dev->flags &IFF_ALLMULTI ) +dev_set_allmulti (port_dev,-1 ); +team_upper_dev_unlink (team, port);netdev_rx_handler_unregister (port_dev);team_port_disable_netpoll (port);
Signature · 1 line
2.19.2
David Miller
maintainerFrom: Hangbin Liu <[email protected]>
Date: Mon, 8 Apr 2019 16:45:17 +0800
Quoted 9 lines
After adding a team interface to bridge, the team interface will enter promisc mode. Then if we add a new slave to team0, the slave will keep promisc off. Fix it by setting slave to promisc on if team master is already in promisc mode, also do the same for allmulti.
v2: add promisc and allmulti checking when delete ports
Fixes 3d249d4ca7d0 ("net: introduce ethernet teaming device")Signed-off-by Hangbin Liu <[email protected]>
Applied and queued up for -stable.