You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
100 lines
3.5 KiB
100 lines
3.5 KiB
From 16c3d368f72223cdfc308be9d40852d1d3cea81b Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Sun, 10 May 2020 14:52:36 -0400
|
|
Subject: [PATCH 061/312] [netdrv] net/mlx5e: kTLS, Fix missing SQ edge fill
|
|
|
|
Message-id: <20200510145245.10054-74-ahleihel@redhat.com>
|
|
Patchwork-id: 306614
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789378 v2 73/82] net/mlx5e: kTLS, Fix missing SQ edge fill
|
|
Bugzilla: 1789378
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1789378
|
|
Upstream: v5.4-rc6
|
|
|
|
commit 700ec497424069fa4d8f3715759c4aaec016e840
|
|
Author: Tariq Toukan <tariqt@mellanox.com>
|
|
Date: Mon Oct 7 13:59:11 2019 +0300
|
|
|
|
net/mlx5e: kTLS, Fix missing SQ edge fill
|
|
|
|
Before posting the context params WQEs, make sure there is enough
|
|
contiguous room for them, and fill frag edge if needed.
|
|
|
|
When posting only a nop, no need for room check, as it needs a single
|
|
WQEBB, meaning no contiguity issue.
|
|
|
|
Fixes: d2ead1f360e8 ("net/mlx5e: Add kTLS TX HW offload support")
|
|
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
|
|
Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
.../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 28 +++++++++++++++-------
|
|
1 file changed, 20 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
|
|
index 5f1d18fb644e..59e3f48470d9 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
|
|
@@ -168,6 +168,14 @@ mlx5e_ktls_tx_post_param_wqes(struct mlx5e_txqsq *sq,
|
|
bool skip_static_post, bool fence_first_post)
|
|
{
|
|
bool progress_fence = skip_static_post || !fence_first_post;
|
|
+ struct mlx5_wq_cyc *wq = &sq->wq;
|
|
+ u16 contig_wqebbs_room, pi;
|
|
+
|
|
+ pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
|
|
+ contig_wqebbs_room = mlx5_wq_cyc_get_contig_wqebbs(wq, pi);
|
|
+ if (unlikely(contig_wqebbs_room <
|
|
+ MLX5E_KTLS_STATIC_WQEBBS + MLX5E_KTLS_PROGRESS_WQEBBS))
|
|
+ mlx5e_fill_sq_frag_edge(sq, wq, pi, contig_wqebbs_room);
|
|
|
|
if (!skip_static_post)
|
|
post_static_params(sq, priv_tx, fence_first_post);
|
|
@@ -355,10 +363,20 @@ mlx5e_ktls_tx_handle_ooo(struct mlx5e_ktls_offload_context_tx *priv_tx,
|
|
|
|
stats->tls_ooo++;
|
|
|
|
- num_wqebbs = MLX5E_KTLS_STATIC_WQEBBS + MLX5E_KTLS_PROGRESS_WQEBBS +
|
|
- (info.nr_frags ? info.nr_frags * MLX5E_KTLS_DUMP_WQEBBS : 1);
|
|
+ tx_post_resync_params(sq, priv_tx, info.rcd_sn);
|
|
+
|
|
+ /* If no dump WQE was sent, we need to have a fence NOP WQE before the
|
|
+ * actual data xmit.
|
|
+ */
|
|
+ if (!info.nr_frags) {
|
|
+ tx_post_fence_nop(sq);
|
|
+ return skb;
|
|
+ }
|
|
+
|
|
+ num_wqebbs = info.nr_frags * MLX5E_KTLS_DUMP_WQEBBS;
|
|
pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
|
|
contig_wqebbs_room = mlx5_wq_cyc_get_contig_wqebbs(wq, pi);
|
|
+
|
|
if (unlikely(contig_wqebbs_room < num_wqebbs))
|
|
mlx5e_fill_sq_frag_edge(sq, wq, pi, contig_wqebbs_room);
|
|
|
|
@@ -368,12 +386,6 @@ mlx5e_ktls_tx_handle_ooo(struct mlx5e_ktls_offload_context_tx *priv_tx,
|
|
if (tx_post_resync_dump(sq, &info.frags[i], priv_tx->tisn, !i))
|
|
goto err_out;
|
|
|
|
- /* If no dump WQE was sent, we need to have a fence NOP WQE before the
|
|
- * actual data xmit.
|
|
- */
|
|
- if (!info.nr_frags)
|
|
- tx_post_fence_nop(sq);
|
|
-
|
|
return skb;
|
|
|
|
err_out:
|
|
--
|
|
2.13.6
|
|
|