[dpdk-stable] patch 'test/hash: fix data reset on new run' has been queued to LTS release 18.11.3

[dpdk-stable] patch 'test/hash: fix data reset on new run' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/557a24534c691c1b6285138b5c9b060f7c006981

Thanks.

Kevin Traynor

---
From 557a24534c691c1b6285138b5c9b060f7c006981 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Date: Mon, 1 Jul 2019 19:27:21 -0500
Subject: [PATCH] test/hash: fix data reset on new run

[ upstream commit e60635c14c1589b9362b7e77c780ff608686d668 ]

Reset tbl_rwc_test_param to discard data from previous run
of the test.

Fixes: c7eb0972e74b ("test/hash: add lock-free r/w concurrency")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
---
 test/test/test_hash_readwrite_lf.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/test/test_hash_readwrite_lf.c b/test/test/test_hash_readwrite_lf.c
index b0f415b0a..432e86e0e 100644
--- a/test/test/test_hash_readwrite_lf.c
+++ b/test/test/test_hash_readwrite_lf.c
@@ -1061,4 +1061,7 @@ test_hash_readwrite_lf_main(void)
 	setlocale(LC_NUMERIC, "");
 
+	/* Reset tbl_rwc_test_param to discard values from previous run */
+	memset(&tbl_rwc_test_param, 0, sizeof(tbl_rwc_test_param));
+
 	if (rte_tm_supported())
 		htm = 1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.007634109 +0100
+++ 0001-test-hash-fix-data-reset-on-new-run.patch	2019-08-27 09:40:10.842146282 +0100
@@ -1 +1 @@
-From e60635c14c1589b9362b7e77c780ff608686d668 Mon Sep 17 00:00:00 2001
+From 557a24534c691c1b6285138b5c9b060f7c006981 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e60635c14c1589b9362b7e77c780ff608686d668 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- app/test/test_hash_readwrite_lf.c | 3 +++
+ test/test/test_hash_readwrite_lf.c | 3 +++
@@ -18,5 +19,5 @@
-diff --git a/app/test/test_hash_readwrite_lf.c b/app/test/test_hash_readwrite_lf.c
-index 2664f5138..7943e3d82 100644
---- a/app/test/test_hash_readwrite_lf.c
-+++ b/app/test/test_hash_readwrite_lf.c
-@@ -1263,4 +1263,7 @@ test_hash_readwrite_lf_main(void)
+diff --git a/test/test/test_hash_readwrite_lf.c b/test/test/test_hash_readwrite_lf.c
+index b0f415b0a..432e86e0e 100644
+--- a/test/test/test_hash_readwrite_lf.c
++++ b/test/test/test_hash_readwrite_lf.c
+@@ -1061,4 +1061,7 @@ test_hash_readwrite_lf_main(void)

[dpdk-stable] patch 'mem: fix typo in API description' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/df04cc3ad8fb6c1c11fd8aba4dd397798f0a3ae7

Thanks.

Kevin Traynor

---
From df04cc3ad8fb6c1c11fd8aba4dd397798f0a3ae7 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 5 Jul 2019 11:18:42 +0200
Subject: [PATCH] mem: fix typo in API description

[ upstream commit d39d8c4bb66c68a6aa13fd363502e4d4986018f7 ]

Fixes: 552afc420a67 ("mem: add contig walk function")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/include/rte_memory.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h
index d970825df..fc4e82b1f 100644
--- a/lib/librte_eal/common/include/rte_memory.h
+++ b/lib/librte_eal/common/include/rte_memory.h
@@ -189,5 +189,5 @@ typedef int (*rte_memseg_walk_t)(const struct rte_memseg_list *msl,
 /**
  * Memseg contig walk function prototype. This will trigger a callback on every
- * VA-contiguous are starting at memseg ``ms``, so total valid VA space at each
+ * VA-contiguous area starting at memseg ``ms``, so total valid VA space at each
  * callback call will be [``ms->addr``, ``ms->addr + len``).
  *
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.051027130 +0100
+++ 0002-mem-fix-typo-in-API-description.patch	2019-08-27 09:40:10.843146257 +0100
@@ -1 +1 @@
-From d39d8c4bb66c68a6aa13fd363502e4d4986018f7 Mon Sep 17 00:00:00 2001
+From df04cc3ad8fb6c1c11fd8aba4dd397798f0a3ae7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d39d8c4bb66c68a6aa13fd363502e4d4986018f7 ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
-index 44cbe6fd2..870288aa7 100644
+index d970825df..fc4e82b1f 100644
@@ -19 +20 @@
-@@ -192,5 +192,5 @@ typedef int (*rte_memseg_walk_t)(const struct rte_memseg_list *msl,
+@@ -189,5 +189,5 @@ typedef int (*rte_memseg_walk_t)(const struct rte_memseg_list *msl,

[dpdk-stable] patch 'kni: abort when IOVA is not PA' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/5c94659a276a981fdb820bf15bb00860c8eed7a1

Thanks.

Kevin Traynor

---
From 5c94659a276a981fdb820bf15bb00860c8eed7a1 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 14 Jun 2019 11:39:15 +0200
Subject: [PATCH] kni: abort when IOVA is not PA

[ upstream commit fe8fc6b0b7eaf9078d804d57221000a494753997 ]

If a forced iova-mode has been passed at init, kni is not supposed to
work.

Fixes: 075b182b54ce ("eal: force IOVA to a particular mode")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 lib/librte_kni/rte_kni.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 73aeccccf..99b6c3e13 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -98,4 +98,9 @@ int
 rte_kni_init(unsigned int max_kni_ifaces __rte_unused)
 {
+	if (rte_eal_iova_mode() != RTE_IOVA_PA) {
+		RTE_LOG(ERR, KNI, "KNI requires IOVA as PA\n");
+		return -1;
+	}
+
 	/* Check FD and open */
 	if (kni_fd < 0) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.099306886 +0100
+++ 0003-kni-abort-when-IOVA-is-not-PA.patch	2019-08-27 09:40:10.845146209 +0100
@@ -1 +1 @@
-From fe8fc6b0b7eaf9078d804d57221000a494753997 Mon Sep 17 00:00:00 2001
+From 5c94659a276a981fdb820bf15bb00860c8eed7a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fe8fc6b0b7eaf9078d804d57221000a494753997 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 00104a35d..e60de2cdb 100644
+index 73aeccccf..99b6c3e13 100644

[dpdk-stable] patch 'doc: fix build with latest meson' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/590e51e0300262b0e7b1a887edd1070e32724e3b

Thanks.

Kevin Traynor

---
From 590e51e0300262b0e7b1a887edd1070e32724e3b Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 5 Jul 2019 16:56:55 +0100
Subject: [PATCH] doc: fix build with latest meson

[ upstream commit 87c95f044568a439175a3fa0becf83b52eed8820 ]

The latest versions of meson don't build targets when build_by_default is
false but install is true, unlike older versions. We can fix this by having
both build_by_default and install settings come from the build-time option.

Bugzilla ID: 303
Fixes: d02a2dab2dfb ("doc: support building HTML guides with meson")
Fixes: 720b14db3ae2 ("build: generate API documentation with meson")

Reported-by: Ali Alnubani <alialnu@mellanox.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
 doc/api/meson.build    | 4 ++--
 doc/guides/meson.build | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/api/meson.build b/doc/api/meson.build
index 30bdc573b..1c48b7672 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -27,5 +27,5 @@ if doxygen.found()
 		install: get_option('enable_docs'),
 		install_dir: htmldir,
-		build_by_default: false)
+		build_by_default: get_option('enable_docs'))
 
 	cdata = configuration_data()
@@ -49,5 +49,5 @@ if doxygen.found()
 		install: get_option('enable_docs'),
 		install_dir: htmldir,
-		build_by_default: false)
+		build_by_default: get_option('enable_docs'))
 
 	doc_targets += doxy_build
diff --git a/doc/guides/meson.build b/doc/guides/meson.build
index 06f14882b..7931ef3bb 100644
--- a/doc/guides/meson.build
+++ b/doc/guides/meson.build
@@ -12,5 +12,5 @@ if sphinx.found()
 			'-d', meson.current_build_dir() + '/.doctrees',
 			'@INPUT@', meson.current_build_dir() + '/guides'],
-		build_by_default: false,
+		build_by_default: get_option('enable_docs'),
 		install: get_option('enable_docs'),
 		install_dir: htmldir)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.148238825 +0100
+++ 0004-doc-fix-build-with-latest-meson.patch	2019-08-27 09:40:10.845146209 +0100
@@ -1 +1 @@
-From 87c95f044568a439175a3fa0becf83b52eed8820 Mon Sep 17 00:00:00 2001
+From 590e51e0300262b0e7b1a887edd1070e32724e3b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 87c95f044568a439175a3fa0becf83b52eed8820 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'ethdev: avoid error on PCI unplug of closed port' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/48ece96d63f88c0aa28b85bed4ecac744b894c8d

Thanks.

Kevin Traynor

---
From 48ece96d63f88c0aa28b85bed4ecac744b894c8d Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko@solarflare.com>
Date: Fri, 21 Jun 2019 10:40:39 +0100
Subject: [PATCH] ethdev: avoid error on PCI unplug of closed port

[ upstream commit ca5ba1b6972f381d410f9e53b650ba179e776225 ]

If PCI Ethernet device driver removes it on close
(RTE_ETH_DEV_CLOSE_REMOVE) and later PCI device itself is unplugged,
it should not fail because of Ethernet device is already removed.

Fixes: 23ea57a2a0ce ("ethdev: complete closing of port")

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reported-by: David Marchand <david.marchand@redhat.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_ethdev/rte_ethdev_pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h
index 23257e986..ccdbb46ec 100644
--- a/lib/librte_ethdev/rte_ethdev_pci.h
+++ b/lib/librte_ethdev/rte_ethdev_pci.h
@@ -185,5 +185,5 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev,
 	eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
 	if (!eth_dev)
-		return -ENODEV;
+		return 0;
 
 	if (dev_uninit) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.196263124 +0100
+++ 0005-ethdev-avoid-error-on-PCI-unplug-of-closed-port.patch	2019-08-27 09:40:10.846146185 +0100
@@ -1 +1 @@
-From ca5ba1b6972f381d410f9e53b650ba179e776225 Mon Sep 17 00:00:00 2001
+From 48ece96d63f88c0aa28b85bed4ecac744b894c8d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ca5ba1b6972f381d410f9e53b650ba179e776225 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/sfc: ensure that device is closed on removal' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/c346ddbd1289143f21fd5f85bfb4f56e4462276f

Thanks.

Kevin Traynor

---
From c346ddbd1289143f21fd5f85bfb4f56e4462276f Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko@solarflare.com>
Date: Fri, 21 Jun 2019 10:40:40 +0100
Subject: [PATCH] net/sfc: ensure that device is closed on removal

[ upstream commit 93f993cbbba21efddc96d36abc4c7329e757ea74 ]

PCI device may be unplugged when ethdev is not closed yet.

Fixes: aaa3f5f0f79d ("net/sfc: add configure and close stubs")

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
---
 drivers/net/sfc/sfc_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 052d38cdf..fa0dd82aa 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -2092,4 +2092,6 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)
 	}
 
+	sfc_dev_close(dev);
+
 	sa = dev->data->dev_private;
 	sfc_log_init(sa, "entry");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.243824089 +0100
+++ 0006-net-sfc-ensure-that-device-is-closed-on-removal.patch	2019-08-27 09:40:10.848146136 +0100
@@ -1 +1 @@
-From 93f993cbbba21efddc96d36abc4c7329e757ea74 Mon Sep 17 00:00:00 2001
+From c346ddbd1289143f21fd5f85bfb4f56e4462276f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 93f993cbbba21efddc96d36abc4c7329e757ea74 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index be185d5e9..583f31b8c 100644
+index 052d38cdf..fa0dd82aa 100644
@@ -21 +22 @@
-@@ -2197,4 +2197,6 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)
+@@ -2092,4 +2092,6 @@ sfc_eth_dev_uninit(struct rte_eth_dev *dev)
@@ -26 +27 @@
- 	sa = sfc_adapter_by_eth_dev(dev);
+ 	sa = dev->data->dev_private;

[dpdk-stable] patch 'net: define IPv4 IHL and VHL' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/e63b7033e41f7cf5e462a8301ca84b2ba9c30fd4

Thanks.

Kevin Traynor

---
From e63b7033e41f7cf5e462a8301ca84b2ba9c30fd4 Mon Sep 17 00:00:00 2001
From: Saleh Alsouqi <salehals@mellanox.com>
Date: Thu, 4 Jul 2019 07:33:19 +0000
Subject: [PATCH] net: define IPv4 IHL and VHL

[ upstream commit 2318d8d5456532e8022d324937a77a416b701d2b ]

Define IPv4 Minimum IHL and VHL according to rfc791 (see [1])

    "The Version field indicates the format of the
    internet header."

    "Internet Header Length (ihl) is the length of the
    internet header in 32 bit words, and thus points
    to the beginning of the data. Note that
    the minimum value for a correct header is 5."

[1] https://tools.ietf.org/html/rfc791

Signed-off-by: Saleh Alsouqi <salehals@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_net/rte_ip.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 3cf3081e4..7639164c2 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -17,5 +17,7 @@
 
 #include <stdint.h>
+#include <sys/types.h>
 #include <netinet/in.h>
+#include <netinet/ip.h>
 
 #include <rte_byteorder.h>
@@ -90,4 +92,8 @@ struct ipv4_hdr {
 	((x) >= IPV4_MIN_MCAST && (x) <= IPV4_MAX_MCAST) /**< check if IPv4 address is multicast */
 
+/* IPv4 default fields values */
+#define IPV4_MIN_IHL    (0x5)
+#define IPV4_VHL_DEF    (IPVERSION | IPV4_MIN_IHL)
+
 /**
  * @internal Calculate a sum of all words in the buffer.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.293303742 +0100
+++ 0007-net-define-IPv4-IHL-and-VHL.patch	2019-08-27 09:40:10.849146112 +0100
@@ -1 +1 @@
-From 2318d8d5456532e8022d324937a77a416b701d2b Mon Sep 17 00:00:00 2001
+From e63b7033e41f7cf5e462a8301ca84b2ba9c30fd4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2318d8d5456532e8022d324937a77a416b701d2b ]
+
@@ -25 +27 @@
-index e69b86353..26b089ec1 100644
+index 3cf3081e4..7639164c2 100644
@@ -36,2 +38,2 @@
-@@ -97,4 +99,8 @@ struct rte_ipv4_hdr {
- 	/**< check if IPv4 address is multicast */
+@@ -90,4 +92,8 @@ struct ipv4_hdr {
+ 	((x) >= IPV4_MIN_MCAST && (x) <= IPV4_MAX_MCAST) /**< check if IPv4 address is multicast */
@@ -40,2 +42,2 @@
-+#define RTE_IPV4_MIN_IHL    (0x5)
-+#define RTE_IPV4_VHL_DEF    (IPVERSION | RTE_IPV4_MIN_IHL)
++#define IPV4_MIN_IHL    (0x5)
++#define IPV4_VHL_DEF    (IPVERSION | IPV4_MIN_IHL)

[dpdk-stable] patch 'app/testpmd: fix MPLS IPv4 encapsulation fields' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/308460c9a7c018c2eb242b6199224895f3a5f8cb

Thanks.

Kevin Traynor

---
From 308460c9a7c018c2eb242b6199224895f3a5f8cb Mon Sep 17 00:00:00 2001
From: Saleh Alsouqi <salehals@mellanox.com>
Date: Thu, 4 Jul 2019 07:33:22 +0000
Subject: [PATCH] app/testpmd: fix MPLS IPv4 encapsulation fields

[ upstream commit a97ec9ba45d4357c172df71be3fcf601dfdb8147 ]

Having version and ihl set to 0 would result in a
corrupted/incorrect encapsulating packet for MPLS,
this commit sets these fields to 4 and 5 respectively
as defined in librte_net/rte_ip.h.

Fixes: 3e77031be855 ("app/testpmd: add MPLSoGRE encapsulation")
Fixes: a1191d39cb57 ("app/testpmd: add MPLSoUDP encapsulation")

Signed-off-by: Saleh Alsouqi <salehals@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/cmdline_flow.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index d202566b2..fe5bda9dc 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -3747,4 +3747,6 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
 			.dst_addr = mplsogre_encap_conf.ipv4_dst,
 			.next_proto_id = IPPROTO_GRE,
+			.version_ihl = IPV4_VHL_DEF,
+			.time_to_live = IPDEFTTL,
 		},
 	};
@@ -3848,4 +3850,5 @@ parse_vc_action_mplsogre_decap(struct context *ctx, const struct token *token,
 		.hdr =  {
 			.proto = IPPROTO_GRE,
+			.hop_limits = IPDEFTTL,
 		},
 	};
@@ -3935,4 +3938,6 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
 			.dst_addr = mplsoudp_encap_conf.ipv4_dst,
 			.next_proto_id = IPPROTO_UDP,
+			.version_ihl = IPV4_VHL_DEF,
+			.time_to_live = IPDEFTTL,
 		},
 	};
