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

Commit 0a8a1bf1 authored by Shalom Toledo's avatar Shalom Toledo Committed by David S. Miller
Browse files

mlxsw: spectrum_switchdev: Check success of FDB add operation 



Until now, we assumed that in case of error when adding FDB entries, the
write operation will fail, but this is not the case. Instead, we need to
check that the number of entries reported in the response is equal to
the number of entries specified in the request.

Fixes: 56ade8fe ("mlxsw: spectrum: Add initial support for Spectrum ASIC")
Reported-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarShalom Toledo <shalomt@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19f6484f

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

+27 −2
Original line number Diff line number Diff line
@@ -1203,6 +1203,7 @@ static int __mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
				     bool dynamic)

{

	char *sfd_pl;

	u8 num_rec;

	int err;



	sfd_pl = kmalloc(MLXSW_REG_SFD_LEN, GFP_KERNEL);
@@ -1212,9 +1213,16 @@ static int __mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port, 
	mlxsw_reg_sfd_pack(sfd_pl, mlxsw_sp_sfd_op(adding), 0);

	mlxsw_reg_sfd_uc_pack(sfd_pl, 0, mlxsw_sp_sfd_rec_policy(dynamic),

			      mac, fid, action, local_port);

	num_rec = mlxsw_reg_sfd_num_rec_get(sfd_pl);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfd), sfd_pl);

	kfree(sfd_pl);

	if (err)

		goto out;



	if (num_rec != mlxsw_reg_sfd_num_rec_get(sfd_pl))

		err = -EBUSY;



out:

	kfree(sfd_pl);

	return err;

}
@@ -1239,6 +1247,7 @@ static int mlxsw_sp_port_fdb_uc_lag_op(struct mlxsw_sp *mlxsw_sp, u16 lag_id, 
				       bool adding, bool dynamic)

{

	char *sfd_pl;

	u8 num_rec;

	int err;



	sfd_pl = kmalloc(MLXSW_REG_SFD_LEN, GFP_KERNEL);
@@ -1249,9 +1258,16 @@ static int mlxsw_sp_port_fdb_uc_lag_op(struct mlxsw_sp *mlxsw_sp, u16 lag_id, 
	mlxsw_reg_sfd_uc_lag_pack(sfd_pl, 0, mlxsw_sp_sfd_rec_policy(dynamic),

				  mac, fid, MLXSW_REG_SFD_REC_ACTION_NOP,

				  lag_vid, lag_id);

	num_rec = mlxsw_reg_sfd_num_rec_get(sfd_pl);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfd), sfd_pl);

	kfree(sfd_pl);

	if (err)

		goto out;



	if (num_rec != mlxsw_reg_sfd_num_rec_get(sfd_pl))

		err = -EBUSY;



out:

	kfree(sfd_pl);

	return err;

}
@@ -1296,6 +1312,7 @@ static int mlxsw_sp_port_mdb_op(struct mlxsw_sp *mlxsw_sp, const char *addr, 
				u16 fid, u16 mid_idx, bool adding)

{

	char *sfd_pl;

	u8 num_rec;

	int err;



	sfd_pl = kmalloc(MLXSW_REG_SFD_LEN, GFP_KERNEL);
@@ -1305,7 +1322,15 @@ static int mlxsw_sp_port_mdb_op(struct mlxsw_sp *mlxsw_sp, const char *addr, 
	mlxsw_reg_sfd_pack(sfd_pl, mlxsw_sp_sfd_op(adding), 0);

	mlxsw_reg_sfd_mc_pack(sfd_pl, 0, addr, fid,

			      MLXSW_REG_SFD_REC_ACTION_NOP, mid_idx);

	num_rec = mlxsw_reg_sfd_num_rec_get(sfd_pl);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfd), sfd_pl);

	if (err)

		goto out;



	if (num_rec != mlxsw_reg_sfd_num_rec_get(sfd_pl))

		err = -EBUSY;



out:

	kfree(sfd_pl);

	return err;

}