patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11
@ 2020-11-23 17:11 Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor
                   ` (28 more replies)
  0 siblings, 29 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:11 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 8ad9970e4a5664ea3cb6806669f6058c63f36f4e Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 12 Nov 2020 09:41:40 +0000
Subject: [PATCH] examples/l2fwd-keepalive: skip meson build if no librt

[ upstream commit b334236abd8dfeea625525de548b35b40cb68c3b ]

When librt is not present on a system, processing the meson.build file
for this example application causes an error. Make the library
non-mandatory and just mark the example as unbuildable if it is
not present.

Fixes: 89f0711f9ddf ("examples: build some samples with meson")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/l2fwd-keepalive/meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/l2fwd-keepalive/meson.build b/examples/l2fwd-keepalive/meson.build
index 6f7b007e1e..aecc8d9fc9 100644
--- a/examples/l2fwd-keepalive/meson.build
+++ b/examples/l2fwd-keepalive/meson.build
@@ -7,5 +7,11 @@
 # DPDK instance, use 'make'
 
-ext_deps += cc.find_library('rt')
+librt = cc.find_library('rt', required: false)
+if not librt.found()
+	build = false
+	subdir_done()
+endif
+
+ext_deps += librt
 deps += 'timer'
 sources = files(
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.036381560 +0000
+++ 0001-examples-l2fwd-keepalive-skip-meson-build-if-no-libr.patch	2020-11-23 17:10:13.969061558 +0000
@@ -1 +1 @@
-From b334236abd8dfeea625525de548b35b40cb68c3b Mon Sep 17 00:00:00 2001
+From 8ad9970e4a5664ea3cb6806669f6058c63f36f4e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b334236abd8dfeea625525de548b35b40cb68c3b ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index d678a8ddd0..a56d679675 100644
+index 6f7b007e1e..aecc8d9fc9 100644
@@ -23 +24,2 @@
-@@ -8,5 +8,11 @@
+@@ -7,5 +7,11 @@
+ # DPDK instance, use 'make'
@@ -25 +26,0 @@
- allow_experimental_apis = true


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
@ 2020-11-23 17:11 ` Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor
                   ` (27 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:11 UTC (permalink / raw)
  To: David Marchand; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From be24f67bfe8a4d21faa1874bdcfde27656eb252d Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Tue, 10 Nov 2020 16:40:05 +0100
Subject: [PATCH] devtools: fix directory filter in forbidden token check

[ upstream commit cb2587644ee65c0956a66529644a5d001d920824 ]

checkpatches.sh current complains on a patch [1] adding
ALLOW_EXPERIMENTAL_API in an example while this check is for app, lib
and drivers directories:

Warning in examples/ethtool/ethtool-app/Makefile:
Using experimental build flag for in-tree compilation

The regexp on entering files concerned by this filter is incorrect.
In the [1] case, the file full name is matched against "app" rather than
"+++ b/app".

1: https://patchwork.dpdk.org/patch/83902/

Fixes: 7413e7f2aeb3 ("devtools: alert on new calls to exit from libs")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 devtools/check-forbidden-tokens.awk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/check-forbidden-tokens.awk b/devtools/check-forbidden-tokens.awk
index f86cbe8dc1..61ba707c9b 100755
--- a/devtools/check-forbidden-tokens.awk
+++ b/devtools/check-forbidden-tokens.awk
@@ -55,5 +55,5 @@ BEGIN {
 	for (i in deny_folders) {
 		re = "^\\+\\+\\+ b/" deny_folders[i];
-		if ($0 ~ deny_folders[i]) {
+		if ($0 ~ re) {
 			in_file = 1
 			last_file = $0
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.057769640 +0000
+++ 0002-devtools-fix-directory-filter-in-forbidden-token-che.patch	2020-11-23 17:10:13.969061558 +0000
@@ -1 +1 @@
-From cb2587644ee65c0956a66529644a5d001d920824 Mon Sep 17 00:00:00 2001
+From be24f67bfe8a4d21faa1874bdcfde27656eb252d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cb2587644ee65c0956a66529644a5d001d920824 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'examples/qos_sched: fix usage string' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor
@ 2020-11-23 17:11 ` Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:11 UTC (permalink / raw)
  To: Ibtisam Tariq; +Cc: David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From f4870d1f9898a2fb08d3c04f1a5568492c47f114 Mon Sep 17 00:00:00 2001
From: Ibtisam Tariq <ibtisam.tariq@emumba.com>
Date: Mon, 2 Nov 2020 11:43:03 +0000
Subject: [PATCH] examples/qos_sched: fix usage string

[ upstream commit fc48d8a5b296daacd47cacb25db6f9f6ca82ccd0 ]

The short option written for interactive mode is --i in usage of
this qos_sched example. Actually, it is -i.

Fixes: cfd5c971e5e ("examples/qos_sched: add stats")

Signed-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 examples/qos_sched/args.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index 7431b29816..2727fd4f27 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -40,5 +40,5 @@ static const char usage[] =
 	"                                                                               \n"
 	"Application optional parameters:                                               \n"
-        "    --i     : run in interactive mode (default value is %u)                    \n"
+	"    -i      : run in interactive mode (default value is %u)                    \n"
 	"    --mst I : master core index (default value is %u)                          \n"
 	"    --rsz \"A, B, C\" :   Ring sizes                                           \n"
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.080143343 +0000
+++ 0003-examples-qos_sched-fix-usage-string.patch	2020-11-23 17:10:13.969061558 +0000
@@ -1 +1 @@
-From fc48d8a5b296daacd47cacb25db6f9f6ca82ccd0 Mon Sep 17 00:00:00 2001
+From f4870d1f9898a2fb08d3c04f1a5568492c47f114 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fc48d8a5b296daacd47cacb25db6f9f6ca82ccd0 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index c627196230..c369ba9b4d 100644
+index 7431b29816..2727fd4f27 100644
@@ -27 +28 @@
- 	"    --mnc I : main core index (default value is %u)                            \n"
+ 	"    --mst I : master core index (default value is %u)                          \n"


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor
@ 2020-11-23 17:11 ` Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:11 UTC (permalink / raw)
  To: Ciara Power; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From e60a2598ccf13c3492a56288ab6808c248510c36 Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power@intel.com>
Date: Fri, 6 Nov 2020 12:40:53 +0000
Subject: [PATCH] usertools: fix CPU layout script to be PEP8 compliant

[ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ]

The pycodestyle tool flagged the following issues, which are now fixed.

$ pycodestyle cpu_layout.py
  cpu_layout.py:18:5: E722 do not use bare 'except'
  cpu_layout.py:62:14: E231 missing whitespace after ','

Fixes: deb87e6777c0 ("usertools: use sysfs for CPU layout")
Fixes: c9208f1dc967 ("usertools: fix CPU layout with python 3")

Signed-off-by: Ciara Power <ciara.power@intel.com>
---
 usertools/cpu_layout.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
index 6f129b1db8..39b268752a 100755
--- a/usertools/cpu_layout.py
+++ b/usertools/cpu_layout.py
@@ -23,6 +23,4 @@ for cpu in xrange(max_cpus + 1):
     except IOError:
         continue
-    except:
-        break
     core = int(fd.read())
     fd.close()
@@ -67,5 +65,5 @@ for c in cores:
     output = "Core %s" % str(c).ljust(max_core_id_len)
     for s in sockets:
-        if (s,c) in core_map:
+        if (s, c) in core_map:
             output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
         else:
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.101072523 +0000
+++ 0004-usertools-fix-CPU-layout-script-to-be-PEP8-compliant.patch	2020-11-23 17:10:13.970061559 +0000
@@ -1 +1 @@
-From b0dcd610529487ed6661351a735a35af5d03a222 Mon Sep 17 00:00:00 2001
+From e60a2598ccf13c3492a56288ab6808c248510c36 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b0dcd610529487ed6661351a735a35af5d03a222 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index cc39638213..891b9238fa 100755
+index 6f129b1db8..39b268752a 100755
@@ -25 +26 @@
-@@ -16,6 +16,4 @@ for cpu in range(max_cpus + 1):
+@@ -23,6 +23,4 @@ for cpu in xrange(max_cpus + 1):
@@ -32 +33 @@
-@@ -60,5 +58,5 @@ for c in cores:
+@@ -67,5 +65,5 @@ for c in cores:


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'config: enable packet prefetching with Meson' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (2 preceding siblings ...)
  2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor
@ 2020-11-23 17:11 ` Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:11 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: Marvin Liu, David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From ebc0bdf697037882baea2f45a3b9da75ab47ddd7 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Fri, 13 Nov 2020 15:52:12 +0100
Subject: [PATCH] config: enable packet prefetching with Meson

[ upstream commit 048a2aa3f30c90c7f9339a17bfd1e663e379625f ]

With Make build system, RTE_PMD_PACKET_PREFETCH was enabled
by default. It got lost when transitioning to Meson build
system.

In order to avoid performance changes, this patch enables
packet prefetching in rte_config.h.

Fixes: 9314afb68a53 ("drivers: add infrastructure for meson build")

Reported-by: Marvin Liu <yong.liu@intel.com>
Suggested-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 config/rte_config.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/rte_config.h b/config/rte_config.h
index 17b9a1ebc9..76ff899019 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -90,4 +90,7 @@
 /****** driver defines ********/
 
+/* Packet prefetching in PMDs */
+#define RTE_PMD_PACKET_PREFETCH 1
+
 /* QuickAssist device */
 /* Max. number of QuickAssist devices which can be attached */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.122967718 +0000
+++ 0005-config-enable-packet-prefetching-with-Meson.patch	2020-11-23 17:10:13.970061559 +0000
@@ -1 +1 @@
-From 048a2aa3f30c90c7f9339a17bfd1e663e379625f Mon Sep 17 00:00:00 2001
+From ebc0bdf697037882baea2f45a3b9da75ab47ddd7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 048a2aa3f30c90c7f9339a17bfd1e663e379625f ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 25219f04af..a0b5160ff2 100644
+index 17b9a1ebc9..76ff899019 100644
@@ -27 +28 @@
-@@ -104,4 +104,7 @@
+@@ -90,4 +90,7 @@


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/ring: fix typo in log message' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (3 preceding siblings ...)
  2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor
