openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: bdfc028de1 ("net/mlx5e: Fix ethtool RX hash func configuration change")
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
This commit is contained in:
Aya Levin 2020-05-17 12:45:52 +03:00 committed by Saeed Mahameed
parent 36d45fb9d2
commit 5f1572e617
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
View File

@ -1173,7 +1173,8 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir,
struct mlx5e_priv *priv = netdev_priv(dev); struct mlx5e_priv *priv = netdev_priv(dev);
struct mlx5e_rss_params *rss = &priv->rss_params; struct mlx5e_rss_params *rss = &priv->rss_params;
int inlen = MLX5_ST_SZ_BYTES(modify_tir_in); int inlen = MLX5_ST_SZ_BYTES(modify_tir_in);
bool hash_changed = false; bool refresh_tirs = false;
bool refresh_rqt = false;
void *in; void *in;
if ((hfunc != ETH_RSS_HASH_NO_CHANGE) && if ((hfunc != ETH_RSS_HASH_NO_CHANGE) &&
@ -1189,36 +1190,38 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir,
if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != rss->hfunc) { if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != rss->hfunc) {
rss->hfunc = hfunc; rss->hfunc = hfunc;
hash_changed = true; refresh_rqt = true;
refresh_tirs = true;
} }
if (indir) { if (indir) {
memcpy(rss->indirection_rqt, indir, memcpy(rss->indirection_rqt, indir,
sizeof(rss->indirection_rqt)); sizeof(rss->indirection_rqt));
refresh_rqt = true;
if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {
u32 rqtn = priv->indir_rqt.rqtn;
struct mlx5e_redirect_rqt_param rrp = {
.is_rss = true,
{
.rss = {
.hfunc = rss->hfunc,
.channels = &priv->channels,
},
},
};
mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, rrp);
}
} }
if (key) { if (key) {
memcpy(rss->toeplitz_hash_key, key, memcpy(rss->toeplitz_hash_key, key,
sizeof(rss->toeplitz_hash_key)); sizeof(rss->toeplitz_hash_key));
hash_changed = hash_changed || rss->hfunc == ETH_RSS_HASH_TOP; refresh_tirs = refresh_tirs || rss->hfunc == ETH_RSS_HASH_TOP;
} }
if (hash_changed) if (refresh_rqt && test_bit(MLX5E_STATE_OPENED, &priv->state)) {
struct mlx5e_redirect_rqt_param rrp = {
.is_rss = true,
{
.rss = {
.hfunc = rss->hfunc,
.channels = &priv->channels,
},
},
};
u32 rqtn = priv->indir_rqt.rqtn;
mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, rrp);
}
if (refresh_tirs)
mlx5e_modify_tirs_hash(priv, in); mlx5e_modify_tirs_hash(priv, in);
mutex_unlock(&priv->state_lock); mutex_unlock(&priv->state_lock);