mlxsw: spectrum_switchdev: Check notification relevance based on upper device

[ Upstream commit 5050f6ae253ad1307af3486c26fc4f94287078b7 ]

VxLAN FDB updates are sent with the VxLAN device which is not our upper
and will therefore be ignored by current code.

Solve this by checking whether the upper device (bridge) is our upper.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Petr Machata <petrm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index 8a1788108f52aa1fa7636768bc7266833bf430df..698de51b3fef0489fbdb059548201dbf86441a65 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -1939,8 +1939,15 @@ static int mlxsw_sp_switchdev_event(struct notifier_block *unused,
        struct net_device *dev = switchdev_notifier_info_to_dev(ptr);
        struct mlxsw_sp_switchdev_event_work *switchdev_work;
        struct switchdev_notifier_fdb_info *fdb_info = ptr;
+       struct net_device *br_dev;
 
-       if (!mlxsw_sp_port_dev_lower_find_rcu(dev))
+       /* Tunnel devices are not our uppers, so check their master instead */
+       br_dev = netdev_master_upper_dev_get_rcu(dev);
+       if (!br_dev)
+               return NOTIFY_DONE;
+       if (!netif_is_bridge_master(br_dev))
+               return NOTIFY_DONE;
+       if (!mlxsw_sp_port_dev_lower_find_rcu(br_dev))
                return NOTIFY_DONE;
 
        switchdev_work = kzalloc(sizeof(*switchdev_work), GFP_ATOMIC);