From: Boris Pismenny <borisp@mellanox.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, davejwatson@fb.com, aviadye@mellanox.com,
borisp@mellanox.com, saeedm@mellanox.com
Subject: [PATCH net-next 17/18] net/mlx5e: IPsec, fix byte count in CQE
Date: Wed, 4 Jul 2018 16:32:40 +0300 [thread overview]
Message-ID: <1530711161-14578-18-git-send-email-borisp@mellanox.com> (raw)
In-Reply-To: <1530711161-14578-1-git-send-email-borisp@mellanox.com>
This patch fixes the byte count indication in CQE for processed IPsec
packets that contain a metadata header.
Signed-off-by: Boris Pismenny <borisp@mellanox.com>
Reviewed-by: Aviad Yehezkel <aviadye@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
index fda7929..128a82b 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
@@ -364,6 +364,7 @@ struct sk_buff *mlx5e_ipsec_handle_rx_skb(struct net_device *netdev,
}
remove_metadata_hdr(skb);
+ *cqe_bcnt -= MLX5E_METADATA_ETHER_LEN;
return skb;
}
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
index 2bfbbef..ca47c05 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h
@@ -41,7 +41,7 @@
#include "en.h"
struct sk_buff *mlx5e_ipsec_handle_rx_skb(struct net_device *netdev,
- struct sk_buff *skb);
+ struct sk_buff *skb, u32 *cqe_bcnt);
void mlx5e_ipsec_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);
void mlx5e_ipsec_inverse_table_init(void);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 0f2bcc2..1d5295e 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -1547,7 +1547,7 @@ void mlx5e_ipsec_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
mlx5e_free_rx_wqe(rq, wi);
goto wq_cyc_pop;
}
- skb = mlx5e_ipsec_handle_rx_skb(rq->netdev, skb);
+ skb = mlx5e_ipsec_handle_rx_skb(rq->netdev, skb, &cqe_bcnt);
if (unlikely(!skb)) {
mlx5e_free_rx_wqe(rq, wi);
goto wq_cyc_pop;
--
1.8.3.1
next prev parent reply other threads:[~2018-07-04 13:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 13:32 [PATCH net-next 00/18] TLS offload rx, netdev & mlx5 Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 01/18] net: Add decrypted field to skb Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 02/18] net: Add TLS RX offload feature Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 03/18] net: Add TLS rx resync NDO Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 04/18] tcp: Don't coalesce decrypted and encrypted SKBs Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 05/18] tls: Refactor tls_offload variable names Boris Pismenny
2018-07-05 8:29 ` kbuild test robot
2018-07-05 8:29 ` kbuild test robot
2018-07-04 13:32 ` [PATCH net-next 06/18] tls: Split decrypt_skb to two functions Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 07/18] tls: Split tls_sw_release_resources_rx Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 08/18] tls: Fill software context without allocation Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 09/18] tls: Add rx inline crypto offload Boris Pismenny
2018-07-05 8:29 ` kbuild test robot
2018-07-05 8:29 ` kbuild test robot
2018-07-04 13:32 ` [PATCH net-next 10/18] net/mlx5e: TLS, refactor variable names Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 11/18] net/mlx5: Accel, add TLS rx offload routines Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 12/18] net/mlx5e: TLS, add innova rx support Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 13/18] net/mlx5e: TLS, add Innova TLS rx data path Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 14/18] net/mlx5e: TLS, add software statistics Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 15/18] net/mlx5e: TLS, build TLS netdev from capabilities Boris Pismenny
2018-07-04 13:32 ` [PATCH net-next 16/18] net/mlx5: Accel, add common metadata functions Boris Pismenny
2018-07-04 13:32 ` Boris Pismenny [this message]
2018-07-04 13:32 ` [PATCH net-next 18/18] net/mlx5e: Kconfig, mutually exclude compilation of TLS and IPsec accel Boris Pismenny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530711161-14578-18-git-send-email-borisp@mellanox.com \
--to=borisp@mellanox.com \
--cc=aviadye@mellanox.com \
--cc=davejwatson@fb.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).