@@ -4039,4 +4044,5 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token,
 		.hdr =  {
 			.proto = IPPROTO_UDP,
+			.hop_limits = IPDEFTTL,
 		},
 	};
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.342002157 +0100
+++ 0008-app-testpmd-fix-MPLS-IPv4-encapsulation-fields.patch	2019-08-27 09:40:10.854145990 +0100
@@ -1 +1 @@
-From a97ec9ba45d4357c172df71be3fcf601dfdb8147 Mon Sep 17 00:00:00 2001
+From 308460c9a7c018c2eb242b6199224895f3a5f8cb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a97ec9ba45d4357c172df71be3fcf601dfdb8147 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index e644efa4f..4e5fa7a2d 100644
+index d202566b2..fe5bda9dc 100644
@@ -25 +26 @@
-@@ -3879,4 +3879,6 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
+@@ -3747,4 +3747,6 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
@@ -28 +29 @@
-+			.version_ihl = RTE_IPV4_VHL_DEF,
++			.version_ihl = IPV4_VHL_DEF,
@@ -32 +33 @@
-@@ -3884,4 +3886,5 @@ parse_vc_action_mplsogre_encap(struct context *ctx, const struct token *token,
+@@ -3848,4 +3850,5 @@ parse_vc_action_mplsogre_decap(struct context *ctx, const struct token *token,
@@ -38 +39 @@
-@@ -4067,4 +4070,6 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
+@@ -3935,4 +3938,6 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
@@ -41 +42 @@
-+			.version_ihl = RTE_IPV4_VHL_DEF,
++			.version_ihl = IPV4_VHL_DEF,
@@ -45 +46 @@
-@@ -4072,4 +4077,5 @@ parse_vc_action_mplsoudp_encap(struct context *ctx, const struct token *token,
+@@ -4039,4 +4044,5 @@ parse_vc_action_mplsoudp_decap(struct context *ctx, const struct token *token,

[dpdk-stable] patch 'net/netvsc: fix definition of offload values' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/92de6c56567849f7a52e6bd5a2b51bfdbcff8d52

Thanks.

Kevin Traynor

---
From 92de6c56567849f7a52e6bd5a2b51bfdbcff8d52 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 3 Jul 2019 08:50:01 -0700
Subject: [PATCH] net/netvsc: fix definition of offload values

[ upstream commit ff155eac9338dfb4f44def1acfe558fc254d2b90 ]

The definition of ipsec and rsc offloads was incorrect.
Neither one of these is used by current driver, but the values
should be fixed now for future RSC support.

Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/ndis.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/netvsc/ndis.h b/drivers/net/netvsc/ndis.h
index 2e7ca99b1..d97a397a8 100644
--- a/drivers/net/netvsc/ndis.h
+++ b/drivers/net/netvsc/ndis.h
@@ -263,15 +263,15 @@ struct ndis_lsov2_offload {
 struct ndis_ipsecv2_offload {
 	uint32_t			ndis_encap;	/*NDIS_OFFLOAD_ENCAP_*/
-	uint16_t			ndis_ip6;
-	uint16_t			ndis_ip4opt;
-	uint16_t			ndis_ip6ext;
-	uint16_t			ndis_ah;
-	uint16_t			ndis_esp;
-	uint16_t			ndis_ah_esp;
-	uint16_t			ndis_xport;
-	uint16_t			ndis_tun;
-	uint16_t			ndis_xport_tun;
-	uint16_t			ndis_lso;
-	uint16_t			ndis_extseq;
+	uint8_t				ndis_ip6;
+	uint8_t				ndis_ip4opt;
+	uint8_t				ndis_ip6ext;
+	uint8_t				ndis_ah;
+	uint8_t				ndis_esp;
+	uint8_t				ndis_ah_esp;
+	uint8_t				ndis_xport;
+	uint8_t				ndis_tun;
+	uint8_t				ndis_xport_tun;
+	uint8_t				ndis_lso;
+	uint8_t				ndis_extseq;
 	uint32_t			ndis_udp_esp;
 	uint32_t			ndis_auth;
@@ -281,6 +281,6 @@ struct ndis_ipsecv2_offload {
 
 struct ndis_rsc_offload {
-	uint16_t			ndis_ip4;
-	uint16_t			ndis_ip6;
+	uint8_t				ndis_ip4;
+	uint8_t				ndis_ip6;
 };
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.394732794 +0100
+++ 0009-net-netvsc-fix-definition-of-offload-values.patch	2019-08-27 09:40:10.855145966 +0100
@@ -1 +1 @@
-From ff155eac9338dfb4f44def1acfe558fc254d2b90 Mon Sep 17 00:00:00 2001
+From 92de6c56567849f7a52e6bd5a2b51bfdbcff8d52 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff155eac9338dfb4f44def1acfe558fc254d2b90 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/i40e: fix crash when TxQ/RxQ set to 0 in VF' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/9a920d057ba69f4f44569ab88e3c042091d995f7

Thanks.

Kevin Traynor

---
From 9a920d057ba69f4f44569ab88e3c042091d995f7 Mon Sep 17 00:00:00 2001
From: Andy Pei <andy.pei@intel.com>
Date: Thu, 4 Jul 2019 09:38:39 +0800
Subject: [PATCH] net/i40e: fix crash when TxQ/RxQ set to 0 in VF

[ upstream commit 343b8e4adabcfabe282b3fdb419e98f6f9cb0b35 ]

Testpmd would stuck and result in core dump when user specifies an
invalid VF queue number, for example when setting txq or rxq to 0.
When txq or rxq is set to 0, pointer of pointer rxq or txq in
function i40evf_configure_vsi_queues is NULL. The usage of txq[i]
or rxq[0] is valid. This patch fixes this issue.

Fixes: d6b19729093e ("i40evf: support configurable crc stripping")

Signed-off-by: Andy Pei <andy.pei@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev_vf.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 551f6fa61..de29f04cb 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -551,5 +551,5 @@ i40evf_fill_virtchnl_vsi_txq_info(struct virtchnl_txq_info *txq_info,
 	txq_info->vsi_id = vsi_id;
 	txq_info->queue_id = queue_id;
-	if (queue_id < nb_txq) {
+	if (queue_id < nb_txq && txq) {
 		txq_info->ring_len = txq->nb_tx_desc;
 		txq_info->dma_ring_addr = txq->tx_ring_phys_addr;
@@ -568,5 +568,5 @@ i40evf_fill_virtchnl_vsi_rxq_info(struct virtchnl_rxq_info *rxq_info,
 	rxq_info->queue_id = queue_id;
 	rxq_info->max_pkt_size = max_pkt_size;
-	if (queue_id < nb_rxq) {
+	if (queue_id < nb_rxq && rxq) {
 		rxq_info->ring_len = rxq->nb_rx_desc;
 		rxq_info->dma_ring_addr = rxq->rx_ring_phys_addr;
@@ -601,8 +601,9 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
 	for (i = 0, vc_qpi = vc_vqci->qpair; i < nb_qp; i++, vc_qpi++) {
 		i40evf_fill_virtchnl_vsi_txq_info(&vc_qpi->txq,
-			vc_vqci->vsi_id, i, dev->data->nb_tx_queues, txq[i]);
+			vc_vqci->vsi_id, i, dev->data->nb_tx_queues,
+			txq ? txq[i] : NULL);
 		i40evf_fill_virtchnl_vsi_rxq_info(&vc_qpi->rxq,
 			vc_vqci->vsi_id, i, dev->data->nb_rx_queues,
-					vf->max_pkt_len, rxq[i]);
+			vf->max_pkt_len, rxq ? rxq[i] : NULL);
 	}
 	memset(&args, 0, sizeof(args));
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.444315365 +0100
+++ 0010-net-i40e-fix-crash-when-TxQ-RxQ-set-to-0-in-VF.patch	2019-08-27 09:40:10.858145893 +0100
@@ -1 +1 @@
-From 343b8e4adabcfabe282b3fdb419e98f6f9cb0b35 Mon Sep 17 00:00:00 2001
+From 9a920d057ba69f4f44569ab88e3c042091d995f7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 343b8e4adabcfabe282b3fdb419e98f6f9cb0b35 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index d922a8479..5be32b069 100644
+index 551f6fa61..de29f04cb 100644
@@ -25 +26 @@
-@@ -574,5 +574,5 @@ i40evf_fill_virtchnl_vsi_txq_info(struct virtchnl_txq_info *txq_info,
+@@ -551,5 +551,5 @@ i40evf_fill_virtchnl_vsi_txq_info(struct virtchnl_txq_info *txq_info,
@@ -32 +33 @@
-@@ -591,5 +591,5 @@ i40evf_fill_virtchnl_vsi_rxq_info(struct virtchnl_rxq_info *rxq_info,
+@@ -568,5 +568,5 @@ i40evf_fill_virtchnl_vsi_rxq_info(struct virtchnl_rxq_info *rxq_info,
@@ -39 +40 @@
-@@ -624,8 +624,9 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
+@@ -601,8 +601,9 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)

[dpdk-stable] patch 'net/mlx5: fix crash on null operation' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/ddddaf1a3a361afe33d078cc0da1d04630b19320

Thanks.

Kevin Traynor

---
From ddddaf1a3a361afe33d078cc0da1d04630b19320 Mon Sep 17 00:00:00 2001
From: Moti Haimovsky <motih@mellanox.com>
Date: Mon, 1 Jul 2019 12:34:21 +0300
Subject: [PATCH] net/mlx5: fix crash on null operation

[ upstream commit 8f0fa0c0adf5dac18641af89143eabea0662f5a2 ]

mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.

Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")

Signed-off-by: Moti Haimovsky <motih@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 4918bb5ee..5eb6c7b55 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1671,8 +1671,8 @@ flow_null_validate(struct rte_eth_dev *dev __rte_unused,
 		   const struct rte_flow_item items[] __rte_unused,
 		   const struct rte_flow_action actions[] __rte_unused,
-		   struct rte_flow_error *error __rte_unused)
+		   struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
@@ -1681,7 +1681,8 @@ flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
 		  const struct rte_flow_item items[] __rte_unused,
 		  const struct rte_flow_action actions[] __rte_unused,
-		  struct rte_flow_error *error __rte_unused)
+		  struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
+	rte_flow_error_set(error, ENOTSUP,
+			   RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 	return NULL;
 }
@@ -1693,8 +1694,8 @@ flow_null_translate(struct rte_eth_dev *dev __rte_unused,
 		    const struct rte_flow_item items[] __rte_unused,
 		    const struct rte_flow_action actions[] __rte_unused,
-		    struct rte_flow_error *error __rte_unused)
+		    struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
@@ -1702,8 +1703,8 @@ static int
 flow_null_apply(struct rte_eth_dev *dev __rte_unused,
 		struct rte_flow *flow __rte_unused,
-		struct rte_flow_error *error __rte_unused)
+		struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
@@ -1725,8 +1726,8 @@ flow_null_query(struct rte_eth_dev *dev __rte_unused,
 		const struct rte_flow_action *actions __rte_unused,
 		void *data __rte_unused,
-		struct rte_flow_error *error __rte_unused)
+		struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.496819935 +0100
+++ 0011-net-mlx5-fix-crash-on-null-operation.patch	2019-08-27 09:40:10.862145796 +0100
@@ -1 +1 @@
-From 8f0fa0c0adf5dac18641af89143eabea0662f5a2 Mon Sep 17 00:00:00 2001
+From ddddaf1a3a361afe33d078cc0da1d04630b19320 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f0fa0c0adf5dac18641af89143eabea0662f5a2 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index c03eb4c37..251da41c0 100644
+index 4918bb5ee..5eb6c7b55 100644
@@ -27 +28 @@
-@@ -1695,8 +1695,8 @@ flow_null_validate(struct rte_eth_dev *dev __rte_unused,
+@@ -1671,8 +1671,8 @@ flow_null_validate(struct rte_eth_dev *dev __rte_unused,
@@ -39 +40 @@
-@@ -1705,7 +1705,8 @@ flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
+@@ -1681,7 +1681,8 @@ flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
@@ -50 +51 @@
-@@ -1717,8 +1718,8 @@ flow_null_translate(struct rte_eth_dev *dev __rte_unused,
+@@ -1693,8 +1694,8 @@ flow_null_translate(struct rte_eth_dev *dev __rte_unused,
@@ -62 +63 @@
-@@ -1726,8 +1727,8 @@ static int
+@@ -1702,8 +1703,8 @@ static int
@@ -74 +75 @@
-@@ -1749,8 +1750,8 @@ flow_null_query(struct rte_eth_dev *dev __rte_unused,
+@@ -1725,8 +1726,8 @@ flow_null_query(struct rte_eth_dev *dev __rte_unused,

[dpdk-stable] patch 'net/mlx5: fix condition for link update fallback' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/922f0d11369dc4204790d4a7ce9ca7eb4615c427

Thanks.

Kevin Traynor

---
From 922f0d11369dc4204790d4a7ce9ca7eb4615c427 Mon Sep 17 00:00:00 2001
From: Asaf Penso <asafp@mellanox.com>
Date: Wed, 19 Jun 2019 09:52:45 +0000
Subject: [PATCH] net/mlx5: fix condition for link update fallback

[ upstream commit cb1d2cce9539f1131a01585888903ab3546d51d9 ]

mlx5_link_update uses the newer ethtool command
ETHTOOL_GLINKSETTINGS to determine interface capabilities but falls
back to the older (deprecated) ETHTOOL_GSET command if the new
method fails for any reason.
The older method only supports reporting of capabilities up to 40G.

However, mlx5_link_update_unlocked_gs can return a failure for a
number of reasons (including the link being down).
Using the older method in cases of transient failure of the method
can result in reporting of reduced capabilities to the application.

The older method (mlx5_link_update_unlocked_gset) should only be
invoked if the newer method returns EOPNOTSUPP.

Fixes: 7d2e32f76cfc ("net/mlx5: fix ethtool link setting call order")

Reported-by: Srinivas Narayan <srinivas.narayan@att.com>
Signed-off-by: Asaf Penso <asafp@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index fb8e313a2..6a5bef117 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -803,5 +803,5 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 	do {
 		ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
-		if (ret)
+		if (ret == -ENOTSUP)
 			ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
 		if (ret == 0)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.550265413 +0100
+++ 0012-net-mlx5-fix-condition-for-link-update-fallback.patch	2019-08-27 09:40:10.863145772 +0100
@@ -1 +1 @@
-From cb1d2cce9539f1131a01585888903ab3546d51d9 Mon Sep 17 00:00:00 2001
+From 922f0d11369dc4204790d4a7ce9ca7eb4615c427 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cb1d2cce9539f1131a01585888903ab3546d51d9 ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 0c7162d7e..eeefe4df3 100644
+index fb8e313a2..6a5bef117 100644
@@ -34 +35 @@
-@@ -1052,5 +1052,5 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
+@@ -803,5 +803,5 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)

[dpdk-stable] patch 'net/mlx5: check memory allocation in flow creation' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/6b4c2b9eabf1dda85801605c3018f38055d63f78

Thanks.

Kevin Traynor

---
From 6b4c2b9eabf1dda85801605c3018f38055d63f78 Mon Sep 17 00:00:00 2001
From: Asaf Penso <asafp@mellanox.com>
Date: Wed, 19 Jun 2019 09:46:24 +0000
Subject: [PATCH] net/mlx5: check memory allocation in flow creation

[ upstream commit 3f22e3153fb5bd1ae2eebfa77678117eb15b33d8 ]

rte_calloc functions returns a non-null pointer in case of
success and null pointer in case of failure.

The return value should be checked and the function flow
should take that into consideration.

This patch adds a check for rte_calloc return value in function
flow_list_create.

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

Signed-off-by: Asaf Penso <asafp@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 5eb6c7b55..de8a77686 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2070,4 +2070,8 @@ flow_list_create(struct rte_eth_dev *dev, struct mlx5_flows *list,
 		flow_size += RTE_ALIGN_CEIL(sizeof(uint16_t), sizeof(void *));
 	flow = rte_calloc(__func__, 1, flow_size, 0);
+	if (!flow) {
+		rte_errno = ENOMEM;
+		return NULL;
+	}
 	flow->drv_type = flow_get_drv_type(dev, attr);
 	assert(flow->drv_type > MLX5_FLOW_TYPE_MIN &&
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.610319577 +0100
+++ 0013-net-mlx5-check-memory-allocation-in-flow-creation.patch	2019-08-27 09:40:10.866145699 +0100
@@ -1 +1 @@
-From 3f22e3153fb5bd1ae2eebfa77678117eb15b33d8 Mon Sep 17 00:00:00 2001
+From 6b4c2b9eabf1dda85801605c3018f38055d63f78 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3f22e3153fb5bd1ae2eebfa77678117eb15b33d8 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index cd04c446b..dc4825279 100644
+index 5eb6c7b55..de8a77686 100644
@@ -28 +29 @@
-@@ -2092,4 +2092,8 @@ flow_list_create(struct rte_eth_dev *dev, struct mlx5_flows *list,
+@@ -2070,4 +2070,8 @@ flow_list_create(struct rte_eth_dev *dev, struct mlx5_flows *list,
@@ -36 +37 @@
- 	flow->ingress = attr->ingress;
+ 	assert(flow->drv_type > MLX5_FLOW_TYPE_MIN &&

[dpdk-stable] patch 'app/testpmd: fix parsing RSS queue rule' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/fdedb6180886c2326db6d7b19b3db0d8c9397055

Thanks.

Kevin Traynor

---
From fdedb6180886c2326db6d7b19b3db0d8c9397055 Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang@intel.com>
Date: Tue, 25 Jun 2019 18:38:03 +0800
Subject: [PATCH] app/testpmd: fix parsing RSS queue rule

[ upstream commit 9a45c4981c351bdef78a69d1f7b7788f2614913f ]

Declare a local variable 'arg' to hold the pointer to ARGS_ENTRY_ARB,
otherwise, the pop 'arg' in 'parse_int' holds wrong data like 'arg->
offset = 5912737, arg->size = 0', this caused the parse failure.

If calling like 'push_args(ctx, ARGS_ENTRY_ARB..)', the below code for
assigning 'offset & size' will be missed for some gcc optimization.

parse_vc_action_rss_queue
    29c5:	c5 f9 ef c0          	vpxor  %xmm0,%xmm0,%xmm0
    29c9:	43 8d 44 24 68       	lea    0x68(%r12,%r12,1),%eax
    29ce:	48 c7 44 24 20 00 00 	movq   $0x0,0x20(%rsp)
    29d5:	00 00
    29d7:	c5 f8 29 44 24 10    	vmovaps %xmm0,0x10(%rsp)
    29dd:	89 44 24 18          	mov    %eax,0x18(%rsp)
    29e1:	48 63 83 0c 01 00 00 	movslq 0x10c(%rbx),%rax
    29e8:	c7 44 24 1c 02 00 00 	movl   $0x2,0x1c(%rsp)
    29ef:	00
    29f0:	c5 f8 29 04 24       	vmovaps %xmm0,(%rsp)

The above assembly code is from this modification with:
    gcc version 9.1.1 20190503 (Red Hat 9.1.1-1) (GCC)
    Fedora release 30 (Thirty)
    5.1.11-300.fc30.x86_64

Fixes: d0ad8648b1c5 ("app/testpmd: fix RSS flow action configuration")

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/cmdline_flow.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index fe5bda9dc..d1fd27327 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -3379,4 +3379,5 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token,
 	static const enum index next[] = NEXT_ENTRY(ACTION_RSS_QUEUE);
 	struct action_rss_data *action_rss_data;
+	const struct arg *arg;
 	int ret;
 	int i;
@@ -3394,8 +3395,8 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token,
 	if (i >= ACTION_RSS_QUEUE_NUM)
 		return -1;
-	if (push_args(ctx,
-		      ARGS_ENTRY_ARB(offsetof(struct action_rss_data, queue) +
-				     i * sizeof(action_rss_data->queue[i]),
-				     sizeof(action_rss_data->queue[i]))))
+	arg = ARGS_ENTRY_ARB(offsetof(struct action_rss_data, queue) +
+			     i * sizeof(action_rss_data->queue[i]),
+			     sizeof(action_rss_data->queue[i]));
+	if (push_args(ctx, arg))
 		return -1;
 	ret = parse_int(ctx, token, str, len, NULL, 0);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.667680895 +0100
+++ 0014-app-testpmd-fix-parsing-RSS-queue-rule.patch	2019-08-27 09:40:10.872145553 +0100
@@ -1 +1 @@
-From 9a45c4981c351bdef78a69d1f7b7788f2614913f Mon Sep 17 00:00:00 2001
+From fdedb6180886c2326db6d7b19b3db0d8c9397055 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9a45c4981c351bdef78a69d1f7b7788f2614913f ]
+
@@ -31 +32,0 @@
-Cc: stable@dpdk.org
@@ -41 +42 @@
-index 4e5fa7a2d..e3e8448c9 100644
+index fe5bda9dc..d1fd27327 100644
@@ -44 +45 @@
-@@ -3479,4 +3479,5 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token,
+@@ -3379,4 +3379,5 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token,
@@ -50 +51 @@
-@@ -3494,8 +3495,8 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token,
+@@ -3394,8 +3395,8 @@ parse_vc_action_rss_queue(struct context *ctx, const struct token *token,

[dpdk-stable] patch 'app/testpmd: fix queue offload configuration' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/78220641288f731cf8eaa44dab1d733f2d4622d3

Thanks.

Kevin Traynor

---
From 78220641288f731cf8eaa44dab1d733f2d4622d3 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Thu, 4 Jul 2019 13:35:37 +0800
Subject: [PATCH] app/testpmd: fix queue offload configuration

[ upstream commit 74453ac9ef67575284e0449ca24aada540505a89 ]

When adding offloads from commandline, not only port
related configuration bits should be set, but also queue
related offloads configuration bits, or it will cause error.
For example, test in this process for ixgbe:
(1)./x86_64-native-linuxapp-gcc/app/testpmd -c 0x6 -n 4
-- -i --portmask=0x1 --port-topology=loop --disable-crc-strip
(2)port stop all
(3)port config all crc-strip on
(4)port start all
we will see "Fail to configure port 0 rx queues" of warning info.

Fixes: 0074d02fca21 ("app/testpmd: convert to new Rx offloads API")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/cmdline.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index eeadb2de4..2eb2fd6ae 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2043,4 +2043,5 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
 	struct cmd_config_rx_mode_flag *res = parsed_result;
 	portid_t pid;
+	int k;
 
 	if (!all_ports_stopped()) {
@@ -2143,4 +2144,8 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
 		}
 		port->dev_conf.rxmode.offloads = rx_offloads;
+		/* Apply Rx offloads configuration */
+		for (k = 0; k < port->dev_info.max_rx_queues; k++)
+			port->rx_conf[k].offloads =
+				port->dev_conf.rxmode.offloads;
 	}
 
@@ -4355,4 +4360,15 @@ csum_show(int port_id)
 }
 
+static void
+cmd_config_queue_tx_offloads(struct rte_port *port)
+{
+	int k;
+
+	/* Apply queue tx offloads configuration */
+	for (k = 0; k < port->dev_info.max_rx_queues; k++)
+		port->tx_conf[k].offloads =
+			port->dev_conf.txmode.offloads;
+}
+
 static void
 cmd_csum_parsed(void *parsed_result,
@@ -4439,4 +4455,5 @@ cmd_csum_parsed(void *parsed_result,
 							(~csum_offloads);
 		}
+		cmd_config_queue_tx_offloads(&ports[res->port_id]);
 	}
 	csum_show(res->port_id);
@@ -4590,4 +4607,5 @@ cmd_tso_set_parsed(void *parsed_result,
 			ports[res->port_id].tso_segsz);
 	}
+	cmd_config_queue_tx_offloads(&ports[res->port_id]);
 
 	/* display warnings if configuration is not supported by the NIC */
@@ -4745,4 +4763,5 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
 	}
 
+	cmd_config_queue_tx_offloads(&ports[res->port_id]);
 	cmd_reconfig_device_queue(res->port_id, 1, 1);
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.726756315 +0100
+++ 0015-app-testpmd-fix-queue-offload-configuration.patch	2019-08-27 09:40:10.890145117 +0100
@@ -1 +1 @@
-From 74453ac9ef67575284e0449ca24aada540505a89 Mon Sep 17 00:00:00 2001
+From 78220641288f731cf8eaa44dab1d733f2d4622d3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 74453ac9ef67575284e0449ca24aada540505a89 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index cbde5d2ae..01dd45f27 100644
+index eeadb2de4..2eb2fd6ae 100644
@@ -30 +31 @@
-@@ -2048,4 +2048,5 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
+@@ -2043,4 +2043,5 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
@@ -36 +37 @@
-@@ -2148,4 +2149,8 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
+@@ -2143,4 +2144,8 @@ cmd_config_rx_mode_flag_parsed(void *parsed_result,
@@ -45 +46 @@
-@@ -4360,4 +4365,15 @@ csum_show(int port_id)
+@@ -4355,4 +4360,15 @@ csum_show(int port_id)
@@ -61 +62 @@
-@@ -4444,4 +4460,5 @@ cmd_csum_parsed(void *parsed_result,
+@@ -4439,4 +4455,5 @@ cmd_csum_parsed(void *parsed_result,
@@ -67 +68 @@
-@@ -4595,4 +4612,5 @@ cmd_tso_set_parsed(void *parsed_result,
+@@ -4590,4 +4607,5 @@ cmd_tso_set_parsed(void *parsed_result,
@@ -73 +74 @@
-@@ -4750,4 +4768,5 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,
+@@ -4745,4 +4763,5 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,

[dpdk-stable] patch 'compress/isal: fix use after free' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/e05f689f71cc1df8b4cfef55fe8d07220315c17d

Thanks.

Kevin Traynor

---
From e05f689f71cc1df8b4cfef55fe8d07220315c17d Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 21 May 2019 07:47:13 -0700
Subject: [PATCH] compress/isal: fix use after free

[ upstream commit abdb798ae22ee4374e9152580f22ff5fb42193a0 ]

The release function was using qp->stream after already
releasing it and the null pointer checking was missing.

Also since rte_free(NULL) is a no-op, remove unnecessary
checks for NULL.

Coverity issure: 340860
Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Lee Daly <lee.daly@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 drivers/compress/isal/isal_compress_pmd_ops.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c
index 472e54e8e..a395a660d 100644
--- a/drivers/compress/isal/isal_compress_pmd_ops.c
+++ b/drivers/compress/isal/isal_compress_pmd_ops.c
@@ -170,16 +170,10 @@ isal_comp_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
 		return -EINVAL;
 
-	if (qp->stream != NULL)
-		rte_free(qp->stream);
-
-	if (qp->stream->level_buf != NULL)
+	if (qp->stream)
 		rte_free(qp->stream->level_buf);
 
-	if (qp->state != NULL)
-		rte_free(qp->state);
-
-	if (qp->processed_pkts != NULL)
-		rte_ring_free(qp->processed_pkts);
-
+	rte_free(qp->state);
+	rte_ring_free(qp->processed_pkts);
+	rte_free(qp->stream);
 	rte_free(qp);
 	dev->data->queue_pairs[qp_id] = NULL;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.797327121 +0100
+++ 0016-compress-isal-fix-use-after-free.patch	2019-08-27 09:40:10.891145092 +0100
@@ -1 +1 @@
-From abdb798ae22ee4374e9152580f22ff5fb42193a0 Mon Sep 17 00:00:00 2001
+From e05f689f71cc1df8b4cfef55fe8d07220315c17d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit abdb798ae22ee4374e9152580f22ff5fb42193a0 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index fe9995992..77ac6fcf2 100644
+index 472e54e8e..a395a660d 100644
@@ -27 +28 @@
-@@ -172,16 +172,10 @@ isal_comp_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id)
+@@ -170,16 +170,10 @@ isal_comp_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id)

[dpdk-stable] patch 'doc: cleanup test removal in armv8 and openssl guides' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/9ca3bd360c760fe32bdd8d74b87774ef203132c6

Thanks.

Kevin Traynor

---
From 9ca3bd360c760fe32bdd8d74b87774ef203132c6 Mon Sep 17 00:00:00 2001
From: Thierry Herbelot <thierry.herbelot@6wind.com>
Date: Wed, 22 May 2019 11:44:45 +0200
Subject: [PATCH] doc: cleanup test removal in armv8 and openssl guides

[ upstream commit 29d11460503617b7bc42b07577003130ed7b59a8 ]

The perf tests were removed in a previous commit.

Fixes: 2ac67c32837a ("test/crypto: remove crypto perf tests")

Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 doc/guides/cryptodevs/armv8.rst   | 1 -
 doc/guides/cryptodevs/openssl.rst | 1 -
 2 files changed, 2 deletions(-)

diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst
index 725398daf..81d7f8eea 100644
--- a/doc/guides/cryptodevs/armv8.rst
+++ b/doc/guides/cryptodevs/armv8.rst
@@ -60,5 +60,4 @@ crypto processing.
 
 Test name is cryptodev_sw_armv8_autotest.
-For performance test cryptodev_sw_armv8_perftest can be used.
 
 Limitations
diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst
index 2ac8090cc..f9a54fe76 100644
--- a/doc/guides/cryptodevs/openssl.rst
+++ b/doc/guides/cryptodevs/openssl.rst
@@ -88,5 +88,4 @@ crypto processing.
 
 Test name is cryptodev_openssl_autotest.
-For performance test cryptodev_openssl_perftest can be used.
 For asymmetric crypto operations testing, run cryptodev_openssl_asym_autotest.
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.846565050 +0100
+++ 0017-doc-cleanup-test-removal-in-armv8-and-openssl-guides.patch	2019-08-27 09:40:10.892145068 +0100
@@ -1 +1 @@
-From 29d11460503617b7bc42b07577003130ed7b59a8 Mon Sep 17 00:00:00 2001
+From 9ca3bd360c760fe32bdd8d74b87774ef203132c6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 29d11460503617b7bc42b07577003130ed7b59a8 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index e60af8400..1ab40096e 100644
+index 725398daf..81d7f8eea 100644
@@ -29 +30 @@
-index d7269870b..740729481 100644
+index 2ac8090cc..f9a54fe76 100644

[dpdk-stable] patch 'crypto/mvsam: fix typo in comment' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/3220ea9a0a78d33af583884e973e3b31a10a8ac9

Thanks.

Kevin Traynor

---
From 3220ea9a0a78d33af583884e973e3b31a10a8ac9 Mon Sep 17 00:00:00 2001
From: Thierry Herbelot <thierry.herbelot@6wind.com>
Date: Wed, 22 May 2019 11:44:46 +0200
Subject: [PATCH] crypto/mvsam: fix typo in comment

[ upstream commit 90ea7e6dd519b716aa2d2ba36b3776d18796d303 ]

Inverted letters.

Fixes: 8a61c83af2fa ("crypto/mrvl: add mrvl crypto driver")

Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
Acked-by: Tomasz Duszynski <tdu@semihalf.com>
---
 drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
index 9956f051f..0e7ade60b 100644
--- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
+++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c
@@ -727,5 +727,5 @@ mrvl_crypto_pmd_sym_session_get_size(__rte_unused struct rte_cryptodev *dev)
  *
  * @param dev Pointer to the device structure.
- * @param xform Pointer to the crytpo configuration structure.
+ * @param xform Pointer to the crypto configuration structure.
  * @param sess Pointer to the empty session structure.
  * @returns 0 upon success, negative value otherwise.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.904317337 +0100
+++ 0018-crypto-mvsam-fix-typo-in-comment.patch	2019-08-27 09:40:10.892145068 +0100
@@ -1 +1 @@
-From 90ea7e6dd519b716aa2d2ba36b3776d18796d303 Mon Sep 17 00:00:00 2001
+From 3220ea9a0a78d33af583884e973e3b31a10a8ac9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 90ea7e6dd519b716aa2d2ba36b3776d18796d303 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index ef520356f..f6bf2cd4c 100644
+index 9956f051f..0e7ade60b 100644
@@ -21 +22 @@
-@@ -728,5 +728,5 @@ mrvl_crypto_pmd_sym_session_get_size(__rte_unused struct rte_cryptodev *dev)
+@@ -727,5 +727,5 @@ mrvl_crypto_pmd_sym_session_get_size(__rte_unused struct rte_cryptodev *dev)

[dpdk-stable] patch 'doc: fix triplicated typo in prog guides' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/8230cee9c82aa16daef351a801ad8fd75dc11586

Thanks.

Kevin Traynor

---
From 8230cee9c82aa16daef351a801ad8fd75dc11586 Mon Sep 17 00:00:00 2001
From: Thierry Herbelot <thierry.herbelot@6wind.com>
Date: Wed, 22 May 2019 11:44:47 +0200
Subject: [PATCH] doc: fix triplicated typo in prog guides

[ upstream commit 8b283e90e6953fe321644c2ba3abf68d154d3cd1 ]

A bad formula was copied and pasted.

Fixes: 4935e1e9f76e ("bbdev: introduce wireless base band device lib")
Fixes: 0318c02b57cf ("doc: add cryptodev chapter in prog guide")
Fixes: a9bb0c44c775 ("doc: add rawdev library guide and doxygen page")

Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 doc/guides/prog_guide/bbdev.rst         | 2 +-
 doc/guides/prog_guide/cryptodev_lib.rst | 2 +-
 doc/guides/prog_guide/rawdev.rst        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index 658ffd400..dfa0ef67d 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -45,5 +45,5 @@ From the command line using the --vdev EAL option
    --vdev 'baseband_turbo_sw,max_nb_queues=8,socket_id=0'
 
-Our using the rte_vdev_init API within the application code.
+Or using the rte_vdev_init API within the application code.
 
 .. code-block:: c
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst
index 23770ffd4..09828aca6 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -53,5 +53,5 @@ From the command line using the --vdev EAL option
    Example: ``--vdev  'crypto_aesni_mb0' --vdev  'crypto_aesni_mb1'``
 
-Our using the rte_vdev_init API within the application code.
+Or using the rte_vdev_init API within the application code.
 
 .. code-block:: c
diff --git a/doc/guides/prog_guide/rawdev.rst b/doc/guides/prog_guide/rawdev.rst
index 42c195cef..06af6942a 100644
--- a/doc/guides/prog_guide/rawdev.rst
+++ b/doc/guides/prog_guide/rawdev.rst
@@ -101,5 +101,5 @@ From the command line using the --vdev EAL option
    --vdev 'rawdev_dev1'
 
-Our using the rte_vdev_init API within the application code.
+Or using the rte_vdev_init API within the application code.
 
 .. code-block:: c
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.953915601 +0100
+++ 0019-doc-fix-triplicated-typo-in-prog-guides.patch	2019-08-27 09:40:10.895144995 +0100
@@ -1 +1 @@
-From 8b283e90e6953fe321644c2ba3abf68d154d3cd1 Mon Sep 17 00:00:00 2001
+From 8230cee9c82aa16daef351a801ad8fd75dc11586 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8b283e90e6953fe321644c2ba3abf68d154d3cd1 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 038bc6ed1..27d7f04d0 100644
+index 658ffd400..dfa0ef67d 100644
@@ -33 +34 @@
-index 23fa5bc18..9bbf20764 100644
+index 23770ffd4..09828aca6 100644

[dpdk-stable] patch 'doc: fix grammar in prog guides' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/0d353ff3b699c7728689475a67be1ec0ca5128e1

Thanks.

Kevin Traynor

---
From 0d353ff3b699c7728689475a67be1ec0ca5128e1 Mon Sep 17 00:00:00 2001
From: Thierry Herbelot <thierry.herbelot@6wind.com>
Date: Wed, 22 May 2019 11:44:48 +0200
Subject: [PATCH] doc: fix grammar in prog guides

[ upstream commit 6b1a74ef805fd48486e2af6d7ca2439adff484c3 ]

A copy'n'paste typo was present in three guides.

Fixes: a584d3bea902 ("doc: add compressdev library guide")
Fixes: 4935e1e9f76e ("bbdev: introduce wireless base band device lib")
Fixes: 0318c02b57cf ("doc: add cryptodev chapter in prog guide")

Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
Acked-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 doc/guides/prog_guide/bbdev.rst         | 2 +-
 doc/guides/prog_guide/compressdev.rst   | 2 +-
 doc/guides/prog_guide/cryptodev_lib.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index dfa0ef67d..12e948a20 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -285,5 +285,5 @@ device. The dequeue burst API will retrieve any processed operations available
 from the queue on the bbdev device, from physical devices this is usually
 directly from the device's processed queue, and for virtual device's from a
-``rte_ring`` where processed operations are place after being processed on the
+``rte_ring`` where processed operations are placed after being processed on the
 enqueue call.
 
diff --git a/doc/guides/prog_guide/compressdev.rst b/doc/guides/prog_guide/compressdev.rst
index 3ba4238ce..0f572f970 100644
--- a/doc/guides/prog_guide/compressdev.rst
+++ b/doc/guides/prog_guide/compressdev.rst
@@ -569,5 +569,5 @@ device. The dequeue burst API will retrieve any processed operations available
 from the queue pair on the compression device, from physical devices this is usually
 directly from the devices processed queue, and for virtual device's from a
-``rte_ring`` where processed operations are place after being processed on the
+``rte_ring`` where processed operations are placed after being processed on the
 enqueue call.
 
diff --git a/doc/guides/prog_guide/cryptodev_lib.rst b/doc/guides/prog_guide/cryptodev_lib.rst
index 09828aca6..7a95053ad 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -295,5 +295,5 @@ device. The dequeue burst API will retrieve any processed operations available
 from the queue pair on the Crypto device, from physical devices this is usually
 directly from the devices processed queue, and for virtual device's from a
-``rte_ring`` where processed operations are place after being processed on the
+``rte_ring`` where processed operations are placed after being processed on the
 enqueue call.
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.005718135 +0100
+++ 0020-doc-fix-grammar-in-prog-guides.patch	2019-08-27 09:40:10.898144922 +0100
@@ -1 +1 @@
-From 6b1a74ef805fd48486e2af6d7ca2439adff484c3 Mon Sep 17 00:00:00 2001
+From 0d353ff3b699c7728689475a67be1ec0ca5128e1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6b1a74ef805fd48486e2af6d7ca2439adff484c3 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 27d7f04d0..607d2e7db 100644
+index dfa0ef67d..12e948a20 100644
@@ -34 +35 @@
-index a06c835a0..07332d004 100644
+index 3ba4238ce..0f572f970 100644
@@ -45 +46 @@
-index 9bbf20764..2839244c5 100644
+index 09828aca6..7a95053ad 100644
@@ -48 +49 @@
-@@ -305,5 +305,5 @@ device. The dequeue burst API will retrieve any processed operations available
+@@ -295,5 +295,5 @@ device. The dequeue burst API will retrieve any processed operations available

[dpdk-stable] patch 'drivers: fix typo in NXP comments' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/1eec32d234e8d35a05e5984dd42a273d2c9a1788

Thanks.

Kevin Traynor

---
From 1eec32d234e8d35a05e5984dd42a273d2c9a1788 Mon Sep 17 00:00:00 2001
From: Thierry Herbelot <thierry.herbelot@6wind.com>
Date: Wed, 22 May 2019 11:44:49 +0200
Subject: [PATCH] drivers: fix typo in NXP comments

[ upstream commit a1f42a9dd7c6443853c92f4ca587d0c8e5ec5f94 ]

Fix another copy'n'paste typo.

Fixes: 531b17a780dc ("bus/fslmc: add QBMAN driver to bus")
Fixes: 6ef6beca8844 ("crypto/caam_jr: add enqueue/dequeue operations")
Fixes: c3e85bdcc6e6 ("crypto/dpaa_sec: add crypto driver for NXP DPAA platform")

Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h | 2 +-
 drivers/crypto/caam_jr/caam_jr.c                   | 2 +-
 drivers/crypto/dpaa_sec/dpaa_sec.c                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h b/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h
index 10c72e048..00b353a2b 100644
--- a/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h
+++ b/drivers/bus/fslmc/qbman/include/fsl_qbman_portal.h
@@ -16,5 +16,5 @@
  *   command etc.
  * - Dequeue, including setting the dequeue descriptor, issuing dequeue command,
- *   parsing the dequeue response in DQRR and memeory, parsing the state change
+ *   parsing the dequeue response in DQRR and memory, parsing the state change
  *   notifications etc.
  * - Release, including setting the release descriptor, and issuing the buffer
diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index efc69b6eb..a4e70babf 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -71,5 +71,5 @@ caam_jr_op_ending(struct caam_jr_op_ctx *ctx)
 {
 	PMD_INIT_FUNC_TRACE();
-	/* report op status to sym->op and then free the ctx memeory  */
+	/* report op status to sym->op and then free the ctx memory  */
 	rte_mempool_put(ctx->ctx_pool, (void *)ctx);
 }
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 10201c58c..742e24c52 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -61,5 +61,5 @@ dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx)
 	}
 
-	/* report op status to sym->op and then free the ctx memeory  */
+	/* report op status to sym->op and then free the ctx memory  */
 	rte_mempool_put(ctx->ctx_pool, (void *)ctx);
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.064718213 +0100
+++ 0021-drivers-fix-typo-in-NXP-comments.patch	2019-08-27 09:40:10.904144777 +0100
@@ -1 +1 @@
-From a1f42a9dd7c6443853c92f4ca587d0c8e5ec5f94 Mon Sep 17 00:00:00 2001
+From 1eec32d234e8d35a05e5984dd42a273d2c9a1788 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a1f42a9dd7c6443853c92f4ca587d0c8e5ec5f94 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 07b8a4372..c35dafedb 100644
+index 10c72e048..00b353a2b 100644
@@ -33 +34 @@
-index 5028bd2a4..77c030347 100644
+index efc69b6eb..a4e70babf 100644
@@ -44 +45 @@
-index d9a7cd8a4..122c80a07 100644
+index 10201c58c..742e24c52 100644
@@ -47 +48 @@
-@@ -62,5 +62,5 @@ dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx)
+@@ -61,5 +61,5 @@ dpaa_sec_op_ending(struct dpaa_sec_op_ctx *ctx)

[dpdk-stable] patch 'crypto/qat: set message field to zero in sym SGL case' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/978f0e8c81245005bc619bf9951de10022df0dc7

Thanks.

Kevin Traynor

---
From 978f0e8c81245005bc619bf9951de10022df0dc7 Mon Sep 17 00:00:00 2001
From: Gosia Bakota <gosia.bakota@intel.com>
Date: Wed, 12 Jun 2019 18:31:41 +0100
Subject: [PATCH] crypto/qat: set message field to zero in sym SGL case

[ upstream commit 22606a96e9d8b1a0678cf812cbc7310963721125 ]

Fixes: e09231eaa2af ("crypto/qat: add SGL capability")

Signed-off-by: Gosia Bakota <gosia.bakota@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 drivers/crypto/qat/qat_sym.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c
index 8801ca567..7515a55d0 100644
--- a/drivers/crypto/qat/qat_sym.c
+++ b/drivers/crypto/qat/qat_sym.c
@@ -531,4 +531,6 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,
 					cookie->qat_sgl_dst_phys_addr;
 		}
+		qat_req->comn_mid.src_length = 0;
+		qat_req->comn_mid.dst_length = 0;
 	} else {
 		qat_req->comn_mid.src_data_addr = src_buf_start;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.122467000 +0100
+++ 0022-crypto-qat-set-message-field-to-zero-in-sym-SGL-case.patch	2019-08-27 09:40:10.904144777 +0100
@@ -1 +1 @@
-From 22606a96e9d8b1a0678cf812cbc7310963721125 Mon Sep 17 00:00:00 2001
+From 978f0e8c81245005bc619bf9951de10022df0dc7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 22606a96e9d8b1a0678cf812cbc7310963721125 ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'app/crypto-perf: fix CSV format' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/c61472d0f3e24fcb5eee557a3e6edcf2b45195dd

Thanks.

Kevin Traynor

---
From c61472d0f3e24fcb5eee557a3e6edcf2b45195dd Mon Sep 17 00:00:00 2001
From: Ankur Dwivedi <adwivedi@marvell.com>
Date: Wed, 29 May 2019 11:50:58 +0530
Subject: [PATCH] app/crypto-perf: fix CSV format

[ upstream commit b29185bcbbf313c4503991358c646a5dad77400e ]

The format for printing float is incorrect for the following fields
in pmd-cyclecount test: Cycles/Op,Cycles/Enq,Cycles/Deq.

Currently, the format is %.f3. This format will round off the number to
the nearest integer and append a 3 after that.

This patch changes the format to %.3f. This will print the number as a
floating point with a precision of 3 fractional digits.

Fixes: 96dfeb609be1 ("app/crypto-perf: add new PMD benchmarking mode")

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
---
 app/test-crypto-perf/cperf_test_pmd_cyclecount.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
index c8d16db6d..c87ae7d36 100644
--- a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
+++ b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
@@ -17,5 +17,5 @@
 #define PRETTY_LINE_FMT "%12u%12u%12u%12u%12u%12u%12u%12.0f%12.0f%12.0f\n"
 #define CSV_HDR_FMT "%s,%s,%s,%s,%s,%s,%s,%s,%s,%s\n"
-#define CSV_LINE_FMT "%10u;%10u;%u;%u;%u;%u;%u;%.f3;%.f3;%.f3\n"
+#define CSV_LINE_FMT "%10u;%10u;%u;%u;%u;%u;%u;%.3f;%.3f;%.3f\n"
 
 struct cperf_pmd_cyclecount_ctx {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.172383134 +0100
+++ 0023-app-crypto-perf-fix-CSV-format.patch	2019-08-27 09:40:10.905144752 +0100
@@ -1 +1 @@
-From b29185bcbbf313c4503991358c646a5dad77400e Mon Sep 17 00:00:00 2001
+From c61472d0f3e24fcb5eee557a3e6edcf2b45195dd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b29185bcbbf313c4503991358c646a5dad77400e ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 92af5ec90..f08a22631 100644
+index c8d16db6d..c87ae7d36 100644

[dpdk-stable] patch 'crypto/openssl: fix usage of non constant time memcmp' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/76659ab156f8e758946c80184b6db2b3460953e0

Thanks.

Kevin Traynor

---
From 76659ab156f8e758946c80184b6db2b3460953e0 Mon Sep 17 00:00:00 2001
From: Arek Kusztal <arkadiuszx.kusztal@intel.com>
Date: Fri, 31 May 2019 08:59:28 +0200
Subject: [PATCH] crypto/openssl: fix usage of non constant time memcmp

[ upstream commit a3f9fededfca6758abb751d67b11cda660a3399a ]

ANSI C memcmp is not constant time function per spec so it should
be avoided in cryptography usage.

Fixes: d61f70b4c918 ("crypto/libcrypto: add driver for OpenSSL library")

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

diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c
index 5b27bb919..d072d8084 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd.c
@@ -1529,5 +1529,5 @@ process_openssl_auth_op(struct openssl_qp *qp, struct rte_crypto_op *op,
 
 	if (sess->auth.operation == RTE_CRYPTO_AUTH_OP_VERIFY) {
-		if (memcmp(dst, op->sym->auth.digest.data,
+		if (CRYPTO_memcmp(dst, op->sym->auth.digest.data,
 				sess->auth.digest_length) != 0) {
 			op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
@@ -1921,5 +1921,5 @@ process_openssl_rsa_op(struct rte_crypto_op *cop,
 				"length of message %zd\n",
 				ret, op->rsa.message.length);
-		if ((ret <= 0) || (memcmp(tmp, op->rsa.message.data,
+		if ((ret <= 0) || (CRYPTO_memcmp(tmp, op->rsa.message.data,
 				op->rsa.message.length))) {
 			OPENSSL_LOG(ERR, "RSA sign Verification failed");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.226239776 +0100
+++ 0024-crypto-openssl-fix-usage-of-non-constant-time-memcmp.patch	2019-08-27 09:40:10.907144704 +0100
@@ -1 +1 @@
-From a3f9fededfca6758abb751d67b11cda660a3399a Mon Sep 17 00:00:00 2001
+From 76659ab156f8e758946c80184b6db2b3460953e0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a3f9fededfca6758abb751d67b11cda660a3399a ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 6504959e6..73ce3833c 100644
+index 5b27bb919..d072d8084 100644
@@ -22 +23 @@
-@@ -1530,5 +1530,5 @@ process_openssl_auth_op(struct openssl_qp *qp, struct rte_crypto_op *op,
+@@ -1529,5 +1529,5 @@ process_openssl_auth_op(struct openssl_qp *qp, struct rte_crypto_op *op,
@@ -29 +30 @@
-@@ -1915,5 +1915,5 @@ process_openssl_rsa_op(struct rte_crypto_op *cop,
+@@ -1921,5 +1921,5 @@ process_openssl_rsa_op(struct rte_crypto_op *cop,

[dpdk-stable] patch 'doc: clarify data plane error handling in compressdev' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/8e5fbdfa04c67425e279d804c9b3bb051387383d

Thanks.

Kevin Traynor

---
From 8e5fbdfa04c67425e279d804c9b3bb051387383d Mon Sep 17 00:00:00 2001
From: Fiona Trahe <fiona.trahe@intel.com>
Date: Wed, 15 May 2019 12:16:07 +0100
Subject: [PATCH] doc: clarify data plane error handling in compressdev

[ upstream commit f7095d41bba6ae30d9756dfbe677256851ff879d ]

Fixed some typos and clarified how errors on ops which
fail to get submitted on the enqueue API should be handled.

Fixes: a584d3bea902 ("doc: add compressdev library guide")

Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Tomasz Jozwiak <tomaszx.jozwiak@intel.com>
Acked-by: Shally Verma <shallyv@marvell.com>
---
 doc/guides/prog_guide/compressdev.rst | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/guides/prog_guide/compressdev.rst b/doc/guides/prog_guide/compressdev.rst
index 0f572f970..0e8d8c3d1 100644
--- a/doc/guides/prog_guide/compressdev.rst
+++ b/doc/guides/prog_guide/compressdev.rst
@@ -202,5 +202,5 @@ Operation Status
 ~~~~~~~~~~~~~~~~
 Each operation carries a status information updated by PMD after it is processed.
-following are currently supported status:
+Following are currently supported:
 
 - RTE_COMP_OP_STATUS_SUCCESS,
@@ -228,4 +228,14 @@ following are currently supported status:
     next op in the stream should continue on from op.consumed+1.
 
+Operation status after enqueue / dequeue
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Some of the above values may arise in the op after an
+``rte_compressdev_enqueue_burst()``. If number ops enqueued < number ops requested then
+the app should check the op.status of nb_enqd+1. If status is RTE_COMP_OP_STATUS_NOT_PROCESSED,
+it likely indicates a full-queue case for a hardware device and a retry after dequeuing some ops is likely
+to be successful. If the op holds any other status, e.g. RTE_COMP_OP_STATUS_INVALID_ARGS, a retry with
+the same op is unlikely to be successful.
+
+
 Produced, Consumed And Operation Status
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -234,6 +244,6 @@ Produced, Consumed And Operation Status
     consumed = amount of data read from input buffer, and
     produced = amount of data written in destination buffer
-- If status is RTE_COMP_OP_STATUS_FAILURE,
-    consumed = produced = 0 or undefined
+- If status is RTE_COMP_OP_STATUS_ERROR,
+    consumed = produced = undefined
 - If status is RTE_COMP_OP_STATUS_OUT_OF_SPACE_TERMINATED,
     consumed = 0 and
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.277229495 +0100
+++ 0025-doc-clarify-data-plane-error-handling-in-compressdev.patch	2019-08-27 09:40:10.908144679 +0100
@@ -1 +1 @@
-From f7095d41bba6ae30d9756dfbe677256851ff879d Mon Sep 17 00:00:00 2001
+From 8e5fbdfa04c67425e279d804c9b3bb051387383d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f7095d41bba6ae30d9756dfbe677256851ff879d ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 07332d004..dd3e40bff 100644
+index 0f572f970..0e8d8c3d1 100644

[dpdk-stable] patch 'crypto/virtio: check PCI config read' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/144158f9c35bed9c49427d1f8bb0b0bfbdf9be57

Thanks.

Kevin Traynor

---
From 144158f9c35bed9c49427d1f8bb0b0bfbdf9be57 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia@intel.com>
Date: Fri, 19 Apr 2019 00:58:34 +0000
Subject: [PATCH] crypto/virtio: check PCI config read

[ upstream commit 691733e72bda85117adf0beb99e12794914fbb84 ]

Fix unchecked return value issue for rte_pci_read_config.

Coverity issue: 302861
Fixes: 25500d4b8076 ("crypto/virtio: support device init")

Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/virtio/virtio_pci.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/virtio/virtio_pci.c b/drivers/crypto/virtio/virtio_pci.c
index 832c465bc..e24ccb607 100644
--- a/drivers/crypto/virtio/virtio_pci.c
+++ b/drivers/crypto/virtio/virtio_pci.c
@@ -398,7 +398,11 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_crypto_hw *hw)
 			break;
 		case VIRTIO_PCI_CAP_NOTIFY_CFG:
-			rte_pci_read_config(dev, &hw->notify_off_multiplier,
+			ret = rte_pci_read_config(dev, &hw->notify_off_multiplier,
 					4, pos + sizeof(cap));
-			hw->notify_base = get_cfg_addr(dev, &cap);
+			if (ret != 4)
+				VIRTIO_CRYPTO_INIT_LOG_ERR(
+					"failed to read notify_off_multiplier: ret %d", ret);
+			else
+				hw->notify_base = get_cfg_addr(dev, &cap);
 			break;
 		case VIRTIO_PCI_CAP_DEVICE_CFG:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.330344884 +0100
+++ 0026-crypto-virtio-check-PCI-config-read.patch	2019-08-27 09:40:10.908144679 +0100
@@ -1 +1 @@
-From 691733e72bda85117adf0beb99e12794914fbb84 Mon Sep 17 00:00:00 2001
+From 144158f9c35bed9c49427d1f8bb0b0bfbdf9be57 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 691733e72bda85117adf0beb99e12794914fbb84 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 0c0c64471..8137b3c5a 100644
+index 832c465bc..e24ccb607 100644

[dpdk-stable] patch 'app/crypto-perf: fix display once detection' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/0f5ef64001a86423f63a462f122acd0d546331f8

Thanks.

Kevin Traynor

---
From 0f5ef64001a86423f63a462f122acd0d546331f8 Mon Sep 17 00:00:00 2001
From: Tomasz Jozwiak <tjozwiakgm@gmail.com>
Date: Sat, 15 Jun 2019 00:28:35 +0200
Subject: [PATCH] app/crypto-perf: fix display once detection

[ upstream commit 90e03347ca7d6d1a0e1b85d71d71ec5ae3b17a90 ]

This patch changes 'only_once' variable to 'display_once',
which should be atomic type due to fact, that all runner functions
can be executed in paraller way on different lcores.

Fixes: df52cb3b6e13 ("app/crypto-perf: move verify as single test type")

Signed-off-by: Tomasz Jozwiak <tjozwiakgm@gmail.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 app/test-crypto-perf/cperf_test_latency.c        | 5 ++---
 app/test-crypto-perf/cperf_test_pmd_cyclecount.c | 8 +++-----
 app/test-crypto-perf/cperf_test_throughput.c     | 8 +++-----
 app/test-crypto-perf/cperf_test_verify.c         | 8 +++-----
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/test-crypto-perf/cperf_test_latency.c b/app/test-crypto-perf/cperf_test_latency.c
index c9c98dc50..ec229bed2 100644
--- a/app/test-crypto-perf/cperf_test_latency.c
+++ b/app/test-crypto-perf/cperf_test_latency.c
@@ -129,5 +129,5 @@ cperf_latency_test_runner(void *arg)
 	uint32_t imix_idx = 0;
 
-	static int only_once;
+	static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
 
 	if (ctx == NULL)
@@ -311,5 +311,5 @@ cperf_latency_test_runner(void *arg)
 
 		if (ctx->options->csv) {
-			if (!only_once)
+			if (rte_atomic16_test_and_set(&display_once))
 				printf("\n# lcore, Buffer Size, Burst Size, Pakt Seq #, "
 						"Packet Size, cycles, time (us)");
@@ -326,5 +326,4 @@ cperf_latency_test_runner(void *arg)
 
 			}
-			only_once = 1;
 		} else {
 			printf("\n# Device %d on lcore %u\n", ctx->dev_id,
diff --git a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
index c87ae7d36..1f700a3d1 100644
--- a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
+++ b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
@@ -391,5 +391,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
 	state.linearize = 0;
 
-	static int only_once;
+	static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
 	static bool warmup = true;
 
@@ -437,5 +437,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
 
 		if (!opts->csv) {
-			if (!only_once)
+			if (rte_atomic16_test_and_set(&display_once))
 				printf(PRETTY_HDR_FMT, "lcore id", "Buf Size",
 						"Burst Size", "Enqueued",
@@ -443,5 +443,4 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
 						"Deq Retries", "Cycles/Op",
 						"Cycles/Enq", "Cycles/Deq");
-			only_once = 1;
 
 			printf(PRETTY_LINE_FMT, state.ctx->lcore_id,
@@ -454,5 +453,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
 					state.cycles_per_deq);
 		} else {
-			if (!only_once)
+			if (rte_atomic16_test_and_set(&display_once))
 				printf(CSV_HDR_FMT, "# lcore id", "Buf Size",
 						"Burst Size", "Enqueued",
@@ -460,5 +459,4 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
 						"Deq Retries", "Cycles/Op",
 						"Cycles/Enq", "Cycles/Deq");
-			only_once = 1;
 
 			printf(CSV_LINE_FMT, state.ctx->lcore_id,
diff --git a/app/test-crypto-perf/cperf_test_throughput.c b/app/test-crypto-perf/cperf_test_throughput.c
index 8766d6e9b..5838f8cf0 100644
--- a/app/test-crypto-perf/cperf_test_throughput.c
+++ b/app/test-crypto-perf/cperf_test_throughput.c
@@ -95,5 +95,5 @@ cperf_throughput_test_runner(void *test_ctx)
 	uint32_t imix_idx = 0;
 
-	static int only_once;
+	static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
 
 	struct rte_crypto_op *ops[ctx->options->max_burst_size];
@@ -262,5 +262,5 @@ cperf_throughput_test_runner(void *test_ctx)
 
 		if (!ctx->options->csv) {
-			if (!only_once)
+			if (rte_atomic16_test_and_set(&display_once))
 				printf("%12s%12s%12s%12s%12s%12s%12s%12s%12s%12s\n\n",
 					"lcore id", "Buf Size", "Burst Size",
@@ -268,5 +268,4 @@ cperf_throughput_test_runner(void *test_ctx)
 					"Failed Deq", "MOps", "Gbps",
 					"Cycles/Buf");
-			only_once = 1;
 
 			printf("%12u%12u%12u%12"PRIu64"%12"PRIu64"%12"PRIu64
@@ -283,10 +282,9 @@ cperf_throughput_test_runner(void *test_ctx)
 					cycles_per_packet);
 		} else {
-			if (!only_once)
+			if (rte_atomic16_test_and_set(&display_once))
 				printf("#lcore id,Buffer Size(B),"
 					"Burst Size,Enqueued,Dequeued,Failed Enq,"
 					"Failed Deq,Ops(Millions),Throughput(Gbps),"
 					"Cycles/Buf\n\n");
-			only_once = 1;
 
 			printf("%u;%u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto-perf/cperf_test_verify.c
index 9134b921e..2f11b73a1 100644
--- a/app/test-crypto-perf/cperf_test_verify.c
+++ b/app/test-crypto-perf/cperf_test_verify.c
@@ -233,5 +233,5 @@ cperf_verify_test_runner(void *test_ctx)
 	uint64_t ops_failed = 0;
 
-	static int only_once;
+	static rte_atomic16_t display_once = RTE_ATOMIC16_INIT(0);
 
 	uint64_t i;
@@ -376,10 +376,9 @@ cperf_verify_test_runner(void *test_ctx)
 
 	if (!ctx->options->csv) {
-		if (!only_once)
+		if (rte_atomic16_test_and_set(&display_once))
 			printf("%12s%12s%12s%12s%12s%12s%12s%12s\n\n",
 				"lcore id", "Buf Size", "Burst size",
 				"Enqueued", "Dequeued", "Failed Enq",
 				"Failed Deq", "Failed Ops");
-		only_once = 1;
 
 		printf("%12u%12u%12u%12"PRIu64"%12"PRIu64"%12"PRIu64
@@ -394,9 +393,8 @@ cperf_verify_test_runner(void *test_ctx)
 				ops_failed);
 	} else {
-		if (!only_once)
+		if (rte_atomic16_test_and_set(&display_once))
 			printf("\n# lcore id, Buffer Size(B), "
 				"Burst Size,Enqueued,Dequeued,Failed Enq,"
 				"Failed Deq,Failed Ops\n");
-		only_once = 1;
 
 		printf("%10u;%10u;%u;%"PRIu64";%"PRIu64";%"PRIu64";%"PRIu64";"
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.378895974 +0100
+++ 0027-app-crypto-perf-fix-display-once-detection.patch	2019-08-27 09:40:10.911144607 +0100
@@ -1 +1 @@
-From 90e03347ca7d6d1a0e1b85d71d71ec5ae3b17a90 Mon Sep 17 00:00:00 2001
+From 0f5ef64001a86423f63a462f122acd0d546331f8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 90e03347ca7d6d1a0e1b85d71d71ec5ae3b17a90 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 0fc3a6680..62478a2df 100644
+index c9c98dc50..ec229bed2 100644
@@ -26 +27 @@
-@@ -130,5 +130,5 @@ cperf_latency_test_runner(void *arg)
+@@ -129,5 +129,5 @@ cperf_latency_test_runner(void *arg)
@@ -33 +34 @@
-@@ -312,5 +312,5 @@ cperf_latency_test_runner(void *arg)
+@@ -311,5 +311,5 @@ cperf_latency_test_runner(void *arg)
@@ -40 +41 @@
-@@ -327,5 +327,4 @@ cperf_latency_test_runner(void *arg)
+@@ -326,5 +326,4 @@ cperf_latency_test_runner(void *arg)
@@ -47 +48 @@
-index f08a22631..74371faa8 100644
+index c87ae7d36..1f700a3d1 100644
@@ -50 +51 @@
-@@ -392,5 +392,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
+@@ -391,5 +391,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
@@ -57 +58 @@
-@@ -438,5 +438,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
+@@ -437,5 +437,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
@@ -64 +65 @@
-@@ -444,5 +444,4 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
+@@ -443,5 +443,4 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
@@ -70 +71 @@
-@@ -455,5 +454,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
+@@ -454,5 +453,5 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
@@ -77 +78 @@
-@@ -461,5 +460,4 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
+@@ -460,5 +459,4 @@ cperf_pmd_cyclecount_test_runner(void *test_ctx)
@@ -84 +85 @@
-index 2767f4ea8..972d52088 100644
+index 8766d6e9b..5838f8cf0 100644
@@ -87 +88 @@
-@@ -96,5 +96,5 @@ cperf_throughput_test_runner(void *test_ctx)
+@@ -95,5 +95,5 @@ cperf_throughput_test_runner(void *test_ctx)
@@ -94 +95 @@
-@@ -263,5 +263,5 @@ cperf_throughput_test_runner(void *test_ctx)
+@@ -262,5 +262,5 @@ cperf_throughput_test_runner(void *test_ctx)
@@ -101 +102 @@
-@@ -269,5 +269,4 @@ cperf_throughput_test_runner(void *test_ctx)
+@@ -268,5 +268,4 @@ cperf_throughput_test_runner(void *test_ctx)
@@ -107 +108 @@
-@@ -284,10 +283,9 @@ cperf_throughput_test_runner(void *test_ctx)
+@@ -283,10 +282,9 @@ cperf_throughput_test_runner(void *test_ctx)
@@ -120 +121 @@
-index 0497cf9a1..bbdf37d05 100644
+index 9134b921e..2f11b73a1 100644
@@ -123 +124 @@
-@@ -234,5 +234,5 @@ cperf_verify_test_runner(void *test_ctx)
+@@ -233,5 +233,5 @@ cperf_verify_test_runner(void *test_ctx)
@@ -130 +131 @@
-@@ -377,10 +377,9 @@ cperf_verify_test_runner(void *test_ctx)
+@@ -376,10 +376,9 @@ cperf_verify_test_runner(void *test_ctx)
@@ -142 +143 @@
-@@ -395,9 +394,8 @@ cperf_verify_test_runner(void *test_ctx)
+@@ -394,9 +393,8 @@ cperf_verify_test_runner(void *test_ctx)

[dpdk-stable] patch 'app/crypto-perf: check lcore job failure' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/08e8a0ed44ee22f3fa39d55a3982ceca886f6058

Thanks.

Kevin Traynor

---
From 08e8a0ed44ee22f3fa39d55a3982ceca886f6058 Mon Sep 17 00:00:00 2001
From: Tomasz Jozwiak <tjozwiakgm@gmail.com>
Date: Fri, 14 Jun 2019 22:56:45 +0200
Subject: [PATCH] app/crypto-perf: check lcore job failure

[ upstream commit 5908e7e837a62fe62c48094d8c2e947242f8fac3 ]

Currently, there's no return status check from lcore's jobs.
In case of fail - crypto-perf tool returns success anyway.
This patch adds such a detection and returns proper status at the end.

Fixes: ce8af1a4398d ("app/crypto-perf: wait for cores launched by app")

Signed-off-by: Tomasz Jozwiak <tjozwiakgm@gmail.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 app/test-crypto-perf/main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 0aa0de8bd..921394799 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -628,7 +628,10 @@ main(int argc, char **argv)
 			if (i == total_nb_qps)
 				break;
-			rte_eal_wait_lcore(lcore_id);
+			ret |= rte_eal_wait_lcore(lcore_id);
 			i++;
 		}
+
+		if (ret != EXIT_SUCCESS)
+			goto err;
 	} else {
 
@@ -655,8 +658,11 @@ main(int argc, char **argv)
 				if (i == total_nb_qps)
 					break;
-				rte_eal_wait_lcore(lcore_id);
+				ret |= rte_eal_wait_lcore(lcore_id);
 				i++;
 			}
 
+			if (ret != EXIT_SUCCESS)
+				goto err;
+
 			/* Get next size from range or list */
 			if (opts.inc_buffer_size != 0)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.436112978 +0100
+++ 0028-app-crypto-perf-check-lcore-job-failure.patch	2019-08-27 09:40:10.911144607 +0100
@@ -1 +1 @@
-From 5908e7e837a62fe62c48094d8c2e947242f8fac3 Mon Sep 17 00:00:00 2001
+From 08e8a0ed44ee22f3fa39d55a3982ceca886f6058 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5908e7e837a62fe62c48094d8c2e947242f8fac3 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index db0290751..ce92a9687 100644
+index 0aa0de8bd..921394799 100644
@@ -23 +24 @@
-@@ -666,7 +666,10 @@ main(int argc, char **argv)
+@@ -628,7 +628,10 @@ main(int argc, char **argv)
@@ -35 +36 @@
-@@ -693,8 +696,11 @@ main(int argc, char **argv)
+@@ -655,8 +658,11 @@ main(int argc, char **argv)

[dpdk-stable] patch 'net/ixgbe: fix IP type for crypto session' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/c58d548e43d1ff774b6ace3fdf8ebcf99e4eb9db

Thanks.

Kevin Traynor

---
From c58d548e43d1ff774b6ace3fdf8ebcf99e4eb9db Mon Sep 17 00:00:00 2001
From: Mariusz Drost <mariuszx.drost@intel.com>
Date: Wed, 26 Jun 2019 15:26:16 +0200
Subject: [PATCH] net/ixgbe: fix IP type for crypto session

[ upstream commit 655df688f8faa448c152c12139e336a3471b174a ]

When ixgbe_crypto_add_sa() is called, it checks whether the ip type is
IPv6 or IPv4 to write correct addresses to the registers. Type itself
is never specified, and act as IPv4, which is the default value.
It causes lack of support for IPv6.

To fix that, ip type needs to be stored in device private data, based on
crypto session ip type field, before the checking is done.

Fixes: ec17993a145a ("examples/ipsec-secgw: support security offload")
Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")

Signed-off-by: Mariusz Drost <mariuszx.drost@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Tested-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 drivers/net/ixgbe/ixgbe_ipsec.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_ipsec.c b/drivers/net/ixgbe/ixgbe_ipsec.c
index 5a416885f..1eea70716 100644
--- a/drivers/net/ixgbe/ixgbe_ipsec.c
+++ b/drivers/net/ixgbe/ixgbe_ipsec.c
@@ -155,6 +155,10 @@ ixgbe_crypto_add_sa(struct ixgbe_crypto_session *ic_session)
 			priv->rx_sa_tbl[sa_index].mode |=
 					(IPSRXMOD_PROTO | IPSRXMOD_DECRYPT);
-		if (ic_session->dst_ip.type == IPv6)
+		if (ic_session->dst_ip.type == IPv6) {
 			priv->rx_sa_tbl[sa_index].mode |= IPSRXMOD_IPV6;
+			priv->rx_ip_tbl[ip_index].ip.type = IPv6;
+		} else if (ic_session->dst_ip.type == IPv4)
+			priv->rx_ip_tbl[ip_index].ip.type = IPv4;
+
 		priv->rx_sa_tbl[sa_index].used = 1;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.493208998 +0100
+++ 0029-net-ixgbe-fix-IP-type-for-crypto-session.patch	2019-08-27 09:40:10.912144582 +0100
@@ -1 +1 @@
-From 655df688f8faa448c152c12139e336a3471b174a Mon Sep 17 00:00:00 2001
+From c58d548e43d1ff774b6ace3fdf8ebcf99e4eb9db Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 655df688f8faa448c152c12139e336a3471b174a ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'eal: fix typo in comments' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/6e53a33e231d689650f0b7b2defad4b0ae75a505

Thanks.

Kevin Traynor

---
From 6e53a33e231d689650f0b7b2defad4b0ae75a505 Mon Sep 17 00:00:00 2001
From: Krzysztof Kanas <kkanas@marvell.com>
Date: Tue, 4 Jun 2019 11:21:26 +0200
Subject: [PATCH] eal: fix typo in comments

[ upstream commit d32411d03466c7cdcc842acdab87dd9f1a5ce2c3 ]

Fixes: a753e53d517b ("eal: add device event monitor framework")
Fixes: af75078fece3 ("first public release")

Signed-off-by: Krzysztof Kanas <kkanas@marvell.com>
---
 lib/librte_eal/common/include/rte_dev.h        | 2 +-
 lib/librte_eal/common/include/rte_interrupts.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h
index a9724dc91..0bfb2487c 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -405,5 +405,5 @@ rte_dev_iterator_next(struct rte_dev_iterator *it);
  *
  * It registers the callback for the specific device.
- * Multiple callbacks cal be registered at the same time.
+ * Multiple callbacks can be registered at the same time.
  *
  * @param device_name
diff --git a/lib/librte_eal/common/include/rte_interrupts.h b/lib/librte_eal/common/include/rte_interrupts.h
index d751a6378..bcd935805 100644
--- a/lib/librte_eal/common/include/rte_interrupts.h
+++ b/lib/librte_eal/common/include/rte_interrupts.h
@@ -29,5 +29,5 @@ typedef void (*rte_intr_callback_fn)(void *cb_arg);
 /**
  * It registers the callback for the specific interrupt. Multiple
- * callbacks cal be registered at the same time.
+ * callbacks can be registered at the same time.
  * @param intr_handle
  *  Pointer to the interrupt handle.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.543900367 +0100
+++ 0030-eal-fix-typo-in-comments.patch	2019-08-27 09:40:10.913144558 +0100
@@ -1 +1 @@
-From d32411d03466c7cdcc842acdab87dd9f1a5ce2c3 Mon Sep 17 00:00:00 2001
+From 6e53a33e231d689650f0b7b2defad4b0ae75a505 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d32411d03466c7cdcc842acdab87dd9f1a5ce2c3 ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index a01c4ad92..94829f6e4 100644
+index a9724dc91..0bfb2487c 100644
@@ -20 +21 @@
-@@ -350,5 +350,5 @@ rte_dev_iterator_next(struct rte_dev_iterator *it);
+@@ -405,5 +405,5 @@ rte_dev_iterator_next(struct rte_dev_iterator *it);
@@ -28 +29 @@
-index d1a78ef20..c1e912c84 100644
+index d751a6378..bcd935805 100644
@@ -31 +32 @@
-@@ -37,5 +37,5 @@ typedef void (*rte_intr_unregister_callback_fn)(struct rte_intr_handle *intr_han
+@@ -29,5 +29,5 @@ typedef void (*rte_intr_callback_fn)(void *cb_arg);

[dpdk-stable] patch 'examples/ipsec-secgw: fix error sign' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/e8242045dda0690a29458f42ef6a147a90ba2f81

Thanks.

Kevin Traynor

---
From e8242045dda0690a29458f42ef6a147a90ba2f81 Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Date: Fri, 5 Jul 2019 13:18:09 +0100
Subject: [PATCH] examples/ipsec-secgw: fix error sign

[ upstream commit 4fbf33243175311781e8f130b53890859304dc29 ]

rte_errno values should be positive.

Fixes: d299106e8e31 ("examples/ipsec-secgw: add IPsec sample application")

Signed-off-by: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 examples/ipsec-secgw/sa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index f7b6eb0bb..a2c718156 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -738,5 +738,5 @@ sa_create(const char *name, int32_t socket_id)
 	if (mz == NULL) {
 		printf("Failed to allocate SA DB memory\n");
-		rte_errno = -ENOMEM;
+		rte_errno = ENOMEM;
 		return NULL;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.600288062 +0100
+++ 0031-examples-ipsec-secgw-fix-error-sign.patch	2019-08-27 09:40:10.915144510 +0100
@@ -1 +1 @@
-From 4fbf33243175311781e8f130b53890859304dc29 Mon Sep 17 00:00:00 2001
+From e8242045dda0690a29458f42ef6a147a90ba2f81 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4fbf33243175311781e8f130b53890859304dc29 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 1083915f9..d700c8ea4 100644
+index f7b6eb0bb..a2c718156 100644
@@ -22 +23 @@
-@@ -744,5 +744,5 @@ sa_create(const char *name, int32_t socket_id)
+@@ -738,5 +738,5 @@ sa_create(const char *name, int32_t socket_id)

[dpdk-stable] patch 'eventdev: fix error sign' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/954b835b66d84487496798022319edcf1e7e8bdf

Thanks.

Kevin Traynor

---
From 954b835b66d84487496798022319edcf1e7e8bdf Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Date: Thu, 4 Jul 2019 11:03:30 +0100
Subject: [PATCH] eventdev: fix error sign

[ upstream commit 468d4c4e202f5653809231aa2d6d6935dd012da0 ]

Fixes: c9bf83947e2e ("eventdev: add eth Tx adapter APIs")
Fixes: 47d05b292820 ("eventdev: add timer adapter common code")
Fixes: 6750b21bd6af ("eventdev: add default software timer adapter")
Fixes: c75f7897ea35 ("eventdev: set error code in port link/unlink functions")
Fixes: 7d1acc9dde93 ("eventdev: introduce helper function for enqueue burst")
Fixes: 406aed4e0dd9 ("eventdev: add errno-style return values")
Fixes: cc7b73ea9e3b ("eventdev: add new software timer adapter")

Signed-off-by: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 .../rte_event_eth_tx_adapter.h                |  8 +++---
 lib/librte_eventdev/rte_event_timer_adapter.c | 12 ++++-----
 lib/librte_eventdev/rte_eventdev.c            | 16 ++++++------
 lib/librte_eventdev/rte_eventdev.h            | 26 +++++++++----------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lib/librte_eventdev/rte_event_eth_tx_adapter.h b/lib/librte_eventdev/rte_event_eth_tx_adapter.h
index 7a4a01fa7..4d8a018c0 100644
--- a/lib/librte_eventdev/rte_event_eth_tx_adapter.h
+++ b/lib/librte_eventdev/rte_event_eth_tx_adapter.h
@@ -376,8 +376,8 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id);
  *   events at the end of ev[] are not consumed and the caller has to take care
  *   of them, and rte_errno is set accordingly. Possible errno values include:
- *   - -EINVAL  The port ID is invalid, device ID is invalid, an event's queue
+ *   - EINVAL   The port ID is invalid, device ID is invalid, an event's queue
  *              ID is invalid, or an event's sched type doesn't match the
  *              capabilities of the destination queue.
- *   - -ENOSPC  The event port was backpressured and unable to enqueue
+ *   - ENOSPC   The event port was backpressured and unable to enqueue
  *              one or more events. This error code is only applicable to
  *              closed systems.
@@ -394,10 +394,10 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id,
 	if (dev_id >= RTE_EVENT_MAX_DEVS ||
 		!rte_eventdevs[dev_id].attached) {
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
 	if (port_id >= dev->data->nb_ports) {
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
diff --git a/lib/librte_eventdev/rte_event_timer_adapter.c b/lib/librte_eventdev/rte_event_timer_adapter.c
index 79070d484..026d639bc 100644
--- a/lib/librte_eventdev/rte_event_timer_adapter.c
+++ b/lib/librte_eventdev/rte_event_timer_adapter.c
@@ -193,5 +193,5 @@ rte_event_timer_adapter_create_ext(
 						   &adapter->ops);
 	if (ret < 0) {
-		rte_errno = ret;
+		rte_errno = -ret;
 		goto free_memzone;
 	}
@@ -199,9 +199,9 @@ rte_event_timer_adapter_create_ext(
 	if (!(adapter->data->caps &
 	      RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT)) {
-		FUNC_PTR_OR_NULL_RET_WITH_ERRNO(conf_cb, -EINVAL);
+		FUNC_PTR_OR_NULL_RET_WITH_ERRNO(conf_cb, EINVAL);
 		ret = conf_cb(adapter->data->id, adapter->data->event_dev_id,
 			      &adapter->data->event_port_id, conf_arg);
 		if (ret < 0) {
-			rte_errno = ret;
+			rte_errno = -ret;
 			goto free_memzone;
 		}
@@ -215,8 +215,8 @@ rte_event_timer_adapter_create_ext(
 
 	/* Allow driver to do some setup */
-	FUNC_PTR_OR_NULL_RET_WITH_ERRNO(adapter->ops->init, -ENOTSUP);
+	FUNC_PTR_OR_NULL_RET_WITH_ERRNO(adapter->ops->init, ENOTSUP);
 	ret = adapter->ops->init(adapter);
 	if (ret < 0) {
-		rte_errno = ret;
+		rte_errno = -ret;
 		goto free_memzone;
 	}
@@ -494,5 +494,5 @@ event_buffer_flush(struct event_buffer *bufp, uint8_t dev_id, uint8_t port_id,
 	*nb_events_flushed = rte_event_enqueue_burst(dev_id, port_id,
 						     &events[tail_idx], n);
-	if (*nb_events_flushed != n && rte_errno == -EINVAL) {
+	if (*nb_events_flushed != n && rte_errno == EINVAL) {
 		EVTIM_LOG_ERR("failed to enqueue invalid event - dropping it");
 		(*nb_events_inv)++;
diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index ebaf3087d..677850cd0 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -889,10 +889,10 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
 	int i, diag;
 
-	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, -EINVAL, 0);
+	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0);
 	dev = &rte_eventdevs[dev_id];
 
 	if (*dev->dev_ops->port_link == NULL) {
 		RTE_PMD_DEBUG_TRACE("Function not supported\n");
-		rte_errno = -ENOTSUP;
+		rte_errno = ENOTSUP;
 		return 0;
 	}
@@ -900,5 +900,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
 	if (!is_valid_port(dev, port_id)) {
 		RTE_EDEV_LOG_ERR("Invalid port_id=%" PRIu8, port_id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
@@ -921,5 +921,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
 	for (i = 0; i < nb_links; i++)
 		if (queues[i] >= dev->data->nb_queues) {
-			rte_errno = -EINVAL;
+			rte_errno = EINVAL;
 			return 0;
 		}
@@ -948,10 +948,10 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 	uint16_t *links_map;
 
-	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, -EINVAL, 0);
+	RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, EINVAL, 0);
 	dev = &rte_eventdevs[dev_id];
 
 	if (*dev->dev_ops->port_unlink == NULL) {
 		RTE_PMD_DEBUG_TRACE("Function not supported\n");
-		rte_errno = -ENOTSUP;
+		rte_errno = ENOTSUP;
 		return 0;
 	}
@@ -959,5 +959,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 	if (!is_valid_port(dev, port_id)) {
 		RTE_EDEV_LOG_ERR("Invalid port_id=%" PRIu8, port_id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
@@ -988,5 +988,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 	for (i = 0; i < nb_unlinks; i++)
 		if (queues[i] >= dev->data->nb_queues) {
-			rte_errno = -EINVAL;
+			rte_errno = EINVAL;
 			return 0;
 		}
diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h
index d593c5277..d755f194f 100644
--- a/lib/librte_eventdev/rte_eventdev.h
+++ b/lib/librte_eventdev/rte_eventdev.h
@@ -1322,10 +1322,10 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
 #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
 	if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) {
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
 	if (port_id >= dev->data->nb_ports) {
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
@@ -1376,8 +1376,8 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
  *   events at the end of ev[] are not consumed and the caller has to take care
  *   of them, and rte_errno is set accordingly. Possible errno values include:
- *   - -EINVAL  The port ID is invalid, device ID is invalid, an event's queue
+ *   - EINVAL   The port ID is invalid, device ID is invalid, an event's queue
  *              ID is invalid, or an event's sched type doesn't match the
  *              capabilities of the destination queue.
- *   - -ENOSPC  The event port was backpressured and unable to enqueue
+ *   - ENOSPC   The event port was backpressured and unable to enqueue
  *              one or more events. This error code is only applicable to
  *              closed systems.
@@ -1426,8 +1426,8 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
  *   events at the end of ev[] are not consumed and the caller has to take care
  *   of them, and rte_errno is set accordingly. Possible errno values include:
- *   - -EINVAL  The port ID is invalid, device ID is invalid, an event's queue
+ *   - EINVAL   The port ID is invalid, device ID is invalid, an event's queue
  *              ID is invalid, or an event's sched type doesn't match the
  *              capabilities of the destination queue.
- *   - -ENOSPC  The event port was backpressured and unable to enqueue
+ *   - ENOSPC   The event port was backpressured and unable to enqueue
  *              one or more events. This error code is only applicable to
  *              closed systems.
@@ -1477,8 +1477,8 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
  *   events at the end of ev[] are not consumed and the caller has to take care
  *   of them, and rte_errno is set accordingly. Possible errno values include:
- *   - -EINVAL  The port ID is invalid, device ID is invalid, an event's queue
+ *   - EINVAL   The port ID is invalid, device ID is invalid, an event's queue
  *              ID is invalid, or an event's sched type doesn't match the
  *              capabilities of the destination queue.
- *   - -ENOSPC  The event port was backpressured and unable to enqueue
+ *   - ENOSPC   The event port was backpressured and unable to enqueue
  *              one or more events. This error code is only applicable to
  *              closed systems.
@@ -1599,10 +1599,10 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],
 #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
 	if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) {
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
 
 	if (port_id >= dev->data->nb_ports) {
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
@@ -1677,7 +1677,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],
  * If return value is less than *nb_links* then implementation shall update the
  * rte_errno accordingly, Possible rte_errno values are
- * (-EDQUOT) Quota exceeded(Application tried to link the queue configured with
+ * (EDQUOT) Quota exceeded(Application tried to link the queue configured with
  *  RTE_EVENT_QUEUE_CFG_SINGLE_LINK to more than one event ports)
- * (-EINVAL) Invalid parameter
+ * (EINVAL) Invalid parameter
  *
  */
@@ -1724,5 +1724,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
  * If return value is less than *nb_unlinks* then implementation shall update
  * the rte_errno accordingly, Possible rte_errno values are
- * (-EINVAL) Invalid parameter
+ * (EINVAL) Invalid parameter
  */
 int
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.659393953 +0100
+++ 0032-eventdev-fix-error-sign.patch	2019-08-27 09:40:10.920144388 +0100
@@ -1 +1 @@
-From 468d4c4e202f5653809231aa2d6d6935dd012da0 Mon Sep 17 00:00:00 2001
+From 954b835b66d84487496798022319edcf1e7e8bdf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 468d4c4e202f5653809231aa2d6d6935dd012da0 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
- lib/librte_eventdev/rte_event_timer_adapter.c | 18 ++++++-------
+ lib/librte_eventdev/rte_event_timer_adapter.c | 12 ++++-----
@@ -24 +25 @@
- 4 files changed, 34 insertions(+), 34 deletions(-)
+ 4 files changed, 31 insertions(+), 31 deletions(-)
@@ -27 +28 @@
-index 9bed12b3a..c848261c4 100644
+index 7a4a01fa7..4d8a018c0 100644
@@ -30 +31 @@
-@@ -333,8 +333,8 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id);
+@@ -376,8 +376,8 @@ rte_event_eth_tx_adapter_event_port_get(uint8_t id, uint8_t *event_port_id);
@@ -41 +42 @@
-@@ -351,10 +351,10 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id,
+@@ -394,10 +394,10 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id,
@@ -55 +56 @@
-index 459bc476d..5ce399eca 100644
+index 79070d484..026d639bc 100644
@@ -88 +89,2 @@
-@@ -510,9 +510,9 @@ event_buffer_flush(struct event_buffer *bufp, uint8_t dev_id, uint8_t port_id,
+@@ -494,5 +494,5 @@ event_buffer_flush(struct event_buffer *bufp, uint8_t dev_id, uint8_t port_id,
+ 	*nb_events_flushed = rte_event_enqueue_burst(dev_id, port_id,
@@ -90,24 +92,4 @@
- 	if (*nb_events_flushed != n) {
--		if (rte_errno == -EINVAL) {
-+		if (rte_errno == EINVAL) {
- 			EVTIM_LOG_ERR("failed to enqueue invalid event - "
- 				      "dropping it");
- 			(*nb_events_inv)++;
--		} else if (rte_errno == -ENOSPC)
-+		} else if (rte_errno == ENOSPC)
- 			rte_pause();
- 	}
-@@ -833,5 +833,5 @@ swtim_init(struct rte_event_timer_adapter *adapter)
- 		if (ret != -EALREADY) {
- 			EVTIM_LOG_ERR("failed to initialize timer subsystem");
--			rte_errno = ret;
-+			rte_errno = -ret;
- 			goto free_mempool;
- 		}
-@@ -841,5 +841,5 @@ swtim_init(struct rte_event_timer_adapter *adapter)
- 	if (ret < 0) {
- 		EVTIM_LOG_ERR("failed to allocate timer data instance");
--		rte_errno = ret;
-+		rte_errno = -ret;
- 		goto free_mempool;
- 	}
+-	if (*nb_events_flushed != n && rte_errno == -EINVAL) {
++	if (*nb_events_flushed != n && rte_errno == EINVAL) {
+ 		EVTIM_LOG_ERR("failed to enqueue invalid event - dropping it");
+ 		(*nb_events_inv)++;
@@ -115 +97 @@
-index cc3199fb6..f44c869cb 100644
+index ebaf3087d..677850cd0 100644
@@ -118 +100 @@
-@@ -890,10 +890,10 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
+@@ -889,10 +889,10 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
@@ -126 +108 @@
- 		RTE_EDEV_LOG_ERR("Function not supported\n");
+ 		RTE_PMD_DEBUG_TRACE("Function not supported\n");
@@ -131 +113 @@
-@@ -901,5 +901,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
+@@ -900,5 +900,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
@@ -138 +120 @@
-@@ -922,5 +922,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
+@@ -921,5 +921,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
@@ -145 +127 @@
-@@ -949,10 +949,10 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
+@@ -948,10 +948,10 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
@@ -153 +135 @@
- 		RTE_EDEV_LOG_ERR("Function not supported");
+ 		RTE_PMD_DEBUG_TRACE("Function not supported\n");
@@ -158 +140 @@
-@@ -960,5 +960,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
+@@ -959,5 +959,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
@@ -165 +147 @@
-@@ -989,5 +989,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
+@@ -988,5 +988,5 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
@@ -173 +155 @@
-index 927f43c24..5044a13d0 100644
+index d593c5277..d755f194f 100644
@@ -176 +158 @@
-@@ -1319,10 +1319,10 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1322,10 +1322,10 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
@@ -189 +171 @@
-@@ -1373,8 +1373,8 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1376,8 +1376,8 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
@@ -200 +182 @@
-@@ -1423,8 +1423,8 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1426,8 +1426,8 @@ rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
@@ -211 +193 @@
-@@ -1474,8 +1474,8 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
+@@ -1477,8 +1477,8 @@ rte_event_enqueue_new_burst(uint8_t dev_id, uint8_t port_id,
@@ -222 +204 @@
-@@ -1596,10 +1596,10 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],
+@@ -1599,10 +1599,10 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],
@@ -235 +217 @@
-@@ -1674,7 +1674,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],
+@@ -1677,7 +1677,7 @@ rte_event_dequeue_burst(uint8_t dev_id, uint8_t port_id, struct rte_event ev[],
@@ -245 +227 @@
-@@ -1721,5 +1721,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,
+@@ -1724,5 +1724,5 @@ rte_event_port_link(uint8_t dev_id, uint8_t port_id,

[dpdk-stable] patch 'event/sw: fix error sign' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/dbce24850f23d82dba81ab3abce0022220520bf8

Thanks.

Kevin Traynor

---
From dbce24850f23d82dba81ab3abce0022220520bf8 Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Date: Thu, 4 Jul 2019 11:03:31 +0100
Subject: [PATCH] event/sw: fix error sign

[ upstream commit 0e2132445930a6fc70f99a9306f76f7001eefb49 ]

Fixes: 371a688fc159 ("event/sw: support linking queues to ports")

Signed-off-by: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 drivers/event/sw/sw_evdev.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/event/sw/sw_evdev.c b/drivers/event/sw/sw_evdev.c
index 1175d6cdb..fb8e8bebb 100644
--- a/drivers/event/sw/sw_evdev.c
+++ b/drivers/event/sw/sw_evdev.c
@@ -39,10 +39,10 @@ sw_port_link(struct rte_eventdev *dev, void *port, const uint8_t queues[],
 		/* check for qid map overflow */
 		if (q->cq_num_mapped_cqs >= RTE_DIM(q->cq_map)) {
-			rte_errno = -EDQUOT;
+			rte_errno = EDQUOT;
 			break;
 		}
 
 		if (p->is_directed && p->num_qids_mapped > 0) {
-			rte_errno = -EDQUOT;
+			rte_errno = EDQUOT;
 			break;
 		}
@@ -60,10 +60,10 @@ sw_port_link(struct rte_eventdev *dev, void *port, const uint8_t queues[],
 			/* check directed qids only map to one port */
 			if (p->num_qids_mapped > 0) {
-				rte_errno = -EDQUOT;
+				rte_errno = EDQUOT;
 				break;
 			}
 			/* check port only takes a directed flow */
 			if (num > 1) {
-				rte_errno = -EDQUOT;
+				rte_errno = EDQUOT;
 				break;
 			}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.719336896 +0100
+++ 0033-event-sw-fix-error-sign.patch	2019-08-27 09:40:10.921144364 +0100
@@ -1 +1 @@
-From 0e2132445930a6fc70f99a9306f76f7001eefb49 Mon Sep 17 00:00:00 2001
+From dbce24850f23d82dba81ab3abce0022220520bf8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0e2132445930a6fc70f99a9306f76f7001eefb49 ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'event/opdl: fix error sign' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/f60244c41401dd933962d60a1ae9098ccdcf5bd3

Thanks.

Kevin Traynor

---
From f60244c41401dd933962d60a1ae9098ccdcf5bd3 Mon Sep 17 00:00:00 2001
From: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Date: Thu, 4 Jul 2019 11:03:32 +0100
Subject: [PATCH] event/opdl: fix error sign

[ upstream commit db8bdaeccab9161dd4058e1902458f860fd48c1e ]

Fixes: 0bf298e39286 ("event/opdl: add event port config get/set")
Fixes: 3c7f3dcfb099 ("event/opdl: add PMD main body and helper function")
Fixes: 4236ce9bf5bf ("event/opdl: add OPDL ring infrastructure library")

Signed-off-by: Dilshod Urazov <dilshod.urazov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 drivers/event/opdl/opdl_evdev.c      | 10 +++++-----
 drivers/event/opdl/opdl_evdev_init.c | 12 ++++++------
 drivers/event/opdl/opdl_ring.c       |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c
index d2d2be44b..3beca8957 100644
--- a/drivers/event/opdl/opdl_evdev.c
+++ b/drivers/event/opdl/opdl_evdev.c
@@ -103,5 +103,5 @@ opdl_port_link(struct rte_eventdev *dev,
 				queues[0],
 				p->id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
@@ -114,5 +114,5 @@ opdl_port_link(struct rte_eventdev *dev,
 				num,
 				p->id);
-		rte_errno = -EDQUOT;
+		rte_errno = EDQUOT;
 		return 0;
 	}
@@ -124,5 +124,5 @@ opdl_port_link(struct rte_eventdev *dev,
 				p->id,
 				queues[0]);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
@@ -135,5 +135,5 @@ opdl_port_link(struct rte_eventdev *dev,
 				p->external_qid,
 				queues[0]);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
@@ -161,5 +161,5 @@ opdl_port_unlink(struct rte_eventdev *dev,
 			     queues[0],
 			     p->id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
diff --git a/drivers/event/opdl/opdl_evdev_init.c b/drivers/event/opdl/opdl_evdev_init.c
index 582ad698f..15aae4752 100644
--- a/drivers/event/opdl/opdl_evdev_init.c
+++ b/drivers/event/opdl/opdl_evdev_init.c
@@ -36,5 +36,5 @@ enqueue_check(struct opdl_port *p,
 					     ev[i].queue_id,
 					     p->next_external_qid);
-				rte_errno = -EINVAL;
+				rte_errno = EINVAL;
 				return 0;
 			}
@@ -64,5 +64,5 @@ enqueue_check(struct opdl_port *p,
 		if (num > 0 &&
 				ev[0].queue_id != p->next_external_qid) {
-			rte_errno = -EINVAL;
+			rte_errno = EINVAL;
 			return 0;
 		}
@@ -117,5 +117,5 @@ opdl_rx_error_enqueue(struct opdl_port *p,
 	RTE_SET_USED(num);
 
-	rte_errno = -ENOSPC;
+	rte_errno = ENOSPC;
 
 	return 0;
@@ -146,5 +146,5 @@ opdl_rx_enqueue(struct opdl_port *p,
 
 	if (enqueued < num)
-		rte_errno = -ENOSPC;
+		rte_errno = ENOSPC;
 
 	return enqueued;
@@ -165,5 +165,5 @@ opdl_tx_error_dequeue(struct opdl_port *p,
 	RTE_SET_USED(num);
 
-	rte_errno = -ENOSPC;
+	rte_errno = ENOSPC;
 
 	return 0;
@@ -241,5 +241,5 @@ opdl_claim(struct opdl_port *p, struct rte_event ev[], uint16_t num)
 			     opdl_pmd_dev_id(p->opdl),
 			     p->id);
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
diff --git a/drivers/event/opdl/opdl_ring.c b/drivers/event/opdl/opdl_ring.c
index 8aca481c9..c0bc4b008 100644
--- a/drivers/event/opdl/opdl_ring.c
+++ b/drivers/event/opdl/opdl_ring.c
@@ -756,5 +756,5 @@ opdl_stage_disclaim(struct opdl_stage *s, uint32_t num_entries, bool block)
 {
 	if (num_entries != s->num_event) {
-		rte_errno = -EINVAL;
+		rte_errno = EINVAL;
 		return 0;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.775822849 +0100
+++ 0034-event-opdl-fix-error-sign.patch	2019-08-27 09:40:10.923144315 +0100
@@ -1 +1 @@
-From db8bdaeccab9161dd4058e1902458f860fd48c1e Mon Sep 17 00:00:00 2001
+From f60244c41401dd933962d60a1ae9098ccdcf5bd3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit db8bdaeccab9161dd4058e1902458f860fd48c1e ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -106 +107 @@
-index e988f1cb2..e8b29e2c7 100644
+index 8aca481c9..c0bc4b008 100644
@@ -109 +110 @@
-@@ -757,5 +757,5 @@ opdl_stage_disclaim(struct opdl_stage *s, uint32_t num_entries, bool block)
+@@ -756,5 +756,5 @@ opdl_stage_disclaim(struct opdl_stage *s, uint32_t num_entries, bool block)

[dpdk-stable] patch 'hash: use ordered loads only if signature matches' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/2f0d98c0a96c87467ffc5b1be76ff45688eb039c

Thanks.

Kevin Traynor

---
From 2f0d98c0a96c87467ffc5b1be76ff45688eb039c Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Date: Tue, 2 Jul 2019 16:16:33 -0500
Subject: [PATCH] hash: use ordered loads only if signature matches

[ upstream commit 4d9ca3ed213320eaef0d8a7e95b3b00c2d70800b ]

Relaxed signature comparison is done first. Further ordered loads
are done only if the signature matches. Any false positives are
caught by the full key comparison. This provides performance
benefits as load-acquire is executed only when required.

Fixes: e605a1d36 ("hash: add lock-free r/w concurrency")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Gavin Hu <gavin.hu@arm.com>
Tested-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
---
 lib/librte_hash/rte_cuckoo_hash.c | 37 +++++++++++++++++++------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c
index d7a5f4c21..e76277167 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -1169,20 +1169,29 @@ search_one_bucket_lf(const struct rte_hash *h, const void *key, uint16_t sig,
 
 	for (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {
-		key_idx = __atomic_load_n(&bkt->key_idx[i],
+		/* Signature comparison is done before the acquire-load
+		 * of the key index to achieve better performance.
+		 * This can result in the reader loading old signature
+		 * (which matches), while the key_idx is updated to a
+		 * value that belongs to a new key. However, the full
+		 * key comparison will ensure that the lookup fails.
+		 */
+		if (bkt->sig_current[i] == sig) {
+			key_idx = __atomic_load_n(&bkt->key_idx[i],
 					  __ATOMIC_ACQUIRE);
-		if (bkt->sig_current[i] == sig && key_idx != EMPTY_SLOT) {
-			k = (struct rte_hash_key *) ((char *)keys +
-					key_idx * h->key_entry_size);
-			pdata = __atomic_load_n(&k->pdata,
-					__ATOMIC_ACQUIRE);
+			if (key_idx != EMPTY_SLOT) {
+				k = (struct rte_hash_key *) ((char *)keys +
+						key_idx * h->key_entry_size);
+				pdata = __atomic_load_n(&k->pdata,
+						__ATOMIC_ACQUIRE);
 
-			if (rte_hash_cmp_eq(key, k->key, h) == 0) {
-				if (data != NULL)
-					*data = pdata;
-				/*
-				 * Return index where key is stored,
-				 * subtracting the first dummy index
-				 */
-				return key_idx - 1;
+				if (rte_hash_cmp_eq(key, k->key, h) == 0) {
+					if (data != NULL)
+						*data = pdata;
+					/*
+					 * Return index where key is stored,
+					 * subtracting the first dummy index
+					 */
+					return key_idx - 1;
+				}
 			}
 		}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.828307491 +0100
+++ 0035-hash-use-ordered-loads-only-if-signature-matches.patch	2019-08-27 09:40:10.925144267 +0100
@@ -1 +1 @@
-From 4d9ca3ed213320eaef0d8a7e95b3b00c2d70800b Mon Sep 17 00:00:00 2001
+From 2f0d98c0a96c87467ffc5b1be76ff45688eb039c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4d9ca3ed213320eaef0d8a7e95b3b00c2d70800b ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 74d5bbd99..a3ac2fead 100644
+index d7a5f4c21..e76277167 100644
@@ -26 +27 @@
-@@ -1190,20 +1190,29 @@ search_one_bucket_lf(const struct rte_hash *h, const void *key, uint16_t sig,
+@@ -1169,20 +1169,29 @@ search_one_bucket_lf(const struct rte_hash *h, const void *key, uint16_t sig,

[dpdk-stable] patch 'doc: fix a grammar mistake in rawdev guide' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/219508130941cae794a6f395e3bb48b99f3a2f5d

Thanks.

Kevin Traynor

---
From 219508130941cae794a6f395e3bb48b99f3a2f5d Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye@intel.com>
Date: Tue, 4 Jun 2019 16:41:00 +0800
Subject: [PATCH] doc: fix a grammar mistake in rawdev guide

[ upstream commit 566d66aa84ad047f0015ef3237995c365123f330 ]

Fixes: a9bb0c44c775 ("doc: add rawdev library guide and doxygen page")

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
 doc/guides/prog_guide/rawdev.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/prog_guide/rawdev.rst b/doc/guides/prog_guide/rawdev.rst
index 06af6942a..a712c7fa9 100644
--- a/doc/guides/prog_guide/rawdev.rst
+++ b/doc/guides/prog_guide/rawdev.rst
@@ -33,5 +33,5 @@ Key factors guiding design of the Rawdevice library:
 1. Following are some generic operations which can be treated as applicable
    to a large subset of device types. None of the operations are mandatory to
-   be implemented by a driver. Application should also be design for proper
+   be implemented by a driver. Application should also be designed for proper
    handling for unsupported APIs.
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.885009093 +0100
+++ 0036-doc-fix-a-grammar-mistake-in-rawdev-guide.patch	2019-08-27 09:40:10.925144267 +0100
@@ -1 +1 @@
-From 566d66aa84ad047f0015ef3237995c365123f330 Mon Sep 17 00:00:00 2001
+From 219508130941cae794a6f395e3bb48b99f3a2f5d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 566d66aa84ad047f0015ef3237995c365123f330 ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'doc: fix link about bifurcated model in Linux guide' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/df6939a80160639cc3ca7cd426c69118aac202d2

Thanks.

Kevin Traynor

---
From df6939a80160639cc3ca7cd426c69118aac202d2 Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu@mellanox.com>
Date: Wed, 26 Jun 2019 18:23:06 +0300
Subject: [PATCH] doc: fix link about bifurcated model in Linux guide

[ upstream commit d052a9a7d5f93c0f3bf5b6faedce4389890a5b6b ]

Since dpdksummit.com does not exist anymore,
the old link redirected to https://www.dpdk.org/events/.

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 doc/guides/linux_gsg/linux_drivers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/linux_gsg/linux_drivers.rst b/doc/guides/linux_gsg/linux_drivers.rst
index 8da6a31be..ef8f5040c 100644
--- a/doc/guides/linux_gsg/linux_drivers.rst
+++ b/doc/guides/linux_gsg/linux_drivers.rst
@@ -104,5 +104,5 @@ Such model has the following benefits:
 More about the bifurcated driver can be found in
 `Mellanox Bifurcated DPDK PMD
-<https://dpdksummit.com/Archive/pdf/2016Userspace/Day02-Session04-RonyEfraim-Userspace2016.pdf>`__.
+<https://www.dpdk.org/wp-content/uploads/sites/35/2016/10/Day02-Session04-RonyEfraim-Userspace2016.pdf>`__.
 
 .. _linux_gsg_binding_kernel:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.933635696 +0100
+++ 0037-doc-fix-link-about-bifurcated-model-in-Linux-guide.patch	2019-08-27 09:40:10.926144242 +0100
@@ -1 +1 @@
-From d052a9a7d5f93c0f3bf5b6faedce4389890a5b6b Mon Sep 17 00:00:00 2001
+From df6939a80160639cc3ca7cd426c69118aac202d2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d052a9a7d5f93c0f3bf5b6faedce4389890a5b6b ]
+
@@ -9,2 +10,0 @@
-Cc: stable@dpdk.org
-
@@ -17 +17 @@
-index 695edbb13..238f3e900 100644
+index 8da6a31be..ef8f5040c 100644
@@ -20 +20 @@
-@@ -109,5 +109,5 @@ Such model has the following benefits:
+@@ -104,5 +104,5 @@ Such model has the following benefits:

[dpdk-stable] patch 'net/i40e: fix unexpected skip FDIR setup' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/0f37091a96106722aa811bba83ea1ab1d46c3e05

Thanks.

Kevin Traynor

---
From 0f37091a96106722aa811bba83ea1ab1d46c3e05 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang@intel.com>
Date: Wed, 3 Jul 2019 14:34:49 +0800
Subject: [PATCH] net/i40e: fix unexpected skip FDIR setup

[ upstream commit c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb ]

In i40e_flow_flush_fdir_filter, i40e_fdir_teardown is called, so
i40e_fdir_setup is required to be called before create a new fdir flow.

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

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Beilei Xing <beilei.xing@intel.com>
---
 drivers/net/i40e/i40e_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index a614ec1d0..3c3b69b9f 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3148,6 +3148,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
 	cons_filter_type = RTE_ETH_FILTER_FDIR;
 
-	if (dev->data->dev_conf.fdir_conf.mode !=
-	    RTE_FDIR_MODE_PERFECT) {
+	if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_PERFECT ||
+		pf->fdir.fdir_vsi == NULL) {
 		/* Enable fdir when fdir flow is added at first time. */
 		ret = i40e_fdir_setup(pf);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:12.988132851 +0100
+++ 0038-net-i40e-fix-unexpected-skip-FDIR-setup.patch	2019-08-27 09:40:10.932144097 +0100
@@ -1 +1 @@
-From c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb Mon Sep 17 00:00:00 2001
+From 0f37091a96106722aa811bba83ea1ab1d46c3e05 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c3be43817cfb2cac9276cbef9f7fd2bec20cc1cb ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index d62b32f17..48a6782a8 100644
+index a614ec1d0..3c3b69b9f 100644
@@ -23 +24 @@
-@@ -3176,6 +3176,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
+@@ -3148,6 +3148,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,

[dpdk-stable] patch 'net/fm10k: fix descriptor filling in vector Tx' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/04b68044ad996b6894e7d080231cafa9f833b942

Thanks.

Kevin Traynor

---
From 04b68044ad996b6894e7d080231cafa9f833b942 Mon Sep 17 00:00:00 2001
From: Xiao Wang <xiao.w.wang@intel.com>
Date: Wed, 3 Jul 2019 10:53:32 +0800
Subject: [PATCH] net/fm10k: fix descriptor filling in vector Tx

[ upstream commit e62d90f2a21b5196aa7606a933923c068a500bee ]

The shift left operation "pkt->vlan_tci << 16" gets vlan_tci extended
to signed type and may cause invalid descriptor. Also the same issue for
the "data_len" field. This patch fixes it by casting them to uint64_t.

Fixes: 21f13c541eb0 ("fm10k: add vector Tx")

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/fm10k/fm10k_rxtx_vec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/fm10k/fm10k_rxtx_vec.c b/drivers/net/fm10k/fm10k_rxtx_vec.c
index 96b46a2bd..788e2484a 100644
--- a/drivers/net/fm10k/fm10k_rxtx_vec.c
+++ b/drivers/net/fm10k/fm10k_rxtx_vec.c
@@ -712,5 +712,5 @@ vtx1(volatile struct fm10k_tx_desc *txdp,
 {
 	__m128i descriptor = _mm_set_epi64x(flags << 56 |
-			pkt->vlan_tci << 16 | pkt->data_len,
+			(uint64_t)pkt->vlan_tci << 16 | (uint64_t)pkt->data_len,
 			MBUF_DMA_ADDR(pkt));
 	_mm_store_si128((__m128i *)txdp, descriptor);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.047059825 +0100
+++ 0039-net-fm10k-fix-descriptor-filling-in-vector-Tx.patch	2019-08-27 09:40:10.933144072 +0100
@@ -1 +1 @@
-From e62d90f2a21b5196aa7606a933923c068a500bee Mon Sep 17 00:00:00 2001
+From 04b68044ad996b6894e7d080231cafa9f833b942 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e62d90f2a21b5196aa7606a933923c068a500bee ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'doc: fix PDF build' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/bdb49345893dc7e829780e261146cf7ebd9aa231

Thanks.

Kevin Traynor

---
From bdb49345893dc7e829780e261146cf7ebd9aa231 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Tue, 9 Jul 2019 15:11:17 +0200
Subject: [PATCH] doc: fix PDF build

[ upstream commit d3ce1dc637c1bbef9a407f10281b2bc0549256da ]

The command "make doc-guides-pdf" is failing because
there are more than 1500 lines in the file MAINTAINERS
which is included in the contributing guide.

We are facing the issue mentioned in this comment:
https://github.com/sphinx-doc/sphinx/issues/3099#issuecomment-256440704

Anyway the file MAINTAINERS is mentioned several times in the guide.
So the "literalinclude" is removed from the guide to fix the build
of the PDF.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Tested-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/contributing/patches.rst | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst
index 1bd91b7e7..02cd0555a 100644
--- a/doc/guides/contributing/patches.rst
+++ b/doc/guides/contributing/patches.rst
@@ -638,11 +638,2 @@ patch accepted. The general cycle for patch review and acceptance is:
    * Trivial patches may be merged sooner than described above at the tree committer's
      discretion.
-
-DPDK Maintainers
-----------------
-
-The following are the DPDK maintainers as listed in the ``MAINTAINERS`` file
-in the DPDK root directory.
-
-.. literalinclude:: ../../../MAINTAINERS
-   :lines: 3-
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.098506602 +0100
+++ 0040-doc-fix-PDF-build.patch	2019-08-27 09:40:10.935144024 +0100
@@ -1 +1 @@
-From d3ce1dc637c1bbef9a407f10281b2bc0549256da Mon Sep 17 00:00:00 2001
+From bdb49345893dc7e829780e261146cf7ebd9aa231 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d3ce1dc637c1bbef9a407f10281b2bc0549256da ]
+
@@ -24 +26 @@
-index 3b2b174ad..f37fb5557 100644
+index 1bd91b7e7..02cd0555a 100644
@@ -27 +29 @@
-@@ -649,11 +649,2 @@ patch accepted. The general cycle for patch review and acceptance is:
+@@ -638,11 +638,2 @@ patch accepted. The general cycle for patch review and acceptance is:

[dpdk-stable] patch 'flow_classify: fix out-of-bounds access' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/5c0e9b1077b4c95d4a8b5612d603466dc23c620f

Thanks.

Kevin Traynor

---
From 5c0e9b1077b4c95d4a8b5612d603466dc23c620f Mon Sep 17 00:00:00 2001
From: Bernard Iremonger <bernard.iremonger@intel.com>
Date: Tue, 9 Jul 2019 12:09:56 +0100
Subject: [PATCH] flow_classify: fix out-of-bounds access

[ upstream commit 8d244bb3a32ee54364f8c0a7b7244a67ad407091 ]

This patch fixes the out-of-bounds coverity issue by removing the
offending line of code at line 107 in rte_flow_classify_parse.c
which is never executed.

Coverity issue: 343454
Fixes: be41ac2a330f ("flow_classify: introduce flow classify library")

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 lib/librte_flow_classify/rte_flow_classify_parse.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.c b/lib/librte_flow_classify/rte_flow_classify_parse.c
index f65ceaf7c..465330291 100644
--- a/lib/librte_flow_classify/rte_flow_classify_parse.c
+++ b/lib/librte_flow_classify/rte_flow_classify_parse.c
@@ -104,6 +104,4 @@ classify_pattern_skip_void_item(struct rte_flow_item *items,
 			break;
 		}
-
-		pb = pe + 1;
 	}
 	/* Copy the END item. */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.152936799 +0100
+++ 0041-flow_classify-fix-out-of-bounds-access.patch	2019-08-27 09:40:10.936144000 +0100
@@ -1 +1 @@
-From 8d244bb3a32ee54364f8c0a7b7244a67ad407091 Mon Sep 17 00:00:00 2001
+From 5c0e9b1077b4c95d4a8b5612d603466dc23c620f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8d244bb3a32ee54364f8c0a7b7244a67ad407091 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org

Re: [dpdk-stable] patch 'flow_classify: fix out-of-bounds access' has been queued to LTS release 18.11.3

[Iremonger, Bernard]

Hi Kevin,

The following patch from Aaron Conole (aconole@redhat.com) should also be back ported to 18.11.3.
[dpdk-dev] [PATCH] test: fix undefined behavior in flow classify test
http://mails.dpdk.org/archives/dev/2019-July/140110.html

The fix below, exposed the above issue.

Regards,

Bernard.


> -----Original Message-----
> From: Kevin Traynor [mailto:ktraynor@redhat.com]
> Sent: Tuesday, August 27, 2019 10:30 AM
> To: Iremonger, Bernard <bernard.iremonger@intel.com>
> Cc: dpdk stable <stable@dpdk.org>
> Subject: patch 'flow_classify: fix out-of-bounds access' has been queued to
> LTS release 18.11.3
> 
> Hi,
> 
> FYI, your patch has been queued to LTS release 18.11.3
> 
> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> It will be pushed if I get no objections before 09/03/19. So please shout if
> anyone has objections.
> 
> Also note that after the patch there's a diff of the upstream commit vs the
> patch applied to the branch. This will indicate if there was any rebasing
> needed to apply to the stable branch. If there were code changes for
> rebasing
> (ie: not only metadata diffs), please double check that the rebase was
> correctly done.
> 
> Queued patches 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/5c0e9b1077b4c95d4a8b5612d603466dc23c620f
> 
> Thanks.
> 
> Kevin Traynor
> 
> ---
> From 5c0e9b1077b4c95d4a8b5612d603466dc23c620f Mon Sep 17 00:00:00
> 2001
> From: Bernard Iremonger <bernard.iremonger@intel.com>
> Date: Tue, 9 Jul 2019 12:09:56 +0100
> Subject: [PATCH] flow_classify: fix out-of-bounds access
> 
> [ upstream commit 8d244bb3a32ee54364f8c0a7b7244a67ad407091 ]
> 
> This patch fixes the out-of-bounds coverity issue by removing the offending
> line of code at line 107 in rte_flow_classify_parse.c which is never executed.
> 
> Coverity issue: 343454
> Fixes: be41ac2a330f ("flow_classify: introduce flow classify library")
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  lib/librte_flow_classify/rte_flow_classify_parse.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/lib/librte_flow_classify/rte_flow_classify_parse.c
> b/lib/librte_flow_classify/rte_flow_classify_parse.c
> index f65ceaf7c..465330291 100644
> --- a/lib/librte_flow_classify/rte_flow_classify_parse.c
> +++ b/lib/librte_flow_classify/rte_flow_classify_parse.c
> @@ -104,6 +104,4 @@ classify_pattern_skip_void_item(struct
> rte_flow_item *items,
>  			break;
>  		}
> -
> -		pb = pe + 1;
>  	}
>  	/* Copy the END item. */
> --
> 2.20.1
> 
> ---
>   Diff of the applied patch vs upstream commit (please double-check if non-
> empty:
> ---
> --- -	2019-08-27 09:40:13.152936799 +0100
> +++ 0041-flow_classify-fix-out-of-bounds-access.patch	2019-08-27
> 09:40:10.936144000 +0100
> @@ -1 +1 @@
> -From 8d244bb3a32ee54364f8c0a7b7244a67ad407091 Mon Sep 17 00:00:00
> 2001
> +From 5c0e9b1077b4c95d4a8b5612d603466dc23c620f Mon Sep 17 00:00:00
> 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit 8d244bb3a32ee54364f8c0a7b7244a67ad407091 ]
> +
> @@ -12 +13,0 @@
> -Cc: stable@dpdk.org

[dpdk-stable] patch 'examples/power: fix FreeBSD meson lib dependency' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/7cde4f3daf2cb052220267b056bc8aa5a6e34e04

Thanks.

Kevin Traynor

---
From 7cde4f3daf2cb052220267b056bc8aa5a6e34e04 Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt@intel.com>
Date: Fri, 12 Jul 2019 10:06:51 +0100
Subject: [PATCH] examples/power: fix FreeBSD meson lib dependency

[ upstream commit 16015fd65a5532604139d4c597e1c16027209c4e ]

Samples apps that depend on the power library should not build if
the power library is not present. So now the following apps will
check to see if it's built, else skip building.
* l3fwd-pwer
* vm_power_manager
* guest_cli

Fixes: e0130788576f ("examples/power: support meson/ninja build")
Fixes: 89f0711f9ddf ("examples: build some samples with meson")

Signed-off-by: David Hunt <david.hunt@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/l3fwd-power/meson.build                |  6 ++++--
 examples/vm_power_manager/guest_cli/meson.build |  5 +++++
 examples/vm_power_manager/meson.build           | 10 +++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index a3c5c2f14..257f290e8 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -7,7 +7,9 @@
 # DPDK instance, use 'make'
 
-if host_machine.system() != 'linux'
-	build = false
+if not dpdk_conf.has('RTE_LIBRTE_POWER')
+        build = false
+        subdir_done()
 endif
+
 allow_experimental_apis = true
 deps += ['power', 'timer', 'lpm', 'hash']
diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
index 9e821ceb8..38bd8d837 100644
--- a/examples/vm_power_manager/guest_cli/meson.build
+++ b/examples/vm_power_manager/guest_cli/meson.build
@@ -11,4 +11,9 @@
 name = 'guest_cli'
 
+if not dpdk_conf.has('RTE_LIBRTE_POWER')
+        build = false
+        subdir_done()
+endif
+
 deps += ['power']
 
diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index f98445bc6..20a4a05b3 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -7,4 +7,11 @@
 # DPDK instance, use 'make'
 
+if not dpdk_conf.has('RTE_LIBRTE_POWER')
+	build = false
+	subdir_done()
+endif
+
+deps += ['power']
+
 if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD')
 	deps += ['pmd_bnxt']
@@ -19,7 +26,4 @@ if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')
 endif
 
-deps += ['power']
-
-
 sources = files(
 	'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.203620627 +0100
+++ 0042-examples-power-fix-FreeBSD-meson-lib-dependency.patch	2019-08-27 09:40:10.938143951 +0100
@@ -1 +1 @@
-From 16015fd65a5532604139d4c597e1c16027209c4e Mon Sep 17 00:00:00 2001
+From 7cde4f3daf2cb052220267b056bc8aa5a6e34e04 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 16015fd65a5532604139d4c597e1c16027209c4e ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index b38a7a0d7..d5a3d4bb2 100644
+index a3c5c2f14..257f290e8 100644
@@ -32 +33 @@
--if not is_linux
+-if host_machine.system() != 'linux'
@@ -40 +41 @@
- deps += ['power', 'timer', 'lpm', 'hash', 'metrics']
+ deps += ['power', 'timer', 'lpm', 'hash']

[dpdk-stable] patch 'eal/freebsd: fix config creation' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/f4a9b2732e8eb2ea126cae8cdf28c8b868d94a00

Thanks.

Kevin Traynor

---
From f4a9b2732e8eb2ea126cae8cdf28c8b868d94a00 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 12 Jul 2019 15:48:08 +0100
Subject: [PATCH] eal/freebsd: fix config creation

[ upstream commit e6d3c09282d88e904e4255a0c81e0c19a92217c1 ]

The config create function did not store the mem config address in
the shared memconfig structure, so the secondary processes couldn't
map it at the required address.

Fixes: b149a7064261 ("eal/freebsd: add config reattach in secondary process")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/bsdapp/eal/eal.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 30b4cf7bf..e85c26ae6 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -254,4 +254,9 @@ rte_eal_config_create(void)
 	memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config));
 	rte_config.mem_config = rte_mem_cfg_addr;
+
+	/* store address of the config in the config itself so that secondary
+	 * processes could later map the config into this exact location
+	 */
+	rte_config.mem_config->mem_cfg_addr = (uintptr_t) rte_mem_cfg_addr;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.261296953 +0100
+++ 0043-eal-freebsd-fix-config-creation.patch	2019-08-27 09:40:10.940143903 +0100
@@ -1 +1 @@
-From e6d3c09282d88e904e4255a0c81e0c19a92217c1 Mon Sep 17 00:00:00 2001
+From f4a9b2732e8eb2ea126cae8cdf28c8b868d94a00 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e6d3c09282d88e904e4255a0c81e0c19a92217c1 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- lib/librte_eal/freebsd/eal/eal.c | 5 +++++
+ lib/librte_eal/bsdapp/eal/eal.c | 5 +++++
@@ -19,5 +20,6 @@
-diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
-index 13ca1202c..d53f0fe69 100644
---- a/lib/librte_eal/freebsd/eal/eal.c
-+++ b/lib/librte_eal/freebsd/eal/eal.c
-@@ -267,4 +267,9 @@ rte_eal_config_create(void)
+diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
+index 30b4cf7bf..e85c26ae6 100644
+--- a/lib/librte_eal/bsdapp/eal/eal.c
++++ b/lib/librte_eal/bsdapp/eal/eal.c
+@@ -254,4 +254,9 @@ rte_eal_config_create(void)
+ 	memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config));
@@ -25 +27 @@
- 
++
@@ -30,2 +31,0 @@
-+
- 	return 0;
@@ -32,0 +33 @@
+ 

[dpdk-stable] patch 'kni: fix copy_from_user failure handling' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/7597357d4a351a4a87d8441bf9e35571ab8bd19c

Thanks.

Kevin Traynor

---
From 7597357d4a351a4a87d8441bf9e35571ab8bd19c Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 24 Jun 2019 09:47:11 -0700
Subject: [PATCH] kni: fix copy_from_user failure handling

[ upstream commit 21dde05a95bb301d485ac2c332a80271213e67c3 ]

The correct thing to return if user gives a bad data
is to return -EFAULT. Logging is also discouraged because
it could be used as a DoS attack.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 kernel/linux/kni/kni_misc.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index b74e8a3a6..8bf0e2103 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -319,9 +319,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
 
 	/* Copy kni info from user space */
-	ret = copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info));
-	if (ret) {
-		pr_err("copy_from_user in kni_ioctl_create");
-		return -EIO;
-	}
+	if (copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info)))
+		return -EFAULT;
 
 	/* Check if name is zero-ended */
@@ -496,13 +493,10 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num,
 		return -EINVAL;
 
-	ret = copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info));
-	if (ret) {
-		pr_err("copy_from_user in kni_ioctl_release");
-		return -EIO;
-	}
+	if (copy_from_user(&dev_info, (void *)ioctl_param, sizeof(dev_info)))
+		return -EFAULT;
 
 	/* Release the network device according to its name */
 	if (strlen(dev_info.name) == 0)
-		return ret;
+		return -EINVAL;
 
 	down_write(&knet->kni_list_lock);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.311807116 +0100
+++ 0044-kni-fix-copy_from_user-failure-handling.patch	2019-08-27 09:40:10.941143878 +0100
@@ -1 +1 @@
-From 21dde05a95bb301d485ac2c332a80271213e67c3 Mon Sep 17 00:00:00 2001
+From 7597357d4a351a4a87d8441bf9e35571ab8bd19c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21dde05a95bb301d485ac2c332a80271213e67c3 ]
+
@@ -17 +19 @@
-index b59cf24c2..be45f8234 100644
+index b74e8a3a6..8bf0e2103 100644
@@ -20 +22 @@
-@@ -302,9 +302,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
+@@ -319,9 +319,6 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
@@ -32 +34 @@
-@@ -428,13 +425,10 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num,
+@@ -496,13 +493,10 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num,

[dpdk-stable] patch 'kni: fix style' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/c20b7cf82bd9fd5723917e1a4497410a98e61174

Thanks.

Kevin Traynor

---
From c20b7cf82bd9fd5723917e1a4497410a98e61174 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 24 Jun 2019 09:47:12 -0700
Subject: [PATCH] kni: fix style

[ upstream commit dbb69b7b648f960ee0b3532225b7e17b998f4edf ]

rte_kni does not follow standard style rules.
Noticed some extra \ line continuation etc.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 kernel/linux/kni/kni_net.c |  7 ++++---
 lib/librte_kni/rte_kni.c   | 38 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 7371b6d58..0be1517f0 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -405,5 +405,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
 	num_rq = kni_fifo_count(kni->rx_q);
 
-	/* Get the number of free entrie in tx_q */
+	/* Get the number of free entries in tx_q */
 	num_tq = kni_fifo_free_count(kni->tx_q);
 
@@ -798,5 +798,6 @@ kni_net_config_lo_mode(char *lo_str)
 		pr_debug("loopback mode=lo_mode_fifo_skb enabled");
 		kni_net_rx_func = kni_net_rx_lo_fifo_skb;
-	} else
-		pr_debug("Incognizant parameter, loopback disabled");
+	} else {
+		pr_debug("Unknown loopback parameter, disabled");
+	}
 }
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 99b6c3e13..2721afdf8 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -60,5 +60,5 @@ struct rte_kni {
 	uint32_t slot_id;                   /**< KNI pool slot ID */
 	struct rte_mempool *pktmbuf_pool;   /**< pkt mbuf mempool */
-	unsigned mbuf_size;                 /**< mbuf size */
+	unsigned int mbuf_size;                 /**< mbuf size */
 
 	const struct rte_memzone *m_tx_q;   /**< TX queue memzone */
@@ -79,5 +79,5 @@ struct rte_kni {
 	struct rte_kni_fifo *req_q;         /**< Request queue */
 	struct rte_kni_fifo *resp_q;        /**< Response queue */
-	void * sync_addr;                   /**< Req/Resp Mem address */
+	void *sync_addr;                   /**< Req/Resp Mem address */
 
 	struct rte_kni_ops ops;             /**< operations for request */
@@ -488,5 +488,5 @@ int
 rte_kni_handle_request(struct rte_kni *kni)
 {
-	unsigned ret;
+	unsigned int ret;
 	struct rte_kni_request *req = NULL;
 
@@ -513,6 +513,6 @@ rte_kni_handle_request(struct rte_kni *kni)
 	case RTE_KNI_REQ_CFG_NETWORK_IF: /* Set network interface up/down */
 		if (kni->ops.config_network_if)
-			req->result = kni->ops.config_network_if(\
-					kni->ops.port_id, req->if_up);
+			req->result = kni->ops.config_network_if(kni->ops.port_id,
+								 req->if_up);
 		break;
 	case RTE_KNI_REQ_CHANGE_MAC_ADDR: /* Change MAC Address */
@@ -549,5 +549,5 @@ rte_kni_handle_request(struct rte_kni *kni)
 
 unsigned
-rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
+rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num)
 {
 	void *phy_mbufs[num];
@@ -567,7 +567,7 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
 
 unsigned
-rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
+rte_kni_rx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num)
 {
-	unsigned ret = kni_fifo_get(kni->tx_q, (void **)mbufs, num);
+	unsigned int ret = kni_fifo_get(kni->tx_q, (void **)mbufs, num);
 
 	/* If buffers removed, allocate mbufs and then put them into alloc_q */
@@ -620,5 +620,5 @@ kni_allocate_mbufs(struct rte_kni *kni)
 	}
 
-	allocq_free = (kni->alloc_q->read - kni->alloc_q->write - 1) \
+	allocq_free = (kni->alloc_q->read - kni->alloc_q->write - 1)
 			& (MAX_MBUF_BURST_NUM - 1);
 	for (i = 0; i < allocq_free; i++) {
@@ -674,11 +674,11 @@ kni_check_request_register(struct rte_kni_ops *ops)
 {
 	/* check if KNI request ops has been registered*/
-	if( NULL == ops )
+	if (ops == NULL)
 		return KNI_REQ_NO_REGISTER;
 
-	if ((ops->change_mtu == NULL)
-		&& (ops->config_network_if == NULL)
-		&& (ops->config_mac_address == NULL)
-		&& (ops->config_promiscusity == NULL))
+	if (ops->change_mtu == NULL
+	    && ops->config_network_if == NULL
+	    && ops->config_mac_address == NULL
+	    && ops->config_promiscusity == NULL)
 		return KNI_REQ_NO_REGISTER;
 
@@ -687,14 +687,14 @@ kni_check_request_register(struct rte_kni_ops *ops)
 
 int
-rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
+rte_kni_register_handlers(struct rte_kni *kni, struct rte_kni_ops *ops)
 {
 	enum kni_ops_status req_status;
 
-	if (NULL == ops) {
+	if (ops == NULL) {
 		RTE_LOG(ERR, KNI, "Invalid KNI request operation.\n");
 		return -1;
 	}
 
-	if (NULL == kni) {
+	if (kni == NULL) {
 		RTE_LOG(ERR, KNI, "Invalid kni info.\n");
 		return -1;
@@ -702,5 +702,5 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
 
 	req_status = kni_check_request_register(&kni->ops);
-	if ( KNI_REQ_REGISTERED == req_status) {
+	if (req_status == KNI_REQ_REGISTERED) {
 		RTE_LOG(ERR, KNI, "The KNI request operation has already registered.\n");
 		return -1;
@@ -714,5 +714,5 @@ int
 rte_kni_unregister_handlers(struct rte_kni *kni)
 {
-	if (NULL == kni) {
+	if (kni == NULL) {
 		RTE_LOG(ERR, KNI, "Invalid kni info.\n");
 		return -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.365867901 +0100
+++ 0045-kni-fix-style.patch	2019-08-27 09:40:10.944143805 +0100
@@ -1 +1 @@
-From dbb69b7b648f960ee0b3532225b7e17b998f4edf Mon Sep 17 00:00:00 2001
+From c20b7cf82bd9fd5723917e1a4497410a98e61174 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dbb69b7b648f960ee0b3532225b7e17b998f4edf ]
+
@@ -17 +19 @@
-index 06310fec5..320d51d7f 100644
+index 7371b6d58..0be1517f0 100644
@@ -20 +22 @@
-@@ -402,5 +402,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
+@@ -405,5 +405,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
@@ -27 +29 @@
-@@ -756,5 +756,6 @@ kni_net_config_lo_mode(char *lo_str)
+@@ -798,5 +798,6 @@ kni_net_config_lo_mode(char *lo_str)
@@ -37 +39 @@
-index 9dd5ebe0e..1de053deb 100644
+index 99b6c3e13..2721afdf8 100644
@@ -54 +56 @@
-@@ -479,5 +479,5 @@ int
+@@ -488,5 +488,5 @@ int
@@ -61 +63 @@
-@@ -504,6 +504,6 @@ rte_kni_handle_request(struct rte_kni *kni)
+@@ -513,6 +513,6 @@ rte_kni_handle_request(struct rte_kni *kni)
@@ -70 +72 @@
-@@ -540,5 +540,5 @@ rte_kni_handle_request(struct rte_kni *kni)
+@@ -549,5 +549,5 @@ rte_kni_handle_request(struct rte_kni *kni)
@@ -77 +79 @@
-@@ -558,7 +558,7 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
+@@ -567,7 +567,7 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned num)
@@ -87 +89 @@
-@@ -611,5 +611,5 @@ kni_allocate_mbufs(struct rte_kni *kni)
+@@ -620,5 +620,5 @@ kni_allocate_mbufs(struct rte_kni *kni)
@@ -94 +96 @@
-@@ -665,11 +665,11 @@ kni_check_request_register(struct rte_kni_ops *ops)
+@@ -674,11 +674,11 @@ kni_check_request_register(struct rte_kni_ops *ops)
@@ -111 +113 @@
-@@ -678,14 +678,14 @@ kni_check_request_register(struct rte_kni_ops *ops)
+@@ -687,14 +687,14 @@ kni_check_request_register(struct rte_kni_ops *ops)
@@ -129 +131 @@
-@@ -693,5 +693,5 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
+@@ -702,5 +702,5 @@ rte_kni_register_handlers(struct rte_kni *kni,struct rte_kni_ops *ops)
@@ -136 +138 @@
-@@ -705,5 +705,5 @@ int
+@@ -714,5 +714,5 @@ int

[dpdk-stable] patch 'kni: fix kernel crash with multi-segments' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/97699e43ded7e4b3893c88686c23a46923da037d

Thanks.

Kevin Traynor

---
From 97699e43ded7e4b3893c88686c23a46923da037d Mon Sep 17 00:00:00 2001
From: Yangchao Zhou <zhouyates@gmail.com>
Date: Tue, 25 Jun 2019 23:04:14 +0800
Subject: [PATCH] kni: fix kernel crash with multi-segments

[ upstream commit 5eb1708ec1db1f2d644f44a42468139df0b0ad6c ]

va2pa depends on the physical address and virtual address offset of
current mbuf. It may get the wrong physical address of next mbuf which
allocated in another hugepage segment.

In rte_mempool_populate_default(), trying to allocate whole block of
contiguous memory could be failed. Then, it would reserve memory in
several memzones that have different physical address and virtual address
offsets. The rte_mempool_populate_default() is used by
rte_pktmbuf_pool_create().

Fixes: 8451269e6d7b ("kni: remove continuous memory restriction")

Signed-off-by: Yangchao Zhou <zhouyates@gmail.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 .../prog_guide/kernel_nic_interface.rst       |  8 ++-
 kernel/linux/kni/kni_net.c                    | 51 ++++++++++++-------
 .../eal/include/exec-env/rte_kni_common.h     |  2 +-
 lib/librte_kni/rte_kni.c                      | 16 +++++-
 lib/librte_kni/rte_kni_fifo.h                 | 11 ++++
 5 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/doc/guides/prog_guide/kernel_nic_interface.rst b/doc/guides/prog_guide/kernel_nic_interface.rst
index 7b8a481a6..9c1483adc 100644
--- a/doc/guides/prog_guide/kernel_nic_interface.rst
+++ b/doc/guides/prog_guide/kernel_nic_interface.rst
@@ -267,10 +267,14 @@ Use Case: Ingress
 
 On the DPDK RX side, the mbuf is allocated by the PMD in the RX thread context.
-This thread will enqueue the mbuf in the rx_q FIFO.
+This thread will enqueue the mbuf in the rx_q FIFO,
+and the next pointers in mbuf-chain will convert to physical address.
 The KNI thread will poll all KNI active devices for the rx_q.
 If an mbuf is dequeued, it will be converted to a sk_buff and sent to the net stack via netif_rx().
-The dequeued mbuf must be freed, so the same pointer is sent back in the free_q FIFO.
+The dequeued mbuf must be freed, so the same pointer is sent back in the free_q FIFO,
+and next pointers must convert back to virtual address if exists before put in the free_q FIFO.
 
 The RX thread, in the same main loop, polls this FIFO and frees the mbuf after dequeuing it.
+The address conversion of the next pointer is to prevent the chained mbuf
+in different hugepage segments from causing kernel crash.
 
 Use Case: Egress
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 0be1517f0..96dc93949 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -62,16 +62,4 @@ kva2data_kva(struct rte_kni_mbuf *m)
 }
 
-/* virtual address to physical address */
-static void *
-va2pa(void *va, struct rte_kni_mbuf *m)
-{
-	void *pa;
-
-	pa = (void *)((unsigned long)va -
-			((unsigned long)m->buf_addr -
-			 (unsigned long)m->buf_physaddr));
-	return pa;
-}
-
 /*
  * It can be called to process the request.
@@ -174,5 +162,8 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,
 {
 	uint32_t ret, i, num_dst, num_rx;
-	void *kva;
+	struct rte_kni_mbuf *kva, *prev_kva;
+	int nb_segs;
+	int kva_nb_segs;
+
 	do {
 		num_dst = kni_fifo_free_count(dst_va);
@@ -189,4 +180,15 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,
 			kva = pa2kva(kni->pa[i]);
 			kni->va[i] = pa2va(kni->pa[i], kva);
+
+			kva_nb_segs = kva->nb_segs;
+			for (nb_segs = 0; nb_segs < kva_nb_segs; nb_segs++) {
+				if (!kva->next)
+					break;
+
+				prev_kva = kva;
+				kva = pa2kva(kva->next);
+				/* Convert physical address to virtual address */
+				prev_kva->next = pa2va(prev_kva->next, kva);
+			}
 		}
 
@@ -314,5 +316,5 @@ kni_net_rx_normal(struct kni_dev *kni)
 	uint32_t len;
 	uint32_t i, num_rx, num_fq;
-	struct rte_kni_mbuf *kva;
+	struct rte_kni_mbuf *kva, *prev_kva;
 	void *data_kva;
 	struct sk_buff *skb;
@@ -364,6 +366,9 @@ kni_net_rx_normal(struct kni_dev *kni)
 					break;
 
-				kva = pa2kva(va2pa(kva->next, kva));
+				prev_kva = kva;
+				kva = pa2kva(kva->next);
 				data_kva = kva2data_kva(kva);
+				/* Convert physical address to virtual address */
+				prev_kva->next = pa2va(prev_kva->next, kva);
 			}
 		}
@@ -397,5 +402,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
 	uint32_t len;
 	uint32_t i, num, num_rq, num_tq, num_aq, num_fq;
-	struct rte_kni_mbuf *kva;
+	struct rte_kni_mbuf *kva, *next_kva;
 	void *data_kva;
 	struct rte_kni_mbuf *alloc_kva;
@@ -440,4 +445,11 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
 			kni->va[i] = pa2va(kni->pa[i], kva);
 
+			while (kva->next) {
+				next_kva = pa2kva(kva->next);
+				/* Convert physical address to virtual address */
+				kva->next = pa2va(kva->next, next_kva);
+				kva = next_kva;
+			}
+
 			alloc_kva = pa2kva(kni->alloc_pa[i]);
 			alloc_data_kva = kva2data_kva(alloc_kva);
@@ -482,5 +494,5 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
 	uint32_t len;
 	uint32_t i, num_rq, num_fq, num;
-	struct rte_kni_mbuf *kva;
+	struct rte_kni_mbuf *kva, *prev_kva;
 	void *data_kva;
 	struct sk_buff *skb;
@@ -546,6 +558,9 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
 					break;
 
-				kva = pa2kva(va2pa(kva->next, kva));
+				prev_kva = kva;
+				kva = pa2kva(kva->next);
 				data_kva = kva2data_kva(kva);
+				/* Convert physical address to virtual address */
+				prev_kva->next = pa2va(prev_kva->next, kva);
 			}
 		}
diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
index 5db5a1333..eb7adf34a 100644
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -87,5 +87,5 @@ struct rte_kni_mbuf {
 	char pad3[8] __attribute__((__aligned__(RTE_CACHE_LINE_MIN_SIZE)));
 	void *pool;
-	void *next;
+	void *next;             /**< Physical address of next mbuf in kernel. */
 };
 
diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c
index 2721afdf8..941bec968 100644
--- a/lib/librte_kni/rte_kni.c
+++ b/lib/librte_kni/rte_kni.c
@@ -359,4 +359,17 @@ va2pa(struct rte_mbuf *m)
 }
 
+static void *
+va2pa_all(struct rte_mbuf *mbuf)
+{
+	void *phy_mbuf = va2pa(mbuf);
+	struct rte_mbuf *next = mbuf->next;
+	while (next) {
+		mbuf->next = va2pa(next);
+		mbuf = next;
+		next = mbuf->next;
+	}
+	return phy_mbuf;
+}
+
 static void
 obj_free(struct rte_mempool *mp __rte_unused, void *opaque, void *obj,
@@ -551,4 +564,5 @@ unsigned
 rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num)
 {
+	num = RTE_MIN(kni_fifo_free_count(kni->rx_q), num);
 	void *phy_mbufs[num];
 	unsigned int ret;
@@ -556,5 +570,5 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num)
 
 	for (i = 0; i < num; i++)
-		phy_mbufs[i] = va2pa(mbufs[i]);
+		phy_mbufs[i] = va2pa_all(mbufs[i]);
 
 	ret = kni_fifo_put(kni->rx_q, phy_mbufs, num);
diff --git a/lib/librte_kni/rte_kni_fifo.h b/lib/librte_kni/rte_kni_fifo.h
index 287d7deb2..d2ec82fe8 100644
--- a/lib/librte_kni/rte_kni_fifo.h
+++ b/lib/librte_kni/rte_kni_fifo.h
@@ -105,2 +105,13 @@ kni_fifo_count(struct rte_kni_fifo *fifo)
 	return (fifo->len + fifo_write - fifo_read) & (fifo->len - 1);
 }
+
+/**
+ * Get the num of available elements in the fifo
+ */
+static inline uint32_t
+kni_fifo_free_count(struct rte_kni_fifo *fifo)
+{
+	uint32_t fifo_write = __KNI_LOAD_ACQUIRE(&fifo->write);
+	uint32_t fifo_read = __KNI_LOAD_ACQUIRE(&fifo->read);
+	return (fifo_read - fifo_write - 1) & (fifo->len - 1);
+}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.423545661 +0100
+++ 0046-kni-fix-kernel-crash-with-multi-segments.patch	2019-08-27 09:40:10.947143732 +0100
@@ -1 +1 @@
-From 5eb1708ec1db1f2d644f44a42468139df0b0ad6c Mon Sep 17 00:00:00 2001
+From 97699e43ded7e4b3893c88686c23a46923da037d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5eb1708ec1db1f2d644f44a42468139df0b0ad6c ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
- .../linux/eal/include/rte_kni_common.h        |  2 +-
+ .../eal/include/exec-env/rte_kni_common.h     |  2 +-
@@ -30 +31 @@
-index 5afd05c0a..38369b30e 100644
+index 7b8a481a6..9c1483adc 100644
@@ -33 +34 @@
-@@ -269,10 +269,14 @@ Use Case: Ingress
+@@ -267,10 +267,14 @@ Use Case: Ingress
@@ -51 +52 @@
-index 319ee2dcb..a736407e6 100644
+index 0be1517f0..96dc93949 100644
@@ -54 +55 @@
-@@ -63,16 +63,4 @@ kva2data_kva(struct rte_kni_mbuf *m)
+@@ -62,16 +62,4 @@ kva2data_kva(struct rte_kni_mbuf *m)
@@ -71 +72 @@
-@@ -175,5 +163,8 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,
+@@ -174,5 +162,8 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,
@@ -81 +82 @@
-@@ -190,4 +181,15 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,
+@@ -189,4 +180,15 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,
@@ -97 +98 @@
-@@ -315,5 +317,5 @@ kni_net_rx_normal(struct kni_dev *kni)
+@@ -314,5 +316,5 @@ kni_net_rx_normal(struct kni_dev *kni)
@@ -104 +105 @@
-@@ -362,6 +364,9 @@ kni_net_rx_normal(struct kni_dev *kni)
+@@ -364,6 +366,9 @@ kni_net_rx_normal(struct kni_dev *kni)
@@ -115 +116 @@
-@@ -394,5 +399,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
+@@ -397,5 +402,5 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
@@ -122 +123 @@
-@@ -438,4 +443,11 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
+@@ -440,4 +445,11 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)
@@ -134 +135 @@
-@@ -480,5 +492,5 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
+@@ -482,5 +494,5 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
@@ -141 +142 @@
-@@ -538,6 +550,9 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
+@@ -546,6 +558,9 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)
@@ -152,4 +153,4 @@
-diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h
-index 91a1c1408..37d9ee8f0 100644
---- a/lib/librte_eal/linux/eal/include/rte_kni_common.h
-+++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h
+diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
+index 5db5a1333..eb7adf34a 100644
+--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
++++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -164 +165 @@
-index 1de053deb..4b51fb4fe 100644
+index 2721afdf8..941bec968 100644
@@ -167 +168 @@
-@@ -350,4 +350,17 @@ va2pa(struct rte_mbuf *m)
+@@ -359,4 +359,17 @@ va2pa(struct rte_mbuf *m)
@@ -185 +186 @@
-@@ -542,4 +555,5 @@ unsigned
+@@ -551,4 +564,5 @@ unsigned
@@ -191 +192 @@
-@@ -547,5 +561,5 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num)
+@@ -556,5 +570,5 @@ rte_kni_tx_burst(struct rte_kni *kni, struct rte_mbuf **mbufs, unsigned int num)

[dpdk-stable] patch 'examples/power: fix strcpy buffer overrun' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/29f6c01ad677f5693d2cba9e89f8d490c209cb99

Thanks.

Kevin Traynor

---
From 29f6c01ad677f5693d2cba9e89f8d490c209cb99 Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt@intel.com>
Date: Tue, 16 Jul 2019 12:19:00 +0100
Subject: [PATCH] examples/power: fix strcpy buffer overrun

[ upstream commit 135393d4560bcffaa3fe0b739d26591565a320a2 ]

replace strcpy with strlcpy to prevent buffer overrun
With fix, attempting to use a VERY lonng vm name results in a nicely
truncated 32 character name rather than a segfault:
Setting VM Name to [sdfdsfsfsdffdsdsasdsadasdakjshd]

Using strlcpy rather than rte_strlcpy, as the rte_ version is only a
fallback.

As well as the fix in main.c, this patch also changes an occurrence of
rte_strlcpy in channel_manager.c and channel_monitor.c to strlcpy.

Fixes: 59287933a0bb ("examples/vm_power: add options to guest app")

Signed-off-by: David Hunt <david.hunt@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 examples/vm_power_manager/guest_cli/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/vm_power_manager/guest_cli/main.c b/examples/vm_power_manager/guest_cli/main.c
index 36365b124..2094145eb 100644
--- a/examples/vm_power_manager/guest_cli/main.c
+++ b/examples/vm_power_manager/guest_cli/main.c
@@ -66,5 +66,5 @@ parse_args(int argc, char **argv)
 		/* portmask */
 		case 'n':
-			strcpy(policy->vm_name, optarg);
+			strlcpy(policy->vm_name, optarg, VM_MAX_NAME_SZ);
 			printf("Setting VM Name to [%s]\n", policy->vm_name);
 			break;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.475508439 +0100
+++ 0047-examples-power-fix-strcpy-buffer-overrun.patch	2019-08-27 09:40:10.948143708 +0100
@@ -1 +1 @@
-From 135393d4560bcffaa3fe0b739d26591565a320a2 Mon Sep 17 00:00:00 2001
+From 29f6c01ad677f5693d2cba9e89f8d490c209cb99 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 135393d4560bcffaa3fe0b739d26591565a320a2 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -23,27 +24,3 @@
- examples/vm_power_manager/channel_manager.c | 2 +-
- examples/vm_power_manager/channel_monitor.c | 2 +-
- examples/vm_power_manager/guest_cli/main.c  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/examples/vm_power_manager/channel_manager.c b/examples/vm_power_manager/channel_manager.c
-index 2c1332257..4db225755 100644
---- a/examples/vm_power_manager/channel_manager.c
-+++ b/examples/vm_power_manager/channel_manager.c
-@@ -589,5 +589,5 @@ add_host_channels(void)
- 		}
- 		chan_infos[i] = chan_info;
--		rte_strlcpy(chan_info->channel_path, socket_path,
-+		strlcpy(chan_info->channel_path, socket_path,
- 				sizeof(chan_info->channel_path));
- 
-diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c
-index 9d7474da0..496772f8a 100644
---- a/examples/vm_power_manager/channel_monitor.c
-+++ b/examples/vm_power_manager/channel_monitor.c
-@@ -310,5 +310,5 @@ parse_json_to_pkt(json_t *element, struct channel_packet *pkt,
- 			return -1;
- 		}
--		rte_strlcpy(pkt->vm_name, vm_name, VM_MAX_NAME_SZ);
-+		strlcpy(pkt->vm_name, vm_name, VM_MAX_NAME_SZ);
- 		pkt->resource_id = resource_id;
- 	}
+ examples/vm_power_manager/guest_cli/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+

[dpdk-stable] patch 'test/distributor: fix flush with worker shutdown' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/8ba090cf6723a1552ba52b92718bc7a11f52b746

Thanks.

Kevin Traynor

---
From 8ba090cf6723a1552ba52b92718bc7a11f52b746 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra@marvell.com>
Date: Fri, 5 Jul 2019 10:05:04 +0000
Subject: [PATCH] test/distributor: fix flush with worker shutdown

[ upstream commit c275ded129cc553309c544b0574826ab23eb2153 ]

On restarting worker 0 after shutdown, packets handled by
worker 0 must be incremented only when a packet is received by
it.

Fixes: c3eabff124e6 ("distributor: add unit tests")

Signed-off-by: Harman Kalra <hkalra@marvell.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
 test/test/test_distributor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c
index da3348fd1..d4996798d 100644
--- a/test/test/test_distributor.c
+++ b/test/test/test_distributor.c
@@ -375,5 +375,6 @@ handle_work_for_shutdown_test(void *arg)
 
 		while (!quit) {
-			worker_stats[id].handled_packets++, count++;
+			worker_stats[id].handled_packets += num;
+			count += num;
 			rte_pktmbuf_free(pkt);
 			num = rte_distributor_get_pkt(d, id, buf, buf, num);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.530590519 +0100
+++ 0048-test-distributor-fix-flush-with-worker-shutdown.patch	2019-08-27 09:40:10.949143684 +0100
@@ -1 +1 @@
-From c275ded129cc553309c544b0574826ab23eb2153 Mon Sep 17 00:00:00 2001
+From 8ba090cf6723a1552ba52b92718bc7a11f52b746 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c275ded129cc553309c544b0574826ab23eb2153 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- app/test/test_distributor.c | 3 ++-
+ test/test/test_distributor.c | 3 ++-
@@ -19,5 +20,5 @@
-diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
-index 928238f4c..7090b55f8 100644
---- a/app/test/test_distributor.c
-+++ b/app/test/test_distributor.c
-@@ -376,5 +376,6 @@ handle_work_for_shutdown_test(void *arg)
+diff --git a/test/test/test_distributor.c b/test/test/test_distributor.c
+index da3348fd1..d4996798d 100644
+--- a/test/test/test_distributor.c
++++ b/test/test/test_distributor.c
+@@ -375,5 +375,6 @@ handle_work_for_shutdown_test(void *arg)

[dpdk-stable] patch 'distributor: fix check of workers number' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/6ba96c6bfaeb7d3406b3d0e97379cb4269a07522

Thanks.

Kevin Traynor

---
From 6ba96c6bfaeb7d3406b3d0e97379cb4269a07522 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra@marvell.com>
Date: Fri, 5 Jul 2019 10:05:12 +0000
Subject: [PATCH] distributor: fix check of workers number

[ upstream commit acc6e5503e058553d668bc8f21038275aa3fa2e2 ]

No of workers should never exceed RTE_MAX_LCORE.
RTE_DIST_ALG_SINGLE also require no of workers check.

Fixes: 775003ad2f96 ("distributor: add new burst-capable library")

Signed-off-by: Harman Kalra <hkalra@marvell.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
 lib/librte_distributor/rte_distributor.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c
index d50598377..043b8f3ae 100644
--- a/lib/librte_distributor/rte_distributor.c
+++ b/lib/librte_distributor/rte_distributor.c
@@ -596,4 +596,10 @@ rte_distributor_create_v1705(const char *name,
 	RTE_BUILD_BUG_ON((RTE_DISTRIB_MAX_WORKERS & 7) != 0);
 
+	if (name == NULL || num_workers >=
+		(unsigned int)RTE_MIN(RTE_DISTRIB_MAX_WORKERS, RTE_MAX_LCORE)) {
+		rte_errno = EINVAL;
+		return NULL;
+	}
+
 	if (alg_type == RTE_DIST_ALG_SINGLE) {
 		d = malloc(sizeof(struct rte_distributor));
@@ -613,9 +619,4 @@ rte_distributor_create_v1705(const char *name,
 	}
 
-	if (name == NULL || num_workers >= RTE_DISTRIB_MAX_WORKERS) {
-		rte_errno = EINVAL;
-		return NULL;
-	}
-
 	snprintf(mz_name, sizeof(mz_name), RTE_DISTRIB_PREFIX"%s", name);
 	mz = rte_memzone_reserve(mz_name, sizeof(*d), socket_id, NO_FLAGS);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.579821520 +0100
+++ 0049-distributor-fix-check-of-workers-number.patch	2019-08-27 09:40:10.949143684 +0100
@@ -1 +1 @@
-From acc6e5503e058553d668bc8f21038275aa3fa2e2 Mon Sep 17 00:00:00 2001
+From 6ba96c6bfaeb7d3406b3d0e97379cb4269a07522 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit acc6e5503e058553d668bc8f21038275aa3fa2e2 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 0a3213bbf..9fa05f69a 100644
+index d50598377..043b8f3ae 100644
@@ -22 +23 @@
-@@ -597,4 +597,10 @@ rte_distributor_create_v1705(const char *name,
+@@ -596,4 +596,10 @@ rte_distributor_create_v1705(const char *name,
@@ -33 +34 @@
-@@ -614,9 +620,4 @@ rte_distributor_create_v1705(const char *name,
+@@ -613,9 +619,4 @@ rte_distributor_create_v1705(const char *name,

[dpdk-stable] patch 'examples: fix use of ethdev internal device array' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/6a734ed87214cd1018864f7ce006a1f2b13f956f

Thanks.

Kevin Traynor

---
From 6a734ed87214cd1018864f7ce006a1f2b13f956f Mon Sep 17 00:00:00 2001
From: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Date: Wed, 17 Jul 2019 09:58:04 +0200
Subject: [PATCH] examples: fix use of ethdev internal device array

[ upstream commit 5c5c1f99a923986b5b2d2d34e874ca14ffabbcb0 ]

Modify l3fwd and related example apps to use locally defined port_conf
instead of global rte_eth_devices which is not a part of public API.
Apps should not be using internal DPDK data structures directly.

Fixes: 1ef9600b2d20 ("examples/l3fwd: convert to ethdev offloads API")
Fixes: ba8c103d2455 ("examples/l3fwd-acl: convert to new ethdev offloads API")
Fixes: 40df1d7a695d ("examples/l3fwd-power: convert to new ethdev offloads API")
Fixes: 43fc038262b8 ("examples/l3fwd-vf: convert to new ethdev offloads API")
Fixes: 373149c631fe ("examples/performance-thread: convert to new offloads API")

Signed-off-by: Marcin Zapolski <marcinx.a.zapolski@intel.com>
---
 examples/l3fwd-acl/main.c                       | 6 +-----
 examples/l3fwd-power/main.c                     | 6 +-----
 examples/l3fwd-vf/main.c                        | 7 +------
 examples/l3fwd/main.c                           | 6 +-----
 examples/performance-thread/l3fwd-thread/main.c | 6 +-----
 5 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index a322ce4f2..8ed0c07ec 100644
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -2019,12 +2019,8 @@ main(int argc, char **argv)
 		/* init RX queues */
 		for (queue = 0; queue < qconf->n_rx_queue; ++queue) {
-			struct rte_eth_dev *dev;
-			struct rte_eth_conf *conf;
 			struct rte_eth_rxconf rxq_conf;
 
 			portid = qconf->rx_queue_list[queue].port_id;
 			queueid = qconf->rx_queue_list[queue].queue_id;
-			dev = &rte_eth_devices[portid];
-			conf = &dev->data->dev_conf;
 
 			if (numa_on)
@@ -2039,5 +2035,5 @@ main(int argc, char **argv)
 			rte_eth_dev_info_get(portid, &dev_info);
 			rxq_conf = dev_info.default_rxconf;
-			rxq_conf.offloads = conf->rxmode.offloads;
+			rxq_conf.offloads = port_conf.rxmode.offloads;
 			ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
 					socketid, &rxq_conf,
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 9c7b31564..3421de8ec 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -2119,11 +2119,7 @@ main(int argc, char **argv)
 		for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
 			struct rte_eth_rxconf rxq_conf;
-			struct rte_eth_dev *dev;
-			struct rte_eth_conf *conf;
 
 			portid = qconf->rx_queue_list[queue].port_id;
 			queueid = qconf->rx_queue_list[queue].queue_id;
-			dev = &rte_eth_devices[portid];
-			conf = &dev->data->dev_conf;
 
 			if (numa_on)
@@ -2138,5 +2134,5 @@ main(int argc, char **argv)
 			rte_eth_dev_info_get(portid, &dev_info);
 			rxq_conf = dev_info.default_rxconf;
-			rxq_conf.offloads = conf->rxmode.offloads;
+			rxq_conf.offloads = port_conf.rxmode.offloads;
 			ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
 				socketid, &rxq_conf,
diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index 036f86854..ce052544f 100644
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -1023,11 +1023,6 @@ main(int argc, char **argv)
 		/* init RX queues */
 		for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
-			struct rte_eth_dev *dev;
-			struct rte_eth_conf *conf;
-
 			portid = qconf->rx_queue_list[queue].port_id;
 			queueid = qconf->rx_queue_list[queue].queue_id;
-			dev = &rte_eth_devices[portid];
-			conf = &dev->data->dev_conf;
 
 			if (numa_on)
@@ -1041,5 +1036,5 @@ main(int argc, char **argv)
 			rte_eth_dev_info_get(portid, &dev_info);
 			rxq_conf = dev_info.default_rxconf;
-			rxq_conf.offloads = conf->rxmode.offloads;
+			rxq_conf.offloads = port_conf.rxmode.offloads;
 			ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
 						socketid, &rxq_conf,
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index e4b99efe0..71a67f422 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -946,12 +946,8 @@ main(int argc, char **argv)
 		/* init RX queues */
 		for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
-			struct rte_eth_dev *dev;
-			struct rte_eth_conf *conf;
 			struct rte_eth_rxconf rxq_conf;
 
 			portid = qconf->rx_queue_list[queue].port_id;
 			queueid = qconf->rx_queue_list[queue].queue_id;
-			dev = &rte_eth_devices[portid];
-			conf = &dev->data->dev_conf;
 
 			if (numa_on)
@@ -966,5 +962,5 @@ main(int argc, char **argv)
 			rte_eth_dev_info_get(portid, &dev_info);
 			rxq_conf = dev_info.default_rxconf;
-			rxq_conf.offloads = conf->rxmode.offloads;
+			rxq_conf.offloads = port_conf.rxmode.offloads;
 			ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
 					socketid,
diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index 4f8747bc3..8ddcfa2f4 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -3635,12 +3635,8 @@ main(int argc, char **argv)
 		/* init RX queues */
 		for (queue = 0; queue < rx_thread[i].n_rx_queue; ++queue) {
-			struct rte_eth_dev *dev;
-			struct rte_eth_conf *conf;
 			struct rte_eth_rxconf rxq_conf;
 
 			portid = rx_thread[i].rx_queue_list[queue].port_id;
 			queueid = rx_thread[i].rx_queue_list[queue].queue_id;
-			dev = &rte_eth_devices[portid];
-			conf = &dev->data->dev_conf;
 
 			if (numa_on)
@@ -3654,5 +3650,5 @@ main(int argc, char **argv)
 			rte_eth_dev_info_get(portid, &dev_info);
 			rxq_conf = dev_info.default_rxconf;
-			rxq_conf.offloads = conf->rxmode.offloads;
+			rxq_conf.offloads = port_conf.rxmode.offloads;
 			ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
 					socketid,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.634769662 +0100
+++ 0050-examples-fix-use-of-ethdev-internal-device-array.patch	2019-08-27 09:40:10.959143441 +0100
@@ -1 +1 @@
-From 5c5c1f99a923986b5b2d2d34e874ca14ffabbcb0 Mon Sep 17 00:00:00 2001
+From 6a734ed87214cd1018864f7ce006a1f2b13f956f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c5c1f99a923986b5b2d2d34e874ca14ffabbcb0 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 09b7c3850..0c44df767 100644
+index a322ce4f2..8ed0c07ec 100644
@@ -30 +31 @@
-@@ -2023,12 +2023,8 @@ main(int argc, char **argv)
+@@ -2019,12 +2019,8 @@ main(int argc, char **argv)
@@ -43 +44 @@
-@@ -2043,5 +2039,5 @@ main(int argc, char **argv)
+@@ -2039,5 +2035,5 @@ main(int argc, char **argv)
@@ -51 +52 @@
-index cbe8f8e3f..fd8d9528f 100644
+index 9c7b31564..3421de8ec 100644
@@ -54 +55 @@
-@@ -2386,11 +2386,7 @@ main(int argc, char **argv)
+@@ -2119,11 +2119,7 @@ main(int argc, char **argv)
@@ -66 +67 @@
-@@ -2405,5 +2401,5 @@ main(int argc, char **argv)
+@@ -2138,5 +2134,5 @@ main(int argc, char **argv)
@@ -74 +75 @@
-index 1432f8969..572e74cf5 100644
+index 036f86854..ce052544f 100644
@@ -97 +98 @@
-index 570693b32..3800bad19 100644
+index e4b99efe0..71a67f422 100644
@@ -100 +101 @@
-@@ -972,12 +972,8 @@ main(int argc, char **argv)
+@@ -946,12 +946,8 @@ main(int argc, char **argv)
@@ -113 +114 @@
-@@ -992,5 +988,5 @@ main(int argc, char **argv)
+@@ -966,5 +962,5 @@ main(int argc, char **argv)
@@ -118,2 +119,2 @@
- 			if (!per_port_pool)
- 				ret = rte_eth_rx_queue_setup(portid, queueid,
+ 			ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
+ 					socketid,
@@ -121 +122 @@
-index dd468958a..0121c71cb 100644
+index 4f8747bc3..8ddcfa2f4 100644
@@ -124 +125 @@
-@@ -3646,12 +3646,8 @@ main(int argc, char **argv)
+@@ -3635,12 +3635,8 @@ main(int argc, char **argv)
@@ -137 +138 @@
-@@ -3665,5 +3661,5 @@ main(int argc, char **argv)
+@@ -3654,5 +3650,5 @@ main(int argc, char **argv)

[dpdk-stable] patch 'examples/ipsec-secgw: fix use of ethdev internal struct' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/ac595561fac708dff1b4302ca24f1a3853117c46

Thanks.

Kevin Traynor

---
From ac595561fac708dff1b4302ca24f1a3853117c46 Mon Sep 17 00:00:00 2001
From: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Date: Wed, 17 Jul 2019 09:58:06 +0200
Subject: [PATCH] examples/ipsec-secgw: fix use of ethdev internal struct

[ upstream commit 0109baf1964ca047646d49708263b2f6cbd63571 ]

Modify ipsec-secgw example app to use rte_eth_dev_info_get instead of
rte_eth_dev.
Apps should not be using internal DPDK data structures directly.

Fixes: a4677f78368b ("examples/ipsec-secgw: add target queues in flow actions")

Signed-off-by: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
 examples/ipsec-secgw/ipsec.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index 72a29bcb1..ebac08e91 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -187,5 +187,5 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
 					.rss_key_len = 40,
 				};
-				struct rte_eth_dev *eth_dev;
+				struct rte_eth_dev_info dev_info;
 				uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
 				struct rte_flow_action_rss action_rss;
@@ -193,15 +193,14 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
 				unsigned int j;
 
+				rte_eth_dev_info_get(sa->portid, &dev_info);
 				sa->action[2].type = RTE_FLOW_ACTION_TYPE_END;
 				/* Try RSS. */
 				sa->action[1].type = RTE_FLOW_ACTION_TYPE_RSS;
 				sa->action[1].conf = &action_rss;
-				eth_dev = ctx->device;
 				rte_eth_dev_rss_hash_conf_get(sa->portid,
 							      &rss_conf);
 				for (i = 0, j = 0;
-				     i < eth_dev->data->nb_rx_queues; ++i)
-					if (eth_dev->data->rx_queues[i])
-						queue[j++] = i;
+				     i < dev_info.nb_rx_queues; ++i)
+					queue[j++] = i;
 				action_rss = (struct rte_flow_action_rss){
 					.types = rss_conf.rss_hf,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.699004061 +0100
+++ 0051-examples-ipsec-secgw-fix-use-of-ethdev-internal-stru.patch	2019-08-27 09:40:10.960143417 +0100
@@ -1 +1 @@
-From 0109baf1964ca047646d49708263b2f6cbd63571 Mon Sep 17 00:00:00 2001
+From ac595561fac708dff1b4302ca24f1a3853117c46 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0109baf1964ca047646d49708263b2f6cbd63571 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index d1cbdc38d..f8fc49bac 100644
+index 72a29bcb1..ebac08e91 100644
@@ -24 +25 @@
-@@ -190,5 +190,5 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
+@@ -187,5 +187,5 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
@@ -31 +32 @@
-@@ -196,15 +196,14 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
+@@ -193,15 +193,14 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)

[dpdk-stable] patch 'examples/ip_frag: fix use of ethdev internal device array' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/f089ac8f1da4bd97c6b9f8d11768375d48b82721

Thanks.

Kevin Traynor

---
From f089ac8f1da4bd97c6b9f8d11768375d48b82721 Mon Sep 17 00:00:00 2001
From: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Date: Wed, 17 Jul 2019 09:58:05 +0200
Subject: [PATCH] examples/ip_frag: fix use of ethdev internal device array

[ upstream commit 6b7780bfebe4de743c5edbe7a3c7f9fa817789ad ]

Modify ip_fragmentation example app to use rte_eth_info_get instead
of global rte_eth_devices structure.
Apps should not be using internal DPDK data structures directly.

Fixes: 9758b956dcf4 ("examples/ip_fragmentation: fix Tx queues init")

Signed-off-by: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/ip_fragmentation/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index b388f3083..8ffcfef80 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -967,5 +967,5 @@ main(int argc, char **argv)
 				continue;
 
-			if (queueid >= rte_eth_devices[portid].data->nb_tx_queues)
+			if (queueid >= dev_info.nb_tx_queues)
 				break;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.754115244 +0100
+++ 0052-examples-ip_frag-fix-use-of-ethdev-internal-device-a.patch	2019-08-27 09:40:10.962143368 +0100
@@ -1 +1 @@
-From 6b7780bfebe4de743c5edbe7a3c7f9fa817789ad Mon Sep 17 00:00:00 2001
+From f089ac8f1da4bd97c6b9f8d11768375d48b82721 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6b7780bfebe4de743c5edbe7a3c7f9fa817789ad ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index ccaf23ff0..1b51bf2da 100644
+index b388f3083..8ffcfef80 100644
@@ -23 +24 @@
-@@ -992,5 +992,5 @@ main(int argc, char **argv)
+@@ -967,5 +967,5 @@ main(int argc, char **argv)

[dpdk-stable] patch 'examples/ip_frag: fix unknown ethernet type' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/bf07a56016504c4117b3f7e4afb06a389a2e2ebd

Thanks.

Kevin Traynor

---
From bf07a56016504c4117b3f7e4afb06a389a2e2ebd Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Thu, 18 Jul 2019 11:11:13 +0100
Subject: [PATCH] examples/ip_frag: fix unknown ethernet type

[ upstream commit 826038fcfc7b82866673f10e22cc89860ca4cba3 ]

Right now app blindly set IPv4 ether type for all non IPv6 packets.
Instead we can save and later restore original type value.

Fixes: 74de12b7b63a ("examples/ip_fragmentation: overhaul")

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 examples/ip_fragmentation/main.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c
index 8ffcfef80..1bcda4e52 100644
--- a/examples/ip_fragmentation/main.c
+++ b/examples/ip_fragmentation/main.c
@@ -234,9 +234,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 	struct rx_queue *rxq;
 	uint32_t i, len, next_hop;
-	uint8_t ipv6;
-	uint16_t port_out;
+	uint16_t port_out, ether_type;
 	int32_t len2;
+	const struct ether_hdr *eth;
 
-	ipv6 = 0;
 	rxq = &qconf->rx_queue_list[queueid];
 
@@ -244,4 +243,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 	port_out = port_in;
 
+	/* save ether type of the incoming packet */
+	eth = rte_pktmbuf_mtod(m, const struct ether_hdr *);
+	ether_type = eth->ether_type;
+
 	/* Remove the Ethernet header and trailer from the input packet */
 	rte_pktmbuf_adj(m, (uint16_t)sizeof(struct ether_hdr));
@@ -289,6 +292,4 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 		struct ipv6_hdr *ip_hdr;
 
-		ipv6 = 1;
-
 		/* Read the lookup key (i.e. ip_dst) from the input packet */
 		ip_hdr = rte_pktmbuf_mtod(m, struct ipv6_hdr *);
@@ -347,8 +348,5 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
 		/* src addr */
 		ether_addr_copy(&ports_eth_addr[port_out], &eth_hdr->s_addr);
-		if (ipv6)
-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
-		else
-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);
+		eth_hdr->ether_type = ether_type;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.804656569 +0100
+++ 0053-examples-ip_frag-fix-unknown-ethernet-type.patch	2019-08-27 09:40:10.963143344 +0100
@@ -1 +1 @@
-From 826038fcfc7b82866673f10e22cc89860ca4cba3 Mon Sep 17 00:00:00 2001
+From bf07a56016504c4117b3f7e4afb06a389a2e2ebd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 826038fcfc7b82866673f10e22cc89860ca4cba3 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- examples/ip_fragmentation/main.c | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
+ examples/ip_fragmentation/main.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
@@ -18 +19 @@
-index d03e93c90..edf87a1a1 100644
+index 8ffcfef80..1bcda4e52 100644
@@ -21 +22 @@
-@@ -243,10 +243,9 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+@@ -234,9 +234,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
@@ -28,2 +29 @@
- 	uint64_t ol_flags;
-+	const struct rte_ether_hdr *eth;
++	const struct ether_hdr *eth;
@@ -32 +31,0 @@
- 	ol_flags = 0;
@@ -34 +33,2 @@
-@@ -255,4 +254,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+ 
+@@ -244,4 +243,8 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
@@ -38 +38 @@
-+	eth = rte_pktmbuf_mtod(m, const struct rte_ether_hdr *);
++	eth = rte_pktmbuf_mtod(m, const struct ether_hdr *);
@@ -42,3 +42,3 @@
- 	rte_pktmbuf_adj(m, (uint16_t)sizeof(struct rte_ether_hdr));
-@@ -303,6 +306,4 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
- 		struct rte_ipv6_hdr *ip_hdr;
+ 	rte_pktmbuf_adj(m, (uint16_t)sizeof(struct ether_hdr));
+@@ -289,6 +292,4 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+ 		struct ipv6_hdr *ip_hdr;
@@ -49,11 +49,8 @@
- 		ip_hdr = rte_pktmbuf_mtod(m, struct rte_ipv6_hdr *);
-@@ -365,11 +366,5 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
- 		rte_ether_addr_copy(&ports_eth_addr[port_out],
- 				&eth_hdr->s_addr);
--		if (ipv6) {
--			eth_hdr->ether_type =
--				rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV6);
--		} else {
--			eth_hdr->ether_type =
--				rte_be_to_cpu_16(RTE_ETHER_TYPE_IPV4);
--		}
+ 		ip_hdr = rte_pktmbuf_mtod(m, struct ipv6_hdr *);
+@@ -347,8 +348,5 @@ l3fwd_simple_forward(struct rte_mbuf *m, struct lcore_queue_conf *qconf,
+ 		/* src addr */
+ 		ether_addr_copy(&ports_eth_addr[port_out], &eth_hdr->s_addr);
+-		if (ipv6)
+-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv6);
+-		else
+-			eth_hdr->ether_type = rte_be_to_cpu_16(ETHER_TYPE_IPv4);

[dpdk-stable] patch 'examples/tep_term: remove duplicate definitions' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/2ad789e9998f90d224e6baf9ec21ab25cc272c96

Thanks.

Kevin Traynor

---
From 2ad789e9998f90d224e6baf9ec21ab25cc272c96 Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang@intel.com>
Date: Wed, 17 Jul 2019 01:04:07 +0800
Subject: [PATCH] examples/tep_term: remove duplicate definitions

[ upstream commit faa4ee75364dcb5343790d5fcf850cebdf7353f6 ]

The state of virtio device has been defined in both header file and
source file, keep the definition in header file for public use.

Fixes: a50245ede72a ("examples/tep_term: initialize VXLAN sample")

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
 examples/tep_termination/main.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c
index d6379e31e..6db604ed8 100644
--- a/examples/tep_termination/main.c
+++ b/examples/tep_termination/main.c
@@ -53,9 +53,4 @@
 #define JUMBO_FRAME_MAX_SIZE    0x2600
 
-/* State of virtio device. */
-#define DEVICE_MAC_LEARNING 0
-#define DEVICE_RX	    1
-#define DEVICE_SAFE_REMOVE  2
-
 /* Config_core_flag status definitions. */
 #define REQUEST_DEV_REMOVAL 1
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.862689136 +0100
+++ 0054-examples-tep_term-remove-duplicate-definitions.patch	2019-08-27 09:40:10.964143320 +0100
@@ -1 +1 @@
-From faa4ee75364dcb5343790d5fcf850cebdf7353f6 Mon Sep 17 00:00:00 2001
+From 2ad789e9998f90d224e6baf9ec21ab25cc272c96 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit faa4ee75364dcb5343790d5fcf850cebdf7353f6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 9d8ab17dd..ab956ad7c 100644
+index d6379e31e..6db604ed8 100644

[dpdk-stable] patch 'examples/performance-thread: init timer subsystem' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

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

Queued patches 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/7cb59154bf252b1fc7b219432f6329cebb17dded

Thanks.

Kevin Traynor

---
From 7cb59154bf252b1fc7b219432f6329cebb17dded Mon Sep 17 00:00:00 2001
From: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
Date: Mon, 15 Jul 2019 10:39:32 -0500
Subject: [PATCH] examples/performance-thread: init timer subsystem

[ upstream commit b58b3c96752eb9b11b41ad5077f288dd4003f072 ]

The timer subsystem should be initialized in the l3fwd-thread app before
the L-thread subsystem can be used.

Fixes: d48415e1fee3 ("examples/performance-thread: add l3fwd-thread app")

Signed-off-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
---
 examples/performance-thread/l3fwd-thread/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index 8ddcfa2f4..79523d23d 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -41,4 +41,5 @@
 #include <rte_string_fns.h>
 #include <rte_pause.h>
+#include <rte_timer.h>
 
 #include <cmdline_parse.h>
@@ -3487,4 +3488,6 @@ main(int argc, char **argv)
 	argv += ret;
 
+	rte_timer_subsystem_init();
+
 	/* pre-init dst MACs for all ports to 02:00:00:00:00:xx */
 	for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.912535227 +0100
+++ 0055-examples-performance-thread-init-timer-subsystem.patch	2019-08-27 09:40:10.968143223 +0100
@@ -1 +1 @@
-From b58b3c96752eb9b11b41ad5077f288dd4003f072 Mon Sep 17 00:00:00 2001
+From 7cb59154bf252b1fc7b219432f6329cebb17dded Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b58b3c96752eb9b11b41ad5077f288dd4003f072 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- examples/performance-thread/l3fwd-thread/main.c | 5 +++++
- 1 file changed, 5 insertions(+)
+ examples/performance-thread/l3fwd-thread/main.c | 3 +++
+ 1 file changed, 3 insertions(+)
@@ -18 +19 @@
-index 0121c71cb..49d942407 100644
+index 8ddcfa2f4..79523d23d 100644
@@ -27 +28 @@
-@@ -3498,4 +3499,8 @@ main(int argc, char **argv)
+@@ -3487,4 +3488,6 @@ main(int argc, char **argv)
@@ -30,3 +31 @@
-+	ret = rte_timer_subsystem_init();
-+	if (ret < 0)
-+		rte_exit(EXIT_FAILURE, "Failed to initialize timer subystem\n");
++	rte_timer_subsystem_init();