Commit 5f1572e6 authored by Aya Levin's avatar Aya Levin Committed by Saeed Mahameed
Browse files

net/mlx5e: Fix ethtool hfunc configuration change 



Changing RX hash function requires rearranging of RQT internal indexes,
the user isn't exposed to such changes and these changes do not affect
the user configured indirection table. Rebuild RQ table on hfunc change.

Fixes: bdfc028d ("net/mlx5e: Fix ethtool RX hash func configuration change")
Signed-off-by: default avatarAya Levin <ayal@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 36d45fb9

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

+22 −19
Original line number Diff line number Diff line
@@ -1173,7 +1173,8 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5e_rss_params *rss = &priv->rss_params;

	int inlen = MLX5_ST_SZ_BYTES(modify_tir_in);

	bool hash_changed = false;

	bool refresh_tirs = false;

	bool refresh_rqt = false;

	void *in;



	if ((hfunc != ETH_RSS_HASH_NO_CHANGE) &&
@@ -1189,15 +1190,23 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 


	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != rss->hfunc) {

		rss->hfunc = hfunc;

		hash_changed = true;

		refresh_rqt = true;

		refresh_tirs = true;

	}



	if (indir) {

		memcpy(rss->indirection_rqt, indir,

		       sizeof(rss->indirection_rqt));

		refresh_rqt = true;

	}



		if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {

			u32 rqtn = priv->indir_rqt.rqtn;

	if (key) {

		memcpy(rss->toeplitz_hash_key, key,

		       sizeof(rss->toeplitz_hash_key));

		refresh_tirs = refresh_tirs || rss->hfunc == ETH_RSS_HASH_TOP;

	}



	if (refresh_rqt && test_bit(MLX5E_STATE_OPENED, &priv->state)) {

		struct mlx5e_redirect_rqt_param rrp = {

			.is_rss = true,

			{
@@ -1207,18 +1216,12 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
				},

			},

		};

		u32 rqtn = priv->indir_rqt.rqtn;



		mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, rrp);

	}

	}



	if (key) {

		memcpy(rss->toeplitz_hash_key, key,

		       sizeof(rss->toeplitz_hash_key));

		hash_changed = hash_changed || rss->hfunc == ETH_RSS_HASH_TOP;

	}



	if (hash_changed)

	if (refresh_tirs)

		mlx5e_modify_tirs_hash(priv, in);



	mutex_unlock(&priv->state_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE