net/mlx5e: Set hairpin queue size

For a given hairpin packet buffer size, different queue sizes
(values of log_hairpin_num_packets) determine how the data is broken
to strides on the RQ. Currently the chosen value is set to 64B strides.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 7a4f577d1c5b272f2313274903336b9104c1f1ee..fd98b0dc610fffce72c7702598271825be6e9160 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -599,8 +599,13 @@ static int mlx5e_hairpin_flow_add(struct mlx5e_priv *priv,
                                     MLX5_CAP_GEN(priv->mdev, log_max_hairpin_wq_data_sz));
        params.log_data_size = max_t(u8, params.log_data_size,
                                     MLX5_CAP_GEN(priv->mdev, log_min_hairpin_wq_data_sz));
                                     MLX5_CAP_GEN(priv->mdev, log_max_hairpin_wq_data_sz));
        params.log_data_size = max_t(u8, params.log_data_size,
                                     MLX5_CAP_GEN(priv->mdev, log_min_hairpin_wq_data_sz));

-       params.q_counter = priv->q_counter;

 
 

+       params.log_num_packets = params.log_data_size -
+                                MLX5_MPWRQ_MIN_LOG_STRIDE_SZ(priv->mdev);
+       params.log_num_packets = min_t(u8, params.log_num_packets,
+                                      MLX5_CAP_GEN(priv->mdev, log_max_hairpin_num_packets));
+
+       params.q_counter = priv->q_counter;

        /* set hairpin pair per each 50Gbs share of the link */
        mlx5e_get_max_linkspeed(priv->mdev, &link_speed);
        link_speed = max_t(u32, link_speed, 50000);
        /* set hairpin pair per each 50Gbs share of the link */
        mlx5e_get_max_linkspeed(priv->mdev, &link_speed);
        link_speed = max_t(u32, link_speed, 50000);


@@ -614,9 +619,9 @@ static int mlx5e_hairpin_flow_add(struct mlx5e_priv *priv,
                goto create_hairpin_err;
        }
 
                goto create_hairpin_err;
        }
 

-       netdev_dbg(priv->netdev, "add hairpin: tirn %x rqn %x peer %s sqn %x prio %d log data size %d\n",
+       netdev_dbg(priv->netdev, "add hairpin: tirn %x rqn %x peer %s sqn %x prio %d (log) data %d packets %d\n",

                   hp->tirn, hp->pair->rqn[0], hp->pair->peer_mdev->priv.name,
                   hp->tirn, hp->pair->rqn[0], hp->pair->peer_mdev->priv.name,

-                  hp->pair->sqn[0], match_prio, params.log_data_size);
+                  hp->pair->sqn[0], match_prio, params.log_data_size, params.log_num_packets);

 
        hpe->hp = hp;
        hash_add(priv->fs.tc.hairpin_tbl, &hpe->hairpin_hlist,
 
        hpe->hp = hp;
        hash_add(priv->fs.tc.hairpin_tbl, &hpe->hairpin_hlist,