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.
79 lines
2.8 KiB
79 lines
2.8 KiB
4 years ago
|
From dcc63af43b8f506960083abc7aa249415234c31b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Sun, 10 May 2020 14:52:35 -0400
|
||
|
|
Subject: [PATCH 060/312] [netdrv] net/mlx5e: kTLS, Fix page refcnt leak in TX
|
||
|
|
resync error flow
|
||
|
|
|
||
|
|
Message-id: <20200510145245.10054-73-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306612
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789378 v2 72/82] net/mlx5e: kTLS, Fix page refcnt leak in TX resync error flow
|
||
|
|
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 b61b24bd135a7775a2839863bd1d58a462a5f1e5
|
||
|
|
Author: Tariq Toukan <tariqt@mellanox.com>
|
||
|
|
Date: Wed Sep 18 13:57:40 2019 +0300
|
||
|
|
|
||
|
|
net/mlx5e: kTLS, Fix page refcnt leak in TX resync error flow
|
||
|
|
|
||
|
|
All references for frag pages that are obtained in tx_sync_info_get()
|
||
|
|
should be released.
|
||
|
|
Release usually occurs in the corresponding CQE of the WQE.
|
||
|
|
In error flows, not all fragments have a WQE posted for them, hence
|
||
|
|
no matching CQE will be generated.
|
||
|
|
For these pages, release the reference in the error flow.
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 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 334808b1863b..5f1d18fb644e 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
|
||
|
|
@@ -329,7 +329,7 @@ mlx5e_ktls_tx_handle_ooo(struct mlx5e_ktls_offload_context_tx *priv_tx,
|
||
|
|
struct tx_sync_info info = {};
|
||
|
|
u16 contig_wqebbs_room, pi;
|
||
|
|
u8 num_wqebbs;
|
||
|
|
- int i;
|
||
|
|
+ int i = 0;
|
||
|
|
|
||
|
|
if (!tx_sync_info_get(priv_tx, seq, &info)) {
|
||
|
|
/* We might get here if a retransmission reaches the driver
|
||
|
|
@@ -364,7 +364,7 @@ mlx5e_ktls_tx_handle_ooo(struct mlx5e_ktls_offload_context_tx *priv_tx,
|
||
|
|
|
||
|
|
tx_post_resync_params(sq, priv_tx, info.rcd_sn);
|
||
|
|
|
||
|
|
- for (i = 0; i < info.nr_frags; i++)
|
||
|
|
+ for (; i < info.nr_frags; i++)
|
||
|
|
if (tx_post_resync_dump(sq, &info.frags[i], priv_tx->tisn, !i))
|
||
|
|
goto err_out;
|
||
|
|
|
||
|
|
@@ -377,6 +377,9 @@ mlx5e_ktls_tx_handle_ooo(struct mlx5e_ktls_offload_context_tx *priv_tx,
|
||
|
|
return skb;
|
||
|
|
|
||
|
|
err_out:
|
||
|
|
+ for (; i < info.nr_frags; i++)
|
||
|
|
+ put_page(skb_frag_page(&info.frags[i]));
|
||
|
|
+
|
||
|
|
dev_kfree_skb_any(skb);
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|