Commit 60bcfede authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Apply user-defined multipath hash seed 



When Spectrum machines compute hash for the purposes of ECMP routing, they
use a seed specified through RECR_v2 (Router ECMP Configuration Register).
Up until now mlxsw computed the seed by hashing the machine's base MAC.
Now that we can optionally have a user-provided seed, use that if possible.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Link: https://lore.kernel.org/r/20240607151357.421181-4-petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4ee2a8ca

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

+5 −1
Original line number Diff line number Diff line
@@ -11450,12 +11450,16 @@ static int mlxsw_sp_mp_hash_init(struct mlxsw_sp *mlxsw_sp) 
{

	bool old_inc_parsing_depth, new_inc_parsing_depth;

	struct mlxsw_sp_mp_hash_config config = {};

	struct net *net = mlxsw_sp_net(mlxsw_sp);

	char recr2_pl[MLXSW_REG_RECR2_LEN];

	unsigned long bit;

	u32 seed;

	int err;



	seed = READ_ONCE(net->ipv4.sysctl_fib_multipath_hash_seed).user_seed;

	if (!seed)

		seed = jhash(mlxsw_sp->base_mac, sizeof(mlxsw_sp->base_mac), 0);



	mlxsw_reg_recr2_pack(recr2_pl, seed);

	mlxsw_sp_mp4_hash_init(mlxsw_sp, &config);

	mlxsw_sp_mp6_hash_init(mlxsw_sp, &config);