@ 2020-11-23 17:11 ` Kevin Traynor
  2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:11 UTC (permalink / raw)
  To: Olivier Matz; +Cc: Ferruh Yigit, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From ac145f3a626cdeb9df0f95870d7f7d27af2545d1 Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz@6wind.com>
Date: Wed, 4 Nov 2020 18:01:25 +0100
Subject: [PATCH] net/ring: fix typo in log message

[ upstream commit f1b910746547b25a8e65dc770b452744e21a0ffd ]

Add a missing space.

Fixes: 869bf6d222bb ("net/ring: fix coding style")

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/net/ring/rte_eth_ring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 245029c107..73161fc042 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -596,5 +596,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 		if (!kvlist) {
 			PMD_LOG(INFO,
-				"Ignoring unsupported parameters when creatingrings-backed ethernet device");
+				"Ignoring unsupported parameters when creating rings-backed ethernet device");
 			ret = eth_dev_ring_create(name, dev, rte_socket_id(),
 						  DEV_CREATE, &eth_dev);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.143560885 +0000
+++ 0006-net-ring-fix-typo-in-log-message.patch	2020-11-23 17:10:13.971061560 +0000
@@ -1 +1 @@
-From f1b910746547b25a8e65dc770b452744e21a0ffd Mon Sep 17 00:00:00 2001
+From ac145f3a626cdeb9df0f95870d7f7d27af2545d1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f1b910746547b25a8e65dc770b452744e21a0ffd ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index d6115abdd5..41402a5159 100644
+index 245029c107..73161fc042 100644
@@ -21 +22 @@
-@@ -630,5 +630,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
+@@ -596,5 +596,5 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (4 preceding siblings ...)
  2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor
@ 2020-11-23 17:11 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:11 UTC (permalink / raw)
  To: Ibtisam Tariq; +Cc: David Marchand, Maxime Coquelin, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 2fa757e52e511bd412225b984602f39b68fd7de4 Mon Sep 17 00:00:00 2001
From: Ibtisam Tariq <ibtisam.tariq@emumba.com>
Date: Mon, 2 Nov 2020 11:38:25 +0000
Subject: [PATCH] examples/vhost_crypto: add new line character in usage

[ upstream commit 854dbee2ac990002bbf7a19c65aa7385e589f6d9 ]

Add new line character(\n) in the usage of vhost_crypto example for
better readability

Fixes: 709521f4c2cd ("examples/vhost_crypto: support multi-core")

Signed-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 examples/vhost_crypto/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c
index 7b41915d36..4105e26ba5 100644
--- a/examples/vhost_crypto/main.c
+++ b/examples/vhost_crypto/main.c
@@ -195,5 +195,5 @@ vhost_crypto_usage(const char *prgname)
 	printf("%s [EAL options] --\n"
 		"  --%s <lcore>,SOCKET-FILE-PATH\n"
-		"  --%s (lcore,cdev_id,queue_id)[,(lcore,cdev_id,queue_id)]"
+		"  --%s (lcore,cdev_id,queue_id)[,(lcore,cdev_id,queue_id)]\n"
 		"  --%s: zero copy\n"
 		"  --%s: guest polling\n",
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.165450015 +0000
+++ 0007-examples-vhost_crypto-add-new-line-character-in-usag.patch	2020-11-23 17:10:13.972061561 +0000
@@ -1 +1 @@
-From 854dbee2ac990002bbf7a19c65aa7385e589f6d9 Mon Sep 17 00:00:00 2001
+From 2fa757e52e511bd412225b984602f39b68fd7de4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 854dbee2ac990002bbf7a19c65aa7385e589f6d9 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 11ad491597..29c8f7228d 100644
+index 7b41915d36..4105e26ba5 100644
@@ -23 +24 @@
-@@ -196,5 +196,5 @@ vhost_crypto_usage(const char *prgname)
+@@ -195,5 +195,5 @@ vhost_crypto_usage(const char *prgname)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'vhost: fix virtqueue initialization' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (5 preceding siblings ...)
  2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: Yu Jiang, David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From cd0bd99f0105a4a63780645b36ecb722db020f51 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Fri, 6 Nov 2020 15:47:44 +0100
Subject: [PATCH] vhost: fix virtqueue initialization

[ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ]

This patches fixes virtqueue initialization issue causing
segfault or file descriptor being closed unexpectedly.

The wrong index was passed to init_vring_queue() by
alloc_vring_queue() when a hole in the virtqueue array was
met.

Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")

Reported-by: Yu Jiang <yux.jiang@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Tested-by: Yu Jiang <yux.jiang@intel.com>
---
 lib/librte_vhost/vhost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 61754833c2..394def1f85 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -549,5 +549,5 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
 
 		dev->virtqueue[i] = vq;
-		init_vring_queue(dev, vring_idx);
+		init_vring_queue(dev, i);
 		rte_spinlock_init(&vq->access_lock);
 		vq->avail_wrap_counter = 1;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.186351373 +0000
+++ 0008-vhost-fix-virtqueue-initialization.patch	2020-11-23 17:10:13.974061563 +0000
@@ -1 +1 @@
-From 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 Mon Sep 17 00:00:00 2001
+From cd0bd99f0105a4a63780645b36ecb722db020f51 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 8a151a9c1d..b83cf639eb 100644
+index 61754833c2..394def1f85 100644
@@ -28 +29 @@
-@@ -606,5 +606,5 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
+@@ -549,5 +549,5 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/i40e: add C++ include guard' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (6 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Prateek Agarwal; +Cc: Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9 Mon Sep 17 00:00:00 2001
From: Prateek Agarwal <prateekag@cse.iitb.ac.in>
Date: Sat, 7 Nov 2020 14:30:38 +0530
Subject: [PATCH] net/i40e: add C++ include guard

[ upstream commit 876589e07ed3ce36b6390ebf41615a8a74557cca ]

Add extern "C" in rte_pmd_i40e.h when be compiled with CPP.

Fixes: 17e906a1ea9c ("net/i40e: support link status notification")

Signed-off-by: Prateek Agarwal <prateekag@cse.iitb.ac.in>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/rte_pmd_i40e.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index 1ef1624236..bbef1e30a8 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -15,4 +15,8 @@
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <rte_compat.h>
 #include <rte_ethdev.h>
@@ -1064,3 +1068,7 @@ rte_pmd_i40e_inset_field_clear(uint64_t *inset, uint8_t field_idx)
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _PMD_I40E_H_ */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.209073658 +0000
+++ 0009-net-i40e-add-C-include-guard.patch	2020-11-23 17:10:13.975061564 +0000
@@ -1 +1 @@
-From 876589e07ed3ce36b6390ebf41615a8a74557cca Mon Sep 17 00:00:00 2001
+From 8a6afa8848a7c3b73519b0efdc01e3bee6f41fe9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 876589e07ed3ce36b6390ebf41615a8a74557cca ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index fc3560c28c..4cb21c3713 100644
+index 1ef1624236..bbef1e30a8 100644
@@ -30,2 +31,2 @@
-@@ -1131,3 +1135,7 @@ int
- rte_pmd_i40e_set_switch_dev(uint16_t port_id, struct rte_eth_dev *switch_dev);
+@@ -1064,3 +1068,7 @@ rte_pmd_i40e_inset_field_clear(uint64_t *inset, uint8_t field_idx)
+ }


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/avf: fix releasing mbufs' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (7 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor
                   ` (19 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Ting Xu; +Cc: Jingjing Wu, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 67ae38570c4e8b3c14d781e09eba210179342f8a Mon Sep 17 00:00:00 2001
From: Ting Xu <ting.xu@intel.com>
Date: Wed, 11 Nov 2020 11:06:51 +0800
Subject: [PATCH] net/avf: fix releasing mbufs

[ upstream commit 36b8b062885f2b6576818a1c18ffaacb4dccefa5 ]

In the function _avf_rx_queue_release_mbufs_vec to release rx mbufs,
rxq->rxrearm_nb is given the value of rx descriptor number at last.
However, since the process to release and allocate mbufs lacks the
initialization of rxrearm_nb, if we try to release mbufs next time, it
will return without releasing directly. In this patch, rxrearm_nb is
initialized to be zero in rx queue reset.

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

Signed-off-by: Ting Xu <ting.xu@intel.com>
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
---
 drivers/net/avf/avf_rxtx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c
index 8c8771e665..33670fdb1c 100644
--- a/drivers/net/avf/avf_rxtx.c
+++ b/drivers/net/avf/avf_rxtx.c
@@ -170,4 +170,5 @@ reset_rx_queue(struct avf_rx_queue *rxq)
 	rxq->pkt_first_seg = NULL;
 	rxq->pkt_last_seg = NULL;
+	rxq->rxrearm_nb = 0;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.230422849 +0000
+++ 0010-net-avf-fix-releasing-mbufs.patch	2020-11-23 17:10:13.976061566 +0000
@@ -1 +1 @@
-From 36b8b062885f2b6576818a1c18ffaacb4dccefa5 Mon Sep 17 00:00:00 2001
+From 67ae38570c4e8b3c14d781e09eba210179342f8a Mon Sep 17 00:00:00 2001
@@ -4 +4 @@
-Subject: [PATCH] net/iavf: fix releasing mbufs
+Subject: [PATCH] net/avf: fix releasing mbufs
@@ -6 +6,3 @@
-In the function _iavf_rx_queue_release_mbufs_vec to release rx mbufs,
+[ upstream commit 36b8b062885f2b6576818a1c18ffaacb4dccefa5 ]
+
+In the function _avf_rx_queue_release_mbufs_vec to release rx mbufs,
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
- drivers/net/iavf/iavf_rxtx.c | 1 +
+ drivers/net/avf/avf_rxtx.c | 1 +
@@ -22,5 +23,5 @@
-diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
-index baac5d65c8..8f43208c80 100644
---- a/drivers/net/iavf/iavf_rxtx.c
-+++ b/drivers/net/iavf/iavf_rxtx.c
-@@ -195,4 +195,5 @@ reset_rx_queue(struct iavf_rx_queue *rxq)
+diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c
+index 8c8771e665..33670fdb1c 100644
+--- a/drivers/net/avf/avf_rxtx.c
++++ b/drivers/net/avf/avf_rxtx.c
+@@ -170,4 +170,5 @@ reset_rx_queue(struct avf_rx_queue *rxq)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/avf: fix performance drop after port reset' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (8 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: fix build for log format specifier' " Kevin Traynor
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Leyi Rong; +Cc: Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 82d2e03c1e709217c4a11d179ad9b1a7ff4dce71 Mon Sep 17 00:00:00 2001
From: Leyi Rong <leyi.rong@intel.com>
Date: Thu, 12 Nov 2020 13:51:54 +0800
Subject: [PATCH] net/avf: fix performance drop after port reset

[ upstream commit 63b7be7870c1eef53808f796f815b9b34ba36325 ]

Needs to reset rxq->rxrearm_start to 0 when reset_rx_queue(),
otherwise, the random value of rxrearm_start will cause performance drop
due to L3 contested accesses.

Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")

Signed-off-by: Leyi Rong <leyi.rong@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/avf/avf_rxtx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c
index 33670fdb1c..79ab94513c 100644
--- a/drivers/net/avf/avf_rxtx.c
+++ b/drivers/net/avf/avf_rxtx.c
@@ -171,4 +171,5 @@ reset_rx_queue(struct avf_rx_queue *rxq)
 	rxq->pkt_last_seg = NULL;
 	rxq->rxrearm_nb = 0;
+	rxq->rxrearm_start = 0;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.254152670 +0000
+++ 0011-net-avf-fix-performance-drop-after-port-reset.patch	2020-11-23 17:10:13.978061568 +0000
@@ -1 +1 @@
-From 63b7be7870c1eef53808f796f815b9b34ba36325 Mon Sep 17 00:00:00 2001
+From 82d2e03c1e709217c4a11d179ad9b1a7ff4dce71 Mon Sep 17 00:00:00 2001
@@ -4 +4,3 @@
-Subject: [PATCH] net/iavf: fix performance drop after port reset
+Subject: [PATCH] net/avf: fix performance drop after port reset
+
+[ upstream commit 63b7be7870c1eef53808f796f815b9b34ba36325 ]
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- drivers/net/iavf/iavf_rxtx.c | 1 +
+ drivers/net/avf/avf_rxtx.c | 1 +
@@ -19,5 +20,5 @@
-diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
-index 8f43208c80..21d508b3f4 100644
---- a/drivers/net/iavf/iavf_rxtx.c
-+++ b/drivers/net/iavf/iavf_rxtx.c
-@@ -196,4 +196,5 @@ reset_rx_queue(struct iavf_rx_queue *rxq)
+diff --git a/drivers/net/avf/avf_rxtx.c b/drivers/net/avf/avf_rxtx.c
+index 33670fdb1c..79ab94513c 100644
+--- a/drivers/net/avf/avf_rxtx.c
++++ b/drivers/net/avf/avf_rxtx.c
+@@ -171,4 +171,5 @@ reset_rx_queue(struct avf_rx_queue *rxq)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/i40e: fix build for log format specifier' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (9 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Luca Boccassi, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 4d522efdc0340556319d2fc97c2b4e4493f2c80e Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Tue, 10 Nov 2020 17:54:57 +0000
Subject: [PATCH] net/i40e: fix build for log format specifier

[ upstream commit c2f4dc6d60098a4596cdf5cee34fbeb8fab74410 ]

Build error:
i40e_common.c: In function "i40e_parse_discover_capabilities":
../drivers/net/i40e/base/../i40e_logs.h:43:50:
    error: format "%llX" expects argument of type "long long unsigned
           int", but argument 7 has type "u64" {aka "long unsigned int"
           [-Werror=format=]
   43 |  rte_log(RTE_LOG_ ## level, i40e_logtype_driver, "%s(): " fmt, \
      |                                                  ^~~~~~~~
.../i40e_osdep.h:87:3: note: in expansion of macro "PMD_DRV_LOG_RAW"
   87 |   PMD_DRV_LOG_RAW(DEBUG, "i40e %02x.%x " s,       \
      |   ^~~~~~~~~~~~~~~
.../base/i40e_common.c:4100:4: note: in expansion of macro "i40e_debug"
 4100 |    i40e_debug(hw, I40E_DEBUG_INIT,
      |    ^~~~~~~~~~

There are multiple build error because of same reason, all fixed.

Using 'PRIX64' to fix the build error.

Fixes: 889bc9f0cd3a ("i40e/base: unify the capability function")
Fixes: 9b1041574cd4 ("i40e/base: enhance polling of NVM semaphore")
Fixes: 8db9e2a1b232 ("i40e: base driver")
Fixes: 3b7271f3958a ("i40e/base: catch NVM write semaphore timeout and retry")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
 drivers/net/i40e/base/i40e_common.c | 4 +++-
 drivers/net/i40e/base/i40e_nvm.c    | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c
index d22184daa6..8a2a84f65d 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -3,4 +3,6 @@
  */
 
+#include <inttypes.h>
+
 #include "i40e_type.h"
 #include "i40e_adminq.h"
@@ -3986,5 +3988,5 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
 			p->wr_csr_prot |= (u64)logical_id << 32;
 			i40e_debug(hw, I40E_DEBUG_INIT,
-				   "HW Capability: wr_csr_prot = 0x%llX\n\n",
+				   "HW Capability: wr_csr_prot = 0x%" PRIX64 "\n\n",
 				   (p->wr_csr_prot & 0xffff));
 			break;
diff --git a/drivers/net/i40e/base/i40e_nvm.c b/drivers/net/i40e/base/i40e_nvm.c
index d87a6e56ff..16aebd077f 100644
--- a/drivers/net/i40e/base/i40e_nvm.c
+++ b/drivers/net/i40e/base/i40e_nvm.c
@@ -3,4 +3,6 @@
  */
 
+#include <inttypes.h>
+
 #include "i40e_prototype.h"
 
@@ -78,5 +80,5 @@ enum i40e_status_code i40e_acquire_nvm(struct i40e_hw *hw,
 	if (ret_code)
 		i40e_debug(hw, I40E_DEBUG_NVM,
-			   "NVM acquire type %d failed time_left=%llu ret=%d aq_err=%d\n",
+			   "NVM acquire type %d failed time_left=%" PRIu64 " ret=%d aq_err=%d\n",
 			   access, time_left, ret_code, hw->aq.asq_last_status);
 
@@ -100,5 +102,5 @@ enum i40e_status_code i40e_acquire_nvm(struct i40e_hw *hw,
 			hw->nvm.hw_semaphore_timeout = 0;
 			i40e_debug(hw, I40E_DEBUG_NVM,
-				   "NVM acquire timed out, wait %llu ms before trying again. status=%d aq_err=%d\n",
+				   "NVM acquire timed out, wait %" PRIu64 " ms before trying again. status=%d aq_err=%d\n",
 				   time_left, ret_code, hw->aq.asq_last_status);
 		}
@@ -1204,5 +1206,5 @@ retry:
 		if (gtime >= hw->nvm.hw_semaphore_timeout) {
 			i40e_debug(hw, I40E_DEBUG_ALL,
-				   "NVMUPD: write semaphore expired (%d >= %lld), retrying\n",
+				   "NVMUPD: write semaphore expired (%d >= %" PRIu64 "), retrying\n",
 				   gtime, hw->nvm.hw_semaphore_timeout);
 			i40e_release_nvm(hw);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.275972614 +0000
+++ 0012-net-i40e-fix-build-for-log-format-specifier.patch	2020-11-23 17:10:13.987061578 +0000
@@ -1 +1 @@
-From c2f4dc6d60098a4596cdf5cee34fbeb8fab74410 Mon Sep 17 00:00:00 2001
+From 4d522efdc0340556319d2fc97c2b4e4493f2c80e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c2f4dc6d60098a4596cdf5cee34fbeb8fab74410 ]
+
@@ -29 +30,0 @@
-Cc: stable@dpdk.org
@@ -39 +40 @@
-index 8e3db0756c..e20bb9ac35 100644
+index d22184daa6..8a2a84f65d 100644
@@ -49 +50 @@
-@@ -4099,5 +4101,5 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
+@@ -3986,5 +3988,5 @@ STATIC void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
@@ -57 +58 @@
-index 6466d86486..561ed21136 100644
+index d87a6e56ff..16aebd077f 100644
@@ -81 +82 @@
-@@ -1301,5 +1303,5 @@ retry:
+@@ -1204,5 +1206,5 @@ retry:


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (10 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: fix build for log format specifier' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Haiyue Wang; +Cc: Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 671fa14c8e11280a0fedaf238051bf209cd7f141 Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang@intel.com>
Date: Thu, 12 Nov 2020 10:00:06 +0800
Subject: [PATCH] net/ixgbe: remove redundant MAC flag check

[ upstream commit 5db5d3b72e7cd5c6c986ef72924eb9069c842063 ]

The flag of RTE_ETHTYPE_FLAGS_MAC has been checked twice, so remove the
first error message "Not supported by ethertype filter" which is not so
specific, and keep the error message "mac compare is unsupported" which
aligns to the definition of RTE_ETHTYPE_FLAGS_MAC.

Fixes: eb3539fc8550 ("net/ixgbe: parse ethertype filter")

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ixgbe/ixgbe_flow.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index c7059ea418..22d48866cc 100644
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -871,13 +871,4 @@ ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev,
 		return ret;
 
-	/* Ixgbe doesn't support MAC address. */
-	if (filter->flags & RTE_ETHTYPE_FLAGS_MAC) {
-		memset(filter, 0, sizeof(struct rte_eth_ethertype_filter));
-		rte_flow_error_set(error, EINVAL,
-			RTE_FLOW_ERROR_TYPE_ITEM,
-			NULL, "Not supported by ethertype filter");
-		return -rte_errno;
-	}
-
 	if (filter->queue >= dev->data->nb_rx_queues) {
 		memset(filter, 0, sizeof(struct rte_eth_ethertype_filter));
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.305021791 +0000
+++ 0013-net-ixgbe-remove-redundant-MAC-flag-check.patch	2020-11-23 17:10:13.991061583 +0000
@@ -1 +1 @@
-From 5db5d3b72e7cd5c6c986ef72924eb9069c842063 Mon Sep 17 00:00:00 2001
+From 671fa14c8e11280a0fedaf238051bf209cd7f141 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5db5d3b72e7cd5c6c986ef72924eb9069c842063 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index dff04c462c..39f6ed73f6 100644
+index c7059ea418..22d48866cc 100644


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'vhost: fix error path when setting memory tables' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (11 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: Xuan Ding, Chenbo Xia, Xueming Li, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 36b1fdd3248fcf1a87eded42f82ca2648fa54293 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Thu, 12 Nov 2020 18:10:27 +0100
Subject: [PATCH] vhost: fix error path when setting memory tables

[ upstream commit 726a14eb83a594011aba5e09159b47f12bc1bad0 ]

If an error is encountered before the memory regions are
parsed, the file descriptors for these shared buffers are
leaked.

This patch fixes this by closing the message file descriptors
on error, taking care of avoiding double closing of the file
descriptors. guest_pages is also freed, even though it was not
leaked as its pointer was not overridden on subsequent function
calls.

Fixes: 8f972312b8f4 ("vhost: support vhost-user")

Reported-by: Xuan Ding <xuan.ding@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Xueming Li <xuemingl@nvidia.com>
---
 lib/librte_vhost/vhost_user.c | 60 ++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 754759f6e0..f35ea97b6a 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -89,6 +89,13 @@ close_msg_fds(struct VhostUserMsg *msg)
 	int i;
 
-	for (i = 0; i < msg->fd_num; i++)
-		close(msg->fds[i]);
+	for (i = 0; i < msg->fd_num; i++) {
+		int fd = msg->fds[i];
+
+		if (fd == -1)
+			continue;
+
+		msg->fds[i] = -1;
+		close(fd);
+	}
 }
 
@@ -1005,5 +1012,4 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	uint32_t i;
 	int populate;
-	int fd;
 
 	if (validate_msg_fds(msg, memory->nregions) != 0)
@@ -1013,5 +1019,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		RTE_LOG(ERR, VHOST_CONFIG,
 			"too many memory regions (%u)\n", memory->nregions);
-		return VH_RESULT_ERR;
+		goto close_msg_fds;
 	}
 
@@ -1046,5 +1052,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				"for dev->guest_pages\n",
 				dev->vid);
-			return VH_RESULT_ERR;
+			goto close_msg_fds;
 		}
 	}
@@ -1056,10 +1062,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			"(%d) failed to allocate memory for dev->mem\n",
 			dev->vid);
-		return VH_RESULT_ERR;
+		goto free_guest_pages;
 	}
 	dev->mem->nregions = memory->nregions;
 
 	for (i = 0; i < memory->nregions; i++) {
-		fd  = msg->fds[i];
 		reg = &dev->mem->regions[i];
 
@@ -1067,5 +1072,11 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		reg->guest_user_addr = memory->regions[i].userspace_addr;
 		reg->size            = memory->regions[i].memory_size;
-		reg->fd              = fd;
+		reg->fd              = msg->fds[i];
+
+		/*
+		 * Assign invalid file descriptor value to avoid double
+		 * closing on error path.
+		 */
+		msg->fds[i] = -1;
 
 		mmap_offset = memory->regions[i].mmap_offset;
@@ -1077,5 +1088,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				"(%#"PRIx64") overflow\n",
 				mmap_offset, reg->size);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
@@ -1090,9 +1101,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 		 * aligned.
 		 */
-		alignment = get_blk_size(fd);
+		alignment = get_blk_size(reg->fd);
 		if (alignment == (uint64_t)-1) {
 			RTE_LOG(ERR, VHOST_CONFIG,
 				"couldn't get hugepage size through fstat\n");
-			goto err_mmap;
+			goto free_mem_table;
 		}
 		mmap_size = RTE_ALIGN_CEIL(mmap_size, alignment);
@@ -1110,15 +1121,15 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 					"or alignment (0x%" PRIx64 ") is invalid\n",
 					reg->size + mmap_offset, alignment);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
 		populate = (dev->dequeue_zero_copy) ? MAP_POPULATE : 0;
 		mmap_addr = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,
