Fix up dev flags when add P2P down link
Subsystems (4)
v3 cover Fix up dev flags when add P2P down link
When adding p2p interfaces to bond/team. The POINTOPOINT, NOARP flags are not inherit to up devices. Which will trigger IPv6 DAD. Since there is no ethernet MAC address for P2P devices. This will cause unexpected DAD failures.
v3: add function team_ether_setup to reset team back to ethernet. Thanks Paolo
v2: Add the missed {} after if checking. Thanks Nikolay.
Hangbin Liu (2):
bonding: reset bond's flags when down link is P2P device
team: reset team's flags when down link is P2P device
drivers/net/bonding/bond_main.c | 5 +++++ drivers/net/team/team.c | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)
Signature · 1 line
2.38.1
PATCH v3 1/2 bonding: reset bond's flags when down link is P2P device
When adding a point to point downlink to the bond, we neglected to reset the bond's flags, which were still using flags like BROADCAST and MULTICAST. Consequently, this would initiate ARP/DAD for P2P downlink interfaces, such as when adding a GRE device to the bonding.
To address this issue, let's reset the bond's flags for P2P interfaces.
Before fix:
7: gre0@NONE: <POINTOPOINT,NOARP,SLAVE,UP,LOWER_UP> mtu 1500 qdisc noqueue master bond0 state UNKNOWN group default qlen 1000
link/gre6 2006:70:10::1 peer 2006:70:10::2 permaddr 167f:18:f188::
8: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
link/gre6 2006:70:10::1 brd 2006:70:10::2
inet6 fe80::200:ff:fe00:0/64 scope link
valid_lft forever preferred_lft foreverAfter fix:
7: gre0@NONE: <POINTOPOINT,NOARP,SLAVE,UP,LOWER_UP> mtu 1500 qdisc noqueue master bond2 state UNKNOWN group default qlen 1000
link/gre6 2006:70:10::1 peer 2006:70:10::2 permaddr c29e:557a:e9d9::
8: bond0: <POINTOPOINT,NOARP,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
link/gre6 2006:70:10::1 peer 2006:70:10::2
inet6 fe80::1/64 scope link
valid_lft forever preferred_lft forever---
v3: no change.
v2: Add the missed {} after if checking.
--- drivers/net/bonding/bond_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/bonding/bond_main.c +5 -0
@@ -1508,6 +1508,11 @@ static void bond_setup_by_slave(struct net_device *bond_dev,memcpy (bond_dev->broadcast, slave_dev->broadcast, slave_dev->addr_len); + +if (slave_dev->flags &IFF_POINTOPOINT ) { + bond_dev->flags &= ~(IFF_BROADCAST |IFF_MULTICAST ); + bond_dev->flags |= (IFF_POINTOPOINT |IFF_NOARP ); + } }/* On bonding slaves other than the currently active slave, suppress
Signature · 1 line
2.38.1
PATCH v3 2/2 team: reset team's flags when down link is P2P device
In reply to Hangbin LiuWhen adding a point to point downlink to team device, we neglected to reset the team's flags, which were still using flags like BROADCAST and MULTICAST. Consequently, this would initiate ARP/DAD for P2P downlink interfaces, such as when adding a GRE device to team device. Fix this by remove multicast/broadcast flags and add p2p and noarp flags.
After removing the none ethernet interface and adding an ethernet interface to team, we need to reset team interface flags and hw address back. Unlike bonding interface, team do not need restore IFF_MASTER, IFF_SLAVE flags.
---
v3: add function team_ether_setup to reset team back to ethernet.
v2: Add the missed {} after if checking.
--- drivers/net/team/team.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
drivers/net/team/team.c +22 -1
@@ -2135,6 +2135,20 @@ static void team_setup_by_port(struct net_device *dev, dev->mtu = port_dev->mtu;memcpy (dev->broadcast, port_dev->broadcast, port_dev->addr_len);eth_hw_addr_inherit (dev, port_dev); + +if (port_dev->flags &IFF_POINTOPOINT ) { + dev->flags &= ~(IFF_BROADCAST |IFF_MULTICAST ); + dev->flags |= (IFF_POINTOPOINT |IFF_NOARP ); + } +} + +static void team_ether_setup (struct net_device *dev) +{ +unsigned int flags = dev->flags &IFF_UP ; + +ether_setup (dev); + dev->flags |= flags; + dev->priv_flags &= ~IFF_TX_SKB_SHARING ; } static int team_dev_type_check_change(struct net_device *dev,
@@ -2158,7 +2172,14 @@ static int team_dev_type_check_change(struct net_device *dev, }dev_uc_flush (dev);dev_mc_flush (dev); -team_setup_by_port (dev, port_dev); + +if (port_dev->type !=ARPHRD_ETHER ) { +team_setup_by_port (dev, port_dev); + }else { +team_ether_setup (dev); +eth_hw_addr_inherit (dev, port_dev); + } +call_netdevice_notifiers (NETDEV_POST_TYPE_CHANGE , dev);return 0 ; }
Signature · 1 line
2.38.1
Paolo Abeni
maintainerRe: [PATCHv3 net 2/2] team: reset team's flags when down link is P2P device
Quoted 33 lines · Hangbin Liu
When adding a point to point downlink to team device, we neglected to reset the team's flags, which were still using flags like BROADCAST and MULTICAST. Consequently, this would initiate ARP/DAD for P2P downlink interfaces, such as when adding a GRE device to team device. Fix this by remove multicast/broadcast flags and add p2p and noarp flags.
After removing the none ethernet interface and adding an ethernet interface to team, we need to reset team interface flags and hw address back. Unlike bonding interface, team do not need restore
IFF_MASTER,IFF_SLAVEflags.Reported-by Liang Li <[email protected]>Fixes 1d76efe1577b ("team: add support for non-ethernet devices")Signed-off-by Hangbin Liu <[email protected]>---
v3: add functionteam_ether_setupto reset team back to ethernet.
v2: Add the missed {} after if checking.--- drivers/net/team/team.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)drivers/net/team/team.c +4
-0@@ -2135,6 +2135,20 @@ static void team_setup_by_port(struct net_device *dev, dev->mtu = port_dev->mtu;memcpy (dev->broadcast, port_dev->broadcast, port_dev->addr_len);eth_hw_addr_inherit (dev, port_dev); + +if (port_dev->flags &IFF_POINTOPOINT ) { + dev->flags &= ~(IFF_BROADCAST |IFF_MULTICAST ); + dev->flags |= (IFF_POINTOPOINT |IFF_NOARP );
drivers/net/team/team.c static void team_setup_by_port(struct net_device *dev, · line 2151
Quoted 10 lines
drivers/net/team/team.c +10
-0+ } +} + +static void team_ether_setup (struct net_device *dev) +{ +unsigned int flags = dev->flags &IFF_UP ; + +ether_setup (dev); + dev->flags |= flags; + dev->priv_flags &= ~IFF_TX_SKB_SHARING ;
I think we can't do the above. e.g. ether_setup() sets dev->mtu to ethernet default, while prior to this patch dev inherited mtu from the slaved device. The change may affect the user-space in bad ways.
I think we just need an 'else' branch in the point2point check above, restoring the bcast/mcast flags as needed.
Yes, we have slightly different behaviours between bond and team, but we can't change that easily.
Cheers,
Paolo
Re: [PATCHv3 net 2/2] team: reset team's flags when down link is P2P device
Quoted 11 lines · Paolo Abeni
drivers/net/team/team.c static void team_setup_by_port(struct net_device *dev, · line 2151
Quoted 7 lines
drivers/net/team/team.c +7
-0+static void team_ether_setup (struct net_device *dev) +{ +unsigned int flags = dev->flags &IFF_UP ; + +ether_setup (dev); + dev->flags |= flags; + dev->priv_flags &= ~IFF_TX_SKB_SHARING ;I think we can't do the above. e.g.
ether_setup()setsdev->mtuto ethernet default, while prior to this patch dev inherited mtu from the slaved device. The change may affect the user-space in bad ways.
Hi Paolo,
I don't see the reason why we should inherited a none ethernet dev's mtu to an ethernet dev (i.e. add a none ethernet dev to team, then delete it and re-add a ethernet dev to team). I think the dev type has changed, so the mtu should also be updated.
BTW, after adding the port, team will also set port's mtu to team's mtu.
Quoted 3 lines
I think we just need an 'else' branch in the point2point check above, restoring the bcast/mcast flags as needed.
Reset the flags is not enough. All the dev header_ops, type, etc are all need to be reset back, that's why we need to call ether_setup().
Thanks
Hangbin
Paolo Abeni
maintainerRe: [PATCHv3 net 2/2] team: reset team's flags when down link is P2P device
Quoted 13 lines · Hangbin Liu
Quoted 11 lines · Paolo Abeni
Review
Quoted 7 lines
(quoted diff) +7
-0+static void team_ether_setup(struct net_device *dev) +{ + unsigned int flags = dev->flags & IFF_UP; + + ether_setup(dev); + dev->flags |= flags; + dev->priv_flags &= ~IFF_TX_SKB_SHARING;I think we can't do the above. e.g.
ether_setup()setsdev->mtuto ethernet default, while prior to this patch dev inherited mtu from the slaved device. The change may affect the user-space in bad ways.
Quoted 8 lines
Hi Paolo,
I don't see the reason why we should inherited a none ethernet dev's mtu to an ethernet dev (i.e. add a none ethernet dev to team, then delete it and re-add a ethernet dev to team). I think the dev type has changed, so the mtu should also be updated.
BTW, after adding the port, team will also set port's mtu to team's mtu.
Let suppose the user has set the lower dev MTU to some N (< 1500) for whatever reason (e.g. lower is a vxlan tunnel). After this change, team will use mtu = 1500 breaking the connectivity in such scenario/
Quoted 5 lines
Quoted 2 lines
I think we just need an 'else' branch in the point2point check above, restoring the bcast/mcast flags as needed.
Reset the flags is not enough. All the dev
header_ops, type, etc are all need to be reset back, that's why we need to callether_setup().
As far as I can see team_setup_by_port() takes care of that, inheriting such infor from the current slave. What I mean is something alike the following.
Cheers,
Paolo
---
drivers/net/team/team.c +9 -0
@@ -2135,6 +2135,15 @@ static void team_setup_by_port(struct net_device *dev, dev->mtu = port_dev->mtu;memcpy (dev->broadcast, port_dev->broadcast, port_dev->addr_len);eth_hw_addr_inherit (dev, port_dev); + +if (port_dev->flags &IFF_POINTOPOINT ) { + dev->flags &= ~(IFF_BROADCAST |IFF_MULTICAST ); + dev->flags |= (IFF_POINTOPOINT |IFF_NOARP ); + }else if ((port_dev->flags & (IFF_BROADCAST |IFF_MULTICAST )) == + (IFF_BROADCAST |IFF_MULTICAST )) { + dev->flags |=IFF_BROADCAST |IFF_MULTICAST ; + dev->flags &= ~(IFF_POINTOPOINT | IFF_NOARP) + } } static int team_dev_type_check_change(struct net_device *dev,
Re: [PATCHv3 net 2/2] team: reset team's flags when down link is P2P device
Quoted 10 lines · Paolo Abeni
Quoted 6 lines
I don't see the reason why we should inherited a none ethernet dev's mtu to an ethernet dev (i.e. add a none ethernet dev to team, then delete it and re-add a ethernet dev to team). I think the dev type has changed, so the mtu should also be updated.
BTW, after adding the port, team will also set port's mtu to team's mtu.
Let suppose the user has set the lower dev MTU to some N (< 1500) for whatever reason (e.g. lower is a vxlan tunnel). After this change, team will use mtu = 1500 breaking the connectivity in such scenario/
This looks like a team bug here. Team will not inherited port mtu if they are some dev type. This would cause adding vxlan to team failed.
But if we change the team dev type and then adding vxlan. Team will reset the mtu and add vxlan success.
With my patch, if we reset team to 1500, the later adding will failed. So, as consistency, you suggestion is right.
Quoted 17 lines
As far as I can see
team_setup_by_port()takes care of that, inheriting such infor from the current slave. What I mean is something alike the following.Cheers,
Paolo
---
drivers/net/team/team.c +0
-0@@ -2135,6 +2135,15 @@ static void team_setup_by_port(struct net_device *dev, dev->mtu = port_dev->mtu;memcpy (dev->broadcast, port_dev->broadcast, port_dev->addr_len);eth_hw_addr_inherit (dev, port_dev);
drivers/net/team/team.c static void team_setup_by_port(struct net_device *dev, · line 2147
Quoted 10 lines
drivers/net/team/team.c +9
-0+ +if (port_dev->flags &IFF_POINTOPOINT ) { + dev->flags &= ~(IFF_BROADCAST |IFF_MULTICAST ); + dev->flags |= (IFF_POINTOPOINT |IFF_NOARP ); + }else if ((port_dev->flags & (IFF_BROADCAST |IFF_MULTICAST )) == + (IFF_BROADCAST |IFF_MULTICAST )) { + dev->flags |=IFF_BROADCAST |IFF_MULTICAST ; + dev->flags &= ~(IFF_POINTOPOINT | IFF_NOARP) + } }
Thanks, this looks good to me. I will update the patch.
Hangbin