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

Commit 1d3398fa authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: Modify TIRs hash only when it's needed 



We don't need to modify our TIRs unless the user requested a change in
the hash function/key, for example when changing indirection only.

Tested:
 # Modify TIRs hash is needed
ethtool -X ethX hkey  <new key>
ethtool -X ethX hfunc <new func>

 # Modify TIRs hash is not needed
ethtool -X ethX equal <new indirection table>

All cases are verified with TCP Multi-Stream traffic over IPv4 & IPv6.

Fixes: bdfc028d ("net/mlx5e: Fix ethtool RX hash func configuration change")
Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 3e621b19

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+13 −5
Original line number Diff line number Diff line
@@ -996,6 +996,7 @@ static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
{

	struct mlx5e_priv *priv = netdev_priv(dev);

	int inlen = MLX5_ST_SZ_BYTES(modify_tir_in);

	bool hash_changed = false;

	void *in;



	if ((hfunc != ETH_RSS_HASH_NO_CHANGE) &&
@@ -1017,13 +1018,20 @@ static int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
		mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, 0);

	}



	if (key)

	if (hfunc != ETH_RSS_HASH_NO_CHANGE &&

	    hfunc != priv->params.rss_hfunc) {

		priv->params.rss_hfunc = hfunc;

		hash_changed = true;

	}



	if (key) {

		memcpy(priv->params.toeplitz_hash_key, key,

		       sizeof(priv->params.toeplitz_hash_key));

		hash_changed = hash_changed ||

			       priv->params.rss_hfunc == ETH_RSS_HASH_TOP;

	}



	if (hfunc != ETH_RSS_HASH_NO_CHANGE)

		priv->params.rss_hfunc = hfunc;



	if (hash_changed)

		mlx5e_modify_tirs_hash(priv, in, inlen);



	mutex_unlock(&priv->state_lock);