[dpdk-stable] patch 'net/bnx2x: fix warnings from invalid assert' has been queued to LTS release 18.11.3

[dpdk-stable] patch 'net/bnx2x: fix warnings from invalid assert' 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 08/28/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/0956207da30f85d4f04c8e781891f28003ae332b

Thanks.

Kevin Traynor

---
From 0956207da30f85d4f04c8e781891f28003ae332b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 19 Jun 2019 11:22:16 -0700
Subject: [PATCH] net/bnx2x: fix warnings from invalid assert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 19927e56a853d9506d640a59fea7d2ec5ec2f208 ]

This driver had a bogus assert which could never happen.
This triggers "expression is always false warnings" with some
compilers which causes build failure.
Just remove it.

Fixes: 6041aa619f9a ("net/bnx2x: fix poll link status")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Rasesh Mody <rmody@marvell.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 drivers/net/bnx2x/bnx2x_ethdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index fa9d83154..cd0a6304c 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -150,5 +150,4 @@ static void bnx2x_periodic_start(void *param)
 			PMD_DRV_LOG(ERR, sc, "Unable to start periodic"
 					     " timer rc %d", ret);
-			assert(false && "Unable to start periodic timer");
 		}
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.524316174 +0100
+++ 0001-net-bnx2x-fix-warnings-from-invalid-assert.patch	2019-08-22 19:38:20.389028024 +0100
@@ -1 +1 @@
-From 19927e56a853d9506d640a59fea7d2ec5ec2f208 Mon Sep 17 00:00:00 2001
+From 0956207da30f85d4f04c8e781891f28003ae332b Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 19927e56a853d9506d640a59fea7d2ec5ec2f208 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 45c6c363c..0ee35e4e4 100644
+index fa9d83154..cd0a6304c 100644
@@ -28 +29 @@
-@@ -151,5 +151,4 @@ static void bnx2x_periodic_start(void *param)
+@@ -150,5 +150,4 @@ static void bnx2x_periodic_start(void *param)

[dpdk-stable] patch 'net/qede: fix warnings from invalid assert' 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 08/28/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/549d22e1da0df69e83007a4d64d83dedf4f34607

Thanks.

Kevin Traynor

---
From 549d22e1da0df69e83007a4d64d83dedf4f34607 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 19 Jun 2019 11:22:17 -0700
Subject: [PATCH] net/qede: fix warnings from invalid assert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 8db9a3145b9670ccc9030abbc0d20956b2ebb26e ]

This driver had a bogus assert which could never happen.
This triggers "expression is always false warnings" with some
compilers which causes build failure.
Just remove it.

Fixes: 2af14ca79c0a ("net/qede: support 100G")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Rasesh Mody <rmody@marvell.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 drivers/net/qede/qede_ethdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index 0b2f305e1..c4f5ad1ed 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -1424,5 +1424,4 @@ static void qede_poll_sp_sb_cb(void *param)
 		DP_ERR(edev, "Unable to start periodic"
 			     " timer rc %d\n", rc);
-		assert(false && "Unable to start periodic timer");
 	}
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.590014956 +0100
+++ 0002-net-qede-fix-warnings-from-invalid-assert.patch	2019-08-22 19:38:20.392027952 +0100
@@ -1 +1 @@
-From 8db9a3145b9670ccc9030abbc0d20956b2ebb26e Mon Sep 17 00:00:00 2001
+From 549d22e1da0df69e83007a4d64d83dedf4f34607 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 8db9a3145b9670ccc9030abbc0d20956b2ebb26e ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 84d898421..82363e6eb 100644
+index 0b2f305e1..c4f5ad1ed 100644
@@ -28 +29 @@
-@@ -1427,5 +1427,4 @@ static void qede_poll_sp_sb_cb(void *param)
+@@ -1424,5 +1424,4 @@ static void qede_poll_sp_sb_cb(void *param)

[dpdk-stable] patch 'eal: correct log for alarm error' 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 08/28/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/b11bc87c685e469e39ecec3dc5c70b75b544c52b

Thanks.

Kevin Traynor

---
From b11bc87c685e469e39ecec3dc5c70b75b544c52b Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye@intel.com>
Date: Wed, 5 Jun 2019 15:18:29 +0800
Subject: [PATCH] eal: correct log for alarm error

[ upstream commit 4142b06e2d60734eb7f6dda5edc212993c461f0a ]

