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: Cosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20250224174416.499070-3-gal@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
index 0d8ccc7b6c11dcae92aef3dbfa6108ec8e5ea286..74cd111ee320c29c443e0701779c3cca4b2014ae 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.c
@@ -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 @@ inner_tir:
        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) {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
index 72089f5f473c28ba2953f6ef64bcec06e44f2a39..8ac902190010b9b47bf3ef0fe6458af7ab35ccc7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rss.h
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
index 9d8b2f5f6c9673e9af72367d5131959c09dd3f80..5fcbe47337b080b57e6e6b224bb7e10d8f858cbf 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c
@@ -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,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
index 05b438043bcb322fcf4dcb7e7a0e20f1f2c78e5c..3e09d91281af9d62ded00567650fe643b81d42c5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
index 11f724ad90dbfb2e7264941c6ee009b80ec1630e..19499072f67f6205ac30b3d75f4ce0a7f545552d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.c
@@ -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);
        }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h
index 857a84bcd53aff22fb7c78794b3e5d5ece33dbb1..e8df3aaf6562ffb3349d34f127b1f061ea6997cc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tir.h
@@ -9,6 +9,7 @@
 struct mlx5e_rss_params_hash {
        u8 hfunc;
        u8 toeplitz_hash_key[40];
+       bool symmetric;
 };
 
 struct mlx5e_rss_params_traffic_type {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 1bf2212a0bb6f971e9e671c928f8d49c7c50898b..0cb515fa179f5008ee94321e004ed82e502cfa82 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -1456,18 +1456,27 @@ static int mlx5e_get_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *
 {
        struct mlx5e_priv *priv = netdev_priv(netdev);
        u32 rss_context = rxfh->rss_context;
+       bool symmetric;
        int err;
 
        mutex_lock(&priv->state_lock);
        err = mlx5e_rx_res_rss_get_rxfh(priv->rx_res, rss_context,
-                                       rxfh->indir, rxfh->key, &rxfh->hfunc);
+                                       rxfh->indir, rxfh->key, &rxfh->hfunc, &symmetric);
        mutex_unlock(&priv->state_lock);
-       return err;
+
+       if (err)
+               return err;
+
+       if (symmetric)
+               rxfh->input_xfrm = RXH_XFRM_SYM_OR_XOR;
+
+       return 0;
 }
 
 static int mlx5e_set_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxfh,
                          struct netlink_ext_ack *extack)
 {
+       bool symmetric = rxfh->input_xfrm == RXH_XFRM_SYM_OR_XOR;
        struct mlx5e_priv *priv = netdev_priv(dev);
        u32 *rss_context = &rxfh->rss_context;
        u8 hfunc = rxfh->hfunc;
@@ -1502,7 +1511,8 @@ static int mlx5e_set_rxfh(struct net_device *dev, struct ethtool_rxfh_param *rxf
 
        err = mlx5e_rx_res_rss_set_rxfh(priv->rx_res, *rss_context,
                                        rxfh->indir, rxfh->key,
-                                       hfunc == ETH_RSS_HASH_NO_CHANGE ? NULL : &hfunc);
+                                       hfunc == ETH_RSS_HASH_NO_CHANGE ? NULL : &hfunc,
+                                       rxfh->input_xfrm == RXH_XFRM_NO_CHANGE ? NULL : &symmetric);
 
 unlock:
        mutex_unlock(&priv->state_lock);
@@ -2611,6 +2621,7 @@ const struct ethtool_ops mlx5e_ethtool_ops = {
                                     ETHTOOL_COALESCE_MAX_FRAMES |
                                     ETHTOOL_COALESCE_USE_ADAPTIVE |
                                     ETHTOOL_COALESCE_USE_CQE,
+       .supported_input_xfrm = RXH_XFRM_SYM_OR_XOR,
        .get_drvinfo       = mlx5e_get_drvinfo,
        .get_link          = ethtool_op_get_link,
        .get_link_ext_state  = mlx5e_get_link_ext_state,