[dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' has been queued to LTS release 18.11.9

[dpdk-stable] patch 'app/testpmd: add parsing for QinQ VLAN headers' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/73a8faecb9d26bf73294c9bafe853b492d444344

Thanks.

Kevin.

---
From 73a8faecb9d26bf73294c9bafe853b492d444344 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland@mellanox.com>
Date: Thu, 23 Apr 2020 12:05:26 +0300
Subject: [PATCH] app/testpmd: add parsing for QinQ VLAN headers

[ upstream commit f16d377150a0ab406d1e845ae1c96a4519f9c0ee ]

When having QinQ VLAN headers in the packet, parse_ethernet
is capable of parsing only the first VLAN.

Add parsing for QinQ VLAN headers in the packet.

Fixes: 51f694dd40f5 ("app/testpmd: rework checksum forward engine")

Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
Acked-by: Ori Kam <orika@mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/csumonly.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 46eb52d5b8..b0d528d98c 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -139,6 +139,6 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
 /*
  * Parse an ethernet header to fill the ethertype, l2_len, l3_len and
- * ipproto. This function is able to recognize IPv4/IPv6 with one optional vlan
- * header. The l4_len argument is only set in case of TCP (useful for TSO).
+ * ipproto. This function is able to recognize IPv4/IPv6 with optional VLAN
+ * headers. The l4_len argument is only set in case of TCP (useful for TSO).
  */
 static void
@@ -147,11 +147,13 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)
 	struct ipv4_hdr *ipv4_hdr;
 	struct ipv6_hdr *ipv6_hdr;
+	struct vlan_hdr *vlan_hdr;
 
 	info->l2_len = sizeof(struct ether_hdr);
 	info->ethertype = eth_hdr->ether_type;
 
-	if (info->ethertype == _htons(ETHER_TYPE_VLAN)) {
-		struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1);
-
+	while (info->ethertype == _htons(ETHER_TYPE_VLAN) ||
+	       info->ethertype == _htons(ETHER_TYPE_QINQ)) {
+		vlan_hdr = (struct vlan_hdr *)
+			((char *)eth_hdr + info->l2_len);
 		info->l2_len  += sizeof(struct vlan_hdr);
 		info->ethertype = vlan_hdr->eth_proto;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.036607058 +0100
+++ 0001-app-testpmd-add-parsing-for-QinQ-VLAN-headers.patch	2020-06-05 19:20:50.700043313 +0100
@@ -1 +1 @@
-From f16d377150a0ab406d1e845ae1c96a4519f9c0ee Mon Sep 17 00:00:00 2001
+From 73a8faecb9d26bf73294c9bafe853b492d444344 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f16d377150a0ab406d1e845ae1c96a4519f9c0ee ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- app/test-pmd/csumonly.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ app/test-pmd/csumonly.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
@@ -22 +23 @@
-index fe19615b14..8626223793 100644
+index 46eb52d5b8..b0d528d98c 100644
@@ -25 +26 @@
-@@ -140,6 +140,6 @@ parse_ipv6(struct rte_ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
+@@ -139,6 +139,6 @@ parse_ipv6(struct ipv6_hdr *ipv6_hdr, struct testpmd_offload_info *info)
@@ -34,4 +35,4 @@
-@@ -148,12 +148,13 @@ parse_ethernet(struct rte_ether_hdr *eth_hdr, struct testpmd_offload_info *info)
- 	struct rte_ipv4_hdr *ipv4_hdr;
- 	struct rte_ipv6_hdr *ipv6_hdr;
-+	struct rte_vlan_hdr *vlan_hdr;
+@@ -147,11 +147,13 @@ parse_ethernet(struct ether_hdr *eth_hdr, struct testpmd_offload_info *info)
+ 	struct ipv4_hdr *ipv4_hdr;
+ 	struct ipv6_hdr *ipv6_hdr;
++	struct vlan_hdr *vlan_hdr;
@@ -39 +40 @@
- 	info->l2_len = sizeof(struct rte_ether_hdr);
+ 	info->l2_len = sizeof(struct ether_hdr);
@@ -42,3 +43,2 @@
--	if (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN)) {
--		struct rte_vlan_hdr *vlan_hdr = (
--			struct rte_vlan_hdr *)(eth_hdr + 1);
+-	if (info->ethertype == _htons(ETHER_TYPE_VLAN)) {
+-		struct vlan_hdr *vlan_hdr = (struct vlan_hdr *)(eth_hdr + 1);
@@ -46,3 +46,3 @@
-+	while (info->ethertype == _htons(RTE_ETHER_TYPE_VLAN) ||
-+	       info->ethertype == _htons(RTE_ETHER_TYPE_QINQ)) {
-+		vlan_hdr = (struct rte_vlan_hdr *)
++	while (info->ethertype == _htons(ETHER_TYPE_VLAN) ||
++	       info->ethertype == _htons(ETHER_TYPE_QINQ)) {
++		vlan_hdr = (struct vlan_hdr *)
@@ -50 +50 @@
- 		info->l2_len  += sizeof(struct rte_vlan_hdr);
+ 		info->l2_len  += sizeof(struct vlan_hdr);

[dpdk-stable] patch 'doc: fix log level example in Linux guide' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/645a18990968316aa9a4a6556745cf9decfdeb58

Thanks.

Kevin.

---
From 645a18990968316aa9a4a6556745cf9decfdeb58 Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye@intel.com>
Date: Wed, 18 Mar 2020 08:58:08 +0800
Subject: [PATCH] doc: fix log level example in Linux guide

[ upstream commit 97fbfe5a9526c6ef6e5583330161f1ea4add22bd ]

Now we need to add prefix like lib. to enable the log,
also changing val 8 to "debug"" which would be more descriptive.

Fixes: ffb9fd1b0808 ("log: update legacy modules dynamic logs regex")

Reported-by: Haiyue Wang <haiyue.wang@intel.com>
Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 doc/guides/linux_gsg/eal_args.include.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/linux_gsg/eal_args.include.rst b/doc/guides/linux_gsg/eal_args.include.rst
index cf421a56eb..7251fe9c2f 100644
--- a/doc/guides/linux_gsg/eal_args.include.rst
+++ b/doc/guides/linux_gsg/eal_args.include.rst
@@ -127,5 +127,5 @@ Debugging options
     Specify log level for a specific component. For example::
 
-        --log-level eal:8
+        --log-level lib.eal:debug
 
     Can be specified multiple times.
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.085593145 +0100
+++ 0002-doc-fix-log-level-example-in-Linux-guide.patch	2020-06-05 19:20:50.701043290 +0100
@@ -1 +1 @@
-From 97fbfe5a9526c6ef6e5583330161f1ea4add22bd Mon Sep 17 00:00:00 2001
+From 645a18990968316aa9a4a6556745cf9decfdeb58 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 97fbfe5a9526c6ef6e5583330161f1ea4add22bd ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 361c7cf67f..711a246a08 100644
+index cf421a56eb..7251fe9c2f 100644
@@ -22 +23 @@
-@@ -133,5 +133,5 @@ Debugging options
+@@ -127,5 +127,5 @@ Debugging options

[dpdk-stable] patch 'eal: fix typo in endian conversion macros' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b09d1a43af775fb6a3ada2e888ccad73f372f51e

Thanks.

Kevin.

---
From b09d1a43af775fb6a3ada2e888ccad73f372f51e Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 27 Apr 2020 15:23:40 +0200
Subject: [PATCH] eal: fix typo in endian conversion macros

[ upstream commit a3e283ed904c3a15971f58525b09e4e5d5e323a9 ]

Caught by code inspection, for little endian, RTE_LEXX macros should
provide rte_leXX_t type values.

Fixes: b75667ef9f7e ("eal: add static endianness conversion macros")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/common/include/generic/rte_byteorder.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/common/include/generic/rte_byteorder.h b/lib/librte_eal/common/include/generic/rte_byteorder.h
index 7d9a1463c4..ac167936de 100644
--- a/lib/librte_eal/common/include/generic/rte_byteorder.h
+++ b/lib/librte_eal/common/include/generic/rte_byteorder.h
@@ -94,7 +94,7 @@
 #define RTE_BE32(v) (rte_be32_t)(RTE_STATIC_BSWAP32(v))
 #define RTE_BE64(v) (rte_be64_t)(RTE_STATIC_BSWAP64(v))
-#define RTE_LE16(v) (rte_be16_t)(v)
-#define RTE_LE32(v) (rte_be32_t)(v)
-#define RTE_LE64(v) (rte_be64_t)(v)
+#define RTE_LE16(v) (rte_le16_t)(v)
+#define RTE_LE32(v) (rte_le32_t)(v)
+#define RTE_LE64(v) (rte_le64_t)(v)
 #else
 #error Unsupported endianness.
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.133906938 +0100
+++ 0003-eal-fix-typo-in-endian-conversion-macros.patch	2020-06-05 19:20:50.702043267 +0100
@@ -1 +1 @@
-From a3e283ed904c3a15971f58525b09e4e5d5e323a9 Mon Sep 17 00:00:00 2001
+From b09d1a43af775fb6a3ada2e888ccad73f372f51e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a3e283ed904c3a15971f58525b09e4e5d5e323a9 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- lib/librte_eal/include/generic/rte_byteorder.h | 6 +++---
+ lib/librte_eal/common/include/generic/rte_byteorder.h | 6 +++---
@@ -18,4 +19,4 @@
-diff --git a/lib/librte_eal/include/generic/rte_byteorder.h b/lib/librte_eal/include/generic/rte_byteorder.h
-index 38e8cfd32b..9ca960932f 100644
---- a/lib/librte_eal/include/generic/rte_byteorder.h
-+++ b/lib/librte_eal/include/generic/rte_byteorder.h
+diff --git a/lib/librte_eal/common/include/generic/rte_byteorder.h b/lib/librte_eal/common/include/generic/rte_byteorder.h
+index 7d9a1463c4..ac167936de 100644
+--- a/lib/librte_eal/common/include/generic/rte_byteorder.h
++++ b/lib/librte_eal/common/include/generic/rte_byteorder.h

[dpdk-stable] patch 'net/avp: fix gcc 10 maybe-uninitialized warning' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4c1bf43e88215b0875dccbe21249cc6d7a330684

Thanks.

Kevin.

---
From 4c1bf43e88215b0875dccbe21249cc6d7a330684 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor@redhat.com>
Date: Wed, 11 Mar 2020 11:32:59 +0000
Subject: [PATCH] net/avp: fix gcc 10 maybe-uninitialized warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit ec87d3b2c2451ce0fa71f53f64987c68a0b3423c ]

gcc 10.0.1 reports:

../drivers/net/avp/avp_ethdev.c: In function ‘avp_xmit_scattered_pkts’:
../drivers/net/avp/avp_ethdev.c:1791:24:
warning: ‘avp_bufs[count]’ may be used uninitialized in this function
 [-Wmaybe-uninitialized]
 1791 |   tx_bufs[i] = avp_bufs[count];
      |                ~~~~~~~~^~~~~~~
../drivers/net/avp/avp_ethdev.c:1791:24:
warning: ‘avp_bufs[count]’ may be used uninitialized in this function
 [-Wmaybe-uninitialized]

Fix by initializing the array.

Fixes: 295abce2d25b ("net/avp: add packet transmit functions")

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Steven Webster <steven.webster@windriver.com>
---
 drivers/net/avp/avp_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index 09388d05f8..c5dfb3cab7 100644
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -1698,5 +1698,5 @@ avp_xmit_scattered_pkts(void *tx_queue,
 {
 	struct rte_avp_desc *avp_bufs[(AVP_MAX_TX_BURST *
-				       RTE_AVP_MAX_MBUF_SEGMENTS)];
+				       RTE_AVP_MAX_MBUF_SEGMENTS)] = {};
 	struct avp_queue *txq = (struct avp_queue *)tx_queue;
 	struct rte_avp_desc *tx_bufs[AVP_MAX_TX_BURST];
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.183073406 +0100
+++ 0004-net-avp-fix-gcc-10-maybe-uninitialized-warning.patch	2020-06-05 19:20:50.704043222 +0100
@@ -1 +1 @@
-From ec87d3b2c2451ce0fa71f53f64987c68a0b3423c Mon Sep 17 00:00:00 2001
+From 4c1bf43e88215b0875dccbe21249cc6d7a330684 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit ec87d3b2c2451ce0fa71f53f64987c68a0b3423c ]
+
@@ -24 +25,0 @@
-Cc: stable@dpdk.org
@@ -33 +34 @@
-index cd747b6beb..1abe96ce50 100644
+index 09388d05f8..c5dfb3cab7 100644
@@ -36 +37 @@
-@@ -1695,5 +1695,5 @@ avp_xmit_scattered_pkts(void *tx_queue,
+@@ -1698,5 +1698,5 @@ avp_xmit_scattered_pkts(void *tx_queue,

[dpdk-stable] patch 'eal/x86: ignore gcc 10 stringop-overflow warnings' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2d982535371cdc6ee86dfdf8ed20a915d464843c

Thanks.

Kevin.

---
From 2d982535371cdc6ee86dfdf8ed20a915d464843c Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor@redhat.com>
Date: Fri, 17 Apr 2020 16:43:35 +0100
Subject: [PATCH] eal/x86: ignore gcc 10 stringop-overflow warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit b5b3ea803e4741ad6a46a38d8227c78226d9054d ]

stringop-overflow warns when it sees a possible overflow
in a string operation.

In the rte_memcpy functions different branches are taken
depending on the size. stringop-overflow is raised for the
branches in the function where it sees the static size of the
src could be overflowed.

However, in reality a correct size argument and in some cases
dynamic allocation would ensure that this does not happen.

For example, in the case below for key, the correct path will be
chosen in rte_memcpy_generic at runtime based on the size argument
but as some paths in the function could lead to a cast to 32 bytes
a warning is raised.

In function ‘_mm256_storeu_si256’,
inlined from ‘rte_memcpy_generic’
at ../lib/librte_eal/common/include/arch/x86/rte_memcpy.h:315:2,
inlined from ‘iavf_configure_rss_key’
at ../lib/librte_eal/common/include/arch/x86/rte_memcpy.h:869:10:

/usr/lib/gcc/x86_64-redhat-linux/10/include/avxintrin.h:928:8:
warning: writing 32 bytes into a region of size 1 [-Wstringop-overflow=]
  928 |   *__P = __A;
      |   ~~~~~^~~~~
In file included
from ../drivers/net/iavf/../../common/iavf/iavf_prototype.h:10,
from ../drivers/net/iavf/iavf.h:9,
from ../drivers/net/iavf/iavf_vchnl.c:22:

../drivers/net/iavf/iavf_vchnl.c:
In function ‘iavf_configure_rss_key’:

../drivers/net/iavf/../../common/iavf/virtchnl.h:508:5:
note: at offset 0 to object ‘key’ with size 1 declared here
  508 |  u8 key[1];         /* RSS hash key, packed bytes */
      |     ^~~

Ignore the stringop-overflow warnings for rte_memcpy.h functions.

Bugzilla ID: 394
Bugzilla ID: 421

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/librte_eal/common/include/arch/x86/rte_memcpy.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
index ba44c4a328..9c67232df9 100644
--- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
+++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
@@ -23,4 +23,9 @@ extern "C" {
 #endif
 
+#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 100000)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
+
 /**
  * Copy bytes from one location to another. The locations must not overlap.
@@ -870,4 +875,8 @@ rte_memcpy(void *dst, const void *src, size_t n)
 }
 
+#if defined(RTE_TOOLCHAIN_GCC) && (GCC_VERSION >= 100000)
+#pragma GCC diagnostic pop
+#endif
+
 #ifdef __cplusplus
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.233448247 +0100
+++ 0005-eal-x86-ignore-gcc-10-stringop-overflow-warnings.patch	2020-06-05 19:20:50.705043199 +0100
@@ -1 +1 @@
-From b5b3ea803e4741ad6a46a38d8227c78226d9054d Mon Sep 17 00:00:00 2001
+From 2d982535371cdc6ee86dfdf8ed20a915d464843c Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit b5b3ea803e4741ad6a46a38d8227c78226d9054d ]
+
@@ -52 +53,0 @@
-Cc: stable@dpdk.org
@@ -58 +59 @@
- lib/librte_eal/x86/include/rte_memcpy.h | 9 +++++++++
+ lib/librte_eal/common/include/arch/x86/rte_memcpy.h | 9 +++++++++
@@ -61 +62 @@
-diff --git a/lib/librte_eal/x86/include/rte_memcpy.h b/lib/librte_eal/x86/include/rte_memcpy.h
+diff --git a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
@@ -63,2 +64,2 @@
---- a/lib/librte_eal/x86/include/rte_memcpy.h
-+++ b/lib/librte_eal/x86/include/rte_memcpy.h
+--- a/lib/librte_eal/common/include/arch/x86/rte_memcpy.h
++++ b/lib/librte_eal/common/include/arch/x86/rte_memcpy.h

[dpdk-stable] patch 'kvargs: fix invalid token parsing on FreeBSD' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/35d679a6265134c2e605e76f8bd9565bbccba333

Thanks.

Kevin.

---
From 35d679a6265134c2e605e76f8bd9565bbccba333 Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz@6wind.com>
Date: Wed, 29 Apr 2020 15:17:00 +0200
Subject: [PATCH] kvargs: fix invalid token parsing on FreeBSD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit b2aa2c9723796d81cb9216f3a5c5e195796985fa ]

The behavior of strtok_r() is not the same between GNU libc and FreeBSD
libc: in the first case, the context is set to "" when the last token is
returned, while in the second case it is set to NULL.

On FreeBSD, the current code crashes because we are dereferencing a NULL
pointer (ctx1). Fix it by first checking if it is NULL. This works with
both GNU and FreeBSD libc.

Fixes: ffcf831454a9 ("kvargs: fix buffer overflow when parsing list")

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Tested-by: Zhimin Huang <zhiminx.huang@intel.com>
---
 lib/librte_kvargs/rte_kvargs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c
index a8a5cb50b9..b6f8a6db87 100644
--- a/lib/librte_kvargs/rte_kvargs.c
+++ b/lib/librte_kvargs/rte_kvargs.c
@@ -51,5 +51,5 @@ rte_kvargs_tokenize(struct rte_kvargs *kvlist, const char *params)
 			while (str[strlen(str) - 1] != ']') {
 				/* Restore the comma erased by strtok_r(). */
-				if (ctx1[0] == '\0')
+				if (ctx1 == NULL || ctx1[0] == '\0')
 					return -1; /* no closing bracket */
 				str[strlen(str)] = ',';
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.282061298 +0100
+++ 0006-kvargs-fix-invalid-token-parsing-on-FreeBSD.patch	2020-06-05 19:20:50.706043176 +0100
@@ -1 +1 @@
-From b2aa2c9723796d81cb9216f3a5c5e195796985fa Mon Sep 17 00:00:00 2001
+From 35d679a6265134c2e605e76f8bd9565bbccba333 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit b2aa2c9723796d81cb9216f3a5c5e195796985fa ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 1d815dcd96..285081c86c 100644
+index a8a5cb50b9..b6f8a6db87 100644

[dpdk-stable] patch 'eal/ppc: fix build with gcc 9.3' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7976550a663afd20a3cc64b8f4890770521c926c

Thanks.

Kevin.

---
From 7976550a663afd20a3cc64b8f4890770521c926c Mon Sep 17 00:00:00 2001
From: David Christensen <drc@linux.vnet.ibm.com>
Date: Mon, 4 May 2020 14:03:47 -0700
Subject: [PATCH] eal/ppc: fix build with gcc 9.3

[ upstream commit 67889d11306a6e531be8d2fe53bc216172b90f5d ]

Building DPDK on Ubuntu 20.04 with GCC 9.3.0 results in a "subscript is
outside array bounds" message in rte_memcpy function.  The build error
is caused by an interaction between __builtin_constant_p and
"-Werror=array-bounds" as described in this bugzilla:

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90387

Modify the code to disable the array-bounds check for GCC versions 9.0
to 9.3.

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
---
 lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
index 75f74897b3..b194564b55 100644
--- a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
+++ b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
@@ -38,4 +38,5 @@
 /*To include altivec.h, GCC version must  >= 4.8 */
 #include <altivec.h>
+#include "rte_common.h"
 
 #ifdef __cplusplus
@@ -45,4 +46,9 @@ extern "C" {
 #include "generic/rte_memcpy.h"
 
+#if (GCC_VERSION >= 90000 && GCC_VERSION < 90400)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+
 static inline void
 rte_mov16(uint8_t *dst, const uint8_t *src)
@@ -220,4 +226,8 @@ rte_memcpy_func(void *dst, const void *src, size_t n)
 }
 
+#if (GCC_VERSION >= 90000 && GCC_VERSION < 90400)
+#pragma GCC diagnostic pop
+#endif
+
 #ifdef __cplusplus
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.329987618 +0100
+++ 0007-eal-ppc-fix-build-with-gcc-9.3.patch	2020-06-05 19:20:50.707043153 +0100
@@ -1 +1 @@
-From 67889d11306a6e531be8d2fe53bc216172b90f5d Mon Sep 17 00:00:00 2001
+From 7976550a663afd20a3cc64b8f4890770521c926c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 67889d11306a6e531be8d2fe53bc216172b90f5d ]
+
@@ -16,2 +17,0 @@
-Cc: stable@dpdk.org
-
@@ -20 +20 @@
- lib/librte_eal/ppc/include/rte_memcpy.h | 10 ++++++++++
+ lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h | 10 ++++++++++
@@ -23,7 +23,7 @@
-diff --git a/lib/librte_eal/ppc/include/rte_memcpy.h b/lib/librte_eal/ppc/include/rte_memcpy.h
-index d685b7b15b..c2a1f356d5 100644
---- a/lib/librte_eal/ppc/include/rte_memcpy.h
-+++ b/lib/librte_eal/ppc/include/rte_memcpy.h
-@@ -11,4 +11,5 @@
- 
- #include "rte_altivec.h"
+diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
+index 75f74897b3..b194564b55 100644
+--- a/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
++++ b/lib/librte_eal/common/include/arch/ppc_64/rte_memcpy.h
+@@ -38,4 +38,5 @@
+ /*To include altivec.h, GCC version must  >= 4.8 */
+ #include <altivec.h>
@@ -33 +33 @@
-@@ -18,4 +19,9 @@ extern "C" {
+@@ -45,4 +46,9 @@ extern "C" {
@@ -43 +43 @@
-@@ -193,4 +199,8 @@ rte_memcpy_func(void *dst, const void *src, size_t n)
+@@ -220,4 +226,8 @@ rte_memcpy_func(void *dst, const void *src, size_t n)

[dpdk-stable] patch 'net/i40e: fix flow director for ARP packets' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0518c7dcaa6dafb087c2811a57b2d03111fde8fe

Thanks.

Kevin.

---
From 0518c7dcaa6dafb087c2811a57b2d03111fde8fe Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Wed, 29 Apr 2020 10:03:51 +0800
Subject: [PATCH] net/i40e: fix flow director for ARP packets

[ upstream commit 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 ]

Currently, flow "pattern eth type is 0x0806 / end actions mark id
0x86 / rss / end" can't be created successfully. FDIR parser
shouldn't deny RTE_ETHER_TYPE_ARP since ARP packets will be
parsed as PCTYPE_L2_PAYLOAD. This patch fixes the issue.

Bugzilla ID: 402
Fixes: 42044b69c67d ("net/i40e: support input set selection for FDIR")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 642532ba96..98588d0113 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2544,5 +2544,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 				    ether_type == ETHER_TYPE_IPv4 ||
 				    ether_type == ETHER_TYPE_IPv6 ||
-				    ether_type == ETHER_TYPE_ARP ||
 				    ether_type == outer_tpid) {
 					rte_flow_error_set(error, EINVAL,
@@ -2589,5 +2588,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
 				if (ether_type == ETHER_TYPE_IPv4 ||
 				    ether_type == ETHER_TYPE_IPv6 ||
-				    ether_type == ETHER_TYPE_ARP ||
 				    ether_type == outer_tpid) {
 					rte_flow_error_set(error, EINVAL,
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.394630669 +0100
+++ 0008-net-i40e-fix-flow-director-for-ARP-packets.patch	2020-06-05 19:20:50.713043017 +0100
@@ -1 +1 @@
-From 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 Mon Sep 17 00:00:00 2001
+From 0518c7dcaa6dafb087c2811a57b2d03111fde8fe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 73cc2f0ab5cfaa7f4b2dd4c0cacc98b8e17cc778 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 7e64ae53a3..1533d5abbd 100644
+index 642532ba96..98588d0113 100644
@@ -25,4 +26,4 @@
-@@ -2667,5 +2667,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
- 				    ether_type == RTE_ETHER_TYPE_IPV4 ||
- 				    ether_type == RTE_ETHER_TYPE_IPV6 ||
--				    ether_type == RTE_ETHER_TYPE_ARP ||
+@@ -2544,5 +2544,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+ 				    ether_type == ETHER_TYPE_IPv4 ||
+ 				    ether_type == ETHER_TYPE_IPv6 ||
+-				    ether_type == ETHER_TYPE_ARP ||
@@ -31,4 +32,4 @@
-@@ -2712,5 +2711,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
- 				if (ether_type == RTE_ETHER_TYPE_IPV4 ||
- 				    ether_type == RTE_ETHER_TYPE_IPV6 ||
--				    ether_type == RTE_ETHER_TYPE_ARP ||
+@@ -2589,5 +2588,4 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,
+ 				if (ether_type == ETHER_TYPE_IPv4 ||
+ 				    ether_type == ETHER_TYPE_IPv6 ||
+-				    ether_type == ETHER_TYPE_ARP ||

[dpdk-stable] patch 'doc: add i40e limitation for flow director' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2fbc40cf414096c94ff22db13d72387a50ccf328

Thanks.

Kevin.

---
From 2fbc40cf414096c94ff22db13d72387a50ccf328 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Wed, 29 Apr 2020 10:03:52 +0800
Subject: [PATCH] doc: add i40e limitation for flow director

[ upstream commit 5b728485d6bf5cfb1fb0dadb76b518df3575da07 ]

Each PCTYPE can only have one specific FDIR input set at one time.
Add input set requirement info to i40e doc.

Bugzilla ID: 403
Fixes: 14c66a451ef7 ("net/i40e: flush tunnel filters")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 doc/guides/nics/i40e.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index 62e90d9fd2..01fa817a6d 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -643,4 +643,13 @@ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size
 Configuration of ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` in config files can be changed to use 16 bytes size RX descriptors.
 
+Input set requirement of each pctype for FDIR
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Each PCTYPE can only have one specific FDIR input set at one time.
+For example, if creating 2 rte_flow rules with different input set for one PCTYPE,
+it will fail and return the info "Conflict with the first rule's input set",
+which means the current rule's input set conflicts with the first rule's.
+Remove the first rule if want to change the input set of the PCTYPE.
+
 Example of getting best performance with l3fwd example
 ------------------------------------------------------
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.446346905 +0100
+++ 0009-doc-add-i40e-limitation-for-flow-director.patch	2020-06-05 19:20:50.715042972 +0100
@@ -1 +1 @@
-From 5b728485d6bf5cfb1fb0dadb76b518df3575da07 Mon Sep 17 00:00:00 2001
+From 2fbc40cf414096c94ff22db13d72387a50ccf328 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5b728485d6bf5cfb1fb0dadb76b518df3575da07 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 416b3904ee..2f846091cf 100644
+index 62e90d9fd2..01fa817a6d 100644
@@ -23 +24 @@
-@@ -748,4 +748,13 @@ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size
+@@ -643,4 +643,13 @@ As i40e PMD supports both 16 and 32 bytes RX descriptor sizes, and 16 bytes size

[dpdk-stable] patch 'net/i40e: fix flush of flow director filter' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/25b486624491329927a2d00c96fb2782ef2eeca0

Thanks.

Kevin.

---
From 25b486624491329927a2d00c96fb2782ef2eeca0 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Wed, 29 Apr 2020 10:03:53 +0800
Subject: [PATCH] net/i40e: fix flush of flow director filter

[ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ]

When we flush FDIR filter, we can not call i40e_fdir_teardown()
function as it will free vsi used for FDIR, then the vsi->base_queue
will be freed from pf->qp_pool, but vsi->base_queue can only get
once when do dev init in i40e_pf_setup(). If we free it, it will
never be alloc again.

Bugzilla ID: 404
Fixes: 2e67a7fbf3ff ("net/i40e: config flow director automatically")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 98588d0113..088b92fdd1 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -4767,5 +4767,4 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
 		/* If the last flow is destroyed, disable fdir. */
 		if (!ret && TAILQ_EMPTY(&pf->fdir.fdir_list)) {
-			i40e_fdir_teardown(pf);
 			dev->data->dev_conf.fdir_conf.mode =
 				   RTE_FDIR_MODE_NONE;
@@ -4963,6 +4962,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
 	}
 
-	i40e_fdir_teardown(pf);
-
 	return ret;
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.497159597 +0100
+++ 0010-net-i40e-fix-flush-of-flow-director-filter.patch	2020-06-05 19:20:50.720042858 +0100
@@ -1 +1 @@
-From 1491f63c75596b01b95355e395dde6795fab3c8b Mon Sep 17 00:00:00 2001
+From 25b486624491329927a2d00c96fb2782ef2eeca0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1491f63c75596b01b95355e395dde6795fab3c8b ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 1533d5abbd..65f877866d 100644
+index 98588d0113..088b92fdd1 100644
@@ -26 +27 @@
-@@ -5146,5 +5146,4 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
+@@ -4767,5 +4767,4 @@ i40e_flow_destroy(struct rte_eth_dev *dev,
@@ -30,3 +31,3 @@
- 			i40e_fdir_rx_proc_enable(dev, 0);
- 		}
-@@ -5344,6 +5343,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
+ 			dev->data->dev_conf.fdir_conf.mode =
+ 				   RTE_FDIR_MODE_NONE;
+@@ -4963,6 +4962,4 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)

[dpdk-stable] patch 'vhost: fix peer close check' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7e26c8c450fb5906ab1e1cf039cd0fd2d750869a

Thanks.

Kevin.

---
From 7e26c8c450fb5906ab1e1cf039cd0fd2d750869a Mon Sep 17 00:00:00 2001
From: Roland Qi <roland.qi@ucloud.cn>
Date: Tue, 21 Apr 2020 16:59:39 +0800
Subject: [PATCH] vhost: fix peer close check

[ upstream commit 41f32b052c78898d20d04913a7e205970b96309a ]

In process_slave_message_reply(), there is a
possibility that receiving a peer close
message instead of a real message response.

This patch targeting to handle the peer close
scenario and report the correct error message.

Fixes: a277c7159876 ("vhost: refactor code structure")

Signed-off-by: Roland Qi <roland.qi@ucloud.cn>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/vhost_user.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index e4f72ba876..4ed75104b9 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2330,9 +2330,17 @@ static int process_slave_message_reply(struct virtio_net *dev,
 		return 0;
 
-	if (read_vhost_message(dev->slave_req_fd, &msg_reply) < 0) {
+	ret = read_vhost_message(dev->slave_req_fd, &msg_reply);
+	if (ret <= 0) {
+		if (ret < 0)
+			RTE_LOG(INFO, VHOST_CONFIG,
+				"vhost read slave message reply failed\n");
+		else
+			RTE_LOG(INFO, VHOST_CONFIG,
+				"vhost peer closed\n");
 		ret = -1;
 		goto out;
 	}
 
+	ret = 0;
 	if (msg_reply.request.slave != msg->request.slave) {
 		RTE_LOG(ERR, VHOST_CONFIG,
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.552948687 +0100
+++ 0011-vhost-fix-peer-close-check.patch	2020-06-05 19:20:50.723042790 +0100
@@ -1 +1 @@
-From 41f32b052c78898d20d04913a7e205970b96309a Mon Sep 17 00:00:00 2001
+From 7e26c8c450fb5906ab1e1cf039cd0fd2d750869a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 41f32b052c78898d20d04913a7e205970b96309a ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index bd1be01040..971ccdb01c 100644
+index e4f72ba876..4ed75104b9 100644
@@ -26 +27 @@
-@@ -2813,9 +2813,17 @@ static int process_slave_message_reply(struct virtio_net *dev,
+@@ -2330,9 +2330,17 @@ static int process_slave_message_reply(struct virtio_net *dev,
@@ -33 +34 @@
-+			VHOST_LOG_CONFIG(ERR,
++			RTE_LOG(INFO, VHOST_CONFIG,
@@ -36 +37 @@
-+			VHOST_LOG_CONFIG(INFO,
++			RTE_LOG(INFO, VHOST_CONFIG,
@@ -44 +45 @@
- 		VHOST_LOG_CONFIG(ERR,
+ 		RTE_LOG(ERR, VHOST_CONFIG,

[dpdk-stable] patch 'vhost: prevent zero-copy with incompatible client mode' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/06b2fe9781c3cb251b2ac4255f2578636ace2b54

Thanks.

Kevin.

---
From 06b2fe9781c3cb251b2ac4255f2578636ace2b54 Mon Sep 17 00:00:00 2001
From: Xuan Ding <xuan.ding@intel.com>
Date: Wed, 29 Apr 2020 02:59:46 +0000
Subject: [PATCH] vhost: prevent zero-copy with incompatible client mode

[ upstream commit 715070ea10e6da1169deef2a3ea77ae934b4c333 ]

In server mode, virtio-user inits under the assumption that vhost-user
supports a list of features. However, this could be problematic when
in_order feature is negotiated but not supported by vhost-user when
enables dequeue_zero_copy later.

Add handling when vhost-user enables dequeue_zero_copy as client.

Fixes: 64ab701c3d1e ("vhost: add vhost-user client mode")

Signed-off-by: Xuan Ding <xuan.ding@intel.com>
Tested-by: Yinan Wang <yinan.wang@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/socket.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index 75f6703f56..fb946e8c54 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -891,4 +891,10 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
 	 */
 	if (vsocket->dequeue_zero_copy) {
+		if (!vsocket->is_server) {
+			RTE_LOG(ERR, VHOST_CONFIG,
+			"error: zero copy is incompatible with vhost client mode\n");
+			ret = -1;
+			goto out_mutex;
+		}
 		vsocket->supported_features &= ~(1ULL << VIRTIO_F_IN_ORDER);
 		vsocket->features &= ~(1ULL << VIRTIO_F_IN_ORDER);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.605232045 +0100
+++ 0012-vhost-prevent-zero-copy-with-incompatible-client-mod.patch	2020-06-05 19:20:50.725042744 +0100
@@ -1 +1 @@
-From 715070ea10e6da1169deef2a3ea77ae934b4c333 Mon Sep 17 00:00:00 2001
+From 06b2fe9781c3cb251b2ac4255f2578636ace2b54 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 715070ea10e6da1169deef2a3ea77ae934b4c333 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 7c80121790..bb8d0d7801 100644
+index 75f6703f56..fb946e8c54 100644
@@ -27,3 +28,3 @@
-@@ -927,4 +927,10 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
- 			goto out_mutex;
- 		}
+@@ -891,4 +891,10 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
+ 	 */
+ 	if (vsocket->dequeue_zero_copy) {
@@ -31 +32 @@
-+			VHOST_LOG_CONFIG(ERR,
++			RTE_LOG(ERR, VHOST_CONFIG,

[dpdk-stable] patch 'net/softnic: fix memory leak for thread' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/55284b6b02af122f85940328ba8b17e21f719178

Thanks.

Kevin.

---
From 55284b6b02af122f85940328ba8b17e21f719178 Mon Sep 17 00:00:00 2001
From: Jasvinder Singh <jasvinder.singh@intel.com>
Date: Mon, 27 Apr 2020 18:13:20 +0100
Subject: [PATCH] net/softnic: fix memory leak for thread

[ upstream commit 22335d4348d4b4b615d5556947c0297e0fe5d79b ]

For sending request messages to data plane threads, the
caller invokes thread_msg_send_recv() function which never
returns null response. Thus, removed redundant check on
the returned response.

Coverity issue: 357717, 357772
Fixes: 70709c78fda6 ("net/softnic: add command to enable/disable pipeline")

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 drivers/net/softnic/rte_eth_softnic_thread.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index 4572adfa6a..e42784e4ca 100644
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -268,6 +268,4 @@ softnic_thread_pipeline_enable(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = thread_msg_send_recv(softnic, thread_id, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -356,6 +354,4 @@ softnic_thread_pipeline_disable(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = thread_msg_send_recv(softnic, thread_id, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.653540402 +0100
+++ 0013-net-softnic-fix-memory-leak-for-thread.patch	2020-06-05 19:20:50.727042699 +0100
@@ -1 +1 @@
-From 22335d4348d4b4b615d5556947c0297e0fe5d79b Mon Sep 17 00:00:00 2001
+From 55284b6b02af122f85940328ba8b17e21f719178 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 22335d4348d4b4b615d5556947c0297e0fe5d79b ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index d610b1617e..d61846e030 100644
+index 4572adfa6a..e42784e4ca 100644
@@ -25 +26 @@
-@@ -360,6 +360,4 @@ softnic_thread_pipeline_enable(struct pmd_internals *softnic,
+@@ -268,6 +268,4 @@ softnic_thread_pipeline_enable(struct pmd_internals *softnic,
@@ -32 +33 @@
-@@ -445,6 +443,4 @@ softnic_thread_pipeline_disable(struct pmd_internals *softnic,
+@@ -356,6 +354,4 @@ softnic_thread_pipeline_disable(struct pmd_internals *softnic,

[dpdk-stable] patch 'net/softnic: fix resource leak for pipeline' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/cb85463b7e8a0bd120b43cd9f48ff9981b337f5b

Thanks.

Kevin.

---
From cb85463b7e8a0bd120b43cd9f48ff9981b337f5b Mon Sep 17 00:00:00 2001
From: Jasvinder Singh <jasvinder.singh@intel.com>
Date: Mon, 27 Apr 2020 18:15:51 +0100
Subject: [PATCH] net/softnic: fix resource leak for pipeline

[ upstream commit c1ea7a5f99ce476631281184b109eb5248ce4a32 ]

For sending request messages to data plane threads, the
caller invokes pipeline_msg_send_recv() function which never
returns null response. Thus, removed redundant check on
the returned response.

Coverity issue: 357676, 357680, 357681, 357682, 357690, 357693, 357711
Coverity issue: 357722, 357725, 357734, 357739, 357743, 357747, 357762
Coverity issue: 357766, 357787

Fixes: 6d4d05402501 ("net/softnic: add command to read stats")
Fixes: 202905f3ee4d ("net/softnic: add command to create objects")
Fixes: ee19326a4b1e ("net/softnic: add command for pipeline table entries")
Fixes: 9bc0ce0ad17c ("net/softnic: add command for meter action")
Fixes: 2505030a8383 ("net/softnic: add command for TTL action")

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 drivers/net/softnic/rte_eth_softnic_thread.c | 34 --------------------
 1 file changed, 34 deletions(-)

diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index e42784e4ca..6a888d20ec 100644
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -748,6 +748,4 @@ softnic_pipeline_port_in_stats_read(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -797,6 +795,4 @@ softnic_pipeline_port_in_enable(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -844,6 +840,4 @@ softnic_pipeline_port_in_disable(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -899,6 +893,4 @@ softnic_pipeline_port_out_stats_read(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -956,6 +948,4 @@ softnic_pipeline_table_stats_read(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1236,6 +1226,4 @@ softnic_pipeline_table_rule_add(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1320,6 +1308,4 @@ softnic_pipeline_table_rule_add_default(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1478,6 +1464,4 @@ fail:
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1543,6 +1527,4 @@ softnic_pipeline_table_rule_delete(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1593,6 +1575,4 @@ softnic_pipeline_table_rule_delete_default(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1653,6 +1633,4 @@ softnic_pipeline_table_rule_stats_read(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1734,8 +1712,4 @@ softnic_pipeline_table_mtr_profile_add(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL) {
-		free(mp);
-		return -1;
-	}
 
 	/* Read response */
@@ -1793,6 +1767,4 @@ softnic_pipeline_table_mtr_profile_delete(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1856,6 +1828,4 @@ softnic_pipeline_table_rule_mtr_read(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1921,6 +1891,4 @@ softnic_pipeline_table_dscp_table_update(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1986,6 +1954,4 @@ softnic_pipeline_table_rule_ttl_read(struct pmd_internals *softnic,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.705048772 +0100
+++ 0014-net-softnic-fix-resource-leak-for-pipeline.patch	2020-06-05 19:20:50.730042631 +0100
@@ -1 +1 @@
-From c1ea7a5f99ce476631281184b109eb5248ce4a32 Mon Sep 17 00:00:00 2001
+From cb85463b7e8a0bd120b43cd9f48ff9981b337f5b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c1ea7a5f99ce476631281184b109eb5248ce4a32 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index d61846e030..dcfb5eb82c 100644
+index e42784e4ca..6a888d20ec 100644
@@ -32 +33 @@
-@@ -836,6 +836,4 @@ softnic_pipeline_port_in_stats_read(struct pmd_internals *softnic,
+@@ -748,6 +748,4 @@ softnic_pipeline_port_in_stats_read(struct pmd_internals *softnic,
@@ -39 +40 @@
-@@ -885,6 +883,4 @@ softnic_pipeline_port_in_enable(struct pmd_internals *softnic,
+@@ -797,6 +795,4 @@ softnic_pipeline_port_in_enable(struct pmd_internals *softnic,
@@ -46 +47 @@
-@@ -932,6 +928,4 @@ softnic_pipeline_port_in_disable(struct pmd_internals *softnic,
+@@ -844,6 +840,4 @@ softnic_pipeline_port_in_disable(struct pmd_internals *softnic,
@@ -53 +54 @@
-@@ -987,6 +981,4 @@ softnic_pipeline_port_out_stats_read(struct pmd_internals *softnic,
+@@ -899,6 +893,4 @@ softnic_pipeline_port_out_stats_read(struct pmd_internals *softnic,
@@ -60 +61 @@
-@@ -1044,6 +1036,4 @@ softnic_pipeline_table_stats_read(struct pmd_internals *softnic,
+@@ -956,6 +948,4 @@ softnic_pipeline_table_stats_read(struct pmd_internals *softnic,
@@ -67 +68 @@
-@@ -1324,6 +1314,4 @@ softnic_pipeline_table_rule_add(struct pmd_internals *softnic,
+@@ -1236,6 +1226,4 @@ softnic_pipeline_table_rule_add(struct pmd_internals *softnic,
@@ -74 +75 @@
-@@ -1408,6 +1396,4 @@ softnic_pipeline_table_rule_add_default(struct pmd_internals *softnic,
+@@ -1320,6 +1308,4 @@ softnic_pipeline_table_rule_add_default(struct pmd_internals *softnic,
@@ -81 +82 @@
-@@ -1566,6 +1552,4 @@ fail:
+@@ -1478,6 +1464,4 @@ fail:
@@ -88 +89 @@
-@@ -1631,6 +1615,4 @@ softnic_pipeline_table_rule_delete(struct pmd_internals *softnic,
+@@ -1543,6 +1527,4 @@ softnic_pipeline_table_rule_delete(struct pmd_internals *softnic,
@@ -95 +96 @@
-@@ -1681,6 +1663,4 @@ softnic_pipeline_table_rule_delete_default(struct pmd_internals *softnic,
+@@ -1593,6 +1575,4 @@ softnic_pipeline_table_rule_delete_default(struct pmd_internals *softnic,
@@ -102 +103 @@
-@@ -1741,6 +1721,4 @@ softnic_pipeline_table_rule_stats_read(struct pmd_internals *softnic,
+@@ -1653,6 +1633,4 @@ softnic_pipeline_table_rule_stats_read(struct pmd_internals *softnic,
@@ -109 +110 @@
-@@ -1822,8 +1800,4 @@ softnic_pipeline_table_mtr_profile_add(struct pmd_internals *softnic,
+@@ -1734,8 +1712,4 @@ softnic_pipeline_table_mtr_profile_add(struct pmd_internals *softnic,
@@ -118 +119 @@
-@@ -1881,6 +1855,4 @@ softnic_pipeline_table_mtr_profile_delete(struct pmd_internals *softnic,
+@@ -1793,6 +1767,4 @@ softnic_pipeline_table_mtr_profile_delete(struct pmd_internals *softnic,
@@ -125 +126 @@
-@@ -1944,6 +1916,4 @@ softnic_pipeline_table_rule_mtr_read(struct pmd_internals *softnic,
+@@ -1856,6 +1828,4 @@ softnic_pipeline_table_rule_mtr_read(struct pmd_internals *softnic,
@@ -132 +133 @@
-@@ -2009,6 +1979,4 @@ softnic_pipeline_table_dscp_table_update(struct pmd_internals *softnic,
+@@ -1921,6 +1891,4 @@ softnic_pipeline_table_dscp_table_update(struct pmd_internals *softnic,
@@ -139 +140 @@
-@@ -2074,6 +2042,4 @@ softnic_pipeline_table_rule_ttl_read(struct pmd_internals *softnic,
+@@ -1986,6 +1954,4 @@ softnic_pipeline_table_rule_ttl_read(struct pmd_internals *softnic,

[dpdk-stable] patch 'net/octeontx: fix dangling pointer on init failure' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e3217b5520e71d401785aa63649ac429603065e9

Thanks.

Kevin.

---
From e3217b5520e71d401785aa63649ac429603065e9 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Tue, 7 Apr 2020 19:35:43 +0800
Subject: [PATCH] net/octeontx: fix dangling pointer on init failure

[ upstream commit 5ed5df8073c80d1af9ec8c89a8b2a5299463058d ]

When octeontx_create() is cleaning up, it does not correctly set
the mac_addrs variable to NULL, which will lead to a double free.

Fixes: 9e399b88ce2f ("net/octeontx: fix memory leak of MAC address table")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Harman Kalra <hkalra@marvell.com>
---
 drivers/net/octeontx/octeontx_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index ac193ace43..17128da994 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -1107,4 +1107,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
 free_mac_addrs:
 	rte_free(data->mac_addrs);
+	data->mac_addrs = NULL;
 err:
 	if (nic)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.756091325 +0100
+++ 0015-net-octeontx-fix-dangling-pointer-on-init-failure.patch	2020-06-05 19:20:50.732042585 +0100
@@ -1 +1 @@
-From 5ed5df8073c80d1af9ec8c89a8b2a5299463058d Mon Sep 17 00:00:00 2001
+From e3217b5520e71d401785aa63649ac429603065e9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5ed5df8073c80d1af9ec8c89a8b2a5299463058d ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index ea3b278a15..d5371ae07d 100644
+index ac193ace43..17128da994 100644
@@ -22 +23 @@
-@@ -1455,4 +1455,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
+@@ -1107,4 +1107,5 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,

[dpdk-stable] patch 'net/mlx5: fix RSS enablement' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/02200202f5ea01c97c851395a0431b24025dcd28

Thanks.

Kevin.

---
From 02200202f5ea01c97c851395a0431b24025dcd28 Mon Sep 17 00:00:00 2001
From: Xiaoyu Min <jackmin@mellanox.com>
Date: Wed, 29 Apr 2020 16:00:42 +0300
Subject: [PATCH] net/mlx5: fix RSS enablement

[ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ]

PMD create some default control rules with RSS action
if it's not isolated mode.

However whether default control rules need to do RSS or not should be
controlled by device configuration, the mq_mode of rxmode configuration
in specific.

In another word, only when mq_mode is configured with ETH_MQ_RX_RSS_FLAG
set, then RSS is needed for default rules.

Fixes: c64ccc0eca2f ("mlx5: fix overwritten RSS configuration")

Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 0a0cd1be53..7a6760154a 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2346,4 +2346,6 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
+	if (!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG))
+		action_rss.types = 0;
 	for (i = 0; i != priv->reta_idx_n; ++i)
 		queue[i] = (*priv->reta_idx)[i];
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.810077100 +0100
+++ 0016-net-mlx5-fix-RSS-enablement.patch	2020-06-05 19:20:50.735042517 +0100
@@ -1 +1 @@
-From 0afac6dcca44dea15f23e93851b6e52f014a98e4 Mon Sep 17 00:00:00 2001
+From 02200202f5ea01c97c851395a0431b24025dcd28 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index e9ae2f782c..cb593c9449 100644
+index 0a0cd1be53..7a6760154a 100644
@@ -31,2 +32,2 @@
-@@ -4913,4 +4913,6 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
- 		return 0;
+@@ -2346,4 +2346,6 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
+ 		return -rte_errno;

[dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9b46674b69e29d26d5d23943abbf65a1a270de25

Thanks.

Kevin.

---
From 9b46674b69e29d26d5d23943abbf65a1a270de25 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Mon, 27 Apr 2020 23:40:38 +0530
Subject: [PATCH] eventdev: fix probe and remove for secondary process

[ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ]

When probing event device in secondary process skip reinitializing
the device data structure as it is already done in primary process.

When removing event device in secondary process skip closing the
event device as it should be done by primary process.

Fixes: 322d0345c2bc ("eventdev: implement PMD registration functions")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 lib/librte_eventdev/rte_eventdev.c         | 15 +++++++++------
 lib/librte_eventdev/rte_eventdev_pmd_pci.h |  8 +++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index 6396a96490..a2db0fd5fb 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -14,4 +14,5 @@
 #include <sys/queue.h>
 
+#include <rte_string_fns.h>
 #include <rte_byteorder.h>
 #include <rte_log.h>
@@ -1363,13 +1364,15 @@ rte_event_pmd_allocate(const char *name, int socket_id)
 		eventdev->data = eventdev_data;
 
-		snprintf(eventdev->data->name, RTE_EVENTDEV_NAME_MAX_LEN,
-				"%s", name);
+		if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
 
-		eventdev->data->dev_id = dev_id;
-		eventdev->data->socket_id = socket_id;
-		eventdev->data->dev_started = 0;
+			strlcpy(eventdev->data->name, name,
+				RTE_EVENTDEV_NAME_MAX_LEN);
+
+			eventdev->data->dev_id = dev_id;
+			eventdev->data->socket_id = socket_id;
+			eventdev->data->dev_started = 0;
+		}
 
 		eventdev->attached = RTE_EVENTDEV_ATTACHED;
-
 		eventdev_globals.nb_devs++;
 	}
diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
index 8fb61386fd..443cd38c23 100644
--- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h
+++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
@@ -113,7 +113,9 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev,
 		return -ENODEV;
 
-	ret = rte_event_dev_close(eventdev->data->dev_id);
-	if (ret < 0)
-		return ret;
+	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+		ret = rte_event_dev_close(eventdev->data->dev_id);
+		if (ret < 0)
+			return ret;
+	}
 
 	/* Invoke PMD device un-init function */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.865081148 +0100
+++ 0017-eventdev-fix-probe-and-remove-for-secondary-process.patch	2020-06-05 19:20:50.737042472 +0100
@@ -1 +1 @@
-From a5f30c925b88bb3613535fb27eb3459d19226cd0 Mon Sep 17 00:00:00 2001
+From 9b46674b69e29d26d5d23943abbf65a1a270de25 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- lib/librte_eventdev/rte_eventdev.c         | 13 ++++++++-----
+ lib/librte_eventdev/rte_eventdev.c         | 15 +++++++++------
@@ -20 +21 @@
- 2 files changed, 13 insertions(+), 8 deletions(-)
+ 2 files changed, 14 insertions(+), 9 deletions(-)
@@ -23 +24 @@
-index e72d8b941c..82c177c734 100644
+index 6396a96490..a2db0fd5fb 100644
@@ -26 +27,7 @@
-@@ -1374,12 +1374,15 @@ rte_event_pmd_allocate(const char *name, int socket_id)
+@@ -14,4 +14,5 @@
+ #include <sys/queue.h>
+ 
++#include <rte_string_fns.h>
+ #include <rte_byteorder.h>
+ #include <rte_log.h>
+@@ -1363,13 +1364,15 @@ rte_event_pmd_allocate(const char *name, int socket_id)
@@ -29 +36,2 @@
--		strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN);
+-		snprintf(eventdev->data->name, RTE_EVENTDEV_NAME_MAX_LEN,
+-				"%s", name);

[dpdk-stable] patch 'event/dsw: avoid reusing previously recorded events' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b835689b4d292674d43c4dcd11ed935312954e4d

Thanks.

Kevin.

---
From b835689b4d292674d43c4dcd11ed935312954e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
Date: Mon, 4 May 2020 11:30:59 +0200
Subject: [PATCH] event/dsw: avoid reusing previously recorded events
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 52b66b2f208aea74e5fc3b004c1e14056bb22970 ]

Avoid reusing recorded events when performing a migration, since this
may make the migration selection logic pick an already-moved flow.

Fixes: f6257b22e767 ("event/dsw: add load balancing")

Reported-by: Venky Venkatesh <vvenkatesh@paloaltonetworks.com>
Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
---
 drivers/event/dsw/dsw_event.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
index 10e44fd497..f3873c54e5 100644
--- a/drivers/event/dsw/dsw_event.c
+++ b/drivers/event/dsw/dsw_event.c
@@ -659,4 +659,7 @@ dsw_port_consider_migration(struct dsw_evdev *dsw,
 		return;
 
+	if (seen_events_len < DSW_MAX_EVENTS_RECORDED)
+		return;
+
 	DSW_LOG_DP_PORT(DEBUG, source_port->id, "Considering migration.\n");
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.913567844 +0100
+++ 0018-event-dsw-avoid-reusing-previously-recorded-events.patch	2020-06-05 19:20:50.738042449 +0100
@@ -1 +1 @@
-From 52b66b2f208aea74e5fc3b004c1e14056bb22970 Mon Sep 17 00:00:00 2001
+From b835689b4d292674d43c4dcd11ed935312954e4d Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 52b66b2f208aea74e5fc3b004c1e14056bb22970 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 8323903736..e5e3597aae 100644
+index 10e44fd497..f3873c54e5 100644
@@ -25 +26 @@
-@@ -822,4 +822,7 @@ dsw_port_consider_emigration(struct dsw_evdev *dsw,
+@@ -659,4 +659,7 @@ dsw_port_consider_migration(struct dsw_evdev *dsw,
@@ -31 +32 @@
- 	DSW_LOG_DP_PORT(DEBUG, source_port->id, "Considering emigration.\n");
+ 	DSW_LOG_DP_PORT(DEBUG, source_port->id, "Considering migration.\n");

[dpdk-stable] patch 'service: fix race condition for MT unsafe service' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/817639c78342003d5d3d675f6bc0eca05ee2c6be

Thanks.

Kevin.

---
From 817639c78342003d5d3d675f6bc0eca05ee2c6be Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Date: Wed, 6 May 2020 23:27:59 +0800
Subject: [PATCH] service: fix race condition for MT unsafe service

[ upstream commit 18cae99cb9096abe0f33b43e51eb8b781e8a5ff9 ]

A MT unsafe service might get configured to run on another core
while the service is running currently. This might result in the
MT unsafe service running on multiple cores simultaneously. Use
'execute_lock' always when the service is MT unsafe.

If the service is known to be mapped on a single lcore,
setting the service capability to MT safe will avoid taking
the lock and improve the performance.

Fixes: e9139a32f6e8 ("service: add function to run on app lcore")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 lib/librte_eal/common/include/rte_service.h           |  8 ++++++--
 lib/librte_eal/common/include/rte_service_component.h |  6 +++++-
 lib/librte_eal/common/rte_service.c                   | 11 +++++------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
index 11f673503b..21002209bc 100644
--- a/lib/librte_eal/common/include/rte_service.h
+++ b/lib/librte_eal/common/include/rte_service.h
@@ -105,10 +105,14 @@ int32_t rte_service_probe_capability(uint32_t id, uint32_t capability);
  * function enables or disables *lcore* to run *service_id*.
  *
- * If multiple cores are enabled on a service, an atomic is used to ensure that
- * only one cores runs the service at a time. The exception to this is when
+ * If multiple cores are enabled on a service, a lock is used to ensure that
+ * only one core runs the service at a time. The exception to this is when
  * a service indicates that it is multi-thread safe by setting the capability
  * called RTE_SERVICE_CAP_MT_SAFE. With the multi-thread safe capability set,
  * the service function can be run on multiple threads at the same time.
  *
+ * If the service is known to be mapped to a single lcore, setting the
+ * capability of the service to RTE_SERVICE_CAP_MT_SAFE can achieve
+ * better performance by avoiding the use of lock.
+ *
  * @param service_id the service to apply the lcore to
  * @param lcore The lcore that will be mapped to service
diff --git a/lib/librte_eal/common/include/rte_service_component.h b/lib/librte_eal/common/include/rte_service_component.h
index c12adbc256..259e3182d8 100644
--- a/lib/librte_eal/common/include/rte_service_component.h
+++ b/lib/librte_eal/common/include/rte_service_component.h
@@ -44,5 +44,5 @@ struct rte_service_spec {
  * Register a new service.
  *
- * A service represents a component that the requires CPU time periodically to
+ * A service represents a component that requires CPU time periodically to
  * achieve its purpose.
  *
@@ -57,4 +57,8 @@ struct rte_service_spec {
  * component is ready to be executed.
  *
+ * If the service is known to be mapped to a single lcore, setting the
+ * capability of the service to RTE_SERVICE_CAP_MT_SAFE can achieve
+ * better performance.
+ *
  * @param spec The specification of the service to register
  * @param[out] service_id A pointer to a uint32_t, which will be filled in
diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index 5e757fbd19..e71e1efaa8 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -50,4 +50,8 @@ struct rte_service_spec_impl {
 
 	/* per service statistics */
+	/* Indicates how many cores the service is mapped to run on.
+	 * It does not indicate the number of cores the service is running
+	 * on currently.
+	 */
 	rte_atomic32_t num_mapped_cores;
 	uint64_t calls;
@@ -370,10 +374,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
 	cs->service_active_on_lcore[i] = 1;
 
-	/* check do we need cmpset, if MT safe or <= 1 core
-	 * mapped, atomic ops are not required.
-	 */
-	const int use_atomics = (service_mt_safe(s) == 0) &&
-				(rte_atomic32_read(&s->num_mapped_cores) > 1);
-	if (use_atomics) {
+	if (service_mt_safe(s) == 0) {
 		if (!rte_atomic32_cmpset((uint32_t *)&s->execute_lock, 0, 1))
 			return -EBUSY;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.965166867 +0100
+++ 0019-service-fix-race-condition-for-MT-unsafe-service.patch	2020-06-05 19:20:50.740042404 +0100
@@ -1 +1 @@
-From 18cae99cb9096abe0f33b43e51eb8b781e8a5ff9 Mon Sep 17 00:00:00 2001
+From 817639c78342003d5d3d675f6bc0eca05ee2c6be Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 18cae99cb9096abe0f33b43e51eb8b781e8a5ff9 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -22,3 +23,3 @@
- lib/librte_eal/common/rte_service.c            | 11 +++++------
- lib/librte_eal/include/rte_service.h           |  8 ++++++--
- lib/librte_eal/include/rte_service_component.h |  6 +++++-
+ lib/librte_eal/common/include/rte_service.h           |  8 ++++++--
+ lib/librte_eal/common/include/rte_service_component.h |  6 +++++-
+ lib/librte_eal/common/rte_service.c                   | 11 +++++------
@@ -27,29 +28,4 @@
-diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
-index 70d17a5d79..b8c465eb96 100644
---- a/lib/librte_eal/common/rte_service.c
-+++ b/lib/librte_eal/common/rte_service.c
-@@ -51,4 +51,8 @@ struct rte_service_spec_impl {
- 
- 	/* per service statistics */
-+	/* Indicates how many cores the service is mapped to run on.
-+	 * It does not indicate the number of cores the service is running
-+	 * on currently.
-+	 */
- 	rte_atomic32_t num_mapped_cores;
- 	uint64_t calls;
-@@ -371,10 +375,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
- 	cs->service_active_on_lcore[i] = 1;
- 
--	/* check do we need cmpset, if MT safe or <= 1 core
--	 * mapped, atomic ops are not required.
--	 */
--	const int use_atomics = (service_mt_safe(s) == 0) &&
--				(rte_atomic32_read(&s->num_mapped_cores) > 1);
--	if (use_atomics) {
-+	if (service_mt_safe(s) == 0) {
- 		if (!rte_atomic32_cmpset((uint32_t *)&s->execute_lock, 0, 1))
- 			return -EBUSY;
-diff --git a/lib/librte_eal/include/rte_service.h b/lib/librte_eal/include/rte_service.h
-index d8701dd4cf..3a1c735c58 100644
---- a/lib/librte_eal/include/rte_service.h
-+++ b/lib/librte_eal/include/rte_service.h
+diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
+index 11f673503b..21002209bc 100644
+--- a/lib/librte_eal/common/include/rte_service.h
++++ b/lib/librte_eal/common/include/rte_service.h
@@ -73,4 +49,4 @@
-diff --git a/lib/librte_eal/include/rte_service_component.h b/lib/librte_eal/include/rte_service_component.h
-index 16eab79eea..b75aba11b9 100644
---- a/lib/librte_eal/include/rte_service_component.h
-+++ b/lib/librte_eal/include/rte_service_component.h
+diff --git a/lib/librte_eal/common/include/rte_service_component.h b/lib/librte_eal/common/include/rte_service_component.h
+index c12adbc256..259e3182d8 100644
+--- a/lib/librte_eal/common/include/rte_service_component.h
++++ b/lib/librte_eal/common/include/rte_service_component.h
@@ -92,0 +69,25 @@
+diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
+index 5e757fbd19..e71e1efaa8 100644
+--- a/lib/librte_eal/common/rte_service.c
++++ b/lib/librte_eal/common/rte_service.c
+@@ -50,4 +50,8 @@ struct rte_service_spec_impl {
+ 
+ 	/* per service statistics */
++	/* Indicates how many cores the service is mapped to run on.
++	 * It does not indicate the number of cores the service is running
++	 * on currently.
++	 */
+ 	rte_atomic32_t num_mapped_cores;
+ 	uint64_t calls;
+@@ -370,10 +374,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
+ 	cs->service_active_on_lcore[i] = 1;
+ 
+-	/* check do we need cmpset, if MT safe or <= 1 core
+-	 * mapped, atomic ops are not required.
+-	 */
+-	const int use_atomics = (service_mt_safe(s) == 0) &&
+-				(rte_atomic32_read(&s->num_mapped_cores) > 1);
+-	if (use_atomics) {
++	if (service_mt_safe(s) == 0) {
+ 		if (!rte_atomic32_cmpset((uint32_t *)&s->execute_lock, 0, 1))
+ 			return -EBUSY;

[dpdk-stable] patch 'service: fix identification of service running on other lcore' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e41b1e38cc5bb71254248dcb3ea0e3242adefe58

Thanks.

Kevin.

---
From e41b1e38cc5bb71254248dcb3ea0e3242adefe58 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Date: Wed, 6 May 2020 23:28:00 +0800
Subject: [PATCH] service: fix identification of service running on other lcore

[ upstream commit 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 ]

The logic to identify if the MT unsafe service is running on another
core can return -EBUSY spuriously. In such cases, running the service
becomes costlier than using atomic operations. Assume that the
application passes the right parameters and reduce the number of
instructions for all cases.

Fixes: 8d39d3e237c2 ("service: fix race in service on app lcore function")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 lib/librte_eal/common/rte_service.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index e71e1efaa8..0030e44e94 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -360,5 +360,5 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s,
 static int32_t
 service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
-	    struct rte_service_spec_impl *s)
+	    struct rte_service_spec_impl *s, uint32_t serialize_mt_unsafe)
 {
 	if (!s)
@@ -374,5 +374,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
 	cs->service_active_on_lcore[i] = 1;
 
-	if (service_mt_safe(s) == 0) {
+	if ((service_mt_safe(s) == 0) && (serialize_mt_unsafe == 1)) {
 		if (!rte_atomic32_cmpset((uint32_t *)&s->execute_lock, 0, 1))
 			return -EBUSY;
@@ -412,22 +412,12 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
 	SERVICE_VALID_GET_OR_ERR_RET(id, s, -EINVAL);
 
-	/* Atomically add this core to the mapped cores first, then examine if
-	 * we can run the service. This avoids a race condition between
-	 * checking the value, and atomically adding to the mapped count.
+	/* Increment num_mapped_cores to reflect that this core is
+	 * now mapped capable of running the service.
 	 */
-	if (serialize_mt_unsafe)
-		rte_atomic32_inc(&s->num_mapped_cores);
+	rte_atomic32_inc(&s->num_mapped_cores);
 
-	if (service_mt_safe(s) == 0 &&
-			rte_atomic32_read(&s->num_mapped_cores) > 1) {
-		if (serialize_mt_unsafe)
-			rte_atomic32_dec(&s->num_mapped_cores);
-		return -EBUSY;
-	}
+	int ret = service_run(id, cs, UINT64_MAX, s, serialize_mt_unsafe);
 
-	int ret = service_run(id, cs, UINT64_MAX, s);
-
-	if (serialize_mt_unsafe)
-		rte_atomic32_dec(&s->num_mapped_cores);
+	rte_atomic32_dec(&s->num_mapped_cores);
 
 	return ret;
@@ -449,5 +439,5 @@ rte_service_runner_func(void *arg)
 				continue;
 			/* return value ignored as no change to code flow */
-			service_run(i, cs, service_mask, service_get(i));
+			service_run(i, cs, service_mask, service_get(i), 1);
 		}
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.015288547 +0100
+++ 0020-service-fix-identification-of-service-running-on-oth.patch	2020-06-05 19:20:50.741042381 +0100
@@ -1 +1 @@
-From 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 Mon Sep 17 00:00:00 2001
+From e41b1e38cc5bb71254248dcb3ea0e3242adefe58 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c76111f068c4ef8aff4f5b4e2e641a21ff733a0 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index b8c465eb96..c283408cf1 100644
+index e71e1efaa8..0030e44e94 100644
@@ -26 +27 @@
-@@ -361,5 +361,5 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s,
+@@ -360,5 +360,5 @@ rte_service_runner_do_callback(struct rte_service_spec_impl *s,
@@ -33 +34 @@
-@@ -375,5 +375,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
+@@ -374,5 +374,5 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
@@ -40 +41 @@
-@@ -413,22 +413,12 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
+@@ -412,22 +412,12 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
@@ -68 +69 @@
-@@ -450,5 +440,5 @@ rte_service_runner_func(void *arg)
+@@ -449,5 +439,5 @@ rte_service_runner_func(void *arg)

[dpdk-stable] patch 'service: remove rte prefix from static functions' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/074b26486c5303b1d70888152e141a659feb77c4

Thanks.

Kevin.

---
From 074b26486c5303b1d70888152e141a659feb77c4 Mon Sep 17 00:00:00 2001
From: Phil Yang <phil.yang@arm.com>
Date: Wed, 6 May 2020 23:28:01 +0800
Subject: [PATCH] service: remove rte prefix from static functions

[ upstream commit 7a0ad72f6e1fc31e020af77d102dc2f1e67d52b9 ]

clean up rte prefix from static functions.
remove unused parameter for service_dump_one function.

Signed-off-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 lib/librte_eal/common/rte_service.c | 36 ++++++++++-------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index 0030e44e94..607f9a0407 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -340,6 +340,6 @@ rte_service_runstate_get(uint32_t id)
 
 static inline void
-rte_service_runner_do_callback(struct rte_service_spec_impl *s,
-			       struct core_state *cs, uint32_t service_idx)
+service_runner_do_callback(struct rte_service_spec_impl *s,
+			   struct core_state *cs, uint32_t service_idx)
 {
 	void *userdata = s->spec.callback_userdata;
@@ -378,8 +378,8 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
 			return -EBUSY;
 
-		rte_service_runner_do_callback(s, cs, i);
+		service_runner_do_callback(s, cs, i);
 		rte_atomic32_clear(&s->execute_lock);
 	} else
-		rte_service_runner_do_callback(s, cs, i);
+		service_runner_do_callback(s, cs, i);
 
 	return 0;
@@ -425,5 +425,5 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
 
 static int32_t
-rte_service_runner_func(void *arg)
+service_runner_func(void *arg)
 {
 	RTE_SET_USED(arg);
@@ -432,5 +432,5 @@ rte_service_runner_func(void *arg)
 	struct core_state *cs = &lcore_states[lcore];
 
-	while (lcore_states[lcore].runstate == RUNSTATE_RUNNING) {
+	while (cs->runstate == RUNSTATE_RUNNING) {
 		const uint64_t service_mask = cs->service_mask;
 
@@ -693,7 +693,7 @@ rte_service_lcore_start(uint32_t lcore)
 	 * return immediately as runstate keeps it in the service poll loop
 	 */
-	lcore_states[lcore].runstate = RUNSTATE_RUNNING;
+	cs->runstate = RUNSTATE_RUNNING;
 
-	int ret = rte_eal_remote_launch(rte_service_runner_func, 0, lcore);
+	int ret = rte_eal_remote_launch(service_runner_func, 0, lcore);
 	/* returns -EBUSY if the core is already launched, 0 on success */
 	return ret;
@@ -774,11 +774,7 @@ rte_service_lcore_attr_get(uint32_t lcore, uint32_t attr_id,
 
 static void
-rte_service_dump_one(FILE *f, struct rte_service_spec_impl *s,
-		     uint64_t all_cycles, uint32_t reset)
+service_dump_one(FILE *f, struct rte_service_spec_impl *s, uint32_t reset)
 {
 	/* avoid divide by zero */
-	if (all_cycles == 0)
-		all_cycles = 1;
-
 	int calls = 1;
 	if (s->calls != 0)
@@ -807,5 +803,5 @@ rte_service_attr_reset_all(uint32_t id)
 
 	int reset = 1;
-	rte_service_dump_one(NULL, s, 0, reset);
+	service_dump_one(NULL, s, reset);
 	return 0;
 }
@@ -851,12 +847,4 @@ rte_service_dump(FILE *f, uint32_t id)
 	int print_one = (id != UINT32_MAX);
 
-	uint64_t total_cycles = 0;
-
-	for (i = 0; i < RTE_SERVICE_NUM_MAX; i++) {
-		if (!service_valid(i))
-			continue;
-		total_cycles += rte_services[i].cycles_spent;
-	}
-
 	/* print only the specified service */
 	if (print_one) {
@@ -865,5 +853,5 @@ rte_service_dump(FILE *f, uint32_t id)
 		fprintf(f, "Service %s Summary\n", s->spec.name);
 		uint32_t reset = 0;
-		rte_service_dump_one(f, s, total_cycles, reset);
+		service_dump_one(f, s, reset);
 		return 0;
 	}
@@ -875,5 +863,5 @@ rte_service_dump(FILE *f, uint32_t id)
 			continue;
 		uint32_t reset = 0;
-		rte_service_dump_one(f, &rte_services[i], total_cycles, reset);
+		service_dump_one(f, &rte_services[i], reset);
 	}
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.063309190 +0100
+++ 0021-service-remove-rte-prefix-from-static-functions.patch	2020-06-05 19:20:50.742042358 +0100
@@ -1 +1 @@
-From 7a0ad72f6e1fc31e020af77d102dc2f1e67d52b9 Mon Sep 17 00:00:00 2001
+From 074b26486c5303b1d70888152e141a659feb77c4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7a0ad72f6e1fc31e020af77d102dc2f1e67d52b9 ]
+
@@ -17 +19 @@
-index c283408cf1..94266e83ff 100644
+index 0030e44e94..607f9a0407 100644
@@ -20 +22 @@
-@@ -341,6 +341,6 @@ rte_service_runstate_get(uint32_t id)
+@@ -340,6 +340,6 @@ rte_service_runstate_get(uint32_t id)
@@ -29 +31 @@
-@@ -379,8 +379,8 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
+@@ -378,8 +378,8 @@ service_run(uint32_t i, struct core_state *cs, uint64_t service_mask,
@@ -40 +42 @@
-@@ -426,5 +426,5 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
+@@ -425,5 +425,5 @@ rte_service_run_iter_on_app_lcore(uint32_t id, uint32_t serialize_mt_unsafe)
@@ -47 +49 @@
-@@ -433,5 +433,5 @@ rte_service_runner_func(void *arg)
+@@ -432,5 +432,5 @@ rte_service_runner_func(void *arg)
@@ -54 +56 @@
-@@ -694,7 +694,7 @@ rte_service_lcore_start(uint32_t lcore)
+@@ -693,7 +693,7 @@ rte_service_lcore_start(uint32_t lcore)
@@ -64 +66 @@
-@@ -775,11 +775,7 @@ rte_service_lcore_attr_get(uint32_t lcore, uint32_t attr_id,
+@@ -774,11 +774,7 @@ rte_service_lcore_attr_get(uint32_t lcore, uint32_t attr_id,
@@ -77 +79 @@
-@@ -808,5 +804,5 @@ rte_service_attr_reset_all(uint32_t id)
+@@ -807,5 +803,5 @@ rte_service_attr_reset_all(uint32_t id)
@@ -84 +86 @@
-@@ -852,12 +848,4 @@ rte_service_dump(FILE *f, uint32_t id)
+@@ -851,12 +847,4 @@ rte_service_dump(FILE *f, uint32_t id)
@@ -97 +99 @@
-@@ -866,5 +854,5 @@ rte_service_dump(FILE *f, uint32_t id)
+@@ -865,5 +853,5 @@ rte_service_dump(FILE *f, uint32_t id)
@@ -104 +106 @@
-@@ -876,5 +864,5 @@ rte_service_dump(FILE *f, uint32_t id)
+@@ -875,5 +863,5 @@ rte_service_dump(FILE *f, uint32_t id)

[dpdk-stable] patch 'remove references to private PCI probe function' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3538ace6654b31aecbac0581e1f93c3046c2abfe

Thanks.

Kevin.

---
From 3538ace6654b31aecbac0581e1f93c3046c2abfe Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 6 May 2020 14:43:13 +0200
Subject: [PATCH] remove references to private PCI probe function

[ upstream commit 87db93e07aeeecc96a9e63b43a652511b95013d6 ]

rte_pci_probe() is private to the PCI bus.
Clean the remaining references in the documentation and comments.

Fixes: c752998b5e2e ("pci: introduce library and driver")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Gaetan Rivet <grive@u256.net>
---
 doc/guides/sample_app_ug/l2_forward_real_virtual.rst |  9 ---------
 doc/guides/sample_app_ug/link_status_intr.rst        |  7 -------
 doc/guides/sample_app_ug/multi_process.rst           |  2 +-
 drivers/bus/pci/pci_common.c                         |  6 +++---
 drivers/bus/pci/private.h                            | 10 ----------
 drivers/net/virtio/virtio_user_ethdev.c              |  2 +-
 6 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst
index 87653ec7bd..9729095872 100644
--- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst
+++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst
@@ -195,7 +195,4 @@ in the *DPDK Programmer's Guide* - Rel 1.4 EAR and the *DPDK API Reference*.
 .. code-block:: c
 
-    if (rte_pci_probe() < 0)
-        rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
-
     /* reset l2fwd_dst_ports */
 
@@ -227,10 +224,4 @@ in the *DPDK Programmer's Guide* - Rel 1.4 EAR and the *DPDK API Reference*.
     }
 
-Observe that:
-
-*   rte_igb_pmd_init_all() simultaneously registers the driver as a PCI driver and as an Ethernet* Poll Mode Driver.
-
-*   rte_pci_probe() parses the devices on the PCI bus and initializes recognized devices.
-
 The next step is to configure the RX and TX queues.
 For each port, there is only one RX queue (only one lcore is able to poll a given port).
diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst
index 695c088e88..45f2439a32 100644
--- a/doc/guides/sample_app_ug/link_status_intr.rst
+++ b/doc/guides/sample_app_ug/link_status_intr.rst
@@ -89,7 +89,4 @@ To fully understand this code, it is recommended to study the chapters that rela
 .. code-block:: c
 
-    if (rte_pci_probe() < 0)
-        rte_exit(EXIT_FAILURE, "Cannot probe PCI\n");
-
     /*
      * Each logical core is assigned a dedicated TX queue on each port.
@@ -116,8 +113,4 @@ To fully understand this code, it is recommended to study the chapters that rela
     }
 
-Observe that:
-
-*   rte_pci_probe()  parses the devices on the PCI bus and initializes recognized devices.
-
 The next step is to configure the RX and TX queues.
 For each port, there is only one RX queue (only one lcore is able to poll a given port).
diff --git a/doc/guides/sample_app_ug/multi_process.rst b/doc/guides/sample_app_ug/multi_process.rst
index 9c374da6f7..f2a79a6397 100644
--- a/doc/guides/sample_app_ug/multi_process.rst
+++ b/doc/guides/sample_app_ug/multi_process.rst
@@ -210,5 +210,5 @@ How the Application Works
 
 The initialization calls in both the primary and secondary instances are the same for the most part,
-calling the rte_eal_init(), 1 G and 10 G driver initialization and then rte_pci_probe() functions.
+calling the rte_eal_init(), 1 G and 10 G driver initialization and then probing devices.
 Thereafter, the initialization done depends on whether the process is configured as a primary or secondary instance.
 
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 6276e5d695..79d4665720 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -274,6 +274,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
  * for discovered devices.
  */
-int
-rte_pci_probe(void)
+static int
+pci_probe(void)
 {
 	struct rte_pci_device *dev = NULL;
@@ -532,5 +532,5 @@ struct rte_pci_bus rte_pci_bus = {
 	.bus = {
 		.scan = rte_pci_scan,
-		.probe = rte_pci_probe,
+		.probe = pci_probe,
 		.find_device = pci_find_device,
 		.plug = pci_plug,
diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index 13c3324bb0..22cefc8b93 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -18,14 +18,4 @@ struct rte_pci_device;
 extern struct rte_pci_bus rte_pci_bus;
 
-/**
- * Probe the PCI bus
- *
- * @return
- *   - 0 on success.
- *   - !0 on error.
- */
-int
-rte_pci_probe(void);
-
 /**
  * Scan the content of the PCI bus, and the devices in the devices
diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 6c184075dd..7c275c7397 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -620,5 +620,5 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
 	}
 
-	/* previously called by rte_pci_probe() for physical dev */
+	/* previously called by pci probing for physical dev */
 	if (eth_virtio_dev_init(eth_dev) < 0) {
 		PMD_INIT_LOG(ERR, "eth_virtio_dev_init fails");
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.112162302 +0100
+++ 0022-remove-references-to-private-PCI-probe-function.patch	2020-06-05 19:20:50.746042267 +0100
@@ -1 +1 @@
-From 87db93e07aeeecc96a9e63b43a652511b95013d6 Mon Sep 17 00:00:00 2001
+From 3538ace6654b31aecbac0581e1f93c3046c2abfe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 87db93e07aeeecc96a9e63b43a652511b95013d6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +15,0 @@
- doc/guides/sample_app_ug/l2_forward_event.rst        |  8 --------
@@ -22 +22 @@
- 7 files changed, 5 insertions(+), 39 deletions(-)
+ 6 files changed, 5 insertions(+), 31 deletions(-)
@@ -24,22 +23,0 @@
-diff --git a/doc/guides/sample_app_ug/l2_forward_event.rst b/doc/guides/sample_app_ug/l2_forward_event.rst
-index 8bdf352c4e..d536eee819 100644
---- a/doc/guides/sample_app_ug/l2_forward_event.rst
-+++ b/doc/guides/sample_app_ug/l2_forward_event.rst
-@@ -205,7 +205,4 @@ chapters that related to the Poll Mode and Event mode Driver in the
- .. code-block:: c
- 
--    if (rte_pci_probe() < 0)
--        rte_panic("Cannot probe PCI\n");
--
-     /* reset l2fwd_dst_ports */
- 
-@@ -237,9 +234,4 @@ chapters that related to the Poll Mode and Event mode Driver in the
-     }
- 
--Observe that:
--
--*   rte_pci_probe() parses the devices on the PCI bus and initializes recognized
--    devices.
--
- The next step is to configure the RX and TX queues. For each port, there is only
- one RX queue (only one lcore is able to poll a given port). The number of TX
@@ -47 +25 @@
-index 39d6b0067a..671d0c7c19 100644
+index 87653ec7bd..9729095872 100644
@@ -70 +48 @@
-index 5283be8b7c..04c40f2854 100644
+index 695c088e88..45f2439a32 100644
@@ -102 +80 @@
-index 6585a4b476..648705582a 100644
+index 6276e5d695..79d4665720 100644
@@ -105 +83 @@
-@@ -293,6 +293,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
+@@ -274,6 +274,6 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
@@ -114 +92 @@
-@@ -680,5 +680,5 @@ struct rte_pci_bus rte_pci_bus = {
+@@ -532,5 +532,5 @@ struct rte_pci_bus rte_pci_bus = {
@@ -122 +100 @@
-index a205d4d9f0..af1c7ae5fe 100644
+index 13c3324bb0..22cefc8b93 100644
@@ -141 +119 @@
-index c54698ad1e..dfc5291d4c 100644
+index 6c184075dd..7c275c7397 100644
@@ -144 +122 @@
-@@ -734,5 +734,5 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
+@@ -620,5 +620,5 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)

[dpdk-stable] patch 'examples/l2fwd-keepalive: fix mbuf pool size' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4e817507780e4547491c22d2f1d240706e364c98

Thanks.

Kevin.

---
From 4e817507780e4547491c22d2f1d240706e364c98 Mon Sep 17 00:00:00 2001
From: Louise Kilheeney <louise.kilheeney@intel.com>
Date: Mon, 27 Apr 2020 15:57:43 +0100
Subject: [PATCH] examples/l2fwd-keepalive: fix mbuf pool size

[ upstream commit 0c2b79e8d59f31bc4bd39a7cd8f1960689465979 ]

MBUF pool of size 8192 was causing packet loss when using four ports. To
fix this issue this patch specifies the number of MBUF's per port
instead of having one set MBUF pool size, this way it will adapt to any
number of ports.

Fixes: e64833f2273a ("examples/l2fwd-keepalive: add sample application")

Signed-off-by: Louise Kilheeney <louise.kilheeney@intel.com>
Tested-by: Xi Zhang <xix.zhang@intel.com>
---
 examples/l2fwd-keepalive/main.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 0bf2b53364..16c0a1c034 100644
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -45,5 +45,5 @@
 #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
 
-#define NB_MBUF   8192
+#define NB_MBUF_PER_PORT 3000
 
 #define MAX_PKT_BURST 32
@@ -529,4 +529,5 @@ main(int argc, char **argv)
 	unsigned lcore_id, rx_lcore_id;
 	unsigned nb_ports_in_mask = 0;
+	unsigned int total_nb_mbufs;
 	struct sigaction signal_handler;
 	struct rte_keepalive_shm *ka_shm;
@@ -554,14 +555,17 @@ main(int argc, char **argv)
 		rte_exit(EXIT_FAILURE, "Invalid L2FWD arguments\n");
 
-	/* create the mbuf pool */
-	l2fwd_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", NB_MBUF, 32,
-		0, RTE_MBUF_DEFAULT_BUF_SIZE, rte_socket_id());
-	if (l2fwd_pktmbuf_pool == NULL)
-		rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
-
 	nb_ports = rte_eth_dev_count_avail();
 	if (nb_ports == 0)
 		rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
 
+	/* create the mbuf pool */
+	total_nb_mbufs = NB_MBUF_PER_PORT * nb_ports;
+
+	l2fwd_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool",
+		total_nb_mbufs,	32, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
+		rte_socket_id());
+	if (l2fwd_pktmbuf_pool == NULL)
+		rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
+
 	/* reset l2fwd_dst_ports */
 	for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.163682394 +0100
+++ 0023-examples-l2fwd-keepalive-fix-mbuf-pool-size.patch	2020-06-05 19:20:50.747042245 +0100
@@ -1 +1 @@
-From 0c2b79e8d59f31bc4bd39a7cd8f1960689465979 Mon Sep 17 00:00:00 2001
+From 4e817507780e4547491c22d2f1d240706e364c98 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0c2b79e8d59f31bc4bd39a7cd8f1960689465979 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 2ae5a3c6a9..32482158d6 100644
+index 0bf2b53364..16c0a1c034 100644
@@ -31 +32 @@
-@@ -537,4 +537,5 @@ main(int argc, char **argv)
+@@ -529,4 +529,5 @@ main(int argc, char **argv)
@@ -37 +38 @@
-@@ -562,14 +563,17 @@ main(int argc, char **argv)
+@@ -554,14 +555,17 @@ main(int argc, char **argv)

[dpdk-stable] patch 'mem: fix overflow on allocation' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/246bd855dff27be510ab98af9629124d3f610cd4

Thanks.

Kevin.

---
From 246bd855dff27be510ab98af9629124d3f610cd4 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@mellanox.com>
Date: Thu, 7 May 2020 16:02:54 +0800
Subject: [PATCH] mem: fix overflow on allocation

[ upstream commit b341a09c1dd3664b43d5b3a91b6a83136f2d4a12 ]

The size checking is done in the caller. The size parameter is an
unsigned (64b wide) right now, so the comparison with zero should be
enough in most cases. But it won't help in the following case.
If the allocating request input a huge number by mistake, e.g., some
overflow after the calculation (especially subtraction), the checking
in the caller will succeed since it is not zero. Indeed, there is not
enough space in the system to support such huge memory allocation.
Usually it will return failure in the following code. But if the
input size is just a little smaller than the UINT64_MAX, like -2 in
signed type.
The roundup will cause an overflow and then "reset" the size to 0,
and then only a header (128B now) with zero length will be returned.
The following will be the previous allocation header.
It should be OK in most cases if the application won't access the
memory body. Or else, some critical issue will be caused and not easy
to debug. So this issue should be prevented at the beginning, like
other big size failure, NULL pointer should be returned also.

Fixes: fdf20fa7bee9 ("add prefix to cache line macros")

Signed-off-by: Bing Zhao <bingz@mellanox.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/malloc_heap.c |  3 +++
 test/test/test_malloc.c             | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
index b8f26f2b37..de3b73e8c5 100644
--- a/lib/librte_eal/common/malloc_heap.c
+++ b/lib/librte_eal/common/malloc_heap.c
@@ -239,4 +239,7 @@ heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,
 	align = RTE_CACHE_LINE_ROUNDUP(align);
 
+	/* roundup might cause an overflow */
+	if (size == 0)
+		return NULL;
 	elem = find_suitable_element(heap, size, flags, align, bound, contig);
 	if (elem != NULL) {
diff --git a/test/test/test_malloc.c b/test/test/test_malloc.c
index 5e52724194..20788011ad 100644
--- a/test/test/test_malloc.c
+++ b/test/test/test_malloc.c
@@ -698,4 +698,16 @@ test_malloc_bad_params(void)
 		goto err_return;
 
+	/* rte_malloc expected to return null with size will cause overflow */
+	align = RTE_CACHE_LINE_SIZE;
+	size = (size_t)-8;
+
+	bad_ptr = rte_malloc(type, size, align);
+	if (bad_ptr != NULL)
+		goto err_return;
+
+	bad_ptr = rte_realloc(NULL, size, align);
+	if (bad_ptr != NULL)
+		goto err_return;
+
 	return 0;
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.213127889 +0100
+++ 0024-mem-fix-overflow-on-allocation.patch	2020-06-05 19:20:50.750042176 +0100
@@ -1 +1 @@
-From b341a09c1dd3664b43d5b3a91b6a83136f2d4a12 Mon Sep 17 00:00:00 2001
+From 246bd855dff27be510ab98af9629124d3f610cd4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b341a09c1dd3664b43d5b3a91b6a83136f2d4a12 ]
+
@@ -25 +26,0 @@
-Cc: stable@dpdk.org
@@ -30 +30,0 @@
- app/test/test_malloc.c              | 12 ++++++++++++
@@ -31,0 +32 @@
+ test/test/test_malloc.c             | 12 ++++++++++++
@@ -34,5 +35,17 @@
-diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c
-index 40a2f500cd..71b3cfdde5 100644
---- a/app/test/test_malloc.c
-+++ b/app/test/test_malloc.c
-@@ -847,4 +847,16 @@ test_malloc_bad_params(void)
+diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
+index b8f26f2b37..de3b73e8c5 100644
+--- a/lib/librte_eal/common/malloc_heap.c
++++ b/lib/librte_eal/common/malloc_heap.c
+@@ -239,4 +239,7 @@ heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,
+ 	align = RTE_CACHE_LINE_ROUNDUP(align);
+ 
++	/* roundup might cause an overflow */
++	if (size == 0)
++		return NULL;
+ 	elem = find_suitable_element(heap, size, flags, align, bound, contig);
+ 	if (elem != NULL) {
+diff --git a/test/test/test_malloc.c b/test/test/test_malloc.c
+index 5e52724194..20788011ad 100644
+--- a/test/test/test_malloc.c
++++ b/test/test/test_malloc.c
+@@ -698,4 +698,16 @@ test_malloc_bad_params(void)
@@ -55,12 +67,0 @@
-diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
-index 842eb9de75..bd5065698d 100644
---- a/lib/librte_eal/common/malloc_heap.c
-+++ b/lib/librte_eal/common/malloc_heap.c
-@@ -242,4 +242,7 @@ heap_alloc(struct malloc_heap *heap, const char *type __rte_unused, size_t size,
- 	align = RTE_CACHE_LINE_ROUNDUP(align);
- 
-+	/* roundup might cause an overflow */
-+	if (size == 0)
-+		return NULL;
- 	elem = find_suitable_element(heap, size, flags, align, bound, contig);
- 	if (elem != NULL) {

[dpdk-stable] patch 'examples/eventdev: fix crash on exit' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/14d8bcafdcf1323ff19995ee09fa48da52a03beb

Thanks.

Kevin.

---
From 14d8bcafdcf1323ff19995ee09fa48da52a03beb Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harry.van.haaren@intel.com>
Date: Tue, 5 May 2020 10:39:04 +0100
Subject: [PATCH] examples/eventdev: fix crash on exit

[ upstream commit 2c434431f47c55e63b91cd32e7476cb8c15f3328 ]

This commit fixes a segfault on exit by using Ctrl^C if the master lcore
was also being used as a worker core. The root cause of the issue was
that the interrupt handler was cleaning up resources such as the ethdev
and eventdev ports, and once the interrupt handler would return, that
thread would continue working as an eventdev worker, and dereference the
memory which just had free() called on it.

Fixed by moving the cleanup code from the interrupt handler to the
cleanup stage of main(), which the master thread will execute once
it has returned from its worker() functionality.

Fixes: 085edac2ca38 ("examples/eventdev_pipeline: support Tx adapter")

Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Tested-by: Jun W Zhou <junx.w.zhou@intel.com>
---
 examples/eventdev_pipeline/main.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/examples/eventdev_pipeline/main.c b/examples/eventdev_pipeline/main.c
index 04b30cf6ea..85d8a624bc 100644
--- a/examples/eventdev_pipeline/main.c
+++ b/examples/eventdev_pipeline/main.c
@@ -420,9 +420,4 @@ signal_handler(int signum)
 		rte_eal_mp_wait_lcore();
 
-		RTE_ETH_FOREACH_DEV(portid) {
-			rte_eth_dev_close(portid);
-		}
-
-		rte_event_dev_close(0);
 	}
 	if (signum == SIGTSTP)
@@ -442,4 +437,5 @@ main(int argc, char **argv)
 {
 	struct worker_data *worker_data;
+	uint16_t portid;
 	uint16_t num_ports;
 	int lcore_id;
@@ -579,4 +575,12 @@ main(int argc, char **argv)
 	}
 
+	RTE_ETH_FOREACH_DEV(portid) {
+		rte_eth_dev_close(portid);
+	}
+
+	rte_event_dev_close(0);
+
+	rte_eal_cleanup();
+
 	return 0;
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.265707234 +0100
+++ 0025-examples-eventdev-fix-crash-on-exit.patch	2020-06-05 19:20:50.751042154 +0100
@@ -1 +1 @@
-From 2c434431f47c55e63b91cd32e7476cb8c15f3328 Mon Sep 17 00:00:00 2001
+From 14d8bcafdcf1323ff19995ee09fa48da52a03beb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2c434431f47c55e63b91cd32e7476cb8c15f3328 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -23,2 +24,2 @@
- examples/eventdev_pipeline/main.c | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
+ examples/eventdev_pipeline/main.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
@@ -27 +28 @@
-index d0da51b1c9..21958269f7 100644
+index 04b30cf6ea..85d8a624bc 100644
@@ -30 +31 @@
-@@ -302,10 +302,4 @@ signal_handler(int signum)
+@@ -420,9 +420,4 @@ signal_handler(int signum)
@@ -37 +37,0 @@
--		rte_event_dev_stop(0);
@@ -41 +41,7 @@
-@@ -470,4 +464,13 @@ main(int argc, char **argv)
+@@ -442,4 +437,5 @@ main(int argc, char **argv)
+ {
+ 	struct worker_data *worker_data;
++	uint16_t portid;
+ 	uint16_t num_ports;
+ 	int lcore_id;
+@@ -579,4 +575,12 @@ main(int argc, char **argv)
@@ -48 +53,0 @@
-+	rte_event_dev_stop(0);

[dpdk-stable] patch 'test/flow_classify: enable multi-sockets system' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/084d0e95edc78cff46294247e2eff270263e8e52

Thanks.

Kevin.

---
From 084d0e95edc78cff46294247e2eff270263e8e52 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harry.van.haaren@intel.com>
Date: Fri, 1 May 2020 12:08:14 +0100
Subject: [PATCH] test/flow_classify: enable multi-sockets system

[ upstream commit 8978ab3b0392d1279d92c706e9e0b00703a85c18 ]

This commit fixes failures of the flow_classify_autotest when
ran on dual-socket servers, as the sample application does not
support more than a single socket. Increasing the NB_SOCKETS
value allows the test to run successfully.

Fixes: 9c9befea4f57 ("test: add flow classify unit tests")

Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Tested-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 test/test/test_flow_classify.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/test_flow_classify.c b/test/test/test_flow_classify.c
index 90066713ed..b4ae229079 100644
--- a/test/test/test_flow_classify.c
+++ b/test/test/test_flow_classify.c
@@ -24,5 +24,5 @@
 #define FLOW_CLASSIFY_MAX_RULE_NUM 100
 #define MAX_PKT_BURST              32
-#define NB_SOCKETS                 1
+#define NB_SOCKETS                 4
 #define MEMPOOL_CACHE_SIZE         256
 #define MBUF_SIZE                  512
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.315447819 +0100
+++ 0026-test-flow_classify-enable-multi-sockets-system.patch	2020-06-05 19:20:50.752042131 +0100
@@ -1 +1 @@
-From 8978ab3b0392d1279d92c706e9e0b00703a85c18 Mon Sep 17 00:00:00 2001
+From 084d0e95edc78cff46294247e2eff270263e8e52 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8978ab3b0392d1279d92c706e9e0b00703a85c18 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
- app/test/test_flow_classify.c | 2 +-
+ test/test/test_flow_classify.c | 2 +-
@@ -22,4 +23,4 @@
-diff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c
-index ff5265c6af..ef0b6fdd5c 100644
---- a/app/test/test_flow_classify.c
-+++ b/app/test/test_flow_classify.c
+diff --git a/test/test/test_flow_classify.c b/test/test/test_flow_classify.c
+index 90066713ed..b4ae229079 100644
+--- a/test/test/test_flow_classify.c
++++ b/test/test/test_flow_classify.c

[dpdk-stable] patch 'bbdev: fix doxygen comments' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f741f61709999aeef4a5d5e0f99052a79d869f57

Thanks.

Kevin.

---
From f741f61709999aeef4a5d5e0f99052a79d869f57 Mon Sep 17 00:00:00 2001
From: Nicolas Chautru <nicolas.chautru@intel.com>
Date: Sun, 19 Apr 2020 16:39:48 -0700
Subject: [PATCH] bbdev: fix doxygen comments

[ upstream commit cc29fea1ca53ce9860566b6986491bcf5aab99b5 ]

Several doxygen markup were incorrect in header files.

Fixes: 4935e1e9f76e ("bbdev: introduce wireless base band device lib")

Signed-off-by: Nicolas Chautru <nicolas.chautru@intel.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 lib/librte_bbdev/rte_bbdev.h     |  8 ++++----
 lib/librte_bbdev/rte_bbdev_op.h  | 22 +++++++++++++---------
 lib/librte_bbdev/rte_bbdev_pmd.h | 14 +++++++-------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/lib/librte_bbdev/rte_bbdev.h b/lib/librte_bbdev/rte_bbdev.h
index 4a2873b2fe..f53ee101da 100644
--- a/lib/librte_bbdev/rte_bbdev.h
+++ b/lib/librte_bbdev/rte_bbdev.h
@@ -421,11 +421,11 @@ TAILQ_HEAD(rte_bbdev_cb_list, rte_bbdev_callback);
  */
 struct __rte_cache_aligned rte_bbdev {
-	/**< Enqueue encode function */
+	/** Enqueue encode function */
 	rte_bbdev_enqueue_enc_ops_t enqueue_enc_ops;
-	/**< Enqueue decode function */
+	/** Enqueue decode function */
 	rte_bbdev_enqueue_dec_ops_t enqueue_dec_ops;
-	/**< Dequeue encode function */
+	/** Dequeue encode function */
 	rte_bbdev_dequeue_enc_ops_t dequeue_enc_ops;
-	/**< Dequeue decode function */
+	/** Dequeue decode function */
 	rte_bbdev_dequeue_dec_ops_t dequeue_dec_ops;
 	const struct rte_bbdev_ops *dev_ops;  /**< Functions exported by PMD */
diff --git a/lib/librte_bbdev/rte_bbdev_op.h b/lib/librte_bbdev/rte_bbdev_op.h
index 83f62c2dc2..14cb87cd96 100644
--- a/lib/librte_bbdev/rte_bbdev_op.h
+++ b/lib/librte_bbdev/rte_bbdev_op.h
@@ -278,9 +278,10 @@ struct rte_bbdev_op_turbo_dec {
 	uint8_t num_maps;
 
-	uint8_t code_block_mode; /**< [0 - TB : 1 - CB] */
+	/** [0 - TB : 1 - CB] */
+	uint8_t code_block_mode;
 	union {
-		/**< Struct which stores Code Block specific parameters */
+		/** Struct which stores Code Block specific parameters */
 		struct rte_bbdev_op_dec_cb_params cb_params;
-		/**< Struct which stores Transport Block specific parameters */
+		/** Struct which stores Transport Block specific parameters */
 		struct rte_bbdev_op_dec_tb_params tb_params;
 	};
@@ -339,5 +340,5 @@ struct rte_bbdev_op_enc_tb_params {
 	 */
 	uint16_t ncb_pos;
-	/**< The index of the first CB in the inbound mbuf data, default is 0 */
+	/** The index of the first CB in the inbound mbuf data, default is 0 */
 	uint8_t r;
 };
@@ -420,8 +421,11 @@ enum {
 /**< Structure specifying a single encode operation */
 struct rte_bbdev_enc_op {
-	int status;  /**< Status of operation that was performed */
-	struct rte_mempool *mempool;  /**< Mempool which op instance is in */
-	void *opaque_data;  /**< Opaque pointer for user data */
-	/**< Contains encoder specific parameters */
+	/** Status of operation that was performed */
+	int status;
+	/** Mempool which op instance is in */
+	struct rte_mempool *mempool;
+	/** Opaque pointer for user data */
+	void *opaque_data;
+	/** Contains encoder specific parameters */
 	struct rte_bbdev_op_turbo_enc turbo_enc;
 };
@@ -445,5 +449,5 @@ struct rte_bbdev_op_cap {
 };
 
-/**< @internal Private data structure stored with operation pool. */
+/** @internal Private data structure stored with operation pool. */
 struct rte_bbdev_op_pool_private {
 	enum rte_bbdev_op_type type;  /**< Type of operations in a pool */
diff --git a/lib/librte_bbdev/rte_bbdev_pmd.h b/lib/librte_bbdev/rte_bbdev_pmd.h
index db9a04cdf9..f6091a5e99 100644
--- a/lib/librte_bbdev/rte_bbdev_pmd.h
+++ b/lib/librte_bbdev/rte_bbdev_pmd.h
@@ -144,16 +144,16 @@ typedef int (*rte_bbdev_queue_intr_disable_t)(struct rte_bbdev *dev,
  */
 struct rte_bbdev_ops {
-	/**< Allocate and configure device memory. Optional. */
+	/** Allocate and configure device memory. Optional. */
 	rte_bbdev_setup_queues_t setup_queues;
-	/**< Configure interrupts. Optional. */
+	/** Configure interrupts. Optional. */
 	rte_bbdev_intr_enable_t intr_enable;
-	/**< Start device. Optional. */
+	/** Start device. Optional. */
 	rte_bbdev_start_t start;
-	/**< Stop device. Optional. */
+	/** Stop device. Optional. */
 	rte_bbdev_stop_t stop;
-	/**< Close device. Optional. */
+	/** Close device. Optional. */
 	rte_bbdev_close_t close;
 
-	/**< Get device info. Required. */
+	/** Get device info. Required. */
 	rte_bbdev_info_get_t info_get;
 	/** Get device statistics. Optional. */
@@ -168,5 +168,5 @@ struct rte_bbdev_ops {
 	/** Start a queue. Optional. */
 	rte_bbdev_queue_start_t queue_start;
-	/**< Stop a queue pair. Optional. */
+	/** Stop a queue pair. Optional. */
 	rte_bbdev_queue_stop_t queue_stop;
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.363429719 +0100
+++ 0027-bbdev-fix-doxygen-comments.patch	2020-06-05 19:20:50.754042085 +0100
@@ -1 +1 @@
-From cc29fea1ca53ce9860566b6986491bcf5aab99b5 Mon Sep 17 00:00:00 2001
+From f741f61709999aeef4a5d5e0f99052a79d869f57 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cc29fea1ca53ce9860566b6986491bcf5aab99b5 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- lib/librte_bbdev/rte_bbdev.h     | 16 ++++++++--------
- lib/librte_bbdev/rte_bbdev_op.h  | 16 ++++++++--------
+ lib/librte_bbdev/rte_bbdev.h     |  8 ++++----
+ lib/librte_bbdev/rte_bbdev_op.h  | 22 +++++++++++++---------
@@ -17 +18 @@
- 3 files changed, 23 insertions(+), 23 deletions(-)
+ 3 files changed, 24 insertions(+), 20 deletions(-)
@@ -20 +21 @@
-index 38d9d50057..ecd95a823d 100644
+index 4a2873b2fe..f53ee101da 100644
@@ -23 +24 @@
-@@ -443,19 +443,19 @@ TAILQ_HEAD(rte_bbdev_cb_list, rte_bbdev_callback);
+@@ -421,11 +421,11 @@ TAILQ_HEAD(rte_bbdev_cb_list, rte_bbdev_callback);
@@ -38,12 +38,0 @@
--	/**< Enqueue encode function */
-+	/** Enqueue encode function */
- 	rte_bbdev_enqueue_enc_ops_t enqueue_ldpc_enc_ops;
--	/**< Enqueue decode function */
-+	/** Enqueue decode function */
- 	rte_bbdev_enqueue_dec_ops_t enqueue_ldpc_dec_ops;
--	/**< Dequeue encode function */
-+	/** Dequeue encode function */
- 	rte_bbdev_dequeue_enc_ops_t dequeue_ldpc_enc_ops;
--	/**< Dequeue decode function */
-+	/** Dequeue decode function */
- 	rte_bbdev_dequeue_dec_ops_t dequeue_ldpc_dec_ops;
@@ -52 +41 @@
-index 9c66721e32..f726d7302e 100644
+index 83f62c2dc2..14cb87cd96 100644
@@ -55 +44 @@
-@@ -399,10 +399,10 @@ struct rte_bbdev_op_turbo_dec {
+@@ -278,9 +278,10 @@ struct rte_bbdev_op_turbo_dec {
@@ -58 +47 @@
--	/**< [0 - TB : 1 - CB] */
+-	uint8_t code_block_mode; /**< [0 - TB : 1 - CB] */
@@ -60 +49 @@
- 	uint8_t code_block_mode;
++	uint8_t code_block_mode;
@@ -64 +53 @@
- 		struct rte_bbdev_op_dec_turbo_cb_params cb_params;
+ 		struct rte_bbdev_op_dec_cb_params cb_params;
@@ -67 +56 @@
- 		struct rte_bbdev_op_dec_turbo_tb_params tb_params;
+ 		struct rte_bbdev_op_dec_tb_params tb_params;
@@ -69 +58 @@
-@@ -555,5 +555,5 @@ struct rte_bbdev_op_enc_turbo_tb_params {
+@@ -339,5 +340,5 @@ struct rte_bbdev_op_enc_tb_params {
@@ -76,2 +65,2 @@
-@@ -752,9 +752,9 @@ enum {
- /** Structure specifying a single encode operation */
+@@ -420,8 +421,11 @@ enum {
+ /**< Structure specifying a single encode operation */
@@ -79 +68,4 @@
--	/**< Status of operation that was performed */
+-	int status;  /**< Status of operation that was performed */
+-	struct rte_mempool *mempool;  /**< Mempool which op instance is in */
+-	void *opaque_data;  /**< Opaque pointer for user data */
+-	/**< Contains encoder specific parameters */
@@ -81,2 +73 @@
- 	int status;
--	/**< Mempool which op instance is in */
++	int status;
@@ -84,2 +75 @@
- 	struct rte_mempool *mempool;
--	/**< Opaque pointer for user data */
++	struct rte_mempool *mempool;
@@ -87,3 +77,5 @@
- 	void *opaque_data;
- 	union {
-@@ -793,5 +793,5 @@ struct rte_bbdev_op_cap {
++	void *opaque_data;
++	/** Contains encoder specific parameters */
+ 	struct rte_bbdev_op_turbo_enc turbo_enc;
+ };
+@@ -445,5 +449,5 @@ struct rte_bbdev_op_cap {
@@ -97 +89 @@
-index 24ddcee7af..237e3361d7 100644
+index db9a04cdf9..f6091a5e99 100644
@@ -100 +92 @@
-@@ -147,16 +147,16 @@ typedef int (*rte_bbdev_queue_intr_disable_t)(struct rte_bbdev *dev,
+@@ -144,16 +144,16 @@ typedef int (*rte_bbdev_queue_intr_disable_t)(struct rte_bbdev *dev,
@@ -123 +115 @@
-@@ -171,5 +171,5 @@ struct rte_bbdev_ops {
+@@ -168,5 +168,5 @@ struct rte_bbdev_ops {

[dpdk-stable] patch 'crypto/ccp: fix fd leak on probe failure' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1f22d214c787a5c286819dab90bedb32c0c2aac5

Thanks.

Kevin.

---
From 1f22d214c787a5c286819dab90bedb32c0c2aac5 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Sun, 26 Apr 2020 14:36:15 +0800
Subject: [PATCH] crypto/ccp: fix fd leak on probe failure

[ upstream commit 4f429be4c09a00ccc5cd13cfb14a11f90958ac74 ]

Zero is a valid fd. When ccp_probe_device() is failed, the uio_fd won't be
closed thus leading fd leak.

Fixes: ef4b04f87fa6 ("crypto/ccp: support device init")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Ravi Kumar <ravi1.kumar@amd.com>
---
 drivers/crypto/ccp/ccp_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c
index 80fe6a4533..7d98b2eb25 100644
--- a/drivers/crypto/ccp/ccp_dev.c
+++ b/drivers/crypto/ccp/ccp_dev.c
@@ -761,5 +761,5 @@ ccp_probe_device(const char *dirname, uint16_t domain,
 fail:
 	CCP_LOG_ERR("CCP Device probe failed");
-	if (uio_fd > 0)
+	if (uio_fd >= 0)
 		close(uio_fd);
 	if (ccp_dev)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.413489991 +0100
+++ 0028-crypto-ccp-fix-fd-leak-on-probe-failure.patch	2020-06-05 19:20:50.755042063 +0100
@@ -1 +1 @@
-From 4f429be4c09a00ccc5cd13cfb14a11f90958ac74 Mon Sep 17 00:00:00 2001
+From 1f22d214c787a5c286819dab90bedb32c0c2aac5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4f429be4c09a00ccc5cd13cfb14a11f90958ac74 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'app/crypto-perf: fix display of sample test vector' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/fd7f4fedf57382aa7556b89d682d8374b087f0ca

Thanks.

Kevin.

---
From fd7f4fedf57382aa7556b89d682d8374b087f0ca Mon Sep 17 00:00:00 2001
From: Adam Dybkowski <adamx.dybkowski@intel.com>
Date: Wed, 29 Apr 2020 12:57:04 +0200
Subject: [PATCH] app/crypto-perf: fix display of sample test vector

[ upstream commit 16f25ee0bf45a3e1b5c4ba4b7e548e321c7db60d ]

This patch disables displaying sample test vector contents when
executing throughput and latency tests as the sample data is not
used in those tests (not copied to input mbuf in order to achieve
better performance).

Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application")

Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 app/test-crypto-perf/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 921394799a..8affc5dc95 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -545,5 +545,6 @@ main(int argc, char **argv)
 	}
 
-	if (!opts.silent)
+	if (!opts.silent && opts.test != CPERF_TEST_TYPE_THROUGHPUT &&
+			opts.test != CPERF_TEST_TYPE_LATENCY)
 		show_test_vector(t_vec);
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.461424804 +0100
+++ 0029-app-crypto-perf-fix-display-of-sample-test-vector.patch	2020-06-05 19:20:50.756042040 +0100
@@ -1 +1 @@
-From 16f25ee0bf45a3e1b5c4ba4b7e548e321c7db60d Mon Sep 17 00:00:00 2001
+From fd7f4fedf57382aa7556b89d682d8374b087f0ca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 16f25ee0bf45a3e1b5c4ba4b7e548e321c7db60d ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 52a1860fbf..7bb286ccbe 100644
+index 921394799a..8affc5dc95 100644
@@ -24 +25 @@
-@@ -583,5 +583,6 @@ main(int argc, char **argv)
+@@ -545,5 +545,6 @@ main(int argc, char **argv)

[dpdk-stable] patch 'crypto/qat: fix cipher descriptor for ZUC and SNOW' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/71c0081bc4248f92bb5cde6f04aa82a3cd1ecf6a

Thanks.

Kevin.

---
From 71c0081bc4248f92bb5cde6f04aa82a3cd1ecf6a Mon Sep 17 00:00:00 2001
From: Arek Kusztal <arkadiuszx.kusztal@intel.com>
Date: Wed, 29 Apr 2020 16:51:34 +0200
Subject: [PATCH] crypto/qat: fix cipher descriptor for ZUC and SNOW

[ upstream commit fae347cb345a844442c18e1384b832912e07daa0 ]

Offset of cd pointer is too big by state1size + state2size, so few extra
unnecessary bytes will be copied into cd. Snow offset was improved as well.

Fixes: d9b7d5bbc845 ("crypto/qat: add ZUC EEA3/EIA3 capability")

Signed-off-by: Arek Kusztal <arkadiuszx.kusztal@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 drivers/crypto/qat/qat_sym_session.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/qat/qat_sym_session.c b/drivers/crypto/qat/qat_sym_session.c
index e147572e12..c4f39280c6 100644
--- a/drivers/crypto/qat/qat_sym_session.c
+++ b/drivers/crypto/qat/qat_sym_session.c
@@ -1433,5 +1433,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 		((char *)&req_tmpl->serv_specif_rqpars +
 		sizeof(struct icp_qat_fw_la_cipher_req_params));
-	uint16_t state1_size = 0, state2_size = 0;
+	uint16_t state1_size = 0, state2_size = 0, cd_extra_size = 0;
 	uint16_t hash_offset, cd_size;
 	uint32_t *aad_len = NULL;
@@ -1609,5 +1609,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 		memset(cipherconfig->key + authkeylen,
 				0, ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ);
-		cdesc->cd_cur_ptr += sizeof(struct icp_qat_hw_cipher_config) +
+		cd_extra_size += sizeof(struct icp_qat_hw_cipher_config) +
 				authkeylen + ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ;
 		auth_param->hash_state_sz = ICP_QAT_HW_SNOW_3G_UEA2_IV_SZ >> 3;
@@ -1625,6 +1625,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 
 		memcpy(cdesc->cd_cur_ptr + state1_size, authkey, authkeylen);
-		cdesc->cd_cur_ptr += state1_size + state2_size
-			+ ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ;
+		cd_extra_size += ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ;
 		auth_param->hash_state_sz = ICP_QAT_HW_ZUC_3G_EEA3_IV_SZ >> 3;
 		cdesc->min_qat_dev_gen = QAT_GEN2;
@@ -1712,5 +1711,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
 					>> 3);
 
-	cdesc->cd_cur_ptr += state1_size + state2_size;
+	cdesc->cd_cur_ptr += state1_size + state2_size + cd_extra_size;
 	cd_size = cdesc->cd_cur_ptr-(uint8_t *)&cdesc->cd;
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.514392942 +0100
+++ 0030-crypto-qat-fix-cipher-descriptor-for-ZUC-and-SNOW.patch	2020-06-05 19:20:50.758041995 +0100
@@ -1 +1 @@
-From fae347cb345a844442c18e1384b832912e07daa0 Mon Sep 17 00:00:00 2001
+From 71c0081bc4248f92bb5cde6f04aa82a3cd1ecf6a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fae347cb345a844442c18e1384b832912e07daa0 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 3727d564d8..58bdbd3438 100644
+index e147572e12..c4f39280c6 100644
@@ -22 +23 @@
-@@ -1665,5 +1665,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1433,5 +1433,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
@@ -24 +25 @@
- 		ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET);
+ 		sizeof(struct icp_qat_fw_la_cipher_req_params));
@@ -29 +30 @@
-@@ -1887,5 +1887,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1609,5 +1609,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
@@ -36 +37 @@
-@@ -1903,6 +1903,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1625,6 +1625,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
@@ -44 +45 @@
-@@ -1990,5 +1989,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+@@ -1712,5 +1711,5 @@ int qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,

[dpdk-stable] patch 'crypto/kasumi: fix extern declaration' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/33e94066f7dc9c40ed16f5b6eca7d862251afa19

Thanks.

Kevin.

---
From 33e94066f7dc9c40ed16f5b6eca7d862251afa19 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor@redhat.com>
Date: Wed, 6 May 2020 10:45:18 +0100
Subject: [PATCH] crypto/kasumi: fix extern declaration

[ upstream commit 6a6b5d5616c976eb306cbdbcf9241aba08d2516e ]

gcc 10 defaults to fno-common and it reports:

crypto_kasumi_rte_kasumi_pmd_ops.c.o:(.data.rel+0x0):
multiple definition of `rte_kasumi_pmd_ops';
crypto_kasumi_rte_kasumi_pmd.c.o:(.bss+0x8): first defined here

Fix by making rte_kasumi_pmd_ops extern in the header file.

Fixes: 2773c86d061a ("crypto/kasumi: add driver for KASUMI library")

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
index bb34a16f7c..d26a86b62c 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
@@ -71,5 +71,5 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
 
 /** device specific operations function pointer structure */
-struct rte_cryptodev_ops *rte_kasumi_pmd_ops;
+extern struct rte_cryptodev_ops *rte_kasumi_pmd_ops;
 
 #endif /* _RTE_KASUMI_PMD_PRIVATE_H_ */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.565156799 +0100
+++ 0031-crypto-kasumi-fix-extern-declaration.patch	2020-06-05 19:20:50.758041995 +0100
@@ -1 +1 @@
-From 6a6b5d5616c976eb306cbdbcf9241aba08d2516e Mon Sep 17 00:00:00 2001
+From 33e94066f7dc9c40ed16f5b6eca7d862251afa19 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6a6b5d5616c976eb306cbdbcf9241aba08d2516e ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
- drivers/crypto/kasumi/kasumi_pmd_private.h | 2 +-
+ drivers/crypto/kasumi/rte_kasumi_pmd_private.h | 2 +-
@@ -23,5 +24,5 @@
-diff --git a/drivers/crypto/kasumi/kasumi_pmd_private.h b/drivers/crypto/kasumi/kasumi_pmd_private.h
-index b7f1c428b4..abedcd616d 100644
---- a/drivers/crypto/kasumi/kasumi_pmd_private.h
-+++ b/drivers/crypto/kasumi/kasumi_pmd_private.h
-@@ -77,5 +77,5 @@ kasumi_set_session_parameters(MB_MGR *mgr, struct kasumi_session *sess,
+diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+index bb34a16f7c..d26a86b62c 100644
+--- a/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
++++ b/drivers/crypto/kasumi/rte_kasumi_pmd_private.h
+@@ -71,5 +71,5 @@ kasumi_set_session_parameters(struct kasumi_session *sess,
@@ -33 +34 @@
- #endif /* _KASUMI_PMD_PRIVATE_H_ */
+ #endif /* _RTE_KASUMI_PMD_PRIVATE_H_ */

[dpdk-stable] patch 'net/failsafe: fix fd leak' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6268dc292c836f2b1b1576e35eef8ecf7edd9a80

Thanks.

Kevin.

---
From 6268dc292c836f2b1b1576e35eef8ecf7edd9a80 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 27 Apr 2020 18:44:19 +0800
Subject: [PATCH] net/failsafe: fix fd leak

[ upstream commit b9663f60359296bcb6f0be8a3d6a2a838c77ee30 ]

Zero is a valid fd. The fd won't be closed thus leading fd leak,
when it is zero.

Also the service proxy is initialized at 0. This is assuming that all of
its fields are invalid at 0. The issue is that a file descriptor at 0 is
a valid one.

The value -1 is used as sentinel during cleanup. Initialize the RX proxy
file descriptor to -1.

Fixes: f234e5bd996d ("net/failsafe: register slaves Rx interrupts")
Fixes: 9e0360aebf23 ("net/failsafe: register as Rx interrupt mode")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Signed-off-by: Gaetan Rivet <grive@u256.net>
Tested-by: Ali Alnubani <alialnu@mellanox.com>
---
 drivers/net/failsafe/failsafe.c         | 1 +
 drivers/net/failsafe/failsafe_intr.c    | 2 +-
 drivers/net/failsafe/failsafe_ops.c     | 2 +-
 drivers/net/failsafe/failsafe_private.h | 8 ++++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 06e859e9fd..0180954123 100644
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -183,4 +183,5 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
 	priv = PRIV(dev);
 	priv->dev = dev;
+	priv->rxp = FS_RX_PROXY_INIT;
 	dev->dev_ops = &failsafe_ops;
 	dev->data->mac_addrs = &PRIV(dev)->mac_addrs[0];
diff --git a/drivers/net/failsafe/failsafe_intr.c b/drivers/net/failsafe/failsafe_intr.c
index 1c2cb71c41..de229b2c2f 100644
--- a/drivers/net/failsafe/failsafe_intr.c
+++ b/drivers/net/failsafe/failsafe_intr.c
@@ -395,5 +395,5 @@ fs_rx_event_proxy_uninstall(struct fs_priv *priv)
 		priv->rxp.evec = NULL;
 	}
-	if (priv->rxp.efd > 0) {
+	if (priv->rxp.efd >= 0) {
 		close(priv->rxp.efd);
 		priv->rxp.efd = -1;
diff --git a/drivers/net/failsafe/failsafe_ops.c b/drivers/net/failsafe/failsafe_ops.c
index 595278bbf7..a3c30c25a9 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -380,5 +380,5 @@ fs_rx_queue_release(void *queue)
 	dev = rxq->priv->dev;
 	fs_lock(dev, 0);
-	if (rxq->event_fd > 0)
+	if (rxq->event_fd >= 0)
 		close(rxq->event_fd);
 	FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE) {
diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 3264bff2f8..cfe29c3f33 100644
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -59,4 +59,12 @@ struct rx_proxy {
 };
 
+#define FS_RX_PROXY_INIT (struct rx_proxy){ \
+	.efd = -1, \
+	.evec = NULL, \
+	.sid = 0, \
+	.scid = 0, \
+	.sstate = SS_NO_SERVICE, \
+}
+
 struct rxq {
 	struct fs_priv *priv;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.615257891 +0100
+++ 0032-net-failsafe-fix-fd-leak.patch	2020-06-05 19:20:50.761041926 +0100
@@ -1 +1 @@
-From b9663f60359296bcb6f0be8a3d6a2a838c77ee30 Mon Sep 17 00:00:00 2001
+From 6268dc292c836f2b1b1576e35eef8ecf7edd9a80 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b9663f60359296bcb6f0be8a3d6a2a838c77ee30 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 8af31d71b3..72362f35de 100644
+index 06e859e9fd..0180954123 100644
@@ -34 +35 @@
-@@ -191,4 +191,5 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
+@@ -183,4 +183,5 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
@@ -36 +37 @@
- 	priv->data = dev->data;
+ 	priv->dev = dev;
@@ -41 +42 @@
-index d8728fe7e3..602c04033c 100644
+index 1c2cb71c41..de229b2c2f 100644
@@ -44 +45 @@
-@@ -394,5 +394,5 @@ fs_rx_event_proxy_uninstall(struct fs_priv *priv)
+@@ -395,5 +395,5 @@ fs_rx_event_proxy_uninstall(struct fs_priv *priv)
@@ -52 +53 @@
-index 50f2aca4e7..e1d08e46c8 100644
+index 595278bbf7..a3c30c25a9 100644
@@ -55,2 +56,2 @@
-@@ -381,5 +381,5 @@ fs_rx_queue_release(void *queue)
- 	dev = &rte_eth_devices[rxq->priv->data->port_id];
+@@ -380,5 +380,5 @@ fs_rx_queue_release(void *queue)
+ 	dev = rxq->priv->dev;
@@ -63 +64 @@
-index 8e9706aef0..651578a128 100644
+index 3264bff2f8..cfe29c3f33 100644

[dpdk-stable] patch 'app/testpmd: fix statistics after reset' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9478a1a301d359e05f271cd5295cf392fa124517

Thanks.

Kevin.

---
From 9478a1a301d359e05f271cd5295cf392fa124517 Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
Date: Tue, 28 Apr 2020 19:50:45 +0800
Subject: [PATCH] app/testpmd: fix statistics after reset

[ upstream commit 9eb974221f44cf210fe5d883bdccfcb48de75fc6 ]

Currently, when running start/clear stats&xstats/stop command many times
based on testpmd application, there are incorrect forward Rx/Tx-packets
stats as below:
---------------------- Forward statistics for port 0  --------------
RX-packets: 18446744073709544808 RX-dropped: 0                <snip>
TX-packets: 18446744073709536616 TX-dropped: 0                <snip>
--------------------------------------------------------------------

The root cause as below:
1. The struct rte_port of testpmd.h has a member variable "struct
   rte_eth_stats stats" to store the last port statistics.
2. When running start command, it execute cmd_start_parsed ->
   start_packet_forwarding -> fwd_stats_reset, which call
   rte_eth_stats_get API function to save current port statistics.
3. When running stop command, it execute fwd_stats_display, which call
   rte_eth_stats_get to get current port statistics, and then minus last
   port statistics.
4. If we run clear stats or xstats after start command, then run stop,
   it may display above incorrect stats because the current
   Rx/Tx-packets is lower than the last saved RX/TX-packets(uint64_t
   overflow).

This patch fixes it by clearing last port statistics when executing
"clear stats/xstats" command.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/config.c                       | 26 ++++++++++++++++++++-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  2 +-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 6e9a2042c2..0e5d77159d 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -205,9 +205,24 @@ void
 nic_stats_clear(portid_t port_id)
 {
+	int ret;
+
 	if (port_id_is_invalid(port_id, ENABLED_WARN)) {
 		print_valid_ports();
 		return;
 	}
-	rte_eth_stats_reset(port_id);
+
+	ret = rte_eth_stats_reset(port_id);
+	if (ret != 0) {
+		printf("%s: Error: failed to reset stats (port %u): %s",
+		       __func__, port_id, strerror(ret));
+		return;
+	}
+
+	ret = rte_eth_stats_get(port_id, &ports[port_id].stats);
+	if (ret != 0) {
+		printf("%s: Error: failed to get stats (port %u): %s",
+		       __func__, port_id, strerror(ret));
+		return;
+	}
 	printf("\n  NIC statistics for port %d cleared\n", port_id);
 }
@@ -279,4 +294,6 @@ void
 nic_xstats_clear(portid_t port_id)
 {
+	int ret;
+
 	if (port_id_is_invalid(port_id, ENABLED_WARN)) {
 		print_valid_ports();
@@ -284,4 +301,11 @@ nic_xstats_clear(portid_t port_id)
 	}
 	rte_eth_xstats_reset(port_id);
+
+	ret = rte_eth_stats_get(port_id, &ports[port_id].stats);
+	if (ret != 0) {
+		printf("%s: Error: failed to get stats (port %u): %s",
+		       __func__, port_id, strerror(ret));
+		return;
+	}
 }
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index c327d1f4df..0d71e20c64 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -239,5 +239,5 @@ clear port
 ~~~~~~~~~~
 
-Clear the port statistics for a given port or for all ports::
+Clear the port statistics and forward engine statistics for a given port or for all ports::
 
    testpmd> clear port (info|stats|xstats|fdir|stat_qmap) (port_id|all)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.664416455 +0100
+++ 0033-app-testpmd-fix-statistics-after-reset.patch	2020-06-05 19:20:50.771041699 +0100
@@ -1 +1 @@
-From 9eb974221f44cf210fe5d883bdccfcb48de75fc6 Mon Sep 17 00:00:00 2001
+From 9478a1a301d359e05f271cd5295cf392fa124517 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9eb974221f44cf210fe5d883bdccfcb48de75fc6 ]
+
@@ -32 +33,0 @@
-Cc: stable@dpdk.org
@@ -43 +44 @@
-index 035d336ab5..5381207cc2 100644
+index 6e9a2042c2..0e5d77159d 100644
@@ -46 +47 @@
-@@ -235,9 +235,24 @@ void
+@@ -205,9 +205,24 @@ void
@@ -72,3 +73,4 @@
-@@ -315,8 +330,17 @@ nic_xstats_clear(portid_t port_id)
- 		return;
- 	}
+@@ -279,4 +294,6 @@ void
+ nic_xstats_clear(portid_t port_id)
+ {
++	int ret;
@@ -76,6 +78,5 @@
- 	ret = rte_eth_xstats_reset(port_id);
- 	if (ret != 0) {
- 		printf("%s: Error: failed to reset xstats (port %u): %s",
- 		       __func__, port_id, strerror(ret));
-+		return;
-+	}
+ 	if (port_id_is_invalid(port_id, ENABLED_WARN)) {
+ 		print_valid_ports();
+@@ -284,4 +301,11 @@ nic_xstats_clear(portid_t port_id)
+ 	}
+ 	rte_eth_xstats_reset(port_id);
@@ -88 +89 @@
- 	}
++	}
@@ -89,0 +91 @@
+ 
@@ -91 +93 @@
-index 19260cc2d9..581cd45ebb 100644
+index c327d1f4df..0d71e20c64 100644
@@ -94 +96 @@
-@@ -238,5 +238,5 @@ clear port
+@@ -239,5 +239,5 @@ clear port

[dpdk-stable] patch 'net/netvsc: fix comment spelling' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4c266f9776b7305413355ceec21bd625eaa5e761

Thanks.

Kevin.

---
From 4c266f9776b7305413355ceec21bd625eaa5e761 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 30 Apr 2020 12:08:47 -0700
Subject: [PATCH] net/netvsc: fix comment spelling

[ upstream commit 672f4d127ba44c5fe89a425fd757d6a0ad4749e1 ]

No code change here.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_nvs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_nvs.h b/drivers/net/netvsc/hn_nvs.h
index 2563fd8d86..015839e364 100644
--- a/drivers/net/netvsc/hn_nvs.h
+++ b/drivers/net/netvsc/hn_nvs.h
@@ -38,5 +38,5 @@
 
 /*
- * NVS message transacion status codes.
+ * NVS message transaction status codes.
  */
 #define NVS_STATUS_OK		1
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.722938415 +0100
+++ 0034-net-netvsc-fix-comment-spelling.patch	2020-06-05 19:20:50.771041699 +0100
@@ -1 +1 @@
-From 672f4d127ba44c5fe89a425fd757d6a0ad4749e1 Mon Sep 17 00:00:00 2001
+From 4c266f9776b7305413355ceec21bd625eaa5e761 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 672f4d127ba44c5fe89a425fd757d6a0ad4749e1 ]
+
@@ -10,3 +12,2 @@
- drivers/net/netvsc/hn_ethdev.c | 2 +-
- drivers/net/netvsc/hn_nvs.h    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ drivers/net/netvsc/hn_nvs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -14,11 +14,0 @@
-diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
-index 05f1a25a1a..46da5a4e81 100644
---- a/drivers/net/netvsc/hn_ethdev.c
-+++ b/drivers/net/netvsc/hn_ethdev.c
-@@ -73,5 +73,5 @@ static const struct hn_xstats_name_off hn_stat_strings[] = {
- /* The default RSS key.
-  * This value is the same as MLX5 so that flows will be
-- * received on same path for both VF ans synthetic NIC.
-+ * received on same path for both VF and synthetic NIC.
-  */
- static const uint8_t rss_default_key[NDIS_HASH_KEYSIZE_TOEPLITZ] = {

[dpdk-stable] patch 'bus/vmbus: fix comment spelling' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1c5ddc784f8d7c925e1df89c86b4d5325f3fdb64

Thanks.

Kevin.

---
From 1c5ddc784f8d7c925e1df89c86b4d5325f3fdb64 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 30 Apr 2020 12:08:48 -0700
Subject: [PATCH] bus/vmbus: fix comment spelling

[ upstream commit 3a185ff42e7f147b7125fb1d718d349baa4f1aef ]

No code change here.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/bus/vmbus/linux/vmbus_uio.c | 2 +-
 drivers/bus/vmbus/vmbus_common.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/vmbus/linux/vmbus_uio.c b/drivers/bus/vmbus/linux/vmbus_uio.c
index 7cab5c19f4..308ba00893 100644
--- a/drivers/bus/vmbus/linux/vmbus_uio.c
+++ b/drivers/bus/vmbus/linux/vmbus_uio.c
@@ -167,5 +167,5 @@ vmbus_uio_map_resource_by_index(struct rte_vmbus_device *dev, int idx,
 	vmbus_map_addr = RTE_PTR_ADD(mapaddr, size);
 
-	/* Record result of sucessful mapping for use by secondary */
+	/* Record result of successful mapping for use by secondary */
 	maps[idx].addr = mapaddr;
 	maps[idx].size = size;
diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c
index 48a219f735..3adef01c95 100644
--- a/drivers/bus/vmbus/vmbus_common.c
+++ b/drivers/bus/vmbus/vmbus_common.c
@@ -132,5 +132,5 @@ vmbus_probe_one_driver(struct rte_vmbus_driver *dr,
 
 /*
- * IF device class GUID mathces, call the probe function of
+ * If device class GUID matches, call the probe function of
  * registere drivers for the vmbus device.
  * Return -1 if initialization failed,
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.771144216 +0100
+++ 0035-bus-vmbus-fix-comment-spelling.patch	2020-06-05 19:20:50.772041677 +0100
@@ -1 +1 @@
-From 3a185ff42e7f147b7125fb1d718d349baa4f1aef Mon Sep 17 00:00:00 2001
+From 1c5ddc784f8d7c925e1df89c86b4d5325f3fdb64 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3a185ff42e7f147b7125fb1d718d349baa4f1aef ]
+
@@ -15 +17 @@
-index 10e50c9b5a..5451bfd150 100644
+index 7cab5c19f4..308ba00893 100644
@@ -18 +20 @@
-@@ -166,5 +166,5 @@ vmbus_uio_map_resource_by_index(struct rte_vmbus_device *dev, int idx,
+@@ -167,5 +167,5 @@ vmbus_uio_map_resource_by_index(struct rte_vmbus_device *dev, int idx,

[dpdk-stable] patch 'net/ixgbe: fix link status synchronization on BSD' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f86e7bae8f8975e50f1cda5b7b88d5d19814e4bd

Thanks.

Kevin.

---
From f86e7bae8f8975e50f1cda5b7b88d5d19814e4bd Mon Sep 17 00:00:00 2001
From: Zhihong Peng <zhihongx.peng@intel.com>
Date: Thu, 16 Apr 2020 23:52:12 -0400
Subject: [PATCH] net/ixgbe: fix link status synchronization on BSD

[ upstream commit 0012111a3d879b0b0e27d14a841e2a729545727d ]

DPDK does not implement interrupt mechanism on BSD,
so force NIC status synchronization.

Fixes: dc66e5fd01b9 ("net/ixgbe: improve link state check on VF")

Signed-off-by: Zhihong Peng <zhihongx.peng@intel.com>
Tested-by: Zhimin Huang <zhiminx.huang@intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 2d49ea011b..9b67e56a53 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -4188,4 +4188,9 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
 		wait = 0;
 
+/* BSD has no interrupt mechanism, so force NIC status synchronization. */
+#ifdef RTE_EXEC_ENV_FREEBSD
+	wait = 1;
+#endif
+
 	if (vf)
 		diag = ixgbevf_check_link(hw, &link_speed, &link_up, wait);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.824516473 +0100
+++ 0036-net-ixgbe-fix-link-status-synchronization-on-BSD.patch	2020-06-05 19:20:50.782041449 +0100
@@ -1 +1 @@
-From 0012111a3d879b0b0e27d14a841e2a729545727d Mon Sep 17 00:00:00 2001
+From f86e7bae8f8975e50f1cda5b7b88d5d19814e4bd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0012111a3d879b0b0e27d14a841e2a729545727d ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index aa1e8aac51..cf5f1fe709 100644
+index 2d49ea011b..9b67e56a53 100644
@@ -23 +24 @@
-@@ -4258,4 +4258,9 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
+@@ -4188,4 +4188,9 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,

[dpdk-stable] patch 'net/tap: fix crash in flow destroy' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/38a16ce6529150af6431e6b879306c6d54e23b20

Thanks.

Kevin.

---
From 38a16ce6529150af6431e6b879306c6d54e23b20 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 27 Apr 2020 14:39:26 -0700
Subject: [PATCH] net/tap: fix crash in flow destroy

[ upstream commit 8451387df206f5ad34461280ab6a2e5bfe382b9b ]

The TAP driver does not initialize all the elements of the rte_flow
structure. This can lead to crash in rte_flow_destroy.

(gdb) where
    flow=0x100e99280, error=0x0)
    at drivers/net/tap/tap_flow.c:1514

(gdb) p remote_flow
$1 = (struct rte_flow *) 0x6b6b6b6b6b6b6b6b

Which is here:
static int
tap_flow_destroy_pmd(struct pmd_internals *pmd,
		     struct rte_flow *flow,
		     struct rte_flow_error *error)
{
	struct rte_flow *remote_flow = flow->remote_flow;
...
	if (remote_flow) {
		remote_flow->msg.nh.nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;

Simplest fix is to use rte_zmalloc() so remote_flow and other fields
are always set at zero.

Fixes: 2bc06869cd94 ("net/tap: add remote netdevice traffic capture")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/tap/tap_flow.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c
index d155618fc8..0c5043b63f 100644
--- a/drivers/net/tap/tap_flow.c
+++ b/drivers/net/tap/tap_flow.c
@@ -1379,5 +1379,5 @@ tap_flow_create(struct rte_eth_dev *dev,
 		goto fail;
 	}
-	flow = rte_malloc(__func__, sizeof(struct rte_flow), 0);
+	flow = rte_zmalloc(__func__, sizeof(struct rte_flow), 0);
 	if (!flow) {
 		rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE,
@@ -1415,5 +1415,5 @@ tap_flow_create(struct rte_eth_dev *dev,
 	 */
 	if (pmd->remote_if_index) {
-		remote_flow = rte_malloc(__func__, sizeof(struct rte_flow), 0);
+		remote_flow = rte_zmalloc(__func__, sizeof(struct rte_flow), 0);
 		if (!remote_flow) {
 			rte_flow_error_set(
@@ -1692,5 +1692,5 @@ int tap_flow_implicit_create(struct pmd_internals *pmd,
 	};
 
-	remote_flow = rte_malloc(__func__, sizeof(struct rte_flow), 0);
+	remote_flow = rte_zmalloc(__func__, sizeof(struct rte_flow), 0);
 	if (!remote_flow) {
 		TAP_LOG(ERR, "Cannot allocate memory for rte_flow");
@@ -1895,5 +1895,5 @@ static int rss_enable(struct pmd_internals *pmd,
 		}
 
-		rss_flow = rte_malloc(__func__, sizeof(struct rte_flow), 0);
+		rss_flow = rte_zmalloc(__func__, sizeof(struct rte_flow), 0);
 		if (!rss_flow) {
 			TAP_LOG(ERR,
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.882412244 +0100
+++ 0037-net-tap-fix-crash-in-flow-destroy.patch	2020-06-05 19:20:50.784041404 +0100
@@ -1 +1 @@
-From 8451387df206f5ad34461280ab6a2e5bfe382b9b Mon Sep 17 00:00:00 2001
+From 38a16ce6529150af6431e6b879306c6d54e23b20 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8451387df206f5ad34461280ab6a2e5bfe382b9b ]
+
@@ -31 +32,0 @@
-Cc: stable@dpdk.org
@@ -40 +41 @@
-index 9d90361d99..1538349e9c 100644
+index d155618fc8..0c5043b63f 100644
@@ -43 +44 @@
-@@ -1381,5 +1381,5 @@ tap_flow_create(struct rte_eth_dev *dev,
+@@ -1379,5 +1379,5 @@ tap_flow_create(struct rte_eth_dev *dev,
@@ -50 +51 @@
-@@ -1417,5 +1417,5 @@ tap_flow_create(struct rte_eth_dev *dev,
+@@ -1415,5 +1415,5 @@ tap_flow_create(struct rte_eth_dev *dev,
@@ -57 +58 @@
-@@ -1694,5 +1694,5 @@ int tap_flow_implicit_create(struct pmd_internals *pmd,
+@@ -1692,5 +1692,5 @@ int tap_flow_implicit_create(struct pmd_internals *pmd,
@@ -64 +65 @@
-@@ -1897,5 +1897,5 @@ static int rss_enable(struct pmd_internals *pmd,
+@@ -1895,5 +1895,5 @@ static int rss_enable(struct pmd_internals *pmd,

[dpdk-stable] patch 'net/bnxt: fix FW version query' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/372013714b3037d9a0e9e040121a6e0e42634b0d

Thanks.

Kevin.

---
From 372013714b3037d9a0e9e040121a6e0e42634b0d Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Wed, 6 May 2020 22:43:28 -0700
Subject: [PATCH] net/bnxt: fix FW version query

[ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ]

bnxt_fw_version_get is not indicating the complete FW version.
Fix it to indicate complete version string.

Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 219d836d91..9ec1e13721 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1550,8 +1550,9 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
 	uint8_t fw_minor = (bp->fw_ver >> 16) & 0xff;
 	uint8_t fw_updt = (bp->fw_ver >> 8) & 0xff;
+	uint8_t fw_rsvd = bp->fw_ver & 0xff;
 	int ret;
 
-	ret = snprintf(fw_version, fw_size, "%d.%d.%d",
-			fw_major, fw_minor, fw_updt);
+	ret = snprintf(fw_version, fw_size, "%d.%d.%d.%d",
+			fw_major, fw_minor, fw_updt, fw_rsvd);
 
 	ret += 1; /* add the size of '\0' */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.932789085 +0100
+++ 0038-net-bnxt-fix-FW-version-query.patch	2020-06-05 19:20:50.789041290 +0100
@@ -1 +1 @@
-From cfa9e98d3c135e4f937265263feb7377330219f6 Mon Sep 17 00:00:00 2001
+From 372013714b3037d9a0e9e040121a6e0e42634b0d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cfa9e98d3c135e4f937265263feb7377330219f6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index dab291c7ce..ee0550b324 100644
+index 219d836d91..9ec1e13721 100644
@@ -21 +22 @@
-@@ -2405,8 +2405,9 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)
+@@ -1550,8 +1550,9 @@ bnxt_fw_version_get(struct rte_eth_dev *dev, char *fw_version, size_t fw_size)

[dpdk-stable] patch 'app/testpmd: fix memory failure handling for i40e DDP' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ae339eaf191361f241e27085acb27c9d2a22f8a1

Thanks.

Kevin.

---
From ae339eaf191361f241e27085acb27c9d2a22f8a1 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Date: Fri, 8 May 2020 10:20:24 +0530
Subject: [PATCH] app/testpmd: fix memory failure handling for i40e DDP

[ upstream commit 489bdbbfc269c819ec679605d1f0e8ad058789f4 ]

In cmd_ddp_get_list_parsed(), elements of "p_list" are accessed
even after the memory allocation for "p_list" fails.

With this patch, this null pointer dereference is avoided as we
return when there is malloc failure.

Fixes: e088907bb851 ("app/testpmd: add command for getting loaded DDP profiles")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/cmdline.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2913de68f4..abf803418c 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -16460,6 +16460,8 @@ cmd_ddp_get_list_parsed(
 	size = PROFILE_INFO_SIZE * MAX_PROFILE_NUM + 4;
 	p_list = (struct rte_pmd_i40e_profile_list *)malloc(size);
-	if (!p_list)
+	if (!p_list) {
 		printf("%s: Failed to malloc buffer\n", __func__);
+		return;
+	}
 
 	if (ret == -ENOTSUP)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:52.985239100 +0100
+++ 0039-app-testpmd-fix-memory-failure-handling-for-i40e-DDP.patch	2020-06-05 19:20:50.815040700 +0100
@@ -1 +1 @@
-From 489bdbbfc269c819ec679605d1f0e8ad058789f4 Mon Sep 17 00:00:00 2001
+From ae339eaf191361f241e27085acb27c9d2a22f8a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 489bdbbfc269c819ec679605d1f0e8ad058789f4 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index b040630c54..996a498768 100644
+index 2913de68f4..abf803418c 100644
@@ -25 +26 @@
-@@ -16892,6 +16892,8 @@ cmd_ddp_get_list_parsed(
+@@ -16460,6 +16460,8 @@ cmd_ddp_get_list_parsed(

[dpdk-stable] patch 'bus/fslmc: fix dereferencing null pointer' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7afb16b952e36c086613f9511fdc87755a241e33

Thanks.

Kevin.

---
From 7afb16b952e36c086613f9511fdc87755a241e33 Mon Sep 17 00:00:00 2001
From: Apeksha Gupta <apeksha.gupta@nxp.com>
Date: Fri, 8 May 2020 18:32:02 +0530
Subject: [PATCH] bus/fslmc: fix dereferencing null pointer

[ upstream commit 27ede02945b31e952a66c1bdbf7cf9481698d8dd ]

Fixes: 6fef517e17cf ("bus/fslmc: add qman HW fq query count API")

Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/fslmc/qbman/qbman_debug.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c
index 0bb2ce880f..4cd0923acb 100644
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -28,4 +28,5 @@ int qbman_fq_query_state(struct qbman_swp *s, uint32_t fqid,
 {
 	struct qbman_fq_query_desc *p;
+	struct qbman_fq_query_np_rslt *var;
 
 	p = (struct qbman_fq_query_desc *)qbman_swp_mc_start(s);
@@ -34,11 +35,11 @@ int qbman_fq_query_state(struct qbman_swp *s, uint32_t fqid,
 
 	p->fqid = fqid;
-	*r = *(struct qbman_fq_query_np_rslt *)qbman_swp_mc_complete(s, p,
-						QBMAN_FQ_QUERY_NP);
-	if (!r) {
+	var = qbman_swp_mc_complete(s, p, QBMAN_FQ_QUERY_NP);
+	if (!var) {
 		pr_err("qbman: Query FQID %d NP fields failed, no response\n",
 		       fqid);
 		return -EIO;
 	}
+	*r = *var;
 
 	/* Decode the outcome */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.053741008 +0100
+++ 0040-bus-fslmc-fix-dereferencing-null-pointer.patch	2020-06-05 19:20:50.816040677 +0100
@@ -1 +1 @@
-From 27ede02945b31e952a66c1bdbf7cf9481698d8dd Mon Sep 17 00:00:00 2001
+From 7afb16b952e36c086613f9511fdc87755a241e33 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 27ede02945b31e952a66c1bdbf7cf9481698d8dd ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/dpaa2: fix 10G port negotiation' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/d2a2e4d347c293888a070a5e3f6e267cd914e525

Thanks.

Kevin.

---
From d2a2e4d347c293888a070a5e3f6e267cd914e525 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj@nxp.com>
Date: Fri, 8 May 2020 18:32:03 +0530
Subject: [PATCH] net/dpaa2: fix 10G port negotiation

[ upstream commit 7e6ecac281e4571d942889d6de687bb87623899b ]

Fixed 10G port negotiation issue with another 10G/non 10G port.

When running testpmd with 10G interfaces on 10BaseT interface
on LS2088ARDB, the ports were showing link as down.

This was identified to be caused by the setting of link as down
during config.
Also, the line rate was not being updated in device link params,
thus having the incorrect link speed in status (as 0).

Fixes: c5acbb5ea20e ("net/dpaa2: support link status event")

Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index e50467285e..c801d922cf 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -437,7 +437,4 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
 		dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
 
-	/* update the current status */
-	dpaa2_dev_link_update(dev, 0);
-
 	return 0;
 }
@@ -1481,4 +1478,5 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
 	dev->tx_pkt_burst = dpaa2_dev_tx;
 	dev->data->dev_link.link_status = state.up;
+	dev->data->dev_link.link_speed = state.rate;
 
 	if (state.up)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.102357569 +0100
+++ 0041-net-dpaa2-fix-10G-port-negotiation.patch	2020-06-05 19:20:50.819040609 +0100
@@ -1 +1 @@
-From 7e6ecac281e4571d942889d6de687bb87623899b Mon Sep 17 00:00:00 2001
+From d2a2e4d347c293888a070a5e3f6e267cd914e525 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7e6ecac281e4571d942889d6de687bb87623899b ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 2cde55e7cc..4fc550a885 100644
+index e50467285e..c801d922cf 100644
@@ -29 +30 @@
-@@ -554,7 +554,4 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
+@@ -437,7 +437,4 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
@@ -37 +38 @@
-@@ -1758,4 +1755,5 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
+@@ -1481,4 +1478,5 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)

[dpdk-stable] patch 'bus/fslmc: fix size of qman fq descriptor' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3dc6b3201b3731fbde8ec35b706e74c0e4b12563

Thanks.

Kevin.

---
From 3dc6b3201b3731fbde8ec35b706e74c0e4b12563 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal@nxp.com>
Date: Fri, 8 May 2020 18:32:10 +0530
Subject: [PATCH] bus/fslmc: fix size of qman fq descriptor

[ upstream commit 231366ba5f538eff9eaffbda35e422cb95af0337 ]

Correct the qman_fq_desc as per the HW defined size

Fixes: 6fef517e17cf ("bus/fslmc: add qman HW fq query count API")

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/fslmc/qbman/qbman_debug.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/qbman/qbman_debug.c b/drivers/bus/fslmc/qbman/qbman_debug.c
index 4cd0923acb..34374ae4b6 100644
--- a/drivers/bus/fslmc/qbman/qbman_debug.c
+++ b/drivers/bus/fslmc/qbman/qbman_debug.c
@@ -21,5 +21,5 @@ struct qbman_fq_query_desc {
 	uint8_t reserved[3];
 	uint32_t fqid;
-	uint8_t reserved2[57];
+	uint8_t reserved2[56];
 };
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.152225678 +0100
+++ 0042-bus-fslmc-fix-size-of-qman-fq-descriptor.patch	2020-06-05 19:20:50.819040609 +0100
@@ -1 +1 @@
-From 231366ba5f538eff9eaffbda35e422cb95af0337 Mon Sep 17 00:00:00 2001
+From 3dc6b3201b3731fbde8ec35b706e74c0e4b12563 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 231366ba5f538eff9eaffbda35e422cb95af0337 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/ring: fix device pointer on allocation' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/160d1b6410cd4db1ec84dba0038f377605741c4f

Thanks.

Kevin.

---
From 160d1b6410cd4db1ec84dba0038f377605741c4f Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <grive@u256.net>
Date: Wed, 6 May 2020 20:09:49 +0200
Subject: [PATCH] net/ring: fix device pointer on allocation

[ upstream commit 8459f5ab32211fb10bbfe388fa0e017475d8507c ]

When a net_ring device is allocated, its device pointer is not set
before calling rte_eth_dev_probing_finish, which is incorrect.

The following:
  commit 96cb19521147 ("net/ring: use EAL APIs in PMD specific API")
  commit a6992e961050 ("net/ring: set ethernet device field")

already fixed the same issue in 17.08, which was fine at the time.
Adding the hook rte_eth_dev_probing_finish() however created this bug,
as the eth_dev exposed when this hook is executed is expected to be
complete.

Remove the prior attempts to fix the issue in rte_pmd_ring_probe() and
write the pointer properly in do_eth_dev_ring_create().

Fixes: fbe90cdd776c ("ethdev: add probing finish function")

Signed-off-by: Gaetan Rivet <grive@u256.net>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/ring/rte_eth_ring.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 452114d0c5..7298ee93e2 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -252,4 +252,5 @@ static const struct eth_dev_ops ops = {
 static int
 do_eth_dev_ring_create(const char *name,
+		struct rte_vdev_device *vdev,
 		struct rte_ring * const rx_queues[],
 		const unsigned int nb_rx_queues,
@@ -297,4 +298,5 @@ do_eth_dev_ring_create(const char *name,
 
 	/* now put it all together
+	 * - store EAL device in eth_dev,
 	 * - store queue data in internals,
 	 * - store numa_node info in eth_dev_data
@@ -303,4 +305,6 @@ do_eth_dev_ring_create(const char *name,
 	 */
 
+	eth_dev->device = &vdev->device;
+
 	data = eth_dev->data;
 	data->rx_queues = rx_queues_local;
@@ -412,5 +416,7 @@ rte_eth_from_ring(struct rte_ring *r)
 
 static int
-eth_dev_ring_create(const char *name, const unsigned int numa_node,
+eth_dev_ring_create(const char *name,
+		struct rte_vdev_device *vdev,
+		const unsigned int numa_node,
 		enum dev_action action, struct rte_eth_dev **eth_dev)
 {
@@ -442,5 +448,5 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node,
 	}
 
-	if (do_eth_dev_ring_create(name, rxtx, num_rings, rxtx, num_rings,
+	if (do_eth_dev_ring_create(name, vdev, rxtx, num_rings, rxtx, num_rings,
 		numa_node, action, eth_dev) < 0)
 		return -1;
@@ -563,10 +569,10 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 
 	if (params == NULL || params[0] == '\0') {
-		ret = eth_dev_ring_create(name, rte_socket_id(), DEV_CREATE,
+		ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_CREATE,
 				&eth_dev);
 		if (ret == -1) {
 			PMD_LOG(INFO,
 				"Attach to pmd_ring for %s", name);
-			ret = eth_dev_ring_create(name, rte_socket_id(),
+			ret = eth_dev_ring_create(name, dev, rte_socket_id(),
 						  DEV_ATTACH, &eth_dev);
 		}
@@ -577,5 +583,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 			PMD_LOG(INFO,
 				"Ignoring unsupported parameters when creatingrings-backed ethernet device");
-			ret = eth_dev_ring_create(name, rte_socket_id(),
+			ret = eth_dev_ring_create(name, dev, rte_socket_id(),
 						  DEV_CREATE, &eth_dev);
 			if (ret == -1) {
@@ -583,11 +589,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 					"Attach to pmd_ring for %s",
 					name);
-				ret = eth_dev_ring_create(name, rte_socket_id(),
+				ret = eth_dev_ring_create(name, dev, rte_socket_id(),
 							  DEV_ATTACH, &eth_dev);
 			}
 
-			if (eth_dev)
-				eth_dev->device = &dev->device;
-
 			return ret;
 		}
@@ -600,5 +603,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 				goto out_free;
 
-			ret = do_eth_dev_ring_create(name,
+			ret = do_eth_dev_ring_create(name, dev,
 				internal_args->rx_queues,
 				internal_args->nb_rx_queues,
@@ -630,4 +633,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 			for (info->count = 0; info->count < info->total; info->count++) {
 				ret = eth_dev_ring_create(info->list[info->count].name,
+							  dev,
 							  info->list[info->count].node,
 							  info->list[info->count].action,
@@ -638,5 +642,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 						"Attach to pmd_ring for %s",
 						name);
-					ret = eth_dev_ring_create(name,
+					ret = eth_dev_ring_create(name, dev,
 							info->list[info->count].node,
 							DEV_ATTACH,
@@ -647,7 +651,4 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 	}
 
-	if (eth_dev)
-		eth_dev->device = &dev->device;
-
 out_free:
 	rte_kvargs_free(kvlist);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.200289319 +0100
+++ 0043-net-ring-fix-device-pointer-on-allocation.patch	2020-06-05 19:20:50.820040586 +0100
@@ -1 +1 @@
-From 8459f5ab32211fb10bbfe388fa0e017475d8507c Mon Sep 17 00:00:00 2001
+From 160d1b6410cd4db1ec84dba0038f377605741c4f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8459f5ab32211fb10bbfe388fa0e017475d8507c ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 41acbc513d..f0fafa0c0d 100644
+index 452114d0c5..7298ee93e2 100644
@@ -34 +35 @@
-@@ -247,4 +247,5 @@ static const struct eth_dev_ops ops = {
+@@ -252,4 +252,5 @@ static const struct eth_dev_ops ops = {
@@ -40 +41 @@
-@@ -292,4 +293,5 @@ do_eth_dev_ring_create(const char *name,
+@@ -297,4 +298,5 @@ do_eth_dev_ring_create(const char *name,
@@ -46 +47 @@
-@@ -298,4 +300,6 @@ do_eth_dev_ring_create(const char *name,
+@@ -303,4 +305,6 @@ do_eth_dev_ring_create(const char *name,
@@ -53 +54 @@
-@@ -409,5 +413,7 @@ rte_eth_from_ring(struct rte_ring *r)
+@@ -412,5 +416,7 @@ rte_eth_from_ring(struct rte_ring *r)
@@ -62 +63 @@
-@@ -439,5 +445,5 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node,
+@@ -442,5 +448,5 @@ eth_dev_ring_create(const char *name, const unsigned int numa_node,
@@ -69 +70 @@
-@@ -561,10 +567,10 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -563,10 +569,10 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
@@ -82 +83 @@
-@@ -575,5 +581,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -577,5 +583,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
@@ -89 +90 @@
-@@ -581,11 +587,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -583,11 +589,8 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
@@ -102 +103 @@
-@@ -598,5 +601,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -600,5 +603,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
@@ -109 +110 @@
-@@ -628,4 +631,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -630,4 +633,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
@@ -115 +116 @@
-@@ -636,5 +640,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -638,5 +642,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
@@ -122 +123 @@
-@@ -645,7 +649,4 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -647,7 +651,4 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)

[dpdk-stable] patch 'net/mlx5: fix matching for UDP tunnels with Verbs' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9ff1e11cb7ae3314f1954cd5506faffa208fe543

Thanks.

Kevin.

---
From 9ff1e11cb7ae3314f1954cd5506faffa208fe543 Mon Sep 17 00:00:00 2001
From: Raslan Darawsheh <rasland@mellanox.com>
Date: Wed, 6 May 2020 09:57:56 +0300
Subject: [PATCH] net/mlx5: fix matching for UDP tunnels with Verbs

[ upstream commit 8a2e026add3a6a7161a7273aedcf396f2a05f3f1 ]

When creating flow rule with zero specs it will cause
matching all UDP packets like following:
 eth / ipv4 / udp / vxlan / end
Such rule will match all udp packets.

This change the behavior to match the dv flow engine
which will automatically set the match on relative
outer UDP port if the user didn't specify any.

Fixes: 84c406e74524 ("net/mlx5: add flow translate function")

Signed-off-by: Raslan Darawsheh <rasland@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_verbs.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index 05a3db501f..eb740290d4 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -573,4 +573,26 @@ flow_verbs_translate_item_udp(struct mlx5_flow *dev_flow,
 		udp.val.dst_port &= udp.mask.dst_port;
 	}
+	item++;
+	while (item->type == RTE_FLOW_ITEM_TYPE_VOID)
+		item++;
+	if (!(udp.val.dst_port & udp.mask.dst_port)) {
+		switch ((item)->type) {
+		case RTE_FLOW_ITEM_TYPE_VXLAN:
+			udp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN);
+			udp.mask.dst_port = 0xffff;
+			break;
+		case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
+			udp.val.dst_port = htons(MLX5_UDP_PORT_VXLAN_GPE);
+			udp.mask.dst_port = 0xffff;
+			break;
+		case RTE_FLOW_ITEM_TYPE_MPLS:
+			udp.val.dst_port = htons(MLX5_UDP_PORT_MPLS);
+			udp.mask.dst_port = 0xffff;
+			break;
+		default:
+			break;
+		}
+	}
+
 	flow_verbs_spec_add(&dev_flow->verbs, &udp, size);
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.248504762 +0100
+++ 0044-net-mlx5-fix-matching-for-UDP-tunnels-with-Verbs.patch	2020-06-05 19:20:50.822040541 +0100
@@ -1 +1 @@
-From 8a2e026add3a6a7161a7273aedcf396f2a05f3f1 Mon Sep 17 00:00:00 2001
+From 9ff1e11cb7ae3314f1954cd5506faffa208fe543 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8a2e026add3a6a7161a7273aedcf396f2a05f3f1 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 4659f0a7f7..c403f72be3 100644
+index 05a3db501f..eb740290d4 100644
@@ -28 +29 @@
-@@ -681,4 +681,26 @@ flow_verbs_translate_item_udp(struct mlx5_flow *dev_flow,
+@@ -573,4 +573,26 @@ flow_verbs_translate_item_udp(struct mlx5_flow *dev_flow,

[dpdk-stable] patch 'net/mlx4: fix drop queue error handling' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4b16538be8008edf9d556f159862b1abb42e8610

Thanks.

Kevin.

---
From 4b16538be8008edf9d556f159862b1abb42e8610 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba@mellanox.com>
Date: Wed, 6 May 2020 16:27:54 +0000
Subject: [PATCH] net/mlx4: fix drop queue error handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 6f155c0b9de5a58b5653d3e81c553564984f3c36 ]

The function mlx4_drop_get() creates pointer to a struct mlx4_drop and
if needed allocates by rte_malloc.

If the allocation is failed the function goes to label “error”, and
there does dereference to a null pointer.

Skip resources cleaning when the memory allocation is failed.

Coverity issue: 146206
Coverity issue: 146146
Fixes: d3a7e09234e4 ("net/mlx4: allocate drop flow resources on demand")

Signed-off-by: Michael Baum <michaelba@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx4/mlx4_flow.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index 5136d136ff..dfdc790aaf 100644
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -977,10 +977,11 @@ mlx4_drop_get(struct mlx4_priv *priv)
 	return drop;
 error:
-	if (drop->qp)
-		claim_zero(mlx4_glue->destroy_qp(drop->qp));
-	if (drop->cq)
-		claim_zero(mlx4_glue->destroy_cq(drop->cq));
-	if (drop)
+	if (drop) {
+		if (drop->qp)
+			claim_zero(mlx4_glue->destroy_qp(drop->qp));
+		if (drop->cq)
+			claim_zero(mlx4_glue->destroy_cq(drop->cq));
 		rte_free(drop);
+	}
 	rte_errno = ENOMEM;
 	return NULL;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.300923714 +0100
+++ 0045-net-mlx4-fix-drop-queue-error-handling.patch	2020-06-05 19:20:50.824040495 +0100
@@ -1 +1 @@
-From 6f155c0b9de5a58b5653d3e81c553564984f3c36 Mon Sep 17 00:00:00 2001
+From 4b16538be8008edf9d556f159862b1abb42e8610 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 6f155c0b9de5a58b5653d3e81c553564984f3c36 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 793f0b090e..2a86382db7 100644
+index 5136d136ff..dfdc790aaf 100644
@@ -32 +33 @@
-@@ -981,10 +981,11 @@ mlx4_drop_get(struct mlx4_priv *priv)
+@@ -977,10 +977,11 @@ mlx4_drop_get(struct mlx4_priv *priv)

[dpdk-stable] patch 'net/mlx5: fix Tx queue release debug log timing' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9d406e92ccf555d396653466d23ab7175bee2e05

Thanks.

Kevin.

---
From 9d406e92ccf555d396653466d23ab7175bee2e05 Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev@mellanox.com>
Date: Wed, 6 May 2020 18:10:59 +0000
Subject: [PATCH] net/mlx5: fix Tx queue release debug log timing

[ upstream commit 776aec28fc47dbf29466555b34cd79ab9cf7a7bc ]

Program received signal SIGSEGV, Segmentation fault.
0x00000000008ef7c4 in mlx5_tx_queue_release (dpdk_txq=0x17ce01680) at
drivers/net/mlx5/mlx5_txq.c:302
301 mlx5_txq_release(ETH_DEV(priv), i);
302 DRV_LOG(DEBUG, "port %u removing Tx queue %u from list",
303         PORT_ID(priv), txq->idx);
The problem is txq is freed inside the mlx5_txq_release() function
and no longer valid in the debug log right after this invocation.
Move the debug log before the mlx5_txq_release() function to fix this.

Fixes: a6d83b6a9209 ("net/mlx5: standardize on negative errno values")

Signed-off-by: Alexander Kozyrev <akozyrev@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
 drivers/net/mlx5/mlx5_txq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index e6020fbcbf..7ee036f97a 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -224,7 +224,7 @@ mlx5_tx_queue_release(void *dpdk_txq)
 	for (i = 0; (i != priv->txqs_n); ++i)
 		if ((*priv->txqs)[i] == txq) {
-			mlx5_txq_release(ETH_DEV(priv), i);
 			DRV_LOG(DEBUG, "port %u removing Tx queue %u from list",
 				PORT_ID(priv), txq_ctrl->idx);
+			mlx5_txq_release(ETH_DEV(priv), i);
 			break;
 		}
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.350474765 +0100
+++ 0046-net-mlx5-fix-Tx-queue-release-debug-log-timing.patch	2020-06-05 19:20:50.825040472 +0100
@@ -1 +1 @@
-From 776aec28fc47dbf29466555b34cd79ab9cf7a7bc Mon Sep 17 00:00:00 2001
+From 9d406e92ccf555d396653466d23ab7175bee2e05 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 776aec28fc47dbf29466555b34cd79ab9cf7a7bc ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 29e5cabab6..a211fa91b2 100644
+index e6020fbcbf..7ee036f97a 100644
@@ -29 +30 @@
-@@ -299,7 +299,7 @@ mlx5_tx_queue_release(void *dpdk_txq)
+@@ -224,7 +224,7 @@ mlx5_tx_queue_release(void *dpdk_txq)
@@ -34 +35 @@
- 				PORT_ID(priv), txq->idx);
+ 				PORT_ID(priv), txq_ctrl->idx);

[dpdk-stable] patch 'app: remove extra new line after link duplex' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8b1f81d77bd2ccb2479444dfdb49918d1be4e464

Thanks.

Kevin.

---
From 8b1f81d77bd2ccb2479444dfdb49918d1be4e464 Mon Sep 17 00:00:00 2001
From: Ivan Dyukov <i.dyukov@samsung.com>
Date: Thu, 7 May 2020 21:26:01 +0300
Subject: [PATCH] app: remove extra new line after link duplex

[ upstream commit a357d09d54246ea72625c22a970d81a3165fbf94 ]

This is testpmd part of new line cleanup.

Fixes: 002ade70e9 ("app/test: measure cycles per packet in Rx/Tx")
Fixes: ce8d561418 ("app/testpmd: add port configuration settings")

Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 app/test-pmd/testpmd.c    | 2 +-
 test/test/test_pmd_perf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index a910c06dc2..b68bc54e32 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2501,5 +2501,5 @@ check_all_ports_link_status(uint32_t port_mask)
 					portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/test/test/test_pmd_perf.c b/test/test/test_pmd_perf.c
index ed8524a176..d68f9599c7 100644
--- a/test/test/test_pmd_perf.c
+++ b/test/test/test_pmd_perf.c
@@ -143,5 +143,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 					if (link_mbps == 0)
 						link_mbps = link.link_speed;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.400205925 +0100
+++ 0047-app-remove-extra-new-line-after-link-duplex.patch	2020-06-05 19:20:50.830040359 +0100
@@ -1 +1 @@
-From a357d09d54246ea72625c22a970d81a3165fbf94 Mon Sep 17 00:00:00 2001
+From 8b1f81d77bd2ccb2479444dfdb49918d1be4e464 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a357d09d54246ea72625c22a970d81a3165fbf94 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15,2 +16,2 @@
- app/test-pmd/testpmd.c   | 2 +-
- app/test/test_pmd_perf.c | 2 +-
+ app/test-pmd/testpmd.c    | 2 +-
+ test/test/test_pmd_perf.c | 2 +-
@@ -20 +21 @@
-index 4b13bf6a98..9cbe6e9f68 100644
+index a910c06dc2..b68bc54e32 100644
@@ -23 +24 @@
-@@ -3013,5 +3013,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -2501,5 +2501,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -30,5 +31,5 @@
-diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
-index d61be58bb3..352cd47156 100644
---- a/app/test/test_pmd_perf.c
-+++ b/app/test/test_pmd_perf.c
-@@ -152,5 +152,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
+diff --git a/test/test/test_pmd_perf.c b/test/test/test_pmd_perf.c
+index ed8524a176..d68f9599c7 100644
+--- a/test/test/test_pmd_perf.c
++++ b/test/test/test_pmd_perf.c
+@@ -143,5 +143,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)

[dpdk-stable] patch 'examples: remove extra new line after link duplex' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ba9c21473a48646ee1de6da01a0eb7120fabd6a9

Thanks.

Kevin.

---
From ba9c21473a48646ee1de6da01a0eb7120fabd6a9 Mon Sep 17 00:00:00 2001
From: Ivan Dyukov <i.dyukov@samsung.com>
Date: Thu, 7 May 2020 21:26:02 +0300
Subject: [PATCH] examples: remove extra new line after link duplex

[ upstream commit c81e3f21d1ea05e5123278b15d9d5e1257b6ba99 ]

This patch removes extra 'new line' in few app examples.

Fixes: d3641ae863 ("examples: update link status checks")
Fixes: 387259bd6c ("examples/l2fwd-crypto: add sample application")
Fixes: 4ff457986f ("examples/l2fwd-event: add default poll mode routines")
Fixes: e64833f227 ("examples/l2fwd-keepalive: add sample application")
Fixes: 204896f8d6 ("examples/l2fwd-jobstats: add new example")
Fixes: c8e6ceeceb ("examples/ioat: add new sample app for ioat driver")
Fixes: cc8f4d020c ("examples/ip_reassembly: initial import")
Fixes: d299106e8e ("examples/ipsec-secgw: add IPsec sample application")
Fixes: 39aad0e88c ("examples/flow_distributor: new example to demonstrate EFD")
Fixes: d48415e1fe ("examples/performance-thread: add l3fwd-thread app")
Fixes: 20c78ac9ee ("examples/vm_power_mgr: add port initialisation")
Fixes: 361b2e9559 ("acl: new sample l3fwd-acl")
Fixes: de3cfa2c98 ("sched: initial import")
Fixes: d7937e2e3d ("power: initial import")
Fixes: 3fc5ca2f63 ("kni: initial import")

Signed-off-by: Ivan Dyukov <i.dyukov@samsung.com>
---
 examples/ip_fragmentation/main.c                         | 2 +-
 examples/ip_reassembly/main.c                            | 2 +-
 examples/ipsec-secgw/ipsec-secgw.c                       | 2 +-
 examples/ipv4_multicast/main.c                           | 2 +-
 examples/kni/main.c                                      | 2 +-
 examples/l2fwd-crypto/main.c                             | 2 +-
 examples/l2fwd-jobstats/main.c                           | 2 +-
 examples/l2fwd-keepalive/main.c                          | 2 +-
 examples/l2fwd/main.c                                    | 2 +-
 examples/l3fwd-acl/main.c                                | 2 +-
 examples/l3fwd-power/main.c                              | 2 +-
 examples/l3fwd/main.c                                    | 2 +-
 examples/link_status_interrupt/main.c                    | 2 +-
 examples/multi_process/client_server_mp/mp_server/init.c | 2 +-
 examples/multi_process/symmetric_mp/main.c               | 2 +-
 examples/performance-thread/l3fwd-thread/main.c          | 2 +-
 examples/qos_sched/init.c                                | 2 +-
 examples/server_node_efd/server/init.c                   | 2 +-
 examples/vm_power_manager/main.c                         | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 68d40c19ac..0631a1a2d4 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -592,5 +592,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c
index 17b55d4c76..d29efc5354 100644
--- a/examples/ip_reassembly/main.c
+++ b/examples/ip_reassembly/main.c
@@ -725,5 +725,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index c55606e078..be77a839d3 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -1326,5 +1326,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c
index 428ca4694e..e7cb4ba566 100644
--- a/examples/ipv4_multicast/main.c
+++ b/examples/ipv4_multicast/main.c
@@ -599,5 +599,5 @@ check_all_ports_link_status(uint32_t port_mask)
 					portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/kni/main.c b/examples/kni/main.c
index 5dff7d3b52..6c9f46e77e 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -661,5 +661,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index f12fd266e6..2d79327875 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -1746,5 +1746,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c
index a4d28e1782..8443f685d3 100644
--- a/examples/l2fwd-jobstats/main.c
+++ b/examples/l2fwd-jobstats/main.c
@@ -703,5 +703,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 16c0a1c034..e74eb1f53e 100644
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -468,5 +468,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c
index 6c23215a54..6ddf94b005 100644
--- a/examples/l2fwd/main.c
+++ b/examples/l2fwd/main.c
@@ -471,5 +471,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index 8ed0c07ec1..f2fe20e48f 100644
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -1828,5 +1828,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 77009ce809..c2a9d36cb6 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1782,5 +1782,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						(unsigned)link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 71a67f422b..3ca84c80d9 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -721,5 +721,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c
index f3346d23b4..17e77427a9 100644
--- a/examples/link_status_interrupt/main.c
+++ b/examples/link_status_interrupt/main.c
@@ -483,5 +483,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index 1b0569937b..bf209522f8 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -200,5 +200,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 						(unsigned)link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index 62771e036c..762c3cdfc7 100644
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -374,5 +374,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index 79523d23d3..8ec819dcbe 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -3439,5 +3439,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						portid, link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n", portid);
diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index 37c2b95fd6..8f53bafbcb 100644
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -154,5 +154,5 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
 			(uint32_t) link.link_speed,
 			(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-			("full-duplex") : ("half-duplex\n"));
+			("full-duplex") : ("half-duplex"));
 	} else {
 		printf(" Link Down\n");
diff --git a/examples/server_node_efd/server/init.c b/examples/server_node_efd/server/init.c
index af5a18e285..ff5b08351e 100644
--- a/examples/server_node_efd/server/init.c
+++ b/examples/server_node_efd/server/init.c
@@ -260,5 +260,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
 						link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
diff --git a/examples/vm_power_manager/main.c b/examples/vm_power_manager/main.c
index 5fa13fe621..30f9ceb73e 100644
--- a/examples/vm_power_manager/main.c
+++ b/examples/vm_power_manager/main.c
@@ -251,5 +251,5 @@ check_all_ports_link_status(uint32_t port_mask)
 						(unsigned int)link.link_speed,
 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-					("full-duplex") : ("half-duplex\n"));
+					("full-duplex") : ("half-duplex"));
 				else
 					printf("Port %d Link Down\n",
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.451215642 +0100
+++ 0048-examples-remove-extra-new-line-after-link-duplex.patch	2020-06-05 19:20:50.853039836 +0100
@@ -1 +1 @@
-From c81e3f21d1ea05e5123278b15d9d5e1257b6ba99 Mon Sep 17 00:00:00 2001
+From ba9c21473a48646ee1de6da01a0eb7120fabd6a9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c81e3f21d1ea05e5123278b15d9d5e1257b6ba99 ]
+
@@ -23 +24,0 @@
-Cc: stable@dpdk.org
@@ -27 +27,0 @@
- examples/ioat/ioatfwd.c                                  | 2 +-
@@ -34 +33,0 @@
- examples/l2fwd-event/main.c                              | 2 +-
@@ -48 +47 @@
- 21 files changed, 21 insertions(+), 21 deletions(-)
+ 19 files changed, 19 insertions(+), 19 deletions(-)
@@ -50,11 +48,0 @@
-diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
-index 7255ff3c9e..53de231795 100644
---- a/examples/ioat/ioatfwd.c
-+++ b/examples/ioat/ioatfwd.c
-@@ -719,5 +719,5 @@ check_link_status(uint32_t port_mask)
- 				portid, link.link_speed,
- 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
--				("full-duplex") : ("half-duplex\n"));
-+				("full-duplex") : ("half-duplex"));
- 			link_status = 1;
- 		} else
@@ -62 +50 @@
-index 5eca7ba994..4afb97109f 100644
+index 68d40c19ac..0631a1a2d4 100644
@@ -65 +53 @@
-@@ -618,5 +618,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -592,5 +592,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -73 +61 @@
-index e34d8f0e12..494d7ee776 100644
+index 17b55d4c76..d29efc5354 100644
@@ -76 +64 @@
-@@ -737,5 +737,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -725,5 +725,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -84 +72 @@
-index 161fd218aa..f777ce2afe 100644
+index c55606e078..be77a839d3 100644
@@ -87 +75 @@
-@@ -1800,5 +1800,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -1326,5 +1326,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -95 +83 @@
-index 1fb28513b0..7e255c35a3 100644
+index 428ca4694e..e7cb4ba566 100644
@@ -98 +86 @@
-@@ -597,5 +597,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -599,5 +599,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -106 +94 @@
-index 29fc37e1fb..6b4ab3b5b5 100644
+index 5dff7d3b52..6c9f46e77e 100644
@@ -109 +97 @@
-@@ -684,5 +684,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -661,5 +661,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -117 +105 @@
-index 61d78295d4..fcb55c370a 100644
+index f12fd266e6..2d79327875 100644
@@ -120 +108 @@
-@@ -1757,5 +1757,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -1746,5 +1746,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -127,11 +114,0 @@
-diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c
-index 9cc29d7324..9593ef11e3 100644
---- a/examples/l2fwd-event/main.c
-+++ b/examples/l2fwd-event/main.c
-@@ -395,5 +395,5 @@ check_all_ports_link_status(struct l2fwd_resources *rsrc,
- 						port_id, link.link_speed,
- 				(link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
--					("full-duplex") : ("half-duplex\n"));
-+					("full-duplex") : ("half-duplex"));
- 				else
- 					printf("Port %d Link Down\n", port_id);
@@ -139 +116 @@
-index c1ca100ed0..396fd89db4 100644
+index a4d28e1782..8443f685d3 100644
@@ -142 +119 @@
-@@ -711,5 +711,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -703,5 +703,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -150 +127 @@
-index 32482158d6..b7585d55e1 100644
+index 16c0a1c034..e74eb1f53e 100644
@@ -153 +130 @@
-@@ -476,5 +476,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -468,5 +468,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -161 +138 @@
-index 88ddfe5897..f8d14b843a 100644
+index 6c23215a54..6ddf94b005 100644
@@ -164 +141 @@
-@@ -479,5 +479,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -471,5 +471,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -172 +149 @@
-index cccf81929c..f22fca7328 100644
+index 8ed0c07ec1..f2fe20e48f 100644
@@ -175 +152 @@
-@@ -1840,5 +1840,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -1828,5 +1828,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -183 +160 @@
-index 48b9c85e1b..9db94ce044 100644
+index 77009ce809..c2a9d36cb6 100644
@@ -186 +163 @@
-@@ -1970,5 +1970,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -1782,5 +1782,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -194 +171 @@
-index dda430d68a..84f171f18b 100644
+index 71a67f422b..3ca84c80d9 100644
@@ -197 +174 @@
-@@ -839,5 +839,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -721,5 +721,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -205 +182 @@
-index 38422f6ac5..25efe2b09a 100644
+index f3346d23b4..17e77427a9 100644
@@ -208 +185 @@
-@@ -501,5 +501,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
+@@ -483,5 +483,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
@@ -216 +193 @@
-index ad9f46f0aa..c2ec07ac65 100644
+index 1b0569937b..bf209522f8 100644
@@ -219 +196 @@
-@@ -210,5 +210,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
+@@ -200,5 +200,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
@@ -227 +204 @@
-index 522f211c0f..9a16e198cb 100644
+index 62771e036c..762c3cdfc7 100644
@@ -230 +207 @@
-@@ -390,5 +390,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
+@@ -374,5 +374,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
@@ -238 +215 @@
-index 43a5b9248d..84c1d7b3a2 100644
+index 79523d23d3..8ec819dcbe 100644
@@ -241 +218 @@
-@@ -3458,5 +3458,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -3439,5 +3439,5 @@ check_all_ports_link_status(uint32_t port_mask)
@@ -249 +226 @@
-index 0a17e0d4d5..9626c15b81 100644
+index 37c2b95fd6..8f53bafbcb 100644
@@ -252 +229 @@
-@@ -165,5 +165,5 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
+@@ -154,5 +154,5 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
@@ -260 +237 @@
-index 00e2e40599..378a74fa5c 100644
+index af5a18e285..ff5b08351e 100644
@@ -263 +240 @@
-@@ -273,5 +273,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
+@@ -260,5 +260,5 @@ check_all_ports_link_status(uint16_t port_num, uint32_t port_mask)
@@ -271 +248 @@
-index dc6afb132c..273bfec299 100644
+index 5fa13fe621..30f9ceb73e 100644
@@ -274 +251 @@
-@@ -273,5 +273,5 @@ check_all_ports_link_status(uint32_t port_mask)
+@@ -251,5 +251,5 @@ check_all_ports_link_status(uint32_t port_mask)

[dpdk-stable] patch 'event/dsw: fix enqueue burst return value' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/2541b21588de394ae590faadfedc2580435d7afb

Thanks.

Kevin.

---
From 2541b21588de394ae590faadfedc2580435d7afb Mon Sep 17 00:00:00 2001
From: Yuri Chipchev <yuric@marvell.com>
Date: Wed, 6 May 2020 23:18:37 +0300
Subject: [PATCH] event/dsw: fix enqueue burst return value
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e ]

The returned number from rte_event_enqueue_*()
wouldn't include events marked with RTE_EVENT_OP_RELEASE.

Fixes: 1c8e3caa3 ("event/dsw: add event scheduling and device start/stop")

Signed-off-by: Yuri Chipchev <yuric@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
Acked-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
---
 drivers/event/dsw/dsw_event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/event/dsw/dsw_event.c b/drivers/event/dsw/dsw_event.c
index f3873c54e5..0df9209e4f 100644
--- a/drivers/event/dsw/dsw_event.c
+++ b/drivers/event/dsw/dsw_event.c
@@ -1098,5 +1098,5 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port,
 			"accepted.\n", num_non_release);
 
-	return num_non_release;
+	return (num_non_release + num_release);
 }
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.522818462 +0100
+++ 0049-event-dsw-fix-enqueue-burst-return-value.patch	2020-06-05 19:20:50.854039814 +0100
@@ -1 +1 @@
-From 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e Mon Sep 17 00:00:00 2001
+From 2541b21588de394ae590faadfedc2580435d7afb Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 1c4975d6dfa244cf52a2836ca267ba4a7b3ec75e ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index e5e3597aae..611b36781f 100644
+index f3873c54e5..0df9209e4f 100644
@@ -26 +27 @@
-@@ -1232,5 +1232,5 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port,
+@@ -1098,5 +1098,5 @@ dsw_event_enqueue_burst_generic(struct dsw_port *source_port,

[dpdk-stable] patch 'app/eventdev: check Tx adapter service ID' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/055173ee37ae10860d2c6ce432650c38cdbc2bb0

Thanks.

Kevin.

---
From 055173ee37ae10860d2c6ce432650c38cdbc2bb0 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Thu, 14 May 2020 01:52:48 +0530
Subject: [PATCH] app/eventdev: check Tx adapter service ID

[ upstream commit 40984bf253e1bccea72a38b2a0edd7c16ea22831 ]

Fix unchecked return values reported by coverity.

Coverity issue: 357755
Fixes: 032a965a8f1d ("app/eventdev: support Tx adapter")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 app/test-eventdev/test_pipeline_common.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/test-eventdev/test_pipeline_common.c b/app/test-eventdev/test_pipeline_common.c
index c988da28c9..b586804090 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -367,10 +367,14 @@ pipeline_event_tx_adapter_setup(struct evt_options *opt,
 			uint32_t service_id;
 
-			rte_event_eth_tx_adapter_service_id_get(consm,
-					&service_id);
+			ret = rte_event_eth_tx_adapter_service_id_get(consm,
+								   &service_id);
+			if (ret != -ESRCH && ret != 0) {
+				evt_err("Failed to get Tx adptr service ID");
+				return ret;
+			}
 			ret = evt_service_setup(service_id);
 			if (ret) {
 				evt_err("Failed to setup service core"
-						" for Tx adapter\n");
+						" for Tx adapter");
 				return ret;
 			}
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.573236910 +0100
+++ 0050-app-eventdev-check-Tx-adapter-service-ID.patch	2020-06-05 19:20:50.854039814 +0100
@@ -1 +1 @@
-From 40984bf253e1bccea72a38b2a0edd7c16ea22831 Mon Sep 17 00:00:00 2001
+From 055173ee37ae10860d2c6ce432650c38cdbc2bb0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 40984bf253e1bccea72a38b2a0edd7c16ea22831 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 84c42b33ce..17088b1b48 100644
+index c988da28c9..b586804090 100644
@@ -22,2 +23,2 @@
-@@ -393,10 +393,14 @@ pipeline_event_tx_adapter_setup(struct evt_options *opt,
- 			uint32_t service_id = -1U;
+@@ -367,10 +367,14 @@ pipeline_event_tx_adapter_setup(struct evt_options *opt,
+ 			uint32_t service_id;

[dpdk-stable] patch 'crypto/caam_jr: fix check of file descriptors' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/af983173ae9e13417a221d147f3ee0b7970c2dfc

Thanks.

Kevin.

---
From af983173ae9e13417a221d147f3ee0b7970c2dfc Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Thu, 14 May 2020 18:59:55 +0800
Subject: [PATCH] crypto/caam_jr: fix check of file descriptors

[ upstream commit 61552661e25df5b78be3079bc02b56a375dc0fdc ]

Zero is a valid fd. It will fail to check the fd if the fd is zero.
The "job_ring->uio_fd" is an fd, so define it as "int".

Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations")
Fixes: a5e1018d5e67 ("crypto/caam_jr: add routines to configure HW")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Gagandeep Singh <g.singh@nxp.com>
---
 drivers/crypto/caam_jr/caam_jr.c             | 23 ++++++++++++---
 drivers/crypto/caam_jr/caam_jr_hw_specific.h |  2 +-
 drivers/crypto/caam_jr/caam_jr_pvt.h         |  9 +++---
 drivers/crypto/caam_jr/caam_jr_uio.c         | 30 +++++++++++++-------
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index a4e70babf4..7aca8d6fbd 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -2111,5 +2111,5 @@ close_job_ring(struct sec_job_ring_t *job_ring)
 {
 	PMD_INIT_FUNC_TRACE();
-	if (job_ring->irq_fd) {
+	if (job_ring->irq_fd != -1) {
 		/* Producer index is frozen. If consumer index is not equal
 		 * with producer index, then we have descs to flush.
@@ -2120,5 +2120,5 @@ close_job_ring(struct sec_job_ring_t *job_ring)
 		/* free the uio job ring */
 		free_job_ring(job_ring->irq_fd);
-		job_ring->irq_fd = 0;
+		job_ring->irq_fd = -1;
 		caam_jr_dma_free(job_ring->input_ring);
 		caam_jr_dma_free(job_ring->output_ring);
@@ -2224,5 +2224,5 @@ caam_jr_dev_uninit(struct rte_cryptodev *dev)
  */
 static void *
-init_job_ring(void *reg_base_addr, uint32_t irq_id)
+init_job_ring(void *reg_base_addr, int irq_id)
 {
 	struct sec_job_ring_t *job_ring = NULL;
@@ -2234,5 +2234,5 @@ init_job_ring(void *reg_base_addr, uint32_t irq_id)
 
 	for (i = 0; i < MAX_SEC_JOB_RINGS; i++) {
-		if (g_job_rings[i].irq_fd == 0) {
+		if (g_job_rings[i].irq_fd == -1) {
 			job_ring = &g_job_rings[i];
 			g_job_rings_no++;
@@ -2487,4 +2487,13 @@ cryptodev_caam_jr_remove(struct rte_vdev_device *vdev)
 }
 
+static void
+sec_job_rings_init(void)
+{
+	int i;
+
+	for (i = 0; i < MAX_SEC_JOB_RINGS; i++)
+		g_job_rings[i].irq_fd = -1;
+}
+
 static struct rte_vdev_driver cryptodev_caam_jr_drv = {
 	.probe = cryptodev_caam_jr_probe,
@@ -2501,4 +2510,10 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(caam_jr_crypto_drv, cryptodev_caam_jr_drv.driver,
 		cryptodev_driver_id);
 
+RTE_INIT(caam_jr_init)
+{
+	sec_uio_job_rings_init();
+	sec_job_rings_init();
+}
+
 RTE_INIT(caam_jr_init_log)
 {
diff --git a/drivers/crypto/caam_jr/caam_jr_hw_specific.h b/drivers/crypto/caam_jr/caam_jr_hw_specific.h
index 5f58a585d7..bbe8bc3f90 100644
--- a/drivers/crypto/caam_jr/caam_jr_hw_specific.h
+++ b/drivers/crypto/caam_jr/caam_jr_hw_specific.h
@@ -361,5 +361,5 @@ struct sec_job_ring_t {
 				 */
 
-	uint32_t irq_fd;	/* The file descriptor used for polling from
+	int irq_fd;		/* The file descriptor used for polling from
 				 * user space for interrupts notifications
 				 */
diff --git a/drivers/crypto/caam_jr/caam_jr_pvt.h b/drivers/crypto/caam_jr/caam_jr_pvt.h
index 9f1adabc7d..7997a1d45c 100644
--- a/drivers/crypto/caam_jr/caam_jr_pvt.h
+++ b/drivers/crypto/caam_jr/caam_jr_pvt.h
@@ -216,5 +216,5 @@ calc_chksum(void *buffer, int len)
 struct uio_job_ring {
 	uint32_t jr_id;
-	uint32_t uio_fd;
+	int uio_fd;
 	void *register_base_addr;
 	int map_size;
@@ -224,6 +224,7 @@ struct uio_job_ring {
 int sec_cleanup(void);
 int sec_configure(void);
+void sec_uio_job_rings_init(void);
 struct uio_job_ring *config_job_ring(void);
-void free_job_ring(uint32_t uio_fd);
+void free_job_ring(int uio_fd);
 
 /* For Dma memory allocation of specified length and alignment */
@@ -274,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
  * @retval -1 value for error
  */
-uint32_t caam_jr_enable_irqs(uint32_t uio_fd);
+uint32_t caam_jr_enable_irqs(int uio_fd);
 
 /** @brief Request to SEC kernel driver to disable interrupts for descriptor
@@ -287,5 +288,5 @@ uint32_t caam_jr_enable_irqs(uint32_t uio_fd);
  *
  */
-uint32_t caam_jr_disable_irqs(uint32_t uio_fd);
+uint32_t caam_jr_disable_irqs(int uio_fd);
 
 #endif
diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index afd75c9a62..8eaa8ae467 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -151,5 +151,5 @@ file_read_first_line(const char root[], const char subdir[],
 
 	fd = open(absolute_file_name, O_RDONLY);
-	SEC_ASSERT(fd > 0, fd, "Error opening file %s",
+	SEC_ASSERT(fd >= 0, fd, "Error opening file %s",
 			absolute_file_name);
 
@@ -185,5 +185,5 @@ file_read_first_line(const char root[], const char subdir[],
  */
 static int
-sec_uio_send_command(uint32_t uio_fd, int32_t uio_command)
+sec_uio_send_command(int uio_fd, int32_t uio_command)
 {
 	int ret;
@@ -208,5 +208,5 @@ sec_uio_send_command(uint32_t uio_fd, int32_t uio_command)
  */
 uint32_t
-caam_jr_enable_irqs(uint32_t uio_fd)
+caam_jr_enable_irqs(int uio_fd)
 {
 	int ret;
@@ -239,5 +239,5 @@ caam_jr_enable_irqs(uint32_t uio_fd)
  */
 uint32_t
-caam_jr_disable_irqs(uint32_t uio_fd)
+caam_jr_disable_irqs(int uio_fd)
 {
 	int ret;
@@ -328,10 +328,10 @@ uio_map_registers(int uio_device_fd, int uio_device_id,
 
 void
-free_job_ring(uint32_t uio_fd)
+free_job_ring(int uio_fd)
 {
 	struct uio_job_ring *job_ring = NULL;
 	int i;
 
-	if (!uio_fd)
+	if (uio_fd == -1)
 		return;
 
@@ -353,5 +353,5 @@ free_job_ring(uint32_t uio_fd)
 	close(job_ring->uio_fd);
 	g_uio_jr_num--;
-	job_ring->uio_fd = 0;
+	job_ring->uio_fd = -1;
 	if (job_ring->register_base_addr == NULL)
 		return;
@@ -376,5 +376,5 @@ uio_job_ring *config_job_ring(void)
 
 	for (i = 0; i < MAX_SEC_JOB_RINGS; i++) {
-		if (g_uio_job_ring[i].uio_fd == 0) {
+		if (g_uio_job_ring[i].uio_fd == -1) {
 			job_ring = &g_uio_job_ring[i];
 			g_uio_jr_num++;
@@ -395,5 +395,5 @@ uio_job_ring *config_job_ring(void)
 	/* Open device file */
 	job_ring->uio_fd = open(uio_device_file_name, O_RDWR);
-	SEC_ASSERT(job_ring->uio_fd > 0, NULL,
+	SEC_ASSERT(job_ring->uio_fd >= 0, NULL,
 		"Failed to open UIO device file for job ring %d",
 		job_ring->jr_id);
@@ -494,11 +494,21 @@ sec_cleanup(void)
 		 * sent using the fd
 		 */
-		if (job_ring->uio_fd != 0) {
+		if (job_ring->uio_fd != -1) {
 			CAAM_JR_INFO(
 			"Closed device file for job ring %d , fd = %d",
 			job_ring->jr_id, job_ring->uio_fd);
 			close(job_ring->uio_fd);
+			job_ring->uio_fd = -1;
 		}
 	}
 	return 0;
 }
+
+void
+sec_uio_job_rings_init(void)
+{
+	int i;
+
+	for (i = 0; i < MAX_SEC_JOB_RINGS; i++)
+		g_uio_job_ring[i].uio_fd = -1;
+}
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.622376931 +0100
+++ 0051-crypto-caam_jr-fix-check-of-file-descriptors.patch	2020-06-05 19:20:50.858039723 +0100
@@ -1 +1 @@
-From 61552661e25df5b78be3079bc02b56a375dc0fdc Mon Sep 17 00:00:00 2001
+From af983173ae9e13417a221d147f3ee0b7970c2dfc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 61552661e25df5b78be3079bc02b56a375dc0fdc ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 45003ba25a..caf2386772 100644
+index a4e70babf4..7aca8d6fbd 100644
@@ -26,2 +27 @@
-@@ -2073,5 +2073,5 @@ static void
- close_job_ring(struct sec_job_ring_t *job_ring)
+@@ -2111,5 +2111,5 @@ close_job_ring(struct sec_job_ring_t *job_ring)
@@ -28,0 +29 @@
+ 	PMD_INIT_FUNC_TRACE();
@@ -33 +34 @@
-@@ -2082,5 +2082,5 @@ close_job_ring(struct sec_job_ring_t *job_ring)
+@@ -2120,5 +2120,5 @@ close_job_ring(struct sec_job_ring_t *job_ring)
@@ -40 +41 @@
-@@ -2186,5 +2186,5 @@ caam_jr_dev_uninit(struct rte_cryptodev *dev)
+@@ -2224,5 +2224,5 @@ caam_jr_dev_uninit(struct rte_cryptodev *dev)
@@ -47 +48 @@
-@@ -2196,5 +2196,5 @@ init_job_ring(void *reg_base_addr, uint32_t irq_id)
+@@ -2234,5 +2234,5 @@ init_job_ring(void *reg_base_addr, uint32_t irq_id)
@@ -54 +55 @@
-@@ -2449,4 +2449,13 @@ cryptodev_caam_jr_remove(struct rte_vdev_device *vdev)
+@@ -2487,4 +2487,13 @@ cryptodev_caam_jr_remove(struct rte_vdev_device *vdev)
@@ -68 +69 @@
-@@ -2463,4 +2472,10 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(caam_jr_crypto_drv, cryptodev_caam_jr_drv.driver,
+@@ -2501,4 +2510,10 @@ RTE_PMD_REGISTER_CRYPTO_DRIVER(caam_jr_crypto_drv, cryptodev_caam_jr_drv.driver,
@@ -91 +92 @@
-index 98cd4438aa..d6b3dafaa6 100644
+index 9f1adabc7d..7997a1d45c 100644
@@ -94 +95 @@
-@@ -217,5 +217,5 @@ calc_chksum(void *buffer, int len)
+@@ -216,5 +216,5 @@ calc_chksum(void *buffer, int len)
@@ -101 +102 @@
-@@ -225,6 +225,7 @@ struct uio_job_ring {
+@@ -224,6 +224,7 @@ struct uio_job_ring {
@@ -110 +111 @@
-@@ -280,5 +281,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
+@@ -274,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
@@ -117 +118 @@
-@@ -293,5 +294,5 @@ uint32_t caam_jr_enable_irqs(uint32_t uio_fd);
+@@ -287,5 +288,5 @@ uint32_t caam_jr_enable_irqs(uint32_t uio_fd);
@@ -125 +126 @@
-index b1bb44ca42..30837c1164 100644
+index afd75c9a62..8eaa8ae467 100644
@@ -128 +129 @@
-@@ -146,5 +146,5 @@ file_read_first_line(const char root[], const char subdir[],
+@@ -151,5 +151,5 @@ file_read_first_line(const char root[], const char subdir[],
@@ -135 +136 @@
-@@ -180,5 +180,5 @@ file_read_first_line(const char root[], const char subdir[],
+@@ -185,5 +185,5 @@ file_read_first_line(const char root[], const char subdir[],
@@ -142 +143 @@
-@@ -203,5 +203,5 @@ sec_uio_send_command(uint32_t uio_fd, int32_t uio_command)
+@@ -208,5 +208,5 @@ sec_uio_send_command(uint32_t uio_fd, int32_t uio_command)
@@ -149 +150 @@
-@@ -234,5 +234,5 @@ caam_jr_enable_irqs(uint32_t uio_fd)
+@@ -239,5 +239,5 @@ caam_jr_enable_irqs(uint32_t uio_fd)
@@ -156 +157 @@
-@@ -323,10 +323,10 @@ uio_map_registers(int uio_device_fd, int uio_device_id,
+@@ -328,10 +328,10 @@ uio_map_registers(int uio_device_fd, int uio_device_id,
@@ -169 +170 @@
-@@ -348,5 +348,5 @@ free_job_ring(uint32_t uio_fd)
+@@ -353,5 +353,5 @@ free_job_ring(uint32_t uio_fd)
@@ -176 +177 @@
-@@ -371,5 +371,5 @@ uio_job_ring *config_job_ring(void)
+@@ -376,5 +376,5 @@ uio_job_ring *config_job_ring(void)
@@ -183 +184 @@
-@@ -390,5 +390,5 @@ uio_job_ring *config_job_ring(void)
+@@ -395,5 +395,5 @@ uio_job_ring *config_job_ring(void)
@@ -190 +191 @@
-@@ -489,11 +489,21 @@ sec_cleanup(void)
+@@ -494,11 +494,21 @@ sec_cleanup(void)

[dpdk-stable] patch 'crypto/caam_jr: fix IRQ functions return type' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8e297725dcdfc086dd7704040369429238514eb3

Thanks.

Kevin.

---
From 8e297725dcdfc086dd7704040369429238514eb3 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Thu, 14 May 2020 19:00:07 +0800
Subject: [PATCH] crypto/caam_jr: fix IRQ functions return type

[ upstream commit c40b4fcd98933749a41f7b8e9b66368f920038f6 ]

The caam_jr_enable_irqs() and caam_jr_disable_irqs() methods maybe return a
negative error. So use int instead of uint32_t int the functions.

Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Gagandeep Singh <g.singh@nxp.com>
---
 drivers/crypto/caam_jr/caam_jr_pvt.h | 4 ++--
 drivers/crypto/caam_jr/caam_jr_uio.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr_pvt.h b/drivers/crypto/caam_jr/caam_jr_pvt.h
index 7997a1d45c..579aacbb38 100644
--- a/drivers/crypto/caam_jr/caam_jr_pvt.h
+++ b/drivers/crypto/caam_jr/caam_jr_pvt.h
@@ -275,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
  * @retval -1 value for error
  */
-uint32_t caam_jr_enable_irqs(int uio_fd);
+int caam_jr_enable_irqs(int uio_fd);
 
 /** @brief Request to SEC kernel driver to disable interrupts for descriptor
@@ -288,5 +288,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd);
  *
  */
-uint32_t caam_jr_disable_irqs(int uio_fd);
+int caam_jr_disable_irqs(int uio_fd);
 
 #endif
diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index 8eaa8ae467..913f5f10a1 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -207,5 +207,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command)
  * @retval -1 value for error
  */
-uint32_t
+int
 caam_jr_enable_irqs(int uio_fd)
 {
@@ -238,5 +238,5 @@ caam_jr_enable_irqs(int uio_fd)
  *
  */
-uint32_t
+int
 caam_jr_disable_irqs(int uio_fd)
 {
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.675942036 +0100
+++ 0052-crypto-caam_jr-fix-IRQ-functions-return-type.patch	2020-06-05 19:20:50.859039700 +0100
@@ -1 +1 @@
-From c40b4fcd98933749a41f7b8e9b66368f920038f6 Mon Sep 17 00:00:00 2001
+From 8e297725dcdfc086dd7704040369429238514eb3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c40b4fcd98933749a41f7b8e9b66368f920038f6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index d6b3dafaa6..552d6b9b1b 100644
+index 7997a1d45c..579aacbb38 100644
@@ -23 +24 @@
-@@ -281,5 +281,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
+@@ -275,5 +275,5 @@ static inline rte_iova_t caam_jr_dma_vtop(void *ptr)
@@ -30 +31 @@
-@@ -294,5 +294,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd);
+@@ -288,5 +288,5 @@ uint32_t caam_jr_enable_irqs(int uio_fd);
@@ -38 +39 @@
-index 30837c1164..e4ee102344 100644
+index 8eaa8ae467..913f5f10a1 100644
@@ -41 +42 @@
-@@ -202,5 +202,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command)
+@@ -207,5 +207,5 @@ sec_uio_send_command(int uio_fd, int32_t uio_command)
@@ -48 +49 @@
-@@ -233,5 +233,5 @@ caam_jr_enable_irqs(int uio_fd)
+@@ -238,5 +238,5 @@ caam_jr_enable_irqs(int uio_fd)

[dpdk-stable] patch 'build: disable gcc 10 zero-length-bounds warning' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8fd2868e3fa6d81f13a24fa30955c181f6f699f1

Thanks.

Kevin.

---
From 8fd2868e3fa6d81f13a24fa30955c181f6f699f1 Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor@redhat.com>
Date: Thu, 14 May 2020 14:18:57 +0100
Subject: [PATCH] build: disable gcc 10 zero-length-bounds warning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit cfacbcb5a23bc26cb913528c372adddabbb33ca1 ]

gcc 10 issues warnings about the use of rearm_data marker
from struct rte_mbuf.

e.g.
../drivers/net/enic/enic_rxtx_vec_avx2.c: In function ‘rx_one’:
../drivers/net/enic/enic_rxtx_vec_avx2.c:21:2:
warning:
array subscript 0 is outside the bounds of an interior zero-length array
‘RTE_MARKER64’ {aka ‘long unsigned int[0]’} [-Wzero-length-bounds]
   21 |  *(uint64_t *)&mb->rearm_data = enic->mbuf_initializer;
      |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../lib/librte_mbuf/rte_mbuf.h:45,
                 from ../drivers/net/enic/enic_rxtx_vec_avx2.c:6:
../lib/librte_mbuf/rte_mbuf_core.h:484:15:
note: while referencing ‘rearm_data’
  484 |  RTE_MARKER64 rearm_data;
      |

Disable this warning for gcc 10 in order to allow v20.05 to build
without changes to struct rte_mbuf.

Bugzilla ID: 396

Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 config/meson.build           | 4 ++++
 mk/toolchain/gcc/rte.vars.mk | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/config/meson.build b/config/meson.build
index 616af97466..88742ce9db 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -112,4 +112,8 @@ warning_flags = [
 	'-Wno-address-of-packed-member'
 ]
+if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0')
+# FIXME: Bugzilla 396
+	warning_flags += '-Wno-zero-length-bounds'
+endif
 if not dpdk_conf.get('RTE_ARCH_64')
 # for 32-bit, don't warn about casting a 32-bit pointer to 64-bit int - it's fine!!
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
index b852fcfd7e..50f5e6f58d 100644
--- a/mk/toolchain/gcc/rte.vars.mk
+++ b/mk/toolchain/gcc/rte.vars.mk
@@ -72,4 +72,9 @@ WERROR_FLAGS += -Wno-uninitialized
 endif
 
+ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1)
+# FIXME: Bugzilla 396
+WERROR_FLAGS += -Wno-zero-length-bounds
+endif
+
 HOST_WERROR_FLAGS := $(WERROR_FLAGS)
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.726330456 +0100
+++ 0053-build-disable-gcc-10-zero-length-bounds-warning.patch	2020-06-05 19:20:50.860039677 +0100
@@ -1 +1 @@
-From cfacbcb5a23bc26cb913528c372adddabbb33ca1 Mon Sep 17 00:00:00 2001
+From 8fd2868e3fa6d81f13a24fa30955c181f6f699f1 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit cfacbcb5a23bc26cb913528c372adddabbb33ca1 ]
+
@@ -31 +32,0 @@
-Cc: stable@dpdk.org
@@ -41 +42 @@
-index a1c38c053e..43ab113106 100644
+index 616af97466..88742ce9db 100644
@@ -44,2 +45,2 @@
-@@ -209,4 +209,8 @@ warning_flags = [
- 	'-Wno-missing-field-initializers'
+@@ -112,4 +112,8 @@ warning_flags = [
+ 	'-Wno-address-of-packed-member'
@@ -54 +55 @@
-index f19305e495..928f0e0830 100644
+index b852fcfd7e..50f5e6f58d 100644
@@ -57 +58 @@
-@@ -82,4 +82,9 @@ WERROR_FLAGS += -Wno-uninitialized
+@@ -72,4 +72,9 @@ WERROR_FLAGS += -Wno-uninitialized

[dpdk-stable] patch 'eal: fix C++17 compilation' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/c3c4ab2586a4ea77824cb021239a26109ff1f422

Thanks.

Kevin.

---
From c3c4ab2586a4ea77824cb021239a26109ff1f422 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Fri, 8 May 2020 16:25:05 -0700
Subject: [PATCH] eal: fix C++17 compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa ]

Compiling a C++ application that includes directly or indirectly
rte_common.h will cause a warning:

include/rte_common.h:350:37: warning: ISO C++17 does not allow
  ‘register’ storage class specifier [-Wregister]
 rte_combine32ms1b(register uint32_t x)

C++ is pickier than standard C and flags this antique usage.

The register keyword is an old K&R legacy and should be removed
everywhere in DPDK. For now, fix it where it hurts.

Fixes: 08f683174e94 ("eal: add functions for previous power of 2 alignment")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/common/include/rte_common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
index 48bf28ca5d..5006ba8cad 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -284,5 +284,5 @@ rte_is_aligned(void *ptr, unsigned align)
  */
 static inline uint32_t
-rte_combine32ms1b(register uint32_t x)
+rte_combine32ms1b(uint32_t x)
 {
 	x |= x >> 1;
@@ -306,5 +306,5 @@ rte_combine32ms1b(register uint32_t x)
  */
 static inline uint64_t
-rte_combine64ms1b(register uint64_t v)
+rte_combine64ms1b(uint64_t v)
 {
 	v |= v >> 1;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.774160460 +0100
+++ 0054-eal-fix-C-17-compilation.patch	2020-06-05 19:20:50.861039654 +0100
@@ -1 +1 @@
-From 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa Mon Sep 17 00:00:00 2001
+From c3c4ab2586a4ea77824cb021239a26109ff1f422 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
- lib/librte_eal/include/rte_common.h | 4 ++--
+ lib/librte_eal/common/include/rte_common.h | 4 ++--
@@ -30,5 +31,5 @@
-diff --git a/lib/librte_eal/include/rte_common.h b/lib/librte_eal/include/rte_common.h
-index 668e8b0af8..0843ce69e7 100644
---- a/lib/librte_eal/include/rte_common.h
-+++ b/lib/librte_eal/include/rte_common.h
-@@ -410,5 +410,5 @@ __extension__ typedef uint64_t RTE_MARKER64[0];
+diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
+index 48bf28ca5d..5006ba8cad 100644
+--- a/lib/librte_eal/common/include/rte_common.h
++++ b/lib/librte_eal/common/include/rte_common.h
+@@ -284,5 +284,5 @@ rte_is_aligned(void *ptr, unsigned align)
@@ -41 +42 @@
-@@ -432,5 +432,5 @@ rte_combine32ms1b(register uint32_t x)
+@@ -306,5 +306,5 @@ rte_combine32ms1b(register uint32_t x)

[dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/5eca31e8f9cc8c091742086c1c0866b8c49c4b3d

Thanks.

Kevin.

---
From 5eca31e8f9cc8c091742086c1c0866b8c49c4b3d Mon Sep 17 00:00:00 2001
From: Alvin Zhang <alvinx.zhang@intel.com>
Date: Wed, 29 Apr 2020 14:37:24 +0800
Subject: [PATCH] net/e1000: fix port hotplug for multi-process

[ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ]

Enable detach device on secondary process.

Fixes: b9eee2cb8c29 ("e1000: support port hotplug")

Signed-off-by: Alvin Zhang <alvinx.zhang@intel.com>
Tested-by: Jianwei Mei <jianweix.mei@intel.com>
Reviewed-by: Jeff Guo <jia.guo@intel.com>
---
 drivers/net/e1000/em_ethdev.c  | 2 +-
 drivers/net/e1000/igb_ethdev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 28637c4945..3f061e8a92 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -321,5 +321,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	if (adapter->stopped == 0)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 2c1f2314e8..dfd16d4049 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -924,5 +924,5 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	hw = E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
@@ -1084,5 +1084,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	if (adapter->stopped == 0)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.832297345 +0100
+++ 0055-net-e1000-fix-port-hotplug-for-multi-process.patch	2020-06-05 19:20:50.868039495 +0100
@@ -1 +1 @@
-From 3a19eeb0c3329905fbb927fdbac90e548061130d Mon Sep 17 00:00:00 2001
+From 5eca31e8f9cc8c091742086c1c0866b8c49c4b3d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 188cda3508..902b1cdca0 100644
+index 28637c4945..3f061e8a92 100644
@@ -23 +24 @@
-@@ -322,5 +322,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -321,5 +321,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -29 +30 @@
- 	eth_em_close(eth_dev);
+ 	if (adapter->stopped == 0)
@@ -31 +32 @@
-index 520fba8fab..a5551e8175 100644
+index 2c1f2314e8..dfd16d4049 100644
@@ -40,2 +41,2 @@
- 	eth_igb_close(eth_dev);
-@@ -1045,5 +1045,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
+ 	hw = E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+@@ -1084,5 +1084,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -47 +48 @@
- 	igbvf_dev_close(eth_dev);
+ 	if (adapter->stopped == 0)

[dpdk-stable] patch 'doc: fix multicast filter feature announcement' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/530fcec9532e70b217a99d0e9c821d47dc17fc6c

Thanks.

Kevin.

---
From 530fcec9532e70b217a99d0e9c821d47dc17fc6c Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang@intel.com>
Date: Fri, 8 May 2020 22:04:09 +0800
Subject: [PATCH] doc: fix multicast filter feature announcement

[ upstream commit 13e4897d98b0af690c81ffd02d212992ce6d9348 ]

Multicast MAC filter flag means device ops set_mc_addr_list support
or not. This patch fixes the wrong flag value in Intel driver's document.

Fixes: 9db3f52126fb ("doc: generate NIC overview table from ini files")
Fixes: cb25d4323fbf ("net/avf: enable MAC VLAN and promisc ops")
Fixes: 26e887343321 ("net/ice: support MAC ops")

Signed-off-by: Qiming Yang <qiming.yang@intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 doc/guides/nics/features/avf.ini     | 1 -
 doc/guides/nics/features/avf_vec.ini | 1 -
 doc/guides/nics/features/i40e.ini    | 1 -
 doc/guides/nics/features/igb.ini     | 1 +
 doc/guides/nics/features/ixgbe.ini   | 1 +
 5 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/doc/guides/nics/features/avf.ini b/doc/guides/nics/features/avf.ini
index 35ceada24f..28d072f37e 100644
--- a/doc/guides/nics/features/avf.ini
+++ b/doc/guides/nics/features/avf.ini
@@ -16,5 +16,4 @@ Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
-Multicast MAC filter = Y
 RSS hash             = Y
 RSS key update       = Y
diff --git a/doc/guides/nics/features/avf_vec.ini b/doc/guides/nics/features/avf_vec.ini
index 3050bc4a60..3b051f0d6f 100644
--- a/doc/guides/nics/features/avf_vec.ini
+++ b/doc/guides/nics/features/avf_vec.ini
@@ -16,5 +16,4 @@ Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
-Multicast MAC filter = Y
 RSS hash             = Y
 RSS key update       = Y
diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini
index 16eab7f43b..b0a9c20e6a 100644
--- a/doc/guides/nics/features/i40e.ini
+++ b/doc/guides/nics/features/i40e.ini
@@ -18,5 +18,4 @@ Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
-Multicast MAC filter = Y
 RSS hash             = Y
 RSS key update       = Y
diff --git a/doc/guides/nics/features/igb.ini b/doc/guides/nics/features/igb.ini
index c53fd0757e..b66aa1de19 100644
--- a/doc/guides/nics/features/igb.ini
+++ b/doc/guides/nics/features/igb.ini
@@ -16,4 +16,5 @@ Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
+Multicast MAC filter = Y
 RSS hash             = Y
 RSS key update       = Y
diff --git a/doc/guides/nics/features/ixgbe.ini b/doc/guides/nics/features/ixgbe.ini
index 4143111769..2ec3552599 100644
--- a/doc/guides/nics/features/ixgbe.ini
+++ b/doc/guides/nics/features/ixgbe.ini
@@ -18,4 +18,5 @@ Promiscuous mode     = Y
 Allmulticast mode    = Y
 Unicast MAC filter   = Y
+Multicast MAC filter = Y
 RSS hash             = Y
 RSS key update       = Y
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.890495792 +0100
+++ 0056-doc-fix-multicast-filter-feature-announcement.patch	2020-06-05 19:20:50.869039473 +0100
@@ -1 +1 @@
-From 13e4897d98b0af690c81ffd02d212992ce6d9348 Mon Sep 17 00:00:00 2001
+From 530fcec9532e70b217a99d0e9c821d47dc17fc6c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 13e4897d98b0af690c81ffd02d212992ce6d9348 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -17,5 +18,5 @@
- doc/guides/nics/features/i40e.ini  | 1 -
- doc/guides/nics/features/iavf.ini  | 1 -
- doc/guides/nics/features/ice.ini   | 1 -
- doc/guides/nics/features/igb.ini   | 1 +
- doc/guides/nics/features/ixgbe.ini | 1 +
+ doc/guides/nics/features/avf.ini     | 1 -
+ doc/guides/nics/features/avf_vec.ini | 1 -
+ doc/guides/nics/features/i40e.ini    | 1 -
+ doc/guides/nics/features/igb.ini     | 1 +
+ doc/guides/nics/features/ixgbe.ini   | 1 +
@@ -24,5 +25,5 @@
-diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini
-index a326f7345f..2e89079f51 100644
---- a/doc/guides/nics/features/i40e.ini
-+++ b/doc/guides/nics/features/i40e.ini
-@@ -20,5 +20,4 @@ Promiscuous mode     = Y
+diff --git a/doc/guides/nics/features/avf.ini b/doc/guides/nics/features/avf.ini
+index 35ceada24f..28d072f37e 100644
+--- a/doc/guides/nics/features/avf.ini
++++ b/doc/guides/nics/features/avf.ini
+@@ -16,5 +16,4 @@ Promiscuous mode     = Y
@@ -34,4 +35,4 @@
-diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini
-index 17f7928eb1..2e7cea38d8 100644
---- a/doc/guides/nics/features/iavf.ini
-+++ b/doc/guides/nics/features/iavf.ini
+diff --git a/doc/guides/nics/features/avf_vec.ini b/doc/guides/nics/features/avf_vec.ini
+index 3050bc4a60..3b051f0d6f 100644
+--- a/doc/guides/nics/features/avf_vec.ini
++++ b/doc/guides/nics/features/avf_vec.ini
@@ -44,5 +45,5 @@
-diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini
-index 895d6b3096..3ee1f6ea45 100644
---- a/doc/guides/nics/features/ice.ini
-+++ b/doc/guides/nics/features/ice.ini
-@@ -19,5 +19,4 @@ Promiscuous mode     = Y
+diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini
+index 16eab7f43b..b0a9c20e6a 100644
+--- a/doc/guides/nics/features/i40e.ini
++++ b/doc/guides/nics/features/i40e.ini
+@@ -18,5 +18,4 @@ Promiscuous mode     = Y
@@ -55 +56 @@
-index 0351f8495d..167c0cabe8 100644
+index c53fd0757e..b66aa1de19 100644
@@ -65 +66 @@
-index fab0487fa9..f817c93b85 100644
+index 4143111769..2ec3552599 100644

[dpdk-stable] patch 'net/ixgbe: fix statistics in flow control mode' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b79430e24abbcaf6b23460462ac550f47962985c

Thanks.

Kevin.

---
From b79430e24abbcaf6b23460462ac550f47962985c Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Tue, 12 May 2020 08:13:06 +0000
Subject: [PATCH] net/ixgbe: fix statistics in flow control mode

[ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ]

The register autoneg can't be updated synchronously with flow control
mode setting in the state of port start, so NIC statistics error occurs.
AUTO_NEG Advt register should be updated by ixgbe_setup_fc() when
enabling flow control.
The patch fixes the issue.

Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting")

Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 9b67e56a53..e888f8e62d 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2581,4 +2581,6 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)
 	uint32_t mflcn;
 
+	ixgbe_setup_fc(hw);
+
 	err = ixgbe_fc_enable(hw);
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.940391314 +0100
+++ 0057-net-ixgbe-fix-statistics-in-flow-control-mode.patch	2020-06-05 19:20:50.877039291 +0100
@@ -1 +1 @@
-From 861ca8b1e97c68727cbafbb859cc6c2ff017801e Mon Sep 17 00:00:00 2001
+From b79430e24abbcaf6b23460462ac550f47962985c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 861ca8b1e97c68727cbafbb859cc6c2ff017801e ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index a4e5c539de..f8a84c565f 100644
+index 9b67e56a53..e888f8e62d 100644
@@ -25 +26 @@
-@@ -2544,4 +2544,6 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)
+@@ -2581,4 +2581,6 @@ ixgbe_flow_ctrl_enable(struct rte_eth_dev *dev, struct ixgbe_hw *hw)

[dpdk-stable] patch 'net/qede: fix link state configuration' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/464774735cbd1937307fa579c2c1a76530194200

Thanks.

Kevin.

---
From 464774735cbd1937307fa579c2c1a76530194200 Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody@marvell.com>
Date: Wed, 13 May 2020 21:09:02 -0700
Subject: [PATCH] net/qede: fix link state configuration

[ upstream commit d789705873d47d70a3ba0a6a4dfb83fb629d3464 ]

Move link state enable/disable to dev_start() and dev_stop()
respectively. This will ensure when devices are stopped,
link status will be appropriately shown as down.

Fixes: dd28bc8c6ef4 ("net/qede: fix VF port creation sequence")

Signed-off-by: Shahed Shaikh <shshaikh@marvell.com>
Signed-off-by: Rasesh Mody <rmody@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
---
 drivers/net/qede/qede_ethdev.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 791556dc52..340c35a1be 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -1059,4 +1059,7 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)
 		goto err;
 
+	/* Bring-up the link */
+	qede_dev_set_link_state(eth_dev, true);
+
 	/* Update link status */
 	qede_link_update(eth_dev, 0);
@@ -1080,4 +1083,10 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)
 	PMD_INIT_FUNC_TRACE(edev);
 
+	/* Bring the link down */
+	qede_dev_set_link_state(eth_dev, false);
+
+	/* Update link status */
+	qede_link_update(eth_dev, 0);
+
 	/* Disable vport */
 	if (qede_activate_vport(eth_dev, false))
@@ -1452,6 +1461,4 @@ static void qede_dev_close(struct rte_eth_dev *eth_dev)
 	eth_dev->data->nb_tx_queues = 0;
 
-	/* Bring the link down */
-	qede_dev_set_link_state(eth_dev, false);
 	qdev->ops->common->slowpath_stop(edev);
 	qdev->ops->common->remove(edev);
@@ -2552,7 +2559,4 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
 	}
 
-	/* Bring-up the link */
-	qede_dev_set_link_state(eth_dev, true);
-
 	adapter->num_tx_queues = 0;
 	adapter->num_rx_queues = 0;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.995381414 +0100
+++ 0058-net-qede-fix-link-state-configuration.patch	2020-06-05 19:20:50.879039246 +0100
@@ -1 +1 @@
-From d789705873d47d70a3ba0a6a4dfb83fb629d3464 Mon Sep 17 00:00:00 2001
+From 464774735cbd1937307fa579c2c1a76530194200 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d789705873d47d70a3ba0a6a4dfb83fb629d3464 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index e71fa1e6a7..0b1fca9aca 100644
+index 791556dc52..340c35a1be 100644
@@ -24 +25 @@
-@@ -1145,4 +1145,7 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)
+@@ -1059,4 +1059,7 @@ static int qede_dev_start(struct rte_eth_dev *eth_dev)
@@ -32 +33 @@
-@@ -1167,4 +1170,10 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)
+@@ -1080,4 +1083,10 @@ static void qede_dev_stop(struct rte_eth_dev *eth_dev)
@@ -43 +44 @@
-@@ -1551,6 +1560,4 @@ static void qede_dev_close(struct rte_eth_dev *eth_dev)
+@@ -1452,6 +1461,4 @@ static void qede_dev_close(struct rte_eth_dev *eth_dev)
@@ -50,2 +51,2 @@
-@@ -2673,7 +2680,4 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
- 	eth_dev->dev_ops = (is_vf) ? &qede_eth_vf_dev_ops : &qede_eth_dev_ops;
+@@ -2552,7 +2559,4 @@ static int qede_common_dev_init(struct rte_eth_dev *eth_dev, bool is_vf)
+ 	}

[dpdk-stable] patch 'net/vmxnet3: handle bad host framing' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e44d378ab80ef9c9174ad0fba8294b37b970c042

Thanks.

Kevin.

---
From e44d378ab80ef9c9174ad0fba8294b37b970c042 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 12 May 2020 13:40:03 -0700
Subject: [PATCH] net/vmxnet3: handle bad host framing

[ upstream commit eb49f1671f30ede5121373e633c529b75993a6b2 ]

The VMXNet3 protocol has a start-of-packet (SOP) and end-of-packet (EOP)
marker. If there was a bug where mbuf arrived without SOP the code that
chains the mbuf would dereference a null pointer.
Also, record any mbuf's dropped in statistics.

Although did the initial code no longer have access to VMware.
Compile tested only!

Coverity issue: 124563
Fixes: 8ee787ce80a8 ("vmxnet3: remove asserts that confuse coverity")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Yong Wang <yongwang@vmware.com>
---
 drivers/net/vmxnet3/vmxnet3_rxtx.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index 6efa3ac217..f15fb6368e 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -948,5 +948,5 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 			RTE_ASSERT(rxd->btype == VMXNET3_RXD_BTYPE_BODY);
 
-			if (rxm->data_len) {
+			if (likely(start && rxm->data_len > 0)) {
 				start->pkt_len += rxm->data_len;
 				start->nb_segs++;
@@ -955,4 +955,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 				rxq->last_seg = rxm;
 			} else {
+				PMD_RX_LOG(ERR, "Error received empty or out of order frame.");
+				rxq->stats.drop_total++;
+				rxq->stats.drop_err++;
+
 				rte_pktmbuf_free_seg(rxm);
 			}
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.045499057 +0100
+++ 0059-net-vmxnet3-handle-bad-host-framing.patch	2020-06-05 19:20:50.881039200 +0100
@@ -1 +1 @@
-From eb49f1671f30ede5121373e633c529b75993a6b2 Mon Sep 17 00:00:00 2001
+From e44d378ab80ef9c9174ad0fba8294b37b970c042 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit eb49f1671f30ede5121373e633c529b75993a6b2 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index dd99684bee..73e270f30f 100644
+index 6efa3ac217..f15fb6368e 100644
@@ -28 +29 @@
-@@ -951,5 +951,5 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -948,5 +948,5 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -35 +36 @@
-@@ -958,4 +958,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -955,4 +955,8 @@ vmxnet3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)

[dpdk-stable] patch 'net/qede: fix port reconfiguration' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8cd93f836bec14d0df67c59ede1dd4639a7ad833

Thanks.

Kevin.

---
From 8cd93f836bec14d0df67c59ede1dd4639a7ad833 Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody@marvell.com>
Date: Thu, 14 May 2020 23:34:19 -0700
Subject: [PATCH] net/qede: fix port reconfiguration

[ upstream commit 05ccc9d8a9f9338b1cb4ae515c60c60f8b7f518d ]

This patch fixes deallocation of all fastpath resources unconditionally,
when re-configuring the device. When re-allocating resources PMD depends
on application to explicitly setup the Rx/Tx queue.

Deallocation of all the resources is only required if the Rx/Tx queue
configuration changes. For other scenarios like KNI MTU change we'd keep
existing configuration.

Fixes: 8de0c4201926 ("net/qede: fix odd number of queues usage in 100G mode")
Fixes: dd28bc8c6ef4 ("net/qede: fix VF port creation sequence")

Signed-off-by: Rasesh Mody <rmody@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
---
 drivers/net/qede/qede_ethdev.c | 19 +++++++++++++------
 drivers/net/qede/qede_rxtx.c   |  4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 340c35a1be..b4a266444b 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -1174,4 +1174,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
 	struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
 	struct rte_eth_rxmode *rxmode = &eth_dev->data->dev_conf.rxmode;
+	uint8_t num_rxqs;
+	uint8_t num_txqs;
 	int ret;
 
@@ -1203,10 +1205,15 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
 		return -ENOTSUP;
 
-	qede_dealloc_fp_resc(eth_dev);
-	qdev->num_tx_queues = eth_dev->data->nb_tx_queues * edev->num_hwfns;
-	qdev->num_rx_queues = eth_dev->data->nb_rx_queues * edev->num_hwfns;
-
-	if (qede_alloc_fp_resc(qdev))
-		return -ENOMEM;
+	/* Allocate/reallocate fastpath resources only for new queue config */
+	num_txqs = eth_dev->data->nb_tx_queues * edev->num_hwfns;
+	num_rxqs = eth_dev->data->nb_rx_queues * edev->num_hwfns;
+	if (qdev->num_tx_queues != num_txqs ||
+	    qdev->num_rx_queues != num_rxqs) {
+		qede_dealloc_fp_resc(eth_dev);
+		qdev->num_tx_queues = num_txqs;
+		qdev->num_rx_queues = num_rxqs;
+		if (qede_alloc_fp_resc(qdev))
+			return -ENOMEM;
+	}
 
 	/* If jumbo enabled adjust MTU */
diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 52ebc8b8b3..a72c9aa333 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -594,5 +594,5 @@ qede_alloc_mem_sb(struct qede_dev *qdev, struct ecore_sb_info *sb_info,
 int qede_alloc_fp_resc(struct qede_dev *qdev)
 {
-	struct ecore_dev *edev = &qdev->edev;
+	struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
 	struct qede_fastpath *fp;
 	uint32_t num_sbs;
@@ -600,4 +600,6 @@ int qede_alloc_fp_resc(struct qede_dev *qdev)
 	int i;
 
+	PMD_INIT_FUNC_TRACE(edev);
+
 	if (IS_VF(edev))
 		ecore_vf_get_num_sbs(ECORE_LEADING_HWFN(edev), &num_sbs);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.096647251 +0100
+++ 0060-net-qede-fix-port-reconfiguration.patch	2020-06-05 19:20:50.885039109 +0100
@@ -1 +1 @@
-From 05ccc9d8a9f9338b1cb4ae515c60c60f8b7f518d Mon Sep 17 00:00:00 2001
+From 8cd93f836bec14d0df67c59ede1dd4639a7ad833 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 05ccc9d8a9f9338b1cb4ae515c60c60f8b7f518d ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index d3d916e81a..c4f8f12589 100644
+index 340c35a1be..b4a266444b 100644
@@ -29 +30 @@
-@@ -1274,4 +1274,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
+@@ -1174,4 +1174,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
@@ -36 +37 @@
-@@ -1306,10 +1308,15 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
+@@ -1203,10 +1205,15 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
@@ -59 +60 @@
-index b81788ca47..9878ba50ea 100644
+index 52ebc8b8b3..a72c9aa333 100644

[dpdk-stable] patch 'net/bnxt: fix error log for command timeout' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/ba4ca794ad3c71244d01d2a4b928b668135d72a2

Thanks.

Kevin.

---
From ba4ca794ad3c71244d01d2a4b928b668135d72a2 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Thu, 14 May 2020 23:37:34 -0700
Subject: [PATCH] net/bnxt: fix error log for command timeout

[ upstream commit 4939f374ad369b4b15ba17a186bd17bf736371f0 ]

Log the command sequence number to aid debug in case of a
FW command timeout.

Fixes: 804e746c7b73 ("net/bnxt: add hardware resource manager init code")

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
---
 drivers/net/bnxt/bnxt_hwrm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 6e6d47751e..cfb4cb63ad 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -142,6 +142,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
 
 	if (i >= timeout) {
-		PMD_DRV_LOG(ERR, "Error(timeout) sending msg 0x%04x\n",
-			    req->req_type);
+		PMD_DRV_LOG(ERR,
+			    "Error(timeout) sending msg 0x%04x, seq_id %d\n",
+			    req->req_type, req->seq_id);
 		return -ETIMEDOUT;
 	}
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.150493312 +0100
+++ 0061-net-bnxt-fix-error-log-for-command-timeout.patch	2020-06-05 19:20:50.889039018 +0100
@@ -1 +1 @@
-From 4939f374ad369b4b15ba17a186bd17bf736371f0 Mon Sep 17 00:00:00 2001
+From ba4ca794ad3c71244d01d2a4b928b668135d72a2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4939f374ad369b4b15ba17a186bd17bf736371f0 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 77a911067e..d80d67a2d5 100644
+index 6e6d47751e..cfb4cb63ad 100644
@@ -23,2 +24 @@
-@@ -165,6 +165,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
- 			return -ETIMEDOUT;
+@@ -142,6 +142,7 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg,
@@ -25,0 +26 @@
+ 	if (i >= timeout) {

[dpdk-stable] patch 'net/bnxt: fix using RSS config struct' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/029c84a92510be2015cf3acaf1efc6ddfab48ce1

Thanks.

Kevin.

---
From 029c84a92510be2015cf3acaf1efc6ddfab48ce1 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Fri, 15 May 2020 04:25:11 -0700
Subject: [PATCH] net/bnxt: fix using RSS config struct

[ upstream commit 39395b9d41aff5488db4924df94098abbe4d4e8c ]

There is no need to maintain local copy.
This helps reduce the size of the bnxt structure.

Fixes: fcc0aa1edc10 ("net/bnxt: add RSS hash configuration")

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
---
 drivers/net/bnxt/bnxt.h        | 1 -
 drivers/net/bnxt/bnxt_ethdev.c | 4 +++-
 drivers/net/bnxt/bnxt_rxq.c    | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 140089d37e..5e5f91d730 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -297,5 +297,4 @@ struct bnxt {
 
 	struct rte_eth_dev		*eth_dev;
-	struct rte_eth_rss_conf		rss_conf;
 	struct rte_pci_device		*pdev;
 	void				*doorbell_base;
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 9ec1e13721..e0b4b4bd67 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1030,5 +1030,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
 
 	bp->flags |= BNXT_FLAG_UPDATE_HASH;
-	memcpy(&bp->rss_conf, rss_conf, sizeof(*rss_conf));
+	memcpy(&eth_dev->data->dev_conf.rx_adv_conf.rss_conf,
+	       rss_conf,
+	       sizeof(*rss_conf));
 
 	if (rss_conf->rss_hf & ETH_RSS_IPV4)
diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 005c9f2c2c..d1664dbc09 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -161,8 +161,6 @@ out:
 		uint16_t hash_type = 0;
 
-		if (bp->flags & BNXT_FLAG_UPDATE_HASH) {
-			rss = &bp->rss_conf;
+		if (bp->flags & BNXT_FLAG_UPDATE_HASH)
 			bp->flags &= ~BNXT_FLAG_UPDATE_HASH;
-		}
 
 		if (rss->rss_hf & ETH_RSS_IPV4)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.203518553 +0100
+++ 0062-net-bnxt-fix-using-RSS-config-struct.patch	2020-06-05 19:20:50.893038927 +0100
@@ -1 +1 @@
-From 39395b9d41aff5488db4924df94098abbe4d4e8c Mon Sep 17 00:00:00 2001
+From 029c84a92510be2015cf3acaf1efc6ddfab48ce1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 39395b9d41aff5488db4924df94098abbe4d4e8c ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 7410db5e42..4093a2f01e 100644
+index 140089d37e..5e5f91d730 100644
@@ -24 +25 @@
-@@ -531,5 +531,4 @@ struct bnxt {
+@@ -297,5 +297,4 @@ struct bnxt {
@@ -31 +32 @@
-index b647450031..4d64a98351 100644
+index 9ec1e13721..e0b4b4bd67 100644
@@ -34 +35 @@
-@@ -1797,5 +1797,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
+@@ -1030,5 +1030,7 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
@@ -42 +43 @@
- 	/* Update the default RSS VNIC(s) */
+ 	if (rss_conf->rss_hf & ETH_RSS_IPV4)
@@ -44 +45 @@
-index 457ebede0e..e42308a97f 100644
+index 005c9f2c2c..d1664dbc09 100644
@@ -47,2 +48,2 @@
-@@ -169,8 +169,6 @@ out:
- 		struct rte_eth_rss_conf *rss = &dev_conf->rx_adv_conf.rss_conf;
+@@ -161,8 +161,6 @@ out:
+ 		uint16_t hash_type = 0;
@@ -56 +57 @@
- 		for (i = 0; i < bp->nr_vnics; i++) {
+ 		if (rss->rss_hf & ETH_RSS_IPV4)

[dpdk-stable] patch 'app/testpmd: fix DCB set' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/efcb7a83984c594d4a74b64ff73d989e58ce3fac

Thanks.

Kevin.

---
From efcb7a83984c594d4a74b64ff73d989e58ce3fac Mon Sep 17 00:00:00 2001
From: Ting Xu <ting.xu@intel.com>
Date: Tue, 12 May 2020 10:13:56 +0000
Subject: [PATCH] app/testpmd: fix DCB set

[ upstream commit 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 ]

When set DCB in testpmd, there is a segmentation fault. It is
because the local variable rss_conf in get_eth_dcb_conf()
is not cleared, so that the pointer member variable rss_key has
a random address, which leads to an error in the following
processing. This patch initialized the local variable rss_conf
to avoid this situation.

Fixes: ac7c491c3fec ("app/testpmd: fix DCB config")

Signed-off-by: Ting Xu <ting.xu@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/testpmd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b68bc54e32..a32eae750c 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2935,4 +2935,6 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf,
 				&eth_conf->tx_adv_conf.dcb_tx_conf;
 
+		memset(&rss_conf, 0, sizeof(struct rte_eth_rss_conf));
+
 		rc = rte_eth_dev_rss_hash_conf_get(pid, &rss_conf);
 		if (rc != 0)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.260020473 +0100
+++ 0063-app-testpmd-fix-DCB-set.patch	2020-06-05 19:20:50.896038859 +0100
@@ -1 +1 @@
-From 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 Mon Sep 17 00:00:00 2001
+From efcb7a83984c594d4a74b64ff73d989e58ce3fac Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index baccc3a495..4989d22ca8 100644
+index b68bc54e32..a32eae750c 100644
@@ -26 +27 @@
-@@ -3461,4 +3461,6 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf,
+@@ -2935,4 +2935,6 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf,

[dpdk-stable] patch 'net/ixgbe/base: update copyright' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/92f70728b24da74542570db8359679fd370026cd

Thanks.

Kevin.

---
From 92f70728b24da74542570db8359679fd370026cd Mon Sep 17 00:00:00 2001
From: Xiaoyun Li <xiaoyun.li@intel.com>
Date: Mon, 18 May 2020 16:41:36 +0800
Subject: [PATCH] net/ixgbe/base: update copyright

[ upstream commit e071d4af8f2918df9542592acc877d75d40c783a ]

Clarify Intel copyright and update the date to 2020.

Fixes: 9db3087f4f77 ("net/ixgbe/base: update the license")

Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/ixgbe/base/README            | 34 +++---------------------
 drivers/net/ixgbe/base/ixgbe_82598.c     |  2 +-
 drivers/net/ixgbe/base/ixgbe_82598.h     |  2 +-
 drivers/net/ixgbe/base/ixgbe_82599.c     |  2 +-
 drivers/net/ixgbe/base/ixgbe_82599.h     |  2 +-
 drivers/net/ixgbe/base/ixgbe_api.c       |  2 +-
 drivers/net/ixgbe/base/ixgbe_api.h       |  2 +-
 drivers/net/ixgbe/base/ixgbe_common.c    |  2 +-
 drivers/net/ixgbe/base/ixgbe_common.h    |  2 +-
 drivers/net/ixgbe/base/ixgbe_dcb.c       |  2 +-
 drivers/net/ixgbe/base/ixgbe_dcb.h       |  2 +-
 drivers/net/ixgbe/base/ixgbe_dcb_82598.c |  2 +-
 drivers/net/ixgbe/base/ixgbe_dcb_82598.h |  2 +-
 drivers/net/ixgbe/base/ixgbe_dcb_82599.c |  2 +-
 drivers/net/ixgbe/base/ixgbe_dcb_82599.h |  2 +-
 drivers/net/ixgbe/base/ixgbe_hv_vf.c     |  2 +-
 drivers/net/ixgbe/base/ixgbe_hv_vf.h     |  2 +-
 drivers/net/ixgbe/base/ixgbe_mbx.c       |  2 +-
 drivers/net/ixgbe/base/ixgbe_mbx.h       |  2 +-
 drivers/net/ixgbe/base/ixgbe_osdep.h     |  2 +-
 drivers/net/ixgbe/base/ixgbe_phy.c       |  2 +-
 drivers/net/ixgbe/base/ixgbe_phy.h       |  2 +-
 drivers/net/ixgbe/base/ixgbe_type.h      |  2 +-
 drivers/net/ixgbe/base/ixgbe_vf.c        |  2 +-
 drivers/net/ixgbe/base/ixgbe_vf.h        |  2 +-
 drivers/net/ixgbe/base/ixgbe_x540.c      |  2 +-
 drivers/net/ixgbe/base/ixgbe_x540.h      |  2 +-
 drivers/net/ixgbe/base/ixgbe_x550.c      |  2 +-
 drivers/net/ixgbe/base/ixgbe_x550.h      |  2 +-
 drivers/net/ixgbe/base/meson.build       |  2 +-
 30 files changed, 32 insertions(+), 60 deletions(-)

diff --git a/drivers/net/ixgbe/base/README b/drivers/net/ixgbe/base/README
index 431be0260e..a48b14ed27 100644
--- a/drivers/net/ixgbe/base/README
+++ b/drivers/net/ixgbe/base/README
@@ -1,33 +1,5 @@
-..
-     BSD LICENSE
-   
-     Copyright(c) 2010-2018 Intel Corporation. All rights reserved.
-     All rights reserved.
-   
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-   
-       * Redistributions of source code must retain the above copyright
-         notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above copyright
-         notice, this list of conditions and the following disclaimer in
-         the documentation and/or other materials provided with the
-         distribution.
-       * Neither the name of Intel Corporation nor the names of its
-         contributors may be used to endorse or promote products derived
-         from this software without specific prior written permission.
-   
-     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-     A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-     OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-     LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-     DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2020 Intel Corporation
+ */
 
 Intel® IXGBE driver
diff --git a/drivers/net/ixgbe/base/ixgbe_82598.c b/drivers/net/ixgbe/base/ixgbe_82598.c
index 245ff75d55..c83e1c6b30 100644
--- a/drivers/net/ixgbe/base/ixgbe_82598.c
+++ b/drivers/net/ixgbe/base/ixgbe_82598.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_82598.h b/drivers/net/ixgbe/base/ixgbe_82598.h
index 8013f495ec..7bad5e12d3 100644
--- a/drivers/net/ixgbe/base/ixgbe_82598.h
+++ b/drivers/net/ixgbe/base/ixgbe_82598.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_82599.c b/drivers/net/ixgbe/base/ixgbe_82599.c
index 96bdde62c8..9cd0b1428c 100644
--- a/drivers/net/ixgbe/base/ixgbe_82599.c
+++ b/drivers/net/ixgbe/base/ixgbe_82599.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_82599.h b/drivers/net/ixgbe/base/ixgbe_82599.h
index a32eb1f517..238481983f 100644
--- a/drivers/net/ixgbe/base/ixgbe_82599.h
+++ b/drivers/net/ixgbe/base/ixgbe_82599.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_api.c b/drivers/net/ixgbe/base/ixgbe_api.c
index 873c07999c..0a22df3d06 100644
--- a/drivers/net/ixgbe/base/ixgbe_api.c
+++ b/drivers/net/ixgbe/base/ixgbe_api.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_api.h b/drivers/net/ixgbe/base/ixgbe_api.h
index ff8f7b2611..33e7c3c215 100644
--- a/drivers/net/ixgbe/base/ixgbe_api.h
+++ b/drivers/net/ixgbe/base/ixgbe_api.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index 62ff767230..4eb98dc198 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_common.h b/drivers/net/ixgbe/base/ixgbe_common.h
index 3bb2475119..7a31f088c4 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.h
+++ b/drivers/net/ixgbe/base/ixgbe_common.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb.c b/drivers/net/ixgbe/base/ixgbe_dcb.c
index a590e0e07c..53def2146e 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb.c
+++ b/drivers/net/ixgbe/base/ixgbe_dcb.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb.h b/drivers/net/ixgbe/base/ixgbe_dcb.h
index 503d06018f..c2a1013ac0 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb.h
+++ b/drivers/net/ixgbe/base/ixgbe_dcb.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
index d87cb58857..bb309e28fd 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.h b/drivers/net/ixgbe/base/ixgbe_dcb_82598.h
index 1a14744482..8f36881378 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb_82598.h
+++ b/drivers/net/ixgbe/base/ixgbe_dcb_82598.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82599.c b/drivers/net/ixgbe/base/ixgbe_dcb_82599.c
index f4f0ff0190..04e0d1fb7d 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb_82599.c
+++ b/drivers/net/ixgbe/base/ixgbe_dcb_82599.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82599.h b/drivers/net/ixgbe/base/ixgbe_dcb_82599.h
index 085ada27f7..7bd1d6a325 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb_82599.h
+++ b/drivers/net/ixgbe/base/ixgbe_dcb_82599.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.c b/drivers/net/ixgbe/base/ixgbe_hv_vf.c
index 67a124d8d1..6005c4ac93 100644
--- a/drivers/net/ixgbe/base/ixgbe_hv_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.h b/drivers/net/ixgbe/base/ixgbe_hv_vf.h
index 9664f3bdbf..dd2e1eee4e 100644
--- a/drivers/net/ixgbe/base/ixgbe_hv_vf.h
+++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.c b/drivers/net/ixgbe/base/ixgbe_mbx.c
index cb82942dfa..13bdb5f68f 100644
--- a/drivers/net/ixgbe/base/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/base/ixgbe_mbx.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_mbx.h b/drivers/net/ixgbe/base/ixgbe_mbx.h
index 5d32cbc074..1a45e49c2f 100644
--- a/drivers/net/ixgbe/base/ixgbe_mbx.h
+++ b/drivers/net/ixgbe/base/ixgbe_mbx.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h
index ea8dc1cbe5..a4eb71777c 100644
--- a/drivers/net/ixgbe/base/ixgbe_osdep.h
+++ b/drivers/net/ixgbe/base/ixgbe_osdep.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c b/drivers/net/ixgbe/base/ixgbe_phy.c
index dd118f9170..a8243fa974 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h b/drivers/net/ixgbe/base/ixgbe_phy.h
index f1605f2cc9..a06c3be170 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index 077b8f01c7..15e9370105 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c b/drivers/net/ixgbe/base/ixgbe_vf.c
index aac37822e4..7f69ece107 100644
--- a/drivers/net/ixgbe/base/ixgbe_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_vf.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_vf.h b/drivers/net/ixgbe/base/ixgbe_vf.h
index dba643fced..be58b4f76e 100644
--- a/drivers/net/ixgbe/base/ixgbe_vf.h
+++ b/drivers/net/ixgbe/base/ixgbe_vf.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_x540.c b/drivers/net/ixgbe/base/ixgbe_x540.c
index f00f0eae7e..d65f47c181 100644
--- a/drivers/net/ixgbe/base/ixgbe_x540.c
+++ b/drivers/net/ixgbe/base/ixgbe_x540.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_x540.h b/drivers/net/ixgbe/base/ixgbe_x540.h
index 231dfe56e5..ba79847d11 100644
--- a/drivers/net/ixgbe/base/ixgbe_x540.h
+++ b/drivers/net/ixgbe/base/ixgbe_x540.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index a920a146e7..f2c8e5425e 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.h b/drivers/net/ixgbe/base/ixgbe_x550.h
index 3bd98f243d..10086ab423 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.h
+++ b/drivers/net/ixgbe/base/ixgbe_x550.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
index 21ac64bf5c..e4807e59a5 100644
--- a/drivers/net/ixgbe/base/meson.build
+++ b/drivers/net/ixgbe/base/meson.build
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.312513630 +0100
+++ 0064-net-ixgbe-base-update-copyright.patch	2020-06-05 19:20:50.917038382 +0100
@@ -1 +1 @@
-From e071d4af8f2918df9542592acc877d75d40c783a Mon Sep 17 00:00:00 2001
+From 92f70728b24da74542570db8359679fd370026cd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e071d4af8f2918df9542592acc877d75d40c783a ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14,31 +15,31 @@
- drivers/net/ixgbe/base/README            | 2 +-
- drivers/net/ixgbe/base/ixgbe_82598.c     | 2 +-
- drivers/net/ixgbe/base/ixgbe_82598.h     | 2 +-
- drivers/net/ixgbe/base/ixgbe_82599.c     | 2 +-
- drivers/net/ixgbe/base/ixgbe_82599.h     | 2 +-
- drivers/net/ixgbe/base/ixgbe_api.c       | 2 +-
- drivers/net/ixgbe/base/ixgbe_api.h       | 2 +-
- drivers/net/ixgbe/base/ixgbe_common.c    | 2 +-
- drivers/net/ixgbe/base/ixgbe_common.h    | 2 +-
- drivers/net/ixgbe/base/ixgbe_dcb.c       | 2 +-
- drivers/net/ixgbe/base/ixgbe_dcb.h       | 2 +-
- drivers/net/ixgbe/base/ixgbe_dcb_82598.c | 2 +-
- drivers/net/ixgbe/base/ixgbe_dcb_82598.h | 2 +-
- drivers/net/ixgbe/base/ixgbe_dcb_82599.c | 2 +-
- drivers/net/ixgbe/base/ixgbe_dcb_82599.h | 2 +-
- drivers/net/ixgbe/base/ixgbe_hv_vf.c     | 2 +-
- drivers/net/ixgbe/base/ixgbe_hv_vf.h     | 2 +-
- drivers/net/ixgbe/base/ixgbe_mbx.c       | 2 +-
- drivers/net/ixgbe/base/ixgbe_mbx.h       | 2 +-
- drivers/net/ixgbe/base/ixgbe_osdep.h     | 2 +-
- drivers/net/ixgbe/base/ixgbe_phy.c       | 2 +-
- drivers/net/ixgbe/base/ixgbe_phy.h       | 2 +-
- drivers/net/ixgbe/base/ixgbe_type.h      | 2 +-
- drivers/net/ixgbe/base/ixgbe_vf.c        | 2 +-
- drivers/net/ixgbe/base/ixgbe_vf.h        | 2 +-
- drivers/net/ixgbe/base/ixgbe_x540.c      | 2 +-
- drivers/net/ixgbe/base/ixgbe_x540.h      | 2 +-
- drivers/net/ixgbe/base/ixgbe_x550.c      | 2 +-
- drivers/net/ixgbe/base/ixgbe_x550.h      | 2 +-
- drivers/net/ixgbe/base/meson.build       | 2 +-
- 30 files changed, 30 insertions(+), 30 deletions(-)
+ drivers/net/ixgbe/base/README            | 34 +++---------------------
+ drivers/net/ixgbe/base/ixgbe_82598.c     |  2 +-
+ drivers/net/ixgbe/base/ixgbe_82598.h     |  2 +-
+ drivers/net/ixgbe/base/ixgbe_82599.c     |  2 +-
+ drivers/net/ixgbe/base/ixgbe_82599.h     |  2 +-
+ drivers/net/ixgbe/base/ixgbe_api.c       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_api.h       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_common.c    |  2 +-
+ drivers/net/ixgbe/base/ixgbe_common.h    |  2 +-
+ drivers/net/ixgbe/base/ixgbe_dcb.c       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_dcb.h       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_dcb_82598.c |  2 +-
+ drivers/net/ixgbe/base/ixgbe_dcb_82598.h |  2 +-
+ drivers/net/ixgbe/base/ixgbe_dcb_82599.c |  2 +-
+ drivers/net/ixgbe/base/ixgbe_dcb_82599.h |  2 +-
+ drivers/net/ixgbe/base/ixgbe_hv_vf.c     |  2 +-
+ drivers/net/ixgbe/base/ixgbe_hv_vf.h     |  2 +-
+ drivers/net/ixgbe/base/ixgbe_mbx.c       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_mbx.h       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_osdep.h     |  2 +-
+ drivers/net/ixgbe/base/ixgbe_phy.c       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_phy.h       |  2 +-
+ drivers/net/ixgbe/base/ixgbe_type.h      |  2 +-
+ drivers/net/ixgbe/base/ixgbe_vf.c        |  2 +-
+ drivers/net/ixgbe/base/ixgbe_vf.h        |  2 +-
+ drivers/net/ixgbe/base/ixgbe_x540.c      |  2 +-
+ drivers/net/ixgbe/base/ixgbe_x540.h      |  2 +-
+ drivers/net/ixgbe/base/ixgbe_x550.c      |  2 +-
+ drivers/net/ixgbe/base/ixgbe_x550.h      |  2 +-
+ drivers/net/ixgbe/base/meson.build       |  2 +-
+ 30 files changed, 32 insertions(+), 60 deletions(-)
@@ -47 +48 @@
-index b6b420e2f3..a48b14ed27 100644
+index 431be0260e..a48b14ed27 100644
@@ -50,3 +51,33 @@
-@@ -1,4 +1,4 @@
- /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2010-2018 Intel Corporation
+@@ -1,33 +1,5 @@
+-..
+-     BSD LICENSE
+-   
+-     Copyright(c) 2010-2018 Intel Corporation. All rights reserved.
+-     All rights reserved.
+-   
+-     Redistribution and use in source and binary forms, with or without
+-     modification, are permitted provided that the following conditions
+-     are met:
+-   
+-       * Redistributions of source code must retain the above copyright
+-         notice, this list of conditions and the following disclaimer.
+-       * Redistributions in binary form must reproduce the above copyright
+-         notice, this list of conditions and the following disclaimer in
+-         the documentation and/or other materials provided with the
+-         distribution.
+-       * Neither the name of Intel Corporation nor the names of its
+-         contributors may be used to endorse or promote products derived
+-         from this software without specific prior written permission.
+-   
+-     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-     A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-     OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-     LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-     DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++/* SPDX-License-Identifier: BSD-3-Clause
@@ -54 +85 @@
-  */
++ */
@@ -55,0 +87 @@
+ Intel® IXGBE driver
@@ -237 +269 @@
-index 844d1701f5..dc712b7c02 100644
+index ea8dc1cbe5..a4eb71777c 100644
@@ -317 +349 @@
-index 930a61a20b..3de406fd35 100644
+index a920a146e7..f2c8e5425e 100644
@@ -337 +369 @@
-index da3887560d..48bbb86cb8 100644
+index 21ac64bf5c..e4807e59a5 100644

[dpdk-stable] patch 'net/i40e/base: update copyright' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/4db6ee199d089187fdb97342c9e3eef64bc0e6af

Thanks.

Kevin.

---
From 4db6ee199d089187fdb97342c9e3eef64bc0e6af Mon Sep 17 00:00:00 2001
From: Xiaoyun Li <xiaoyun.li@intel.com>
Date: Mon, 18 May 2020 16:44:06 +0800
Subject: [PATCH] net/i40e/base: update copyright

[ upstream commit 760ed82196c69695649b6681d76af0fea19f2cb8 ]

Clarify Intel copyright and update the date to 2020.

Fixes: 547be3f01f55 ("net/i40e/base: replace license text with SPDX tag")

Signed-off-by: Xiaoyun Li <xiaoyun.li@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/i40e/base/README            | 34 +++----------------------
 drivers/net/i40e/base/i40e_adminq.c     |  2 +-
 drivers/net/i40e/base/i40e_adminq.h     |  2 +-
 drivers/net/i40e/base/i40e_adminq_cmd.h |  2 +-
 drivers/net/i40e/base/i40e_alloc.h      |  2 +-
 drivers/net/i40e/base/i40e_common.c     |  2 +-
 drivers/net/i40e/base/i40e_dcb.c        |  2 +-
 drivers/net/i40e/base/i40e_dcb.h        |  2 +-
 drivers/net/i40e/base/i40e_devids.h     |  2 +-
 drivers/net/i40e/base/i40e_diag.c       |  2 +-
 drivers/net/i40e/base/i40e_diag.h       |  2 +-
 drivers/net/i40e/base/i40e_hmc.c        |  2 +-
 drivers/net/i40e/base/i40e_hmc.h        |  2 +-
 drivers/net/i40e/base/i40e_lan_hmc.c    |  2 +-
 drivers/net/i40e/base/i40e_lan_hmc.h    |  2 +-
 drivers/net/i40e/base/i40e_nvm.c        |  2 +-
 drivers/net/i40e/base/i40e_osdep.h      |  2 +-
 drivers/net/i40e/base/i40e_prototype.h  |  2 +-
 drivers/net/i40e/base/i40e_register.h   |  2 +-
 drivers/net/i40e/base/i40e_status.h     |  2 +-
 drivers/net/i40e/base/i40e_type.h       |  2 +-
 drivers/net/i40e/base/meson.build       |  2 +-
 drivers/net/i40e/base/virtchnl.h        |  2 +-
 23 files changed, 25 insertions(+), 53 deletions(-)

diff --git a/drivers/net/i40e/base/README b/drivers/net/i40e/base/README
index 84f191fad1..b46593566b 100644
--- a/drivers/net/i40e/base/README
+++ b/drivers/net/i40e/base/README
@@ -1,33 +1,5 @@
-..
-     BSD LICENSE
-
-     Copyright(c) 2017 Intel Corporation. All rights reserved.
-     All rights reserved.
-
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted provided that the following conditions
-     are met:
-
-       * Redistributions of source code must retain the above copyright
-         notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above copyright
-         notice, this list of conditions and the following disclaimer in
-         the documentation and/or other materials provided with the
-         distribution.
-       * Neither the name of Intel Corporation nor the names of its
-         contributors may be used to endorse or promote products derived
-         from this software without specific prior written permission.
-
-     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-     A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-     OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-     LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-     DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017-2020 Intel Corporation
+ */
 
 Intel® I40E driver
diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c
index b2fc6f5900..584da0383c 100644
--- a/drivers/net/i40e/base/i40e_adminq.c
+++ b/drivers/net/i40e/base/i40e_adminq.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_adminq.h b/drivers/net/i40e/base/i40e_adminq.h
index 769d84809e..6ce262ad4b 100644
--- a/drivers/net/i40e/base/i40e_adminq.h
+++ b/drivers/net/i40e/base/i40e_adminq.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_adminq_cmd.h b/drivers/net/i40e/base/i40e_adminq_cmd.h
index cf6ef63e39..ec1ba7825b 100644
--- a/drivers/net/i40e/base/i40e_adminq_cmd.h
+++ b/drivers/net/i40e/base/i40e_adminq_cmd.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_alloc.h b/drivers/net/i40e/base/i40e_alloc.h
index 4fc1860155..ae14e4d932 100644
--- a/drivers/net/i40e/base/i40e_alloc.h
+++ b/drivers/net/i40e/base/i40e_alloc.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index 1f8bb603df..b256fb47d3 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c
index a26f82b3a6..d99bd6e3f8 100644
--- a/drivers/net/i40e/base/i40e_dcb.c
+++ b/drivers/net/i40e/base/i40e_dcb.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h
index 85b0eed3ad..8d36fce430 100644
--- a/drivers/net/i40e/base/i40e_dcb.h
+++ b/drivers/net/i40e/base/i40e_dcb.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_devids.h b/drivers/net/i40e/base/i40e_devids.h
index 8b667c2afb..545e35d243 100644
--- a/drivers/net/i40e/base/i40e_devids.h
+++ b/drivers/net/i40e/base/i40e_devids.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_diag.c b/drivers/net/i40e/base/i40e_diag.c
index 3ccbea4829..b3c4cfd3aa 100644
--- a/drivers/net/i40e/base/i40e_diag.c
+++ b/drivers/net/i40e/base/i40e_diag.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_diag.h b/drivers/net/i40e/base/i40e_diag.h
index 4434fc960b..cb59285d9c 100644
--- a/drivers/net/i40e/base/i40e_diag.h
+++ b/drivers/net/i40e/base/i40e_diag.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_hmc.c b/drivers/net/i40e/base/i40e_hmc.c
index 11c9ae2072..a47d6e0d79 100644
--- a/drivers/net/i40e/base/i40e_hmc.c
+++ b/drivers/net/i40e/base/i40e_hmc.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_hmc.h b/drivers/net/i40e/base/i40e_hmc.h
index 289264ed99..f9aad7dc31 100644
--- a/drivers/net/i40e/base/i40e_hmc.h
+++ b/drivers/net/i40e/base/i40e_hmc.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_lan_hmc.c b/drivers/net/i40e/base/i40e_lan_hmc.c
index 0afee49b13..d3969396f0 100644
--- a/drivers/net/i40e/base/i40e_lan_hmc.c
+++ b/drivers/net/i40e/base/i40e_lan_hmc.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_lan_hmc.h b/drivers/net/i40e/base/i40e_lan_hmc.h
index e531ec490a..aa5dceb792 100644
--- a/drivers/net/i40e/base/i40e_lan_hmc.h
+++ b/drivers/net/i40e/base/i40e_lan_hmc.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index 6c8ca87718..d87a6e56ff 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_osdep.h b/drivers/net/i40e/base/i40e_osdep.h
index 8a2d82a8d0..64b15e1b61 100644
--- a/drivers/net/i40e/base/i40e_osdep.h
+++ b/drivers/net/i40e/base/i40e_osdep.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_prototype.h b/drivers/net/i40e/base/i40e_prototype.h
index 0cf006dadc..055b38e73d 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_register.h b/drivers/net/i40e/base/i40e_register.h
index e93ec3f58f..2408dcb117 100644
--- a/drivers/net/i40e/base/i40e_register.h
+++ b/drivers/net/i40e/base/i40e_register.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_status.h b/drivers/net/i40e/base/i40e_status.h
index 1dad4f4b83..cd72169f14 100644
--- a/drivers/net/i40e/base/i40e_status.h
+++ b/drivers/net/i40e/base/i40e_status.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/i40e_type.h b/drivers/net/i40e/base/i40e_type.h
index 1a637e40e8..3a46e3e1fa 100644
--- a/drivers/net/i40e/base/i40e_type.h
+++ b/drivers/net/i40e/base/i40e_type.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index d4c8f872d5..07aa91c08f 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
diff --git a/drivers/net/i40e/base/virtchnl.h b/drivers/net/i40e/base/virtchnl.h
index 88096cb45c..483020d4e5 100644
--- a/drivers/net/i40e/base/virtchnl.h
+++ b/drivers/net/i40e/base/virtchnl.h
@@ -1,4 +1,4 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2001-2018
+ * Copyright(c) 2001-2020 Intel Corporation
  */
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.389919224 +0100
+++ 0065-net-i40e-base-update-copyright.patch	2020-06-05 19:20:50.941037837 +0100
@@ -1 +1 @@
-From 760ed82196c69695649b6681d76af0fea19f2cb8 Mon Sep 17 00:00:00 2001
+From 4db6ee199d089187fdb97342c9e3eef64bc0e6af Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 760ed82196c69695649b6681d76af0fea19f2cb8 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -14,24 +15,24 @@
- drivers/net/i40e/base/README            | 2 +-
- drivers/net/i40e/base/i40e_adminq.c     | 2 +-
- drivers/net/i40e/base/i40e_adminq.h     | 2 +-
- drivers/net/i40e/base/i40e_adminq_cmd.h | 2 +-
- drivers/net/i40e/base/i40e_alloc.h      | 2 +-
- drivers/net/i40e/base/i40e_common.c     | 2 +-
- drivers/net/i40e/base/i40e_dcb.c        | 2 +-
- drivers/net/i40e/base/i40e_dcb.h        | 2 +-
- drivers/net/i40e/base/i40e_devids.h     | 2 +-
- drivers/net/i40e/base/i40e_diag.c       | 2 +-
- drivers/net/i40e/base/i40e_diag.h       | 2 +-
- drivers/net/i40e/base/i40e_hmc.c        | 2 +-
- drivers/net/i40e/base/i40e_hmc.h        | 2 +-
- drivers/net/i40e/base/i40e_lan_hmc.c    | 2 +-
- drivers/net/i40e/base/i40e_lan_hmc.h    | 2 +-
- drivers/net/i40e/base/i40e_nvm.c        | 2 +-
- drivers/net/i40e/base/i40e_osdep.h      | 2 +-
- drivers/net/i40e/base/i40e_prototype.h  | 2 +-
- drivers/net/i40e/base/i40e_register.h   | 2 +-
- drivers/net/i40e/base/i40e_status.h     | 2 +-
- drivers/net/i40e/base/i40e_type.h       | 2 +-
- drivers/net/i40e/base/meson.build       | 2 +-
- drivers/net/i40e/base/virtchnl.h        | 2 +-
- 23 files changed, 23 insertions(+), 23 deletions(-)
+ drivers/net/i40e/base/README            | 34 +++----------------------
+ drivers/net/i40e/base/i40e_adminq.c     |  2 +-
+ drivers/net/i40e/base/i40e_adminq.h     |  2 +-
+ drivers/net/i40e/base/i40e_adminq_cmd.h |  2 +-
+ drivers/net/i40e/base/i40e_alloc.h      |  2 +-
+ drivers/net/i40e/base/i40e_common.c     |  2 +-
+ drivers/net/i40e/base/i40e_dcb.c        |  2 +-
+ drivers/net/i40e/base/i40e_dcb.h        |  2 +-
+ drivers/net/i40e/base/i40e_devids.h     |  2 +-
+ drivers/net/i40e/base/i40e_diag.c       |  2 +-
+ drivers/net/i40e/base/i40e_diag.h       |  2 +-
+ drivers/net/i40e/base/i40e_hmc.c        |  2 +-
+ drivers/net/i40e/base/i40e_hmc.h        |  2 +-
+ drivers/net/i40e/base/i40e_lan_hmc.c    |  2 +-
+ drivers/net/i40e/base/i40e_lan_hmc.h    |  2 +-
+ drivers/net/i40e/base/i40e_nvm.c        |  2 +-
+ drivers/net/i40e/base/i40e_osdep.h      |  2 +-
+ drivers/net/i40e/base/i40e_prototype.h  |  2 +-
+ drivers/net/i40e/base/i40e_register.h   |  2 +-
+ drivers/net/i40e/base/i40e_status.h     |  2 +-
+ drivers/net/i40e/base/i40e_type.h       |  2 +-
+ drivers/net/i40e/base/meson.build       |  2 +-
+ drivers/net/i40e/base/virtchnl.h        |  2 +-
+ 23 files changed, 25 insertions(+), 53 deletions(-)
@@ -40 +41 @@
-index e7b39b4d14..6baca43603 100644
+index 84f191fad1..b46593566b 100644
@@ -43,3 +44,33 @@
-@@ -1,4 +1,4 @@
- /* SPDX-License-Identifier: BSD-3-Clause
-- * Copyright(c) 2017 Intel Corporation
+@@ -1,33 +1,5 @@
+-..
+-     BSD LICENSE
+-
+-     Copyright(c) 2017 Intel Corporation. All rights reserved.
+-     All rights reserved.
+-
+-     Redistribution and use in source and binary forms, with or without
+-     modification, are permitted provided that the following conditions
+-     are met:
+-
+-       * Redistributions of source code must retain the above copyright
+-         notice, this list of conditions and the following disclaimer.
+-       * Redistributions in binary form must reproduce the above copyright
+-         notice, this list of conditions and the following disclaimer in
+-         the documentation and/or other materials provided with the
+-         distribution.
+-       * Neither the name of Intel Corporation nor the names of its
+-         contributors may be used to endorse or promote products derived
+-         from this software without specific prior written permission.
+-
+-     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+-     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+-     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+-     A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+-     OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+-     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+-     LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+-     DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+-     THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-     OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++/* SPDX-License-Identifier: BSD-3-Clause
@@ -47 +78 @@
-  */
++ */
@@ -48,0 +80 @@
+ Intel® I40E driver
@@ -50 +82 @@
-index 659b971e5c..c89e1fb3f7 100644
+index b2fc6f5900..584da0383c 100644
@@ -70 +102 @@
-index 55fd43e220..1905167f5e 100644
+index cf6ef63e39..ec1ba7825b 100644
@@ -90 +122 @@
-index 4e06f2d234..46a0b78816 100644
+index 1f8bb603df..b256fb47d3 100644
@@ -100 +132 @@
-index 2ab5021ee8..a07c61e673 100644
+index a26f82b3a6..d99bd6e3f8 100644
@@ -110 +142 @@
-index 60193c98d6..0409fd3e1a 100644
+index 85b0eed3ad..8d36fce430 100644
@@ -115 +147 @@
-- * Copyright(c) 2001-2019
+- * Copyright(c) 2001-2018
@@ -120 +152 @@
-index b87e1bcb40..02ae7be550 100644
+index 8b667c2afb..545e35d243 100644
@@ -190 +222 @@
-index fc24cc2ce0..6466d86486 100644
+index 6c8ca87718..d87a6e56ff 100644
@@ -200 +232 @@
-index 17eee94533..58be39677a 100644
+index 8a2d82a8d0..64b15e1b61 100644
@@ -210 +242 @@
-index d8ab3ea0a4..91fa234915 100644
+index 0cf006dadc..055b38e73d 100644
@@ -220 +252 @@
-index dffcc633c1..ee4f333f9c 100644
+index e93ec3f58f..2408dcb117 100644
@@ -240 +272 @@
-index af9089829d..014a4c132a 100644
+index 1a637e40e8..3a46e3e1fa 100644
@@ -250 +282 @@
-index db0c830dc2..8bc6a0fa0b 100644
+index d4c8f872d5..07aa91c08f 100644
@@ -260 +292 @@
-index 92515bf340..4f498ca456 100644
+index 88096cb45c..483020d4e5 100644

[dpdk-stable] patch 'pci: accept 32-bit domain numbers' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/857ab632a16974b51b08f41370ff00ada2c03ba1

Thanks.

Kevin.

---
From 857ab632a16974b51b08f41370ff00ada2c03ba1 Mon Sep 17 00:00:00 2001
From: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Date: Tue, 12 May 2020 15:30:57 +0200
Subject: [PATCH] pci: accept 32-bit domain numbers

[ upstream commit 26cfc20feddd9fc5b87842d4c9bda6b9453e2c46 ]

The parsing code was bailing on domains greater than UINT16_MAX,
but domain numbers like that are still valid and present on some systems.
One example is Intel VMD (Volume Management Device), which acts somewhat
as a software-managed PCI switch and its upstream linux driver assigns
all downstream devices a PCI domain of 0x10000.

Parsing a BDF like 10000:01:00.0 was failing before. To fix it, increase
the upper limit of domain number to UINT32_MAX. This matches the size of
struct rte_pci_addr->domain (uint32).

Fixes: af75078fece3 ("first public release")

Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Acked-by: Gaetan Rivet <grive@u256.net>
---
 lib/librte_pci/rte_pci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index a13aed9856..e35d64f99c 100644
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -73,7 +73,7 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
 	errno = 0;
 	val = strtoul(in, &end, 16);
-	if (errno != 0 || end[0] != ':' || val > UINT16_MAX)
+	if (errno != 0 || end[0] != ':' || val > UINT32_MAX)
 		return -EINVAL;
-	dev_addr->domain = (uint16_t)val;
+	dev_addr->domain = (uint32_t)val;
 	in = end + 1;
 	in = get_u8_pciaddr_field(in, &dev_addr->bus, ':');
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.466266143 +0100
+++ 0066-pci-accept-32-bit-domain-numbers.patch	2020-06-05 19:20:50.942037814 +0100
@@ -1 +1 @@
-From 26cfc20feddd9fc5b87842d4c9bda6b9453e2c46 Mon Sep 17 00:00:00 2001
+From 857ab632a16974b51b08f41370ff00ada2c03ba1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 26cfc20feddd9fc5b87842d4c9bda6b9453e2c46 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index d1ab6b414d..ad2cdfebb2 100644
+index a13aed9856..e35d64f99c 100644

[dpdk-stable] patch 'pci: reject negative values in PCI id' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/6c308ef1d740e4f5dae7f612b7ffbe50256b1ade

Thanks.

Kevin.

---
From 6c308ef1d740e4f5dae7f612b7ffbe50256b1ade Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <grive@u256.net>
Date: Wed, 13 May 2020 12:47:50 +0200
Subject: [PATCH] pci: reject negative values in PCI id

[ upstream commit 21a61fae51804cfdf7c6f7e6189c63f02025de89 ]

The function strtoul will not return ERANGE if the input is negative, as
one might expect.

   0000:-FFFFFFFFFFFFFFFB:00.0

is not a better way to write 0000:05:00.0.
To simplify checking for '-', forbid using spaces before the field value.

   0000: 00:   2c.0

Should not be accepted.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Gaetan Rivet <grive@u256.net>
Acked-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
---
 lib/librte_pci/rte_pci.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index e35d64f99c..2c98c3efb5 100644
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -36,4 +36,10 @@ get_u8_pciaddr_field(const char *in, void *_u8, char dlm)
 		return NULL;
 
+	/* PCI field starting with spaces is forbidden.
+	 * Negative wrap-around is not reported as an error by strtoul.
+	 */
+	if (*in == ' ' || *in == '-')
+		return NULL;
+
 	errno = 0;
 	val = strtoul(in, &end, 16);
@@ -71,4 +77,10 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
 	char *end;
 
+	/* PCI id starting with spaces is forbidden.
+	 * Negative wrap-around is not reported as an error by strtoul.
+	 */
+	if (*in == ' ' || *in == '-')
+		return -EINVAL;
+
 	errno = 0;
 	val = strtoul(in, &end, 16);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.515505654 +0100
+++ 0067-pci-reject-negative-values-in-PCI-id.patch	2020-06-05 19:20:50.942037814 +0100
@@ -1 +1 @@
-From 21a61fae51804cfdf7c6f7e6189c63f02025de89 Mon Sep 17 00:00:00 2001
+From 6c308ef1d740e4f5dae7f612b7ffbe50256b1ade Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21a61fae51804cfdf7c6f7e6189c63f02025de89 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index ad2cdfebb2..5f7726fa89 100644
+index e35d64f99c..2c98c3efb5 100644

[dpdk-stable] patch 'kvargs: fix strcmp helper documentation' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/a7504cbd8afbb3578bda887702c599f6f9da5967

Thanks.

Kevin.

---
From a7504cbd8afbb3578bda887702c599f6f9da5967 Mon Sep 17 00:00:00 2001
From: Gaetan Rivet <grive@u256.net>
Date: Wed, 13 May 2020 12:42:29 +0200
Subject: [PATCH] kvargs: fix strcmp helper documentation

[ upstream commit e90b9c52f8affc46ba41266ecdfe29bddaf62b0e ]

Minor error, "unless" was used instead of "unlike".

Fixes: a3b85476c51e ("kvargs: add generic string matching callback")

Signed-off-by: Gaetan Rivet <grive@u256.net>
---
 lib/librte_kvargs/rte_kvargs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_kvargs/rte_kvargs.h b/lib/librte_kvargs/rte_kvargs.h
index 1946195de4..eff598e08b 100644
--- a/lib/librte_kvargs/rte_kvargs.h
+++ b/lib/librte_kvargs/rte_kvargs.h
@@ -172,5 +172,5 @@ unsigned rte_kvargs_count(const struct rte_kvargs *kvlist,
  *   !0 otherwise or on error.
  *
- *   Unless strcmp, comparison ordering is not kept.
+ *   Unlike strcmp, comparison ordering is not kept.
  *   In order for rte_kvargs_process to stop processing on match error,
  *   a negative value is returned even if strcmp had returned a positive one.
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.564711361 +0100
+++ 0068-kvargs-fix-strcmp-helper-documentation.patch	2020-06-05 19:20:50.943037791 +0100
@@ -1 +1 @@
-From e90b9c52f8affc46ba41266ecdfe29bddaf62b0e Mon Sep 17 00:00:00 2001
+From a7504cbd8afbb3578bda887702c599f6f9da5967 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e90b9c52f8affc46ba41266ecdfe29bddaf62b0e ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'mempool/dpaa2: install missing header with meson' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/351c25aa6c3d7bd9df520612423e1f394ae1fa5f

Thanks.

Kevin.

---
From 351c25aa6c3d7bd9df520612423e1f394ae1fa5f Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal@nxp.com>
Date: Fri, 15 May 2020 15:17:47 +0530
Subject: [PATCH] mempool/dpaa2: install missing header with meson

[ upstream commit a95e588c07518356725ca1f30189262e3d1b1593 ]

rte_dpaa2_mempool.h header was missed to be added in meson.build
for header installation.

Fixes: 7ed359909556 ("mempool/dpaa2: add functions for CMDIF")

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
---
 drivers/mempool/dpaa2/meson.build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build
index 6b6ead617e..cdec39ddda 100644
--- a/drivers/mempool/dpaa2/meson.build
+++ b/drivers/mempool/dpaa2/meson.build
@@ -13,2 +13,4 @@ sources = files('dpaa2_hw_mempool.c')
 # depends on fslmc bus which uses experimental API
 allow_experimental_apis = true
+
+install_headers('rte_dpaa2_mempool.h')
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.614227347 +0100
+++ 0069-mempool-dpaa2-install-missing-header-with-meson.patch	2020-06-05 19:20:50.943037791 +0100
@@ -1 +1 @@
-From a95e588c07518356725ca1f30189262e3d1b1593 Mon Sep 17 00:00:00 2001
+From 351c25aa6c3d7bd9df520612423e1f394ae1fa5f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a95e588c07518356725ca1f30189262e3d1b1593 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index df299a0456..c3f479afa1 100644
+index 6b6ead617e..cdec39ddda 100644
@@ -22,3 +23,3 @@
-@@ -9,2 +9,4 @@ endif
- deps += ['bus_fslmc']
- sources = files('dpaa2_hw_mempool.c')
+@@ -13,2 +13,4 @@ sources = files('dpaa2_hw_mempool.c')
+ # depends on fslmc bus which uses experimental API
+ allow_experimental_apis = true

[dpdk-stable] patch 'fix same typo in multiple places' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/587595788158926e1726c9d13ee7946b43b34422

Thanks.

Kevin.

---
From 587595788158926e1726c9d13ee7946b43b34422 Mon Sep 17 00:00:00 2001
From: Muhammad Bilal <m.bilal@emumba.com>
Date: Fri, 15 May 2020 21:50:54 +0500
Subject: [PATCH] fix same typo in multiple places

[ upstream commit 5a448a55b4bb39720a42d9a186ed35dd6515e980 ]

Removed the typing error in doc/guides/eventdevs/index.rst,
drivers/net/mlx5/mlx5.c and in lib/librte_vhost/rte_vhost.h

Bugzilla ID: 477
Fixes: 0857b9421138 ("doc: add event device and software eventdev")
Fixes: 039253166a57 ("vhost: add device op when notification to guest is sent")
Fixes: ad74bc619504 ("net/mlx5: support multiport IB device during probing")

Signed-off-by: Muhammad Bilal <m.bilal@emumba.com>
---
 doc/guides/eventdevs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/eventdevs/index.rst b/doc/guides/eventdevs/index.rst
index f7382dc8a3..ce8b73cb86 100644
--- a/doc/guides/eventdevs/index.rst
+++ b/doc/guides/eventdevs/index.rst
@@ -6,5 +6,5 @@ Event Device Drivers
 
 The following are a list of event device PMDs, which can be used from an
-application trough the eventdev API.
+application through the eventdev API.
 
 .. toctree::
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.661134305 +0100
+++ 0070-fix-same-typo-in-multiple-places.patch	2020-06-05 19:20:50.943037791 +0100
@@ -1 +1 @@
-From 5a448a55b4bb39720a42d9a186ed35dd6515e980 Mon Sep 17 00:00:00 2001
+From 587595788158926e1726c9d13ee7946b43b34422 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5a448a55b4bb39720a42d9a186ed35dd6515e980 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18,3 +19 @@
- drivers/net/mlx5/mlx5.c        | 2 +-
- lib/librte_vhost/rte_vhost.h   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -23 +22 @@
-index 570905b813..bb66a5eacc 100644
+index f7382dc8a3..ce8b73cb86 100644
@@ -33,22 +31,0 @@
-diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
-index ab4adecdc3..5589772eb8 100644
---- a/drivers/net/mlx5/mlx5.c
-+++ b/drivers/net/mlx5/mlx5.c
-@@ -3375,5 +3375,5 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
- 		 * Single IB device with multiple ports found,
- 		 * it may be E-Switch master device and representors.
--		 * We have to perform identification trough the ports.
-+		 * We have to perform identification through the ports.
- 		 */
- 		MLX5_ASSERT(nl_rdma >= 0);
-diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
-index 5c72fba797..d43669f2c2 100644
---- a/lib/librte_vhost/rte_vhost.h
-+++ b/lib/librte_vhost/rte_vhost.h
-@@ -260,5 +260,5 @@ struct vhost_device_ops {
- 	/**
- 	 * This callback gets called each time a guest gets notified
--	 * about waiting packets. This is the interrupt handling trough
-+	 * about waiting packets. This is the interrupt handling through
- 	 * the eventfd_write(callfd), which can be used for counting these
- 	 * "slow" syscalls.

[dpdk-stable] patch 'examples/kni: fix MTU change to setup Tx queue' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1804a539faca3fb88608cc3d0b2501dc77a4eac7

Thanks.

Kevin.

---
From 1804a539faca3fb88608cc3d0b2501dc77a4eac7 Mon Sep 17 00:00:00 2001
From: Rasesh Mody <rmody@marvell.com>
Date: Wed, 13 May 2020 21:09:38 -0700
Subject: [PATCH] examples/kni: fix MTU change to setup Tx queue

[ upstream commit a26b116749a38db09223cfbb18f4c349f2bbae8e ]

This patch adds a fix to setup Tx queue when changing KNI interface MTU.
It ensures device can safely start txq post MTU change operation.

Fixes: fc9ee41b7016 ("examples/kni: convert to new ethdev offloads API")

Signed-off-by: Rasesh Mody <rmody@marvell.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 examples/kni/main.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/examples/kni/main.c b/examples/kni/main.c
index 6c9f46e77e..4fbb860109 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -745,7 +745,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 	int ret;
 	uint16_t nb_rxd = NB_RXD;
+	uint16_t nb_txd = NB_TXD;
 	struct rte_eth_conf conf;
 	struct rte_eth_dev_info dev_info;
 	struct rte_eth_rxconf rxq_conf;
+	struct rte_eth_txconf txq_conf;
 
 	if (!rte_eth_dev_is_valid_port(port_id)) {
@@ -775,5 +777,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 	}
 
-	ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, NULL);
+	ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, &nb_txd);
 	if (ret < 0)
 		rte_exit(EXIT_FAILURE, "Could not adjust number of descriptors "
@@ -792,4 +794,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 	}
 
+	txq_conf = dev_info.default_txconf;
+	txq_conf.offloads = conf.txmode.offloads;
+	ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd,
+		rte_eth_dev_socket_id(port_id), &txq_conf);
+	if (ret < 0) {
+		RTE_LOG(ERR, APP, "Fail to setup Tx queue of port %d\n",
+				port_id);
+		return ret;
+	}
+
 	/* Restart specific port */
 	ret = rte_eth_dev_start(port_id);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.713523082 +0100
+++ 0071-examples-kni-fix-MTU-change-to-setup-Tx-queue.patch	2020-06-05 19:20:50.944037769 +0100
@@ -1 +1 @@
-From a26b116749a38db09223cfbb18f4c349f2bbae8e Mon Sep 17 00:00:00 2001
+From 1804a539faca3fb88608cc3d0b2501dc77a4eac7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a26b116749a38db09223cfbb18f4c349f2bbae8e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 6b4ab3b5b5..7a927a50c0 100644
+index 6c9f46e77e..4fbb860109 100644
@@ -22 +23 @@
-@@ -775,7 +775,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+@@ -745,7 +745,9 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
@@ -32 +33 @@
-@@ -805,5 +807,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+@@ -775,5 +777,5 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
@@ -39 +40 @@
-@@ -830,4 +832,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+@@ -792,4 +794,14 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)

[dpdk-stable] patch 'net/i40e: fix wild pointer' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/d820e970512a5ad89039b27bcf2a17542777d678

Thanks.

Kevin.

---
From d820e970512a5ad89039b27bcf2a17542777d678 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Mon, 18 May 2020 16:00:51 +0800
Subject: [PATCH] net/i40e: fix wild pointer

[ upstream commit b342fd9084cf99292f0077e16b0edb3b6b79f6e7 ]

In i40e PMD code of function i40e_res_pool_free(), if valid_entry
is freed by "rte_free(valid_entry);" in the code, then the following
code for pool update may still use the wild pointer "valid_entry"
for pool info update. It seems has the risk of core dump for
using wild pointer operation, we should avoid this risk.

Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Reviewed-by: Jeff Guo <jia.guo@intel.com>
Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index f312abed27..fb7b489296 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -4807,4 +4807,5 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 	struct pool_entry *entry, *next, *prev, *valid_entry = NULL;
 	uint32_t pool_offset;
+	uint16_t len;
 	int insert;
 
@@ -4845,10 +4846,11 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 
 	insert = 0;
+	len = valid_entry->len;
 	/* Try to merge with next one*/
 	if (next != NULL) {
 		/* Merge with next one */
-		if (valid_entry->base + valid_entry->len == next->base) {
+		if (valid_entry->base + len == next->base) {
 			next->base = valid_entry->base;
-			next->len += valid_entry->len;
+			next->len += len;
 			rte_free(valid_entry);
 			valid_entry = next;
@@ -4860,11 +4862,13 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 		/* Merge with previous one */
 		if (prev->base + prev->len == valid_entry->base) {
-			prev->len += valid_entry->len;
+			prev->len += len;
 			/* If it merge with next one, remove next node */
 			if (insert == 1) {
 				LIST_REMOVE(valid_entry, next);
 				rte_free(valid_entry);
+				valid_entry = NULL;
 			} else {
 				rte_free(valid_entry);
+				valid_entry = NULL;
 				insert = 1;
 			}
@@ -4882,6 +4886,6 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
 	}
 
-	pool->num_free += valid_entry->len;
-	pool->num_alloc -= valid_entry->len;
+	pool->num_free += len;
+	pool->num_alloc -= len;
 
 	return 0;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.764114488 +0100
+++ 0072-net-i40e-fix-wild-pointer.patch	2020-06-05 19:20:50.957037474 +0100
@@ -1 +1 @@
-From b342fd9084cf99292f0077e16b0edb3b6b79f6e7 Mon Sep 17 00:00:00 2001
+From d820e970512a5ad89039b27bcf2a17542777d678 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b342fd9084cf99292f0077e16b0edb3b6b79f6e7 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 91dcd0ebf0..c68fba125e 100644
+index f312abed27..fb7b489296 100644
@@ -26 +27 @@
-@@ -4936,4 +4936,5 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -4807,4 +4807,5 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
@@ -32 +33 @@
-@@ -4974,10 +4975,11 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -4845,10 +4846,11 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
@@ -46 +47 @@
-@@ -4989,11 +4991,13 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -4860,11 +4862,13 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
@@ -61 +62 @@
-@@ -5011,6 +5015,6 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,
+@@ -4882,6 +4886,6 @@ i40e_res_pool_free(struct i40e_res_pool_info *pool,

[dpdk-stable] patch 'net/i40e: fix queue related exception handling' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8ef22403db44d3b93527a1988c736e5f38d8c617

Thanks.

Kevin.

---
From 8ef22403db44d3b93527a1988c736e5f38d8c617 Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang@intel.com>
Date: Mon, 18 May 2020 13:45:53 +0800
Subject: [PATCH] net/i40e: fix queue related exception handling

[ upstream commit 6cc330b709b0d0b72880d872edf7d13b95649566 ]

There should have different behavior in queue start fail and stop fail
case.  When queue start fail, all the next actions should be terminated
and then started queues should be cleared. But for queue stop stage, one
queue stop fail should not end other queues stop. This patch fixed that
issue in PF and VF.

Fixes: b6583ee40265 ("i40e: full VMDQ pools support")
Fixes: 3f6a696f1054 ("i40evf: queue start and stop")

Signed-off-by: Qiming Yang <qiming.yang@intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c    | 116 +++++++-----------------------
 drivers/net/i40e/i40e_ethdev_vf.c |   2 -
 drivers/net/i40e/i40e_rxtx.c      |  28 ++++++++
 3 files changed, 53 insertions(+), 93 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index fb7b489296..3f1787728f 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2242,4 +2242,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
 	uint32_t intr_vector = 0;
 	struct i40e_vsi *vsi;
+	uint16_t nb_rxq, nb_txq;
 
 	hw->adapter_stopped = 0;
@@ -2280,5 +2281,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
 	if (ret != I40E_SUCCESS) {
 		PMD_DRV_LOG(ERR, "Failed to init rx/tx queues");
-		goto err_up;
+		return ret;
 	}
 
@@ -2305,8 +2306,14 @@ i40e_dev_start(struct rte_eth_dev *dev)
 
 	/* Enable all queues which have been configured */
-	ret = i40e_dev_switch_queues(pf, TRUE);
-	if (ret != I40E_SUCCESS) {
-		PMD_DRV_LOG(ERR, "Failed to enable VSI");
-		goto err_up;
+	for (nb_rxq = 0; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) {
+		ret = i40e_dev_rx_queue_start(dev, nb_rxq);
+		if (ret)
+			goto rx_err;
+	}
+
+	for (nb_txq = 0; nb_txq < dev->data->nb_tx_queues; nb_txq++) {
+		ret = i40e_dev_tx_queue_start(dev, nb_txq);
+		if (ret)
+			goto tx_err;
 	}
 
@@ -2338,5 +2345,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
 		if (ret != I40E_SUCCESS) {
 			PMD_DRV_LOG(ERR, "fail to set loopback link");
-			goto err_up;
+			goto tx_err;
 		}
 	}
@@ -2346,5 +2353,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
 	if (I40E_SUCCESS != ret) {
 		PMD_DRV_LOG(ERR, "Fail to apply link setting");
-		goto err_up;
+		goto tx_err;
 	}
 
@@ -2389,7 +2396,10 @@ i40e_dev_start(struct rte_eth_dev *dev)
 	return I40E_SUCCESS;
 
-err_up:
-	i40e_dev_switch_queues(pf, FALSE);
-	i40e_dev_clear_queues(dev);
+tx_err:
+	for (i = 0; i < nb_txq; i++)
+		i40e_dev_tx_queue_stop(dev, i);
+rx_err:
+	for (i = 0; i < nb_rxq; i++)
+		i40e_dev_rx_queue_stop(dev, i);
 
 	return ret;
@@ -2415,5 +2425,9 @@ i40e_dev_stop(struct rte_eth_dev *dev)
 
 	/* Disable all queues */
-	i40e_dev_switch_queues(pf, FALSE);
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		i40e_dev_tx_queue_stop(dev, i);
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		i40e_dev_rx_queue_stop(dev, i);
 
 	/* un-map queues with interrupt registers */
@@ -6158,31 +6172,4 @@ i40e_switch_tx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)
 }
 
-/* Swith on or off the tx queues */
-static int
-i40e_dev_switch_tx_queues(struct i40e_pf *pf, bool on)
-{
-	struct rte_eth_dev_data *dev_data = pf->dev_data;
-	struct i40e_tx_queue *txq;
-	struct rte_eth_dev *dev = pf->adapter->eth_dev;
-	uint16_t i;
-	int ret;
-
-	for (i = 0; i < dev_data->nb_tx_queues; i++) {
-		txq = dev_data->tx_queues[i];
-		/* Don't operate the queue if not configured or
-		 * if starting only per queue */
-		if (!txq || !txq->q_set || (on && txq->tx_deferred_start))
-			continue;
-		if (on)
-			ret = i40e_dev_tx_queue_start(dev, i);
-		else
-			ret = i40e_dev_tx_queue_stop(dev, i);
-		if ( ret != I40E_SUCCESS)
-			return ret;
-	}
-
-	return I40E_SUCCESS;
-}
-
 int
 i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)
@@ -6236,57 +6223,4 @@ i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)
 	return I40E_SUCCESS;
 }
-/* Switch on or off the rx queues */
-static int
-i40e_dev_switch_rx_queues(struct i40e_pf *pf, bool on)
-{
-	struct rte_eth_dev_data *dev_data = pf->dev_data;
-	struct i40e_rx_queue *rxq;
-	struct rte_eth_dev *dev = pf->adapter->eth_dev;
-	uint16_t i;
-	int ret;
-
-	for (i = 0; i < dev_data->nb_rx_queues; i++) {
-		rxq = dev_data->rx_queues[i];
-		/* Don't operate the queue if not configured or
-		 * if starting only per queue */
-		if (!rxq || !rxq->q_set || (on && rxq->rx_deferred_start))
-			continue;
-		if (on)
-			ret = i40e_dev_rx_queue_start(dev, i);
-		else
-			ret = i40e_dev_rx_queue_stop(dev, i);
-		if (ret != I40E_SUCCESS)
-			return ret;
-	}
-
-	return I40E_SUCCESS;
-}
-
-/* Switch on or off all the rx/tx queues */
-int
-i40e_dev_switch_queues(struct i40e_pf *pf, bool on)
-{
-	int ret;
-
-	if (on) {
-		/* enable rx queues before enabling tx queues */
-		ret = i40e_dev_switch_rx_queues(pf, on);
-		if (ret) {
-			PMD_DRV_LOG(ERR, "Failed to switch rx queues");
-			return ret;
-		}
-		ret = i40e_dev_switch_tx_queues(pf, on);
-	} else {
-		/* Stop tx queues before stopping rx queues */
-		ret = i40e_dev_switch_tx_queues(pf, on);
-		if (ret) {
-			PMD_DRV_LOG(ERR, "Failed to switch tx queues");
-			return ret;
-		}
-		ret = i40e_dev_switch_rx_queues(pf, on);
-	}
-
-	return ret;
-}
 
 /* Initialize VSI for TX */
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 16d67b5938..e1ebaa55de 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -739,5 +739,4 @@ i40evf_stop_queues(struct rte_eth_dev *dev)
 		if (i40evf_dev_tx_queue_stop(dev, i) != 0) {
 			PMD_DRV_LOG(ERR, "Fail to stop queue %u", i);
-			return -1;
 		}
 	}
@@ -747,5 +746,4 @@ i40evf_stop_queues(struct rte_eth_dev *dev)
 		if (i40evf_dev_rx_queue_stop(dev, i) != 0) {
 			PMD_DRV_LOG(ERR, "Fail to stop queue %u", i);
-			return -1;
 		}
 	}
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index e4a314f4ab..7c620a76b0 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1587,4 +1587,13 @@ i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 
 	rxq = dev->data->rx_queues[rx_queue_id];
+	if (!rxq || !rxq->q_set) {
+		PMD_DRV_LOG(ERR, "RX queue %u not available or setup",
+			    rx_queue_id);
+		return -EINVAL;
+	}
+
+	if (rxq->rx_deferred_start)
+		PMD_DRV_LOG(WARNING, "RX queue %u is deferrd start",
+			    rx_queue_id);
 
 	err = i40e_alloc_rx_queue_mbufs(rxq);
@@ -1621,4 +1630,9 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 
 	rxq = dev->data->rx_queues[rx_queue_id];
+	if (!rxq || !rxq->q_set) {
+		PMD_DRV_LOG(ERR, "RX queue %u not available or setup",
+				rx_queue_id);
+		return -EINVAL;
+	}
 
 	/*
@@ -1649,4 +1663,13 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 
 	txq = dev->data->tx_queues[tx_queue_id];
+	if (!txq || !txq->q_set) {
+		PMD_DRV_LOG(ERR, "TX queue %u is not available or setup",
+			    tx_queue_id);
+		return -EINVAL;
+	}
+
+	if (txq->tx_deferred_start)
+		PMD_DRV_LOG(WARNING, "TX queue %u is deferrd start",
+			    tx_queue_id);
 
 	/*
@@ -1673,4 +1696,9 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
 
 	txq = dev->data->tx_queues[tx_queue_id];
+	if (!txq || !txq->q_set) {
+		PMD_DRV_LOG(ERR, "TX queue %u is not available or setup",
+			tx_queue_id);
+		return -EINVAL;
+	}
 
 	/*
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.827827596 +0100
+++ 0073-net-i40e-fix-queue-related-exception-handling.patch	2020-06-05 19:20:50.975037064 +0100
@@ -1 +1 @@
-From 6cc330b709b0d0b72880d872edf7d13b95649566 Mon Sep 17 00:00:00 2001
+From 8ef22403db44d3b93527a1988c736e5f38d8c617 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6cc330b709b0d0b72880d872edf7d13b95649566 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index c68fba125e..970a31cb2e 100644
+index fb7b489296..3f1787728f 100644
@@ -28 +29 @@
-@@ -2281,4 +2281,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2242,4 +2242,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -34 +35 @@
-@@ -2312,5 +2313,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2280,5 +2281,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -41 +42 @@
-@@ -2337,8 +2338,14 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2305,8 +2306,14 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -60 +61 @@
-@@ -2370,5 +2377,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2338,5 +2345,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -67 +68 @@
-@@ -2378,5 +2385,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2346,5 +2353,5 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -74 +75 @@
-@@ -2421,7 +2428,10 @@ i40e_dev_start(struct rte_eth_dev *dev)
+@@ -2389,7 +2396,10 @@ i40e_dev_start(struct rte_eth_dev *dev)
@@ -88 +89 @@
-@@ -2447,5 +2457,9 @@ i40e_dev_stop(struct rte_eth_dev *dev)
+@@ -2415,5 +2425,9 @@ i40e_dev_stop(struct rte_eth_dev *dev)
@@ -99 +100 @@
-@@ -6287,31 +6301,4 @@ i40e_switch_tx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)
+@@ -6158,31 +6172,4 @@ i40e_switch_tx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)
@@ -131 +132 @@
-@@ -6365,57 +6352,4 @@ i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)
+@@ -6236,57 +6223,4 @@ i40e_switch_rx_queue(struct i40e_hw *hw, uint16_t q_idx, bool on)
@@ -190 +191 @@
-index bb5d28a448..eca716a6a8 100644
+index 16d67b5938..e1ebaa55de 100644
@@ -193 +194 @@
-@@ -790,5 +790,4 @@ i40evf_stop_queues(struct rte_eth_dev *dev)
+@@ -739,5 +739,4 @@ i40evf_stop_queues(struct rte_eth_dev *dev)
@@ -199 +200 @@
-@@ -798,5 +797,4 @@ i40evf_stop_queues(struct rte_eth_dev *dev)
+@@ -747,5 +746,4 @@ i40evf_stop_queues(struct rte_eth_dev *dev)
@@ -206 +207 @@
-index 5e7c86ed82..840b6f387f 100644
+index e4a314f4ab..7c620a76b0 100644
@@ -209 +210 @@
-@@ -1572,4 +1572,13 @@ i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+@@ -1587,4 +1587,13 @@ i40e_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
@@ -223 +224 @@
-@@ -1604,4 +1613,9 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+@@ -1621,4 +1630,9 @@ i40e_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
@@ -233 +234 @@
-@@ -1632,4 +1646,13 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
+@@ -1649,4 +1663,13 @@ i40e_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
@@ -247 +248 @@
-@@ -1656,4 +1679,9 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
+@@ -1673,4 +1696,9 @@ i40e_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)

[dpdk-stable] patch 'vhost: fix zero-copy server mode' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/304c6b09f4ec37f9552d5a1083483251893a5c45

Thanks.

Kevin.

---
From 304c6b09f4ec37f9552d5a1083483251893a5c45 Mon Sep 17 00:00:00 2001
From: Xuan Ding <xuan.ding@intel.com>
Date: Tue, 19 May 2020 10:15:46 +0000
Subject: [PATCH] vhost: fix zero-copy server mode

[ upstream commit 22fa1bcbcbc7489304a711c39aea9a1593a873a5 ]

This patch fixes the situation where vhost-user cannot start as server
with dequeue_zero_copy enabled.

Using flag instead of vsocket->is_server to determine whether vhost-user
is in client mode. Because vsocket->is_server is not ready at this time.

Fixes: 715070ea10e6 ("vhost: prevent zero-copy with incompatible client mode")

Signed-off-by: Xuan Ding <xuan.ding@intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
Tested-by: Yinan Wang <yinan.wang@intel.com>
---
 lib/librte_vhost/socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c
index fb946e8c54..4819d31737 100644
--- a/lib/librte_vhost/socket.c
+++ b/lib/librte_vhost/socket.c
@@ -891,5 +891,5 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
 	 */
 	if (vsocket->dequeue_zero_copy) {
-		if (!vsocket->is_server) {
+		if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
 			RTE_LOG(ERR, VHOST_CONFIG,
 			"error: zero copy is incompatible with vhost client mode\n");
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.894176540 +0100
+++ 0074-vhost-fix-zero-copy-server-mode.patch	2020-06-05 19:20:50.977037019 +0100
@@ -1 +1 @@
-From 22fa1bcbcbc7489304a711c39aea9a1593a873a5 Mon Sep 17 00:00:00 2001
+From 304c6b09f4ec37f9552d5a1083483251893a5c45 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 22fa1bcbcbc7489304a711c39aea9a1593a873a5 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index bb8d0d7801..0a66ef9767 100644
+index fb946e8c54..4819d31737 100644
@@ -26,3 +27,3 @@
-@@ -927,5 +927,5 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
- 			goto out_mutex;
- 		}
+@@ -891,5 +891,5 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
+ 	 */
+ 	if (vsocket->dequeue_zero_copy) {
@@ -31 +32 @@
- 			VHOST_LOG_CONFIG(ERR,
+ 			RTE_LOG(ERR, VHOST_CONFIG,

[dpdk-stable] patch 'net/mvpp2: fix build with gcc 10' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/25d6dfdc154ffa3f544c2d109263c8c672f65ca3

Thanks.

Kevin.

---
From 25d6dfdc154ffa3f544c2d109263c8c672f65ca3 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Wed, 20 May 2020 11:56:02 +0200
Subject: [PATCH] net/mvpp2: fix build with gcc 10

[ upstream commit 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 ]

GCC 10 is detecting the enum mismatch when assigning UDP variables
with MUSDK constants for TCP.

drivers/net/mvpp2/mrvl_flow.c:2521:47: error: implicit conversion
from 'enum mv_net_tcp_fields' to 'enum mv_net_udp_fields'
[-Werror=enum-conversion]

An assigned field is also fixed from "tcp" to "udp".

Fixes: 7235341d7517 ("net/mrvl: support classifier")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Liron Himi <lironh@marvell.com>
Acked-by: David Marchand <david.marchand@redhat.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
---
 drivers/net/mvpp2/mrvl_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c
index ffd1dab9b5..8b1ec7e2bc 100644
--- a/drivers/net/mvpp2/mrvl_flow.c
+++ b/drivers/net/mvpp2/mrvl_flow.c
@@ -2512,5 +2512,5 @@ mrvl_create_cls_table(struct rte_eth_dev *dev, struct rte_flow *first_flow)
 	if (first_flow->pattern & F_UDP_SPORT) {
 		key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP;
-		key->proto_field[key->num_fields].field.tcp = MV_NET_TCP_F_SP;
+		key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_SP;
 		key->key_size += 2;
 		key->num_fields += 1;
@@ -2519,5 +2519,5 @@ mrvl_create_cls_table(struct rte_eth_dev *dev, struct rte_flow *first_flow)
 	if (first_flow->pattern & F_UDP_DPORT) {
 		key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP;
-		key->proto_field[key->num_fields].field.udp = MV_NET_TCP_F_DP;
+		key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_DP;
 		key->key_size += 2;
 		key->num_fields += 1;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.943436404 +0100
+++ 0075-net-mvpp2-fix-build-with-gcc-10.patch	2020-06-05 19:20:50.979036974 +0100
@@ -1 +1 @@
-From 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 Mon Sep 17 00:00:00 2001
+From 25d6dfdc154ffa3f544c2d109263c8c672f65ca3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7f55a2053b908ff08a8a2d1cc8d4d927923d52f7 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 381b54e291..ea43255284 100644
+index ffd1dab9b5..8b1ec7e2bc 100644

[dpdk-stable] patch 'examples/vm_power: drop Unix path limit redefinition' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7578d9d656905098a08a9ba47faca674f9504cf0

Thanks.

Kevin.

---
From 7578d9d656905098a08a9ba47faca674f9504cf0 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Wed, 20 May 2020 10:10:50 +0200
Subject: [PATCH] examples/vm_power: drop Unix path limit redefinition

[ upstream commit 666272d20da3deb1fb41051b9f91a46a8363f2b0 ]

The Unix socket path may be as long as UNIX_PATH_MAX.
This constant is supposed to be defined in sys/un.h.
On Linux, it appears to be in linux/un.h.

This constant was re-defined locally, based on a variable declaration.
It is breaking compilation with -fno-common (default in GCC 10)
We could avoid the variable declaration by using NULL struct,
but it looks simpler not redefining this system constant.

As the power library and its examples are restricted to Linux only,
the Linux header file is directly included.

Fixes: 0d74597c1b4f ("examples/vm_power: fix max length of unix socket path")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: David Marchand <david.marchand@redhat.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
---
 examples/vm_power_manager/channel_manager.c | 1 -
 examples/vm_power_manager/channel_manager.h | 6 +-----
 examples/vm_power_manager/power_manager.c   | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
index 4fac099dfd..8aabd69c40 100644
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -5,5 +5,4 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/un.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/examples/vm_power_manager/channel_manager.h b/examples/vm_power_manager/channel_manager.h
index d948b304c4..22905266f8 100644
--- a/examples/vm_power_manager/channel_manager.h
+++ b/examples/vm_power_manager/channel_manager.h
@@ -11,5 +11,5 @@ extern "C" {
 
 #include <linux/limits.h>
-#include <sys/un.h>
+#include <linux/un.h>
 #include <rte_atomic.h>
 
@@ -33,8 +33,4 @@ extern "C" {
 #define CHANNEL_MGR_SOCKET_PATH     "/tmp/powermonitor/"
 
-#ifndef UNIX_PATH_MAX
-struct sockaddr_un _sockaddr_un;
-#define UNIX_PATH_MAX sizeof(_sockaddr_un.sun_path)
-#endif
 
 #define MAX_CLIENTS 64
diff --git a/examples/vm_power_manager/power_manager.c b/examples/vm_power_manager/power_manager.c
index a7e98cf40b..ecdf9a5583 100644
--- a/examples/vm_power_manager/power_manager.c
+++ b/examples/vm_power_manager/power_manager.c
@@ -7,5 +7,4 @@
 #include <stdint.h>
 #include <inttypes.h>
-#include <sys/un.h>
 #include <fcntl.h>
 #include <unistd.h>
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:54.992471597 +0100
+++ 0076-examples-vm_power-drop-Unix-path-limit-redefinition.patch	2020-06-05 19:20:50.980036951 +0100
@@ -1 +1 @@
-From 666272d20da3deb1fb41051b9f91a46a8363f2b0 Mon Sep 17 00:00:00 2001
+From 7578d9d656905098a08a9ba47faca674f9504cf0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 666272d20da3deb1fb41051b9f91a46a8363f2b0 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
- examples/vm_power_manager/channel_manager.h | 7 +------
+ examples/vm_power_manager/channel_manager.h | 6 +-----
@@ -28 +29 @@
- 3 files changed, 1 insertion(+), 8 deletions(-)
+ 3 files changed, 1 insertion(+), 7 deletions(-)
@@ -31 +32 @@
-index 4d13697208..74a2a677e8 100644
+index 4fac099dfd..8aabd69c40 100644
@@ -41 +42 @@
-index a2a2f2bba0..e55376fcdb 100644
+index d948b304c4..22905266f8 100644
@@ -50,3 +51,3 @@
- #include <stdbool.h>
-@@ -27,9 +27,4 @@ extern "C" {
- #define CHANNEL_MGR_FIFO_PATTERN_NAME   "fifo"
+ 
+@@ -33,8 +33,4 @@ extern "C" {
+ #define CHANNEL_MGR_SOCKET_PATH     "/tmp/powermonitor/"
@@ -58 +59 @@
--
+ 
@@ -60 +60,0 @@
- #define MAX_VCPUS 20
@@ -62 +62 @@
-index 7b4f4b3c4d..cd51d4741f 100644
+index a7e98cf40b..ecdf9a5583 100644

[dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/1f5251a7f175f9e6d166615101c046beb183dba9

Thanks.

Kevin.

---
From 1f5251a7f175f9e6d166615101c046beb183dba9 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Wed, 20 May 2020 15:33:43 +0200
Subject: [PATCH] doc: fix build with doxygen 1.8.18

[ upstream commit 76fb8fc486f94e268c1329425b3a0d5900cd3214 ]

Having an explicit "index" anchor looks forbidden:

doc/api/doxy-api-index.md:1: warning:
multiple use of section label 'index' for main page

Anyway this anchor was not used, it can be removed.

Fixes: 9bf486e606b0 ("doc: generate HTML for API with doxygen")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Tested-by: Jerin Jacob <jerinj@marvell.com>
---
 doc/api/doxy-api-index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index e27874c5ae..a380f44fbd 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -1,3 +1,3 @@
-API {#index}
+API
 ===
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.040518208 +0100
+++ 0077-doc-fix-build-with-doxygen-1.8.18.patch	2020-06-05 19:20:50.981036928 +0100
@@ -1 +1 @@
-From 76fb8fc486f94e268c1329425b3a0d5900cd3214 Mon Sep 17 00:00:00 2001
+From 1f5251a7f175f9e6d166615101c046beb183dba9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 76fb8fc486f94e268c1329425b3a0d5900cd3214 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 93f0d933b1..f597663237 100644
+index e27874c5ae..a380f44fbd 100644

Re: [dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' has been queued to LTS release 18.11.9

[Thomas Monjalon]

05/06/2020 20:25, Kevin Traynor:
> FYI, your patch has been queued to LTS release 18.11.9
> 
> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> It will be pushed if I get no objections before 06/10/20. So please
> shout if anyone has objections.

It is breaking the doxygen index.
Please add this fix: http://git.dpdk.org/dpdk/commit/?id=60814f955cfdebeb

Thanks

Re: [dpdk-stable] patch 'doc: fix build with doxygen 1.8.18' has been queued to LTS release 18.11.9

[Kevin Traynor]

On 05/06/2020 23:46, Thomas Monjalon wrote:
> 05/06/2020 20:25, Kevin Traynor:
>> FYI, your patch has been queued to LTS release 18.11.9
>>
>> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
>> It will be pushed if I get no objections before 06/10/20. So please
>> shout if anyone has objections.
> 
> It is breaking the doxygen index.
> Please add this fix: http://git.dpdk.org/dpdk/commit/?id=60814f955cfdebeb
> 
> Thanks
> 
> 

Thanks, applied the fix as well.

[dpdk-stable] patch 'cryptodev: fix SHA-1 digest enum comment' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b4b8b0a13242bd1f1905f80777af0c010e30ef1c

Thanks.

Kevin.

---
From b4b8b0a13242bd1f1905f80777af0c010e30ef1c Mon Sep 17 00:00:00 2001
From: Adam Dybkowski <adamx.dybkowski@intel.com>
Date: Thu, 21 May 2020 16:48:53 +0200
Subject: [PATCH] cryptodev: fix SHA-1 digest enum comment

[ upstream commit e475fd853ac1cae9cf837a10e8c386503175752e ]

This patch fixes improper SHA-1 digest size in the enum comment
and also adds the note about HMAC-SHA-1-96.

Fixes: 1bd407fac80b ("cryptodev: extract symmetric operations")

Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 lib/librte_cryptodev/rte_crypto_sym.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/librte_cryptodev/rte_crypto_sym.h b/lib/librte_cryptodev/rte_crypto_sym.h
index eb5afc5ef0..70038db776 100644
--- a/lib/librte_cryptodev/rte_crypto_sym.h
+++ b/lib/librte_cryptodev/rte_crypto_sym.h
@@ -220,7 +220,10 @@ enum rte_crypto_auth_algorithm {
 
 	RTE_CRYPTO_AUTH_SHA1,
-	/**< 128 bit SHA algorithm. */
+	/**< 160 bit SHA algorithm. */
 	RTE_CRYPTO_AUTH_SHA1_HMAC,
-	/**< HMAC using 128 bit SHA algorithm. */
+	/**< HMAC using 160 bit SHA algorithm.
+	 * HMAC-SHA-1-96 can be generated by setting
+	 * digest_length to 12 bytes in auth/aead xforms.
+	 */
 	RTE_CRYPTO_AUTH_SHA224,
 	/**< 224 bit SHA algorithm. */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.088187019 +0100
+++ 0078-cryptodev-fix-SHA-1-digest-enum-comment.patch	2020-06-05 19:20:50.982036906 +0100
@@ -1 +1 @@
-From e475fd853ac1cae9cf837a10e8c386503175752e Mon Sep 17 00:00:00 2001
+From b4b8b0a13242bd1f1905f80777af0c010e30ef1c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e475fd853ac1cae9cf837a10e8c386503175752e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index d9585ecd69..da961a19d2 100644
+index eb5afc5ef0..70038db776 100644
@@ -24 +25 @@
-@@ -270,7 +270,10 @@ enum rte_crypto_auth_algorithm {
+@@ -220,7 +220,10 @@ enum rte_crypto_auth_algorithm {

[dpdk-stable] patch 'net/sfc/base: fix manual filter delete in EF10' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/55db8eaf27cf3b450c5647f0f8ce349c0f15ed40

Thanks.

Kevin.

---
From 55db8eaf27cf3b450c5647f0f8ce349c0f15ed40 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Wed, 20 May 2020 14:59:52 +0100
Subject: [PATCH] net/sfc/base: fix manual filter delete in EF10

[ upstream commit 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 ]

When user requests a filter deletion only filter with
manual priority must be deleted. When an automatic filter has
the same specification, it must be skipped.

Fixes: 585c22edb29c ("net/sfc/base: handle manual and auto filter clashes in EF10")

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/base/ef10_filter.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/sfc/base/ef10_filter.c b/drivers/net/sfc/base/ef10_filter.c
index 38843207f6..cf3446805a 100644
--- a/drivers/net/sfc/base/ef10_filter.c
+++ b/drivers/net/sfc/base/ef10_filter.c
@@ -1173,5 +1173,6 @@ ef10_filter_delete(
 		saved_spec = ef10_filter_entry_spec(table, i);
 		if (saved_spec && ef10_filter_equal(spec, saved_spec) &&
-		    ef10_filter_same_dest(spec, saved_spec)) {
+		    ef10_filter_same_dest(spec, saved_spec) &&
+		    saved_spec->efs_priority == EFX_FILTER_PRI_MANUAL) {
 			break;
 		}
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.139357340 +0100
+++ 0079-net-sfc-base-fix-manual-filter-delete-in-EF10.patch	2020-06-05 19:20:50.984036860 +0100
@@ -1 +1 @@
-From 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 Mon Sep 17 00:00:00 2001
+From 55db8eaf27cf3b450c5647f0f8ce349c0f15ed40 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 977424c2cc21a9b6542497546fbbfa2ad7f02ea3 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 7a726ef977..12c84a5640 100644
+index 38843207f6..cf3446805a 100644
@@ -23 +24 @@
-@@ -1162,5 +1162,6 @@ ef10_filter_delete(
+@@ -1173,5 +1173,6 @@ ef10_filter_delete(

[dpdk-stable] patch 'net/i40e: fix setting L2TAG' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/0d6f9fe5333ab4da58bd38e1500dfccbc3febf6d

Thanks.

Kevin.

---
From 0d6f9fe5333ab4da58bd38e1500dfccbc3febf6d Mon Sep 17 00:00:00 2001
From: Jeff Guo <jia.guo@intel.com>
Date: Wed, 20 May 2020 17:25:21 -0400
Subject: [PATCH] net/i40e: fix setting L2TAG

[ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ]

Base on HW, if a packet is split into multiple segments, the L2TAG
should only be valid on the last Rx descriptor. So fix it by setting
L2TAG into mbuf when processing the last split packet.

Fixes: ca74903b75cf ("net/i40e: extract non-x86 specific code from vector driver")

Signed-off-by: Jeff Guo <jia.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_rxtx_vec_common.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h
index 0e6ffa0078..31f73f6054 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_common.h
+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h
@@ -34,4 +34,5 @@ reassemble_packets(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_bufs,
 				/* it's the last packet of the set */
 				start->hash = end->hash;
+				start->vlan_tci = end->vlan_tci;
 				start->ol_flags = end->ol_flags;
 				/* we need to strip crc for the whole packet */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.189394240 +0100
+++ 0080-net-i40e-fix-setting-L2TAG.patch	2020-06-05 19:20:50.985036837 +0100
@@ -1 +1 @@
-From 61b26a9c5ae569ce5900414a41a42c41d069155c Mon Sep 17 00:00:00 2001
+From 0d6f9fe5333ab4da58bd38e1500dfccbc3febf6d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 61b26a9c5ae569ce5900414a41a42c41d069155c ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/iavf: fix setting L2TAG' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/87d69a212fdedaef7e4b06a7ed96ad84ff1db871

Thanks.

Kevin.

---
From 87d69a212fdedaef7e4b06a7ed96ad84ff1db871 Mon Sep 17 00:00:00 2001
From: Jeff Guo <jia.guo@intel.com>
Date: Wed, 20 May 2020 17:44:14 -0400
Subject: [PATCH] net/iavf: fix setting L2TAG

[ upstream commit 2482a99f303873175c5781d3c685eaa9e17cfaf7 ]

Base on HW, if a packet is split into multiple segments, the L2TAG
should only be valid on the last Rx descriptor. So fix it by setting
L2TAG into mbuf when processing the last split packet.

Fixes: 319c421f3890 ("net/avf: enable SSE Rx Tx")

Signed-off-by: Jeff Guo <jia.guo@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/avf/avf_rxtx_vec_common.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/avf/avf_rxtx_vec_common.h b/drivers/net/avf/avf_rxtx_vec_common.h
index 8057b9682d..b97ea5f2b7 100644
--- a/drivers/net/avf/avf_rxtx_vec_common.h
+++ b/drivers/net/avf/avf_rxtx_vec_common.h
@@ -34,4 +34,5 @@ reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs,
 				/* it's the last packet of the set */
 				start->hash = end->hash;
+				start->vlan_tci = end->vlan_tci;
 				start->ol_flags = end->ol_flags;
 				/* we need to strip crc for the whole packet */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.237375288 +0100
+++ 0081-net-iavf-fix-setting-L2TAG.patch	2020-06-05 19:20:50.985036837 +0100
@@ -1 +1 @@
-From 2482a99f303873175c5781d3c685eaa9e17cfaf7 Mon Sep 17 00:00:00 2001
+From 87d69a212fdedaef7e4b06a7ed96ad84ff1db871 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2482a99f303873175c5781d3c685eaa9e17cfaf7 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- drivers/net/iavf/iavf_rxtx_vec_common.h | 1 +
+ drivers/net/avf/avf_rxtx_vec_common.h | 1 +
@@ -19,5 +20,5 @@
-diff --git a/drivers/net/iavf/iavf_rxtx_vec_common.h b/drivers/net/iavf/iavf_rxtx_vec_common.h
-index a6ba227584..25bb502de2 100644
---- a/drivers/net/iavf/iavf_rxtx_vec_common.h
-+++ b/drivers/net/iavf/iavf_rxtx_vec_common.h
-@@ -34,4 +34,5 @@ reassemble_packets(struct iavf_rx_queue *rxq, struct rte_mbuf **rx_bufs,
+diff --git a/drivers/net/avf/avf_rxtx_vec_common.h b/drivers/net/avf/avf_rxtx_vec_common.h
+index 8057b9682d..b97ea5f2b7 100644
+--- a/drivers/net/avf/avf_rxtx_vec_common.h
++++ b/drivers/net/avf/avf_rxtx_vec_common.h
+@@ -34,4 +34,5 @@ reassemble_packets(struct avf_rx_queue *rxq, struct rte_mbuf **rx_bufs,

[dpdk-stable] patch 'net/ixgbe: check driver type in MACsec API' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/224d1b6c3f9e15077a99b67bee8ad5cab787904a

Thanks.

Kevin.

---
From 224d1b6c3f9e15077a99b67bee8ad5cab787904a Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Fri, 22 May 2020 05:59:55 +0000
Subject: [PATCH] net/ixgbe: check driver type in MACsec API

[ upstream commit dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 ]

The driver type need to be checked in private API.

Fixes: 50556c88104c ("net/ixgbe: fix MACsec setting")

Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/ixgbe/rte_pmd_ixgbe.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.c b/drivers/net/ixgbe/rte_pmd_ixgbe.c
index b946808bc2..62376bdad7 100644
--- a/drivers/net/ixgbe/rte_pmd_ixgbe.c
+++ b/drivers/net/ixgbe/rte_pmd_ixgbe.c
@@ -522,4 +522,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp)
 	dev = &rte_eth_devices[port];
 
+	if (!is_ixgbe_supported(dev))
+		return -ENOTSUP;
+
 	macsec_setting.offload_en = 1;
 	macsec_setting.encrypt_en = en;
@@ -542,4 +545,7 @@ rte_pmd_ixgbe_macsec_disable(uint16_t port)
 	dev = &rte_eth_devices[port];
 
+	if (!is_ixgbe_supported(dev))
+		return -ENOTSUP;
+
 	ixgbe_dev_macsec_setting_reset(dev);
 
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.284400467 +0100
+++ 0082-net-ixgbe-check-driver-type-in-MACsec-API.patch	2020-06-05 19:20:50.986036815 +0100
@@ -1 +1 @@
-From dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 Mon Sep 17 00:00:00 2001
+From 224d1b6c3f9e15077a99b67bee8ad5cab787904a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dd8384a4f5dd7e04cd3bc7ded0f0a6d9c79d25b4 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 8bcaded6e5..9bff557f97 100644
+index b946808bc2..62376bdad7 100644
@@ -22 +23 @@
-@@ -523,4 +523,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp)
+@@ -522,4 +522,7 @@ rte_pmd_ixgbe_macsec_enable(uint16_t port, uint8_t en, uint8_t rp)
@@ -30 +31 @@
-@@ -543,4 +546,7 @@ rte_pmd_ixgbe_macsec_disable(uint16_t port)
+@@ -542,4 +545,7 @@ rte_pmd_ixgbe_macsec_disable(uint16_t port)

[dpdk-stable] patch 'examples/kni: fix crash during MTU set' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/949e3fde221cfaca5e534921971a7324523f88c0

Thanks.

Kevin.

---
From 949e3fde221cfaca5e534921971a7324523f88c0 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Thu, 21 May 2020 16:10:42 +0100
Subject: [PATCH] examples/kni: fix crash during MTU set

[ upstream commit 36f9eba4710b521b95d72f0e65e85f38c1cff9b5 ]

During MTU set (kni_change_mtu) sample application setup queues, which
can free and re-allocate queues.
Meanwhile sample application keeps continues in Rx/Tx burst calls in
different threads, which may cause crash during queue setup.

Pausing application Rx/Tx calls before MTU set and starts it back
afterwards.

Bugzilla ID: 482
Fixes: a26b116749a3 ("examples/kni: fix MTU change to setup Tx queue")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Rasesh Mody <rmody@marvell.com>
Tested-by: Xi Zhang <xix.zhang@intel.com>
---
 examples/kni/main.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/examples/kni/main.c b/examples/kni/main.c
index 4fbb860109..54bd69491b 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -739,7 +739,6 @@ monitor_all_ports_link_status(void *arg)
 }
 
-/* Callback for request of changing MTU */
 static int
-kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+kni_change_mtu_(uint16_t port_id, unsigned int new_mtu)
 {
 	int ret;
@@ -814,4 +813,17 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
 }
 
+/* Callback for request of changing MTU */
+static int
+kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+{
+	int ret;
+
+	rte_atomic32_inc(&kni_pause);
+	ret =  kni_change_mtu_(port_id, new_mtu);
+	rte_atomic32_dec(&kni_pause);
+
+	return ret;
+}
+
 /* Callback for request of configuring network interface up/down */
 static int
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.333053196 +0100
+++ 0083-examples-kni-fix-crash-during-MTU-set.patch	2020-06-05 19:20:50.987036792 +0100
@@ -1 +1 @@
-From 36f9eba4710b521b95d72f0e65e85f38c1cff9b5 Mon Sep 17 00:00:00 2001
+From 949e3fde221cfaca5e534921971a7324523f88c0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 36f9eba4710b521b95d72f0e65e85f38c1cff9b5 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 7a927a50c0..80dd0353e7 100644
+index 4fbb860109..54bd69491b 100644
@@ -29 +30 @@
-@@ -769,7 +769,6 @@ monitor_all_ports_link_status(void *arg)
+@@ -739,7 +739,6 @@ monitor_all_ports_link_status(void *arg)
@@ -38 +39 @@
-@@ -852,4 +851,17 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)
+@@ -814,4 +813,17 @@ kni_change_mtu(uint16_t port_id, unsigned int new_mtu)

[dpdk-stable] patch 'examples/ip_pipeline: remove check of null response' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/fc250052402d70045eaf9e26b8be58de01be36c0

Thanks.

Kevin.

---
From fc250052402d70045eaf9e26b8be58de01be36c0 Mon Sep 17 00:00:00 2001
From: Jasvinder Singh <jasvinder.singh@intel.com>
Date: Mon, 27 Apr 2020 17:56:49 +0100
Subject: [PATCH] examples/ip_pipeline: remove check of null response

[ upstream commit 358eb13389070b34809f478678351ab99f813e5b ]

For sending request messages to data plane threads, the
caller invokes *_msg_send_recv() functions which never
return null response. Thus, removed redundant check on
the returned response.

Coverity issue: 357750, 357740, 357749, 357758, 357702, 357736
Coverity issue: 357679, 357791, 357738, 357778, 357716, 357705
Coverity issue: 357776, 357753, 357729, 357735, 357773, 357723
Fixes: 32e5d9b154cb ("examples/ip_pipeline: add enable and disable commands")
Fixes: 50e73d051806 ("examples/ip_pipeline: add stats read commands")
Fixes: 6b1b3c3c9d30 ("examples/ip_pipeline: add port enable and disable commands")
Fixes: a3a95b7d58b9 ("examples/ip_pipeline: add table entry commands")
Fixes: 3186282f8e12 ("examples/ip_pipeline: add table bulk add command")
Fixes: f634e4c5698a ("examples/ip_pipeline: add table entry delete command")
Fixes: c64b9121a963 ("examples/ip_pipeline: add table entry stats command")
Fixes: 7e11393e40ef ("examples/ip_pipeline: add meter profile commands")
Fixes: e92058d604e6 ("examples/ip_pipeline: add meter stats command")
Fixes: 2b82ef4861c0 ("examples/ip_pipeline: add DSCP table update command")
Fixes: d0d306c7f2a1 ("examples/ip_pipeline: add TTL stats command")
Fixes: a3169ee5ec59 ("examples/ip_pipeline: support rule time read")

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 examples/ip_pipeline/thread.c | 44 -----------------------------------
 1 file changed, 44 deletions(-)

diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c
index 272fbbeed1..adb83167cd 100644
--- a/examples/ip_pipeline/thread.c
+++ b/examples/ip_pipeline/thread.c
@@ -326,6 +326,4 @@ thread_pipeline_enable(uint32_t thread_id,
 	/* Send request and wait for response */
 	rsp = thread_msg_send_recv(thread_id, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -413,6 +411,4 @@ thread_pipeline_disable(uint32_t thread_id,
 	/* Send request and wait for response */
 	rsp = thread_msg_send_recv(thread_id, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -816,6 +812,4 @@ pipeline_port_in_stats_read(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -864,6 +858,4 @@ pipeline_port_in_enable(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -910,6 +902,4 @@ pipeline_port_in_disable(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -964,6 +954,4 @@ pipeline_port_out_stats_read(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1020,6 +1008,4 @@ pipeline_table_stats_read(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1437,8 +1423,4 @@ pipeline_table_rule_add(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL) {
-		free(rule);
-		return -1;
-	}
 
 	/* Read response */
@@ -1539,8 +1521,4 @@ pipeline_table_rule_add_default(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL) {
-		free(rule);
-		return -1;
-	}
 
 	/* Read response */
@@ -1656,8 +1634,4 @@ pipeline_table_rule_add_bulk(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL) {
-		table_rule_list_free(list);
-		return -ENOMEM;
-	}
 
 	/* Read response */
@@ -1734,6 +1708,4 @@ pipeline_table_rule_delete(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1791,6 +1763,4 @@ pipeline_table_rule_delete_default(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1858,6 +1828,4 @@ pipeline_table_rule_stats_read(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1916,6 +1884,4 @@ pipeline_table_mtr_profile_add(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -1968,6 +1934,4 @@ pipeline_table_mtr_profile_delete(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -2038,6 +2002,4 @@ pipeline_table_rule_mtr_read(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -2097,6 +2059,4 @@ pipeline_table_dscp_table_update(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -2165,6 +2125,4 @@ pipeline_table_rule_ttl_read(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
@@ -2230,6 +2188,4 @@ pipeline_table_rule_time_read(const char *pipeline_name,
 	/* Send request and wait for response */
 	rsp = pipeline_msg_send_recv(p, req);
-	if (rsp == NULL)
-		return -1;
 
 	/* Read response */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.382139891 +0100
+++ 0084-examples-ip_pipeline-remove-check-of-null-response.patch	2020-06-05 19:20:50.989036747 +0100
@@ -1 +1 @@
-From 358eb13389070b34809f478678351ab99f813e5b Mon Sep 17 00:00:00 2001
+From fc250052402d70045eaf9e26b8be58de01be36c0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 358eb13389070b34809f478678351ab99f813e5b ]
+
@@ -26 +27,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'doc: add NASM installation steps' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/cf245ae47f92930b60e9388ac5cb2a3c852fa685

Thanks.

Kevin.

---
From cf245ae47f92930b60e9388ac5cb2a3c852fa685 Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Date: Thu, 21 May 2020 10:15:12 +0100
Subject: [PATCH] doc: add NASM installation steps

[ upstream commit dede694cd58f6ee9c53f1e7d8d5960835bdc8fff ]

The intel-ipsec-mb library requires NASM as a dependency.
Steps on how to get and install NASM are added on the documentation
of the crypto PMDs which requires the library.

Bugzilla ID: 417

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
---
 doc/guides/cryptodevs/aesni_gcm.rst | 14 ++++++++++++++
 doc/guides/cryptodevs/aesni_mb.rst  | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/doc/guides/cryptodevs/aesni_gcm.rst b/doc/guides/cryptodevs/aesni_gcm.rst
index fb74179b84..77f45b8a26 100644
--- a/doc/guides/cryptodevs/aesni_gcm.rst
+++ b/doc/guides/cryptodevs/aesni_gcm.rst
@@ -46,4 +46,18 @@ can be downloaded in `<https://github.com/01org/intel-ipsec-mb/archive/v0.50.zip
     make install
 
+The library requires NASM to be built. Depending on the library version, it might
+require a minimum NASM version (e.g. v0.54 requires at least NASM 2.14).
+
+NASM is packaged for different OS. However, on some OS the version is too old,
+so a manual installation is required. In that case, NASM can be downloaded from
+`NASM website <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_.
+Once it is downloaded, extract it and follow these steps:
+
+.. code-block:: console
+
+    ./configure
+    make
+    make install
+
 As a reference, the following table shows a mapping between the past DPDK versions
 and the external crypto libraries supported by them:
diff --git a/doc/guides/cryptodevs/aesni_mb.rst b/doc/guides/cryptodevs/aesni_mb.rst
index 2c8ccc3d45..012726b3c7 100644
--- a/doc/guides/cryptodevs/aesni_mb.rst
+++ b/doc/guides/cryptodevs/aesni_mb.rst
@@ -70,4 +70,18 @@ can be downloaded from `<https://github.com/01org/intel-ipsec-mb/archive/v0.51.z
     make install
 
+The library requires NASM to be built. Depending on the library version, it might
+require a minimum NASM version (e.g. v0.54 requires at least NASM 2.14).
+
+NASM is packaged for different OS. However, on some OS the version is too old,
+so a manual installation is required. In that case, NASM can be downloaded from
+`NASM website <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_.
+Once it is downloaded, extract it and follow these steps:
+
+.. code-block:: console
+
+    ./configure
+    make
+    make install
+
 As a reference, the following table shows a mapping between the past DPDK versions
 and the Multi-Buffer library version supported by them:
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.434172007 +0100
+++ 0085-doc-add-NASM-installation-steps.patch	2020-06-05 19:20:50.990036724 +0100
@@ -1 +1 @@
-From dede694cd58f6ee9c53f1e7d8d5960835bdc8fff Mon Sep 17 00:00:00 2001
+From cf245ae47f92930b60e9388ac5cb2a3c852fa685 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dede694cd58f6ee9c53f1e7d8d5960835bdc8fff ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -18,4 +19 @@
- doc/guides/cryptodevs/kasumi.rst    | 14 ++++++++++++++
- doc/guides/cryptodevs/snow3g.rst    | 14 ++++++++++++++
- doc/guides/cryptodevs/zuc.rst       | 14 ++++++++++++++
- 5 files changed, 70 insertions(+)
+ 2 files changed, 28 insertions(+)
@@ -24 +22 @@
-index 7dfd0ca99b..74e0de63ad 100644
+index fb74179b84..77f45b8a26 100644
@@ -27 +25 @@
-@@ -51,4 +51,18 @@ can be downloaded in `<https://github.com/01org/intel-ipsec-mb/archive/v0.54.zip
+@@ -46,4 +46,18 @@ can be downloaded in `<https://github.com/01org/intel-ipsec-mb/archive/v0.50.zip
@@ -44,2 +42,2 @@
- .. note::
- 
+ As a reference, the following table shows a mapping between the past DPDK versions
+ and the external crypto libraries supported by them:
@@ -47 +45 @@
-index a2c3a84814..cc64f12430 100644
+index 2c8ccc3d45..012726b3c7 100644
@@ -50,47 +48 @@
-@@ -76,4 +76,18 @@ can be downloaded from `<https://github.com/01org/intel-ipsec-mb/archive/v0.54.z
-     make install
- 
-+The library requires NASM to be built. Depending on the library version, it might
-+require a minimum NASM version (e.g. v0.54 requires at least NASM 2.14).
-+
-+NASM is packaged for different OS. However, on some OS the version is too old,
-+so a manual installation is required. In that case, NASM can be downloaded from
-+`NASM website <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_.
-+Once it is downloaded, extract it and follow these steps:
-+
-+.. code-block:: console
-+
-+    ./configure
-+    make
-+    make install
-+
- .. note::
- 
-diff --git a/doc/guides/cryptodevs/kasumi.rst b/doc/guides/cryptodevs/kasumi.rst
-index edbc1c6994..09a538f816 100644
---- a/doc/guides/cryptodevs/kasumi.rst
-+++ b/doc/guides/cryptodevs/kasumi.rst
-@@ -48,4 +48,18 @@ on their system before building DPDK:
-     make install
- 
-+The library requires NASM to be built. Depending on the library version, it might
-+require a minimum NASM version (e.g. v0.54 requires at least NASM 2.14).
-+
-+NASM is packaged for different OS. However, on some OS the version is too old,
-+so a manual installation is required. In that case, NASM can be downloaded from
-+`NASM website <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_.
-+Once it is downloaded, extract it and follow these steps:
-+
-+.. code-block:: console
-+
-+    ./configure
-+    make
-+    make install
-+
- .. note::
- 
-diff --git a/doc/guides/cryptodevs/snow3g.rst b/doc/guides/cryptodevs/snow3g.rst
-index b715b4602e..e0cddc2d77 100644
---- a/doc/guides/cryptodevs/snow3g.rst
-+++ b/doc/guides/cryptodevs/snow3g.rst
-@@ -47,4 +47,18 @@ on their system before building DPDK:
+@@ -70,4 +70,18 @@ can be downloaded from `<https://github.com/01org/intel-ipsec-mb/archive/v0.51.z
@@ -113,25 +65,2 @@
- .. note::
- 
-diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst
-index c384f3d9e9..9b51ba141d 100644
---- a/doc/guides/cryptodevs/zuc.rst
-+++ b/doc/guides/cryptodevs/zuc.rst
-@@ -47,4 +47,18 @@ on their system before building DPDK:
-     make install
- 
-+The library requires NASM to be built. Depending on the library version, it might
-+require a minimum NASM version (e.g. v0.54 requires at least NASM 2.14).
-+
-+NASM is packaged for different OS. However, on some OS the version is too old,
-+so a manual installation is required. In that case, NASM can be downloaded from
-+`NASM website <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_.
-+Once it is downloaded, extract it and follow these steps:
-+
-+.. code-block:: console
-+
-+    ./configure
-+    make
-+    make install
-+
- .. note::
- 
+ As a reference, the following table shows a mapping between the past DPDK versions
+ and the Multi-Buffer library version supported by them:

[dpdk-stable] patch 'doc: fix typo in contributors guide' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9b5e5ace1a45fe6367332cb564c456b03ca5b151

Thanks.

Kevin.

---
From 9b5e5ace1a45fe6367332cb564c456b03ca5b151 Mon Sep 17 00:00:00 2001
From: Sarosh Arif <sarosh.arif@emumba.com>
Date: Sat, 21 Mar 2020 23:06:54 +0500
Subject: [PATCH] doc: fix typo in contributors guide

[ upstream commit e37348d7a6c8cb36524910f029e9b1fa855845aa ]

Bugzilla ID: 420
Fixes: 58abf6e77c6b ("doc: add contributors guide")

Signed-off-by: Sarosh Arif <sarosh.arif@emumba.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 doc/guides/contributing/patches.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index 02cd0555a4..4d8ec47619 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -407,5 +407,5 @@ files, in order of preference::
    /etc/dpdk/devel.config.
 
-Once the environment variable the script can be run as follows::
+Once the environment variable is set, the script can be run as follows::
 
    devtools/checkpatches.sh ~/patch/
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.483475896 +0100
+++ 0086-doc-fix-typo-in-contributors-guide.patch	2020-06-05 19:20:50.991036701 +0100
@@ -1 +1 @@
-From e37348d7a6c8cb36524910f029e9b1fa855845aa Mon Sep 17 00:00:00 2001
+From 9b5e5ace1a45fe6367332cb564c456b03ca5b151 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e37348d7a6c8cb36524910f029e9b1fa855845aa ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index e6a934846e..5e6faa0c63 100644
+index 02cd0555a4..4d8ec47619 100644
@@ -20 +21 @@
-@@ -424,5 +424,5 @@ are loaded from the following files, in order of preference::
+@@ -407,5 +407,5 @@ files, in order of preference::

[dpdk-stable] patch 'doc: fix typo in contributors guide' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/a28f45c97ec412e02588cc5efd909cdde58f4018

Thanks.

Kevin.

---
From a28f45c97ec412e02588cc5efd909cdde58f4018 Mon Sep 17 00:00:00 2001
From: Muhammad Bilal <m.bilal@emumba.com>
Date: Thu, 26 Mar 2020 10:46:54 +0500
Subject: [PATCH] doc: fix typo in contributors guide

[ upstream commit ba8af67fcd7aea9f0d4956bc58b15c71d3319744 ]

Bugzilla ID: 422
Fixes: 9e0e4a00df77 ("doc: suggest to keep doc and code in same patch")

Signed-off-by: Muhammad Bilal <m.bilal@emumba.com>
---
 doc/guides/contributing/patches.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index 4d8ec47619..a1bfae1c93 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -175,5 +175,5 @@ applied without dependencies as a backport.
 
 It is better to keep the related documentation changes in the same patch
-file as the code, rather than one big documentation patch at then end of a
+file as the code, rather than one big documentation patch at the end of a
 patchset. This makes it easier for future maintenance and development of the
 code.
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.539125956 +0100
+++ 0087-doc-fix-typo-in-contributors-guide.patch	2020-06-05 19:20:50.992036678 +0100
@@ -1 +1 @@
-From ba8af67fcd7aea9f0d4956bc58b15c71d3319744 Mon Sep 17 00:00:00 2001
+From a28f45c97ec412e02588cc5efd909cdde58f4018 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba8af67fcd7aea9f0d4956bc58b15c71d3319744 ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
-index 5e6faa0c63..01e0a2f6ba 100644
+index 4d8ec47619..a1bfae1c93 100644
@@ -19 +20 @@
-@@ -183,5 +183,5 @@ applied without dependencies as a backport.
+@@ -175,5 +175,5 @@ applied without dependencies as a backport.

[dpdk-stable] patch 'doc: prefer https when pointing to dpdk.org' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/10/20. 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 are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b860ed986ebffbff3168776c03ba9136ca28458c

Thanks.

Kevin.

---
From b860ed986ebffbff3168776c03ba9136ca28458c Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Thu, 19 Mar 2020 09:28:59 +0100
Subject: [PATCH] doc: prefer https when pointing to dpdk.org

[ upstream commit 3d4b2afb73f7f0988f8e66ba1b37f2a446e33868 ]

for file in $(git grep -l http://.*dpdk.org doc/); do
  sed -i -e 's#http://\(.*dpdk.org\)#https://\1#g' $file;
done

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
---
 devtools/checkpatches.sh                         |  8 ++++++++
 doc/guides/contributing/documentation.rst        | 12 ++++++------
 doc/guides/contributing/patches.rst              | 16 ++++++++--------
 doc/guides/contributing/stable.rst               |  6 +++---
 doc/guides/freebsd_gsg/install_from_ports.rst    |  2 +-
 doc/guides/linux_gsg/nic_perf_intel_platform.rst |  2 +-
 doc/guides/nics/enic.rst                         |  2 +-
 doc/guides/prog_guide/cryptodev_lib.rst          |  2 +-
 8 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh
index c471731d45..acff1843af 100755
--- a/devtools/checkpatches.sh
+++ b/devtools/checkpatches.sh
@@ -57,4 +57,12 @@ check_forbidden_additions() { # <patch>
 		"$1" || res=1
 
+	# links must prefer https over http
+	awk -v FOLDERS='doc' \
+		-v EXPRESSIONS='http://.*dpdk.org' \
+		-v RET_ON_FAIL=1 \
+		-v MESSAGE='Using non https link to dpdk.org' \
+		-f $(dirname $(readlink -f $0))/check-forbidden-tokens.awk \
+		"$1" || res=1
+
 	return $res
 }
diff --git a/doc/guides/contributing/documentation.rst b/doc/guides/contributing/documentation.rst
index a45b62bad3..8c782531d9 100644
--- a/doc/guides/contributing/documentation.rst
+++ b/doc/guides/contributing/documentation.rst
@@ -84,5 +84,5 @@ added to by the developer.
 
   The API documentation explains how to use the public DPDK functions.
-  The `API index page <http://doc.dpdk.org/api/>`_ shows the generated API documentation with related groups of functions.
+  The `API index page <https://doc.dpdk.org/api/>`_ shows the generated API documentation with related groups of functions.
 
   The API documentation should be updated via Doxygen comments when new functions are added.
@@ -563,12 +563,12 @@ Hyperlinks
 
 * Links to external websites can be plain URLs.
-  The following is rendered as http://dpdk.org::
+  The following is rendered as https://dpdk.org::
 
-     http://dpdk.org
+     https://dpdk.org
 
 * They can contain alternative text.
-  The following is rendered as `Check out DPDK <http://dpdk.org>`_::
+  The following is rendered as `Check out DPDK <https://dpdk.org>`_::
 
-     `Check out DPDK <http://dpdk.org>`_
+     `Check out DPDK <https://dpdk.org>`_
 
 * An internal link can be generated by placing labels in the document with the format ``.. _label_name``.
@@ -668,5 +668,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati
 
   In the API documentation the functions will be rendered as links, see the
-  `online section of the rte_ethdev.h docs <http://doc.dpdk.org/api/rte__ethdev_8h.html>`_ that contains the above text.
+  `online section of the rte_ethdev.h docs <https://doc.dpdk.org/api/rte__ethdev_8h.html>`_ that contains the above text.
 
 * The ``@see`` keyword can be used to create a *see also* link to another file or library.
diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index a1bfae1c93..28d4b67d66 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -29,7 +29,7 @@ The DPDK development process has the following features:
 * After the ``-rc2`` release all patches should target the main repository.
 
-The mailing list for DPDK development is `dev@dpdk.org <http://mails.dpdk.org/archives/dev/>`_.
-Contributors will need to `register for the mailing list <http://mails.dpdk.org/listinfo/dev>`_ in order to submit patches.
-It is also worth registering for the DPDK `Patchwork <http://patches.dpdk.org/project/dpdk/list/>`_
+The mailing list for DPDK development is `dev@dpdk.org <https://mails.dpdk.org/archives/dev/>`_.
+Contributors will need to `register for the mailing list <https://mails.dpdk.org/listinfo/dev>`_ in order to submit patches.
+It is also worth registering for the DPDK `Patchwork <https://patches.dpdk.org/project/dpdk/list/>`_
 
 If you are using the GitHub service, you can link your repository to
@@ -133,10 +133,10 @@ main repository::
 
     git clone git://dpdk.org/dpdk
-    git clone http://dpdk.org/git/dpdk
+    git clone https://dpdk.org/git/dpdk
 
-sub-repositories (`list <http://git.dpdk.org/next>`_)::
+sub-repositories (`list <https://git.dpdk.org/next>`_)::
 
     git clone git://dpdk.org/next/dpdk-next-*
-    git clone http://dpdk.org/git/next/dpdk-next-*
+    git clone https://dpdk.org/git/next/dpdk-next-*
 
 Make your Changes
@@ -313,5 +313,5 @@ Patch for Stable Releases
 
 All fix patches to the master branch that are candidates for backporting
-should also be CCed to the `stable@dpdk.org <http://mails.dpdk.org/listinfo/stable>`_
+should also be CCed to the `stable@dpdk.org <https://mails.dpdk.org/listinfo/stable>`_
 mailing list.
 In the commit message body the Cc: stable@dpdk.org should be inserted as follows::
@@ -514,5 +514,5 @@ If the patch is in relation to a previous email thread you can add it to the sam
 
 The Message ID can be found in the raw text of emails or at the top of each Patchwork patch,
-`for example <http://patches.dpdk.org/patch/7646/>`_.
+`for example <https://patches.dpdk.org/patch/7646/>`_.
 Shallow threading (``--thread --no-chain-reply-to``) is preferred for a patch series.
 
diff --git a/doc/guides/contributing/stable.rst b/doc/guides/contributing/stable.rst
index 2ac4f0a88b..88b46aee24 100644
--- a/doc/guides/contributing/stable.rst
+++ b/doc/guides/contributing/stable.rst
@@ -97,5 +97,5 @@ list.
 
 All fix patches to the master branch that are candidates for backporting
-should also be CCed to the `stable@dpdk.org <http://mails.dpdk.org/listinfo/stable>`_
+should also be CCed to the `stable@dpdk.org <https://mails.dpdk.org/listinfo/stable>`_
 mailing list.
 
@@ -108,8 +108,8 @@ A Stable Release will be released by:
 * Tagging the release with YY.MM.n (year, month, number).
 * Uploading a tarball of the release to dpdk.org.
-* Sending an announcement to the `announce@dpdk.org <http://mails.dpdk.org/listinfo/announce>`_
+* Sending an announcement to the `announce@dpdk.org <https://mails.dpdk.org/listinfo/announce>`_
   list.
 
-Stable releases are available on the `dpdk.org download page <http://core.dpdk.org/download/>`_.
+Stable releases are available on the `dpdk.org download page <https://core.dpdk.org/download/>`_.
 
 
diff --git a/doc/guides/freebsd_gsg/install_from_ports.rst b/doc/guides/freebsd_gsg/install_from_ports.rst
index 253328eb10..2ac27f115c 100644
--- a/doc/guides/freebsd_gsg/install_from_ports.rst
+++ b/doc/guides/freebsd_gsg/install_from_ports.rst
@@ -63,5 +63,5 @@ environmental variables should be set as below:
 
    To install a copy of the DPDK compiled using gcc, please download the
-   official DPDK package from http://core.dpdk.org/download/ and install manually using
+   official DPDK package from https://core.dpdk.org/download/ and install manually using
    the instructions given in the next chapter, :ref:`building_from_source`
 
diff --git a/doc/guides/linux_gsg/nic_perf_intel_platform.rst b/doc/guides/linux_gsg/nic_perf_intel_platform.rst
index 4e9afbdbc1..5fa6e3899d 100644
--- a/doc/guides/linux_gsg/nic_perf_intel_platform.rst
+++ b/doc/guides/linux_gsg/nic_perf_intel_platform.rst
@@ -65,5 +65,5 @@ Network Interface Card Requirements
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Use a `DPDK supported <http://core.dpdk.org/supported/>`_ high end NIC such as the Intel XL710 40GbE.
+Use a `DPDK supported <https://core.dpdk.org/supported/>`_ high end NIC such as the Intel XL710 40GbE.
 
 Make sure each NIC has been flashed the latest version of NVM/firmware.
diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index 773f13b0fc..c06363fc27 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -15,5 +15,5 @@ How to obtain ENIC PMD integrated DPDK
 
 ENIC PMD support is integrated into the DPDK suite. dpdk-<version>.tar.gz
-should be downloaded from http://core.dpdk.org/download/
+should be downloaded from https://core.dpdk.org/download/
 
 
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst
index 7a95053ad5..53d797bcc1 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -1044,3 +1044,3 @@ Asymmetric Crypto Device API
 
 The cryptodev Library API is described in the
-`DPDK API Reference <http://doc.dpdk.org/api/>`_
+`DPDK API Reference <https://doc.dpdk.org/api/>`_
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:55.590329918 +0100
+++ 0088-doc-prefer-https-when-pointing-to-dpdk.org.patch	2020-06-05 19:20:50.998036542 +0100
@@ -1 +1 @@
-From 3d4b2afb73f7f0988f8e66ba1b37f2a446e33868 Mon Sep 17 00:00:00 2001
+From b860ed986ebffbff3168776c03ba9136ca28458c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3d4b2afb73f7f0988f8e66ba1b37f2a446e33868 ]
+
@@ -10,2 +11,0 @@
-Cc: stable@dpdk.org
-
@@ -18,2 +18 @@
- doc/guides/contributing/stable.rst               |  8 ++++----
- doc/guides/contributing/vulnerability.rst        |  6 +++---
+ doc/guides/contributing/stable.rst               |  6 +++---
@@ -24,2 +23 @@
- doc/guides/rel_notes/deprecation.rst             |  2 +-
- 10 files changed, 34 insertions(+), 26 deletions(-)
+ 8 files changed, 29 insertions(+), 21 deletions(-)
@@ -28 +26 @@
-index 42b833e0d7..158087f1ca 100755
+index c471731d45..acff1843af 100755
@@ -31 +29 @@
-@@ -79,4 +79,12 @@ check_forbidden_additions() { # <patch>
+@@ -57,4 +57,12 @@ check_forbidden_additions() { # <patch>
@@ -45 +43 @@
-index 550d8dec28..375ea64ba8 100644
+index a45b62bad3..8c782531d9 100644
@@ -48 +46 @@
-@@ -83,5 +83,5 @@ added to by the developer.
+@@ -84,5 +84,5 @@ added to by the developer.
@@ -55 +53 @@
-@@ -562,12 +562,12 @@ Hyperlinks
+@@ -563,12 +563,12 @@ Hyperlinks
@@ -72 +70 @@
-@@ -667,5 +667,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati
+@@ -668,5 +668,5 @@ The following are some guidelines for use of Doxygen in the DPDK API documentati
@@ -80 +78 @@
-index 01e0a2f6ba..16b40225f2 100644
+index a1bfae1c93..28d4b67d66 100644
@@ -94 +92 @@
-@@ -131,10 +131,10 @@ main repository::
+@@ -133,10 +133,10 @@ main repository::
@@ -108 +106 @@
-@@ -321,5 +321,5 @@ Patch for Stable Releases
+@@ -313,5 +313,5 @@ Patch for Stable Releases
@@ -115 +113 @@
-@@ -566,5 +566,5 @@ If the patch is in relation to a previous email thread you can add it to the sam
+@@ -514,5 +514,5 @@ If the patch is in relation to a previous email thread you can add it to the sam
@@ -123 +121 @@
-index 626cebf655..890bbeccc3 100644
+index 2ac4f0a88b..88b46aee24 100644
@@ -126,8 +124 @@
-@@ -52,5 +52,5 @@ year's November (X.11) release will be maintained as an LTS for 2 years.
- 
- After the X.11 release, an LTS branch will be created for it at
--http://git.dpdk.org/dpdk-stable where bugfixes will be backported to.
-+https://git.dpdk.org/dpdk-stable where bugfixes will be backported to.
- 
- A LTS release may align with the declaration of a new major ABI version,
-@@ -109,5 +109,5 @@ list.
+@@ -97,5 +97,5 @@ list.
@@ -140 +131 @@
-@@ -120,6 +120,6 @@ A Stable Release will be released by:
+@@ -108,8 +108,8 @@ A Stable Release will be released by:
@@ -149,21 +139,0 @@
-diff --git a/doc/guides/contributing/vulnerability.rst b/doc/guides/contributing/vulnerability.rst
-index 5484119d19..da00acd4f0 100644
---- a/doc/guides/contributing/vulnerability.rst
-+++ b/doc/guides/contributing/vulnerability.rst
-@@ -37,9 +37,9 @@ Report
- Do not use Bugzilla (unsecured).
- Instead, send GPG-encrypted emails
--to `security@dpdk.org <http://core.dpdk.org/security#contact>`_.
-+to `security@dpdk.org <https://core.dpdk.org/security#contact>`_.
- Anyone can post to this list.
- In order to reduce the disclosure of a vulnerability in the early stages,
- membership of this list is intentionally limited to a `small number of people
--<http://mails.dpdk.org/roster/security>`_.
-+<https://mails.dpdk.org/roster/security>`_.
- 
- It is additionally encouraged to GPG-sign one-on-one conversations
-@@ -189,5 +189,5 @@ until the embargo is passed, otherwise they will be removed from the list.
- 
- Downstream stakeholders (in `security-prerelease list
--<http://mails.dpdk.org/roster/security-prerelease>`_), are:
-+<https://mails.dpdk.org/roster/security-prerelease>`_), are:
@@ -171 +141 @@
- * Operating system vendors known to package DPDK
+ 
@@ -173 +143 @@
-index 36dc4a417b..d946f3f3b2 100644
+index 253328eb10..2ac27f115c 100644
@@ -176 +146 @@
-@@ -73,5 +73,5 @@ These examples can be compiled and run as described in :ref:`compiling_sample_ap
+@@ -63,5 +63,5 @@ environmental variables should be set as below:
@@ -184 +154 @@
-index c554c2159c..1dabbce244 100644
+index 4e9afbdbc1..5fa6e3899d 100644
@@ -195 +165 @@
-index aa4fdc0e39..a28a7f4e47 100644
+index 773f13b0fc..c06363fc27 100644
@@ -206 +176 @@
-index b91f7c8b7f..c14f750fa8 100644
+index 7a95053ad5..53d797bcc1 100644
@@ -209 +179 @@
-@@ -1129,3 +1129,3 @@ Asymmetric Crypto Device API
+@@ -1044,3 +1044,3 @@ Asymmetric Crypto Device API
@@ -214,11 +183,0 @@
-diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
-index cf8b1eb7b0..e8fd441696 100644
---- a/doc/guides/rel_notes/deprecation.rst
-+++ b/doc/guides/rel_notes/deprecation.rst
-@@ -44,5 +44,5 @@ Deprecation Notices
-   in 20.11.
-   Minutes of Technical Board Meeting of `2019-11-06
--  <http://mails.dpdk.org/archives/dev/2019-November/151763.html>`_.
-+  <https://mails.dpdk.org/archives/dev/2019-November/151763.html>`_.
- 
- * lib: will fix extending some enum/define breaking the ABI. There are multiple