Fixes: af75078fece3 ("first public release")
Fixes: 764bf26873b9 ("add FreeBSD support")

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 lib/librte_eal/bsdapp/eal/eal.c   | 2 +-
 lib/librte_eal/linuxapp/eal/eal.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index bfac7fdc9..cfaa87a48 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -664,5 +664,5 @@ rte_eal_init(int argc, char **argv)
 
 	if (rte_eal_alarm_init() < 0) {
-		rte_eal_init_alert("Cannot init interrupt-handling thread");
+		rte_eal_init_alert("Cannot init alarm");
 		/* rte_eal_alarm_init sets rte_errno on failure. */
 		return -1;
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 7a08cf1ec..fa97b1154 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -1002,5 +1002,5 @@ rte_eal_init(int argc, char **argv)
 
 	if (rte_eal_alarm_init() < 0) {
-		rte_eal_init_alert("Cannot init interrupt-handling thread");
+		rte_eal_init_alert("Cannot init alarm");
 		/* rte_eal_alarm_init sets rte_errno on failure. */
 		return -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.659525287 +0100
+++ 0003-eal-correct-log-for-alarm-error.patch	2019-08-22 19:38:20.395027881 +0100
@@ -1 +1 @@
-From 4142b06e2d60734eb7f6dda5edc212993c461f0a Mon Sep 17 00:00:00 2001
+From b11bc87c685e469e39ecec3dc5c70b75b544c52b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4142b06e2d60734eb7f6dda5edc212993c461f0a ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
@@ -13,2 +14,2 @@
- lib/librte_eal/freebsd/eal/eal.c | 2 +-
- lib/librte_eal/linux/eal/eal.c   | 2 +-
+ lib/librte_eal/bsdapp/eal/eal.c   | 2 +-
+ lib/librte_eal/linuxapp/eal/eal.c | 2 +-
@@ -17,5 +18,5 @@
-diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
-index 97633a55a..1364d55c9 100644
---- a/lib/librte_eal/freebsd/eal/eal.c
-+++ b/lib/librte_eal/freebsd/eal/eal.c
-@@ -695,5 +695,5 @@ rte_eal_init(int argc, char **argv)
+diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
+index bfac7fdc9..cfaa87a48 100644
+--- a/lib/librte_eal/bsdapp/eal/eal.c
++++ b/lib/librte_eal/bsdapp/eal/eal.c
+@@ -664,5 +664,5 @@ rte_eal_init(int argc, char **argv)
@@ -28,5 +29,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
-index d96ed3a7c..dfbbeddc4 100644
---- a/lib/librte_eal/linux/eal/eal.c
-+++ b/lib/librte_eal/linux/eal/eal.c
-@@ -1046,5 +1046,5 @@ rte_eal_init(int argc, char **argv)
+diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
+index 7a08cf1ec..fa97b1154 100644
+--- a/lib/librte_eal/linuxapp/eal/eal.c
++++ b/lib/librte_eal/linuxapp/eal/eal.c
+@@ -1002,5 +1002,5 @@ rte_eal_init(int argc, char **argv)

[dpdk-stable] patch 'eal/linux: fix return after alarm registration 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 08/28/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/6f4a16e42610878c498b24af79826bd4580d1a00

Thanks.

Kevin Traynor

---
From 6f4a16e42610878c498b24af79826bd4580d1a00 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Wed, 26 Jun 2019 12:12:00 +0200
Subject: [PATCH] eal/linux: fix return after alarm registration failure

[ upstream commit 75683290e5ed7846b3e37d927efca68974fb3f20 ]

When adding an alarm, if an error happen when registering
the common alarm callback, it is not considered as a major failure.
The alarm is then inserted in the list.
However it was returning an error code after inserting the alarm.

The error code is not set anymore to be consistent with the behaviour.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/librte_eal/linuxapp/eal/eal_alarm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/linuxapp/eal/eal_alarm.c
index 840ede780..0924c9205 100644
--- a/lib/librte_eal/linuxapp/eal/eal_alarm.c
+++ b/lib/librte_eal/linuxapp/eal/eal_alarm.c
@@ -138,7 +138,8 @@ rte_eal_alarm_set(uint64_t us, rte_eal_alarm_callback cb_fn, void *cb_arg)
 	rte_spinlock_lock(&alarm_list_lk);
 	if (!handler_registered) {
-		ret |= rte_intr_callback_register(&intr_handle,
-				eal_alarm_callback, NULL);
-		handler_registered = (ret == 0) ? 1 : 0;
+		/* registration can fail, callback can be registered later */
+		if (rte_intr_callback_register(&intr_handle,
+				eal_alarm_callback, NULL) == 0)
+			handler_registered = 1;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.730451971 +0100
+++ 0004-eal-linux-fix-return-after-alarm-registration-failur.patch	2019-08-22 19:38:20.395027881 +0100
@@ -1 +1 @@
-From 75683290e5ed7846b3e37d927efca68974fb3f20 Mon Sep 17 00:00:00 2001
+From 6f4a16e42610878c498b24af79826bd4580d1a00 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 75683290e5ed7846b3e37d927efca68974fb3f20 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
- lib/librte_eal/linux/eal/eal_alarm.c | 7 ++++---
+ lib/librte_eal/linuxapp/eal/eal_alarm.c | 7 ++++---
@@ -23 +24 @@
-diff --git a/lib/librte_eal/linux/eal/eal_alarm.c b/lib/librte_eal/linux/eal/eal_alarm.c
+diff --git a/lib/librte_eal/linuxapp/eal/eal_alarm.c b/lib/librte_eal/linuxapp/eal/eal_alarm.c
@@ -25,2 +26,2 @@
---- a/lib/librte_eal/linux/eal/eal_alarm.c
-+++ b/lib/librte_eal/linux/eal/eal_alarm.c
+--- a/lib/librte_eal/linuxapp/eal/eal_alarm.c
++++ b/lib/librte_eal/linuxapp/eal/eal_alarm.c

[dpdk-stable] patch 'kernel/freebsd: fix module build on latest head' 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 08/28/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/c63ac1bab51842676c65655f8c269c099851ebe1

Thanks.

Kevin Traynor

---
From c63ac1bab51842676c65655f8c269c099851ebe1 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 6 Jun 2019 16:40:16 +0100
Subject: [PATCH] kernel/freebsd: fix module build on latest head

[ upstream commit 1c7191e7349e612a44523cde7fa2340ffe8f1c8f ]

Internal changes in the freebsd kernel have meant that additional includes
are now necessary to build the kernel modules for DPDK. Tested with latest
bsd HEAD revision.

Bugzilla ID: 282

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 kernel/freebsd/contigmem/contigmem.c | 3 +++
 kernel/freebsd/nic_uio/nic_uio.c     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/kernel/freebsd/contigmem/contigmem.c b/kernel/freebsd/contigmem/contigmem.c
index 1715b5dc5..64e0a7fec 100644
--- a/kernel/freebsd/contigmem/contigmem.c
+++ b/kernel/freebsd/contigmem/contigmem.c
@@ -14,8 +14,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/proc.h>
+#include <sys/lock.h>
 #include <sys/rwlock.h>
+#include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/vmmeter.h>
+#include <sys/eventhandler.h>
 
 #include <machine/bus.h>
diff --git a/kernel/freebsd/nic_uio/nic_uio.c b/kernel/freebsd/nic_uio/nic_uio.c
index 401b487e1..7a81694c9 100644
--- a/kernel/freebsd/nic_uio/nic_uio.c
+++ b/kernel/freebsd/nic_uio/nic_uio.c
@@ -12,4 +12,5 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/rwlock.h>
 #include <sys/proc.h>
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.811769907 +0100
+++ 0005-kernel-freebsd-fix-module-build-on-latest-head.patch	2019-08-22 19:38:20.396027857 +0100
@@ -1 +1 @@
-From 1c7191e7349e612a44523cde7fa2340ffe8f1c8f Mon Sep 17 00:00:00 2001
+From c63ac1bab51842676c65655f8c269c099851ebe1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c7191e7349e612a44523cde7fa2340ffe8f1c8f ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'kernel/linux: fix modules install path' 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 08/28/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/15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9

Thanks.

Kevin Traynor

---
From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001
From: Igor Ryzhov <iryzhov@nfware.com>
Date: Tue, 11 Jun 2019 11:49:34 +0300
Subject: [PATCH] kernel/linux: fix modules install path

[ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ]

Currently kernel modules are installed into /usr/src instead of
/lib/modules when meson build system is used. This patch fixes that.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 kernel/linux/igb_uio/meson.build | 4 ++--
 kernel/linux/kni/meson.build     | 4 ++--
 kernel/linux/meson.build         | 4 ++--
 meson_options.txt                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
index f5a9d5ccf..fac404f07 100644
--- a/kernel/linux/igb_uio/meson.build
+++ b/kernel/linux/igb_uio/meson.build
@@ -9,5 +9,5 @@ custom_target('igb_uio',
 	input: ['igb_uio.c', 'Kbuild'],
 	output: 'igb_uio.ko',
-	command: ['make', '-C', kernel_dir,
+	command: ['make', '-C', kernel_dir + '/build',
 		'M=' + meson.current_build_dir(),
 		'src=' + meson.current_source_dir(),
@@ -17,4 +17,4 @@ custom_target('igb_uio',
 	depends: mkfile,
 	install: true,
-	install_dir: kernel_dir + '/../extra/dpdk',
+	install_dir: kernel_dir + '/extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
index a09af5aa5..e6822f49c 100644
--- a/kernel/linux/kni/meson.build
+++ b/kernel/linux/kni/meson.build
@@ -17,5 +17,5 @@ custom_target('rte_kni',
 	input: kni_sources + kni_igb_sources + kni_ixgbe_sources,
 	output: 'rte_kni.ko',
-	command: ['make', '-j4', '-C', kernel_dir,
+	command: ['make', '-j4', '-C', kernel_dir + '/build',
 		'M=' + meson.current_build_dir(),
 		'src=' + meson.current_source_dir(),
@@ -31,4 +31,4 @@ custom_target('rte_kni',
 	console: true,
 	install: true,
-	install_dir: kernel_dir + '/../extra/dpdk',
+	install_dir: kernel_dir + '/extra/dpdk',
 	build_by_default: get_option('enable_kmods'))
diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index 5b7ec06e1..c5bcc1f38 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -21,9 +21,9 @@ else
 		# use default path for native builds
 		kernel_version = run_command('uname', '-r').stdout().strip()
-		kernel_dir = '/lib/modules/' + kernel_version + '/build'
+		kernel_dir = '/lib/modules/' + kernel_version
 	endif
 
 	# test running make in kernel directory, using "make kernelversion"
-	make_returncode = run_command('make', '-sC', kernel_dir,
+	make_returncode = run_command('make', '-sC', kernel_dir + '/build',
 			'kernelversion').returncode()
 	if make_returncode != 0
diff --git a/meson_options.txt b/meson_options.txt
index 10b541615..91b0449a1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '',
 	description: 'subdirectory where to install arch-dependent headers')
 option('kernel_dir', type: 'string', value: '',
-	description: 'path to the kernel for building kernel modules, they will be installed in $DEST_DIR/$kernel_dir/../extra/dpdk')
+	description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
 option('lib_musdk_dir', type: 'string', value: '',
 	description: 'path to the MUSDK library installation directory')
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.876697935 +0100
+++ 0006-kernel-linux-fix-modules-install-path.patch	2019-08-22 19:38:20.397027833 +0100
@@ -1 +1 @@
-From 317832f97c165cd4f327567935dfbd6af92b4159 Mon Sep 17 00:00:00 2001
+From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ]
+
@@ -9,2 +10,0 @@
-Cc: stable@dpdk.org
-
@@ -38 +38 @@
-index a9f48b0e6..955eec949 100644
+index a09af5aa5..e6822f49c 100644
@@ -41,2 +41,2 @@
-@@ -14,5 +14,5 @@ custom_target('rte_kni',
- 	input: kni_sources,
+@@ -17,5 +17,5 @@ custom_target('rte_kni',
+ 	input: kni_sources + kni_igb_sources + kni_ixgbe_sources,
@@ -48 +48 @@
-@@ -26,4 +26,4 @@ custom_target('rte_kni',
+@@ -31,4 +31,4 @@ custom_target('rte_kni',
@@ -55 +55 @@
-index a37c95752..1796cc686 100644
+index 5b7ec06e1..c5bcc1f38 100644
@@ -58,6 +58,6 @@
-@@ -14,9 +14,9 @@ if kernel_dir == ''
- 	# use default path for native builds
- 	kernel_version = run_command('uname', '-r').stdout().strip()
--	kernel_dir = '/lib/modules/' + kernel_version + '/build'
-+	kernel_dir = '/lib/modules/' + kernel_version
- endif
+@@ -21,9 +21,9 @@ else
+ 		# use default path for native builds
+ 		kernel_version = run_command('uname', '-r').stdout().strip()
+-		kernel_dir = '/lib/modules/' + kernel_version + '/build'
++		kernel_dir = '/lib/modules/' + kernel_version
+ 	endif
@@ -65,5 +65,5 @@
- # test running make in kernel directory, using "make kernelversion"
--make_returncode = run_command('make', '-sC', kernel_dir,
-+make_returncode = run_command('make', '-sC', kernel_dir + '/build',
- 		'kernelversion').returncode()
- if make_returncode != 0
+ 	# test running make in kernel directory, using "make kernelversion"
+-	make_returncode = run_command('make', '-sC', kernel_dir,
++	make_returncode = run_command('make', '-sC', kernel_dir + '/build',
+ 			'kernelversion').returncode()
+ 	if make_returncode != 0
@@ -71 +71 @@
-index 16d9f92c6..5302b9c68 100644
+index 10b541615..91b0449a1 100644
@@ -74 +74 @@
-@@ -16,5 +16,5 @@ option('include_subdir_arch', type: 'string', value: '',
+@@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '',

[dpdk-stable] patch 'ip_frag: fix IPv6 fragment size calculation' 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 08/28/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/7ba4bc38778196ab636539672e370dc6044b11f6

Thanks.

Kevin Traynor

---
From 7ba4bc38778196ab636539672e370dc6044b11f6 Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Thu, 6 Jun 2019 12:33:28 +0100
Subject: [PATCH] ip_frag: fix IPv6 fragment size calculation

[ upstream commit 4b06b0771f321bd4301075eaff64452261a45a4d ]

Take into account IPv6 fragment extension header when
calculating data size for each fragment.

Fixes: 7a838c8798a9 ("ip_frag: fix IPv6 when MTU sizes not aligned to 8 bytes")
Fixes: 0aa31d7a5929 ("ip_frag: add IPv6 fragmentation support")

Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/librte_ip_frag/rte_ipv6_fragmentation.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/librte_ip_frag/rte_ipv6_fragmentation.c b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
index b9437eb11..e5759a783 100644
--- a/lib/librte_ip_frag/rte_ipv6_fragmentation.c
+++ b/lib/librte_ip_frag/rte_ipv6_fragmentation.c
@@ -84,6 +84,8 @@ rte_ipv6_fragment_packet(struct rte_mbuf *pkt_in,
 	 * the last fragment) are a multiple of 8 bytes per RFC2460.
 	 */
-	frag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct ipv6_hdr),
-				    RTE_IPV6_EHDR_FO_ALIGN);
+
+	frag_size = mtu_size - sizeof(struct ipv6_hdr) -
+		sizeof(struct ipv6_extension_fragment);
+	frag_size = RTE_ALIGN_FLOOR(frag_size, RTE_IPV6_EHDR_FO_ALIGN);
 
 	/* Check that pkts_out is big enough to hold all fragments */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:20.943656152 +0100
+++ 0007-ip_frag-fix-IPv6-fragment-size-calculation.patch	2019-08-22 19:38:20.398027809 +0100
@@ -1 +1 @@
-From 4b06b0771f321bd4301075eaff64452261a45a4d Mon Sep 17 00:00:00 2001
+From 7ba4bc38778196ab636539672e370dc6044b11f6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4b06b0771f321bd4301075eaff64452261a45a4d ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index bfe44d435..43449970e 100644
+index b9437eb11..e5759a783 100644
@@ -25 +26 @@
--	frag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct rte_ipv6_hdr),
+-	frag_size = RTE_ALIGN_FLOOR(mtu_size - sizeof(struct ipv6_hdr),
@@ -28 +29 @@
-+	frag_size = mtu_size - sizeof(struct rte_ipv6_hdr) -
++	frag_size = mtu_size - sizeof(struct ipv6_hdr) -

[dpdk-stable] patch 'test/hash: fix off-by-one check on core count' 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 08/28/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/88e2855e59c2ba76818e47b779f826399740972f

Thanks.

Kevin Traynor

---
From 88e2855e59c2ba76818e47b779f826399740972f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 15 Jun 2019 08:42:19 +0200
Subject: [PATCH] test/hash: fix off-by-one check on core count

[ upstream commit bf7a24b997dc1f7516f38a38a8ce3c364d64aff4 ]

This subtest wants to start rwc_core_cnt[n] reader threads, while the
master core is waiting for them to report.

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

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
---
 test/test/test_hash_readwrite_lf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test/test_hash_readwrite_lf.c b/test/test/test_hash_readwrite_lf.c
index 934512ddb..f0fc63b9f 100644
--- a/test/test/test_hash_readwrite_lf.c
+++ b/test/test/test_hash_readwrite_lf.c
@@ -821,5 +821,5 @@ test_hash_add_ks_lookup_hit_sp(struct rwc_perf *rwc_perf_results, int rwc_lf,
 		for (n = 0; n < NUM_TEST; n++) {
 			unsigned int tot_lcore = rte_lcore_count();
-			if (tot_lcore < rwc_core_cnt[n])
+			if (tot_lcore < rwc_core_cnt[n] + 1)
 				goto finish;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.001953057 +0100
+++ 0008-test-hash-fix-off-by-one-check-on-core-count.patch	2019-08-22 19:38:20.399027785 +0100
@@ -1 +1 @@
-From bf7a24b997dc1f7516f38a38a8ce3c364d64aff4 Mon Sep 17 00:00:00 2001
+From 88e2855e59c2ba76818e47b779f826399740972f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bf7a24b997dc1f7516f38a38a8ce3c364d64aff4 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- app/test/test_hash_readwrite_lf.c | 2 +-
+ test/test/test_hash_readwrite_lf.c | 2 +-
@@ -19,5 +20,5 @@
-diff --git a/app/test/test_hash_readwrite_lf.c b/app/test/test_hash_readwrite_lf.c
-index 343a338b4..f9f233a73 100644
---- a/app/test/test_hash_readwrite_lf.c
-+++ b/app/test/test_hash_readwrite_lf.c
-@@ -940,5 +940,5 @@ test_hash_add_ks_lookup_hit_sp(struct rwc_perf *rwc_perf_results, int rwc_lf,
+diff --git a/test/test/test_hash_readwrite_lf.c b/test/test/test_hash_readwrite_lf.c
+index 934512ddb..f0fc63b9f 100644
+--- a/test/test/test_hash_readwrite_lf.c
++++ b/test/test/test_hash_readwrite_lf.c
+@@ -821,5 +821,5 @@ test_hash_add_ks_lookup_hit_sp(struct rwc_perf *rwc_perf_results, int rwc_lf,

[dpdk-stable] patch 'test/hash: rectify slave id to point to valid cores' 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 08/28/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/692fdd5ac23bf0b19ccf62e86c90c169516dc23a

Thanks.

Kevin Traynor

---
From 692fdd5ac23bf0b19ccf62e86c90c169516dc23a Mon Sep 17 00:00:00 2001
From: Dharmik Thakkar <dharmik.thakkar@arm.com>
Date: Sat, 15 Jun 2019 08:42:20 +0200
Subject: [PATCH] test/hash: rectify slave id to point to valid cores

[ upstream commit 477cafea6532881477da3676579ec3ca236ce47f ]

This patch rectifies slave_id to point to valid core indexes rather than
core ranks in read-write lock-free concurrency test.

It also replaces a 'for' loop with RTE_LCORE_FOREACH API.

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

Signed-off-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
---
 test/test/test_hash_readwrite_lf.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/test/test/test_hash_readwrite_lf.c b/test/test/test_hash_readwrite_lf.c
index f0fc63b9f..b0f415b0a 100644
--- a/test/test/test_hash_readwrite_lf.c
+++ b/test/test/test_hash_readwrite_lf.c
@@ -87,9 +87,7 @@ get_enabled_cores_list(void)
 	uint16_t core_id;
 	uint32_t max_cores = rte_lcore_count();
-	for (core_id = 0; core_id < RTE_MAX_LCORE && i < max_cores; core_id++) {
-		if (rte_lcore_is_enabled(core_id)) {
-			enabled_core_ids[i] = core_id;
-			i++;
-		}
+	RTE_LCORE_FOREACH(core_id) {
+		enabled_core_ids[i] = core_id;
+		i++;
 	}
 
@@ -620,5 +618,5 @@ test_hash_add_no_ks_lookup_hit(struct rwc_perf *rwc_perf_results, int rwc_lf,
 
 			for (i = 1; i <= rwc_core_cnt[n]; i++)
-				if (rte_eal_wait_lcore(i) < 0)
+				if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
 					goto err;
 
@@ -692,5 +690,5 @@ test_hash_add_no_ks_lookup_miss(struct rwc_perf *rwc_perf_results, int rwc_lf,
 				goto err;
 			for (i = 1; i <= rwc_core_cnt[n]; i++)
-				if (rte_eal_wait_lcore(i) < 0)
+				if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
 					goto err;
 
@@ -768,5 +766,5 @@ test_hash_add_ks_lookup_hit_non_sp(struct rwc_perf *rwc_perf_results,
 				goto err;
 			for (i = 1; i <= rwc_core_cnt[n]; i++)
-				if (rte_eal_wait_lcore(i) < 0)
+				if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
 					goto err;
 
@@ -844,5 +842,5 @@ test_hash_add_ks_lookup_hit_sp(struct rwc_perf *rwc_perf_results, int rwc_lf,
 				goto err;
 			for (i = 1; i <= rwc_core_cnt[n]; i++)
-				if (rte_eal_wait_lcore(i) < 0)
+				if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
 					goto err;
 
@@ -919,5 +917,5 @@ test_hash_add_ks_lookup_miss(struct rwc_perf *rwc_perf_results, int rwc_lf, int
 				goto err;
 			for (i = 1; i <= rwc_core_cnt[n]; i++)
-				if (rte_eal_wait_lcore(i) < 0)
+				if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
 					goto err;
 
@@ -1014,10 +1012,10 @@ test_hash_multi_add_lookup(struct rwc_perf *rwc_perf_results, int rwc_lf,
 				     i <= rwc_core_cnt[m] + rwc_core_cnt[n];
 				     i++)
-					rte_eal_wait_lcore(i);
+					rte_eal_wait_lcore(enabled_core_ids[i]);
 
 				writer_done = 1;
 
 				for (i = 1; i <= rwc_core_cnt[n]; i++)
-					if (rte_eal_wait_lcore(i) < 0)
+					if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
 						goto err;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.064526980 +0100
+++ 0009-test-hash-rectify-slave-id-to-point-to-valid-cores.patch	2019-08-22 19:38:20.401027738 +0100
@@ -1 +1 @@
-From 477cafea6532881477da3676579ec3ca236ce47f Mon Sep 17 00:00:00 2001
+From 692fdd5ac23bf0b19ccf62e86c90c169516dc23a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 477cafea6532881477da3676579ec3ca236ce47f ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -19,2 +20,2 @@
- app/test/test_hash_readwrite_lf.c | 24 +++++++++++-------------
- 1 file changed, 11 insertions(+), 13 deletions(-)
+ test/test/test_hash_readwrite_lf.c | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
@@ -22,5 +23,5 @@
-diff --git a/app/test/test_hash_readwrite_lf.c b/app/test/test_hash_readwrite_lf.c
-index f9f233a73..564436196 100644
---- a/app/test/test_hash_readwrite_lf.c
-+++ b/app/test/test_hash_readwrite_lf.c
-@@ -127,9 +127,7 @@ get_enabled_cores_list(void)
+diff --git a/test/test/test_hash_readwrite_lf.c b/test/test/test_hash_readwrite_lf.c
+index f0fc63b9f..b0f415b0a 100644
+--- a/test/test/test_hash_readwrite_lf.c
++++ b/test/test/test_hash_readwrite_lf.c
+@@ -87,9 +87,7 @@ get_enabled_cores_list(void)
@@ -39 +40 @@
-@@ -739,5 +737,5 @@ test_hash_add_no_ks_lookup_hit(struct rwc_perf *rwc_perf_results, int rwc_lf,
+@@ -620,5 +618,5 @@ test_hash_add_no_ks_lookup_hit(struct rwc_perf *rwc_perf_results, int rwc_lf,
@@ -46 +47 @@
-@@ -811,5 +809,5 @@ test_hash_add_no_ks_lookup_miss(struct rwc_perf *rwc_perf_results, int rwc_lf,
+@@ -692,5 +690,5 @@ test_hash_add_no_ks_lookup_miss(struct rwc_perf *rwc_perf_results, int rwc_lf,
@@ -53 +54 @@
-@@ -887,5 +885,5 @@ test_hash_add_ks_lookup_hit_non_sp(struct rwc_perf *rwc_perf_results,
+@@ -768,5 +766,5 @@ test_hash_add_ks_lookup_hit_non_sp(struct rwc_perf *rwc_perf_results,
@@ -60 +61 @@
-@@ -963,5 +961,5 @@ test_hash_add_ks_lookup_hit_sp(struct rwc_perf *rwc_perf_results, int rwc_lf,
+@@ -844,5 +842,5 @@ test_hash_add_ks_lookup_hit_sp(struct rwc_perf *rwc_perf_results, int rwc_lf,
@@ -67 +68 @@
-@@ -1038,5 +1036,5 @@ test_hash_add_ks_lookup_miss(struct rwc_perf *rwc_perf_results, int rwc_lf, int
+@@ -919,5 +917,5 @@ test_hash_add_ks_lookup_miss(struct rwc_perf *rwc_perf_results, int rwc_lf, int
@@ -74 +75 @@
-@@ -1133,10 +1131,10 @@ test_hash_multi_add_lookup(struct rwc_perf *rwc_perf_results, int rwc_lf,
+@@ -1014,10 +1012,10 @@ test_hash_multi_add_lookup(struct rwc_perf *rwc_perf_results, int rwc_lf,
@@ -86,7 +86,0 @@
- 
-@@ -1222,5 +1220,5 @@ test_hash_add_ks_lookup_hit_extbkt(struct rwc_perf *rwc_perf_results,
- 
- 			for (i = 1; i <= rwc_core_cnt[n]; i++)
--				if (rte_eal_wait_lcore(i) < 0)
-+				if (rte_eal_wait_lcore(enabled_core_ids[i]) < 0)
- 					goto err;

[dpdk-stable] patch 'bus/vmbus: skip non-network devices' 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 08/28/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/f8ecc54396ca33b15909908b6797f82a532ff616

Thanks.

Kevin Traynor

---
From f8ecc54396ca33b15909908b6797f82a532ff616 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Wed, 5 Jun 2019 17:37:46 -0700
Subject: [PATCH] bus/vmbus: skip non-network devices

[ upstream commit b11b76c22c55c06cabd113a04d7c92bdc3f18aa7 ]

The vmbus scan code can just skip non-network devices.
More importantly, this fixes the bug where some vmbus devices
don't have all the attributes (like monitor_id) and a single
failure would cause the scan to break the loop.

Fixes: 831dba47bd36 ("bus/vmbus: add Hyper-V virtual bus support")

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/bus/vmbus/linux/vmbus_bus.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/drivers/bus/vmbus/linux/vmbus_bus.c b/drivers/bus/vmbus/linux/vmbus_bus.c
index a4755a387..3c924eee1 100644
--- a/drivers/bus/vmbus/linux/vmbus_bus.c
+++ b/drivers/bus/vmbus/linux/vmbus_bus.c
@@ -26,4 +26,16 @@
 #define SYSFS_VMBUS_DEVICES "/sys/bus/vmbus/devices"
 
+/*
+ * GUID associated with network devices
+ * {f8615163-df3e-46c5-913f-f2d2f965ed0e}
+ */
+static const rte_uuid_t vmbus_nic_uuid = {
+	0xf8, 0x61, 0x51, 0x63,
+	0xdf, 0x3e,
+	0x46, 0xc5,
+	0x91, 0x3f,
+	0xf2, 0xd2, 0xf9, 0x65, 0xed, 0xe
+};
+
 extern struct rte_vmbus_bus rte_vmbus_bus;
 
@@ -243,9 +255,4 @@ vmbus_scan_one(const char *name)
 		 SYSFS_VMBUS_DEVICES, name);
 
-	/* get device id */
-	snprintf(filename, sizeof(filename), "%s/device_id", dirname);
-	if (parse_sysfs_uuid(filename, dev->device_id) < 0)
-		goto error;
-
 	/* get device class  */
 	snprintf(filename, sizeof(filename), "%s/class_id", dirname);
@@ -253,4 +260,15 @@ vmbus_scan_one(const char *name)
 		goto error;
 
+	/* skip non-network devices */
+	if (rte_uuid_compare(dev->class_id, vmbus_nic_uuid) != 0) {
+		free(dev);
+		return 0;
+	}
+
+	/* get device id */
+	snprintf(filename, sizeof(filename), "%s/device_id", dirname);
+	if (parse_sysfs_uuid(filename, dev->device_id) < 0)
+		goto error;
+
 	/* get relid */
 	snprintf(filename, sizeof(filename), "%s/id", dirname);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.127196199 +0100
+++ 0010-bus-vmbus-skip-non-network-devices.patch	2019-08-22 19:38:20.402027714 +0100
@@ -1 +1 @@
-From b11b76c22c55c06cabd113a04d7c92bdc3f18aa7 Mon Sep 17 00:00:00 2001
+From f8ecc54396ca33b15909908b6797f82a532ff616 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b11b76c22c55c06cabd113a04d7c92bdc3f18aa7 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'bpf: fix check array size' 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 08/28/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/d606af604d40a0da9cb44406a0068729e707cfd3

Thanks.

Kevin Traynor

---
From d606af604d40a0da9cb44406a0068729e707cfd3 Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Fri, 21 Jun 2019 15:26:49 +0100
Subject: [PATCH] bpf: fix check array size

[ upstream commit 28b2d3d112e2bde5264921d8feca89e2e5708a87 ]

Array ins_chk in lib/librte_bpf/bpf_validate.c has 255 entries.
So the instruction with opcode == 255 will reading beyond array
boundaries.
For more details please refer to:
https://bugs.dpdk.org/show_bug.cgi?id=283

Fixes: 6e12ec4c4d6d ("bpf: add more checks")

Reported-by: Michel Machado <michel@digirati.com.br>
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/librte_bpf/bpf_validate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index 83983efc4..d0e683b5b 100644
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -1085,5 +1085,5 @@ eval_jcc(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
  * validate parameters for each instruction type.
  */
-static const struct bpf_ins_check ins_chk[UINT8_MAX] = {
+static const struct bpf_ins_check ins_chk[UINT8_MAX + 1] = {
 	/* ALU IMM 32-bit instructions */
 	[(BPF_ALU | BPF_ADD | BPF_K)] = {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.191143492 +0100
+++ 0011-bpf-fix-check-array-size.patch	2019-08-22 19:38:20.403027690 +0100
@@ -1 +1 @@
-From 28b2d3d112e2bde5264921d8feca89e2e5708a87 Mon Sep 17 00:00:00 2001
+From d606af604d40a0da9cb44406a0068729e707cfd3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 28b2d3d112e2bde5264921d8feca89e2e5708a87 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'eal: hide internal hotplug function' 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 08/28/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/d2d1dbb6f51aadad579a3f0fac8d1589ca99f67a

Thanks.

Kevin Traynor

---
From d2d1dbb6f51aadad579a3f0fac8d1589ca99f67a Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 29 Jun 2019 13:58:44 +0200
Subject: [PATCH] eal: hide internal hotplug function

[ upstream commit f319d9937977479528870c6859bd3a227c212f75 ]

This API was experimental and not properly marked in the map file.
But looking more closely, this is just an internal wrapper for EAL init.
Hide it in the hotplug code.

Fixes: 244d5130719c ("eal: enable hotplug on multi-process")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 lib/librte_eal/common/hotplug_mp.c      | 2 +-
 lib/librte_eal/common/hotplug_mp.h      | 9 +++++++++
 lib/librte_eal/common/include/rte_eal.h | 9 ---------
 lib/librte_eal/linuxapp/eal/eal.c       | 3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/librte_eal/common/hotplug_mp.c
index 7c3f38dba..287f3df0b 100644
--- a/lib/librte_eal/common/hotplug_mp.c
+++ b/lib/librte_eal/common/hotplug_mp.c
@@ -419,5 +419,5 @@ int eal_dev_hotplug_request_to_secondary(struct eal_dev_mp_req *req)
 }
 
-int rte_mp_dev_hotplug_init(void)
+int eal_mp_dev_hotplug_init(void)
 {
 	int ret;
diff --git a/lib/librte_eal/common/hotplug_mp.h b/lib/librte_eal/common/hotplug_mp.h
index 597fde3d7..8fcf9b52e 100644
--- a/lib/librte_eal/common/hotplug_mp.h
+++ b/lib/librte_eal/common/hotplug_mp.h
@@ -29,4 +29,13 @@ struct eal_dev_mp_req {
 };
 
+/**
+ * Register all mp action callbacks for hotplug.
+ *
+ * @return
+ *   0 on success, negative on error.
+ */
+int
+eal_mp_dev_hotplug_init(void);
+
 /**
  * This is a synchronous wrapper for secondary process send
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 9951228e0..595efdca5 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -400,13 +400,4 @@ int __rte_experimental
 rte_mp_reply(struct rte_mp_msg *msg, const char *peer);
 
-/**
- * Register all mp action callbacks for hotplug.
- *
- * @return
- *   0 on success, negative on error.
- */
-int __rte_experimental
-rte_mp_dev_hotplug_init(void);
-
 /**
  * Usage function typedef used by the application usage function.
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index fa97b1154..f453337f7 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -60,4 +60,5 @@
 #include "eal_options.h"
 #include "eal_vfio.h"
+#include "hotplug_mp.h"
 
 #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
@@ -1019,5 +1020,5 @@ rte_eal_init(int argc, char **argv)
 
 	/* register multi-process action callbacks for hotplug */
-	if (rte_mp_dev_hotplug_init() < 0) {
+	if (eal_mp_dev_hotplug_init() < 0) {
 		rte_eal_init_alert("failed to register mp callback for hotplug");
 		return -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.257554824 +0100
+++ 0012-eal-hide-internal-hotplug-function.patch	2019-08-22 19:38:20.407027595 +0100
@@ -1 +1 @@
-From f319d9937977479528870c6859bd3a227c212f75 Mon Sep 17 00:00:00 2001
+From d2d1dbb6f51aadad579a3f0fac8d1589ca99f67a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f319d9937977479528870c6859bd3a227c212f75 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
- lib/librte_eal/linux/eal/eal.c          | 3 ++-
+ lib/librte_eal/linuxapp/eal/eal.c       | 3 ++-
@@ -25 +26 @@
-index 4f316ba9a..ee791903b 100644
+index 7c3f38dba..287f3df0b 100644
@@ -28 +29 @@
-@@ -439,5 +439,5 @@ int eal_dev_hotplug_request_to_secondary(struct eal_dev_mp_req *req)
+@@ -419,5 +419,5 @@ int eal_dev_hotplug_request_to_secondary(struct eal_dev_mp_req *req)
@@ -54 +55 @@
-index cf701e177..27808a336 100644
+index 9951228e0..595efdca5 100644
@@ -57 +58 @@
-@@ -409,13 +409,4 @@ int __rte_experimental
+@@ -400,13 +400,4 @@ int __rte_experimental
@@ -71,4 +72,4 @@
-diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
-index aa0137ecd..8a0b387ce 100644
---- a/lib/librte_eal/linux/eal/eal.c
-+++ b/lib/librte_eal/linux/eal/eal.c
+diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
+index fa97b1154..f453337f7 100644
+--- a/lib/librte_eal/linuxapp/eal/eal.c
++++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -81 +82 @@
-@@ -1063,5 +1064,5 @@ rte_eal_init(int argc, char **argv)
+@@ -1019,5 +1020,5 @@ rte_eal_init(int argc, char **argv)

[dpdk-stable] patch 'vfio: remove incorrect experimental tag' 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 08/28/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/8994b53642022ed9143c9befbad927aa8ab1fdea

Thanks.

Kevin Traynor

---
From 8994b53642022ed9143c9befbad927aa8ab1fdea Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 29 Jun 2019 13:58:46 +0200
Subject: [PATCH] vfio: remove incorrect experimental tag

[ upstream commit 55cf111b6e35be3b6bc43e5dda706498445d248e ]

The incriminated commit promoted this symbol as stable but the
definition still has the tag.

Fixes: 787ae736a3d9 ("vfio: remove experimental tag")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 lib/librte_eal/linuxapp/eal/eal_vfio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c
index c821e8382..28b4ea66f 100644
--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
@@ -1809,5 +1809,5 @@ rte_vfio_container_create(void)
 }
 
-int __rte_experimental
+int
 rte_vfio_container_destroy(int container_fd)
 {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.320908684 +0100
+++ 0013-vfio-remove-incorrect-experimental-tag.patch	2019-08-22 19:38:20.409027547 +0100
@@ -1 +1 @@
-From 55cf111b6e35be3b6bc43e5dda706498445d248e Mon Sep 17 00:00:00 2001
+From 8994b53642022ed9143c9befbad927aa8ab1fdea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 55cf111b6e35be3b6bc43e5dda706498445d248e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
- lib/librte_eal/linux/eal/eal_vfio.c | 2 +-
+ lib/librte_eal/linuxapp/eal/eal_vfio.c | 2 +-
@@ -20,5 +21,5 @@
-diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/eal/eal_vfio.c
-index 6892a2c14..feada64c0 100644
---- a/lib/librte_eal/linux/eal/eal_vfio.c
-+++ b/lib/librte_eal/linux/eal/eal_vfio.c
-@@ -1835,5 +1835,5 @@ rte_vfio_container_create(void)
+diff --git a/lib/librte_eal/linuxapp/eal/eal_vfio.c b/lib/librte_eal/linuxapp/eal/eal_vfio.c
+index c821e8382..28b4ea66f 100644
+--- a/lib/librte_eal/linuxapp/eal/eal_vfio.c
++++ b/lib/librte_eal/linuxapp/eal/eal_vfio.c
+@@ -1809,5 +1809,5 @@ rte_vfio_container_create(void)

[dpdk-stable] patch 'mem: remove incorrect experimental tag on static symbol' 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 08/28/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/ab71e242b4c517685f168bd418ad47feeabadfd3

Thanks.

Kevin Traynor

---
From ab71e242b4c517685f168bd418ad47feeabadfd3 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 29 Jun 2019 13:58:50 +0200
Subject: [PATCH] mem: remove incorrect experimental tag on static symbol

[ upstream commit 146e002c68b1d428696a250464cdb7c46a366f52 ]

This function is not visible from outside this code unit.

Fixes: 84e7477e10b1 ("mem: add thread unsafe version for DMA mask check")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 lib/librte_eal/common/eal_common_memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/eal_common_memory.c b/lib/librte_eal/common/eal_common_memory.c
index e3ef3714e..9a14698aa 100644
--- a/lib/librte_eal/common/eal_common_memory.c
+++ b/lib/librte_eal/common/eal_common_memory.c
@@ -448,5 +448,5 @@ check_iova(const struct rte_memseg_list *msl __rte_unused,
 
 /* check memseg iovas are within the required range based on dma mask */
-static int __rte_experimental
+static int
 check_dma_mask(uint8_t maskbits, bool thread_unsafe)
 {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.383405099 +0100
+++ 0014-mem-remove-incorrect-experimental-tag-on-static-symb.patch	2019-08-22 19:38:20.410027523 +0100
@@ -1 +1 @@
-From 146e002c68b1d428696a250464cdb7c46a366f52 Mon Sep 17 00:00:00 2001
+From ab71e242b4c517685f168bd418ad47feeabadfd3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 146e002c68b1d428696a250464cdb7c46a366f52 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 5ae8d0124..de6fc1b3a 100644
+index e3ef3714e..9a14698aa 100644
@@ -22 +23 @@
-@@ -449,5 +449,5 @@ check_iova(const struct rte_memseg_list *msl __rte_unused,
+@@ -448,5 +448,5 @@ check_iova(const struct rte_memseg_list *msl __rte_unused,

[dpdk-stable] patch 'telemetry: add missing header include' 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 08/28/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/5d90a3f88b631ba468f5ba064cf7cebc49d9291d

Thanks.

Kevin Traynor

---
From 5d90a3f88b631ba468f5ba064cf7cebc49d9291d Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 29 Jun 2019 13:58:51 +0200
Subject: [PATCH] telemetry: add missing header include

[ upstream commit ba4edc8f27a71724280bf1776d5f1253ab87b298 ]

Fixes: 1b756087db93 ("telemetry: add parser for client socket messages")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 lib/librte_telemetry/rte_telemetry_parser.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_telemetry/rte_telemetry_parser.c b/lib/librte_telemetry/rte_telemetry_parser.c
index e9297021a..55f133d6a 100644
--- a/lib/librte_telemetry/rte_telemetry_parser.c
+++ b/lib/librte_telemetry/rte_telemetry_parser.c
@@ -14,4 +14,5 @@
 
 #include "rte_telemetry_internal.h"
+#include "rte_telemetry_parser.h"
 
 typedef int (*command_func)(struct telemetry_impl *, int, json_t *);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.446845854 +0100
+++ 0015-telemetry-add-missing-header-include.patch	2019-08-22 19:38:20.410027523 +0100
@@ -1 +1 @@
-From ba4edc8f27a71724280bf1776d5f1253ab87b298 Mon Sep 17 00:00:00 2001
+From 5d90a3f88b631ba468f5ba064cf7cebc49d9291d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba4edc8f27a71724280bf1776d5f1253ab87b298 ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
-index e76382afa..956d78382 100644
+index e9297021a..55f133d6a 100644

[dpdk-stable] patch 'eal: fix positive error codes from probe/remove' 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 08/28/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/2b6f661d58c5054bed31b5fd3b5b6fd6062ba7c6

Thanks.

Kevin Traynor

---
From 2b6f661d58c5054bed31b5fd3b5b6fd6062ba7c6 Mon Sep 17 00:00:00 2001
From: Ilya Maximets <i.maximets@samsung.com>
Date: Thu, 6 Jun 2019 13:02:28 +0300
Subject: [PATCH] eal: fix positive error codes from probe/remove

[ upstream commit 75b66decdbd52948721f5c286244dc1d29d71711 ]

According to API, 'rte_dev_probe()' and 'rte_dev_remove()' must
return 0 or negative error code. Bus code returns positive values
if device wasn't recognized by any driver, so the result of
'bus->plug/unplug()' must be converted. 'local_dev_probe()' and
'local_dev_remove()' also has their internal API, so the conversion
should be done there.

Positive on remove means that device not found by driver.
Positive on probe means that there are no suitable buses/drivers,
i.e. device is not supported.

Users of these API fixed to provide a good example by respecting
DPDK API. This also will allow to catch such issues in the future.

Fixes: a3ee360f4440 ("eal: add hotplug add/remove device")
Fixes: 244d5130719c ("eal: enable hotplug on multi-process")

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 app/test-pmd/testpmd.c                 | 4 ++--
 drivers/net/failsafe/failsafe_eal.c    | 4 ++--
 drivers/net/failsafe/failsafe_ether.c  | 2 +-
 drivers/net/vdev_netvsc/vdev_netvsc.c  | 2 +-
 lib/librte_eal/common/eal_common_dev.c | 5 ++++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index cf983b16b..b4215c75d 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2291,5 +2291,5 @@ attach_port(char *identifier)
 	}
 
-	if (rte_dev_probe(identifier) != 0) {
+	if (rte_dev_probe(identifier) < 0) {
 		TESTPMD_LOG(ERR, "Failed to attach port %s\n", identifier);
 		return;
@@ -2361,5 +2361,5 @@ detach_port_device(portid_t port_id)
 	}
 
-	if (rte_dev_remove(dev) != 0) {
+	if (rte_dev_remove(dev) < 0) {
 		TESTPMD_LOG(ERR, "Failed to detach device %s\n", dev->name);
 		return;
diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_eal.c
index 8a888b1ff..88df6ea0c 100644
--- a/drivers/net/failsafe/failsafe_eal.c
+++ b/drivers/net/failsafe/failsafe_eal.c
@@ -48,5 +48,5 @@ fs_bus_init(struct rte_eth_dev *dev)
 						  da->name,
 						  da->args);
-			if (ret) {
+			if (ret < 0) {
 				ERROR("sub_device %d probe failed %s%s%s", i,
 				      rte_errno ? "(" : "",
@@ -146,5 +146,5 @@ fs_bus_uninit(struct rte_eth_dev *dev)
 	FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
 		sdev_ret = rte_dev_remove(sdev->dev);
-		if (sdev_ret) {
+		if (sdev_ret < 0) {
 			ERROR("Failed to remove requested device %s (err: %d)",
 			      sdev->dev->name, sdev_ret);
diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 178316521..2ff234ea3 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -284,5 +284,5 @@ fs_dev_remove(struct sub_device *sdev)
 	case DEV_PROBED:
 		ret = rte_dev_remove(sdev->dev);
-		if (ret) {
+		if (ret < 0) {
 			ERROR("Bus detach failed for sub_device %u",
 			      SUB_ID(sdev));
diff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c
index 94d067b20..a865a8281 100644
--- a/drivers/net/vdev_netvsc/vdev_netvsc.c
+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c
@@ -637,5 +637,5 @@ vdev_netvsc_netvsc_probe(const struct if_nameindex *iface,
 	vdev_netvsc_foreach_iface(vdev_netvsc_device_probe, 0, ctx);
 	ret = rte_eal_hotplug_add("vdev", ctx->devname, ctx->devargs);
-	if (ret)
+	if (ret < 0)
 		goto error;
 	LIST_INSERT_HEAD(&vdev_netvsc_ctx_list, ctx, entry);
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index fd7f5ca7d..dc2bc0c98 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -173,4 +173,7 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev)
 
 	ret = dev->bus->plug(dev);
+	if (ret > 0)
+		ret = -ENOTSUP;
+
 	if (ret && !rte_dev_is_probed(dev)) { /* if hasn't ever succeeded */
 		RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
@@ -320,5 +323,5 @@ local_dev_remove(struct rte_device *dev)
 		RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
 			dev->name);
-		return ret;
+		return (ret < 0) ? ret : -ENOENT;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.508825800 +0100
+++ 0016-eal-fix-positive-error-codes-from-probe-remove.patch	2019-08-22 19:38:20.417027356 +0100
@@ -1 +1 @@
-From 75b66decdbd52948721f5c286244dc1d29d71711 Mon Sep 17 00:00:00 2001
+From 2b6f661d58c5054bed31b5fd3b5b6fd6062ba7c6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 75b66decdbd52948721f5c286244dc1d29d71711 ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -28 +28,0 @@
- drivers/net/failsafe/failsafe.c        | 2 +-
@@ -33 +33 @@
- 6 files changed, 11 insertions(+), 8 deletions(-)
+ 5 files changed, 10 insertions(+), 7 deletions(-)
@@ -36 +36 @@
-index 0dd47b3e0..c578f75e7 100644
+index cf983b16b..b4215c75d 100644
@@ -39 +39 @@
-@@ -2384,5 +2384,5 @@ attach_port(char *identifier)
+@@ -2291,5 +2291,5 @@ attach_port(char *identifier)
@@ -46 +46 @@
-@@ -2454,5 +2454,5 @@ detach_port_device(portid_t port_id)
+@@ -2361,5 +2361,5 @@ detach_port_device(portid_t port_id)
@@ -53,11 +52,0 @@
-diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
-index e91c274d8..19dd71d4e 100644
---- a/drivers/net/failsafe/failsafe.c
-+++ b/drivers/net/failsafe/failsafe.c
-@@ -375,5 +375,5 @@ rte_pmd_failsafe_probe(struct rte_vdev_device *vdev)
- 			if (!devargs_already_listed(&devargs)) {
- 				ret = rte_dev_probe(devargs.name);
--				if (ret != 0) {
-+				if (ret < 0) {
- 					ERROR("Failed to probe devargs %s",
- 					      devargs.name);
@@ -65 +54 @@
-index 820a915f7..b9fc50867 100644
+index 8a888b1ff..88df6ea0c 100644
@@ -68 +57 @@
-@@ -49,5 +49,5 @@ fs_bus_init(struct rte_eth_dev *dev)
+@@ -48,5 +48,5 @@ fs_bus_init(struct rte_eth_dev *dev)
@@ -75 +64 @@
-@@ -148,5 +148,5 @@ fs_bus_uninit(struct rte_eth_dev *dev)
+@@ -146,5 +146,5 @@ fs_bus_uninit(struct rte_eth_dev *dev)
@@ -83 +72 @@
-index 4746fad36..504c76edb 100644
+index 178316521..2ff234ea3 100644
@@ -86 +75 @@
-@@ -285,5 +285,5 @@ fs_dev_remove(struct sub_device *sdev)
+@@ -284,5 +284,5 @@ fs_dev_remove(struct sub_device *sdev)
@@ -94 +83 @@
-index edab63e3a..1fcf90d7b 100644
+index 94d067b20..a865a8281 100644
@@ -97 +86 @@
-@@ -634,5 +634,5 @@ vdev_netvsc_netvsc_probe(const struct if_nameindex *iface,
+@@ -637,5 +637,5 @@ vdev_netvsc_netvsc_probe(const struct if_nameindex *iface,
@@ -105 +94 @@
-index 86f801da7..9e4f09d83 100644
+index fd7f5ca7d..dc2bc0c98 100644

[dpdk-stable] patch 'net/bnx2x: fix invalid free on unplug' 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 08/28/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/d38d3ff61172c75bd10e248d84ea6a2481e3dcf1

Thanks.

Kevin Traynor

---
From d38d3ff61172c75bd10e248d84ea6a2481e3dcf1 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 17 Jun 2019 17:05:23 +0200
Subject: [PATCH] net/bnx2x: fix invalid free on unplug

[ upstream commit eaa45270aa6646aefc223d0734e14ccb8838c2ef ]

mac_addrs points to a field in dev_private.
We can't let ethdev free it.

Fixes: e16adf08e54d ("ethdev: free all common data when releasing port")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/bnx2x/bnx2x_ethdev.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index cd0a6304c..d2ef8c953 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -700,4 +700,11 @@ eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev)
 }
 
+static int eth_bnx2x_dev_uninit(struct rte_eth_dev *eth_dev)
+{
+	/* mac_addrs must not be freed alone because part of dev_private */
+	eth_dev->data->mac_addrs = NULL;
+	return 0;
+}
+
 static struct rte_pci_driver rte_bnx2x_pmd;
 static struct rte_pci_driver rte_bnx2xvf_pmd;
@@ -718,5 +725,5 @@ static int eth_bnx2x_pci_probe(struct rte_pci_driver *pci_drv,
 static int eth_bnx2x_pci_remove(struct rte_pci_device *pci_dev)
 {
-	return rte_eth_dev_pci_generic_remove(pci_dev, NULL);
+	return rte_eth_dev_pci_generic_remove(pci_dev, eth_bnx2x_dev_uninit);
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.570146756 +0100
+++ 0017-net-bnx2x-fix-invalid-free-on-unplug.patch	2019-08-22 19:38:20.418027332 +0100
@@ -1 +1 @@
-From eaa45270aa6646aefc223d0734e14ccb8838c2ef Mon Sep 17 00:00:00 2001
+From d38d3ff61172c75bd10e248d84ea6a2481e3dcf1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit eaa45270aa6646aefc223d0734e14ccb8838c2ef ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 0ee35e4e4..10b4fdb8e 100644
+index cd0a6304c..d2ef8c953 100644
@@ -22 +23 @@
-@@ -701,4 +701,11 @@ eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -700,4 +700,11 @@ eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev)
@@ -34 +35 @@
-@@ -719,5 +726,5 @@ static int eth_bnx2x_pci_probe(struct rte_pci_driver *pci_drv,
+@@ -718,5 +725,5 @@ static int eth_bnx2x_pci_probe(struct rte_pci_driver *pci_drv,

[dpdk-stable] patch 'drivers/net: fix double free on init 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 08/28/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/f4aaa8cc9280685783187ce9242b1f529f8dd9db

Thanks.

Kevin Traynor

---
From f4aaa8cc9280685783187ce9242b1f529f8dd9db Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 17 Jun 2019 17:05:24 +0200
Subject: [PATCH] drivers/net: fix double free on init failure

[ upstream commit e7f2fa88a71eb667788a124abbdc6d1ca1e0671e ]

If we don't clear mac_addrs, ethdev will double free it on cleanup.

Fixes: e16adf08e54d ("ethdev: free all common data when releasing port")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/ark/ark_ethdev.c        | 6 +++---
 drivers/net/axgbe/axgbe_ethdev.c    | 1 +
 drivers/net/i40e/i40e_ethdev.c      | 1 +
 drivers/net/thunderx/nicvf_ethdev.c | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index af37f75ee..18eb15e59 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -403,7 +403,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
 	return ret;
 
- error:
-	if (dev->data->mac_addrs)
-		rte_free(dev->data->mac_addrs);
+error:
+	rte_free(dev->data->mac_addrs);
+	dev->data->mac_addrs = NULL;
 	return -1;
 }
diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index 2f34ad80c..8e534a760 100644
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -701,4 +701,5 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 	if (ret) {
 		rte_free(eth_dev->data->mac_addrs);
+		eth_dev->data->mac_addrs = NULL;
 		return ret;
 	}
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index d419c0cf0..bef5f25a4 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1594,4 +1594,5 @@ err_init_tunnel_filter_list:
 err_init_ethtype_filter_list:
 	rte_free(dev->data->mac_addrs);
+	dev->data->mac_addrs = NULL;
 err_mac_alloc:
 	i40e_vsi_release(pf->main_vsi);
diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c
index 879d88998..8f5664d7b 100644
--- a/drivers/net/thunderx/nicvf_ethdev.c
+++ b/drivers/net/thunderx/nicvf_ethdev.c
@@ -2206,4 +2206,5 @@ nicvf_eth_dev_init(struct rte_eth_dev *eth_dev)
 malloc_fail:
 	rte_free(eth_dev->data->mac_addrs);
+	eth_dev->data->mac_addrs = NULL;
 alarm_fail:
 	nicvf_periodic_alarm_stop(nicvf_interrupt, eth_dev);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.632317543 +0100
+++ 0018-drivers-net-fix-double-free-on-init-failure.patch	2019-08-22 19:38:20.438026856 +0100
@@ -1 +1 @@
-From e7f2fa88a71eb667788a124abbdc6d1ca1e0671e Mon Sep 17 00:00:00 2001
+From f4aaa8cc9280685783187ce9242b1f529f8dd9db Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e7f2fa88a71eb667788a124abbdc6d1ca1e0671e ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +17,0 @@
- drivers/net/ice/ice_ethdev.c        | 1 +
@@ -19 +19 @@
- 5 files changed, 7 insertions(+), 3 deletions(-)
+ 4 files changed, 6 insertions(+), 3 deletions(-)
@@ -22 +22 @@
-index 7fd784cd0..86e500ecb 100644
+index af37f75ee..18eb15e59 100644
@@ -25 +25 @@
-@@ -404,7 +404,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
+@@ -403,7 +403,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
@@ -37 +37 @@
-index 6b3bc3eea..cfb172064 100644
+index 2f34ad80c..8e534a760 100644
@@ -47 +47 @@
-index 33644557b..2b9fc4572 100644
+index d419c0cf0..bef5f25a4 100644
@@ -50 +50 @@
-@@ -1596,4 +1596,5 @@ err_init_tunnel_filter_list:
+@@ -1594,4 +1594,5 @@ err_init_tunnel_filter_list:
@@ -56,10 +55,0 @@
-diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
-index 203d0a9f9..1e48bd0bd 100644
---- a/drivers/net/ice/ice_ethdev.c
-+++ b/drivers/net/ice/ice_ethdev.c
-@@ -1467,4 +1467,5 @@ err_pf_setup:
- err_msix_pool_init:
- 	rte_free(dev->data->mac_addrs);
-+	dev->data->mac_addrs = NULL;
- err_init_mac:
- 	ice_sched_cleanup_all(hw);
@@ -67 +57 @@
-index eb2c11da5..ec57692fb 100644
+index 879d88998..8f5664d7b 100644
@@ -70 +60 @@
-@@ -2207,4 +2207,5 @@ nicvf_eth_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2206,4 +2206,5 @@ nicvf_eth_dev_init(struct rte_eth_dev *eth_dev)

[dpdk-stable] patch 'net: fix encapsulation markers for inner L3 offset' 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 08/28/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/88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44

Thanks.

Kevin Traynor

---
From 88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov@oktetlabs.ru>
Date: Fri, 24 May 2019 17:57:14 +0300
Subject: [PATCH] net: fix encapsulation markers for inner L3 offset

[ upstream commit 6bf0912011eed76285a6acf2ddb9b126008b6339 ]

The API to prepare checksum offloads employs outer
IP checksum flag to tell regular IPv4 packets from
tunnel packets with outer IPv4 encapsulation. This
flag cannot serve as a marker for the said purpose
because a packet can have outer IPv4 encapsulation
and may not have outer IP checksum offload request.

Fix the API by changing the said criterion to test
outer IPv4 flag rather than outer IP checksum flag.
Use simpler spelling of the conditional expression.

Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation")

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/librte_net/rte_net.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
index e59760a0a..a8eafa146 100644
--- a/lib/librte_net/rte_net.h
+++ b/lib/librte_net/rte_net.h
@@ -119,6 +119,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
 	uint64_t inner_l3_offset = m->l2_len;
 
-	if ((ol_flags & PKT_TX_OUTER_IP_CKSUM) ||
-		(ol_flags & PKT_TX_OUTER_IPV6))
+	if (ol_flags & (PKT_TX_OUTER_IPV4 | PKT_TX_OUTER_IPV6))
 		inner_l3_offset += m->outer_l2_len + m->outer_l3_len;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.713661170 +0100
+++ 0019-net-fix-encapsulation-markers-for-inner-L3-offset.patch	2019-08-22 19:38:20.438026856 +0100
@@ -1 +1 @@
-From 6bf0912011eed76285a6acf2ddb9b126008b6339 Mon Sep 17 00:00:00 2001
+From 88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6bf0912011eed76285a6acf2ddb9b126008b6339 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index b83f8c13a..461f2c81d 100644
+index e59760a0a..a8eafa146 100644
@@ -31,2 +32,2 @@
-@@ -130,6 +130,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
- #endif
+@@ -119,6 +119,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
+ 	uint64_t inner_l3_offset = m->l2_len;

[dpdk-stable] patch 'net/mlx5: fix 32-bit 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 08/28/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/a9028545828a6fcfbfe322825159b925dd006d0f

Thanks.

Kevin Traynor

---
From a9028545828a6fcfbfe322825159b925dd006d0f Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu@mellanox.com>
Date: Thu, 27 Jun 2019 18:10:07 +0300
Subject: [PATCH] net/mlx5: fix 32-bit build

[ upstream commit 843e720557105750d5152f3a414655ab87fb856c ]

This is to fix the error:
  ```
  drivers/net/mlx5/mlx5_defs.h:14:26:
  error: format '%lx' expects argument of type 'long unsigned int',
  but argument 5 has type 'off_t {aka long long int}' [-Werror=format=]
  drivers/net/mlx5/mlx5_txq.c:569:48: note: format string is defined here
     DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%lx"
                                                ~~^
                                                %llx
  ```
Which reproduces with gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0.

Fixes: 6bf10ab69be0 ("net/mlx5: support 32-bit systems")

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/mlx5/mlx5_txq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 2971f9aa2..a3c6fdd18 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -11,4 +11,5 @@
 #include <unistd.h>
 #include <sys/mman.h>
+#include <inttypes.h>
 
 /* Verbs header. */
@@ -524,5 +525,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
 	if (qp.comp_mask & MLX5DV_QP_MASK_UAR_MMAP_OFFSET) {
 		txq_ctrl->uar_mmap_offset = qp.uar_mmap_offset;
-		DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%lx",
+		DRV_LOG(DEBUG, "port %u: uar_mmap_offset 0x%"PRIx64,
 			dev->data->port_id, txq_ctrl->uar_mmap_offset);
 	} else {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.776129240 +0100
+++ 0020-net-mlx5-fix-32-bit-build.patch	2019-08-22 19:38:20.440026808 +0100
@@ -1 +1 @@
-From 843e720557105750d5152f3a414655ab87fb856c Mon Sep 17 00:00:00 2001
+From a9028545828a6fcfbfe322825159b925dd006d0f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 843e720557105750d5152f3a414655ab87fb856c ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index ebb42cbff..77410955f 100644
+index 2971f9aa2..a3c6fdd18 100644
@@ -37 +38 @@
-@@ -567,5 +568,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)
+@@ -524,5 +525,5 @@ mlx5_txq_ibv_new(struct rte_eth_dev *dev, uint16_t idx)

[dpdk-stable] patch 'net/netvsc: fix RSS offload settings' 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 08/28/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/ddc352a3f230494e13071702471dcf3d6cc38280

Thanks.

Kevin Traynor

---
From ddc352a3f230494e13071702471dcf3d6cc38280 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Thu, 13 Jun 2019 08:03:42 -0700
Subject: [PATCH] net/netvsc: fix RSS offload settings

[ upstream commit 3a899f8afc3438bf092494209da69f74c1ddc54b ]

Use the result from querying host to show the RSS info.

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

Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 drivers/net/netvsc/hn_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 66e158c72..c3afd2fe9 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -235,6 +235,6 @@ static void hn_dev_info_get(struct rte_eth_dev *dev,
 
 	dev_info->hash_key_size = NDIS_HASH_KEYSIZE_TOEPLITZ;
-	dev_info->flow_type_rss_offloads =
-		ETH_RSS_IPV4 | ETH_RSS_IPV6 | ETH_RSS_TCP | ETH_RSS_UDP;
+	dev_info->flow_type_rss_offloads = hv->rss_offloads;
+	dev_info->reta_size = ETH_RSS_RETA_SIZE_128;
 
 	dev_info->max_rx_queues = hv->max_queues;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.839317878 +0100
+++ 0021-net-netvsc-fix-RSS-offload-settings.patch	2019-08-22 19:38:20.441026784 +0100
@@ -1 +1 @@
-From 3a899f8afc3438bf092494209da69f74c1ddc54b Mon Sep 17 00:00:00 2001
+From ddc352a3f230494e13071702471dcf3d6cc38280 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3a899f8afc3438bf092494209da69f74c1ddc54b ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index 70352f0e1..1fa14fff3 100644
+index 66e158c72..c3afd2fe9 100644
@@ -20 +21 @@
-@@ -238,6 +238,6 @@ static void hn_dev_info_get(struct rte_eth_dev *dev,
+@@ -235,6 +235,6 @@ static void hn_dev_info_get(struct rte_eth_dev *dev,

[dpdk-stable] patch 'net/netvsc: fix xstats id' 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 08/28/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/9fd8123bdaefd63d9158fa91bd13820a8b7fb397

Thanks.

Kevin Traynor

---
From 9fd8123bdaefd63d9158fa91bd13820a8b7fb397 Mon Sep 17 00:00:00 2001
From: Mohsin Mazhar Shaikh <mohsinmazhar_shaikh@trendmicro.com>
Date: Thu, 20 Jun 2019 15:09:23 -0700
Subject: [PATCH] net/netvsc: fix xstats id

[ upstream commit b21ad01a82904413485c82a08c154aeacf31fd02 ]

The xstats_get was not setting id correctly for each entry.

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

Signed-off-by: Mohsin Mazhar Shaikh <mohsinmazhar_shaikh@trendmicro.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_ethdev.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index c3afd2fe9..cf03972fd 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -573,7 +573,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
 
 		stats = (const char *)&txq->stats;
-		for (t = 0; t < RTE_DIM(hn_stat_strings); t++)
-			xstats[count++].value = *(const uint64_t *)
+		for (t = 0; t < RTE_DIM(hn_stat_strings); t++, count++) {
+			xstats[count].id = count;
+			xstats[count].value = *(const uint64_t *)
 				(stats + hn_stat_strings[t].offset);
+		}
 	}
 
@@ -585,7 +587,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
 
 		stats = (const char *)&rxq->stats;
-		for (t = 0; t < RTE_DIM(hn_stat_strings); t++)
-			xstats[count++].value = *(const uint64_t *)
+		for (t = 0; t < RTE_DIM(hn_stat_strings); t++, count++) {
+			xstats[count].id = count;
+			xstats[count].value = *(const uint64_t *)
 				(stats + hn_stat_strings[t].offset);
+		}
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.903047589 +0100
+++ 0022-net-netvsc-fix-xstats-id.patch	2019-08-22 19:38:20.442026760 +0100
@@ -1 +1 @@
-From b21ad01a82904413485c82a08c154aeacf31fd02 Mon Sep 17 00:00:00 2001
+From 9fd8123bdaefd63d9158fa91bd13820a8b7fb397 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b21ad01a82904413485c82a08c154aeacf31fd02 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index e0b701676..69cf5d1d9 100644
+index c3afd2fe9..cf03972fd 100644
@@ -21 +22 @@
-@@ -743,7 +743,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
+@@ -573,7 +573,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
@@ -33 +34 @@
-@@ -755,7 +757,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
+@@ -585,7 +587,9 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,

[dpdk-stable] patch 'net/netvsc: fix xstats for VF device' 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 08/28/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/a8a965216c4bf161974ddd265c85534a99f8a566

Thanks.

Kevin Traynor

---
From a8a965216c4bf161974ddd265c85534a99f8a566 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 20 Jun 2019 15:09:24 -0700
Subject: [PATCH] net/netvsc: fix xstats for VF device

[ upstream commit cc9271f9e7ee5723677e57f2d49720d3828b51b6 ]

The id values for VF stats were not being offset correctly.
And getting xstats for VF device only worked if VF device supported
it; it did not support the generic stats.

Fixes: dc7680e8597c ("net/netvsc: support integrated VF")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_ethdev.c |  2 +-
 drivers/net/netvsc/hn_var.h    |  2 +-
 drivers/net/netvsc/hn_vf.c     | 26 ++++++++++++++++++--------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index cf03972fd..c2cf0afc8 100644
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -594,5 +594,5 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
 	}
 
-	ret = hn_vf_xstats_get(dev, xstats + count, n - count);
+	ret = hn_vf_xstats_get(dev, xstats, count, n);
 	if (ret < 0)
 		return ret;
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index b31563435..d10e164e6 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -236,4 +236,4 @@ int	hn_vf_xstats_get_names(struct rte_eth_dev *dev,
 int	hn_vf_xstats_get(struct rte_eth_dev *dev,
 			 struct rte_eth_xstat *xstats,
-			 unsigned int n);
+			 unsigned int offset, unsigned int n);
 void	hn_vf_xstats_reset(struct rte_eth_dev *dev);
diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c
index 4127e411f..50f92a00a 100644
--- a/drivers/net/netvsc/hn_vf.c
+++ b/drivers/net/netvsc/hn_vf.c
@@ -501,10 +501,10 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
 	struct rte_eth_dev *vf_dev;
 	int i, count = 0;
-	char tmp[RTE_ETH_XSTATS_NAME_SIZE];
 
 	rte_spinlock_lock(&hv->vf_lock);
 	vf_dev = hn_get_vf_dev(hv);
-	if (vf_dev && vf_dev->dev_ops->xstats_get_names)
-		count = vf_dev->dev_ops->xstats_get_names(vf_dev, names, n);
+	if (vf_dev)
+		count = rte_eth_xstats_get_names(vf_dev->data->port_id,
+						 names, n);
 	rte_spinlock_unlock(&hv->vf_lock);
 
@@ -512,4 +512,6 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
 	if (names) {
 		for (i = 0; i < count; i++) {
+			char tmp[RTE_ETH_XSTATS_NAME_SIZE];
+
 			snprintf(tmp, sizeof(tmp), "vf_%s", names[i].name);
 			strlcpy(names[i].name, tmp, sizeof(names[i].name));
@@ -522,16 +524,24 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
 int hn_vf_xstats_get(struct rte_eth_dev *dev,
 		     struct rte_eth_xstat *xstats,
+		     unsigned int offset,
 		     unsigned int n)
 {
 	struct hn_data *hv = dev->data->dev_private;
 	struct rte_eth_dev *vf_dev;
-	int count = 0;
+	int i, count = 0;
 
 	rte_spinlock_lock(&hv->vf_lock);
 	vf_dev = hn_get_vf_dev(hv);
-	if (vf_dev && vf_dev->dev_ops->xstats_get)
-		count = vf_dev->dev_ops->xstats_get(vf_dev, xstats, n);
+	if (vf_dev)
+		count = rte_eth_xstats_get(vf_dev->data->port_id,
+					   xstats + offset, n - offset);
 	rte_spinlock_unlock(&hv->vf_lock);
 
+	/* Offset id's for VF stats */
+	if (count > 0) {
+		for (i = 0; i < count; i++)
+			xstats[i + offset].id += offset;
+	}
+
 	return count;
 }
@@ -544,6 +554,6 @@ void hn_vf_xstats_reset(struct rte_eth_dev *dev)
 	rte_spinlock_lock(&hv->vf_lock);
 	vf_dev = hn_get_vf_dev(hv);
-	if (vf_dev && vf_dev->dev_ops->xstats_reset)
-		vf_dev->dev_ops->xstats_reset(vf_dev);
+	if (vf_dev)
+		rte_eth_xstats_reset(vf_dev->data->port_id);
 	rte_spinlock_unlock(&hv->vf_lock);
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.965337644 +0100
+++ 0023-net-netvsc-fix-xstats-for-VF-device.patch	2019-08-22 19:38:20.444026713 +0100
@@ -1 +1 @@
-From cc9271f9e7ee5723677e57f2d49720d3828b51b6 Mon Sep 17 00:00:00 2001
+From a8a965216c4bf161974ddd265c85534a99f8a566 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cc9271f9e7ee5723677e57f2d49720d3828b51b6 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 69cf5d1d9..2a90d674e 100644
+index cf03972fd..c2cf0afc8 100644
@@ -24 +25 @@
-@@ -764,5 +764,5 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
+@@ -594,5 +594,5 @@ hn_dev_xstats_get(struct rte_eth_dev *dev,
@@ -32 +33 @@
-index 1756615a3..3f5e8dfa7 100644
+index b31563435..d10e164e6 100644
@@ -35 +36 @@
-@@ -242,5 +242,5 @@ int	hn_vf_xstats_get_names(struct rte_eth_dev *dev,
+@@ -236,4 +236,4 @@ int	hn_vf_xstats_get_names(struct rte_eth_dev *dev,
@@ -41 +41,0 @@
- int	hn_vf_rss_hash_update(struct rte_eth_dev *dev,
@@ -43 +43 @@
-index 764cf844c..03f855b94 100644
+index 4127e411f..50f92a00a 100644
@@ -46 +46 @@
-@@ -507,10 +507,10 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
+@@ -501,10 +501,10 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
@@ -60 +60 @@
-@@ -518,4 +518,6 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
+@@ -512,4 +512,6 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
@@ -67 +67 @@
-@@ -528,16 +530,24 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
+@@ -522,16 +524,24 @@ int hn_vf_xstats_get_names(struct rte_eth_dev *dev,
@@ -95 +95 @@
-@@ -550,6 +560,6 @@ void hn_vf_xstats_reset(struct rte_eth_dev *dev)
+@@ -544,6 +554,6 @@ void hn_vf_xstats_reset(struct rte_eth_dev *dev)

[dpdk-stable] patch 'doc: fix typos in flow API 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 08/28/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/4de76d3fb0c2e10d7fd93b223a96a05265af7bda

Thanks.

Kevin Traynor

---
From 4de76d3fb0c2e10d7fd93b223a96a05265af7bda Mon Sep 17 00:00:00 2001
From: Xiaolong Ye <xiaolong.ye@intel.com>
Date: Tue, 18 Jun 2019 22:07:05 +0800
Subject: [PATCH] doc: fix typos in flow API guide

[ upstream commit bbf708e54ffb2bd6ab945fba37998d1e4659623a ]

Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")

Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/howto/rte_flow.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
index e080570e9..81fa805e9 100644
--- a/doc/guides/howto/rte_flow.rst
+++ b/doc/guides/howto/rte_flow.rst
@@ -46,5 +46,5 @@ Code
   pattern[0].spec = &eth;
 
-  /* set the vlan to pas all packets */
+  /* set the vlan to pass all packets */
   pattern[1] = RTE_FLOW_ITEM_TYPE_VLAN;
   pattern[1].spec = &vlan;
@@ -142,5 +142,5 @@ Code
   pattern[0].spec = &eth;
 
-  /* set the vlan to pas all packets */
+  /* set the vlan to pass all packets */
   pattern[1] = RTE_FLOW_ITEM_TYPE_VLAN;
   pattern[1].spec = &vlan;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.029946803 +0100
+++ 0024-doc-fix-typos-in-flow-API-guide.patch	2019-08-22 19:38:20.445026689 +0100
@@ -1 +1 @@
-From bbf708e54ffb2bd6ab945fba37998d1e4659623a Mon Sep 17 00:00:00 2001
+From 4de76d3fb0c2e10d7fd93b223a96a05265af7bda Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bbf708e54ffb2bd6ab945fba37998d1e4659623a ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
-index e197376e2..27d4f28f7 100644
+index e080570e9..81fa805e9 100644

[dpdk-stable] patch 'net: fix how L4 checksum choice is tested' 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 08/28/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/3ad4739521ccae17e04135938b55c27a4988faf0

Thanks.

Kevin Traynor

---
From 3ad4739521ccae17e04135938b55c27a4988faf0 Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov@oktetlabs.ru>
Date: Fri, 28 Jun 2019 06:13:09 +0300
Subject: [PATCH] net: fix how L4 checksum choice is tested

[ upstream commit 39a94299195f3329a28a3556e2431b9d6b83b222 ]

The API to prepare checksum offloads mistreats L4
checksum type enum values as self-contained flags.

Turning these flag checks into enum checks causes
warnings by GCC about possibly uninitialised IPv4
header pointer. The issue was found to show up in
the case of GCC versions 4.8.5 and 5.4.0, however,
it might be the case for a wider variety of other
versions. Initialise the pointer upon declaration.
and explain the reason behind this in the comment.

Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation")

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/librte_net/rte_net.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
index a8eafa146..025acba7f 100644
--- a/lib/librte_net/rte_net.h
+++ b/lib/librte_net/rte_net.h
@@ -113,5 +113,6 @@ static inline int
 rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
 {
-	struct ipv4_hdr *ipv4_hdr;
+	/* Initialise ipv4_hdr to avoid false positive compiler warnings. */
+	struct ipv4_hdr *ipv4_hdr = NULL;
 	struct ipv6_hdr *ipv6_hdr;
 	struct tcp_hdr *tcp_hdr;
@@ -130,5 +131,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
 	}
 
-	if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) {
+	if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM) {
 		if (ol_flags & PKT_TX_IPV4) {
 			udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
@@ -145,5 +146,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
 					ol_flags);
 		}
-	} else if ((ol_flags & PKT_TX_TCP_CKSUM) ||
+	} else if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM ||
 			(ol_flags & PKT_TX_TCP_SEG)) {
 		if (ol_flags & PKT_TX_IPV4) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.094524402 +0100
+++ 0025-net-fix-how-L4-checksum-choice-is-tested.patch	2019-08-22 19:38:20.445026689 +0100
@@ -1 +1 @@
-From 39a94299195f3329a28a3556e2431b9d6b83b222 Mon Sep 17 00:00:00 2001
+From 3ad4739521ccae17e04135938b55c27a4988faf0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 39a94299195f3329a28a3556e2431b9d6b83b222 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 461f2c81d..1560ecfa4 100644
+index a8eafa146..025acba7f 100644
@@ -32 +33 @@
-@@ -114,5 +114,6 @@ static inline int
+@@ -113,5 +113,6 @@ static inline int
@@ -35 +36 @@
--	struct rte_ipv4_hdr *ipv4_hdr;
+-	struct ipv4_hdr *ipv4_hdr;
@@ -37,4 +38,4 @@
-+	struct rte_ipv4_hdr *ipv4_hdr = NULL;
- 	struct rte_ipv6_hdr *ipv6_hdr;
- 	struct rte_tcp_hdr *tcp_hdr;
-@@ -152,5 +153,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
++	struct ipv4_hdr *ipv4_hdr = NULL;
+ 	struct ipv6_hdr *ipv6_hdr;
+ 	struct tcp_hdr *tcp_hdr;
+@@ -130,5 +131,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
@@ -46,2 +47,2 @@
- 			udp_hdr = (struct rte_udp_hdr *)((char *)ipv4_hdr +
-@@ -168,5 +169,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)
+ 			udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
+@@ -145,5 +146,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)

[dpdk-stable] patch 'eal/freebsd: fix init completion' 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 08/28/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/d86739b109a03bed54b4e6544f148ae86499670a

Thanks.

Kevin Traynor

---
From d86739b109a03bed54b4e6544f148ae86499670a Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov@intel.com>
Date: Thu, 27 Jun 2019 12:33:45 +0100
Subject: [PATCH] eal/freebsd: fix init completion

[ upstream commit 9c8a35a572e6742eac84042bcc645269b50a0e55 ]

When init is complete, EAL is supposed to update internal config
to indicate that initialization is complete. Add missing write.

Fixes: a99c96e96ad3 ("eal: add internal flag of init completed")

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 lib/librte_eal/bsdapp/eal/eal.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index cfaa87a48..30b4cf7bf 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -567,4 +567,6 @@ rte_eal_mcfg_complete(void)
 	if (rte_config.process_type == RTE_PROC_PRIMARY)
 		rte_config.mem_config->magic = RTE_MAGIC;
+
+	internal_config.init_complete = 1;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.156972621 +0100
+++ 0026-eal-freebsd-fix-init-completion.patch	2019-08-22 19:38:20.447026641 +0100
@@ -1 +1 @@
-From 9c8a35a572e6742eac84042bcc645269b50a0e55 Mon Sep 17 00:00:00 2001
+From d86739b109a03bed54b4e6544f148ae86499670a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9c8a35a572e6742eac84042bcc645269b50a0e55 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- lib/librte_eal/freebsd/eal/eal.c | 2 ++
+ lib/librte_eal/bsdapp/eal/eal.c | 2 ++
@@ -18,5 +19,5 @@
-diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
-index a3d4863c8..b10e257df 100644
---- a/lib/librte_eal/freebsd/eal/eal.c
-+++ b/lib/librte_eal/freebsd/eal/eal.c
-@@ -595,4 +595,6 @@ rte_eal_mcfg_complete(void)
+diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
+index cfaa87a48..30b4cf7bf 100644
+--- a/lib/librte_eal/bsdapp/eal/eal.c
++++ b/lib/librte_eal/bsdapp/eal/eal.c
+@@ -567,4 +567,6 @@ rte_eal_mcfg_complete(void)

[dpdk-stable] patch 'raw/skeleton: fix test of attribute set/get' 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 08/28/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/259104066dff55a6e60d6570247b474c6ffaea4a

Thanks.

Kevin Traynor

---
From 259104066dff55a6e60d6570247b474c6ffaea4a Mon Sep 17 00:00:00 2001
From: Thinh Tran <thinhtr@linux.vnet.ibm.com>
Date: Tue, 11 Jun 2019 16:44:12 -0500
Subject: [PATCH] raw/skeleton: fix test of attribute set/get

[ upstream commit dcb1595956e366a15f9b33998b37172ee29da1e1 ]

Using memory on the stack instead of on the heap by calling malloc
also avoid memory leak in case of test case failures

Fixes: 88d0e47880ec ("raw/skeleton: fix memory leak on test failure")

Signed-off-by: Thinh Tran <thinhtr@linux.vnet.ibm.com>
Acked-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
 drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
index 359c9e296..3250c2296 100644
--- a/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
+++ b/drivers/raw/skeleton_rawdev/skeleton_rawdev_test.c
@@ -275,5 +275,5 @@ test_rawdev_attr_set_get(void)
 {
 	int ret;
-	int *dummy_value;
+	int *dummy_value, set_value;
 	uint64_t ret_value;
 
@@ -282,8 +282,5 @@ test_rawdev_attr_set_get(void)
 	RTE_TEST_ASSERT(!ret, "Unable to set an attribute (Test1)");
 
-	dummy_value = malloc(sizeof(int));
-	if (!dummy_value)
-		RTE_TEST_ASSERT(1, "Unable to allocate memory (dummy_value)");
-
+	dummy_value = &set_value;
 	*dummy_value = 200;
 	ret = rte_rawdev_set_attr(TEST_DEV_ID, "Test2", (uintptr_t)dummy_value);
@@ -295,9 +292,7 @@ test_rawdev_attr_set_get(void)
 			      ret_value);
 
-	free(dummy_value);
-
 	ret_value = 0;
 	ret = rte_rawdev_get_attr(TEST_DEV_ID, "Test2", &ret_value);
-	RTE_TEST_ASSERT_EQUAL(*((int *)(uintptr_t)ret_value), 200,
+	RTE_TEST_ASSERT_EQUAL(*((int *)(uintptr_t)ret_value), set_value,
 			      "Attribute (Test2) not set correctly (%" PRIu64 ")",
 			      ret_value);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.219791830 +0100
+++ 0027-raw-skeleton-fix-test-of-attribute-set-get.patch	2019-08-22 19:38:20.447026641 +0100
@@ -1 +1 @@
-From dcb1595956e366a15f9b33998b37172ee29da1e1 Mon Sep 17 00:00:00 2001
+From 259104066dff55a6e60d6570247b474c6ffaea4a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit dcb1595956e366a15f9b33998b37172ee29da1e1 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'examples/l3fwd-vf: remove unused Rx/Tx 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 08/28/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/2cb7e21e536a941ff49652c25a06e1544993e277

Thanks.

Kevin Traynor

---
From 2cb7e21e536a941ff49652c25a06e1544993e277 Mon Sep 17 00:00:00 2001
From: Bao-Long Tran <longtb5@viettel.com.vn>
Date: Mon, 3 Jun 2019 17:06:18 +0700
Subject: [PATCH] examples/l3fwd-vf: remove unused Rx/Tx configuration

[ upstream commit a1d9307b2c0651315fe1a73768a88bacc9c6c59a ]

The RX and TX Prefetch, Host, and Write-back threshold values are
defined but not used anywhere. They are leftovers from a previous
patch.

Fixes: 81f7ecd9 ("examples: use factorized default Rx/Tx configuration")

Signed-off-by: Bao-Long Tran <longtb5@viettel.com.vn>
---
 examples/l3fwd-vf/main.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index 41137f978..036f86854 100644
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -75,23 +75,4 @@
 				(unsigned)8192)
 
-/*
- * RX and TX Prefetch, Host, and Write-back threshold values should be
- * carefully set for optimal performance. Consult the network
- * controller's datasheet and supporting DPDK documentation for guidance
- * on how these parameters should be set.
- */
-#define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */
-#define RX_HTHRESH 8 /**< Default values of RX host threshold reg. */
-#define RX_WTHRESH 4 /**< Default values of RX write-back threshold reg. */
-
-/*
- * These default values are optimized for use with the Intel(R) 82599 10 GbE
- * Controller and the DPDK ixgbe PMD. Consider using other values for other
- * network controllers and/or network drivers.
- */
-#define TX_PTHRESH 36 /**< Default values of TX prefetch threshold reg. */
-#define TX_HTHRESH 0  /**< Default values of TX host threshold reg. */
-#define TX_WTHRESH 0  /**< Default values of TX write-back threshold reg. */
-
 #define MAX_PKT_BURST 32
 #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.281403036 +0100
+++ 0028-examples-l3fwd-vf-remove-unused-Rx-Tx-configuration.patch	2019-08-22 19:38:20.448026617 +0100
@@ -1 +1 @@
-From a1d9307b2c0651315fe1a73768a88bacc9c6c59a Mon Sep 17 00:00:00 2001
+From 2cb7e21e536a941ff49652c25a06e1544993e277 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a1d9307b2c0651315fe1a73768a88bacc9c6c59a ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 95948676a..1432f8969 100644
+index 41137f978..036f86854 100644

[dpdk-stable] patch 'doc: remove useless Rx configuration in l2fwd 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 08/28/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/ea044b08a1d292594d3b466622fb2ff9ce0e8bea

Thanks.

Kevin Traynor

---
From ea044b08a1d292594d3b466622fb2ff9ce0e8bea Mon Sep 17 00:00:00 2001
From: Bao-Long Tran <longtb5@viettel.com.vn>
Date: Mon, 3 Jun 2019 17:06:23 +0700
Subject: [PATCH] doc: remove useless Rx configuration in l2fwd guide

[ upstream commit a0fbab25b7c301b685eacbabb6ecd9296623653d ]

Update doc the match with code.

Fixes: 81f7ecd9 ("examples: use factorized default Rx/Tx configuration")

Signed-off-by: Bao-Long Tran <longtb5@viettel.com.vn>
---
 doc/guides/sample_app_ug/l2_forward_real_virtual.rst | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst
index 2b2d5afa0..87653ec7b 100644
--- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst
+++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst
@@ -282,16 +282,4 @@ The values n_rx_port and rx_port_list[] are used in the main packet processing l
 (see :ref:`l2_fwd_app_rx_tx_packets`).
 
-The global configuration for the RX queues is stored in a static structure:
-
-.. code-block:: c
-
-    static const struct rte_eth_rxconf rx_conf = {
-        .rx_thresh = {
-            .pthresh = RX_PTHRESH,
-            .hthresh = RX_HTHRESH,
-            .wthresh = RX_WTHRESH,
-        },
-    };
-
 .. _l2_fwd_app_tx_init:
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.345273934 +0100
+++ 0029-doc-remove-useless-Rx-configuration-in-l2fwd-guide.patch	2019-08-22 19:38:20.450026570 +0100
@@ -1 +1 @@
-From a0fbab25b7c301b685eacbabb6ecd9296623653d Mon Sep 17 00:00:00 2001
+From ea044b08a1d292594d3b466622fb2ff9ce0e8bea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a0fbab25b7c301b685eacbabb6ecd9296623653d ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index bede06ed1..39d6b0067 100644
+index 2b2d5afa0..87653ec7b 100644

[dpdk-stable] patch 'test: add rawdev autotest to 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 08/28/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/4056a1336dc9be41910729b8e0066e02a9b3e646

Thanks.

Kevin Traynor

---
From 4056a1336dc9be41910729b8e0066e02a9b3e646 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Tue, 2 Jul 2019 10:56:06 +0100
Subject: [PATCH] test: add rawdev autotest to meson

[ upstream commit 14e1310ec78e0a1c3e46a9745ecb1b428ae0b567 ]

the test_rawdev.c file was missing from the meson.build file, and the test
case from the list of test commands.

Fixes: 55ca1b0f2151 ("raw/skeleton: add test cases")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 test/test/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/test/meson.build b/test/test/meson.build
index 8f03ddda5..cd4035a68 100644
--- a/test/test/meson.build
+++ b/test/test/meson.build
@@ -80,4 +80,5 @@ test_sources = files('commands.c',
 	'test_power_acpi_cpufreq.c',
 	'test_power_kvm_vm.c',
+	'test_rawdev.c',
 	'test_prefetch.c',
 	'test_reciprocal_division.c',
@@ -123,4 +124,5 @@ test_deps = ['acl',
 	'pipeline',
 	'port',
+	'rawdev',
 	'reorder',
 	'ring',
@@ -210,4 +212,5 @@ test_names = [
 	'power_kvm_vm_autotest',
 	'prefetch_autotest',
+	'rawdev_autotest',
 	'reciprocal_division',
 	'reciprocal_division_perf',
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.407601000 +0100
+++ 0030-test-add-rawdev-autotest-to-meson.patch	2019-08-22 19:38:20.450026570 +0100
@@ -1 +1 @@
-From 14e1310ec78e0a1c3e46a9745ecb1b428ae0b567 Mon Sep 17 00:00:00 2001
+From 4056a1336dc9be41910729b8e0066e02a9b3e646 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 14e1310ec78e0a1c3e46a9745ecb1b428ae0b567 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- app/test/meson.build | 3 +++
+ test/test/meson.build | 3 +++
@@ -18,7 +19,7 @@
-diff --git a/app/test/meson.build b/app/test/meson.build
-index 562b93efb..466fd56da 100644
---- a/app/test/meson.build
-+++ b/app/test/meson.build
-@@ -92,4 +92,5 @@ test_sources = files('commands.c',
- 	'test_prefetch.c',
- 	'test_rand_perf.c',
+diff --git a/test/test/meson.build b/test/test/meson.build
+index 8f03ddda5..cd4035a68 100644
+--- a/test/test/meson.build
++++ b/test/test/meson.build
+@@ -80,4 +80,5 @@ test_sources = files('commands.c',
+ 	'test_power_acpi_cpufreq.c',
+ 	'test_power_kvm_vm.c',
@@ -26,3 +27,3 @@
- 	'test_rcu_qsbr.c',
- 	'test_rcu_qsbr_perf.c',
-@@ -143,4 +144,5 @@ test_deps = ['acl',
+ 	'test_prefetch.c',
+ 	'test_reciprocal_division.c',
+@@ -123,4 +124,5 @@ test_deps = ['acl',
@@ -32 +32,0 @@
- 	'rcu',
@@ -34,6 +34,7 @@
-@@ -280,4 +282,5 @@ driver_test_names = [
-         'link_bonding_mode4_autotest',
-         'link_bonding_rssconf_autotest',
-+        'rawdev_autotest',
- ]
- 
+ 	'ring',
+@@ -210,4 +212,5 @@ test_names = [
+ 	'power_kvm_vm_autotest',
+ 	'prefetch_autotest',
++	'rawdev_autotest',
+ 	'reciprocal_division',
+ 	'reciprocal_division_perf',

[dpdk-stable] patch 'event/dpaa2: fix timeout ticks' 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 08/28/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/22b0ecf05f62c8a27ad927cee72266f69b41a882

Thanks.

Kevin Traynor

---
From 22b0ecf05f62c8a27ad927cee72266f69b41a882 Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta@nxp.com>
Date: Thu, 27 Jun 2019 15:06:04 +0530
Subject: [PATCH] event/dpaa2: fix timeout ticks

[ upstream commit aad967bb3c5605d1fb5d6ea81c0c6157eb3e37a0 ]

Correct timeout to tick conversion.

Fixes: 0ce3ce7c275c ("event/dpaa2: add configuration functions")

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
---
 drivers/event/dpaa2/dpaa2_eventdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index 8d168b028..926b7edd8 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -641,5 +641,5 @@ dpaa2_eventdev_timeout_ticks(struct rte_eventdev *dev, uint64_t ns,
 
 	RTE_SET_USED(dev);
-	*timeout_ticks = ns * scale;
+	*timeout_ticks = ns / scale;
 
 	return 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.469754480 +0100
+++ 0031-event-dpaa2-fix-timeout-ticks.patch	2019-08-22 19:38:20.451026546 +0100
@@ -1 +1 @@
-From aad967bb3c5605d1fb5d6ea81c0c6157eb3e37a0 Mon Sep 17 00:00:00 2001
+From 22b0ecf05f62c8a27ad927cee72266f69b41a882 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aad967bb3c5605d1fb5d6ea81c0c6157eb3e37a0 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'eventdev: fix doxygen 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 08/28/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/4e671ffc4c66f021df12b46cab27d5217971b5af

Thanks.

Kevin Traynor

---
From 4e671ffc4c66f021df12b46cab27d5217971b5af Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerinj@marvell.com>
Date: Tue, 2 Jul 2019 12:15:48 +0530
Subject: [PATCH] eventdev: fix doxygen comment

[ upstream commit 374348cd33af5463122cc2e64cb46ee58d1ee279 ]

Update rte_eventdev.h file description to adapt to Tx adapter changes.

Fixes: c9bf83947e2e ("eventdev: add eth Tx adapter APIs")

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Reviewed-by: Nikhil Rao <nikhil.rao@intel.com>
---
 lib/librte_eventdev/rte_eventdev.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h
index 38608114d..d593c5277 100644
--- a/lib/librte_eventdev/rte_eventdev.h
+++ b/lib/librte_eventdev/rte_eventdev.h
@@ -182,7 +182,6 @@
  * The application process the events and send to downstream event queue through
  * rte_event_enqueue_burst() if it is an intermediate stage of event processing,
- * on the final stage, the application may send to different subsystem like
- * ethdev to send the packet/event on the wire using ethdev
- * rte_eth_tx_burst() API.
+ * on the final stage, the application may use Tx adapter API for maintaining
+ * the ingress order and then send the packet/event on the wire.
  *
  * The point at which events are scheduled to ports depends on the device.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.533077821 +0100
+++ 0032-eventdev-fix-doxygen-comment.patch	2019-08-22 19:38:20.454026474 +0100
@@ -1 +1 @@
-From 374348cd33af5463122cc2e64cb46ee58d1ee279 Mon Sep 17 00:00:00 2001
+From 4e671ffc4c66f021df12b46cab27d5217971b5af Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 374348cd33af5463122cc2e64cb46ee58d1ee279 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 517cd8083..927f43c24 100644
+index 38608114d..d593c5277 100644

[dpdk-stable] patch 'app/eventdev: fix order test port 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 08/28/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/0b6cf76cbd55261fd6a486c1c75ae668a7f4f4fd

Thanks.

Kevin Traynor

---
From 0b6cf76cbd55261fd6a486c1c75ae668a7f4f4fd Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Sun, 30 Jun 2019 23:22:39 +0530
Subject: [PATCH] app/eventdev: fix order test port creation

[ upstream commit f77f8c9fe7ea2bd36e0bccd4c908c54e1b7f0420 ]

Configure event ports based on the underlying event device info rather
than using hardcoded values.

Fixes: 5710e751813e ("app/testeventdev: add order port setup")

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

diff --git a/app/test-eventdev/test_order_common.c b/app/test-eventdev/test_order_common.c
index 8a3420130..252e4a14c 100644
--- a/app/test-eventdev/test_order_common.c
+++ b/app/test-eventdev/test_order_common.c
@@ -68,4 +68,9 @@ int
 order_opt_check(struct evt_options *opt)
 {
+	if (opt->prod_type != EVT_PROD_TYPE_SYNT) {
+		evt_err("Invalid producer type");
+		return -EINVAL;
+	}
+
 	/* 1 producer + N workers + 1 master */
 	if (rte_lcore_count() < 3) {
@@ -299,10 +304,21 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 	uint8_t port;
 	struct test_order *t = evt_test_priv(test);
+	struct rte_event_dev_info dev_info;
+
+	memset(&dev_info, 0, sizeof(struct rte_event_dev_info));
+	ret = rte_event_dev_info_get(opt->dev_id, &dev_info);
+	if (ret) {
+		evt_err("failed to get eventdev info %d", opt->dev_id);
+		return ret;
+	}
+
+	if (opt->wkr_deq_dep > dev_info.max_event_port_dequeue_depth)
+		opt->wkr_deq_dep = dev_info.max_event_port_dequeue_depth;
 
 	/* port configuration */
-	const struct rte_event_port_conf wkr_p_conf = {
+	const struct rte_event_port_conf p_conf = {
 			.dequeue_depth = opt->wkr_deq_dep,
-			.enqueue_depth = 64,
-			.new_event_threshold = 4096,
+			.enqueue_depth = dev_info.max_event_port_dequeue_depth,
+			.new_event_threshold = dev_info.max_num_events,
 	};
 
@@ -315,5 +331,5 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 		w->t = t;
 
-		ret = rte_event_port_setup(opt->dev_id, port, &wkr_p_conf);
+		ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
 		if (ret) {
 			evt_err("failed to setup port %d", port);
@@ -327,10 +343,4 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 		}
 	}
-	/* port for producer, no links */
-	const struct rte_event_port_conf prod_conf = {
-			.dequeue_depth = 8,
-			.enqueue_depth = 32,
-			.new_event_threshold = 1200,
-	};
 	struct prod_data *p = &t->prod;
 
@@ -340,5 +350,5 @@ order_event_dev_port_setup(struct evt_test *test, struct evt_options *opt,
 	p->t = t;
 
-	ret = rte_event_port_setup(opt->dev_id, port, &prod_conf);
+	ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
 	if (ret) {
 		evt_err("failed to setup producer port %d", port);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.597386398 +0100
+++ 0033-app-eventdev-fix-order-test-port-creation.patch	2019-08-22 19:38:20.454026474 +0100
@@ -1 +1 @@
-From f77f8c9fe7ea2bd36e0bccd4c908c54e1b7f0420 Mon Sep 17 00:00:00 2001
+From 0b6cf76cbd55261fd6a486c1c75ae668a7f4f4fd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f77f8c9fe7ea2bd36e0bccd4c908c54e1b7f0420 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'test/eventdev: fix producer core validity checks' 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 08/28/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/dbce7dc53468425624ec122e20cfeec86f458179

Thanks.

Kevin Traynor

---
From dbce7dc53468425624ec122e20cfeec86f458179 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Sun, 30 Jun 2019 23:22:40 +0530
Subject: [PATCH] test/eventdev: fix producer core validity checks

[ upstream commit 902387ea4ed1e10330bf74dcad5b715ed5118efd ]

When producer type is event timer adapter producer lcore checks are
skipped. Since, timer adapter relies on SW to arm timers producer lcore
is essential for its functionality.
Verify producer lcore validity when producer type is event timer
adapter.

Fixes: b01974da9f25 ("app/eventdev: add ethernet device producer option")

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

diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index f99a6a607..f93729a12 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -584,5 +584,6 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
 	}
 
-	if (opt->prod_type == EVT_PROD_TYPE_SYNT) {
+	if (opt->prod_type == EVT_PROD_TYPE_SYNT ||
+			opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
 		/* Validate producer lcores */
 		if (evt_lcores_has_overlap(opt->plcores,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.658608843 +0100
+++ 0034-test-eventdev-fix-producer-core-validity-checks.patch	2019-08-22 19:38:20.455026450 +0100
@@ -1 +1 @@
-From 902387ea4ed1e10330bf74dcad5b715ed5118efd Mon Sep 17 00:00:00 2001
+From dbce7dc53468425624ec122e20cfeec86f458179 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 902387ea4ed1e10330bf74dcad5b715ed5118efd ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 01f782820..2e9e83e88 100644
+index f99a6a607..f93729a12 100644
@@ -25 +26 @@
-@@ -563,5 +563,6 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
+@@ -584,5 +584,6 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)

[dpdk-stable] patch 'net/mvneta: fix ierror statistics' 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 08/28/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/a9b869ed83f19ecac2255ff4fe4063be7a547fff

Thanks.

Kevin Traynor

---
From a9b869ed83f19ecac2255ff4fe4063be7a547fff Mon Sep 17 00:00:00 2001
From: Liron Himi <lironh@marvell.com>
Date: Mon, 1 Jul 2019 11:00:22 +0300
Subject: [PATCH] net/mvneta: fix ierror statistics

[ upstream commit 09a6afe7e4bff1d4b2961e031fcae1b7a1f042d3 ]

Error packets were counted twice due to use of redundant counters.

Fixes: e9d5faffd10c ("net/mvneta: support basic stats")

Signed-off-by: Liron Himi <lironh@marvell.com>
Reviewed-by: Yuri Chipchev <yuric@marvell.com>
Tested-by: Liron Himi <lironh@marvell.com>
---
 drivers/net/mvneta/mvneta_ethdev.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 2d7666454..919856885 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -707,8 +707,5 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 			  ppio_stats.rx_overrun -
 			  priv->prev_stats.imissed;
-
-	stats->ierrors = ppio_stats.rx_packets_err +
-			ppio_stats.rx_errors +
-			ppio_stats.rx_crc_error -
+	stats->ierrors = ppio_stats.rx_packets_err -
 			priv->prev_stats.ierrors;
 	stats->oerrors = ppio_stats.tx_errors - priv->prev_stats.oerrors;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.720052952 +0100
+++ 0035-net-mvneta-fix-ierror-statistics.patch	2019-08-22 19:38:20.456026427 +0100
@@ -1 +1 @@
-From 09a6afe7e4bff1d4b2961e031fcae1b7a1f042d3 Mon Sep 17 00:00:00 2001
+From a9b869ed83f19ecac2255ff4fe4063be7a547fff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 09a6afe7e4bff1d4b2961e031fcae1b7a1f042d3 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 965744406..d6e64a849 100644
+index 2d7666454..919856885 100644
@@ -22 +23 @@
-@@ -708,8 +708,5 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+@@ -707,8 +707,5 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)

[dpdk-stable] patch 'net: fix definition of IPv6 traffic class mask' 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 08/28/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/96f2d95e20ef31dff5ef463394f99e9c121ae349

Thanks.

Kevin Traynor

---
From 96f2d95e20ef31dff5ef463394f99e9c121ae349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>
Date: Mon, 1 Jul 2019 15:38:05 +0200
Subject: [PATCH] net: fix definition of IPv6 traffic class mask
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 854c1333b53f42767b1f5bc731d139d8f675574c ]

IPv6 header TC field is 8 bits, not 4.

Fixes: 9b20c6e9028e ("net: add IPv6 header fields macros")

Signed-off-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_net/rte_ip.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index f9b909090..3cf3081e4 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -353,5 +353,5 @@ struct ipv6_hdr {
 #define IPV6_HDR_TC_SHIFT 20
 #define IPV6_HDR_FL_MASK ((1u << IPV6_HDR_TC_SHIFT) - 1)
-#define IPV6_HDR_TC_MASK (0xf << IPV6_HDR_TC_SHIFT)
+#define IPV6_HDR_TC_MASK (0xff << IPV6_HDR_TC_SHIFT)
 
 /**
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.789833026 +0100
+++ 0036-net-fix-definition-of-IPv6-traffic-class-mask.patch	2019-08-22 19:38:20.457026403 +0100
@@ -1 +1 @@
-From 854c1333b53f42767b1f5bc731d139d8f675574c Mon Sep 17 00:00:00 2001
+From 96f2d95e20ef31dff5ef463394f99e9c121ae349 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 854c1333b53f42767b1f5bc731d139d8f675574c ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index ae3b7e730..059ec80c2 100644
+index f9b909090..3cf3081e4 100644
@@ -24,5 +25,5 @@
-@@ -356,5 +356,5 @@ struct rte_ipv6_hdr {
- #define RTE_IPV6_HDR_TC_SHIFT 20
- #define RTE_IPV6_HDR_FL_MASK ((1u << RTE_IPV6_HDR_TC_SHIFT) - 1)
--#define RTE_IPV6_HDR_TC_MASK (0xf << RTE_IPV6_HDR_TC_SHIFT)
-+#define RTE_IPV6_HDR_TC_MASK (0xff << RTE_IPV6_HDR_TC_SHIFT)
+@@ -353,5 +353,5 @@ struct ipv6_hdr {
+ #define IPV6_HDR_TC_SHIFT 20
+ #define IPV6_HDR_FL_MASK ((1u << IPV6_HDR_TC_SHIFT) - 1)
+-#define IPV6_HDR_TC_MASK (0xf << IPV6_HDR_TC_SHIFT)
++#define IPV6_HDR_TC_MASK (0xff << IPV6_HDR_TC_SHIFT)

[dpdk-stable] patch 'examples: fix pkg-config detection with older make' 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 08/28/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/d9760a99aeacd67c3400390119cc87b8bb98ce27

Thanks.

Kevin Traynor

---
From d9760a99aeacd67c3400390119cc87b8bb98ce27 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Wed, 3 Jul 2019 17:40:00 +0100
Subject: [PATCH] examples: fix pkg-config detection with older make

[ upstream commit 4131ad5db79a016970287282b938ebed2f19bdb3 ]

Make versions before 4.2 did not have support for the .SHELLSTATUS
variable, so use another method to detect shell success.

Fixes: 22119c4591a0 ("examples: use pkg-config in makefiles")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
 examples/bbdev_app/Makefile             | 3 +--
 examples/bond/Makefile                  | 3 +--
 examples/cmdline/Makefile               | 3 +--
 examples/distributor/Makefile           | 3 +--
 examples/eventdev_pipeline/Makefile     | 3 +--
 examples/exception_path/Makefile        | 3 +--
 examples/fips_validation/Makefile       | 3 +--
 examples/flow_classify/Makefile         | 3 +--
 examples/flow_filtering/Makefile        | 3 +--
 examples/helloworld/Makefile            | 3 +--
 examples/ip_fragmentation/Makefile      | 3 +--
 examples/ip_pipeline/Makefile           | 3 +--
 examples/ip_reassembly/Makefile         | 3 +--
 examples/ipsec-secgw/Makefile           | 3 +--
 examples/ipv4_multicast/Makefile        | 3 +--
 examples/kni/Makefile                   | 3 +--
 examples/l2fwd-cat/Makefile             | 3 +--
 examples/l2fwd-crypto/Makefile          | 3 +--
 examples/l2fwd-jobstats/Makefile        | 3 +--
 examples/l2fwd-keepalive/Makefile       | 3 +--
 examples/l2fwd/Makefile                 | 3 +--
 examples/l3fwd-acl/Makefile             | 3 +--
 examples/l3fwd-power/Makefile           | 3 +--
 examples/l3fwd-vf/Makefile              | 3 +--
 examples/l3fwd/Makefile                 | 3 +--
 examples/link_status_interrupt/Makefile | 3 +--
 examples/load_balancer/Makefile         | 3 +--
 examples/packet_ordering/Makefile       | 3 +--
 examples/ptpclient/Makefile             | 3 +--
 examples/qos_meter/Makefile             | 3 +--
 examples/qos_sched/Makefile             | 3 +--
 examples/rxtx_callbacks/Makefile        | 3 +--
 examples/service_cores/Makefile         | 3 +--
 examples/skeleton/Makefile              | 3 +--
 examples/tep_termination/Makefile       | 3 +--
 examples/timer/Makefile                 | 3 +--
 examples/vhost/Makefile                 | 3 +--
 examples/vhost_scsi/Makefile            | 3 +--
 examples/vmdq/Makefile                  | 3 +--
 examples/vmdq_dcb/Makefile              | 3 +--
 40 files changed, 40 insertions(+), 80 deletions(-)

diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile
index c149589bc..378b4cb54 100644
--- a/examples/bbdev_app/Makefile
+++ b/examples/bbdev_app/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/bond/Makefile b/examples/bond/Makefile
index 2511b71eb..665fcf6a3 100644
--- a/examples/bond/Makefile
+++ b/examples/bond/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile
index d4180406e..fbe521c39 100644
--- a/examples/cmdline/Makefile
+++ b/examples/cmdline/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c commands.c parse_obj_list.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile
index 02656e326..372446f9c 100644
--- a/examples/distributor/Makefile
+++ b/examples/distributor/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile
index 12e3f262b..cab4d4050 100644
--- a/examples/eventdev_pipeline/Makefile
+++ b/examples/eventdev_pipeline/Makefile
@@ -11,6 +11,5 @@ SRCS-y += pipeline_worker_tx.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile
index 6f52213ed..013ae1cbe 100644
--- a/examples/exception_path/Makefile
+++ b/examples/exception_path/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile
index 2e30ab266..5fb64e4d9 100644
--- a/examples/fips_validation/Makefile
+++ b/examples/fips_validation/Makefile
@@ -16,6 +16,5 @@ SRCS-y += main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile
index 08bf71272..5c0f7fc57 100644
--- a/examples/flow_classify/Makefile
+++ b/examples/flow_classify/Makefile
@@ -9,6 +9,5 @@ SRCS-y := flow_classify.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile
index 619ed53b7..5140f5079 100644
--- a/examples/flow_filtering/Makefile
+++ b/examples/flow_filtering/Makefile
@@ -7,6 +7,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile
index 9cf7c4e7c..970c9ea80 100644
--- a/examples/helloworld/Makefile
+++ b/examples/helloworld/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile
index de9281677..84e66f239 100644
--- a/examples/ip_fragmentation/Makefile
+++ b/examples/ip_fragmentation/Makefile
@@ -10,6 +10,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile
index 1e03befeb..d667af811 100644
--- a/examples/ip_pipeline/Makefile
+++ b/examples/ip_pipeline/Makefile
@@ -22,6 +22,5 @@ SRCS-y += cryptodev.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile
index 8b2a158af..ad7e5feae 100644
--- a/examples/ip_reassembly/Makefile
+++ b/examples/ip_reassembly/Makefile
@@ -10,6 +10,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile
index 9e19c2519..3fd2079df 100644
--- a/examples/ipsec-secgw/Makefile
+++ b/examples/ipsec-secgw/Makefile
@@ -19,6 +19,5 @@ CFLAGS += -gdwarf-2
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile
index f840f1642..83a21feba 100644
--- a/examples/ipv4_multicast/Makefile
+++ b/examples/ipv4_multicast/Makefile
@@ -10,6 +10,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/kni/Makefile b/examples/kni/Makefile
index 3b9bacb7c..6c3e30396 100644
--- a/examples/kni/Makefile
+++ b/examples/kni/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile
index b80f73014..3c39ed6db 100644
--- a/examples/l2fwd-cat/Makefile
+++ b/examples/l2fwd-cat/Makefile
@@ -9,6 +9,5 @@ SRCS-y := l2fwd-cat.c cat.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile
index 5c2fd3c05..21fd8eeae 100644
--- a/examples/l2fwd-crypto/Makefile
+++ b/examples/l2fwd-crypto/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile
index 7fb0a2618..aec35390e 100644
--- a/examples/l2fwd-jobstats/Makefile
+++ b/examples/l2fwd-jobstats/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile
index 65d4a86b7..5c7eb85cd 100644
--- a/examples/l2fwd-keepalive/Makefile
+++ b/examples/l2fwd-keepalive/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c shm.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile
index 43ac7f3c0..42b2234af 100644
--- a/examples/l2fwd/Makefile
+++ b/examples/l2fwd/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile
index 0ebf8cebd..8f01f7550 100644
--- a/examples/l3fwd-acl/Makefile
+++ b/examples/l3fwd-acl/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile
index 1d5f83acd..53aaaca48 100644
--- a/examples/l3fwd-power/Makefile
+++ b/examples/l3fwd-power/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c perf_core.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile
index 5497f941c..c51117768 100644
--- a/examples/l3fwd-vf/Makefile
+++ b/examples/l3fwd-vf/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile
index 2ec75a545..4357ddb79 100644
--- a/examples/l3fwd/Makefile
+++ b/examples/l3fwd/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile
index b45338408..de11a17f0 100644
--- a/examples/link_status_interrupt/Makefile
+++ b/examples/link_status_interrupt/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makefile
index 437315871..9261ce4ef 100644
--- a/examples/load_balancer/Makefile
+++ b/examples/load_balancer/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c config.c init.c runtime.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile
index 626665e4f..27b82b6ea 100644
--- a/examples/packet_ordering/Makefile
+++ b/examples/packet_ordering/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile
index 42db83f57..3eec3dc19 100644
--- a/examples/ptpclient/Makefile
+++ b/examples/ptpclient/Makefile
@@ -9,6 +9,5 @@ SRCS-y := ptpclient.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile
index b27baae6e..95bd1b148 100644
--- a/examples/qos_meter/Makefile
+++ b/examples/qos_meter/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c rte_policer.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile
index c0a287e0c..2cdd5fa3d 100644
--- a/examples/qos_sched/Makefile
+++ b/examples/qos_sched/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c args.c init.c app_thread.c cfg_file.c cmdline.c stats.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile
index 5b09eb279..2873f7995 100644
--- a/examples/rxtx_callbacks/Makefile
+++ b/examples/rxtx_callbacks/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile
index 030681fa4..49e2a5878 100644
--- a/examples/service_cores/Makefile
+++ b/examples/service_cores/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile
index d0fbacec7..f58c8903d 100644
--- a/examples/skeleton/Makefile
+++ b/examples/skeleton/Makefile
@@ -9,6 +9,5 @@ SRCS-y := basicfwd.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile
index 3025ef04d..5f76a97ef 100644
--- a/examples/tep_termination/Makefile
+++ b/examples/tep_termination/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c vxlan_setup.c vxlan.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/timer/Makefile b/examples/timer/Makefile
index 3698a8e38..3e8a14261 100644
--- a/examples/timer/Makefile
+++ b/examples/timer/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile
index b9cce0817..a8a8aba95 100644
--- a/examples/vhost/Makefile
+++ b/examples/vhost/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c virtio_net.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile
index 43d54de9c..69e102de5 100644
--- a/examples/vhost_scsi/Makefile
+++ b/examples/vhost_scsi/Makefile
@@ -9,6 +9,5 @@ SRCS-y := scsi.c vhost_scsi.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile
index 63283a8e4..a9983a184 100644
--- a/examples/vmdq/Makefile
+++ b/examples/vmdq/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile
index c56954d12..5a8934c84 100644
--- a/examples/vmdq_dcb/Makefile
+++ b/examples/vmdq_dcb/Makefile
@@ -9,6 +9,5 @@ SRCS-y := main.c
 
 # Build using pkg-config variables if possible
-$(shell pkg-config --exists libdpdk)
-ifeq ($(.SHELLSTATUS),0)
+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
 
 all: shared
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.853958269 +0100
+++ 0037-examples-fix-pkg-config-detection-with-older-make.patch	2019-08-22 19:38:20.467026164 +0100
@@ -1 +1 @@
-From 4131ad5db79a016970287282b938ebed2f19bdb3 Mon Sep 17 00:00:00 2001
+From d9760a99aeacd67c3400390119cc87b8bb98ce27 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4131ad5db79a016970287282b938ebed2f19bdb3 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -51 +51,0 @@
- examples/vdpa/Makefile                  | 3 +--
@@ -53 +52,0 @@
- examples/vhost_crypto/Makefile          | 3 +--
@@ -57 +56 @@
- 42 files changed, 42 insertions(+), 84 deletions(-)
+ 40 files changed, 40 insertions(+), 80 deletions(-)
@@ -60 +59 @@
-index 2bf97e415..715c521a9 100644
+index c149589bc..378b4cb54 100644
@@ -72 +71 @@
-index 96868f2fc..0229b31bb 100644
+index 2511b71eb..665fcf6a3 100644
@@ -84 +83 @@
-index 9b757316f..c1852080a 100644
+index d4180406e..fbe521c39 100644
@@ -96 +95 @@
-index 6aa5e7a9e..bac8d5578 100644
+index 02656e326..372446f9c 100644
@@ -108 +107 @@
-index 626d56024..205145853 100644
+index 12e3f262b..cab4d4050 100644
@@ -120 +119 @@
-index dc891b3d1..90c7f133a 100644
+index 6f52213ed..013ae1cbe 100644
@@ -132 +131 @@
-index f8cbba592..9485daf7a 100644
+index 2e30ab266..5fb64e4d9 100644
@@ -135 +134 @@
-@@ -18,6 +18,5 @@ SRCS-y += main.c
+@@ -16,6 +16,5 @@ SRCS-y += main.c
@@ -144 +143 @@
-index aca7772b4..4c23e5c6d 100644
+index 08bf71272..5c0f7fc57 100644
@@ -156 +155 @@
-index a64a10a08..a63a75555 100644
+index 619ed53b7..5140f5079 100644
@@ -168 +167 @@
-index 2ab294091..403afa050 100644
+index 9cf7c4e7c..970c9ea80 100644
@@ -180 +179 @@
-index 63b66ce25..6af25a02e 100644
+index de9281677..84e66f239 100644
@@ -192 +191 @@
-index 1553d705d..cf10d7180 100644
+index 1e03befeb..d667af811 100644
@@ -204 +203 @@
-index 5af5d63bd..0b1a904e0 100644
+index 8b2a158af..ad7e5feae 100644
@@ -216 +215 @@
-index 1bfaf3b9a..851123be5 100644
+index 9e19c2519..3fd2079df 100644
@@ -219 +218 @@
-@@ -20,6 +20,5 @@ CFLAGS += -gdwarf-2
+@@ -19,6 +19,5 @@ CFLAGS += -gdwarf-2
@@ -228 +227 @@
-index a03bfadbf..5f8a67dd4 100644
+index f840f1642..83a21feba 100644
@@ -240 +239 @@
-index 46f592692..5dc8118e3 100644
+index 3b9bacb7c..6c3e30396 100644
@@ -252 +251 @@
-index e83d406b0..c1960d6d3 100644
+index b80f73014..3c39ed6db 100644
@@ -264 +263 @@
-index 87d311193..29fd530b4 100644
+index 5c2fd3c05..21fd8eeae 100644
@@ -276 +275 @@
-index d63ece8e3..729a39e93 100644
+index 7fb0a2618..aec35390e 100644
@@ -288 +287 @@
-index 9b92bc238..37de27a6f 100644
+index 65d4a86b7..5c7eb85cd 100644
@@ -300 +299 @@
-index fb352e1b7..230352093 100644
+index 43ac7f3c0..42b2234af 100644
@@ -312 +311 @@
-index d12d3a987..e2c989f71 100644
+index 0ebf8cebd..8f01f7550 100644
@@ -324 +323 @@
-index 359f323dc..98248f462 100644
+index 1d5f83acd..53aaaca48 100644
@@ -336 +335 @@
-index 892ecf38b..7b186a23c 100644
+index 5497f941c..c51117768 100644
@@ -348 +347 @@
-index 52976880a..c55f5c288 100644
+index 2ec75a545..4357ddb79 100644
@@ -360 +359 @@
-index 77774eda7..97e5a14a8 100644
+index b45338408..de11a17f0 100644
@@ -372 +371 @@
-index 09676a57c..caae8a107 100644
+index 437315871..9261ce4ef 100644
@@ -384 +383 @@
-index eb01b2d5b..51acaf7eb 100644
+index 626665e4f..27b82b6ea 100644
@@ -396 +395 @@
-index 019476a7a..89e2bacbd 100644
+index 42db83f57..3eec3dc19 100644
@@ -408 +407 @@
-index e4d170177..e5217cf7c 100644
+index b27baae6e..95bd1b148 100644
@@ -420 +419 @@
-index 0c92c4866..ce2d25371 100644
+index c0a287e0c..2cdd5fa3d 100644
@@ -432 +431 @@
-index 2ababd2e4..edd5b52cd 100644
+index 5b09eb279..2873f7995 100644
@@ -444 +443 @@
-index ae7d6478c..abbb7aed2 100644
+index 030681fa4..49e2a5878 100644
@@ -456 +455 @@
-index 68454a558..c5ac26029 100644
+index d0fbacec7..f58c8903d 100644
@@ -468 +467 @@
-index be5aa9a64..31165bd92 100644
+index 3025ef04d..5f76a97ef 100644
@@ -480 +479 @@
-index d21e4c63c..a86178355 100644
+index 3698a8e38..3e8a14261 100644
@@ -491,12 +489,0 @@
-diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile
-index 734042380..2ac991a4b 100644
---- a/examples/vdpa/Makefile
-+++ b/examples/vdpa/Makefile
-@@ -10,6 +10,5 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
- # Build using pkg-config variables if possible
--$(shell pkg-config --exists libdpdk)
--ifeq ($(.SHELLSTATUS),0)
-+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
- 
- all: shared
@@ -504 +491 @@
-index 5e1400678..f84b7f017 100644
+index b9cce0817..a8a8aba95 100644
@@ -515,12 +501,0 @@
-diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile
-index e7958b5ba..a9e1c4d3a 100644
---- a/examples/vhost_crypto/Makefile
-+++ b/examples/vhost_crypto/Makefile
-@@ -10,6 +10,5 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API
- 
- # Build using pkg-config variables if possible
--$(shell pkg-config --exists libdpdk)
--ifeq ($(.SHELLSTATUS),0)
-+ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
- 
- all: shared
@@ -528 +503 @@
-index 3ea37ebc6..c5aec269e 100644
+index 43d54de9c..69e102de5 100644
@@ -540 +515 @@
-index dc1bc82d0..1557ee86b 100644
+index 63283a8e4..a9983a184 100644
@@ -552 +527 @@
-index a77e78987..391096cfb 100644
+index c56954d12..5a8934c84 100644

[dpdk-stable] patch 'bpf: fix validate for function return value' 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 08/28/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/68d2a7f08c1b355a9295ba22a31f9aeb26da2c83

Thanks.

Kevin Traynor

---
From 68d2a7f08c1b355a9295ba22a31f9aeb26da2c83 Mon Sep 17 00:00:00 2001
From: Konstantin Ananyev <konstantin.ananyev@intel.com>
Date: Wed, 3 Jul 2019 14:40:34 +0100
Subject: [PATCH] bpf: fix validate for function return value

[ upstream commit 4715bb162368cf75c5e8db62f54b5071b70d68f3 ]

eval_call() blindly calls eval_max_bound() for external function
return value for all return types.
That causes wrong estimation for returned pointer min and max boundaries.
So any attempt to dereference that pointer value causes verifier to fail
with error message: "memory boundary violation at pc: ...".
To fix - estimate min/max boundaries based on the return value type.

Bugzilla ID: 298

Fixes: 8021917293d0 ("bpf: add extra validation for input BPF program")

Reported-by: Michel Machado <michel@digirati.com.br>
Suggested-by: Michel Machado <michel@digirati.com.br>
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/librte_bpf/bpf_validate.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librte_bpf/bpf_validate.c b/lib/librte_bpf/bpf_validate.c
index d0e683b5b..0cf41fa27 100644
--- a/lib/librte_bpf/bpf_validate.c
+++ b/lib/librte_bpf/bpf_validate.c
@@ -926,5 +926,4 @@ static const char *
 eval_call(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
 {
-	uint64_t msk;
 	uint32_t i, idx;
 	struct bpf_reg_val *rv;
@@ -959,8 +958,9 @@ eval_call(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
 	rv = bvf->evst->rv + EBPF_REG_0;
 	rv->v = xsym->func.ret;
-	msk = (rv->v.type == RTE_BPF_ARG_RAW) ?
-		RTE_LEN2MASK(rv->v.size * CHAR_BIT, uint64_t) : UINTPTR_MAX;
-	eval_max_bound(rv, msk);
-	rv->mask = msk;
+	if (rv->v.type == RTE_BPF_ARG_RAW)
+		eval_fill_max_bound(rv,
+			RTE_LEN2MASK(rv->v.size * CHAR_BIT, uint64_t));
+	else if (RTE_BPF_ARG_PTR_TYPE(rv->v.type) != 0)
+		eval_fill_imm64(rv, UINTPTR_MAX, 0);
 
 	return err;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.921956273 +0100
+++ 0038-bpf-fix-validate-for-function-return-value.patch	2019-08-22 19:38:20.469026117 +0100
@@ -1 +1 @@
-From 4715bb162368cf75c5e8db62f54b5071b70d68f3 Mon Sep 17 00:00:00 2001
+From 68d2a7f08c1b355a9295ba22a31f9aeb26da2c83 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4715bb162368cf75c5e8db62f54b5071b70d68f3 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'raw/ifpga/base: fix use of untrusted scalar value' 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 08/28/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/1b084f38c075b089888186c65a476ffc7b4d57de

Thanks.

Kevin Traynor

---
From 1b084f38c075b089888186c65a476ffc7b4d57de Mon Sep 17 00:00:00 2001
From: Tianfei Zhang <tianfei.zhang@intel.com>
Date: Fri, 21 Jun 2019 16:40:13 +0800
Subject: [PATCH] raw/ifpga/base: fix use of untrusted scalar value

[ upstream commit 8234347f999daed5ddcbfd659260fed79abb537a ]

Add checking the buffer size and use
const char * for buffer declaration.

Coverity issue: 279449
Fixes: ef1e8ede ("raw/ifpga: add Intel FPGA bus rawdev driver")

Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
Acked-by: Rosen Xu <rosen.xu@intel.com>
---
 drivers/raw/ifpga_rawdev/base/ifpga_api.c     |  4 +--
 drivers/raw/ifpga_rawdev/base/ifpga_api.h     |  2 +-
 .../raw/ifpga_rawdev/base/ifpga_feature_dev.h |  2 +-
 drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c  | 27 +++++++++++--------
 drivers/raw/ifpga_rawdev/base/opae_hw_api.c   |  4 +--
 drivers/raw/ifpga_rawdev/base/opae_hw_api.h   |  4 +--
 drivers/raw/ifpga_rawdev/ifpga_rawdev.c       |  7 ++++-
 7 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.c b/drivers/raw/ifpga_rawdev/base/ifpga_api.c
index 540e171a0..a7ab0f705 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_api.c
+++ b/drivers/raw/ifpga_rawdev/base/ifpga_api.c
@@ -184,5 +184,5 @@ struct opae_bridge_ops ifpga_br_ops = {
 
 /* Manager APIs */
-static int ifpga_mgr_flash(struct opae_manager *mgr, int id, void *buf,
+static int ifpga_mgr_flash(struct opae_manager *mgr, int id, const char *buf,
 			   u32 size, u64 *status)
 {
@@ -231,5 +231,5 @@ struct opae_adapter_ops ifpga_adapter_ops = {
  *   - <0: Error code returned in partial reconfiguration.
  **/
-int ifpga_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,
+int ifpga_pr(struct ifpga_hw *hw, u32 port_id, const char *buffer, u32 size,
 	     u64 *status)
 {
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.h b/drivers/raw/ifpga_rawdev/base/ifpga_api.h
index dae7ca14c..f203f3def 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_api.h
+++ b/drivers/raw/ifpga_rawdev/base/ifpga_api.h
@@ -23,5 +23,5 @@ int ifpga_set_irq(struct ifpga_hw *hw, u32 fiu_id, u32 port_id,
 
 /* FME APIs */
-int ifpga_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,
+int ifpga_pr(struct ifpga_hw *hw, u32 port_id, const char *buffer, u32 size,
 	     u64 *status);
 
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
index 4391f2fdf..a58dbdc70 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
+++ b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h
@@ -122,5 +122,5 @@ static inline int fpga_port_reset(struct ifpga_port_hw *port)
 }
 
-int do_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,
+int do_pr(struct ifpga_hw *hw, u32 port_id, const char *buffer, u32 size,
 	  u64 *status);
 
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
index ec0beeb1a..cc91dff59 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
+++ b/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c
@@ -224,6 +224,6 @@ static int fpga_pr_buf_load(struct ifpga_fme_hw *fme_dev,
 }
 
-static int fme_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,
-		  u64 *status)
+static int fme_pr(struct ifpga_hw *hw, u32 port_id, const char *buffer,
+		u32 size, u64 *status)
 {
 	struct feature_fme_header *fme_hdr;
@@ -270,5 +270,5 @@ static int fme_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,
 	fpga_port_disable(port);
 
-	ret = fpga_pr_buf_load(fme, &info, (void *)buffer, size);
+	ret = fpga_pr_buf_load(fme, &info, buffer, size);
 
 	*status = info.pr_err;
@@ -281,10 +281,12 @@ static int fme_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,
 }
 
-int do_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size, u64 *status)
+int do_pr(struct ifpga_hw *hw, u32 port_id, const char *buffer,
+		u32 size, u64 *status)
 {
-	struct bts_header *bts_hdr;
-	void *buf;
+	const struct bts_header *bts_hdr;
+	const char *buf;
 	struct ifpga_port_hw *port;
 	int ret;
+	u32 header_size;
 
 	if (!buffer || size == 0) {
@@ -293,13 +295,16 @@ int do_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size, u64 *status)
 	}
 
-	bts_hdr = (struct bts_header *)buffer;
+	bts_hdr = (const struct bts_header *)buffer;
 
 	if (is_valid_bts(bts_hdr)) {
 		dev_info(hw, "this is a valid bitsteam..\n");
-		size -= (sizeof(struct bts_header) +
-				     bts_hdr->metadata_len);
-		buf = (u8 *)buffer + sizeof(struct bts_header) +
-			       bts_hdr->metadata_len;
+		header_size = sizeof(struct bts_header) +
+			bts_hdr->metadata_len;
+		if (size < header_size)
+			return -EINVAL;
+		size -= header_size;
+		buf = buffer + header_size;
 	} else {
+		dev_err(hw, "this is an invalid bitstream..\n");
 		return -EINVAL;
 	}
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c b/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
index 1541b6798..ff0ed8c31 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
+++ b/drivers/raw/ifpga_rawdev/base/opae_hw_api.c
@@ -242,6 +242,6 @@ opae_manager_alloc(const char *name, struct opae_manager_ops *ops, void *data)
  * Return: 0 on success, otherwise error code.
  */
-int opae_manager_flash(struct opae_manager *mgr, int id, void *buf, u32 size,
-		       u64 *status)
+int opae_manager_flash(struct opae_manager *mgr, int id, const char *buf,
+		u32 size, u64 *status)
 {
 	if (!mgr)
diff --git a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h b/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
index 332e0f3f6..2a2121c08 100644
--- a/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
+++ b/drivers/raw/ifpga_rawdev/base/opae_hw_api.h
@@ -41,5 +41,5 @@ struct opae_manager {
 /* FIXME: add more management ops, e.g power/thermal and etc */
 struct opae_manager_ops {
-	int (*flash)(struct opae_manager *mgr, int id, void *buffer,
+	int (*flash)(struct opae_manager *mgr, int id, const char *buffer,
 		     u32 size, u64 *status);
 };
@@ -49,5 +49,5 @@ struct opae_manager *
 opae_manager_alloc(const char *name, struct opae_manager_ops *ops, void *data);
 #define opae_manager_free(mgr) opae_free(mgr)
-int opae_manager_flash(struct opae_manager *mgr, int acc_id, void *buf,
+int opae_manager_flash(struct opae_manager *mgr, int acc_id, const char *buf,
 		       u32 size, u64 *status);
 
diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
index eff001b59..941616466 100644
--- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
+++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c
@@ -178,5 +178,5 @@ ifpga_rawdev_reset(struct rte_rawdev *dev)
 
 static int
-fpga_pr(struct rte_rawdev *raw_dev, u32 port_id, u64 *buffer, u32 size,
+fpga_pr(struct rte_rawdev *raw_dev, u32 port_id, const char *buffer, u32 size,
 			u64 *status)
 {
@@ -249,4 +249,9 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
 	}
 	buffer_size = file_stat.st_size;
+	if (buffer_size <= 0) {
+		ret = -EINVAL;
+		goto close_fd;
+	}
+
 	IFPGA_RAWDEV_PMD_INFO("bitstream file size: %zu\n", buffer_size);
 	buffer = rte_malloc(NULL, buffer_size, 0);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.983366250 +0100
+++ 0039-raw-ifpga-base-fix-use-of-untrusted-scalar-value.patch	2019-08-22 19:38:20.472026045 +0100
@@ -1 +1 @@
-From 8234347f999daed5ddcbfd659260fed79abb537a Mon Sep 17 00:00:00 2001
+From 1b084f38c075b089888186c65a476ffc7b4d57de Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8234347f999daed5ddcbfd659260fed79abb537a ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 3ddbcdc2a..53d101daf 100644
+index 540e171a0..a7ab0f705 100644
@@ -29 +30 @@
-@@ -183,5 +183,5 @@ struct opae_bridge_ops ifpga_br_ops = {
+@@ -184,5 +184,5 @@ struct opae_bridge_ops ifpga_br_ops = {
@@ -36 +37 @@
-@@ -325,5 +325,5 @@ struct opae_adapter_ops ifpga_adapter_ops = {
+@@ -231,5 +231,5 @@ struct opae_adapter_ops ifpga_adapter_ops = {
@@ -44 +45 @@
-index 4a247698c..051ab8276 100644
+index dae7ca14c..f203f3def 100644
@@ -47 +48 @@
-@@ -24,5 +24,5 @@ int ifpga_set_irq(struct ifpga_hw *hw, u32 fiu_id, u32 port_id,
+@@ -23,5 +23,5 @@ int ifpga_set_irq(struct ifpga_hw *hw, u32 fiu_id, u32 port_id,
@@ -55 +56 @@
-index bb9fcc289..e243d4273 100644
+index 4391f2fdf..a58dbdc70 100644
@@ -58 +59 @@
-@@ -150,5 +150,5 @@ static inline int fpga_port_reset(struct ifpga_port_hw *port)
+@@ -122,5 +122,5 @@ static inline int fpga_port_reset(struct ifpga_port_hw *port)
@@ -66 +67 @@
-index efa72660f..9997942d2 100644
+index ec0beeb1a..cc91dff59 100644
@@ -124 +125 @@
-index 0e117d05e..8964e7984 100644
+index 1541b6798..ff0ed8c31 100644
@@ -127 +128 @@
-@@ -245,6 +245,6 @@ opae_manager_alloc(const char *name, struct opae_manager_ops *ops,
+@@ -242,6 +242,6 @@ opae_manager_alloc(const char *name, struct opae_manager_ops *ops, void *data)
@@ -137 +138 @@
-index 383e751cb..63405a471 100644
+index 332e0f3f6..2a2121c08 100644
@@ -140 +141 @@
-@@ -45,5 +45,5 @@ struct opae_manager {
+@@ -41,5 +41,5 @@ struct opae_manager {
@@ -146,3 +147,3 @@
- 	int (*get_eth_group_region_info)(struct opae_manager *mgr,
-@@ -75,5 +75,5 @@ opae_manager_alloc(const char *name, struct opae_manager_ops *ops,
- 		struct opae_manager_networking_ops *network_ops, void *data);
+ };
+@@ -49,5 +49,5 @@ struct opae_manager *
+ opae_manager_alloc(const char *name, struct opae_manager_ops *ops, void *data);
@@ -153 +154 @@
- int opae_manager_get_eth_group_region_info(struct opae_manager *mgr,
+ 
@@ -155 +156 @@
-index 41be1a205..01aa917de 100644
+index eff001b59..941616466 100644
@@ -158 +159 @@
-@@ -226,5 +226,5 @@ ifpga_rawdev_reset(struct rte_rawdev *dev)
+@@ -178,5 +178,5 @@ ifpga_rawdev_reset(struct rte_rawdev *dev)
@@ -165 +166 @@
-@@ -297,4 +297,9 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,
+@@ -249,4 +249,9 @@ rte_fpga_do_pr(struct rte_rawdev *rawdev, int port_id,

[dpdk-stable] patch 'raw/ifpga/base: fix physical address info' 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 08/28/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/dd8df88ad08be5c5ff85204cfd04aa6480ce7f17

Thanks.

Kevin Traynor

---
From dd8df88ad08be5c5ff85204cfd04aa6480ce7f17 Mon Sep 17 00:00:00 2001
From: Tianfei Zhang <tianfei.zhang@intel.com>
Date: Fri, 21 Jun 2019 16:40:16 +0800
Subject: [PATCH] raw/ifpga/base: fix physical address info

[ upstream commit 4507a3d1f88fa2b554ee6f5bd7a3d589b9e4c2a0 ]

Fix miss phy_addr on ifpga_acc_get_region_info() function.

Fixes: 56bb54ea1bd ("raw/ifpga/base: add Intel FPGA OPAE share code")

Signed-off-by: Tianfei Zhang <tianfei.zhang@intel.com>
Acked-by: Rosen Xu <rosen.xu@intel.com>
---
 drivers/raw/ifpga_rawdev/base/ifpga_api.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_api.c b/drivers/raw/ifpga_rawdev/base/ifpga_api.c
index a7ab0f705..55bcb6833 100644
--- a/drivers/raw/ifpga_rawdev/base/ifpga_api.c
+++ b/drivers/raw/ifpga_rawdev/base/ifpga_api.c
@@ -77,4 +77,5 @@ static int ifpga_acc_get_region_info(struct opae_accelerator *acc,
 	info->len = afu_info->region[info->index].len;
 	info->addr = afu_info->region[info->index].addr;
+	info->phys_addr = afu_info->region[info->index].phys_addr;
 
 	return 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.046412552 +0100
+++ 0040-raw-ifpga-base-fix-physical-address-info.patch	2019-08-22 19:38:20.473026021 +0100
@@ -1 +1 @@
-From 4507a3d1f88fa2b554ee6f5bd7a3d589b9e4c2a0 Mon Sep 17 00:00:00 2001
+From dd8df88ad08be5c5ff85204cfd04aa6480ce7f17 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4507a3d1f88fa2b554ee6f5bd7a3d589b9e4c2a0 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 53d101daf..7ae626d64 100644
+index a7ab0f705..55bcb6833 100644

[dpdk-stable] patch 'usertools: fix refresh binding infos' 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 08/28/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/b2826333d2631e1840a3465fb242efc3382c5dd9

Thanks.

Kevin Traynor

---
From b2826333d2631e1840a3465fb242efc3382c5dd9 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli@redhat.com>
Date: Fri, 31 May 2019 13:11:26 +0200
Subject: [PATCH] usertools: fix refresh binding infos

[ upstream commit 93b93beb123d96e5acbbb24491c491bec47da60d ]

Currently clear_data (dpdk-devbind.py) doesn't work as expected
since "global devices" is missing and so "devices" is considered
a local variable.

This commit changes "clear_data" function in order to really clear
devices by adding "global devices".

Fixes: ea9f00f7289a ("usertools: refactor NIC and crypto binding details")

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Acked-by: Luca Boccassi <bluca@debian.org>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 usertools/dpdk-devbind.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index a9cd66a78..1c9c0187d 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -204,4 +204,5 @@ def get_pci_device_details(dev_id, probe_lspci):
 def clear_data():
     '''This function clears any old data'''
+    global devices
     devices = {}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.107944402 +0100
+++ 0041-usertools-fix-refresh-binding-infos.patch	2019-08-22 19:38:20.474025998 +0100
@@ -1 +1 @@
-From 93b93beb123d96e5acbbb24491c491bec47da60d Mon Sep 17 00:00:00 2001
+From b2826333d2631e1840a3465fb242efc3382c5dd9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 93b93beb123d96e5acbbb24491c491bec47da60d ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 5c1cd3548..4791e5f48 100755
+index a9cd66a78..1c9c0187d 100755
@@ -27 +28 @@
-@@ -217,4 +217,5 @@ def get_pci_device_details(dev_id, probe_lspci):
+@@ -204,4 +204,5 @@ def get_pci_device_details(dev_id, probe_lspci):

[dpdk-stable] patch 'doc: add a note for multi-process in mempool 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 08/28/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/44eddd06f4c240f27722e2d31c8d51f488088b1c

Thanks.

Kevin Traynor

---
From 44eddd06f4c240f27722e2d31c8d51f488088b1c Mon Sep 17 00:00:00 2001
From: Gage Eads <gage.eads@intel.com>
Date: Thu, 20 Jun 2019 17:07:35 -0500
Subject: [PATCH] doc: add a note for multi-process in mempool guide

[ upstream commit 4ae9f32eccef0e12ec7282889fc2a2e444b8ec4d ]

The mempool library assigns handler ops indexes based on the dynamic load
order of mempool handlers. Indexes are used so a mempool can be used by
multiple processes, but this only works if all processes agree on the
mapping from index to mempool handler.

When using the '-d' argument, it's possible for different processes to load
mempool handlers in different orders, and thus have different
index->handler mappings. Using a mempool in multiple of such processes will
result in undefined behavior.

This commit adds a note to the mempool library programmer's guide warning
users against this.

Fixes: 449c49b93a6b ("mempool: support handler operations")

Signed-off-by: Gage Eads <gage.eads@intel.com>
Acked-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 doc/guides/prog_guide/mempool_lib.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/guides/prog_guide/mempool_lib.rst b/doc/guides/prog_guide/mempool_lib.rst
index 52a569f57..3bb84b0a6 100644
--- a/doc/guides/prog_guide/mempool_lib.rst
+++ b/doc/guides/prog_guide/mempool_lib.rst
@@ -134,4 +134,12 @@ For applications that use ``rte_pktmbuf_create()``, there is a config setting
 an alternative mempool handler.
 
+  .. note::
+
+    When running a DPDK application with shared libraries, mempool handler
+    shared objects specified with the '-d' EAL command-line parameter are
+    dynamically loaded. When running a multi-process application with shared
+    libraries, the -d arguments for mempool handlers *must be specified in the
+    same order for all processes* to ensure correct operation.
+
 
 Use Cases
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.168129454 +0100
+++ 0042-doc-add-a-note-for-multi-process-in-mempool-guide.patch	2019-08-22 19:38:20.474025998 +0100
@@ -1 +1 @@
-From 4ae9f32eccef0e12ec7282889fc2a2e444b8ec4d Mon Sep 17 00:00:00 2001
+From 44eddd06f4c240f27722e2d31c8d51f488088b1c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4ae9f32eccef0e12ec7282889fc2a2e444b8ec4d ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'table: fix crash in LPM IPv6' 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 08/28/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/60c0d21f4123a3e9ff1c17de499fb7be3e8f83c5

Thanks.

Kevin Traynor

---
From 60c0d21f4123a3e9ff1c17de499fb7be3e8f83c5 Mon Sep 17 00:00:00 2001
From: Jananee Parthasarathy <jananeex.m.parthasarathy@intel.com>
Date: Tue, 2 Jul 2019 12:21:34 +0100
Subject: [PATCH] table: fix crash in LPM IPv6

[ upstream commit 984d9e522fa0522c2cd15863c9790195a630b0b9 ]

Unit test table_autotest results in segmentation fault.
Crash occurs in test_table_lpm_ipv6_combined().

Variable 'nht_pos0' used as array subscript is not initialized
in rte_table_lpm_ipv6_entry_add(). It will not be assigned,
if a rule does not exist.

In such case a junk number or invalid array index might result in
segmentation fault due to array out of bounds when
lpm->nht_users is used with such invalid array index.

Fix is to initialize the variables used for array subscript.

Bugzilla ID: 285
Fixes: d89a5bce1d ("lpm6: extend next hop field")

Signed-off-by: Jananee Parthasarathy <jananeex.m.parthasarathy@intel.com>
Tested-by: David Marchand <david.marchand@redhat.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 lib/librte_table/rte_table_lpm_ipv6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/librte_table/rte_table_lpm_ipv6.c
index a55f808a4..4e068d79b 100644
--- a/lib/librte_table/rte_table_lpm_ipv6.c
+++ b/lib/librte_table/rte_table_lpm_ipv6.c
@@ -183,5 +183,5 @@ rte_table_lpm_ipv6_entry_add(
 	struct rte_table_lpm_ipv6_key *ip_prefix =
 		key;
-	uint32_t nht_pos, nht_pos0, nht_pos0_valid;
+	uint32_t nht_pos = 0, nht_pos0 = 0, nht_pos0_valid = 0;
 	int status;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.229472688 +0100
+++ 0043-table-fix-crash-in-LPM-IPv6.patch	2019-08-22 19:38:20.475025974 +0100
@@ -1 +1 @@
-From 984d9e522fa0522c2cd15863c9790195a630b0b9 Mon Sep 17 00:00:00 2001
+From 60c0d21f4123a3e9ff1c17de499fb7be3e8f83c5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 984d9e522fa0522c2cd15863c9790195a630b0b9 ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'test: fix autotest crash' 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 08/28/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/08385dc344141eccac5ebea8a8782a373109774a

Thanks.

Kevin Traynor

---
From 08385dc344141eccac5ebea8a8782a373109774a Mon Sep 17 00:00:00 2001
From: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Date: Wed, 12 Jun 2019 15:46:47 +0100
Subject: [PATCH] test: fix autotest crash

[ upstream commit c6ad35c468451466720009b374c9b19c43b9f7ae ]

On some systems when dpdk test is executed with make test command
autotest_runner crashes in first_cpu_on_node. This happens when list
of available cpus contains something that is not a cpu as first element.
Fixed by removing all non-cpu values from list of available cpus.

Bugzilla ID: 253
Fixes: 22dcd9a4d90f ("test: parallelize unit tests")

Signed-off-by: Herakliusz Lipiec <herakliusz.lipiec@intel.com>
Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 test/test/autotest_runner.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/test/autotest_runner.py b/test/test/autotest_runner.py
index 36941a40a..8e7a45678 100644
--- a/test/test/autotest_runner.py
+++ b/test/test/autotest_runner.py
@@ -44,7 +44,14 @@ def get_numa_nodes():
 # processes around NUMA nodes to avoid exhausting memory on particular node
 def first_cpu_on_node(node_nr):
-    cpu_path = glob.glob("/sys/devices/system/node/node%d/cpu*" % node_nr)[0]
-    cpu_name = os.path.basename(cpu_path)
-    m = re.match(r"cpu(\d+)", cpu_name)
+    cpu_path = glob.glob("/sys/devices/system/node/node%d/cpu*" % node_nr)
+    r = re.compile(r"cpu(\d+)")
+    cpu_name = filter(None,
+            map(r.match,
+                map(os.path.basename, cpu_path)
+            )
+    )
+    # for compatibility between python 3 and 2 we need to make interable out
+    # of filter return as it returns list in python 2 and a generator in 3
+    m = next(iter(cpu_name))
     return int(m.group(1))
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.291675928 +0100
+++ 0044-test-fix-autotest-crash.patch	2019-08-22 19:38:20.476025950 +0100
@@ -1 +1 @@
-From c6ad35c468451466720009b374c9b19c43b9f7ae Mon Sep 17 00:00:00 2001
+From 08385dc344141eccac5ebea8a8782a373109774a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c6ad35c468451466720009b374c9b19c43b9f7ae ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- app/test/autotest_runner.py | 13 ++++++++++---
+ test/test/autotest_runner.py | 13 ++++++++++---
@@ -21,4 +22,4 @@
-diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py
-index b72716e1e..95e74c760 100644
---- a/app/test/autotest_runner.py
-+++ b/app/test/autotest_runner.py
+diff --git a/test/test/autotest_runner.py b/test/test/autotest_runner.py
+index 36941a40a..8e7a45678 100644
+--- a/test/test/autotest_runner.py
++++ b/test/test/autotest_runner.py

[dpdk-stable] patch 'telemetry: fix 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 08/28/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/7d4a8db6489eaa3a5bdff728fa6254b7729ded0f

Thanks.

Kevin Traynor

---
From 7d4a8db6489eaa3a5bdff728fa6254b7729ded0f Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Thu, 22 Aug 2019 16:07:50 +0100
Subject: [PATCH] telemetry: fix build

[ upstream commit 500e70b90c05c267d53963c757c3b1f66908b2fa ]

Build error:
../lib/librte_telemetry/rte_telemetry.c:558:28:
error: comparison of unsigned expression < 0 is always false
[-Werror,-Wtautological-compare]

Build error not observed in default make build because telemetry library
disabled by default but easier to reproduce via meson.

Fixing by converting unsigned variables to signed.

Fixes: 0fe3a37924d4 ("telemetry: format json response when sending stats")
Fixes: 4080e46c8078 ("telemetry: support global metrics")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Kevin Laatz <kevin.laatz@intel.com>
---
 lib/librte_telemetry/rte_telemetry.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c
index 7fb247eaa..eceb7e116 100644
--- a/lib/librte_telemetry/rte_telemetry.c
+++ b/lib/librte_telemetry/rte_telemetry.c
@@ -319,5 +319,5 @@ static int32_t
 rte_telemetry_json_format_port(struct telemetry_impl *telemetry,
 	uint32_t port_id, json_t *ports, uint32_t *metric_ids,
-	uint32_t num_metric_ids)
+	int num_metric_ids)
 {
 	struct rte_metric_value *metrics = 0;
@@ -325,5 +325,5 @@ rte_telemetry_json_format_port(struct telemetry_impl *telemetry,
 	int num_metrics, ret, err_ret;
 	json_t *port, *stats;
-	uint32_t i;
+	int i;
 
 	num_metrics = rte_metrics_get_names(NULL, 0);
@@ -450,10 +450,10 @@ einval_fail:
 static int32_t
 rte_telemetry_encode_json_format(struct telemetry_impl *telemetry,
-	uint32_t *port_ids, uint32_t num_port_ids, uint32_t *metric_ids,
-	uint32_t num_metric_ids, char **json_buffer)
+	uint32_t *port_ids, int num_port_ids, uint32_t *metric_ids,
+	int num_metric_ids, char **json_buffer)
 {
 	int ret;
 	json_t *root, *ports;
-	uint32_t i;
+	int i;
 
 	if (num_port_ids <= 0 || num_metric_ids <= 0) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.355327300 +0100
+++ 0045-telemetry-fix-build.patch	2019-08-22 19:38:20.477025926 +0100
@@ -1 +1 @@
-From 500e70b90c05c267d53963c757c3b1f66908b2fa Mon Sep 17 00:00:00 2001
+From 7d4a8db6489eaa3a5bdff728fa6254b7729ded0f Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Thu, 27 Jun 2019 20:51:44 +0100
+Date: Thu, 22 Aug 2019 16:07:50 +0100
@@ -5,0 +6,2 @@
+[ upstream commit 500e70b90c05c267d53963c757c3b1f66908b2fa ]
+
@@ -8,2 +10,2 @@
-  error: comparison of unsigned expression < 0 is always false
-  [-Werror,-Wtautological-compare]
+error: comparison of unsigned expression < 0 is always false
+[-Werror,-Wtautological-compare]
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -23,3 +24,2 @@
- lib/librte_telemetry/rte_telemetry.c          | 12 ++++++------
- lib/librte_telemetry/rte_telemetry_internal.h |  6 +++---
- 2 files changed, 9 insertions(+), 9 deletions(-)
+ lib/librte_telemetry/rte_telemetry.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
@@ -28 +28 @@
-index a4b82c97f..949c63612 100644
+index 7fb247eaa..eceb7e116 100644
@@ -45 +45,8 @@
-@@ -454,8 +454,8 @@ rte_telemetry_encode_json_format(struct telemetry_impl *telemetry,
+@@ -450,10 +450,10 @@ einval_fail:
+ static int32_t
+ rte_telemetry_encode_json_format(struct telemetry_impl *telemetry,
+-	uint32_t *port_ids, uint32_t num_port_ids, uint32_t *metric_ids,
+-	uint32_t num_metric_ids, char **json_buffer)
++	uint32_t *port_ids, int num_port_ids, uint32_t *metric_ids,
++	int num_metric_ids, char **json_buffer)
+ {
@@ -50,12 +56,0 @@
- 	uint32_t port_id;
--	uint32_t num_port_ids;
--	uint32_t num_metric_ids;
-+	int num_port_ids;
-+	int num_metric_ids;
- 
- 	ports = json_array();
-@@ -590,5 +590,5 @@ rte_telemetry_send_ports_stats_values(struct telemetry_encode_param *ep,
- 	char *json_buffer = NULL;
- 	uint32_t port_id;
--	unsigned int i;
-+	int i;
@@ -63,20 +58 @@
- 	if (telemetry == NULL) {
-diff --git a/lib/librte_telemetry/rte_telemetry_internal.h b/lib/librte_telemetry/rte_telemetry_internal.h
-index 6a91d0c44..ce1ee8865 100644
---- a/lib/librte_telemetry/rte_telemetry_internal.h
-+++ b/lib/librte_telemetry/rte_telemetry_internal.h
-@@ -61,11 +61,11 @@ struct telemetry_encode_param {
- 	union {
- 		struct port_param {
--			uint32_t num_metric_ids;
-+			int num_metric_ids;
- 			uint32_t metric_ids[MAX_METRICS];
--			uint32_t num_port_ids;
-+			int num_port_ids;
- 			uint32_t port_ids[RTE_MAX_ETHPORTS];
- 		} pp;
- 		struct global_param {
--			uint32_t num_metric_ids;
-+			int num_metric_ids;
- 			uint32_t metric_ids[MAX_METRICS];
- 		} gp;
+ 	if (num_port_ids <= 0 || num_metric_ids <= 0) {

[dpdk-stable] patch 'app/testpmd: fix offloads config' 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 08/28/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/df34973221d9e24d74b5381e540e95561ae69458

Thanks.

Kevin Traynor

---
From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Thu, 9 May 2019 15:20:47 +0800
Subject: [PATCH] app/testpmd: fix offloads config

[ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]
[ upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]

This is a squashed commit of the above upstream master commits.

5e91aeef218c was previously applied to stable as:
c14f54bd7fea ("app/testpmd: fix offload flags after port config")
but had to be reverted in:
4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port config"")
as it caused a regression.

Now that 575e0fd1a0b3 is available in upstream master to fix that
regression, squashing those two commits and applying to stable.

Original upstream master commit messages:

commit 5e91aeef218c452c370aacf74265c7a42b67dffa
Author: Wei Zhao <wei.zhao1@intel.com>
Date:   Thu May 9 15:20:47 2019 +0800

    app/testpmd: fix offload flags after port config

    There is an error in function rxtx_port_config(), which may overwrite
    offloads configuration get from function launch_args_parse() when run
    testpmd app. So rxtx_port_config() should do "or" for port offloads.

    Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
    Cc: stable@dpdk.org

    Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
    Tested-by: Peng Yuan <yuan.peng@intel.com>

commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
Author: Wei Zhao <wei.zhao1@intel.com>
Date:   Mon Jun 10 14:45:10 2019 +0800

    app/testpmd: fix offloads config

    There is no need to use default offloads configuration
    if offloads configuration has been pass down from upper layer.
    The default offloads are overwritten if not zero.

    Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
    Cc: stable@dpdk.org

    Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
    Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
Cc: Jingjing Wu <jingjing.wu@intel.com>
Cc: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/testpmd.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b4215c75d..41283b481 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2736,7 +2736,11 @@ rxtx_port_config(struct rte_port *port)
 {
 	uint16_t qid;
+	uint64_t offloads;
 
 	for (qid = 0; qid < nb_rxq; qid++) {
+		offloads = port->rx_conf[qid].offloads;
 		port->rx_conf[qid] = port->dev_info.default_rxconf;
+		if (offloads != 0)
+			port->rx_conf[qid].offloads = offloads;
 
 		/* Check if any Rx parameters have been passed */
@@ -2760,5 +2764,8 @@ rxtx_port_config(struct rte_port *port)
 
 	for (qid = 0; qid < nb_txq; qid++) {
+		offloads = port->tx_conf[qid].offloads;
 		port->tx_conf[qid] = port->dev_info.default_txconf;
+		if (offloads != 0)
+			port->tx_conf[qid].offloads = offloads;
 
 		/* Check if any Tx parameters have been passed */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.416326314 +0100
+++ 0046-app-testpmd-fix-offloads-config.patch	2019-08-22 19:38:20.480025854 +0100
@@ -1 +1 @@
-From 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 Mon Sep 17 00:00:00 2001
+From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Mon, 10 Jun 2019 14:45:10 +0800
+Date: Thu, 9 May 2019 15:20:47 +0800
@@ -6,3 +6,2 @@
-There is no need to use default offloads configuration
-if offloads configuration has been pass down from upper layer.
-The default offloads are overwritten if not zero.
+[ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]
+[ upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]
@@ -10,2 +9 @@
-Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
-Cc: stable@dpdk.org
+This is a squashed commit of the above upstream master commits.
@@ -13,2 +11,46 @@
-Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
-Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
+5e91aeef218c was previously applied to stable as:
+c14f54bd7fea ("app/testpmd: fix offload flags after port config")
+but had to be reverted in:
+4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port config"")
+as it caused a regression.
+
+Now that 575e0fd1a0b3 is available in upstream master to fix that
+regression, squashing those two commits and applying to stable.
+
+Original upstream master commit messages:
+
+commit 5e91aeef218c452c370aacf74265c7a42b67dffa
+Author: Wei Zhao <wei.zhao1@intel.com>
+Date:   Thu May 9 15:20:47 2019 +0800
+
+    app/testpmd: fix offload flags after port config
+
+    There is an error in function rxtx_port_config(), which may overwrite
+    offloads configuration get from function launch_args_parse() when run
+    testpmd app. So rxtx_port_config() should do "or" for port offloads.
+
+    Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
+    Cc: stable@dpdk.org
+
+    Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
+    Tested-by: Peng Yuan <yuan.peng@intel.com>
+
+commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
+Author: Wei Zhao <wei.zhao1@intel.com>
+Date:   Mon Jun 10 14:45:10 2019 +0800
+
+    app/testpmd: fix offloads config
+
+    There is no need to use default offloads configuration
+    if offloads configuration has been pass down from upper layer.
+    The default offloads are overwritten if not zero.
+
+    Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
+    Cc: stable@dpdk.org
+
+    Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
+    Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
+
+Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
+Cc: Jingjing Wu <jingjing.wu@intel.com>
+Cc: Bernard Iremonger <bernard.iremonger@intel.com>
@@ -16,2 +58,2 @@
- app/test-pmd/testpmd.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ app/test-pmd/testpmd.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
@@ -20 +62 @@
-index c578f75e7..3ed3523b7 100644
+index b4215c75d..41283b481 100644
@@ -23,2 +65,7 @@
-@@ -2825,5 +2825,6 @@ rxtx_port_config(struct rte_port *port)
- 		offloads = port->rx_conf[qid].offloads;
+@@ -2736,7 +2736,11 @@ rxtx_port_config(struct rte_port *port)
+ {
+ 	uint16_t qid;
++	uint64_t offloads;
+ 
+ 	for (qid = 0; qid < nb_rxq; qid++) {
++		offloads = port->rx_conf[qid].offloads;
@@ -26 +72,0 @@
--		port->rx_conf[qid].offloads |= offloads;
@@ -31,2 +77,4 @@
-@@ -2849,5 +2850,6 @@ rxtx_port_config(struct rte_port *port)
- 		offloads = port->tx_conf[qid].offloads;
+@@ -2760,5 +2764,8 @@ rxtx_port_config(struct rte_port *port)
+ 
+ 	for (qid = 0; qid < nb_txq; qid++) {
++		offloads = port->tx_conf[qid].offloads;
@@ -34 +81,0 @@
--		port->tx_conf[qid].offloads |= offloads;

Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been queued to LTS release 18.11.3

[Kevin Traynor]

On 23/08/2019 10:43, Kevin Traynor wrote:
> 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 08/28/19. So please
> shout if anyone has objections.
> 

Hi, the first of these 2 squashed patches in isolation caused a
regression found by Intel validation team which required a lot of
investigation and it being reverted at the last moment before 18.11.2.

In this case I would like an Ack from Zhao and one of the testpmd
maintainers that they will support this before applying the patch below.

thanks,
Kevin.

> 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/df34973221d9e24d74b5381e540e95561ae69458
> 
> Thanks.
> 
> Kevin Traynor
> 
> ---
> From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17 00:00:00 2001
> From: Wei Zhao <wei.zhao1@intel.com>
> Date: Thu, 9 May 2019 15:20:47 +0800
> Subject: [PATCH] app/testpmd: fix offloads config
> 
> [ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]
> [ upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]
> 
> This is a squashed commit of the above upstream master commits.
> 
> 5e91aeef218c was previously applied to stable as:
> c14f54bd7fea ("app/testpmd: fix offload flags after port config")
> but had to be reverted in:
> 4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port config"")
> as it caused a regression.
> 
> Now that 575e0fd1a0b3 is available in upstream master to fix that
> regression, squashing those two commits and applying to stable.
> 
> Original upstream master commit messages:
> 
> commit 5e91aeef218c452c370aacf74265c7a42b67dffa
> Author: Wei Zhao <wei.zhao1@intel.com>
> Date:   Thu May 9 15:20:47 2019 +0800
> 
>     app/testpmd: fix offload flags after port config
> 
>     There is an error in function rxtx_port_config(), which may overwrite
>     offloads configuration get from function launch_args_parse() when run
>     testpmd app. So rxtx_port_config() should do "or" for port offloads.
> 
>     Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
>     Cc: stable@dpdk.org
> 
>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
>     Tested-by: Peng Yuan <yuan.peng@intel.com>
> 
> commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
> Author: Wei Zhao <wei.zhao1@intel.com>
> Date:   Mon Jun 10 14:45:10 2019 +0800
> 
>     app/testpmd: fix offloads config
> 
>     There is no need to use default offloads configuration
>     if offloads configuration has been pass down from upper layer.
>     The default offloads are overwritten if not zero.
> 
>     Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
>     Cc: stable@dpdk.org
> 
>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
>     Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
> 
> Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
> Cc: Jingjing Wu <jingjing.wu@intel.com>
> Cc: Bernard Iremonger <bernard.iremonger@intel.com>
> ---
>  app/test-pmd/testpmd.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
> index b4215c75d..41283b481 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -2736,7 +2736,11 @@ rxtx_port_config(struct rte_port *port)
>  {
>  	uint16_t qid;
> +	uint64_t offloads;
>  
>  	for (qid = 0; qid < nb_rxq; qid++) {
> +		offloads = port->rx_conf[qid].offloads;
>  		port->rx_conf[qid] = port->dev_info.default_rxconf;
> +		if (offloads != 0)
> +			port->rx_conf[qid].offloads = offloads;
>  
>  		/* Check if any Rx parameters have been passed */
> @@ -2760,5 +2764,8 @@ rxtx_port_config(struct rte_port *port)
>  
>  	for (qid = 0; qid < nb_txq; qid++) {
> +		offloads = port->tx_conf[qid].offloads;
>  		port->tx_conf[qid] = port->dev_info.default_txconf;
> +		if (offloads != 0)
> +			port->tx_conf[qid].offloads = offloads;
>  
>  		/* Check if any Tx parameters have been passed */
> 

Re: [dpdk-stable] patch 'kernel/linux: fix modules install path' has been queued to LTS release 18.11.3

[Igor Ryzhov]

Rebased version looks fine.

Best regards,
Igor
On 23 Aug 2019, 12:44 +0300, Kevin Traynor <ktraynor@redhat.com>, wrote:
> 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 08/28/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/15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9
>
> Thanks.
>
> Kevin Traynor
>
> ---
> From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001
> From: Igor Ryzhov <iryzhov@nfware.com>
> Date: Tue, 11 Jun 2019 11:49:34 +0300
> Subject: [PATCH] kernel/linux: fix modules install path
>
> [ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ]
>
> Currently kernel modules are installed into /usr/src instead of
> /lib/modules when meson build system is used. This patch fixes that.
>
> Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> kernel/linux/igb_uio/meson.build | 4 ++--
> kernel/linux/kni/meson.build | 4 ++--
> kernel/linux/meson.build | 4 ++--
> meson_options.txt | 2 +-
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build
> index f5a9d5ccf..fac404f07 100644
> --- a/kernel/linux/igb_uio/meson.build
> +++ b/kernel/linux/igb_uio/meson.build
> @@ -9,5 +9,5 @@ custom_target('igb_uio',
> input: ['igb_uio.c', 'Kbuild'],
> output: 'igb_uio.ko',
> - command: ['make', '-C', kernel_dir,
> + command: ['make', '-C', kernel_dir + '/build',
> 'M=' + meson.current_build_dir(),
> 'src=' + meson.current_source_dir(),
> @@ -17,4 +17,4 @@ custom_target('igb_uio',
> depends: mkfile,
> install: true,
> - install_dir: kernel_dir + '/../extra/dpdk',
> + install_dir: kernel_dir + '/extra/dpdk',
> build_by_default: get_option('enable_kmods'))
> diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build
> index a09af5aa5..e6822f49c 100644
> --- a/kernel/linux/kni/meson.build
> +++ b/kernel/linux/kni/meson.build
> @@ -17,5 +17,5 @@ custom_target('rte_kni',
> input: kni_sources + kni_igb_sources + kni_ixgbe_sources,
> output: 'rte_kni.ko',
> - command: ['make', '-j4', '-C', kernel_dir,
> + command: ['make', '-j4', '-C', kernel_dir + '/build',
> 'M=' + meson.current_build_dir(),
> 'src=' + meson.current_source_dir(),
> @@ -31,4 +31,4 @@ custom_target('rte_kni',
> console: true,
> install: true,
> - install_dir: kernel_dir + '/../extra/dpdk',
> + install_dir: kernel_dir + '/extra/dpdk',
> build_by_default: get_option('enable_kmods'))
> diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
> index 5b7ec06e1..c5bcc1f38 100644
> --- a/kernel/linux/meson.build
> +++ b/kernel/linux/meson.build
> @@ -21,9 +21,9 @@ else
> # use default path for native builds
> kernel_version = run_command('uname', '-r').stdout().strip()
> - kernel_dir = '/lib/modules/' + kernel_version + '/build'
> + kernel_dir = '/lib/modules/' + kernel_version
> endif
>
> # test running make in kernel directory, using "make kernelversion"
> - make_returncode = run_command('make', '-sC', kernel_dir,
> + make_returncode = run_command('make', '-sC', kernel_dir + '/build',
> 'kernelversion').returncode()
> if make_returncode != 0
> diff --git a/meson_options.txt b/meson_options.txt
> index 10b541615..91b0449a1 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '',
> description: 'subdirectory where to install arch-dependent headers')
> option('kernel_dir', type: 'string', value: '',
> - description: 'path to the kernel for building kernel modules, they will be installed in $DEST_DIR/$kernel_dir/../extra/dpdk')
> + description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
> option('lib_musdk_dir', type: 'string', value: '',
> description: 'path to the MUSDK library installation directory')
> --
> 2.20.1
>
> ---
> Diff of the applied patch vs upstream commit (please double-check if non-empty:
> ---
> --- - 2019-08-22 19:38:20.876697935 +0100
> +++ 0006-kernel-linux-fix-modules-install-path.patch 2019-08-22 19:38:20.397027833 +0100
> @@ -1 +1 @@
> -From 317832f97c165cd4f327567935dfbd6af92b4159 Mon Sep 17 00:00:00 2001
> +From 15a14f6d5bc6fb4df53e8b3cb3fb53e504f838c9 Mon Sep 17 00:00:00 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit 317832f97c165cd4f327567935dfbd6af92b4159 ]
> +
> @@ -9,2 +10,0 @@
> -Cc: stable@dpdk.org
> -
> @@ -38 +38 @@
> -index a9f48b0e6..955eec949 100644
> +index a09af5aa5..e6822f49c 100644
> @@ -41,2 +41,2 @@
> -@@ -14,5 +14,5 @@ custom_target('rte_kni',
> - input: kni_sources,
> +@@ -17,5 +17,5 @@ custom_target('rte_kni',
> + input: kni_sources + kni_igb_sources + kni_ixgbe_sources,
> @@ -48 +48 @@
> -@@ -26,4 +26,4 @@ custom_target('rte_kni',
> +@@ -31,4 +31,4 @@ custom_target('rte_kni',
> @@ -55 +55 @@
> -index a37c95752..1796cc686 100644
> +index 5b7ec06e1..c5bcc1f38 100644
> @@ -58,6 +58,6 @@
> -@@ -14,9 +14,9 @@ if kernel_dir == ''
> - # use default path for native builds
> - kernel_version = run_command('uname', '-r').stdout().strip()
> -- kernel_dir = '/lib/modules/' + kernel_version + '/build'
> -+ kernel_dir = '/lib/modules/' + kernel_version
> - endif
> +@@ -21,9 +21,9 @@ else
> + # use default path for native builds
> + kernel_version = run_command('uname', '-r').stdout().strip()
> +- kernel_dir = '/lib/modules/' + kernel_version + '/build'
> ++ kernel_dir = '/lib/modules/' + kernel_version
> + endif
> @@ -65,5 +65,5 @@
> - # test running make in kernel directory, using "make kernelversion"
> --make_returncode = run_command('make', '-sC', kernel_dir,
> -+make_returncode = run_command('make', '-sC', kernel_dir + '/build',
> - 'kernelversion').returncode()
> - if make_returncode != 0
> + # test running make in kernel directory, using "make kernelversion"
> +- make_returncode = run_command('make', '-sC', kernel_dir,
> ++ make_returncode = run_command('make', '-sC', kernel_dir + '/build',
> + 'kernelversion').returncode()
> + if make_returncode != 0
> @@ -71 +71 @@
> -index 16d9f92c6..5302b9c68 100644
> +index 10b541615..91b0449a1 100644
> @@ -74 +74 @@
> -@@ -16,5 +16,5 @@ option('include_subdir_arch', type: 'string', value: '',
> +@@ -14,5 +14,5 @@ option('include_subdir_arch', type: 'string', value: '',

Re: [dpdk-stable] [EXT] patch 'net/mvneta: fix ierror statistics' has been queued to LTS release 18.11.3

[Liron Himi]

queued commit looks okay.

Regards,
Liron

-----Original Message-----
From: Kevin Traynor <ktraynor@redhat.com> 
Sent: Friday, August 23, 2019 12:43
To: Liron Himi <lironh@marvell.com>
Cc: Yuri Chipchev <yuric@marvell.com>; dpdk stable <stable@dpdk.org>
Subject: [EXT] patch 'net/mvneta: fix ierror statistics' has been queued to LTS release 18.11.3

External Email

----------------------------------------------------------------------
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 08/28/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/a9b869ed83f19ecac2255ff4fe4063be7a547fff

Thanks.

Kevin Traynor

---
From a9b869ed83f19ecac2255ff4fe4063be7a547fff Mon Sep 17 00:00:00 2001
From: Liron Himi <lironh@marvell.com>
Date: Mon, 1 Jul 2019 11:00:22 +0300
Subject: [PATCH] net/mvneta: fix ierror statistics

[ upstream commit 09a6afe7e4bff1d4b2961e031fcae1b7a1f042d3 ]

Error packets were counted twice due to use of redundant counters.

Fixes: e9d5faffd10c ("net/mvneta: support basic stats")

Signed-off-by: Liron Himi <lironh@marvell.com>
Reviewed-by: Yuri Chipchev <yuric@marvell.com>
Tested-by: Liron Himi <lironh@marvell.com>
---
 drivers/net/mvneta/mvneta_ethdev.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index 2d7666454..919856885 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -707,8 +707,5 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
 			  ppio_stats.rx_overrun -
 			  priv->prev_stats.imissed;
-
-	stats->ierrors = ppio_stats.rx_packets_err +
-			ppio_stats.rx_errors +
-			ppio_stats.rx_crc_error -
+	stats->ierrors = ppio_stats.rx_packets_err -
 			priv->prev_stats.ierrors;
 	stats->oerrors = ppio_stats.tx_errors - priv->prev_stats.oerrors;
--
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.720052952 +0100
+++ 0035-net-mvneta-fix-ierror-statistics.patch	2019-08-22 19:38:20.456026427 +0100
@@ -1 +1 @@
-From 09a6afe7e4bff1d4b2961e031fcae1b7a1f042d3 Mon Sep 17 00:00:00 2001
+From a9b869ed83f19ecac2255ff4fe4063be7a547fff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 09a6afe7e4bff1d4b2961e031fcae1b7a1f042d3 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 965744406..d6e64a849 100644
+index 2d7666454..919856885 100644
@@ -22 +23 @@
-@@ -708,8 +708,5 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
+@@ -707,8 +707,5 @@ mvneta_stats_get(struct rte_eth_dev *dev, struct 
+rte_eth_stats *stats)

Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been queued to LTS release 18.11.3

[Kevin Traynor]

On 23/08/2019 10:59, Kevin Traynor wrote:
> On 23/08/2019 10:43, Kevin Traynor wrote:
>> 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 08/28/19. So please
>> shout if anyone has objections.
>>
> 
> Hi, the first of these 2 squashed patches in isolation caused a
> regression found by Intel validation team which required a lot of
> investigation and it being reverted at the last moment before 18.11.2.
> 
> In this case I would like an Ack from Zhao and one of the testpmd
> maintainers that they will support this before applying the patch below.
> 

Ping Zhao and testpmd maintainers

> thanks,
> Kevin.
> 
>> 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/df34973221d9e24d74b5381e540e95561ae69458
>>
>> Thanks.
>>
>> Kevin Traynor
>>
>> ---
>> From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17 00:00:00 2001
>> From: Wei Zhao <wei.zhao1@intel.com>
>> Date: Thu, 9 May 2019 15:20:47 +0800
>> Subject: [PATCH] app/testpmd: fix offloads config
>>
>> [ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ]
>> [ upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]
>>
>> This is a squashed commit of the above upstream master commits.
>>
>> 5e91aeef218c was previously applied to stable as:
>> c14f54bd7fea ("app/testpmd: fix offload flags after port config")
>> but had to be reverted in:
>> 4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port config"")
>> as it caused a regression.
>>
>> Now that 575e0fd1a0b3 is available in upstream master to fix that
>> regression, squashing those two commits and applying to stable.
>>
>> Original upstream master commit messages:
>>
>> commit 5e91aeef218c452c370aacf74265c7a42b67dffa
>> Author: Wei Zhao <wei.zhao1@intel.com>
>> Date:   Thu May 9 15:20:47 2019 +0800
>>
>>     app/testpmd: fix offload flags after port config
>>
>>     There is an error in function rxtx_port_config(), which may overwrite
>>     offloads configuration get from function launch_args_parse() when run
>>     testpmd app. So rxtx_port_config() should do "or" for port offloads.
>>
>>     Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
>>     Cc: stable@dpdk.org
>>
>>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
>>     Tested-by: Peng Yuan <yuan.peng@intel.com>
>>
>> commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
>> Author: Wei Zhao <wei.zhao1@intel.com>
>> Date:   Mon Jun 10 14:45:10 2019 +0800
>>
>>     app/testpmd: fix offloads config
>>
>>     There is no need to use default offloads configuration
>>     if offloads configuration has been pass down from upper layer.
>>     The default offloads are overwritten if not zero.
>>
>>     Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
>>     Cc: stable@dpdk.org
>>
>>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
>>     Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
>>
>> Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
>> Cc: Jingjing Wu <jingjing.wu@intel.com>
>> Cc: Bernard Iremonger <bernard.iremonger@intel.com>
>> ---
>>  app/test-pmd/testpmd.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
>> index b4215c75d..41283b481 100644
>> --- a/app/test-pmd/testpmd.c
>> +++ b/app/test-pmd/testpmd.c
>> @@ -2736,7 +2736,11 @@ rxtx_port_config(struct rte_port *port)
>>  {
>>  	uint16_t qid;
>> +	uint64_t offloads;
>>  
>>  	for (qid = 0; qid < nb_rxq; qid++) {
>> +		offloads = port->rx_conf[qid].offloads;
>>  		port->rx_conf[qid] = port->dev_info.default_rxconf;
>> +		if (offloads != 0)
>> +			port->rx_conf[qid].offloads = offloads;
>>  
>>  		/* Check if any Rx parameters have been passed */
>> @@ -2760,5 +2764,8 @@ rxtx_port_config(struct rte_port *port)
>>  
>>  	for (qid = 0; qid < nb_txq; qid++) {
>> +		offloads = port->tx_conf[qid].offloads;
>>  		port->tx_conf[qid] = port->dev_info.default_txconf;
>> +		if (offloads != 0)
>> +			port->tx_conf[qid].offloads = offloads;
>>  
>>  		/* Check if any Tx parameters have been passed */
>>
> 

Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been queued to LTS release 18.11.3

[Zhao1, Wei]

Hi, I have discussion with Intel validation team before, there is no problem caused by these two patch by now.
ALL caused issue has been fixed by other patch.

> -----Original Message-----
> From: Kevin Traynor [mailto:ktraynor@redhat.com]
> Sent: Thursday, September 5, 2019 1:44 AM
> To: Zhao1, Wei <wei.zhao1@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>;
> Wu, Jingjing <jingjing.wu@intel.com>; Iremonger, Bernard
> <bernard.iremonger@intel.com>
> Cc: Peng, Yuan <yuan.peng@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>;
> dpdk stable <stable@dpdk.org>
> Subject: Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been
> queued to LTS release 18.11.3
> 
> On 23/08/2019 10:59, Kevin Traynor wrote:
> > On 23/08/2019 10:43, Kevin Traynor wrote:
> >> 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 08/28/19. So please
> >> shout if anyone has objections.
> >>
> >
> > Hi, the first of these 2 squashed patches in isolation caused a
> > regression found by Intel validation team which required a lot of
> > investigation and it being reverted at the last moment before 18.11.2.
> >
> > In this case I would like an Ack from Zhao and one of the testpmd
> > maintainers that they will support this before applying the patch below.
> >
> 
> Ping Zhao and testpmd maintainers
> 
> > thanks,
> > Kevin.
> >
> >> 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/df34973221d9
> >> e24d74b5381e540e95561ae69458
> >>
> >> Thanks.
> >>
> >> Kevin Traynor
> >>
> >> ---
> >> From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17 00:00:00
> >> 2001
> >> From: Wei Zhao <wei.zhao1@intel.com>
> >> Date: Thu, 9 May 2019 15:20:47 +0800
> >> Subject: [PATCH] app/testpmd: fix offloads config
> >>
> >> [ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ] [
> >> upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]
> >>
> >> This is a squashed commit of the above upstream master commits.
> >>
> >> 5e91aeef218c was previously applied to stable as:
> >> c14f54bd7fea ("app/testpmd: fix offload flags after port config") but
> >> had to be reverted in:
> >> 4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port
> >> config"") as it caused a regression.
> >>
> >> Now that 575e0fd1a0b3 is available in upstream master to fix that
> >> regression, squashing those two commits and applying to stable.
> >>
> >> Original upstream master commit messages:
> >>
> >> commit 5e91aeef218c452c370aacf74265c7a42b67dffa
> >> Author: Wei Zhao <wei.zhao1@intel.com>
> >> Date:   Thu May 9 15:20:47 2019 +0800
> >>
> >>     app/testpmd: fix offload flags after port config
> >>
> >>     There is an error in function rxtx_port_config(), which may overwrite
> >>     offloads configuration get from function launch_args_parse() when run
> >>     testpmd app. So rxtx_port_config() should do "or" for port offloads.
> >>
> >>     Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
> >>     Cc: stable@dpdk.org
> >>
> >>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> >>     Tested-by: Peng Yuan <yuan.peng@intel.com>
> >>
> >> commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
> >> Author: Wei Zhao <wei.zhao1@intel.com>
> >> Date:   Mon Jun 10 14:45:10 2019 +0800
> >>
> >>     app/testpmd: fix offloads config
> >>
> >>     There is no need to use default offloads configuration
> >>     if offloads configuration has been pass down from upper layer.
> >>     The default offloads are overwritten if not zero.
> >>
> >>     Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
> >>     Cc: stable@dpdk.org
> >>
> >>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> >>     Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
> >>
> >> Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
> >> Cc: Jingjing Wu <jingjing.wu@intel.com>
> >> Cc: Bernard Iremonger <bernard.iremonger@intel.com>
> >> ---
> >>  app/test-pmd/testpmd.c | 7 +++++++
> >>  1 file changed, 7 insertions(+)
> >>
> >> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> >> b4215c75d..41283b481 100644
> >> --- a/app/test-pmd/testpmd.c
> >> +++ b/app/test-pmd/testpmd.c
> >> @@ -2736,7 +2736,11 @@ rxtx_port_config(struct rte_port *port)  {
> >>  	uint16_t qid;
> >> +	uint64_t offloads;
> >>
> >>  	for (qid = 0; qid < nb_rxq; qid++) {
> >> +		offloads = port->rx_conf[qid].offloads;
> >>  		port->rx_conf[qid] = port->dev_info.default_rxconf;
> >> +		if (offloads != 0)
> >> +			port->rx_conf[qid].offloads = offloads;
> >>
> >>  		/* Check if any Rx parameters have been passed */ @@ -
> 2760,5
> >> +2764,8 @@ rxtx_port_config(struct rte_port *port)
> >>
> >>  	for (qid = 0; qid < nb_txq; qid++) {
> >> +		offloads = port->tx_conf[qid].offloads;
> >>  		port->tx_conf[qid] = port->dev_info.default_txconf;
> >> +		if (offloads != 0)
> >> +			port->tx_conf[qid].offloads = offloads;
> >>
> >>  		/* Check if any Tx parameters have been passed */
> >>
> >

Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been queued to LTS release 18.11.3

[Kevin Traynor]

On 05/09/2019 03:14, Zhao1, Wei wrote:
> Hi, I have discussion with Intel validation team before, there is no problem caused by these two patch by now.
> ALL caused issue has been fixed by other patch.
> 

Thanks Wei. Ping again to testpmd maintainers for an ACK that they will
support this if there are any more problems.

>> -----Original Message-----
>> From: Kevin Traynor [mailto:ktraynor@redhat.com]
>> Sent: Thursday, September 5, 2019 1:44 AM
>> To: Zhao1, Wei <wei.zhao1@intel.com>; Lu, Wenzhuo <wenzhuo.lu@intel.com>;
>> Wu, Jingjing <jingjing.wu@intel.com>; Iremonger, Bernard
>> <bernard.iremonger@intel.com>
>> Cc: Peng, Yuan <yuan.peng@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>;
>> dpdk stable <stable@dpdk.org>
>> Subject: Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been
>> queued to LTS release 18.11.3
>>
>> On 23/08/2019 10:59, Kevin Traynor wrote:
>>> On 23/08/2019 10:43, Kevin Traynor wrote:
>>>> 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 08/28/19. So please
>>>> shout if anyone has objections.
>>>>
>>>
>>> Hi, the first of these 2 squashed patches in isolation caused a
>>> regression found by Intel validation team which required a lot of
>>> investigation and it being reverted at the last moment before 18.11.2.
>>>
>>> In this case I would like an Ack from Zhao and one of the testpmd
>>> maintainers that they will support this before applying the patch below.
>>>
>>
>> Ping Zhao and testpmd maintainers
>>
>>> thanks,
>>> Kevin.
>>>
>>>> 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/df34973221d9
>>>> e24d74b5381e540e95561ae69458
>>>>
>>>> Thanks.
>>>>
>>>> Kevin Traynor
>>>>
>>>> ---
>>>> From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17 00:00:00
>>>> 2001
>>>> From: Wei Zhao <wei.zhao1@intel.com>
>>>> Date: Thu, 9 May 2019 15:20:47 +0800
>>>> Subject: [PATCH] app/testpmd: fix offloads config
>>>>
>>>> [ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ] [
>>>> upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]
>>>>
>>>> This is a squashed commit of the above upstream master commits.
>>>>
>>>> 5e91aeef218c was previously applied to stable as:
>>>> c14f54bd7fea ("app/testpmd: fix offload flags after port config") but
>>>> had to be reverted in:
>>>> 4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port
>>>> config"") as it caused a regression.
>>>>
>>>> Now that 575e0fd1a0b3 is available in upstream master to fix that
>>>> regression, squashing those two commits and applying to stable.
>>>>
>>>> Original upstream master commit messages:
>>>>
>>>> commit 5e91aeef218c452c370aacf74265c7a42b67dffa
>>>> Author: Wei Zhao <wei.zhao1@intel.com>
>>>> Date:   Thu May 9 15:20:47 2019 +0800
>>>>
>>>>     app/testpmd: fix offload flags after port config
>>>>
>>>>     There is an error in function rxtx_port_config(), which may overwrite
>>>>     offloads configuration get from function launch_args_parse() when run
>>>>     testpmd app. So rxtx_port_config() should do "or" for port offloads.
>>>>
>>>>     Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
>>>>     Cc: stable@dpdk.org
>>>>
>>>>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
>>>>     Tested-by: Peng Yuan <yuan.peng@intel.com>
>>>>
>>>> commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
>>>> Author: Wei Zhao <wei.zhao1@intel.com>
>>>> Date:   Mon Jun 10 14:45:10 2019 +0800
>>>>
>>>>     app/testpmd: fix offloads config
>>>>
>>>>     There is no need to use default offloads configuration
>>>>     if offloads configuration has been pass down from upper layer.
>>>>     The default offloads are overwritten if not zero.
>>>>
>>>>     Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
>>>>     Cc: stable@dpdk.org
>>>>
>>>>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
>>>>     Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
>>>>
>>>> Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
>>>> Cc: Jingjing Wu <jingjing.wu@intel.com>
>>>> Cc: Bernard Iremonger <bernard.iremonger@intel.com>
>>>> ---
>>>>  app/test-pmd/testpmd.c | 7 +++++++
>>>>  1 file changed, 7 insertions(+)
>>>>
>>>> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
>>>> b4215c75d..41283b481 100644
>>>> --- a/app/test-pmd/testpmd.c
>>>> +++ b/app/test-pmd/testpmd.c
>>>> @@ -2736,7 +2736,11 @@ rxtx_port_config(struct rte_port *port)  {
>>>>  	uint16_t qid;
>>>> +	uint64_t offloads;
>>>>
>>>>  	for (qid = 0; qid < nb_rxq; qid++) {
>>>> +		offloads = port->rx_conf[qid].offloads;
>>>>  		port->rx_conf[qid] = port->dev_info.default_rxconf;
>>>> +		if (offloads != 0)
>>>> +			port->rx_conf[qid].offloads = offloads;
>>>>
>>>>  		/* Check if any Rx parameters have been passed */ @@ -
>> 2760,5
>>>> +2764,8 @@ rxtx_port_config(struct rte_port *port)
>>>>
>>>>  	for (qid = 0; qid < nb_txq; qid++) {
>>>> +		offloads = port->tx_conf[qid].offloads;
>>>>  		port->tx_conf[qid] = port->dev_info.default_txconf;
>>>> +		if (offloads != 0)
>>>> +			port->tx_conf[qid].offloads = offloads;
>>>>
>>>>  		/* Check if any Tx parameters have been passed */
>>>>
>>>
> 

Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been queued to LTS release 18.11.3

[Iremonger, Bernard]

> -----Original Message-----
> From: Kevin Traynor [mailto:ktraynor@redhat.com]
> Sent: Wednesday, September 11, 2019 3:47 PM
> To: Zhao1, Wei <wei.zhao1@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>; Iremonger,
> Bernard <bernard.iremonger@intel.com>
> Cc: Peng, Yuan <yuan.peng@intel.com>; Yigit, Ferruh
> <ferruh.yigit@intel.com>; dpdk stable <stable@dpdk.org>
> Subject: Re: [dpdk-stable] patch 'app/testpmd: fix offloads config' has been
> queued to LTS release 18.11.3
> 
> On 05/09/2019 03:14, Zhao1, Wei wrote:
> > Hi, I have discussion with Intel validation team before, there is no problem
> caused by these two patch by now.
> > ALL caused issue has been fixed by other patch.
> >
> 
> Thanks Wei. Ping again to testpmd maintainers for an ACK that they will
> support this if there are any more problems.
> 
> >> -----Original Message-----
> >> From: Kevin Traynor [mailto:ktraynor@redhat.com]
> >> Sent: Thursday, September 5, 2019 1:44 AM
> >> To: Zhao1, Wei <wei.zhao1@intel.com>; Lu, Wenzhuo
> >> <wenzhuo.lu@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>;
> >> Iremonger, Bernard <bernard.iremonger@intel.com>
> >> Cc: Peng, Yuan <yuan.peng@intel.com>; Yigit, Ferruh
> >> <ferruh.yigit@intel.com>; dpdk stable <stable@dpdk.org>
> >> Subject: Re: [dpdk-stable] patch 'app/testpmd: fix offloads config'
> >> has been queued to LTS release 18.11.3
> >>
> >> On 23/08/2019 10:59, Kevin Traynor wrote:
> >>> On 23/08/2019 10:43, Kevin Traynor wrote:
> >>>> 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 08/28/19. So please
> >>>> shout if anyone has objections.
> >>>>
> >>>
> >>> Hi, the first of these 2 squashed patches in isolation caused a
> >>> regression found by Intel validation team which required a lot of
> >>> investigation and it being reverted at the last moment before 18.11.2.
> >>>
> >>> In this case I would like an Ack from Zhao and one of the testpmd
> >>> maintainers that they will support this before applying the patch below.
> >>>
> >>
> >> Ping Zhao and testpmd maintainers
> >>
> >>> thanks,
> >>> Kevin.
> >>>
> >>>> 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/df34973221
> >>>> d9
> >>>> e24d74b5381e540e95561ae69458
> >>>>
> >>>> Thanks.
> >>>>
> >>>> Kevin Traynor
> >>>>
> >>>> ---
> >>>> From df34973221d9e24d74b5381e540e95561ae69458 Mon Sep 17
> 00:00:00
> >>>> 2001
> >>>> From: Wei Zhao <wei.zhao1@intel.com>
> >>>> Date: Thu, 9 May 2019 15:20:47 +0800
> >>>> Subject: [PATCH] app/testpmd: fix offloads config
> >>>>
> >>>> [ upstream commit 5e91aeef218c452c370aacf74265c7a42b67dffa ] [
> >>>> upstream commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517 ]
> >>>>
> >>>> This is a squashed commit of the above upstream master commits.
> >>>>
> >>>> 5e91aeef218c was previously applied to stable as:
> >>>> c14f54bd7fea ("app/testpmd: fix offload flags after port config")
> >>>> but had to be reverted in:
> >>>> 4d1815fe6a73 ("Revert "app/testpmd: fix offload flags after port
> >>>> config"") as it caused a regression.
> >>>>
> >>>> Now that 575e0fd1a0b3 is available in upstream master to fix that
> >>>> regression, squashing those two commits and applying to stable.
> >>>>
> >>>> Original upstream master commit messages:
> >>>>
> >>>> commit 5e91aeef218c452c370aacf74265c7a42b67dffa
> >>>> Author: Wei Zhao <wei.zhao1@intel.com>
> >>>> Date:   Thu May 9 15:20:47 2019 +0800
> >>>>
> >>>>     app/testpmd: fix offload flags after port config
> >>>>
> >>>>     There is an error in function rxtx_port_config(), which may overwrite
> >>>>     offloads configuration get from function launch_args_parse() when
> run
> >>>>     testpmd app. So rxtx_port_config() should do "or" for port offloads.
> >>>>
> >>>>     Fixes: d44f8a485f5d ("app/testpmd: enable per queue configure")
> >>>>     Cc: stable@dpdk.org
> >>>>
> >>>>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> >>>>     Tested-by: Peng Yuan <yuan.peng@intel.com>
> >>>>
> >>>> commit 575e0fd1a0b33b5b6c977f743fd4ba27b3523517
> >>>> Author: Wei Zhao <wei.zhao1@intel.com>
> >>>> Date:   Mon Jun 10 14:45:10 2019 +0800
> >>>>
> >>>>     app/testpmd: fix offloads config
> >>>>
> >>>>     There is no need to use default offloads configuration
> >>>>     if offloads configuration has been pass down from upper layer.
> >>>>     The default offloads are overwritten if not zero.
> >>>>
> >>>>     Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port
> config")
> >>>>     Cc: stable@dpdk.org
> >>>>
> >>>>     Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
> >>>>     Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
> >>>>
> >>>> Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>
> >>>> Cc: Jingjing Wu <jingjing.wu@intel.com>
> >>>> Cc: Bernard Iremonger <bernard.iremonger@intel.com>
> >>>> ---
> >>>>  app/test-pmd/testpmd.c | 7 +++++++
> >>>>  1 file changed, 7 insertions(+)
> >>>>
> >>>> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> >>>> b4215c75d..41283b481 100644
> >>>> --- a/app/test-pmd/testpmd.c
> >>>> +++ b/app/test-pmd/testpmd.c
> >>>> @@ -2736,7 +2736,11 @@ rxtx_port_config(struct rte_port *port)  {
> >>>>  	uint16_t qid;
> >>>> +	uint64_t offloads;
> >>>>
> >>>>  	for (qid = 0; qid < nb_rxq; qid++) {
> >>>> +		offloads = port->rx_conf[qid].offloads;
> >>>>  		port->rx_conf[qid] = port->dev_info.default_rxconf;
> >>>> +		if (offloads != 0)
> >>>> +			port->rx_conf[qid].offloads = offloads;
> >>>>
> >>>>  		/* Check if any Rx parameters have been passed */ @@ -
> >> 2760,5
> >>>> +2764,8 @@ rxtx_port_config(struct rte_port *port)
> >>>>
> >>>>  	for (qid = 0; qid < nb_txq; qid++) {
> >>>> +		offloads = port->tx_conf[qid].offloads;
> >>>>  		port->tx_conf[qid] = port->dev_info.default_txconf;
> >>>> +		if (offloads != 0)
> >>>> +			port->tx_conf[qid].offloads = offloads;
> >>>>
> >>>>  		/* Check if any Tx parameters have been passed */
> >>>>
> >>>
> >
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>