[dpdk-stable] patch 'net/sfc: improve TSO header length check in EFX datapath' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
>From 3fe65d2ac9eeb8b99151f07725bbabcdd770c40c Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Tue, 2 Apr 2019 10:28:33 +0100
Subject: [PATCH] net/sfc: improve TSO header length check in EFX datapath

[ upstream commit ac30699e9cfbb58faeca82ac6d122baf2d61b480 ]

Move the check inside xmit function to the branch in which
the check is mandatory. It makes case when TSO header is not
fragmented a bit more faster.

Fixes: fec33d5bb3eb ("net/sfc: support firmware-assisted TSO")

Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/sfc_tso.c | 11 +++++++----
 drivers/net/sfc/sfc_tx.c  |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/sfc/sfc_tso.c b/drivers/net/sfc/sfc_tso.c
index 076a25d44..a28af0e78 100644
--- a/drivers/net/sfc/sfc_tso.c
+++ b/drivers/net/sfc/sfc_tso.c
@@ -108,8 +108,4 @@ sfc_efx_tso_do(struct sfc_efx_txq *txq, unsigned int idx,
 	idx += SFC_TSO_OPT_DESCS_NUM;
 
-	/* Packets which have too big headers should be discarded */
-	if (unlikely(header_len > SFC_TSOH_STD_LEN))
-		return EMSGSIZE;
-
 	/*
 	 * The TCP header must start at most 208 bytes into the frame.
@@ -130,4 +126,11 @@ sfc_efx_tso_do(struct sfc_efx_txq *txq, unsigned int idx,
 	 */
 	if (m->data_len < header_len) {
+		/*
+		 * Discard a packet if header linearization is needed but
+		 * the header is too big.
+		 */
+		if (unlikely(header_len > SFC_TSOH_STD_LEN))
+			return EMSGSIZE;
+
 		tsoh = txq->sw_ring[idx & txq->ptr_mask].tsoh;
 		sfc_tso_prepare_header(tsoh, header_len, in_seg, in_off);
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index aa73d2642..242137e64 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -738,5 +738,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 				 * one of the following reasons:
 				 *
-				 * 1) Packet header length is greater
+				 * 1) Packet header linearization is needed
+				 *    and the header length is greater
 				 *    than SFC_TSOH_STD_LEN
 				 * 2) TCP header starts at more then
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.061309970 +0100
+++ 0005-net-sfc-improve-TSO-header-length-check-in-EFX-datap.patch	2019-04-30 17:58:13.754140864 +0100
@@ -1 +1 @@
-From ac30699e9cfbb58faeca82ac6d122baf2d61b480 Mon Sep 17 00:00:00 2001
+From 3fe65d2ac9eeb8b99151f07725bbabcdd770c40c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ac30699e9cfbb58faeca82ac6d122baf2d61b480 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -46 +47 @@
-index c3e0936cc..4b1f94ce8 100644
+index aa73d2642..242137e64 100644
@@ -49 +50 @@
-@@ -761,5 +761,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+@@ -738,5 +738,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)