Skip to content

Commit 60021f6

Browse files
pmachataNipaLocal
authored andcommitted
vxlan: Join / leave MC group after remote changes
When a vxlan netdevice is brought up, if its default remote is a multicast address, the device joins the indicated group. Therefore when the multicast remote address changes, the device should leave the current group and subscribe to the new one. Similarly when the interface used for endpoint communication is changed in a situation when multicast remote is configured. This is currently not done. Both vxlan_igmp_join() and vxlan_igmp_leave() can however fail. So it is possible that with such fix, the netdevice will end up in an inconsistent situation where the old group is not joined anymore, but joining the new group fails. Should we join the new group first, and leave the old one second, we might end up in the opposite situation, where both groups are joined. Undoing any of this during rollback is going to be similarly problematic. One solution would be to just forbid the change when the netdevice is up. However in vnifilter mode, changing the group address is allowed, and these problems are simply ignored (see vxlan_vni_update_group()): # ip link add name br up type bridge vlan_filtering 1 # ip link add vx1 up master br type vxlan external vnifilter local 192.0.2.1 dev lo dstport 4789 # bridge vni add dev vx1 vni 200 group 224.0.0.1 # tcpdump -i lo & # bridge vni add dev vx1 vni 200 group 224.0.0.2 18:55:46.523438 IP 0.0.0.0 > 224.0.0.22: igmp v3 report, 1 group record(s) 18:55:46.943447 IP 0.0.0.0 > 224.0.0.22: igmp v3 report, 1 group record(s) # bridge vni dev vni group/remote vx1 200 224.0.0.2 Having two different modes of operation for conceptually the same interface is silly, so in this patch, just do what the vnifilter code does and deal with the errors by crossing fingers real hard. The vnifilter code leaves old before joining new, and in case of join / leave failures does not roll back the configuration changes that have already been applied, but bails out of joining if it could not leave. Do the same here: leave before join, apply changes unconditionally and do not attempt to join if we couldn't leave. Signed-off-by: Petr Machata <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent 8bab807 commit 60021f6

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

drivers/net/vxlan/vxlan_core.c

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4419,6 +4419,7 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
44194419
struct netlink_ext_ack *extack)
44204420
{
44214421
struct vxlan_dev *vxlan = netdev_priv(dev);
4422+
bool rem_ip_changed, change_igmp;
44224423
struct net_device *lowerdev;
44234424
struct vxlan_config conf;
44244425
struct vxlan_rdst *dst;
@@ -4442,8 +4443,13 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
44424443
if (err)
44434444
return err;
44444445

4446+
rem_ip_changed = !vxlan_addr_equal(&conf.remote_ip, &dst->remote_ip);
4447+
change_igmp = vxlan->dev->flags & IFF_UP &&
4448+
(rem_ip_changed ||
4449+
dst->remote_ifindex != conf.remote_ifindex);
4450+
44454451
/* handle default dst entry */
4446-
if (!vxlan_addr_equal(&conf.remote_ip, &dst->remote_ip)) {
4452+
if (rem_ip_changed) {
44474453
u32 hash_index = fdb_head_index(vxlan, all_zeros_mac, conf.vni);
44484454

44494455
spin_lock_bh(&vxlan->hash_lock[hash_index]);
@@ -4487,14 +4493,22 @@ static int vxlan_changelink(struct net_device *dev, struct nlattr *tb[],
44874493
}
44884494
}
44894495

4496+
if (change_igmp && vxlan_addr_multicast(&dst->remote_ip))
4497+
err = vxlan_multicast_leave(vxlan);
4498+
44904499
if (conf.age_interval != vxlan->cfg.age_interval)
44914500
mod_timer(&vxlan->age_timer, jiffies);
44924501

44934502
netdev_adjacent_change_commit(dst->remote_dev, lowerdev, dev);
44944503
if (lowerdev && lowerdev != dst->remote_dev)
44954504
dst->remote_dev = lowerdev;
44964505
vxlan_config_apply(dev, &conf, lowerdev, vxlan->net, true);
4497-
return 0;
4506+
4507+
if (!err && change_igmp &&
4508+
vxlan_addr_multicast(&dst->remote_ip))
4509+
err = vxlan_multicast_join(vxlan);
4510+
4511+
return err;
44984512
}
44994513

45004514
static void vxlan_dellink(struct net_device *dev, struct list_head *head)

0 commit comments

Comments
 (0)