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

Commit 1aff0c34 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Couple-of-fixes' 



Jiri Pirko says:

====================
mlxsw: Couple of fixes

Ido says:

The first patch prevents us from warning about valid situations that can
happen due to the fact that some operations in switchdev are deferred.

Second patch fixes a long standing problem in which we didn't correctly
free resources upon module removal, resulting in a memory leak.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 337f1b07 852cfeed

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

+24 −13
Original line number Diff line number Diff line
@@ -626,8 +626,8 @@ static int mlxsw_sp_port_attr_br_flags_set(struct mlxsw_sp_port *mlxsw_sp_port, 


	bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp_port->mlxsw_sp->bridge,

						orig_dev);

	if (WARN_ON(!bridge_port))

		return -EINVAL;

	if (!bridge_port)

		return 0;



	err = mlxsw_sp_bridge_port_flood_table_set(mlxsw_sp_port, bridge_port,

						   MLXSW_SP_FLOOD_TYPE_UC,
@@ -711,8 +711,8 @@ static int mlxsw_sp_port_attr_mc_router_set(struct mlxsw_sp_port *mlxsw_sp_port, 


	bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp_port->mlxsw_sp->bridge,

						orig_dev);

	if (WARN_ON(!bridge_port))

		return -EINVAL;

	if (!bridge_port)

		return 0;



	if (!bridge_port->bridge_device->multicast_enabled)

		return 0;
@@ -1283,15 +1283,15 @@ static int mlxsw_sp_port_mdb_add(struct mlxsw_sp_port *mlxsw_sp_port, 
		return 0;



	bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp->bridge, orig_dev);

	if (WARN_ON(!bridge_port))

		return -EINVAL;

	if (!bridge_port)

		return 0;



	bridge_device = bridge_port->bridge_device;

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_bridge(mlxsw_sp_port,

							       bridge_device,

							       mdb->vid);

	if (WARN_ON(!mlxsw_sp_port_vlan))

		return -EINVAL;

	if (!mlxsw_sp_port_vlan)

		return 0;



	fid_index = mlxsw_sp_fid_index(mlxsw_sp_port_vlan->fid);
@@ -1407,15 +1407,15 @@ static int mlxsw_sp_port_mdb_del(struct mlxsw_sp_port *mlxsw_sp_port, 
	int err = 0;



	bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp->bridge, orig_dev);

	if (WARN_ON(!bridge_port))

		return -EINVAL;

	if (!bridge_port)

		return 0;



	bridge_device = bridge_port->bridge_device;

	mlxsw_sp_port_vlan = mlxsw_sp_port_vlan_find_by_bridge(mlxsw_sp_port,

							       bridge_device,

							       mdb->vid);

	if (WARN_ON(!mlxsw_sp_port_vlan))

		return -EINVAL;

	if (!mlxsw_sp_port_vlan)

		return 0;



	fid_index = mlxsw_sp_fid_index(mlxsw_sp_port_vlan->fid);
@@ -1974,6 +1974,17 @@ static void mlxsw_sp_fdb_fini(struct mlxsw_sp *mlxsw_sp) 


}



static void mlxsw_sp_mids_fini(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_mid *mid, *tmp;



	list_for_each_entry_safe(mid, tmp, &mlxsw_sp->bridge->mids_list, list) {

		list_del(&mid->list);

		clear_bit(mid->mid, mlxsw_sp->bridge->mids_bitmap);

		kfree(mid);

	}

}



int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp)

{

	struct mlxsw_sp_bridge *bridge;
@@ -1996,7 +2007,7 @@ int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp) 
void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp)

{

	mlxsw_sp_fdb_fini(mlxsw_sp);

	WARN_ON(!list_empty(&mlxsw_sp->bridge->mids_list));

	mlxsw_sp_mids_fini(mlxsw_sp);

	WARN_ON(!list_empty(&mlxsw_sp->bridge->bridges_list));

	kfree(mlxsw_sp->bridge);

}