-				 MAP_SHARED | populate, fd, 0);
+				 MAP_SHARED | populate, reg->fd, 0);
 
 		if (mmap_addr == MAP_FAILED) {
 			RTE_LOG(ERR, VHOST_CONFIG,
 				"mmap region %u failed.\n", i);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
@@ -1133,5 +1144,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 					"adding guest pages to region %u failed.\n",
 					i);
-				goto err_mmap;
+				goto free_mem_table;
 			}
 
@@ -1176,9 +1187,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			RTE_LOG(ERR, VHOST_CONFIG,
 				"Failed to read qemu ack on postcopy set-mem-table\n");
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
 		if (validate_msg_fds(&ack_msg, 0) != 0)
-			goto err_mmap;
+			goto free_mem_table;
 
 		if (ack_msg.request.master != VHOST_USER_SET_MEM_TABLE) {
@@ -1186,5 +1197,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				"Bad qemu ack on postcopy set-mem-table (%d)\n",
 				ack_msg.request.master);
-			goto err_mmap;
+			goto free_mem_table;
 		}
 
@@ -1210,5 +1221,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 					i, dev->postcopy_ufd,
 					strerror(errno));
-				goto err_mmap;
+				goto free_mem_table;
 			}
 			RTE_LOG(INFO, VHOST_CONFIG,
@@ -1219,5 +1230,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 				(uint64_t)reg_struct.range.len - 1);
 #else
-			goto err_mmap;
+			goto free_mem_table;
 #endif
 		}
@@ -1238,5 +1249,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			if (!dev) {
 				dev = *pdev;
-				goto err_mmap;
+				goto free_mem_table;
 			}
 
@@ -1249,8 +1260,13 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	return VH_RESULT_OK;
 
