mlxsw: spectrum_switchdev: Release multicast groups during fini

idosch · davem330 · commit 852cfeed0ebe · 2017-08-04T11:15:07.000-07:00
Each multicast group (MID) stores a bitmap of ports to which a packet should be forwarded to in case an MDB entry associated with the MID is hit. Since the initial introduction of IGMP snooping in commit 3a49b4f ("mlxsw: Adding layer 2 multicast support") the driver didn't correctly free these multicast groups upon ungraceful situations such as the removal of the upper bridge device or module removal. The correct way to fix this is to associate each MID with the bridge ports member in it and then drop the reference in case the bridge port is destroyed, but this will result in a lot more code and will be fixed in net-next. For now, upon module removal, traverse the MID list and release each one. Fixes: 3a49b4f ("mlxsw: Adding layer 2 multicast support") Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -1974,6 +1974,17 @@ static void mlxsw_sp_fdb_fini(struct mlxsw_sp *mlxsw_sp)`
`1974`	`1974`
`1975`	`1975`	`}`
`1976`	`1976`
	`1977`	`+static void mlxsw_sp_mids_fini(struct mlxsw_sp *mlxsw_sp)`
	`1978`	`+{`
	`1979`	`+ struct mlxsw_sp_mid mid, tmp;`
	`1980`	`+`
	`1981`	`+ list_for_each_entry_safe(mid, tmp, &mlxsw_sp->bridge->mids_list, list) {`
	`1982`	`+ list_del(&mid->list);`
	`1983`	`+ clear_bit(mid->mid, mlxsw_sp->bridge->mids_bitmap);`
	`1984`	`+ kfree(mid);`
	`1985`	`+ }`
	`1986`	`+}`
	`1987`	`+`
`1977`	`1988`	`int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp)`
`1978`	`1989`	`{`
`1979`	`1990`	`struct mlxsw_sp_bridge *bridge;`
`@@ -1996,7 +2007,7 @@ int mlxsw_sp_switchdev_init(struct mlxsw_sp *mlxsw_sp)`
`1996`	`2007`	`void mlxsw_sp_switchdev_fini(struct mlxsw_sp *mlxsw_sp)`
`1997`	`2008`	`{`
`1998`	`2009`	`mlxsw_sp_fdb_fini(mlxsw_sp);`
`1999`		`- WARN_ON(!list_empty(&mlxsw_sp->bridge->mids_list));`
	`2010`	`+ mlxsw_sp_mids_fini(mlxsw_sp);`
`2000`	`2011`	`WARN_ON(!list_empty(&mlxsw_sp->bridge->bridges_list));`
`2001`	`2012`	`kfree(mlxsw_sp->bridge);`
`2002`	`2013`	`}`