Commit 4d20c9f2 authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

net/mlx5e: Symmetric OR-XOR RSS hash control 



Allow control over the symmetric RSS hash, which was previously set to
enabled by default by the driver.

Symmetric OR-XOR RSS can now be queried and controlled using the
'ethtool -x/X' command.

Reviewed-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20250224174416.499070-3-gal@nvidia.com


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

drivers/net/ethernet/mellanox/mlx5/core/en/rss.c

+11 −2
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static void mlx5e_rss_params_init(struct mlx5e_rss *rss) 
{

	enum mlx5_traffic_types tt;



	rss->hash.symmetric = true;

	rss->hash.hfunc = ETH_RSS_HASH_TOP;

	netdev_rss_key_fill(rss->hash.toeplitz_hash_key,

			    sizeof(rss->hash.toeplitz_hash_key));
@@ -566,7 +567,7 @@ int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss, 
	return final_err;

}



int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc)

int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc, bool *symmetric)

{

	if (indir)

		memcpy(indir, rss->indir.table,
@@ -579,11 +580,14 @@ int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc) 
	if (hfunc)

		*hfunc = rss->hash.hfunc;



	if (symmetric)

		*symmetric = rss->hash.symmetric;



	return 0;

}



int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir,

		       const u8 *key, const u8 *hfunc,

		       const u8 *key, const u8 *hfunc, const bool *symmetric,

		       u32 *rqns, u32 *vhca_ids, unsigned int num_rqns)

{

	bool changed_indir = false;
@@ -623,6 +627,11 @@ int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir, 
		       rss->indir.actual_table_size * sizeof(*rss->indir.table));

	}



	if (symmetric) {

		rss->hash.symmetric = *symmetric;

		changed_hash = true;

	}



	if (changed_indir && rss->enabled) {

		err = mlx5e_rss_apply(rss, rqns, vhca_ids, num_rqns);

		if (err) {

drivers/net/ethernet/mellanox/mlx5/core/en/rss.h

+2 −2
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ void mlx5e_rss_disable(struct mlx5e_rss *rss); 


int mlx5e_rss_packet_merge_set_param(struct mlx5e_rss *rss,

				     struct mlx5e_packet_merge_param *pkt_merge_param);

int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc);

int mlx5e_rss_get_rxfh(struct mlx5e_rss *rss, u32 *indir, u8 *key, u8 *hfunc, bool *symmetric);

int mlx5e_rss_set_rxfh(struct mlx5e_rss *rss, const u32 *indir,

		       const u8 *key, const u8 *hfunc,

		       const u8 *key, const u8 *hfunc, const bool *symmetric,

		       u32 *rqns, u32 *vhca_ids, unsigned int num_rqns);

struct mlx5e_rss_params_hash mlx5e_rss_get_hash(struct mlx5e_rss *rss);

u8 mlx5e_rss_get_hash_fields(struct mlx5e_rss *rss, enum mlx5_traffic_types tt);

drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c

+6 −5
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void mlx5e_rx_res_rss_set_indir_uniform(struct mlx5e_rx_res *res, unsigned int n 
}



int mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 rss_idx,

			      u32 *indir, u8 *key, u8 *hfunc)

			      u32 *indir, u8 *key, u8 *hfunc, bool *symmetric)

{

	struct mlx5e_rss *rss;
@@ -205,11 +205,12 @@ int mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, 
	if (!rss)

		return -ENOENT;



	return mlx5e_rss_get_rxfh(rss, indir, key, hfunc);

	return mlx5e_rss_get_rxfh(rss, indir, key, hfunc, symmetric);

}



int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx,

			      const u32 *indir, const u8 *key, const u8 *hfunc)

			      const u32 *indir, const u8 *key, const u8 *hfunc,

			      const bool *symmetric)

{

	u32 *vhca_ids = get_vhca_ids(res, 0);

	struct mlx5e_rss *rss;
@@ -221,8 +222,8 @@ int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx, 
	if (!rss)

		return -ENOENT;



	return mlx5e_rss_set_rxfh(rss, indir, key, hfunc, res->rss_rqns, vhca_ids,

				  res->rss_nch);

	return mlx5e_rss_set_rxfh(rss, indir, key, hfunc, symmetric,

				  res->rss_rqns, vhca_ids, res->rss_nch);

}



int mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx,

drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h

+3 −2
Original line number Diff line number Diff line
@@ -49,9 +49,10 @@ void mlx5e_rx_res_xsk_update(struct mlx5e_rx_res *res, struct mlx5e_channels *ch 
/* Configuration API */

void mlx5e_rx_res_rss_set_indir_uniform(struct mlx5e_rx_res *res, unsigned int nch);

int mlx5e_rx_res_rss_get_rxfh(struct mlx5e_rx_res *res, u32 rss_idx,

			      u32 *indir, u8 *key, u8 *hfunc);

			      u32 *indir, u8 *key, u8 *hfunc, bool *symmetric);

int mlx5e_rx_res_rss_set_rxfh(struct mlx5e_rx_res *res, u32 rss_idx,

			      const u32 *indir, const u8 *key, const u8 *hfunc);

			      const u32 *indir, const u8 *key, const u8 *hfunc,

			      const bool *symmetric);



int mlx5e_rx_res_rss_get_hash_fields(struct mlx5e_rx_res *res, u32 rss_idx,

				     enum mlx5_traffic_types tt);

drivers/net/ethernet/mellanox/mlx5/core/en/tir.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ void mlx5e_tir_builder_build_rss(struct mlx5e_tir_builder *builder, 
		const size_t len = MLX5_FLD_SZ_BYTES(tirc, rx_hash_toeplitz_key);

		void *rss_key = MLX5_ADDR_OF(tirc, tirc, rx_hash_toeplitz_key);



		MLX5_SET(tirc, tirc, rx_hash_symmetric, 1);

		MLX5_SET(tirc, tirc, rx_hash_symmetric, rss_hash->symmetric);

		memcpy(rss_key, rss_hash->toeplitz_hash_key, len);

	}