-err_mmap:
+free_mem_table:
 	free_mem_region(dev);
 	rte_free(dev->mem);
 	dev->mem = NULL;
+free_guest_pages:
+	rte_free(dev->guest_pages);
+	dev->guest_pages = NULL;
+close_msg_fds:
+	close_msg_fds(msg);
 	return VH_RESULT_ERR;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.328560137 +0000
+++ 0014-vhost-fix-error-path-when-setting-memory-tables.patch	2020-11-23 17:10:13.993061585 +0000
@@ -1 +1 @@
-From 726a14eb83a594011aba5e09159b47f12bc1bad0 Mon Sep 17 00:00:00 2001
+From 36b1fdd3248fcf1a87eded42f82ca2648fa54293 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 726a14eb83a594011aba5e09159b47f12bc1bad0 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index 8a8726f8b8..3898c93d1f 100644
+index 754759f6e0..f35ea97b6a 100644
@@ -31 +32 @@
-@@ -100,6 +100,13 @@ close_msg_fds(struct VhostUserMsg *msg)
+@@ -89,6 +89,13 @@ close_msg_fds(struct VhostUserMsg *msg)
@@ -54 +55 @@
- 		VHOST_LOG_CONFIG(ERR,
+ 		RTE_LOG(ERR, VHOST_CONFIG,
@@ -56 +57 @@
--		return RTE_VHOST_MSG_RESULT_ERR;
+-		return VH_RESULT_ERR;
@@ -60 +61 @@
-@@ -1055,5 +1061,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1046,5 +1052,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -63 +64 @@
--			return RTE_VHOST_MSG_RESULT_ERR;
+-			return VH_RESULT_ERR;
@@ -67 +68 @@
-@@ -1065,10 +1071,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1056,10 +1062,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -70 +71 @@
--		return RTE_VHOST_MSG_RESULT_ERR;
+-		return VH_RESULT_ERR;
@@ -79 +80 @@
-@@ -1076,5 +1081,11 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1067,5 +1072,11 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -92 +93 @@
-@@ -1086,5 +1097,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1077,5 +1088,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -99 +100 @@
-@@ -1099,9 +1110,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1090,9 +1101,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -105 +106 @@
- 			VHOST_LOG_CONFIG(ERR,
+ 			RTE_LOG(ERR, VHOST_CONFIG,
@@ -111 +112 @@
-@@ -1119,15 +1130,15 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1110,15 +1121,15 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -118 +119 @@
- 		populate = dev->async_copy ? MAP_POPULATE : 0;
+ 		populate = (dev->dequeue_zero_copy) ? MAP_POPULATE : 0;
@@ -124 +125 @@
- 			VHOST_LOG_CONFIG(ERR,
+ 			RTE_LOG(ERR, VHOST_CONFIG,
@@ -130 +131 @@
-@@ -1142,5 +1153,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1133,5 +1144,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -137,2 +138,2 @@
-@@ -1185,9 +1196,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
- 			VHOST_LOG_CONFIG(ERR,
+@@ -1176,9 +1187,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ 			RTE_LOG(ERR, VHOST_CONFIG,
@@ -149 +150 @@
-@@ -1195,5 +1206,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1186,5 +1197,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -156 +157 @@
-@@ -1219,5 +1230,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1210,5 +1221,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -162,2 +163,2 @@
- 			VHOST_LOG_CONFIG(INFO,
-@@ -1228,5 +1239,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ 			RTE_LOG(INFO, VHOST_CONFIG,
+@@ -1219,5 +1230,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -170 +171 @@
-@@ -1250,5 +1261,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1238,5 +1249,5 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -177,2 +178,2 @@
-@@ -1261,8 +1272,13 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
- 	return RTE_VHOST_MSG_RESULT_OK;
+@@ -1249,8 +1260,13 @@ vhost_user_set_mem_table(struct virtio_net **pdev, struct VhostUserMsg *msg,
+ 	return VH_RESULT_OK;
@@ -190 +191 @@
- 	return RTE_VHOST_MSG_RESULT_ERR;
+ 	return VH_RESULT_ERR;


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (12 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: Xuan Ding, Chenbo Xia, Xueming Li, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 34ed9a3f953af3ac036f9cf6d14d397b251d3bdb Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Thu, 12 Nov 2020 18:10:28 +0100
Subject: [PATCH] vhost: fix fd leak in dirty logging setup

[ upstream commit 6dc3f119ce7310e4e473e5759885ac773dbb12ef ]

This patch fixes a file descriptor leak which happens
in the error path of vhost_user_set_log_base().

Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")

Reported-by: Xuan Ding <xuan.ding@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Xueming Li <xuemingl@nvidia.com>
---
 lib/librte_vhost/vhost_user.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index f35ea97b6a..ca6f8338cc 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1609,5 +1609,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			"invalid log base msg size: %"PRId32" != %d\n",
 			msg->size, (int)sizeof(VhostUserLog));
-		return VH_RESULT_ERR;
+		goto close_msg_fds;
 	}
 
@@ -1620,5 +1620,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 			"log offset %#"PRIx64" and log size %#"PRIx64" overflow\n",
 			off, size);
-		return VH_RESULT_ERR;
+		goto close_msg_fds;
 	}
 
@@ -1657,4 +1657,8 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
 
 	return VH_RESULT_REPLY;
+
+close_msg_fds:
+	close_msg_fds(msg);
+	return VH_RESULT_ERR;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.351861789 +0000
+++ 0015-vhost-fix-fd-leak-in-dirty-logging-setup.patch	2020-11-23 17:10:13.995061587 +0000
@@ -1 +1 @@
-From 6dc3f119ce7310e4e473e5759885ac773dbb12ef Mon Sep 17 00:00:00 2001
+From 34ed9a3f953af3ac036f9cf6d14d397b251d3bdb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6dc3f119ce7310e4e473e5759885ac773dbb12ef ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 3898c93d1f..23c115f994 100644
+index f35ea97b6a..ca6f8338cc 100644
@@ -24 +25 @@
-@@ -2087,5 +2087,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1609,5 +1609,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -27 +28 @@
--		return RTE_VHOST_MSG_RESULT_ERR;
+-		return VH_RESULT_ERR;
@@ -31 +32 @@
-@@ -2098,5 +2098,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1620,5 +1620,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -34 +35 @@
--		return RTE_VHOST_MSG_RESULT_ERR;
+-		return VH_RESULT_ERR;
@@ -38 +39 @@
-@@ -2135,4 +2135,8 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1657,4 +1657,8 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -40 +41 @@
- 	return RTE_VHOST_MSG_RESULT_REPLY;
+ 	return VH_RESULT_REPLY;
@@ -44 +45 @@
-+	return RTE_VHOST_MSG_RESULT_ERR;
++	return VH_RESULT_ERR;


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'vhost: fix fd leak in kick setup' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (13 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: Chenbo Xia, Xueming Li, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From bac2835e77a86ae2406e67bf3b98af165e79c7e7 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Thu, 12 Nov 2020 18:10:29 +0100
Subject: [PATCH] vhost: fix fd leak in kick setup

[ upstream commit bc900f86aa943006b9f97f3297aeed5ef3caaf5e ]

This patch fixes a file descriptor leak which happens
in the error path of vhost_user_set_vring_kick().

Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application")

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Xueming Li <xuemingl@nvidia.com>
---
 lib/librte_vhost/vhost_user.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index ca6f8338cc..5f46897e5d 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1382,6 +1382,10 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
 	/* Interpret ring addresses only when ring is started. */
 	dev = translate_ring_addresses(dev, file.index);
-	if (!dev)
+	if (!dev) {
+		if (file.fd != VIRTIO_INVALID_EVENTFD)
+			close(file.fd);
+
 		return VH_RESULT_ERR;
+	}
 
 	*pdev = dev;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.375261430 +0000
+++ 0016-vhost-fix-fd-leak-in-kick-setup.patch	2020-11-23 17:10:13.997061589 +0000
@@ -1 +1 @@
-From bc900f86aa943006b9f97f3297aeed5ef3caaf5e Mon Sep 17 00:00:00 2001
+From bac2835e77a86ae2406e67bf3b98af165e79c7e7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc900f86aa943006b9f97f3297aeed5ef3caaf5e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 23c115f994..45c8ac09da 100644
+index ca6f8338cc..5f46897e5d 100644
@@ -23 +24 @@
-@@ -1859,6 +1859,10 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
+@@ -1382,6 +1382,10 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg,
@@ -31 +32 @@
- 		return RTE_VHOST_MSG_RESULT_ERR;
+ 		return VH_RESULT_ERR;


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (14 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 18:35   ` David Marchand
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor
                   ` (12 subsequent siblings)
  28 siblings, 1 reply; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Qi Zhang, Andrew Rybchenko, Igor Romanov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 922feed76bd5d8fe06b95a56afabd3a95987b047 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Fri, 13 Nov 2020 11:44:00 +0000
Subject: [PATCH] app/testpmd: fix MTU after device configure

[ upstream commit 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f ]

In 'rte_eth_dev_configure()', if 'DEV_RX_OFFLOAD_JUMBO_FRAME' is not set
the max frame size is limited to 'RTE_ETHER_MAX_LEN' (1518).
This is mistake because for the PMDs that has frame size bigger than
"RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN" (18 bytes), the MTU becomes
less than 1500, causing a valid frame with 1500 bytes payload to be
dropped.

Since 'rte_eth_dev_set_mtu()' works as expected, it is called after
'rte_eth_dev_configure()' to fix the MTU.
It may look redundant to set MTU after 'rte_eth_dev_configure()', both
with default values, but it is not, the resulting MTU config can be
different in the device based on frame overhead of the PMD.

And instead of setting the MTU to default value, it is first get via
'rte_eth_dev_get_mtu()' and set again, this is to cover cases MTU
changed from testpmd command line.

'rte_eth_dev_set_mtu()', '-ENOTSUP' error is ignored to prevent
irrelevant warning messages for the virtual PMDs.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Tested-by: Igor Romanov <igor.romanov@oktetlabs.ru>
---
 app/test-pmd/testpmd.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 018bd32ec6..21eb315983 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1969,4 +1969,6 @@ start_port(portid_t pid)
 
 		if (port->need_reconfig > 0) {
+			uint16_t mtu = RTE_ETHER_MTU;
+
 			port->need_reconfig = 0;
 
@@ -1995,4 +1997,21 @@ start_port(portid_t pid)
 				return -1;
 			}
+
+			/*
+			 * Workaround for rte_eth_dev_configure(), max_rx_pkt_len
+			 * set MTU wrong for the PMDs that have frame overhead
+			 * bigger than RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN.
+			 * For a PMD that has 26 bytes overhead, rte_eth_dev_configure()
+			 * can set MTU to max 1492, not to expected 1500 bytes.
+			 * Using rte_eth_dev_set_mtu() to be able to set MTU correctly,
+			 * default MTU value is 1500.
+			 */
+			diag = rte_eth_dev_get_mtu(pi, &mtu);
+			if (diag)
+				printf("Failed to get MTU for port %d\n", pi);
+			diag = rte_eth_dev_set_mtu(pi, mtu);
+			if (diag != 0 && diag != -ENOTSUP)
+				printf("Failed to set MTU to %u for port %d\n",
+						mtu, pi);
 		}
 		if (port->need_reconfig_queues > 0) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.398320110 +0000
+++ 0017-app-testpmd-fix-MTU-after-device-configure.patch	2020-11-23 17:10:14.000061593 +0000
@@ -1 +1 @@
-From 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f Mon Sep 17 00:00:00 2001
+From 922feed76bd5d8fe06b95a56afabd3a95987b047 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f ]
+
@@ -27 +28,0 @@
-Cc: stable@dpdk.org
@@ -38 +39 @@
-index 33fc0fddf5..48e9647fc7 100644
+index 018bd32ec6..21eb315983 100644
@@ -41 +42 @@
-@@ -2538,4 +2538,6 @@ start_port(portid_t pid)
+@@ -1969,4 +1969,6 @@ start_port(portid_t pid)
@@ -48 +49 @@
-@@ -2571,4 +2573,21 @@ start_port(portid_t pid)
+@@ -1995,4 +1997,21 @@ start_port(portid_t pid)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'app/eventdev: check timer adadpters number' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (15 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Pavan Nikhilesh; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 5567063f1dae62d8d4cacc4d628adb9d79c72c52 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Thu, 12 Nov 2020 23:13:29 +0530
Subject: [PATCH] app/eventdev: check timer adadpters number

[ upstream commit 15c19f36f59ed56b87ab4eb192a859bf273dbccc ]

Fix SEGFAULT when nb_timer_adapters command line parameter is
set to 0.

Fixes: 98c6292105d4 ("app/eventdev: add options for event timer adapter")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 app/test-eventdev/evt_options.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c
index cfa43a1655..c4ce24bc68 100644
--- a/app/test-eventdev/evt_options.c
+++ b/app/test-eventdev/evt_options.c
@@ -187,4 +187,8 @@ evt_parse_nb_timer_adptrs(struct evt_options *opt, const char *arg)
 
 	ret = parser_read_uint8(&(opt->nb_timer_adptrs), arg);
+	if (opt->nb_timer_adptrs <= 0) {
+		evt_err("Number of timer adapters cannot be <= 0");
+		return -EINVAL;
+	}
 
 	return ret;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.423242361 +0000
+++ 0018-app-eventdev-check-timer-adadpters-number.patch	2020-11-23 17:10:14.000061593 +0000
@@ -1 +1 @@
-From 15c19f36f59ed56b87ab4eb192a859bf273dbccc Mon Sep 17 00:00:00 2001
+From 5567063f1dae62d8d4cacc4d628adb9d79c72c52 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 15c19f36f59ed56b87ab4eb192a859bf273dbccc ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 6994ac453c..0d04ea9f8d 100644
+index cfa43a1655..c4ce24bc68 100644
@@ -21 +22 @@
-@@ -198,4 +198,8 @@ evt_parse_nb_timer_adptrs(struct evt_options *opt, const char *arg)
+@@ -187,4 +187,8 @@ evt_parse_nb_timer_adptrs(struct evt_options *opt, const char *arg)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'examples/kni: fix build with pkg-config' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (16 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: David Marchand; +Cc: Bruce Richardson, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 80741c6a2ce00ce9a46a9944caa0457d85378685 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 14 Nov 2020 10:05:25 +0100
Subject: [PATCH] examples/kni: fix build with pkg-config

[ upstream commit 58a0648bd33c3cb7ff6e746c639e0613fda4b9b0 ]

rm -f build/kni build/kni-static build/kni-shared
test -d build && rmdir -p build || true
[...]
/usr/bin/ld: /tmp/cc72ssnK.o: undefined reference to symbol
'pthread_join@@GLIBC_2.2.5'

This example explicitly call pthread API and should be linked against
the pthread library.

Fixes: 724beb913b44 ("examples/kni: monitor and update link state continually")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 examples/kni/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/kni/Makefile b/examples/kni/Makefile
index b3d39a5778..c6e3b8eed0 100644
--- a/examples/kni/Makefile
+++ b/examples/kni/Makefile
@@ -26,4 +26,6 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
 LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
 
+LDFLAGS += -pthread
+
 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.444258906 +0000
+++ 0019-examples-kni-fix-build-with-pkg-config.patch	2020-11-23 17:10:14.001061594 +0000
@@ -1 +1 @@
-From 58a0648bd33c3cb7ff6e746c639e0613fda4b9b0 Mon Sep 17 00:00:00 2001
+From 80741c6a2ce00ce9a46a9944caa0457d85378685 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 58a0648bd33c3cb7ff6e746c639e0613fda4b9b0 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index fa9fa85319..bbf3bcae12 100644
+index b3d39a5778..c6e3b8eed0 100644
@@ -28,2 +29,2 @@
-@@ -28,4 +28,6 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
- LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+@@ -26,4 +26,6 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+ LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'examples/l2fwd-crypto: fix build with pkg-config' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (17 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: David Marchand; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 1ceffb2318882648926fd29fa9023da6d3a71186 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 14 Nov 2020 10:05:26 +0100
Subject: [PATCH] examples/l2fwd-crypto: fix build with pkg-config

[ upstream commit bcd3004381b09adaa1ab7ceb9c0592e640fb210c ]

Two issues fixed here.

First add the experimental flag.
Then fix a link issue with the crypto scheduler driver:
/usr/bin/ld: /tmp/cchr7aHA.o: in function `main':
main.c:(.text.startup+0x1673): undefined reference to
`rte_cryptodev_scheduler_workers_get'
collect2: error: ld returned 1 exit status

Fixes: e3bcb99a5e13 ("examples/l2fwd-crypto: limit number of sessions")
Fixes: 261bbff75e34 ("examples: use separate crypto session mempools")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 examples/l2fwd-crypto/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile
index 08881ff183..4c085ab221 100644
--- a/examples/l2fwd-crypto/Makefile
+++ b/examples/l2fwd-crypto/Makefile
@@ -25,4 +25,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
 LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
 
+CFLAGS += -DALLOW_EXPERIMENTAL_API
+CONFIG_DEFINES = $(shell $(CC) $(CFLAGS) -dM -E - < /dev/null)
+ifneq ($(findstring RTE_CRYPTO_SCHEDULER,$(CONFIG_DEFINES)),)
+LDFLAGS_SHARED += -lrte_crypto_scheduler
+endif
+
 build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
 	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.465625868 +0000
+++ 0020-examples-l2fwd-crypto-fix-build-with-pkg-config.patch	2020-11-23 17:10:14.001061594 +0000
@@ -1 +1 @@
-From bcd3004381b09adaa1ab7ceb9c0592e640fb210c Mon Sep 17 00:00:00 2001
+From 1ceffb2318882648926fd29fa9023da6d3a71186 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bcd3004381b09adaa1ab7ceb9c0592e640fb210c ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 4953ee2b95..7731eccd03 100644
+index 08881ff183..4c085ab221 100644
@@ -28,2 +29,2 @@
-@@ -27,4 +27,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
- LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk)
+@@ -25,4 +25,10 @@ LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
+ LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'examples/performance-thread: fix build with pkg-config' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (18 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: David Marchand; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From b53c6db14d3636d8a1f3565e419b18333d73c65c Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Sat, 14 Nov 2020 10:05:30 +0100
Subject: [PATCH] examples/performance-thread: fix build with pkg-config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit e0216ac509558b2b95d34f5b4df604e0e4d0bf1e ]

main.c: In function ‘lthread_tx’:
main.c:2091:25: error: implicit declaration of function ‘sched_getcpu’;
 did you mean ‘sched_getparam’? [-Werror=implicit-function-declaration]
 2091 |  tx_conf->conf.cpu_id = sched_getcpu();
      |                         ^~~~~~~~~~~~
      |                         sched_getparam
cc1: all warnings being treated as errors

Explicitly pass _GNU_SOURCE and include missing header (rather than
rely on automagic inclusion from other system headers).

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

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 examples/performance-thread/l3fwd-thread/main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index 6768a0ebd3..b57943749f 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -3,4 +3,8 @@
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -13,4 +17,5 @@
 #include <errno.h>
 #include <getopt.h>
+#include <sched.h>
 
 #include <rte_common.h>
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.486445228 +0000
+++ 0021-examples-performance-thread-fix-build-with-pkg-confi.patch	2020-11-23 17:10:14.004061597 +0000
@@ -1 +1 @@
-From e0216ac509558b2b95d34f5b4df604e0e4d0bf1e Mon Sep 17 00:00:00 2001
+From b53c6db14d3636d8a1f3565e419b18333d73c65c Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit e0216ac509558b2b95d34f5b4df604e0e4d0bf1e ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 7bf61db6be..4d82fb82ef 100644
+index 6768a0ebd3..b57943749f 100644


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (19 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Ibtisam Tariq; +Cc: David Marchand, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 591190e371b85365968da3d0e2d991a8babf1a86 Mon Sep 17 00:00:00 2001
From: Ibtisam Tariq <ibtisam.tariq@emumba.com>
Date: Mon, 2 Nov 2020 11:19:15 +0000
Subject: [PATCH] doc: fix rule file parameters in l3fwd-acl guide

[ upstream commit 1995c2c1b99afe89be8b532d2fde0d3619446f3c ]

Add "--" and remove extra spaces in l3fwd-acl commands.

Fixes: d0dff9ba445e ("doc: sample application user guide")

Signed-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 doc/guides/sample_app_ug/l3_forward_access_ctrl.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst
index a44fbcd52c..32adf2d3aa 100644
--- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst
+++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst
@@ -237,5 +237,5 @@ The application has a number of command line options:
 ..  code-block:: console
 
-    ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa]
+    ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa]
 
 
@@ -269,5 +269,5 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s
 ..  code-block:: console
 
-    ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar
+    ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="rule_ipv4.db" -- rule_ipv6="rule_ipv6.db" --scalar
 
 In this command:
@@ -291,7 +291,7 @@ In this command:
     +----------+------------+-----------+-------------------------------------+
 
-*   The --rule_ipv4 option specifies the reading of IPv4 rules sets from the ./ rule_ipv4.db file.
+*   The --rule_ipv4 option specifies the reading of IPv4 rules sets from the rule_ipv4.db file.
 
-*   The --rule_ipv6 option specifies the reading of IPv6 rules sets from the ./ rule_ipv6.db file.
+*   The --rule_ipv6 option specifies the reading of IPv6 rules sets from the rule_ipv6.db file.
 
 *   The --scalar option specifies the performing of rule lookup with a scalar function.
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.510812766 +0000
+++ 0022-doc-fix-rule-file-parameters-in-l3fwd-acl-guide.patch	2020-11-23 17:10:14.005061599 +0000
@@ -1 +1 @@
-From 1995c2c1b99afe89be8b532d2fde0d3619446f3c Mon Sep 17 00:00:00 2001
+From 591190e371b85365968da3d0e2d991a8babf1a86 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1995c2c1b99afe89be8b532d2fde0d3619446f3c ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index eee5d81850..2cf6e4556f 100644
+index a44fbcd52c..32adf2d3aa 100644
@@ -24,2 +25,2 @@
--    ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--alg=<val>] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM]
-+    ./<build_dir>/examples/dpdk-l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--alg=<val>] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa] [--eth-dest=X,MM:MM:MM:MM:MM:MM]
+-    ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa]
++    ./build/l3fwd-acl [EAL options] -- -p PORTMASK [-P] --config(port,queue,lcore)[,(port,queue,lcore)] --rule_ipv4 FILENAME --rule_ipv6 FILENAME [--scalar] [--enable-jumbo [--max-pkt-len PKTLEN]] [--no-numa]
@@ -28 +29 @@
-@@ -272,5 +272,5 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s
+@@ -269,5 +269,5 @@ To enable L3 forwarding between two ports, assuming that both ports are in the s
@@ -31,2 +32,2 @@
--    ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --alg=scalar
-+    ./<build_dir>/examples/dpdk-l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="rule_ipv4.db" --rule_ipv6="rule_ipv6.db" --alg=scalar
+-    ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="./rule_ipv4.db" -- rule_ipv6="./rule_ipv6.db" --scalar
++    ./build/l3fwd-acl -l 1,2 -n 4 -- -p 0x3 --config="(0,0,1),(1,0,2)" --rule_ipv4="rule_ipv4.db" -- rule_ipv6="rule_ipv6.db" --scalar
@@ -35 +36 @@
-@@ -294,7 +294,7 @@ In this command:
+@@ -291,7 +291,7 @@ In this command:
@@ -44 +45 @@
- *   The --alg=scalar option specifies the performing of rule lookup with a scalar function.
+ *   The --scalar option specifies the performing of rule lookup with a scalar function.


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (20 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Maxime Leroy; +Cc: Nelio Laranjeiro, Viacheslav Ovsiienko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 77fb0d8675924094ae787238477eebad1010bfa0 Mon Sep 17 00:00:00 2001
From: Maxime Leroy <maxime.leroy@6wind.com>
Date: Tue, 17 Nov 2020 12:26:46 +0100
Subject: [PATCH] net/mlx5: fix Rx queue count calculation

[ upstream commit 9ae9720d7f0c12f877df9214f7cbedae546d4020 ]

The commit d2d57605522d ("net/mlx5: fix Rx queue count calculation") is
incorrect because the count calculation is wrong for the next cqe:

Example:

 Compressed Set of packets 1  |   Compressed Set of packets 2
C | a | e0 | e1 | e2 | e3 | e4 | e5 | C | a | e0

There are 2 compressed set of packets in the first queue. For the first
set, n is computed correctly.

But for the second, n is not computed properly. Because the zip context
is for the first set. The  second set is not yet decompressed, so
there are no context.

To fix the issue, we should only use the zip context for the first CQEs
series.

Fixes: d2d57605522d ("net/mlx5: fix Rx queue count calculation")

Signed-off-by: Maxime Leroy <maxime.leroy@6wind.com>
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 2896a9b4ef..dd7b183395 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -431,9 +431,16 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 	struct rxq_zip *zip = &rxq->zip;
 	volatile struct mlx5_cqe *cqe;
-	unsigned int cq_ci = rxq->cq_ci;
 	const unsigned int cqe_n = (1 << rxq->cqe_n);
 	const unsigned int cqe_cnt = cqe_n - 1;
-	unsigned int used = 0;
+	unsigned int cq_ci, used;
 
+	/* if we are processing a compressed cqe */
+	if (zip->ai) {
+		used = zip->cqe_cnt - zip->ai;
+		cq_ci = zip->cq_ci;
+	} else {
+		used = 0;
+		cq_ci = rxq->cq_ci;
+	}
 	cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
 	while (check_cqe(cqe, cqe_n, cq_ci) == 0) {
@@ -443,8 +450,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 		op_own = cqe->op_own;
 		if (MLX5_CQE_FORMAT(op_own) == MLX5_COMPRESSED)
-			if (unlikely(zip->ai))
-				n = zip->cqe_cnt - zip->ai;
-			else
-				n = rte_be_to_cpu_32(cqe->byte_cnt);
+			n = rte_be_to_cpu_32(cqe->byte_cnt);
 		else
 			n = 1;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.532486728 +0000
+++ 0023-net-mlx5-fix-Rx-queue-count-calculation.patch	2020-11-23 17:10:14.007061601 +0000
@@ -1 +1 @@
-From 9ae9720d7f0c12f877df9214f7cbedae546d4020 Mon Sep 17 00:00:00 2001
+From 77fb0d8675924094ae787238477eebad1010bfa0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9ae9720d7f0c12f877df9214f7cbedae546d4020 ]
+
@@ -25 +26,0 @@
-Cc: stable@dpdk.org
@@ -35 +36 @@
-index 844a1c633d..2733dcd3ff 100644
+index 2896a9b4ef..dd7b183395 100644
@@ -38 +39 @@
-@@ -463,9 +463,16 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -431,9 +431,16 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -56,2 +57,2 @@
- 	while (check_cqe(cqe, cqe_n, cq_ci) != MLX5_CQE_STATUS_HW_OWN) {
-@@ -475,8 +482,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+ 	while (check_cqe(cqe, cqe_n, cq_ci) == 0) {
+@@ -443,8 +450,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (21 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Didier Pallard; +Cc: Maxime Leroy, Viacheslav Ovsiienko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From b8a7d45b93255969067b0150fa9d086fa86586a1 Mon Sep 17 00:00:00 2001
From: Didier Pallard <didier.pallard@6wind.com>
Date: Tue, 17 Nov 2020 12:26:47 +0100
Subject: [PATCH] net/mlx5: fix Rx descriptor status

[ upstream commit 7c085d3a4a06b60cd04a408d7edf4e9382172a42 ]

Three bugs in rx_queue_count function:
- One entry may contain several segments, so 'used' must be multiplied
  by number of segments per entry to properly reflect the queue usage.
- The number of cqes is equals to (1U << rxq->elts_n) - 1 in SPRQ mode.
  The range returned by rx_queue_count should be the number of entries
  used in queue, so it ranges from 0 to max number of entries
  in queue, not this number minus one.
- For MPRQ mode, we need to take into account of the number of strd.

Fixes: 8788fec1f269 ("net/mlx5: implement descriptor status API")

Signed-off-by: Didier Pallard <didier.pallard@6wind.com>
Signed-off-by: Maxime Leroy <maxime.leroy@6wind.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index dd7b183395..c9305334d0 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -432,4 +432,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 	volatile struct mlx5_cqe *cqe;
 	const unsigned int cqe_n = (1 << rxq->cqe_n);
+	const unsigned int sges_n = (1 << rxq->sges_n);
+	const unsigned int elts_n = (1 << rxq->elts_n);
+	const unsigned int strd_n = (1 << rxq->strd_num_n);
 	const unsigned int cqe_cnt = cqe_n - 1;
 	unsigned int cq_ci, used;
@@ -457,5 +460,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 		cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
 	}
-	used = RTE_MIN(used, cqe_n);
+	used = RTE_MIN(used * sges_n, elts_n * strd_n);
 	return used;
 }
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.558324428 +0000
+++ 0024-net-mlx5-fix-Rx-descriptor-status.patch	2020-11-23 17:10:14.009061603 +0000
@@ -1 +1 @@
-From 7c085d3a4a06b60cd04a408d7edf4e9382172a42 Mon Sep 17 00:00:00 2001
+From b8a7d45b93255969067b0150fa9d086fa86586a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7c085d3a4a06b60cd04a408d7edf4e9382172a42 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 2733dcd3ff..2ecf901fb1 100644
+index dd7b183395..c9305334d0 100644
@@ -29 +30 @@
-@@ -464,4 +464,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -432,4 +432,7 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -37 +38 @@
-@@ -489,5 +492,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -457,5 +460,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (22 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 18:36   ` David Marchand
  2020-11-23 17:12 ` [dpdk-stable] patch 'compress/isal: check allocation in queue setup' " Kevin Traynor
                   ` (4 subsequent siblings)
  28 siblings, 1 reply; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Bo Chen, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 6326a29a056706db93e58067626eb2a3340a3a4c Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Mon, 16 Nov 2020 19:03:54 +0000
Subject: [PATCH] app/testpmd: revert setting MTU explicitly after configure

[ upstream commit 56f0534311d4c61c63e2455169749ae440278122 ]

Setting MTU after each 'rte_eth_dev_configure()' prevents using
"--max-pkt-len=N" parameter and "port config all max-pkt-len #" command

This is breaking DTS scatter test case which is using
"--max-pkt-len=9000" testpmd parameter.

Reverting workaround to recover the DTS testcase.

Fixes: 1c21ee95cf52 ("app/testpmd: fix MTU after device configure")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Bo Chen <box.c.chen@intel.com>
---
 app/test-pmd/testpmd.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 21eb315983..018bd32ec6 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1969,6 +1969,4 @@ start_port(portid_t pid)
 
 		if (port->need_reconfig > 0) {
-			uint16_t mtu = RTE_ETHER_MTU;
-
 			port->need_reconfig = 0;
 
@@ -1997,21 +1995,4 @@ start_port(portid_t pid)
 				return -1;
 			}
-
-			/*
-			 * Workaround for rte_eth_dev_configure(), max_rx_pkt_len
-			 * set MTU wrong for the PMDs that have frame overhead
-			 * bigger than RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN.
-			 * For a PMD that has 26 bytes overhead, rte_eth_dev_configure()
-			 * can set MTU to max 1492, not to expected 1500 bytes.
-			 * Using rte_eth_dev_set_mtu() to be able to set MTU correctly,
-			 * default MTU value is 1500.
-			 */
-			diag = rte_eth_dev_get_mtu(pi, &mtu);
-			if (diag)
-				printf("Failed to get MTU for port %d\n", pi);
-			diag = rte_eth_dev_set_mtu(pi, mtu);
-			if (diag != 0 && diag != -ENOTSUP)
-				printf("Failed to set MTU to %u for port %d\n",
-						mtu, pi);
 		}
 		if (port->need_reconfig_queues > 0) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.583915439 +0000
+++ 0025-app-testpmd-revert-setting-MTU-explicitly-after-conf.patch	2020-11-23 17:10:14.012061606 +0000
@@ -1 +1 @@
-From 56f0534311d4c61c63e2455169749ae440278122 Mon Sep 17 00:00:00 2001
+From 6326a29a056706db93e58067626eb2a3340a3a4c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 56f0534311d4c61c63e2455169749ae440278122 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 48e9647fc7..33fc0fddf5 100644
+index 21eb315983..018bd32ec6 100644
@@ -27 +28 @@
-@@ -2538,6 +2538,4 @@ start_port(portid_t pid)
+@@ -1969,6 +1969,4 @@ start_port(portid_t pid)
@@ -34 +35 @@
-@@ -2573,21 +2571,4 @@ start_port(portid_t pid)
+@@ -1997,21 +1995,4 @@ start_port(portid_t pid)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'compress/isal: check allocation in queue setup' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (23 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Lee Daly, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From f1af8302c34cd0eab358b95c12007cd4cc33eb2c Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Mon, 2 Nov 2020 19:36:24 +0800
Subject: [PATCH] compress/isal: check allocation in queue setup

[ upstream commit e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 ]

The function rte_zmalloc() could return NULL, the return value
need to be checked.

Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality")
Fixes: 7bf4f0630af6 ("compress/isal: add ISA-L decomp functionality")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Lee Daly <lee.daly@intel.com>
---
 drivers/compress/isal/isal_compress_pmd_ops.c | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c
index a395a660d6..5e93bccf8c 100644
--- a/drivers/compress/isal/isal_compress_pmd_ops.c
+++ b/drivers/compress/isal/isal_compress_pmd_ops.c
@@ -248,9 +248,16 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 			sizeof(struct isal_zstream),  RTE_CACHE_LINE_SIZE,
 			socket_id);
-
+	if (qp->stream == NULL) {
+		ISAL_PMD_LOG(ERR, "Failed to allocate compression stream memory");
+		goto qp_setup_cleanup;
+	}
 	/* Initialize memory for compression level buffer */
 	qp->stream->level_buf = rte_zmalloc_socket("Isa-l compression lev_buf",
 			ISAL_DEF_LVL3_DEFAULT, RTE_CACHE_LINE_SIZE,
 			socket_id);
+	if (qp->stream->level_buf == NULL) {
+		ISAL_PMD_LOG(ERR, "Failed to allocate compression level_buf memory");
+		goto qp_setup_cleanup;
+	}
 
 	/* Initialize memory for decompression state structure */
@@ -258,4 +265,8 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 			sizeof(struct inflate_state), RTE_CACHE_LINE_SIZE,
 			socket_id);
+	if (qp->state == NULL) {
+		ISAL_PMD_LOG(ERR, "Failed to allocate decompression state memory");
+		goto qp_setup_cleanup;
+	}
 
 	qp->id = qp_id;
@@ -283,6 +294,9 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 
 qp_setup_cleanup:
-	if (qp)
-		rte_free(qp);
+	if (qp->stream)
+		rte_free(qp->stream->level_buf);
+	rte_free(qp->stream);
+	rte_free(qp->state);
+	rte_free(qp);
 
 	return -1;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.608652855 +0000
+++ 0026-compress-isal-check-allocation-in-queue-setup.patch	2020-11-23 17:10:14.012061606 +0000
@@ -1 +1 @@
-From e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 Mon Sep 17 00:00:00 2001
+From f1af8302c34cd0eab358b95c12007cd4cc33eb2c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 31c4559915..7d03749da3 100644
+index a395a660d6..5e93bccf8c 100644
@@ -23 +24 @@
-@@ -250,9 +250,16 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
+@@ -248,9 +248,16 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
@@ -41 +42 @@
-@@ -260,4 +267,8 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
+@@ -258,4 +265,8 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
@@ -50 +51 @@
-@@ -285,6 +296,9 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
+@@ -283,6 +294,9 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (24 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'compress/isal: check allocation in queue setup' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Gregory Etelson; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 82297adc98c43bcd82460d107f8c4b115ecca7c7 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Tue, 17 Nov 2020 20:49:39 +0200
Subject: [PATCH] examples/l3fwd-power: check packet types after start

[ upstream commit 6184a02223722b929ae99dff2ba967626448dd63 ]

l3fwd-power uses `--parse-ptype' parameter to query egress packets
type.  Before that feature is enabled l3fwd-power verifies PMD ability
to advertise supported packet types with
rte_eth_dev_get_supported_ptypes().

The above ethdev function API contains this note:
"
Better to invoke this API after the device is already started or rx burst
function is decided, to obtain correct supported ptypes.
"

The patch updates code for PMDs that register supported types after
dev_start.

Fixes: 82bea4661626 ("examples/l3fwd-power: add --parse-ptype option")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
---
 examples/l3fwd-power/main.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index c2a9d36cb6..4d1f24a1e8 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -2150,7 +2150,5 @@ main(int argc, char **argv)
 					rte_exit(EXIT_FAILURE,
 						 "Fail to add ptype cb\n");
-			} else if (!check_ptype(portid))
-				rte_exit(EXIT_FAILURE,
-					 "PMD can not provide needed ptypes\n");
+			}
 		}
 	}
@@ -2178,4 +2176,9 @@ main(int argc, char **argv)
 		/* initialize spinlock for each port */
 		rte_spinlock_init(&(locks[portid]));
+
+		if (!parse_ptype)
+			if (!check_ptype(portid))
+				rte_exit(EXIT_FAILURE,
+					"PMD can not provide needed ptypes\n");
 	}
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.630943861 +0000
+++ 0027-examples-l3fwd-power-check-packet-types-after-start.patch	2020-11-23 17:10:14.014061609 +0000
@@ -1 +1 @@
-From 6184a02223722b929ae99dff2ba967626448dd63 Mon Sep 17 00:00:00 2001
+From 82297adc98c43bcd82460d107f8c4b115ecca7c7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6184a02223722b929ae99dff2ba967626448dd63 ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index 2874285c4e..995a3b6ad7 100644
+index c2a9d36cb6..4d1f24a1e8 100644
@@ -32 +33 @@
-@@ -2708,7 +2708,5 @@ main(int argc, char **argv)
+@@ -2150,7 +2150,5 @@ main(int argc, char **argv)
@@ -41 +42 @@
-@@ -2741,4 +2739,9 @@ main(int argc, char **argv)
+@@ -2178,4 +2176,9 @@ main(int argc, char **argv)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (25 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'usertools: fix pmdinfo parsing' " Kevin Traynor
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Gregory Etelson; +Cc: Viacheslav Ovsiienko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From d83d4c863a8dc1c54c5da75a2709717d86c16309 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Tue, 17 Nov 2020 20:49:40 +0200
Subject: [PATCH] net/mlx5: fix representor interrupts handler

[ upstream commit 5882bde88da28b82f138676544ca9e807a9124f5 ]

Representor is a port in DPDK that is connected to a VF in such a way
that assuming there are no offload flows, each packet that is sent
from the VF will be received by the corresponding representor. While
each packet that is sent to a representor will be received by the VF.
This is very useful in case of SRIOV mode, where the first packet that
is sent by the VF will be received by the DPDK application which will
decide if this flow should be offloaded to the E-Switch.

Representor shares interrupts handler with host PF over the PCI
address. Therefore, after PF completes its interrupts handler
initialization, no additional actions required for representor.

Fixes: 26c08b979d26 ("net/mlx5: add port representor awareness")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 314ffc3876..8eb237e777 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -522,4 +522,7 @@ mlx5_rx_intr_vec_enable(struct rte_eth_dev *dev)
 	struct rte_intr_handle *intr_handle = dev->intr_handle;
 
+	/* Representor shares dev->intr_handle with PF. */
+	if (priv->representor)
+		return 0;
 	if (!dev->data->dev_conf.intr_conf.rxq)
 		return 0;
@@ -599,4 +602,7 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)
 	unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);
 
+	/* Representor shares dev->intr_handle with PF. */
+	if (priv->representor)
+		return;
 	if (!dev->data->dev_conf.intr_conf.rxq)
 		return;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.654318446 +0000
+++ 0028-net-mlx5-fix-representor-interrupts-handler.patch	2020-11-23 17:10:14.016061611 +0000
@@ -1 +1 @@
-From 5882bde88da28b82f138676544ca9e807a9124f5 Mon Sep 17 00:00:00 2001
+From d83d4c863a8dc1c54c5da75a2709717d86c16309 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5882bde88da28b82f138676544ca9e807a9124f5 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index f298327005..da7a8b3cd7 100644
+index 314ffc3876..8eb237e777 100644
@@ -31 +32 @@
-@@ -903,4 +903,7 @@ mlx5_rx_intr_vec_enable(struct rte_eth_dev *dev)
+@@ -522,4 +522,7 @@ mlx5_rx_intr_vec_enable(struct rte_eth_dev *dev)
@@ -39 +40 @@
-@@ -983,4 +986,7 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)
+@@ -599,4 +602,7 @@ mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'malloc: fix style in free list index computation' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (26 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  2020-11-23 17:12 ` [dpdk-stable] patch 'usertools: fix pmdinfo parsing' " Kevin Traynor
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Yunjian Wang; +Cc: Anatoly Burakov, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 98b43ae0db82af30b98cd81eba0f5b9b0bdddfcd Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian@huawei.com>
Date: Thu, 12 Nov 2020 17:31:15 +0800
Subject: [PATCH] malloc: fix style in free list index computation

[ upstream commit a99d2521a3b8e33c34eb8fdf5719c0e8f0cf07a7 ]

Cleanup code style issue reported by kernel checkpatch. As follows:
  * ERROR:CODE_INDENT: code indent should use tabs where possible
  * ERROR:SPACING: spaces required around that '?' (ctx:VxE)
  * WARNING:INDENTED_LABEL: labels should not be indented

Fixes: b0489e7bca2f ("malloc: fix linear complexity")

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/common/malloc_elem.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c
index 69ff063883..48cdc48756 100644
--- a/lib/librte_eal/common/malloc_elem.c
+++ b/lib/librte_eal/common/malloc_elem.c
@@ -364,12 +364,12 @@ malloc_elem_free_list_index(size_t size)
 
 	/* Find next power of 2 >= size. */
-	log2 = sizeof(size) * 8 - __builtin_clzl(size-1);
+	log2 = sizeof(size) * 8 - __builtin_clzl(size - 1);
 
 	/* Compute freelist index, based on log2(size). */
 	index = (log2 - MALLOC_MINSIZE_LOG2 + MALLOC_LOG2_INCREMENT - 1) /
-	        MALLOC_LOG2_INCREMENT;
+			MALLOC_LOG2_INCREMENT;
 
-	return index <= RTE_HEAP_NUM_FREELISTS-1?
-	        index: RTE_HEAP_NUM_FREELISTS-1;
+	return index <= RTE_HEAP_NUM_FREELISTS - 1 ?
+			index : RTE_HEAP_NUM_FREELISTS - 1;
 }
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.678244606 +0000
+++ 0029-malloc-fix-style-in-free-list-index-computation.patch	2020-11-23 17:10:14.017061612 +0000
@@ -1 +1 @@
-From a99d2521a3b8e33c34eb8fdf5719c0e8f0cf07a7 Mon Sep 17 00:00:00 2001
+From 98b43ae0db82af30b98cd81eba0f5b9b0bdddfcd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a99d2521a3b8e33c34eb8fdf5719c0e8f0cf07a7 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index c70112f84d..c2c9461f1d 100644
+index 69ff063883..48cdc48756 100644
@@ -24 +25 @@
-@@ -392,12 +392,12 @@ malloc_elem_free_list_index(size_t size)
+@@ -364,12 +364,12 @@ malloc_elem_free_list_index(size_t size)


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'usertools: fix pmdinfo parsing' has been queued to LTS release 18.11.11
  2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
                   ` (27 preceding siblings ...)
  2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor
@ 2020-11-23 17:12 ` Kevin Traynor
  28 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-23 17:12 UTC (permalink / raw)
  To: Julien Massonneau; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From 3627aa71db4b46ac17b448fd35c409e2362ab181 Mon Sep 17 00:00:00 2001
From: Julien Massonneau <julien.massonneau@6wind.com>
Date: Thu, 19 Nov 2020 10:44:01 +0100
Subject: [PATCH] usertools: fix pmdinfo parsing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 3515fa1e5ecbe0099cb886b81ba77058d1a2d397 ]

In the display_pmd_info_strings function, the script parses the section
until to find a byte between 32 and 127, and get all data
until a byte equals to 0.
After, it searches "PMD_INFO_STRING" in the data and passes the whole
string in the parse_pmd_info_string function, which split the string
with "=" and convert it in python dict with json.loads().

But the string may contain a "=" before "PMD_INFO_STRING",
so it is not correctly split and will lead to an error
(json.decoder.JSONDecodeError).

Example of a string encountered that leads to an error:

"Ag%=C£°ÐÊ+Ë®{0´wË-£0òjB·;¾¬úPMD_INFO_STRING= {"name" :
"net_octeontx", "params" : "nr_port=<int> ", "pci_ids" : []}"

Fixes: c67c9a5c646a ("tools: query binaries for HW and other support information")

Signed-off-by: Julien Massonneau <julien.massonneau@6wind.com>
---
 usertools/dpdk-pmdinfo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py
index 12f20735e0..27e1cad328 100755
--- a/usertools/dpdk-pmdinfo.py
+++ b/usertools/dpdk-pmdinfo.py
@@ -353,5 +353,5 @@ class ReadElf(object):
             rc = mystring.find("PMD_INFO_STRING")
             if (rc != -1):
-                self.parse_pmd_info_string(mystring)
+                self.parse_pmd_info_string(mystring[rc:])
 
             dataptr = endptr
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.700509820 +0000
+++ 0030-usertools-fix-pmdinfo-parsing.patch	2020-11-23 17:10:14.018061613 +0000
@@ -1 +1 @@
-From 3515fa1e5ecbe0099cb886b81ba77058d1a2d397 Mon Sep 17 00:00:00 2001
+From 3627aa71db4b46ac17b448fd35c409e2362ab181 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 3515fa1e5ecbe0099cb886b81ba77058d1a2d397 ]
+
@@ -26 +27,0 @@
-Cc: stable@dpdk.org
@@ -34 +35 @@
-index b4e8a48cde..3381aa616c 100755
+index 12f20735e0..27e1cad328 100755
@@ -37 +38 @@
-@@ -347,5 +347,5 @@ class ReadElf(object):
+@@ -353,5 +353,5 @@ class ReadElf(object):
@@ -39 +40 @@
-             if rc != -1:
+             if (rc != -1):


^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' has been queued to LTS release 18.11.11
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor
@ 2020-11-23 18:35   ` David Marchand
  2020-11-24  9:38     ` Kevin Traynor
  0 siblings, 1 reply; 34+ messages in thread
From: David Marchand @ 2020-11-23 18:35 UTC (permalink / raw)
  To: Kevin Traynor
  Cc: Ferruh Yigit, Qi Zhang, Andrew Rybchenko, Igor Romanov, dpdk stable

On Mon, Nov 23, 2020 at 6:13 PM Kevin Traynor <ktraynor@redhat.com> wrote:
> From 922feed76bd5d8fe06b95a56afabd3a95987b047 Mon Sep 17 00:00:00 2001
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Date: Fri, 13 Nov 2020 11:44:00 +0000
> Subject: [PATCH] app/testpmd: fix MTU after device configure
>
> [ upstream commit 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f ]
>
> In 'rte_eth_dev_configure()', if 'DEV_RX_OFFLOAD_JUMBO_FRAME' is not set
> the max frame size is limited to 'RTE_ETHER_MAX_LEN' (1518).
> This is mistake because for the PMDs that has frame size bigger than
> "RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN" (18 bytes), the MTU becomes
> less than 1500, causing a valid frame with 1500 bytes payload to be
> dropped.
>
> Since 'rte_eth_dev_set_mtu()' works as expected, it is called after
> 'rte_eth_dev_configure()' to fix the MTU.
> It may look redundant to set MTU after 'rte_eth_dev_configure()', both
> with default values, but it is not, the resulting MTU config can be
> different in the device based on frame overhead of the PMD.
>
> And instead of setting the MTU to default value, it is first get via
> 'rte_eth_dev_get_mtu()' and set again, this is to cover cases MTU
> changed from testpmd command line.
>
> 'rte_eth_dev_set_mtu()', '-ENOTSUP' error is ignored to prevent
> irrelevant warning messages for the virtual PMDs.
>
> Fixes: af75078fece3 ("first public release")
>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> Reviewed-by: Qi Zhang <qi.z.zhang@intel.com>
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> Tested-by: Igor Romanov <igor.romanov@oktetlabs.ru>

Hey Kevin,

This patch has been reverted in rc5.


-- 
David Marchand


^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' has been queued to LTS release 18.11.11
  2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor
@ 2020-11-23 18:36   ` David Marchand
  0 siblings, 0 replies; 34+ messages in thread
From: David Marchand @ 2020-11-23 18:36 UTC (permalink / raw)
  To: Kevin Traynor; +Cc: Ferruh Yigit, Bo Chen, dpdk stable

On Mon, Nov 23, 2020 at 6:13 PM Kevin Traynor <ktraynor@redhat.com> wrote:
> From 6326a29a056706db93e58067626eb2a3340a3a4c Mon Sep 17 00:00:00 2001
> From: Ferruh Yigit <ferruh.yigit@intel.com>
> Date: Mon, 16 Nov 2020 19:03:54 +0000
> Subject: [PATCH] app/testpmd: revert setting MTU explicitly after configure
>
> [ upstream commit 56f0534311d4c61c63e2455169749ae440278122 ]
>
> Setting MTU after each 'rte_eth_dev_configure()' prevents using
> "--max-pkt-len=N" parameter and "port config all max-pkt-len #" command
>
> This is breaking DTS scatter test case which is using
> "--max-pkt-len=9000" testpmd parameter.
>
> Reverting workaround to recover the DTS testcase.
>
> Fixes: 1c21ee95cf52 ("app/testpmd: fix MTU after device configure")
>
> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
> Tested-by: Bo Chen <box.c.chen@intel.com>

No need for this backport if we skip the backport I just commented on.


-- 
David Marchand


^ permalink raw reply	[flat|nested] 34+ messages in thread

* Re: [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' has been queued to LTS release 18.11.11
  2020-11-23 18:35   ` David Marchand
@ 2020-11-24  9:38     ` Kevin Traynor
  0 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-24  9:38 UTC (permalink / raw)
  To: David Marchand
  Cc: Ferruh Yigit, Qi Zhang, Andrew Rybchenko, Igor Romanov, dpdk stable

On 23/11/2020 18:35, David Marchand wrote:
> On Mon, Nov 23, 2020 at 6:13 PM Kevin Traynor <ktraynor@redhat.com> wrote:
>> From 922feed76bd5d8fe06b95a56afabd3a95987b047 Mon Sep 17 00:00:00 2001
>> From: Ferruh Yigit <ferruh.yigit@intel.com>
>> Date: Fri, 13 Nov 2020 11:44:00 +0000
>> Subject: [PATCH] app/testpmd: fix MTU after device configure
>>
>> [ upstream commit 1c21ee95cf5298fe7b6a8b7d8a997ff3c402a08f ]
>>
>> In 'rte_eth_dev_configure()', if 'DEV_RX_OFFLOAD_JUMBO_FRAME' is not set
>> the max frame size is limited to 'RTE_ETHER_MAX_LEN' (1518).
>> This is mistake because for the PMDs that has frame size bigger than
>> "RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN" (18 bytes), the MTU becomes
>> less than 1500, causing a valid frame with 1500 bytes payload to be
>> dropped.
>>
>> Since 'rte_eth_dev_set_mtu()' works as expected, it is called after
>> 'rte_eth_dev_configure()' to fix the MTU.
>> It may look redundant to set MTU after 'rte_eth_dev_configure()', both
>> with default values, but it is not, the resulting MTU config can be
>> different in the device based on frame overhead of the PMD.
>>
>> And instead of setting the MTU to default value, it is first get via
>> 'rte_eth_dev_get_mtu()' and set again, this is to cover cases MTU
>> changed from testpmd command line.
>>
>> 'rte_eth_dev_set_mtu()', '-ENOTSUP' error is ignored to prevent
>> irrelevant warning messages for the virtual PMDs.
>>
>> Fixes: af75078fece3 ("first public release")
>>
>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
>> Reviewed-by: Qi Zhang <qi.z.zhang@intel.com>
>> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
>> Tested-by: Igor Romanov <igor.romanov@oktetlabs.ru>
> 
> Hey Kevin,
> 
> This patch has been reverted in rc5.
> 
> 

Thanks David. I dropped this patch and the later revert from 18.11 queue.


^ permalink raw reply	[flat|nested] 34+ messages in thread

* [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' has been queued to LTS release 18.11.11
  2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' " Kevin Traynor
@ 2020-11-05 12:39 ` Kevin Traynor
  0 siblings, 0 replies; 34+ messages in thread
From: Kevin Traynor @ 2020-11-05 12:39 UTC (permalink / raw)
  To: Alexander Kozyrev; +Cc: Viacheslav Ovsiienko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

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

Thanks.

Kevin.

---
From e0a4de61c71f57aa0d3de220aaa23bb3d092cf60 Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev@nvidia.com>
Date: Tue, 29 Sep 2020 18:36:23 +0000
Subject: [PATCH] net/mlx5: fix Rx queue count calculation

[ upstream commit d2d57605522d4a43be17e22e649e54033f6d8835 ]

There are a few discrepancies in the Rx queue count calculation.

The wrong index is used to calculate the number of used descriptors
in an Rx queue in case of the compressed CQE processing. The global
CQ index is used while we really need an internal index in a single
compressed session to get the right number of elements processed.

The total number of CQs should be used instead of the number of mbufs
to find out about the maximum number of Rx descriptors. These numbers
are not equal for the Multi-Packet Rx queue.

Allow the Rx queue count calculation for all possible Rx bursts since
CQ handling is the same for regular, vectorized, and multi-packet Rx
queues.

Fixes: 26f04883441a ("net/mlx5: support Rx queue count API")

Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 38ce0e29a2..2896a9b4ef 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -431,17 +431,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 	struct rxq_zip *zip = &rxq->zip;
 	volatile struct mlx5_cqe *cqe;
+	unsigned int cq_ci = rxq->cq_ci;
 	const unsigned int cqe_n = (1 << rxq->cqe_n);
 	const unsigned int cqe_cnt = cqe_n - 1;
-	unsigned int cq_ci;
-	unsigned int used;
+	unsigned int used = 0;
 
-	/* if we are processing a compressed cqe */
-	if (zip->ai) {
-		used = zip->cqe_cnt - zip->ca;
-		cq_ci = zip->cq_ci;
-	} else {
-		used = 0;
-		cq_ci = rxq->cq_ci;
-	}
 	cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
 	while (check_cqe(cqe, cqe_n, cq_ci) == 0) {
@@ -451,5 +443,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 		op_own = cqe->op_own;
 		if (MLX5_CQE_FORMAT(op_own) == MLX5_COMPRESSED)
-			n = rte_be_to_cpu_32(cqe->byte_cnt);
+			if (unlikely(zip->ai))
+				n = zip->cqe_cnt - zip->ai;
+			else
+				n = rte_be_to_cpu_32(cqe->byte_cnt);
 		else
 			n = 1;
@@ -458,5 +453,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
 		cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
 	}
-	used = RTE_MIN(used, (1U << rxq->elts_n) - 1);
+	used = RTE_MIN(used, cqe_n);
 	return used;
 }
@@ -481,9 +476,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)
 	struct rte_eth_dev *dev = ETH_DEV(rxq_ctrl->priv);
 
-	if (dev->rx_pkt_burst != mlx5_rx_burst) {
+	if (dev->rx_pkt_burst == NULL ||
+	    dev->rx_pkt_burst == removed_rx_burst) {
 		rte_errno = ENOTSUP;
 		return -rte_errno;
 	}
-	if (offset >= (1 << rxq->elts_n)) {
+	if (offset >= (1 << rxq->cqe_n)) {
 		rte_errno = EINVAL;
 		return -rte_errno;
@@ -513,5 +509,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 	struct mlx5_rxq_data *rxq;
 
-	if (dev->rx_pkt_burst != mlx5_rx_burst) {
+	if (dev->rx_pkt_burst == NULL ||
+	    dev->rx_pkt_burst == removed_rx_burst) {
 		rte_errno = ENOTSUP;
 		return -rte_errno;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.210327070 +0000
+++ 0051-net-mlx5-fix-Rx-queue-count-calculation.patch	2020-11-05 12:38:54.251896028 +0000
@@ -1 +1 @@
-From d2d57605522d4a43be17e22e649e54033f6d8835 Mon Sep 17 00:00:00 2001
+From e0a4de61c71f57aa0d3de220aaa23bb3d092cf60 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d2d57605522d4a43be17e22e649e54033f6d8835 ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 0b87be15b4..2422a4d6ca 100644
+index 38ce0e29a2..2896a9b4ef 100644
@@ -34 +35 @@
-@@ -466,17 +466,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -431,17 +431,9 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -53,2 +54,2 @@
- 	while (check_cqe(cqe, cqe_n, cq_ci) != MLX5_CQE_STATUS_HW_OWN) {
-@@ -486,5 +478,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+ 	while (check_cqe(cqe, cqe_n, cq_ci) == 0) {
+@@ -451,5 +443,8 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -64 +65 @@
-@@ -493,5 +488,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
+@@ -458,5 +453,5 @@ rx_queue_count(struct mlx5_rxq_data *rxq)
@@ -71 +72 @@
-@@ -516,9 +511,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)
+@@ -481,9 +476,10 @@ mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)
@@ -84 +85 @@
-@@ -631,5 +627,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+@@ -513,5 +509,6 @@ mlx5_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)


^ permalink raw reply	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2020-11-24  9:38 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 17:11 [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'devtools: fix directory filter in forbidden token check' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'examples/qos_sched: fix usage string' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'usertools: fix CPU layout script to be PEP8 compliant' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'config: enable packet prefetching with Meson' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'net/ring: fix typo in log message' " Kevin Traynor
2020-11-23 17:11 ` [dpdk-stable] patch 'examples/vhost_crypto: add new line character in usage' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix virtqueue initialization' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: add C++ include guard' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix releasing mbufs' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/avf: fix performance drop after port reset' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/i40e: fix build for log format specifier' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/ixgbe: remove redundant MAC flag check' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix error path when setting memory tables' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'vhost: fix fd leak in kick " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: fix MTU after device configure' " Kevin Traynor
2020-11-23 18:35   ` David Marchand
2020-11-24  9:38     ` Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'app/eventdev: check timer adadpters number' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/kni: fix build with pkg-config' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l2fwd-crypto: " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/performance-thread: " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'doc: fix rule file parameters in l3fwd-acl guide' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix Rx descriptor status' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'app/testpmd: revert setting MTU explicitly after configure' " Kevin Traynor
2020-11-23 18:36   ` David Marchand
2020-11-23 17:12 ` [dpdk-stable] patch 'compress/isal: check allocation in queue setup' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'examples/l3fwd-power: check packet types after start' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'net/mlx5: fix representor interrupts handler' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'malloc: fix style in free list index computation' " Kevin Traynor
2020-11-23 17:12 ` [dpdk-stable] patch 'usertools: fix pmdinfo parsing' " Kevin Traynor
  -- strict thread matches above, loose matches on Subject: below --
2020-11-05 12:39 [dpdk-stable] patch 'bus/pci: remove duplicate declaration' " Kevin Traynor
2020-11-05 12:39 ` [dpdk-stable] patch 'net/mlx5: fix Rx queue count calculation' " Kevin Traynor

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git