net: dsa: replay the local bridge FDB entries pointing to the bridge dev too

When we join a bridge that already has some local addresses pointing to
itself, we do not get those notifications. Similarly, when we leave that
bridge, we do not get notifications for the deletion of those entries.
The only switchdev notifications we get are those of entries added while
the DSA port is enslaved to the bridge.

This makes use cases such as the following work properly (with the
number of additions and removals properly balanced):

ip link add br0 type bridge
ip link add br1 type bridge
ip link set br0 address 00:01:02:03:04:05
ip link set br1 address 00:01:02:03:04:05
ip link set swp0 up
ip link set swp1 up
ip link set swp0 master br0
ip link set swp1 master br1
ip link set br0 up
ip link set br1 up
ip link del br1 # 00:01:02:03:04:05 still installed on the CPU port
ip link del br0 # 00:01:02:03:04:05 finally removed from the CPU port

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 778b0dc2bb39bb8b0ac6b3888ac1b0d0eff69933..28b45b7e66df1fdcb4e7a510f58f5e68c91a8afd 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -199,11 +199,17 @@ static int dsa_port_switchdev_sync(struct dsa_port *dp,
        if (err && err != -EOPNOTSUPP)
                return err;
 
+       /* Forwarding and termination FDB entries on the port */
        err = br_fdb_replay(br, brport_dev, dp, true,
                            &dsa_slave_switchdev_notifier);
        if (err && err != -EOPNOTSUPP)
                return err;
 
+       /* Termination FDB entries on the bridge itself */
+       err = br_fdb_replay(br, br, dp, true, &dsa_slave_switchdev_notifier);
+       if (err && err != -EOPNOTSUPP)
+               return err;
+
        err = br_vlan_replay(br, brport_dev, dp, true,
                             &dsa_slave_switchdev_blocking_notifier, extack);
        if (err && err != -EOPNOTSUPP)
@@ -225,11 +231,17 @@ static int dsa_port_switchdev_unsync_objs(struct dsa_port *dp,
        if (err && err != -EOPNOTSUPP)
                return err;
 
+       /* Forwarding and termination FDB entries on the port */
        err = br_fdb_replay(br, brport_dev, dp, false,
                            &dsa_slave_switchdev_notifier);
        if (err && err != -EOPNOTSUPP)
                return err;
 
+       /* Termination FDB entries on the bridge itself */
+       err = br_fdb_replay(br, br, dp, false, &dsa_slave_switchdev_notifier);
+       if (err && err != -EOPNOTSUPP)
+               return err;
+
        err = br_vlan_replay(br, brport_dev, dp, false,
                             &dsa_slave_switchdev_blocking_notifier, extack);
        if (err && err != -EOPNOTSUPP)