[dpdk-stable] patch 'drivers/net: fix several Tx prepare functions' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/18/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 4cfe313616b9db796d02ee8e5cbbcf70a0a4d446 Mon Sep 17 00:00:00 2001
From: Didier Pallard <didier.pallard at 6wind.com>
Date: Tue, 11 Dec 2018 14:00:28 +0100
Subject: [PATCH] drivers/net: fix several Tx prepare functions

[ upstream commit d6db681bf9b8095da2fed653ec5b89e5f165eaa8 ]

Since below commit, several tx_prep functions are broken, they fail to
pass supported Tx offload features check:
PKT_TX_IPVx must be set when any PKT_TX_L4 checksum is requested,
but these values are not present in the mask of supported Tx offloads
of several drivers that advertise PKT_TX_L4_MASK.
So any packet sent to those drivers with a L4 checksum request and
one of PKT_TX_IPVx bit set is rejected by the tx prepare function.

Fixes: 1037ed842c37 ("mbuf: fix Tx offload mask")

Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/e1000/em_rxtx.c        | 2 ++
 drivers/net/ena/ena_ethdev.c       | 2 ++
 drivers/net/fm10k/fm10k_rxtx.c     | 2 ++
 drivers/net/vmxnet3/vmxnet3_rxtx.c | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index 46bdf519c..8913a7a99 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -51,4 +51,6 @@
 
 #define E1000_TX_OFFLOAD_MASK ( \
+		PKT_TX_IPV6 |           \
+		PKT_TX_IPV4 |           \
 		PKT_TX_IP_CKSUM |       \
 		PKT_TX_L4_MASK |        \
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 87c95b2e7..e57e4baa2 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -190,4 +190,6 @@ static const struct ena_stats ena_stats_ena_com_strings[] = {
 #define	ENA_TX_OFFLOAD_MASK	(\
 	PKT_TX_L4_MASK |         \
+	PKT_TX_IPV6 |            \
+	PKT_TX_IPV4 |            \
 	PKT_TX_IP_CKSUM |        \
 	PKT_TX_TCP_SEG)
diff --git a/drivers/net/fm10k/fm10k_rxtx.c b/drivers/net/fm10k/fm10k_rxtx.c
index 4a5b46ec8..1d0f09d25 100644
--- a/drivers/net/fm10k/fm10k_rxtx.c
+++ b/drivers/net/fm10k/fm10k_rxtx.c
@@ -40,4 +40,6 @@ static inline void dump_rxd(union fm10k_rx_desc *rxd)
 #define FM10K_TX_OFFLOAD_MASK (  \
 		PKT_TX_VLAN_PKT |        \
+		PKT_TX_IPV6 |            \
+		PKT_TX_IPV4 |            \
 		PKT_TX_IP_CKSUM |        \
 		PKT_TX_L4_MASK |         \
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index cf85f3d61..d30914a8a 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -51,4 +51,6 @@
 #define	VMXNET3_TX_OFFLOAD_MASK	( \
 		PKT_TX_VLAN_PKT | \
+		PKT_TX_IPV6 |     \
+		PKT_TX_IPV4 |     \
 		PKT_TX_L4_MASK |  \
 		PKT_TX_TCP_SEG)
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-12-14 17:49:48.139710023 +0000
+++ 0015-drivers-net-fix-several-Tx-prepare-functions.patch	2018-12-14 17:49:47.000000000 +0000
@@ -1,8 +1,10 @@
-From d6db681bf9b8095da2fed653ec5b89e5f165eaa8 Mon Sep 17 00:00:00 2001
+From 4cfe313616b9db796d02ee8e5cbbcf70a0a4d446 Mon Sep 17 00:00:00 2001
 From: Didier Pallard <didier.pallard at 6wind.com>
 Date: Tue, 11 Dec 2018 14:00:28 +0100
 Subject: [PATCH] drivers/net: fix several Tx prepare functions
 
+[ upstream commit d6db681bf9b8095da2fed653ec5b89e5f165eaa8 ]
+
 Since below commit, several tx_prep functions are broken, they fail to
 pass supported Tx offload features check:
 PKT_TX_IPVx must be set when any PKT_TX_L4 checksum is requested,
@@ -12,31 +14,18 @@
 one of PKT_TX_IPVx bit set is rejected by the tx prepare function.
 
 Fixes: 1037ed842c37 ("mbuf: fix Tx offload mask")
-Cc: stable at dpdk.org
 
 Signed-off-by: Didier Pallard <didier.pallard at 6wind.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- drivers/net/atlantic/atl_rxtx.c    | 2 ++
  drivers/net/e1000/em_rxtx.c        | 2 ++
  drivers/net/ena/ena_ethdev.c       | 2 ++
  drivers/net/fm10k/fm10k_rxtx.c     | 2 ++
  drivers/net/vmxnet3/vmxnet3_rxtx.c | 2 ++
- 5 files changed, 10 insertions(+)
+ 4 files changed, 8 insertions(+)
 
-diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c
-index fd909476c..40c913795 100644
---- a/drivers/net/atlantic/atl_rxtx.c
-+++ b/drivers/net/atlantic/atl_rxtx.c
-@@ -22,4 +22,6 @@
- #define ATL_TX_OFFLOAD_MASK (				 \
- 	PKT_TX_VLAN |					 \
-+	PKT_TX_IPV6 |					 \
-+	PKT_TX_IPV4 |					 \
- 	PKT_TX_IP_CKSUM |				 \
- 	PKT_TX_L4_MASK |				 \
 diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
-index a9cd76518..005e1ea96 100644
+index 46bdf519c..8913a7a99 100644
 --- a/drivers/net/e1000/em_rxtx.c
 +++ b/drivers/net/e1000/em_rxtx.c
 @@ -51,4 +51,6 @@
@@ -47,7 +36,7 @@
  		PKT_TX_IP_CKSUM |       \
  		PKT_TX_L4_MASK |        \
 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
-index a07bd2b49..709ad2edb 100644
+index 87c95b2e7..e57e4baa2 100644
 --- a/drivers/net/ena/ena_ethdev.c
 +++ b/drivers/net/ena/ena_ethdev.c
 @@ -190,4 +190,6 @@ static const struct ena_stats ena_stats_ena_com_strings[] = {