Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 183f9ae8 authored by Ido Schimmel's avatar Ido Schimmel Committed by Greg Kroah-Hartman
Browse files

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: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarPetr Machata <petrm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 16ad1c43

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+8 −1
Original line number Diff line number Diff line
@@ -2324,8 +2324,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);