patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10
@ 2020-08-20 15:33 Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: allow getting info for unknown device' " Kevin Traynor
                   ` (34 more replies)
  0 siblings, 35 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Timothy Redaelli; +Cc: Bruce Richardson, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/42c9b85315164d8c78037edf13511fae532eeee2

Thanks.

Kevin.

---
From 42c9b85315164d8c78037edf13511fae532eeee2 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli@redhat.com>
Date: Wed, 1 Jul 2020 19:16:38 +0200
Subject: [PATCH] test: fix rpath for drivers with meson

[ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ]

This commit fixes the setting of relative rpath on dpdk-test for
drivers ($libdir/dpdk/pmd-$abiver) to the correct absolute rpath
($prefix$libdir/dpdk/pmd-$abiver).

Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test")

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 test/test/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/test/meson.build b/test/test/meson.build
index c097840f65..09b51a7ca6 100644
--- a/test/test/meson.build
+++ b/test/test/meson.build
@@ -288,5 +288,6 @@ if get_option('tests')
 		dependencies: test_dep_objs,
 		c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
-		install_rpath: driver_install_path,
+		install_rpath: join_paths(get_option('prefix'),
+		                 driver_install_path),
 		install: true)
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:15.889435614 +0100
+++ 0001-test-fix-rpath-for-drivers-with-meson.patch	2020-08-20 16:26:15.749323644 +0100
@@ -1 +1 @@
-From f62093e7390d39c160205a4915ce0b4de116a0c3 Mon Sep 17 00:00:00 2001
+From 42c9b85315164d8c78037edf13511fae532eeee2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- app/test/meson.build | 3 ++-
+ test/test/meson.build | 3 ++-
@@ -19,11 +20,11 @@
-diff --git a/app/test/meson.build b/app/test/meson.build
-index 56591db4e0..39f295d737 100644
---- a/app/test/meson.build
-+++ b/app/test/meson.build
-@@ -426,5 +426,6 @@ dpdk_test = executable('dpdk-test',
- 	dependencies: test_dep_objs,
- 	c_args: cflags,
--	install_rpath: driver_install_path,
-+	install_rpath: join_paths(get_option('prefix'),
-+			 driver_install_path),
- 	install: true)
+diff --git a/test/test/meson.build b/test/test/meson.build
+index c097840f65..09b51a7ca6 100644
+--- a/test/test/meson.build
++++ b/test/test/meson.build
+@@ -288,5 +288,6 @@ if get_option('tests')
+ 		dependencies: test_dep_objs,
+ 		c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
+-		install_rpath: driver_install_path,
++		install_rpath: join_paths(get_option('prefix'),
++		                 driver_install_path),
+ 		install: true)


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

* [dpdk-stable] patch 'rawdev: allow getting info for unknown device' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: fill NUMA socket ID in info' " Kevin Traynor
                   ` (33 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: Hemant Agrawal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/c56a4aa29ba4416d84b932358392f96ca78bfc85

Thanks.

Kevin.

---
From c56a4aa29ba4416d84b932358392f96ca78bfc85 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Mon, 6 Jul 2020 11:31:30 +0100
Subject: [PATCH] rawdev: allow getting info for unknown device

[ upstream commit 201a68c67839b879b39aa897b6bdb024a49ae436 ]

To call the rte_rawdev_info_get() function, the user currently has to know
the underlying type of the device in order to pass an appropriate structure
or buffer as the dev_private pointer in the info structure. By allowing a
NULL value for this field, we can skip getting the device-specific info and
just return the generic info - including the device name and driver, which
can be used to determine the device type - to the user.

This ensures that basic info can be get for all rawdevs, without knowing
the type, and even if the info driver API call has not been implemented for
the device.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 lib/librte_rawdev/rte_rawdev.c | 6 ++++--
 lib/librte_rawdev/rte_rawdev.h | 8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c
index 9f1e3592dd..53f16c5b07 100644
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -89,6 +89,8 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
 	rawdev = &rte_rawdevs[dev_id];
 
-	RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
-	(*rawdev->dev_ops->dev_info_get)(rawdev, dev_info->dev_private);
+	if (dev_info->dev_private != NULL) {
+		RTE_FUNC_PTR_OR_ERR_RET(*rawdev->dev_ops->dev_info_get, -ENOTSUP);
+		(*rawdev->dev_ops->dev_info_get)(rawdev, dev_info->dev_private);
+	}
 
 	if (dev_info) {
diff --git a/lib/librte_rawdev/rte_rawdev.h b/lib/librte_rawdev/rte_rawdev.h
index 7a1f3213e9..32f6b8bb03 100644
--- a/lib/librte_rawdev/rte_rawdev.h
+++ b/lib/librte_rawdev/rte_rawdev.h
@@ -75,5 +75,11 @@ struct rte_rawdev_info;
  * @param[out] dev_info
  *   A pointer to a structure of type *rte_rawdev_info* to be filled with the
- *   contextual information of the device.
+ *   contextual information of the device. The dev_info->dev_private field
+ *   should point to an appropriate buffer space for holding the device-
+ *   specific info for that hardware.
+ *   If the dev_private field is set to NULL, then the device-specific info
+ *   function will not be called and only basic information about the device
+ *   will be returned. This can be used to safely query the type of a rawdev
+ *   instance without needing to know the size of the private data to return.
  *
  * @return
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:15.972046501 +0100
+++ 0002-rawdev-allow-getting-info-for-unknown-device.patch	2020-08-20 16:26:15.752323671 +0100
@@ -1 +1 @@
-From 201a68c67839b879b39aa897b6bdb024a49ae436 Mon Sep 17 00:00:00 2001
+From c56a4aa29ba4416d84b932358392f96ca78bfc85 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 201a68c67839b879b39aa897b6bdb024a49ae436 ]
+
@@ -17,2 +18,0 @@
-Cc: stable@dpdk.org
-
@@ -27 +27 @@
-index 2eb7b3bc3b..e634a567fa 100644
+index 9f1e3592dd..53f16c5b07 100644
@@ -30 +30 @@
-@@ -88,6 +88,8 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
+@@ -89,6 +89,8 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)


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

* [dpdk-stable] patch 'rawdev: fill NUMA socket ID in info' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: allow getting info for unknown device' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: export dump function in map file' " Kevin Traynor
                   ` (32 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: Hemant Agrawal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/6cda1b579ad8cfacd3402b946fec81f1bee9e4d4

Thanks.

Kevin.

---
From 6cda1b579ad8cfacd3402b946fec81f1bee9e4d4 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Mon, 6 Jul 2020 11:31:31 +0100
Subject: [PATCH] rawdev: fill NUMA socket ID in info

[ upstream commit 26892215922595e117f19e522bf05183213392ff ]

The rawdev info struct has a socket_id field which was not filled in.

We can also omit the checks for the parameter struct being null, since
that is previously checked in the function.

Fixes: c88b3f2558ed ("rawdev: introduce raw device library")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 lib/librte_rawdev/rte_rawdev.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/librte_rawdev/rte_rawdev.c b/lib/librte_rawdev/rte_rawdev.c
index 53f16c5b07..a06f454431 100644
--- a/lib/librte_rawdev/rte_rawdev.c
+++ b/lib/librte_rawdev/rte_rawdev.c
@@ -94,9 +94,7 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
 	}
 
-	if (dev_info) {
-
-		dev_info->driver_name = rawdev->driver_name;
-		dev_info->device = rawdev->device;
-	}
+	dev_info->driver_name = rawdev->driver_name;
+	dev_info->device = rawdev->device;
+	dev_info->socket_id = rawdev->socket_id;
 
 	return 0;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.013886207 +0100
+++ 0003-rawdev-fill-NUMA-socket-ID-in-info.patch	2020-08-20 16:26:15.754323689 +0100
@@ -1 +1 @@
-From 26892215922595e117f19e522bf05183213392ff Mon Sep 17 00:00:00 2001
+From 6cda1b579ad8cfacd3402b946fec81f1bee9e4d4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 26892215922595e117f19e522bf05183213392ff ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index e634a567fa..8f84d0b228 100644
+index 53f16c5b07..a06f454431 100644
@@ -24 +25 @@
-@@ -93,9 +93,7 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)
+@@ -94,9 +94,7 @@ rte_rawdev_info_get(uint16_t dev_id, struct rte_rawdev_info *dev_info)


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

* [dpdk-stable] patch 'rawdev: export dump function in map file' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: allow getting info for unknown device' " Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: fill NUMA socket ID in info' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'cfgfile: fix stack buffer underflow' " Kevin Traynor
                   ` (31 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: Hemant Agrawal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/06333f8b244730f55d7d94d402e2b6c1cca0d7e3

Thanks.

Kevin.

---
From 06333f8b244730f55d7d94d402e2b6c1cca0d7e3 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Mon, 6 Jul 2020 11:31:32 +0100
Subject: [PATCH] rawdev: export dump function in map file

[ upstream commit a8550b773184c202cee408aee8621d682ccb21dc ]

The rte_rawdev_dump function was missing from the map file,
meaning it was unavailable for use when linking dynamically.

Fixes: c88b3f2558ed ("rawdev: introduce raw device library")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 lib/librte_rawdev/rte_rawdev_version.map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/librte_rawdev/rte_rawdev_version.map b/lib/librte_rawdev/rte_rawdev_version.map
index b61dbff11c..4f512a2475 100644
--- a/lib/librte_rawdev/rte_rawdev_version.map
+++ b/lib/librte_rawdev/rte_rawdev_version.map
@@ -6,4 +6,5 @@ DPDK_18.08 {
 	rte_rawdev_count;
 	rte_rawdev_dequeue_buffers;
+	rte_rawdev_dump;
 	rte_rawdev_enqueue_buffers;
 	rte_rawdev_firmware_load;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.047112912 +0100
+++ 0004-rawdev-export-dump-function-in-map-file.patch	2020-08-20 16:26:15.755323698 +0100
@@ -1 +1 @@
-From a8550b773184c202cee408aee8621d682ccb21dc Mon Sep 17 00:00:00 2001
+From 06333f8b244730f55d7d94d402e2b6c1cca0d7e3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a8550b773184c202cee408aee8621d682ccb21dc ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index d847c9e0d3..63b54f598b 100644
+index b61dbff11c..4f512a2475 100644
@@ -22 +23 @@
-@@ -6,4 +6,5 @@ DPDK_20.0 {
+@@ -6,4 +6,5 @@ DPDK_18.08 {


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

* [dpdk-stable] patch 'cfgfile: fix stack buffer underflow' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (2 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: export dump function in map file' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' " Kevin Traynor
                   ` (30 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Stephen Hemminger; +Cc: Bruce Richardson, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/f567b9af5186940a95fd9ed8cd19ca6525708229

Thanks.

Kevin.

---
From f567b9af5186940a95fd9ed8cd19ca6525708229 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 1 Jul 2020 20:05:58 -0700
Subject: [PATCH] cfgfile: fix stack buffer underflow

[ upstream commit 041a3971c8f47f7850586c601b7002652dc9327c ]

If cfgfile is give a line with comment character at the start
of the line, it will dereference outside of the buffer.

Detected with address sanitizer:

SUMMARY: AddressSanitizer: stack-buffer-underflow
lib/librte_cfgfile/rte_cfgfile.c:194 in rte_cfgfile_load_with_params
Shadow bytes around the buggy address:
  0x200fff79f6a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  0x200fff79f6b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  0x200fff79f6c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  0x200fff79f6d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  0x200fff79f6e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
=>0x200fff79f6f0: 00 00 00 00 f1 f1 f1[f1]00 00 00 00 00 00 00 00
  0x200fff79f700: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  0x200fff79f710: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  0x200fff79f720: 04 f2 f2 f2 f3 f3 f3 f3 00 00 00 00 00 00 00 00
  0x200fff79f730: 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1 00 f2
  0x200fff79f740: f2 f2 f3 f3 f3 f3 00 00 00 00 00 00 00 00 00 00
Shadow byte legend (one shadow byte represents 8 application bytes):
  Addressable:           00
  Partially addressable: 01 02 03 04 05 06 07
  Heap left redzone:       fa
  Freed heap region:       fd
  Stack left redzone:      f1
  Stack mid redzone:       f2
  Stack right redzone:     f3
  Stack after return:      f5
  Stack use after scope:   f8
  Global redzone:          f9
  Global init order:       f6
  Poisoned by user:        f7
  Container overflow:      fc
  Array cookie:            ac
  Intra object redzone:    bb
  ASan internal:           fe
  Left alloca redzone:     ca
  Right alloca redzone:    cb
==2189==ABORTING

Fixes: a6a47ac9c2c9 ("cfgfile: rework load function")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_cfgfile/rte_cfgfile.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_cfgfile/rte_cfgfile.c b/lib/librte_cfgfile/rte_cfgfile.c
index 6142696341..3b0ce68b19 100644
--- a/lib/librte_cfgfile/rte_cfgfile.c
+++ b/lib/librte_cfgfile/rte_cfgfile.c
@@ -186,5 +186,6 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
 		/* skip parsing if comment character found */
 		pos = memchr(buffer, params->comment_character, len);
-		if (pos != NULL && (*(pos-1) != '\\')) {
+		if (pos != NULL &&
+		    (pos == buffer || *(pos-1) != '\\')) {
 			*pos = '\0';
 			len = pos -  buffer;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.079025498 +0100
+++ 0005-cfgfile-fix-stack-buffer-underflow.patch	2020-08-20 16:26:15.756323707 +0100
@@ -1 +1 @@
-From 041a3971c8f47f7850586c601b7002652dc9327c Mon Sep 17 00:00:00 2001
+From f567b9af5186940a95fd9ed8cd19ca6525708229 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 041a3971c8f47f7850586c601b7002652dc9327c ]
+
@@ -47 +48,0 @@
-Cc: stable@dpdk.org
@@ -56 +57 @@
-index f132e40563..002022263e 100644
+index 6142696341..3b0ce68b19 100644
@@ -59 +60 @@
-@@ -192,5 +192,6 @@ rte_cfgfile_load_with_params(const char *filename, int flags,
+@@ -186,5 +186,6 @@ rte_cfgfile_load_with_params(const char *filename, int flags,


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

* [dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (3 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'cfgfile: fix stack buffer underflow' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'test/crypto: fix asymmetric session mempool creation' " Kevin Traynor
                   ` (29 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Pablo de Lara; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/cb32f798b1221818aa2f97f64d3ef7106cfb580d

Thanks.

Kevin.

---
From cb32f798b1221818aa2f97f64d3ef7106cfb580d Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Date: Thu, 4 Jun 2020 08:51:12 +0000
Subject: [PATCH] drivers/crypto: add missing OOP feature flag

[ upstream commit cd346367f898d619edf53f13628d6e539dbcab40 ]

ZUC, SNOW3G and KASUMI PMDs support Out-of-place operations,
but their feature flags did not reflect this.

Fixes: 2717246ecd7d ("cryptodev: replace mbuf scatter gather flag")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 doc/guides/cryptodevs/features/kasumi.ini | 3 ++-
 doc/guides/cryptodevs/features/snow3g.ini | 3 ++-
 doc/guides/cryptodevs/features/zuc.ini    | 1 +
 drivers/crypto/kasumi/rte_kasumi_pmd.c    | 1 +
 drivers/crypto/snow3g/rte_snow3g_pmd.c    | 1 +
 drivers/crypto/zuc/rte_zuc_pmd.c          | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/guides/cryptodevs/features/kasumi.ini b/doc/guides/cryptodevs/features/kasumi.ini
index f3d061009b..a6235288b6 100644
--- a/doc/guides/cryptodevs/features/kasumi.ini
+++ b/doc/guides/cryptodevs/features/kasumi.ini
@@ -7,4 +7,5 @@
 Symmetric crypto       = Y
 Sym operation chaining = Y
+OOP LB  In LB  Out     = Y
 
 ;
@@ -27,3 +28,3 @@ KASUMI F9 = Y
 ; Supported Asymmetric algorithms of the 'kasumi' crypto driver.
 ;
-[Asymmetric]
\ No newline at end of file
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/snow3g.ini b/doc/guides/cryptodevs/features/snow3g.ini
index ec2daf6c64..b5b478ad37 100644
--- a/doc/guides/cryptodevs/features/snow3g.ini
+++ b/doc/guides/cryptodevs/features/snow3g.ini
@@ -7,4 +7,5 @@
 Symmetric crypto       = Y
 Sym operation chaining = Y
+OOP LB  In LB  Out     = Y
 
 ;
@@ -27,3 +28,3 @@ SNOW3G UIA2 = Y
 ; Supported Asymmetric algorithms of the 'snow3g' crypto driver.
 ;
-[Asymmetric]
\ No newline at end of file
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/zuc.ini b/doc/guides/cryptodevs/features/zuc.ini
index 9b6a4287e8..29cc258aae 100644
--- a/doc/guides/cryptodevs/features/zuc.ini
+++ b/doc/guides/cryptodevs/features/zuc.ini
@@ -7,4 +7,5 @@
 Symmetric crypto       = Y
 Sym operation chaining = Y
+OOP LB  In LB  Out     = Y
 
 ;
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 2d33f14e76..7a406573f6 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -556,4 +556,5 @@ cryptodev_kasumi_create(const char *name,
 	dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
 			RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
+			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
 			cpu_flags;
 
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c
index aa3277ff57..a080b0db5f 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -552,4 +552,5 @@ cryptodev_snow3g_create(const char *name,
 	dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
 			RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
+			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
 			cpu_flags;
 
diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c
index 64a0d7a812..efc304342c 100644
--- a/drivers/crypto/zuc/rte_zuc_pmd.c
+++ b/drivers/crypto/zuc/rte_zuc_pmd.c
@@ -475,4 +475,5 @@ cryptodev_zuc_create(const char *name,
 	dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
 			RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
+			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
 			cpu_flags;
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.112944341 +0100
+++ 0006-drivers-crypto-add-missing-OOP-feature-flag.patch	2020-08-20 16:26:15.760323743 +0100
@@ -1 +1 @@
-From cd346367f898d619edf53f13628d6e539dbcab40 Mon Sep 17 00:00:00 2001
+From cb32f798b1221818aa2f97f64d3ef7106cfb580d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cd346367f898d619edf53f13628d6e539dbcab40 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- doc/guides/cryptodevs/features/kasumi.ini | 1 +
- doc/guides/cryptodevs/features/snow3g.ini | 1 +
+ doc/guides/cryptodevs/features/kasumi.ini | 3 ++-
+ doc/guides/cryptodevs/features/snow3g.ini | 3 ++-
@@ -17,4 +18,4 @@
- drivers/crypto/kasumi/rte_kasumi_pmd.c    | 3 ++-
- drivers/crypto/snow3g/rte_snow3g_pmd.c    | 3 ++-
- drivers/crypto/zuc/rte_zuc_pmd.c          | 3 ++-
- 6 files changed, 9 insertions(+), 3 deletions(-)
+ drivers/crypto/kasumi/rte_kasumi_pmd.c    | 1 +
+ drivers/crypto/snow3g/rte_snow3g_pmd.c    | 1 +
+ drivers/crypto/zuc/rte_zuc_pmd.c          | 1 +
+ 6 files changed, 8 insertions(+), 2 deletions(-)
@@ -23 +24 @@
-index 8380a57655..fbdb47e89f 100644
+index f3d061009b..a6235288b6 100644
@@ -26,3 +27,3 @@
-@@ -9,4 +9,5 @@ Sym operation chaining = Y
- Symmetric sessionless  = Y
- Non-Byte aligned data  = Y
+@@ -7,4 +7,5 @@
+ Symmetric crypto       = Y
+ Sym operation chaining = Y
@@ -31,0 +33,6 @@
+@@ -27,3 +28,3 @@ KASUMI F9 = Y
+ ; Supported Asymmetric algorithms of the 'kasumi' crypto driver.
+ ;
+-[Asymmetric]
+\ No newline at end of file
++[Asymmetric]
@@ -33 +40 @@
-index b2caefe3a2..14ac7e4b6d 100644
+index ec2daf6c64..b5b478ad37 100644
@@ -36,3 +43,3 @@
-@@ -9,4 +9,5 @@ Sym operation chaining = Y
- Symmetric sessionless  = Y
- Non-Byte aligned data  = Y
+@@ -7,4 +7,5 @@
+ Symmetric crypto       = Y
+ Sym operation chaining = Y
@@ -41,0 +49,6 @@
+@@ -27,3 +28,3 @@ SNOW3G UIA2 = Y
+ ; Supported Asymmetric algorithms of the 'snow3g' crypto driver.
+ ;
+-[Asymmetric]
+\ No newline at end of file
++[Asymmetric]
@@ -43 +56 @@
-index 21d074f9b2..1c53454a6c 100644
+index 9b6a4287e8..29cc258aae 100644
@@ -46,3 +59,3 @@
-@@ -9,4 +9,5 @@ Sym operation chaining = Y
- Symmetric sessionless  = Y
- Non-Byte aligned data  = Y
+@@ -7,4 +7,5 @@
+ Symmetric crypto       = Y
+ Sym operation chaining = Y
@@ -53 +66 @@
-index c3f0dfc2f2..5ff1b5c562 100644
+index 2d33f14e76..7a406573f6 100644
@@ -56 +69,2 @@
-@@ -552,5 +552,6 @@ cryptodev_kasumi_create(const char *name,
+@@ -556,4 +556,5 @@ cryptodev_kasumi_create(const char *name,
+ 	dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
@@ -58,4 +72,2 @@
- 			RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA |
--			RTE_CRYPTODEV_FF_SYM_SESSIONLESS;
-+			RTE_CRYPTODEV_FF_SYM_SESSIONLESS |
-+			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;
++			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
+ 			cpu_flags;
@@ -63 +74,0 @@
- 	mgr = alloc_mb_mgr(0);
@@ -65 +76 @@
-index 558e01e706..962868e1fc 100644
+index aa3277ff57..a080b0db5f 100644
@@ -68 +79,2 @@
-@@ -564,5 +564,6 @@ cryptodev_snow3g_create(const char *name,
+@@ -552,4 +552,5 @@ cryptodev_snow3g_create(const char *name,
+ 	dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
@@ -70,4 +82,2 @@
- 			RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA |
--			RTE_CRYPTODEV_FF_SYM_SESSIONLESS;
-+			RTE_CRYPTODEV_FF_SYM_SESSIONLESS |
-+			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;
++			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
+ 			cpu_flags;
@@ -75 +84,0 @@
- 	mgr = alloc_mb_mgr(0);
@@ -77 +86 @@
-index 20cb5a1600..a9ff318281 100644
+index 64a0d7a812..efc304342c 100644
@@ -80 +89,2 @@
-@@ -481,5 +481,6 @@ cryptodev_zuc_create(const char *name,
+@@ -475,4 +475,5 @@ cryptodev_zuc_create(const char *name,
+ 	dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
@@ -82,4 +92,2 @@
- 			RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA |
--			RTE_CRYPTODEV_FF_SYM_SESSIONLESS;
-+			RTE_CRYPTODEV_FF_SYM_SESSIONLESS |
-+			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;
++			RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
+ 			cpu_flags;
@@ -87 +94,0 @@
- 	mb_mgr = alloc_mb_mgr(0);


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

* [dpdk-stable] patch 'test/crypto: fix asymmetric session mempool creation' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (4 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'common/cpt: fix encryption offset' " Kevin Traynor
                   ` (28 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Adam Dybkowski; +Cc: Fiona Trahe, Akhil Goyal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/b1caa2cfe65cff6083b8b5a5b0e4815cbb489e45

Thanks.

Kevin.

---
From b1caa2cfe65cff6083b8b5a5b0e4815cbb489e45 Mon Sep 17 00:00:00 2001
From: Adam Dybkowski <adamx.dybkowski@intel.com>
Date: Mon, 8 Jun 2020 15:15:01 +0200
Subject: [PATCH] test/crypto: fix asymmetric session mempool creation

[ upstream commit 0ad83afdf3352e5e61e8c137131524ee6b2506ce ]

This patch fixes the element size of the mempool used
for allocating asym crypto sessions and their private data.

Fixes: 2c6dab9cd93d ("test/crypto: add RSA and Mod tests")

Signed-off-by: Adam Dybkowski <adamx.dybkowski@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 test/test/test_cryptodev_asym.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/test/test_cryptodev_asym.c b/test/test/test_cryptodev_asym.c
index a899f99735..4828f58213 100644
--- a/test/test/test_cryptodev_asym.c
+++ b/test/test/test_cryptodev_asym.c
@@ -394,6 +394,7 @@ testsuite_setup(void)
 
 	/* setup asym session pool */
-	unsigned int session_size =
-		rte_cryptodev_asym_get_private_session_size(dev_id);
+	unsigned int session_size = RTE_MAX(
+		rte_cryptodev_asym_get_private_session_size(dev_id),
+		rte_cryptodev_asym_get_header_session_size());
 	/*
 	 * Create mempool with TEST_NUM_SESSIONS * 2,
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.148787056 +0100
+++ 0007-test-crypto-fix-asymmetric-session-mempool-creation.patch	2020-08-20 16:26:15.762323761 +0100
@@ -1 +1 @@
-From 0ad83afdf3352e5e61e8c137131524ee6b2506ce Mon Sep 17 00:00:00 2001
+From b1caa2cfe65cff6083b8b5a5b0e4815cbb489e45 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0ad83afdf3352e5e61e8c137131524ee6b2506ce ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
- app/test/test_cryptodev_asym.c | 5 +++--
+ test/test/test_cryptodev_asym.c | 5 +++--
@@ -19,5 +20,5 @@
-diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
-index b8e0500481..dc62ed7bf3 100644
---- a/app/test/test_cryptodev_asym.c
-+++ b/app/test/test_cryptodev_asym.c
-@@ -936,6 +936,7 @@ testsuite_setup(void)
+diff --git a/test/test/test_cryptodev_asym.c b/test/test/test_cryptodev_asym.c
+index a899f99735..4828f58213 100644
+--- a/test/test/test_cryptodev_asym.c
++++ b/test/test/test_cryptodev_asym.c
+@@ -394,6 +394,7 @@ testsuite_setup(void)


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

* [dpdk-stable] patch 'common/cpt: fix encryption offset' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (5 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'test/crypto: fix asymmetric session mempool creation' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' " Kevin Traynor
                   ` (27 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Ankur Dwivedi; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/380fb4d751781f214a0055211700a88a8f730505

Thanks.

Kevin.

---
From 380fb4d751781f214a0055211700a88a8f730505 Mon Sep 17 00:00:00 2001
From: Ankur Dwivedi <adwivedi@marvell.com>
Date: Fri, 3 Jul 2020 11:11:37 +0530
Subject: [PATCH] common/cpt: fix encryption offset

[ upstream commit 0058f30514f13e5d5412e97973a9c9254e36edb1 ]

In case of gmac auth the encryption offset should be set to zero.

Fixes: b74652f3a91f ("common/cpt: add microcode interface for encryption")
Fixes: 177b41ceee61 ("common/cpt: add microcode interface for decryption")

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
---
 drivers/common/cpt/cpt_ucode.h | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/common/cpt/cpt_ucode.h b/drivers/common/cpt/cpt_ucode.h
index f47c96d934..ac6cd8d1eb 100644
--- a/drivers/common/cpt/cpt_ucode.h
+++ b/drivers/common/cpt/cpt_ucode.h
@@ -732,7 +732,4 @@ cpt_enc_hmac_prep(uint32_t flags,
 	m_dma += size;
 
-	if (hash_type == GMAC_TYPE)
-		encr_data_len = 0;
-
 	if (unlikely(!(flags & VALID_IV_BUF))) {
 		iv_len = 0;
@@ -766,4 +763,9 @@ cpt_enc_hmac_prep(uint32_t flags,
 	opcode.s.minor = 0;
 
+	if (hash_type == GMAC_TYPE) {
+		encr_offset = 0;
+		encr_data_len = 0;
+	}
+
 	auth_dlen = auth_offset + auth_data_len;
 	enc_dlen = encr_data_len + encr_offset;
@@ -776,9 +778,4 @@ cpt_enc_hmac_prep(uint32_t flags,
 	}
 
-	if (unlikely(hash_type == GMAC_TYPE)) {
-		encr_offset = auth_dlen;
-		enc_dlen = 0;
-	}
-
 	if (unlikely(auth_dlen > enc_dlen)) {
 		inputlen = auth_dlen;
@@ -1085,7 +1082,4 @@ cpt_dec_hmac_prep(uint32_t flags,
 	mac_len = cpt_ctx->mac_len;
 
-	if (hash_type == GMAC_TYPE)
-		encr_data_len = 0;
-
 	if (unlikely(!(flags & VALID_IV_BUF))) {
 		iv_len = 0;
@@ -1144,4 +1138,9 @@ cpt_dec_hmac_prep(uint32_t flags,
 	opcode.s.minor = 1;
 
+	if (hash_type == GMAC_TYPE) {
+		encr_offset = 0;
+		encr_data_len = 0;
+	}
+
 	enc_dlen = encr_offset + encr_data_len;
 	auth_dlen = auth_offset + auth_data_len;
@@ -1155,7 +1154,4 @@ cpt_dec_hmac_prep(uint32_t flags,
 	}
 
-	if (hash_type == GMAC_TYPE)
-		encr_offset = inputlen;
-
 	vq_cmd_w0.u64 = 0;
 	vq_cmd_w0.s.param1 = rte_cpu_to_be_16(encr_data_len);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.183979376 +0100
+++ 0008-common-cpt-fix-encryption-offset.patch	2020-08-20 16:26:15.767323807 +0100
@@ -1 +1 @@
-From 0058f30514f13e5d5412e97973a9c9254e36edb1 Mon Sep 17 00:00:00 2001
+From 380fb4d751781f214a0055211700a88a8f730505 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0058f30514f13e5d5412e97973a9c9254e36edb1 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 34ccd08a40..ab595eb580 100644
+index f47c96d934..ac6cd8d1eb 100644
@@ -21 +22 @@
-@@ -683,7 +683,4 @@ cpt_enc_hmac_prep(uint32_t flags,
+@@ -732,7 +732,4 @@ cpt_enc_hmac_prep(uint32_t flags,
@@ -29 +30 @@
-@@ -717,4 +714,9 @@ cpt_enc_hmac_prep(uint32_t flags,
+@@ -766,4 +763,9 @@ cpt_enc_hmac_prep(uint32_t flags,
@@ -39 +40 @@
-@@ -727,9 +729,4 @@ cpt_enc_hmac_prep(uint32_t flags,
+@@ -776,9 +778,4 @@ cpt_enc_hmac_prep(uint32_t flags,
@@ -49 +50 @@
-@@ -1034,7 +1031,4 @@ cpt_dec_hmac_prep(uint32_t flags,
+@@ -1085,7 +1082,4 @@ cpt_dec_hmac_prep(uint32_t flags,
@@ -57 +58 @@
-@@ -1093,4 +1087,9 @@ cpt_dec_hmac_prep(uint32_t flags,
+@@ -1144,4 +1138,9 @@ cpt_dec_hmac_prep(uint32_t flags,
@@ -67 +68 @@
-@@ -1104,7 +1103,4 @@ cpt_dec_hmac_prep(uint32_t flags,
+@@ -1155,7 +1154,4 @@ cpt_dec_hmac_prep(uint32_t flags,
@@ -74 +75 @@
- 	vq_cmd_w0.s.param1 = encr_data_len;
+ 	vq_cmd_w0.s.param1 = rte_cpu_to_be_16(encr_data_len);


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

* [dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (6 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'common/cpt: fix encryption offset' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix core mapping reset' " Kevin Traynor
                   ` (26 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Akhil Goyal; +Cc: Hemant Agrawal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/fc14e174a78a17b0d7be03f19e81333ee1fc4880

Thanks.

Kevin.

---
From fc14e174a78a17b0d7be03f19e81333ee1fc4880 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <akhil.goyal@nxp.com>
Date: Fri, 5 Jun 2020 01:34:10 +0530
Subject: [PATCH] crypto/dpaax_sec: fix inline query for descriptors

[ upstream commit 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 ]

The maximum length of job descriptor which is formed
is 13 words and hence rta_inline_query should take
care of the max descriptor(shared + job) lengths and
thus find out of the key can be referenced or immediate.

Fixes: 05b12700cd4c ("crypto/dpaa_sec: support null algos for protocol offload")
Fixes: 13273250eec5 ("crypto/dpaa2_sec: support AES-GCM and CTR")

Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 4 ++--
 drivers/crypto/dpaa2_sec/hw/desc.h          | 2 +-
 drivers/crypto/dpaa_sec/dpaa_sec.c          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index d888568327..db8a6b0ee3 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -1906,5 +1906,5 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
 	priv->flc_desc[0].desc[0] = aeaddata.keylen;
 	err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-			       MIN_JOB_DESC_SIZE,
+			       DESC_JOB_IO_LEN,
 			       (unsigned int *)priv->flc_desc[0].desc,
 			       &priv->flc_desc[0].desc[1], 1);
@@ -2128,5 +2128,5 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,
 	priv->flc_desc[0].desc[1] = authdata.keylen;
 	err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-			       MIN_JOB_DESC_SIZE,
+			       DESC_JOB_IO_LEN,
 			       (unsigned int *)priv->flc_desc[0].desc,
 			       &priv->flc_desc[0].desc[2], 2);
diff --git a/drivers/crypto/dpaa2_sec/hw/desc.h b/drivers/crypto/dpaa2_sec/hw/desc.h
index 5d99dd8af6..7e703dabbc 100644
--- a/drivers/crypto/dpaa2_sec/hw/desc.h
+++ b/drivers/crypto/dpaa2_sec/hw/desc.h
@@ -25,5 +25,5 @@
 #define CAAM_PTR_SZ sizeof(dma_addr_t)
 #define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE)
-#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)
+#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 7 + CAAM_PTR_SZ * 3)
 
 /* Block size of any entity covered/uncovered with a KEK/TKEK */
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 4426f08c10..d650b44204 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -416,5 +416,5 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)
 	cdb->sh_desc[1] = authdata.keylen;
 	err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-			       MIN_JOB_DESC_SIZE,
+			       DESC_JOB_IO_LEN,
 			       (unsigned int *)cdb->sh_desc,
 			       &cdb->sh_desc[2], 2);
@@ -560,5 +560,5 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
 		cdb->sh_desc[1] = alginfo_a.keylen;
 		err = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,
-				       MIN_JOB_DESC_SIZE,
+				       DESC_JOB_IO_LEN,
 				       (unsigned int *)cdb->sh_desc,
 				       &cdb->sh_desc[2], 2);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.220769358 +0100
+++ 0009-crypto-dpaax_sec-fix-inline-query-for-descriptors.patch	2020-08-20 16:26:15.775323879 +0100
@@ -1 +1 @@
-From 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 Mon Sep 17 00:00:00 2001
+From fc14e174a78a17b0d7be03f19e81333ee1fc4880 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 453b9593a3cfe62ce1f64c65382090ec8adb3ec0 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18 +18,0 @@
- drivers/common/dpaax/caamflib/desc.h        | 2 +-
@@ -19,0 +20 @@
+ drivers/crypto/dpaa2_sec/hw/desc.h          | 2 +-
@@ -23,11 +23,0 @@
-diff --git a/drivers/common/dpaax/caamflib/desc.h b/drivers/common/dpaax/caamflib/desc.h
-index e4139aaa9f..635d6bad07 100644
---- a/drivers/common/dpaax/caamflib/desc.h
-+++ b/drivers/common/dpaax/caamflib/desc.h
-@@ -27,5 +27,5 @@ extern enum rta_sec_era rta_sec_era;
- #define CAAM_PTR_SZ sizeof(dma_addr_t)
- #define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE)
--#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)
-+#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 7 + CAAM_PTR_SZ * 3)
- 
- /* Block size of any entity covered/uncovered with a KEK/TKEK */
@@ -35 +25 @@
-index 60fdced789..c56fb2152e 100644
+index d888568327..db8a6b0ee3 100644
@@ -38 +28 @@
-@@ -2193,5 +2193,5 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
+@@ -1906,5 +1906,5 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
@@ -45 +35 @@
-@@ -2417,5 +2417,5 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,
+@@ -2128,5 +2128,5 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,
@@ -51,0 +42,11 @@
+diff --git a/drivers/crypto/dpaa2_sec/hw/desc.h b/drivers/crypto/dpaa2_sec/hw/desc.h
+index 5d99dd8af6..7e703dabbc 100644
+--- a/drivers/crypto/dpaa2_sec/hw/desc.h
++++ b/drivers/crypto/dpaa2_sec/hw/desc.h
+@@ -25,5 +25,5 @@
+ #define CAAM_PTR_SZ sizeof(dma_addr_t)
+ #define CAAM_DESC_BYTES_MAX (CAAM_CMD_SZ * MAX_CAAM_DESCSIZE)
+-#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 5 + CAAM_PTR_SZ * 3)
++#define DESC_JOB_IO_LEN (CAAM_CMD_SZ * 7 + CAAM_PTR_SZ * 3)
+ 
+ /* Block size of any entity covered/uncovered with a KEK/TKEK */
@@ -53 +54 @@
-index 01e79c8eaa..5ce7e35827 100644
+index 4426f08c10..d650b44204 100644
@@ -56 +57 @@
-@@ -352,5 +352,5 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)
+@@ -416,5 +416,5 @@ dpaa_sec_prep_ipsec_cdb(dpaa_sec_session *ses)
@@ -63 +64 @@
-@@ -538,5 +538,5 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)
+@@ -560,5 +560,5 @@ dpaa_sec_prep_cdb(dpaa_sec_session *ses)


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

* [dpdk-stable] patch 'service: fix core mapping reset' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (7 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe: report 10Mbps link speed for x553' " Kevin Traynor
                   ` (25 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Lukasz Wojciechowski; +Cc: Sarosh Arif, Harry van Haaren, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/369c28238f9bd69e530f527217cb502e3fd11916

Thanks.

Kevin.

---
From 369c28238f9bd69e530f527217cb502e3fd11916 Mon Sep 17 00:00:00 2001
From: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Date: Wed, 8 Jul 2020 15:37:33 +0200
Subject: [PATCH] service: fix core mapping reset

[ upstream commit 048db4b6dcccaee9277ce5b4fbb2fe684b212e22 ]

The rte_service_lcore_reset_all function stops execution of services
on all lcores and switches them back from ROLE_SERVICE to ROLE_RTE.
However the thread loop for slave lcores (eal_thread_loop) distincts these
roles to set lcore state after processing delegated function.
It sets WAIT state for ROLE_SERVICE, but FINISHED for ROLE_RTE.
So changing the role to RTE before stopping work in slave lcores
causes lcores to end in FINISHED state. That is why the rte_eal_lcore_wait
must be run after rte_service_lcore_reset_all to bring back lcores to
launchable (WAIT) state.
This has been fixed in test app and clarified in API documentation.

Setting the state to WAIT in rte_service_runner_func is premature
as the rte_service_runner_func function is still a part of the lcore
function delegated to slave lcore. The state is overwritten anyway in
slave lcore thread loop. This premature setting state to WAIT might
however cause rte_eal_lcore_wait, that was called by the application,
to return before slave lcore thread set the FINISHED state. That's
why it is removed from librte_eal rte_service_runner_func function.

Bugzilla ID: 464
Fixes: 21698354c832 ("service: introduce service cores concept")
Fixes: f038a81e1c56 ("service: add unit tests")

Reported-by: Sarosh Arif <sarosh.arif@emumba.com>
Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 lib/librte_eal/common/include/rte_service.h | 4 ++++
 lib/librte_eal/common/rte_service.c         | 2 --
 test/test/test_service_cores.c              | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
index 21002209bc..200e028778 100644
--- a/lib/librte_eal/common/include/rte_service.h
+++ b/lib/librte_eal/common/include/rte_service.h
@@ -308,4 +308,8 @@ int32_t rte_service_lcore_count(void);
  * The runstate of services is not modified.
  *
+ * The cores that are stopped with this call, are in FINISHED state and
+ * the application must take care of bringing them back to a launchable state:
+ * e.g. call *rte_eal_lcore_wait* on the lcore_id.
+ *
  * @retval 0 Success
  */
diff --git a/lib/librte_eal/common/rte_service.c b/lib/librte_eal/common/rte_service.c
index 607f9a0407..af1733eb09 100644
--- a/lib/librte_eal/common/rte_service.c
+++ b/lib/librte_eal/common/rte_service.c
@@ -447,6 +447,4 @@ service_runner_func(void *arg)
 	}
 
-	lcore_config[lcore].state = WAIT;
-
 	return 0;
 }
diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c
index aa2174a332..c5150b6378 100644
--- a/test/test/test_service_cores.c
+++ b/test/test/test_service_cores.c
@@ -115,4 +115,5 @@ unregister_all(void)
 
 	rte_service_lcore_reset_all();
+	rte_eal_mp_wait_lcore();
 
 	return TEST_SUCCESS;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.264728042 +0100
+++ 0010-service-fix-core-mapping-reset.patch	2020-08-20 16:26:15.778323907 +0100
@@ -1 +1 @@
-From 048db4b6dcccaee9277ce5b4fbb2fe684b212e22 Mon Sep 17 00:00:00 2001
+From 369c28238f9bd69e530f527217cb502e3fd11916 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 048db4b6dcccaee9277ce5b4fbb2fe684b212e22 ]
+
@@ -28 +29,0 @@
-Cc: stable@dpdk.org
@@ -34,3 +35,3 @@
- app/test/test_service_cores.c        | 1 +
- lib/librte_eal/common/rte_service.c  | 2 --
- lib/librte_eal/include/rte_service.h | 4 ++++
+ lib/librte_eal/common/include/rte_service.h | 4 ++++
+ lib/librte_eal/common/rte_service.c         | 2 --
+ test/test/test_service_cores.c              | 1 +
@@ -39,10 +40,13 @@
-diff --git a/app/test/test_service_cores.c b/app/test/test_service_cores.c
-index 4f003ed1af..ef1d8fcb9b 100644
---- a/app/test/test_service_cores.c
-+++ b/app/test/test_service_cores.c
-@@ -115,4 +115,5 @@ unregister_all(void)
- 
- 	rte_service_lcore_reset_all();
-+	rte_eal_mp_wait_lcore();
- 
- 	return TEST_SUCCESS;
+diff --git a/lib/librte_eal/common/include/rte_service.h b/lib/librte_eal/common/include/rte_service.h
+index 21002209bc..200e028778 100644
+--- a/lib/librte_eal/common/include/rte_service.h
++++ b/lib/librte_eal/common/include/rte_service.h
+@@ -308,4 +308,8 @@ int32_t rte_service_lcore_count(void);
+  * The runstate of services is not modified.
+  *
++ * The cores that are stopped with this call, are in FINISHED state and
++ * the application must take care of bringing them back to a launchable state:
++ * e.g. call *rte_eal_lcore_wait* on the lcore_id.
++ *
+  * @retval 0 Success
+  */
@@ -50 +54 @@
-index e2795f857e..6a0e0ff65d 100644
+index 607f9a0407..af1733eb09 100644
@@ -53 +57 @@
-@@ -476,6 +476,4 @@ service_runner_func(void *arg)
+@@ -447,6 +447,4 @@ service_runner_func(void *arg)
@@ -60,13 +64,10 @@
-diff --git a/lib/librte_eal/include/rte_service.h b/lib/librte_eal/include/rte_service.h
-index 3a1c735c58..e2d0a6dd32 100644
---- a/lib/librte_eal/include/rte_service.h
-+++ b/lib/librte_eal/include/rte_service.h
-@@ -305,4 +305,8 @@ int32_t rte_service_lcore_count(void);
-  * The runstate of services is not modified.
-  *
-+ * The cores that are stopped with this call, are in FINISHED state and
-+ * the application must take care of bringing them back to a launchable state:
-+ * e.g. call *rte_eal_lcore_wait* on the lcore_id.
-+ *
-  * @retval 0 Success
-  */
+diff --git a/test/test/test_service_cores.c b/test/test/test_service_cores.c
+index aa2174a332..c5150b6378 100644
+--- a/test/test/test_service_cores.c
++++ b/test/test/test_service_cores.c
+@@ -115,4 +115,5 @@ unregister_all(void)
+ 
+ 	rte_service_lcore_reset_all();
++	rte_eal_mp_wait_lcore();
+ 
+ 	return TEST_SUCCESS;


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

* [dpdk-stable] patch 'net/ixgbe: report 10Mbps link speed for x553' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (8 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix core mapping reset' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/iavf: fix uninitialized variable' " Kevin Traynor
                   ` (24 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Wei Zhao; +Cc: Jeff Guo, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/0fd5bd21c1b8eb88bd47a2892add192999852825

Thanks.

Kevin.

---
From 0fd5bd21c1b8eb88bd47a2892add192999852825 Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Tue, 30 Jun 2020 09:16:51 +0800
Subject: [PATCH] net/ixgbe: report 10Mbps link speed for x553

[ upstream commit b23c52a451958a6140fc86fa72f51f5a8f4584da ]

For ixgbe x553(IXGBE_DEV_ID_X550EM_A_1G_T) it support 10M
link speed, so add the support link speed info for 10Mb/s.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Jeff Guo <jia.guo@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index e888f8e62d..01cedb45e8 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -4230,4 +4230,8 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
 		break;
 
+	case IXGBE_LINK_SPEED_10_FULL:
+		link.link_speed = ETH_SPEED_NUM_10M;
+		break;
+
 	case IXGBE_LINK_SPEED_100_FULL:
 		link.link_speed = ETH_SPEED_NUM_100M;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.300642588 +0100
+++ 0011-net-ixgbe-report-10Mbps-link-speed-for-x553.patch	2020-08-20 16:26:15.785323970 +0100
@@ -1 +1 @@
-From b23c52a451958a6140fc86fa72f51f5a8f4584da Mon Sep 17 00:00:00 2001
+From 0fd5bd21c1b8eb88bd47a2892add192999852825 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b23c52a451958a6140fc86fa72f51f5a8f4584da ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 248f21d143..095f1bde57 100644
+index e888f8e62d..01cedb45e8 100644
@@ -22 +23 @@
-@@ -4308,4 +4308,8 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
+@@ -4230,4 +4230,8 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,


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

* [dpdk-stable] patch 'net/iavf: fix uninitialized variable' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (9 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe: report 10Mbps link speed for x553' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: remove dead code' " Kevin Traynor
                   ` (23 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/af7961c247910bf9cde1872823626e262d4c9905

Thanks.

Kevin.

---
From af7961c247910bf9cde1872823626e262d4c9905 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Tue, 23 Jun 2020 14:45:31 +0100
Subject: [PATCH] net/iavf: fix uninitialized variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit ca5e39f8535300b247d14865cd8c6b9b4acba38a ]

This is observed with experimental gcc 11, although the older gcc
versions don't complain about it, issue seems a valid one.
gcc version 11.0.0 20200621 (experimental) (GCC)

Build error
.../drivers/net/iavf/iavf_ethdev.c: In function ‘iavf_dev_link_update’:
.../drivers/net/iavf/iavf_ethdev.c:641:6:
    error: ‘new_link’ is used uninitialized [-Werror=uninitialized]
  641 |  if (rte_atomic64_cmpset((uint64_t *)&dev->data->dev_link,
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  642 |     *(uint64_t *)&dev->data->dev_link,
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  643 |     *(uint64_t *)&new_link) == 0)
      |     ~~~~~~~~~~~~~~~~~~~~~~~
.../drivers/net/iavf/iavf_ethdev.c:596:22:
    note: ‘new_link’ declared here
  596 |  struct rte_eth_link new_link;
      |                      ^~~~~~~~
cc1: all warnings being treated as error

All fields of the 'new_link' struct is already set in function, so the
'uninitialized' warning is hard to get. This is because the combination
of aligning and bitfield usage of the struct

The definition of the struct is:
struct rte_eth_link {
        uint32_t link_speed;        /**< ETH_SPEED_NUM_ */
        uint16_t link_duplex  : 1;  /**< ETH_LINK_[HALF/FULL]_DUPLEX */
        uint16_t link_autoneg : 1;  /**< ETH_LINK_[AUTONEG/FIXED] */
        uint16_t link_status  : 1;  /**< ETH_LINK_[DOWN/UP] */
} __rte_aligned(8);      /**< aligned for atomic64 read/write */

Overall the size of the 'struct rte_eth_link' is 64 bits, but function
only sets the 35 bits of it, because only 3 bits of 16 bits variable are
used.
When the struct cast to 'uint64_t' because of the 'rte_atomic64_cmpset'
the upper 29 bits are used without initialization.

To fix the uninitialized usage, memset the variable 'new_link' before
using it.

Fixes: 48de41ca11f0 ("net/avf: enable link status update")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/avf/avf_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c
index 8000e9c70d..0ab468904c 100644
--- a/drivers/net/avf/avf_ethdev.c
+++ b/drivers/net/avf/avf_ethdev.c
@@ -581,4 +581,6 @@ avf_dev_link_update(struct rte_eth_dev *dev,
 	struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 
+	memset(&new_link, 0, sizeof(new_link));
+
 	/* Only read status info stored in VF, and the info is updated
 	 *  when receive LINK_CHANGE evnet from PF by Virtchnnl.
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.339157367 +0100
+++ 0012-net-iavf-fix-uninitialized-variable.patch	2020-08-20 16:26:15.786323979 +0100
@@ -1 +1 @@
-From ca5e39f8535300b247d14865cd8c6b9b4acba38a Mon Sep 17 00:00:00 2001
+From af7961c247910bf9cde1872823626e262d4c9905 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit ca5e39f8535300b247d14865cd8c6b9b4acba38a ]
+
@@ -51 +52,0 @@
-Cc: stable@dpdk.org
@@ -56 +57 @@
- drivers/net/iavf/iavf_ethdev.c | 2 ++
+ drivers/net/avf/avf_ethdev.c | 2 ++
@@ -59,6 +60,6 @@
-diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
-index d69e5284ed..b0dd49a8da 100644
---- a/drivers/net/iavf/iavf_ethdev.c
-+++ b/drivers/net/iavf/iavf_ethdev.c
-@@ -583,4 +583,6 @@ iavf_dev_link_update(struct rte_eth_dev *dev,
- 	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c
+index 8000e9c70d..0ab468904c 100644
+--- a/drivers/net/avf/avf_ethdev.c
++++ b/drivers/net/avf/avf_ethdev.c
+@@ -581,4 +581,6 @@ avf_dev_link_update(struct rte_eth_dev *dev,
+ 	struct avf_info *vf = AVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);


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

* [dpdk-stable] patch 'net/ixgbe/base: remove dead code' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (10 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/iavf: fix uninitialized variable' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/i40e: fix getting EEPROM information' " Kevin Traynor
                   ` (22 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/a7ecf87543bfeca357695a996a4f014338330313

Thanks.

Kevin.

---
From a7ecf87543bfeca357695a996a4f014338330313 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Tue, 30 Jun 2020 15:45:54 +0100
Subject: [PATCH] net/ixgbe/base: remove dead code

[ upstream commit a6395d471e14e5a7432875dad8fb3533238c5167 ]

The question around getting rid of the assignments seems lived
long enough, if they are not needed until now, we can drop them.

Fixes: 39bca0ed994c ("ixgbe: DCB in base driver")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_dcb_82598.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
index bb309e28fd..dc7b905c5d 100644
--- a/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
+++ b/drivers/net/ixgbe/base/ixgbe_dcb_82598.c
@@ -37,12 +37,4 @@ s32 ixgbe_dcb_get_tc_stats_82598(struct ixgbe_hw *hw,
 		/* Received Bytes */
 		stats->qbrc[tc] += IXGBE_READ_REG(hw, IXGBE_QBRC(tc));
-
-#if 0
-		/* Can we get rid of these??  Consequently, getting rid
-		 * of the tc_stats structure.
-		 */
-		tc_stats_array[up]->in_overflow_discards = 0;
-		tc_stats_array[up]->out_overflow_discards = 0;
-#endif
 	}
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.367412675 +0100
+++ 0013-net-ixgbe-base-remove-dead-code.patch	2020-08-20 16:26:15.787323988 +0100
@@ -1 +1 @@
-From a6395d471e14e5a7432875dad8fb3533238c5167 Mon Sep 17 00:00:00 2001
+From a7ecf87543bfeca357695a996a4f014338330313 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a6395d471e14e5a7432875dad8fb3533238c5167 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org


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

* [dpdk-stable] patch 'net/i40e: fix getting EEPROM information' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (11 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: remove dead code' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: use clock time in throughput calculation' " Kevin Traynor
                   ` (21 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Pavel Ivashchenko; +Cc: Qi Zhang, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/ffa1d166d65da66b3bb75a24e1aa18948d25a8b0

Thanks.

Kevin.

---
From ffa1d166d65da66b3bb75a24e1aa18948d25a8b0 Mon Sep 17 00:00:00 2001
From: Pavel Ivashchenko <pivashchenko@nfware.com>
Date: Thu, 2 Jul 2020 12:37:17 +0000
Subject: [PATCH] net/i40e: fix getting EEPROM information

[ upstream commit 2fc1d6da882563ab80786d69b6d7c9d0e4ce860a ]

Fixes: 50130a0c4440 ("net/i40e/base: change AQ command for PHY access")

Signed-off-by: Pavel Ivashchenko <pivashchenko@nfware.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 3f1787728f..98c752bc4e 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -11849,5 +11849,5 @@ static int i40e_get_module_eeprom(struct rte_eth_dev *dev,
 		status = i40e_aq_get_phy_register(hw,
 				I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE,
-				addr, offset, 1, &value, NULL);
+				addr, 1, offset, &value, NULL);
 		if (status)
 			return -EIO;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.395459811 +0100
+++ 0014-net-i40e-fix-getting-EEPROM-information.patch	2020-08-20 16:26:15.797324079 +0100
@@ -1 +1 @@
-From 2fc1d6da882563ab80786d69b6d7c9d0e4ce860a Mon Sep 17 00:00:00 2001
+From ffa1d166d65da66b3bb75a24e1aa18948d25a8b0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2fc1d6da882563ab80786d69b6d7c9d0e4ce860a ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
-index 472ce2a9e1..777e14926f 100644
+index 3f1787728f..98c752bc4e 100644
@@ -19 +20 @@
-@@ -12082,5 +12082,5 @@ static int i40e_get_module_eeprom(struct rte_eth_dev *dev,
+@@ -11849,5 +11849,5 @@ static int i40e_get_module_eeprom(struct rte_eth_dev *dev,


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

* [dpdk-stable] patch 'app/testpmd: use clock time in throughput calculation' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (12 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/i40e: fix getting EEPROM information' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: fix burst percentage " Kevin Traynor
                   ` (20 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Honnappa Nagarahalli
  Cc: Phil Yang, Ruifeng Wang, Ferruh Yigit, Ali Alnubani, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/c6b6392a369508349351c1b9407a80515be14361

Thanks.

Kevin.

---
From c6b6392a369508349351c1b9407a80515be14361 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Date: Mon, 6 Jul 2020 18:32:29 -0500
Subject: [PATCH] app/testpmd: use clock time in throughput calculation

[ upstream commit aac2b6a78d7728ee39aed8822cba102b3a99a6bf ]

The throughput calculation requires a counter that measures
passing of time. However, the kernel saves and restores the PMU
state when a thread is unscheduled and scheduled. This ensures
that the PMU cycles are not counted towards a thread that is
not scheduled. Hence, when RTE_ARM_EAL_RDTSC_USE_PMU is enabled,
the PMU cycles do not represent the passing of time.
This results in incorrect calculation of throughput numbers.
Use clock_gettime system call to calculate the time passed since
last call.

Bugzilla ID: 450
Fixes: 0e106980301d ("app/testpmd: show throughput in port stats")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Phil Yang <phil.yang@arm.com>
Tested-by: Ali Alnubani <alialnu@mellanox.com>
---
 app/test-pmd/config.c | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 0e5d77159d..b51e821a45 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -55,4 +55,12 @@
 #include "testpmd.h"
 
+#ifdef CLOCK_MONOTONIC_RAW /* Defined in glibc bits/time.h */
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC_RAW
+#else
+#define CLOCK_TYPE_ID CLOCK_MONOTONIC
+#endif
+
+#define NS_PER_SEC 1E9
+
 static char *flowtype_to_str(uint16_t flow_type);
 
@@ -121,6 +129,7 @@ nic_stats_display(portid_t port_id)
 	static uint64_t prev_pkts_rx[RTE_MAX_ETHPORTS];
 	static uint64_t prev_pkts_tx[RTE_MAX_ETHPORTS];
-	static uint64_t prev_cycles[RTE_MAX_ETHPORTS];
-	uint64_t diff_pkts_rx, diff_pkts_tx, diff_cycles;
+	static uint64_t prev_ns[RTE_MAX_ETHPORTS];
+	struct timespec cur_time;
+	uint64_t diff_pkts_rx, diff_pkts_tx, diff_ns;
 	uint64_t mpps_rx, mpps_tx;
 	struct rte_eth_stats stats;
@@ -179,8 +188,15 @@ nic_stats_display(portid_t port_id)
 	}
 
-	diff_cycles = prev_cycles[port_id];
-	prev_cycles[port_id] = rte_rdtsc();
-	if (diff_cycles > 0)
-		diff_cycles = prev_cycles[port_id] - diff_cycles;
+	diff_ns = 0;
+	if (clock_gettime(CLOCK_TYPE_ID, &cur_time) == 0) {
+		uint64_t ns;
+
+		ns = cur_time.tv_sec * NS_PER_SEC;
+		ns += cur_time.tv_nsec;
+
+		if (prev_ns[port_id] != 0)
+			diff_ns = ns - prev_ns[port_id];
+		prev_ns[port_id] = ns;
+	}
 
 	diff_pkts_rx = (stats.ipackets > prev_pkts_rx[port_id]) ?
@@ -190,8 +206,9 @@ nic_stats_display(portid_t port_id)
 	prev_pkts_rx[port_id] = stats.ipackets;
 	prev_pkts_tx[port_id] = stats.opackets;
-	mpps_rx = diff_cycles > 0 ?
-		diff_pkts_rx * rte_get_tsc_hz() / diff_cycles : 0;
-	mpps_tx = diff_cycles > 0 ?
-		diff_pkts_tx * rte_get_tsc_hz() / diff_cycles : 0;
+	mpps_rx = diff_ns > 0 ?
+		(double)diff_pkts_rx / diff_ns * NS_PER_SEC : 0;
+	mpps_tx = diff_ns > 0 ?
+		(double)diff_pkts_tx / diff_ns * NS_PER_SEC : 0;
+
 	printf("\n  Throughput (since last show)\n");
 	printf("  Rx-pps: %12"PRIu64"\n  Tx-pps: %12"PRIu64"\n",
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.437389024 +0100
+++ 0015-app-testpmd-use-clock-time-in-throughput-calculation.patch	2020-08-20 16:26:15.799324097 +0100
@@ -1 +1 @@
-From aac2b6a78d7728ee39aed8822cba102b3a99a6bf Mon Sep 17 00:00:00 2001
+From c6b6392a369508349351c1b9407a80515be14361 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aac2b6a78d7728ee39aed8822cba102b3a99a6bf ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org
@@ -27,2 +28,2 @@
- app/test-pmd/config.c | 44 +++++++++++++++++++++++++++++--------------
- 1 file changed, 30 insertions(+), 14 deletions(-)
+ app/test-pmd/config.c | 37 +++++++++++++++++++++++++++----------
+ 1 file changed, 27 insertions(+), 10 deletions(-)
@@ -31 +32 @@
-index a79019f522..75013100f5 100644
+index 0e5d77159d..b51e821a45 100644
@@ -35 +36 @@
- #define ETHDEV_FWVERS_LEN 32
+ #include "testpmd.h"
@@ -47,3 +48,3 @@
-@@ -140,7 +148,8 @@ nic_stats_display(portid_t port_id)
- 	static uint64_t prev_bytes_rx[RTE_MAX_ETHPORTS];
- 	static uint64_t prev_bytes_tx[RTE_MAX_ETHPORTS];
+@@ -121,6 +129,7 @@ nic_stats_display(portid_t port_id)
+ 	static uint64_t prev_pkts_rx[RTE_MAX_ETHPORTS];
+ 	static uint64_t prev_pkts_tx[RTE_MAX_ETHPORTS];
@@ -50,0 +52 @@
+-	uint64_t diff_pkts_rx, diff_pkts_tx, diff_cycles;
@@ -53,4 +55,2 @@
- 	uint64_t diff_pkts_rx, diff_pkts_tx, diff_bytes_rx, diff_bytes_tx,
--								diff_cycles;
-+								diff_ns;
- 	uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx;
++	uint64_t diff_pkts_rx, diff_pkts_tx, diff_ns;
+ 	uint64_t mpps_rx, mpps_tx;
@@ -58 +58 @@
-@@ -199,8 +208,15 @@ nic_stats_display(portid_t port_id)
+@@ -179,8 +188,15 @@ nic_stats_display(portid_t port_id)
@@ -78 +78 @@
-@@ -210,8 +226,8 @@ nic_stats_display(portid_t port_id)
+@@ -190,8 +206,9 @@ nic_stats_display(portid_t port_id)
@@ -89,14 +89 @@
- 
- 	diff_bytes_rx = (stats.ibytes > prev_bytes_rx[port_id]) ?
-@@ -221,8 +237,8 @@ nic_stats_display(portid_t port_id)
- 	prev_bytes_rx[port_id] = stats.ibytes;
- 	prev_bytes_tx[port_id] = stats.obytes;
--	mbps_rx = diff_cycles > 0 ?
--		diff_bytes_rx * rte_get_tsc_hz() / diff_cycles : 0;
--	mbps_tx = diff_cycles > 0 ?
--		diff_bytes_tx * rte_get_tsc_hz() / diff_cycles : 0;
-+	mbps_rx = diff_ns > 0 ?
-+		(double)diff_bytes_rx / diff_ns * NS_PER_SEC : 0;
-+	mbps_tx = diff_ns > 0 ?
-+		(double)diff_bytes_tx / diff_ns * NS_PER_SEC : 0;
- 
++
@@ -103,0 +91 @@
+ 	printf("  Rx-pps: %12"PRIu64"\n  Tx-pps: %12"PRIu64"\n",


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

* [dpdk-stable] patch 'app/testpmd: fix burst percentage calculation' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (13 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: use clock time in throughput calculation' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix log type for some error messages' " Kevin Traynor
                   ` (19 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Honnappa Nagarahalli
  Cc: Phil Yang, Ruifeng Wang, Ferruh Yigit, Ali Alnubani, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/f1b7643e624b44873ae9673d14cf57c0fd277639

Thanks.

Kevin.

---
From f1b7643e624b44873ae9673d14cf57c0fd277639 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Date: Mon, 6 Jul 2020 18:32:30 -0500
Subject: [PATCH] app/testpmd: fix burst percentage calculation

[ upstream commit 85de481a716a14a3eb89869928d96b539b1f0b62 ]

The burst % calculation can over flow due to multiplication.
Fix the multiplication and increase the size of variables to
64b.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Phil Yang <phil.yang@arm.com>
Tested-by: Ali Alnubani <alialnu@mellanox.com>
---
 app/test-pmd/testpmd.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index a32eae750c..018bd32ec6 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1326,7 +1326,7 @@ static void
 pkt_burst_stats_display(const char *rx_tx, struct pkt_burst_stats *pbs)
 {
-	unsigned int total_burst;
-	unsigned int nb_burst;
-	unsigned int burst_stats[3];
+	uint64_t total_burst;
+	uint64_t nb_burst;
+	uint64_t burst_stats[3];
 	uint16_t pktnb_stats[3];
 	uint16_t nb_pkt;
@@ -1357,6 +1357,6 @@ pkt_burst_stats_display(const char *rx_tx, struct pkt_burst_stats *pbs)
 	if (total_burst == 0)
 		return;
-	burst_percent[0] = (burst_stats[0] * 100) / total_burst;
-	printf("  %s-bursts : %u [%d%% of %d pkts", rx_tx, total_burst,
+	burst_percent[0] = (double)burst_stats[0] / total_burst * 100;
+	printf("  %s-bursts : %"PRIu64" [%d%% of %d pkts", rx_tx, total_burst,
 	       burst_percent[0], (int) pktnb_stats[0]);
 	if (burst_stats[0] == total_burst) {
@@ -1369,5 +1369,5 @@ pkt_burst_stats_display(const char *rx_tx, struct pkt_burst_stats *pbs)
 		return;
 	}
-	burst_percent[1] = (burst_stats[1] * 100) / total_burst;
+	burst_percent[1] = (double)burst_stats[1] / total_burst * 100;
 	burst_percent[2] = 100 - (burst_percent[0] + burst_percent[1]);
 	if ((burst_percent[1] == 0) || (burst_percent[2] == 0)) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.469640556 +0100
+++ 0016-app-testpmd-fix-burst-percentage-calculation.patch	2020-08-20 16:26:15.801324115 +0100
@@ -1 +1 @@
-From 85de481a716a14a3eb89869928d96b539b1f0b62 Mon Sep 17 00:00:00 2001
+From f1b7643e624b44873ae9673d14cf57c0fd277639 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 85de481a716a14a3eb89869928d96b539b1f0b62 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 4989d22ca8..2e1493da23 100644
+index a32eae750c..018bd32ec6 100644
@@ -27 +28 @@
-@@ -1693,7 +1693,7 @@ static void
+@@ -1326,7 +1326,7 @@ static void
@@ -38 +39 @@
-@@ -1724,6 +1724,6 @@ pkt_burst_stats_display(const char *rx_tx, struct pkt_burst_stats *pbs)
+@@ -1357,6 +1357,6 @@ pkt_burst_stats_display(const char *rx_tx, struct pkt_burst_stats *pbs)
@@ -47 +48 @@
-@@ -1736,5 +1736,5 @@ pkt_burst_stats_display(const char *rx_tx, struct pkt_burst_stats *pbs)
+@@ -1369,5 +1369,5 @@ pkt_burst_stats_display(const char *rx_tx, struct pkt_burst_stats *pbs)


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

* [dpdk-stable] patch 'ethdev: fix log type for some error messages' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (14 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: fix burst percentage " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix C++ linkage' " Kevin Traynor
                   ` (18 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Andrew Rybchenko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/4a0112bf9c7db0c4909d43321274f2b296f2199d

Thanks.

Kevin.

---
From 4a0112bf9c7db0c4909d43321274f2b296f2199d Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Thu, 2 Jul 2020 12:17:05 +0100
Subject: [PATCH] ethdev: fix log type for some error messages

[ upstream commit f6ac2b06ecffa62abbc2cd6009b593604c2f3447 ]

Some log macros was using 'EAL' logtype, convert them to 'ethdev'.
Also fix missing EOL and fix syntax for some logs.

Fixes: 214ed1acd125 ("ethdev: add iterator to match devargs input")
Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 lib/librte_ethdev/rte_ethdev.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 2929d10c22..7769b0f4bc 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -280,5 +280,5 @@ end:
 error:
 	if (ret == -ENOTSUP)
-		RTE_LOG(ERR, EAL, "Bus %s does not support iterating.\n",
+		RTE_ETHDEV_LOG(ERR, "Bus %s does not support iterating.\n",
 				iter->bus->name);
 	free(devargs.args);
@@ -3636,5 +3636,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 
 			if (!ethdev->data->dev_private) {
-				RTE_LOG(ERR, EAL, "failed to allocate private data");
+				RTE_ETHDEV_LOG(ERR,
+					"failed to allocate private data\n");
 				retval = -ENOMEM;
 				goto probe_failed;
@@ -3644,6 +3645,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 		ethdev = rte_eth_dev_attach_secondary(name);
 		if (!ethdev) {
-			RTE_LOG(ERR, EAL, "secondary process attach failed, "
-				"ethdev doesn't exist");
+			RTE_ETHDEV_LOG(ERR,
+				"secondary process attach failed, ethdev doesn't exist\n");
 			return  -ENODEV;
 		}
@@ -3655,6 +3656,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 		retval = ethdev_bus_specific_init(ethdev, bus_init_params);
 		if (retval) {
-			RTE_LOG(ERR, EAL,
-				"ethdev bus specific initialisation failed");
+			RTE_ETHDEV_LOG(ERR,
+				"ethdev bus specific initialisation failed\n");
 			goto probe_failed;
 		}
@@ -3663,5 +3664,5 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 	retval = ethdev_init(ethdev, init_params);
 	if (retval) {
-		RTE_LOG(ERR, EAL, "ethdev initialisation failed");
+		RTE_ETHDEV_LOG(ERR, "ethdev initialisation failed\n");
 		goto probe_failed;
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.499991750 +0100
+++ 0017-ethdev-fix-log-type-for-some-error-messages.patch	2020-08-20 16:26:15.804324143 +0100
@@ -1 +1 @@
-From f6ac2b06ecffa62abbc2cd6009b593604c2f3447 Mon Sep 17 00:00:00 2001
+From 4a0112bf9c7db0c4909d43321274f2b296f2199d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f6ac2b06ecffa62abbc2cd6009b593604c2f3447 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index d06b7f9b1a..5f10f2d8d2 100644
+index 2929d10c22..7769b0f4bc 100644
@@ -23 +24 @@
-@@ -278,5 +278,5 @@ end:
+@@ -280,5 +280,5 @@ end:
@@ -30 +31 @@
-@@ -4231,5 +4231,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -3636,5 +3636,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
@@ -38 +39 @@
-@@ -4239,6 +4240,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -3644,6 +3645,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
@@ -47 +48 @@
-@@ -4250,6 +4251,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -3655,6 +3656,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
@@ -56 +57 @@
-@@ -4258,5 +4259,5 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
+@@ -3663,5 +3664,5 @@ rte_eth_dev_create(struct rte_device *device, const char *name,


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

* [dpdk-stable] patch 'service: fix C++ linkage' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (15 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix log type for some error messages' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix unneeded replacement of TCP checksum 0' " Kevin Traynor
                   ` (17 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Levend Sayar; +Cc: Harry van Haaren, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/71cd446cef77636f192ee178024f484ace334c9d

Thanks.

Kevin.

---
From 71cd446cef77636f192ee178024f484ace334c9d Mon Sep 17 00:00:00 2001
From: Levend Sayar <levendsayar@gmail.com>
Date: Thu, 9 Jul 2020 15:32:16 +0300
Subject: [PATCH] service: fix C++ linkage

[ upstream commit 604d426de35b445476fa1b9aeae4933ae647be3f ]

"extern C" define is added to rte_service_component.h file
to be able to use in C++ context

Fixes: 21698354c832 ("service: introduce service cores concept")

Signed-off-by: Levend Sayar <levendsayar@gmail.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
---
 lib/librte_eal/common/include/rte_service_component.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/librte_eal/common/include/rte_service_component.h b/lib/librte_eal/common/include/rte_service_component.h
index 259e3182d8..238a94680f 100644
--- a/lib/librte_eal/common/include/rte_service_component.h
+++ b/lib/librte_eal/common/include/rte_service_component.h
@@ -10,4 +10,9 @@
  * operate, and you wish to run the component using service cores
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <rte_compat.h>
 #include <rte_service.h>
@@ -131,3 +136,7 @@ int32_t rte_service_init(void);
 void rte_service_finalize(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_SERVICE_PRIVATE_H_ */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.532488991 +0100
+++ 0018-service-fix-C-linkage.patch	2020-08-20 16:26:15.804324143 +0100
@@ -1 +1 @@
-From 604d426de35b445476fa1b9aeae4933ae647be3f Mon Sep 17 00:00:00 2001
+From 71cd446cef77636f192ee178024f484ace334c9d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 604d426de35b445476fa1b9aeae4933ae647be3f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -15 +16 @@
- lib/librte_eal/include/rte_service_component.h | 9 +++++++++
+ lib/librte_eal/common/include/rte_service_component.h | 9 +++++++++
@@ -18,4 +19,4 @@
-diff --git a/lib/librte_eal/include/rte_service_component.h b/lib/librte_eal/include/rte_service_component.h
-index b75aba11b9..9e66ee7e29 100644
---- a/lib/librte_eal/include/rte_service_component.h
-+++ b/lib/librte_eal/include/rte_service_component.h
+diff --git a/lib/librte_eal/common/include/rte_service_component.h b/lib/librte_eal/common/include/rte_service_component.h
+index 259e3182d8..238a94680f 100644
+--- a/lib/librte_eal/common/include/rte_service_component.h
++++ b/lib/librte_eal/common/include/rte_service_component.h
@@ -39 +40 @@
- #endif /* _SERVICE_PRIVATE_H_ */
+ #endif /* _RTE_SERVICE_PRIVATE_H_ */


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

* [dpdk-stable] patch 'net: fix unneeded replacement of TCP checksum 0' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (16 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix C++ linkage' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix checksum on big endian CPUs' " Kevin Traynor
                   ` (16 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Hongzhi Guo; +Cc: Olivier Matz, Morten Brørup, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/0c4ca42257f40b58bac2e35fbdbc62771eca8cef

Thanks.

Kevin.

---
From 0c4ca42257f40b58bac2e35fbdbc62771eca8cef Mon Sep 17 00:00:00 2001
From: Hongzhi Guo <guohongzhi1@huawei.com>
Date: Fri, 10 Jul 2020 14:55:51 +0800
Subject: [PATCH] net: fix unneeded replacement of TCP checksum 0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit d5df2ae0428a147b80bbb65d623f88f75d28b226 ]

Per RFC768:
If the computed checksum is zero, it is transmitted as all ones.
An all zero transmitted checksum value means that the transmitter
generated no checksum.

RFC793 for TCP has no such special treatment for the checksum of zero.

Fixes: 6006818cfb26 ("net: new checksum functions")

Signed-off-by: Hongzhi Guo <guohongzhi1@huawei.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 lib/librte_net/rte_ip.h | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 2c78ba6cf6..728a045b9d 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -317,6 +317,5 @@ rte_ipv4_phdr_cksum(const struct ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
  *   The pointer to the beginning of the L4 header.
  * @return
- *   The complemented checksum to set in the IP packet
- *   or 0 on error
+ *   The complemented checksum to set in the IP packet.
  */
 static inline uint16_t
@@ -337,5 +336,10 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr)
 	cksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);
 	cksum = (~cksum) & 0xffff;
-	if (cksum == 0)
+	/*
+	 * Per RFC 768:If the computed checksum is zero for UDP,
+	 * it is transmitted as all ones
+	 * (the equivalent in one's complement arithmetic).
+	 */
+	if (cksum == 0 && ipv4_hdr->next_proto_id == IPPROTO_UDP)
 		cksum = 0xffff;
 
@@ -426,5 +430,10 @@ rte_ipv6_udptcp_cksum(const struct ipv6_hdr *ipv6_hdr, const void *l4_hdr)
 	cksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);
 	cksum = (~cksum) & 0xffff;
-	if (cksum == 0)
+	/*
+	 * Per RFC 768: If the computed checksum is zero for UDP,
+	 * it is transmitted as all ones
+	 * (the equivalent in one's complement arithmetic).
+	 */
+	if (cksum == 0 && ipv6_hdr->proto == IPPROTO_UDP)
 		cksum = 0xffff;
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.560303769 +0100
+++ 0019-net-fix-unneeded-replacement-of-TCP-checksum-0.patch	2020-08-20 16:26:15.805324152 +0100
@@ -1 +1 @@
-From d5df2ae0428a147b80bbb65d623f88f75d28b226 Mon Sep 17 00:00:00 2001
+From 0c4ca42257f40b58bac2e35fbdbc62771eca8cef Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit d5df2ae0428a147b80bbb65d623f88f75d28b226 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 292f63fd74..a9ffc33571 100644
+index 2c78ba6cf6..728a045b9d 100644
@@ -30 +31 @@
-@@ -325,6 +325,5 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
+@@ -317,6 +317,5 @@ rte_ipv4_phdr_cksum(const struct ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
@@ -38 +39 @@
-@@ -345,5 +344,10 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)
+@@ -337,5 +336,10 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr)
@@ -50 +51 @@
-@@ -439,5 +443,10 @@ rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr)
+@@ -426,5 +430,10 @@ rte_ipv6_udptcp_cksum(const struct ipv6_hdr *ipv6_hdr, const void *l4_hdr)


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

* [dpdk-stable] patch 'net: fix checksum on big endian CPUs' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (17 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix unneeded replacement of TCP checksum 0' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'eal: fix parentheses in alignment macros' " Kevin Traynor
                   ` (15 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Hongzhi Guo; +Cc: Morten Brørup, Olivier Matz, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4

Thanks.

Kevin.

---
From 9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4 Mon Sep 17 00:00:00 2001
From: Hongzhi Guo <guohongzhi1@huawei.com>
Date: Fri, 10 Jul 2020 19:43:13 +0800
Subject: [PATCH] net: fix checksum on big endian CPUs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 982bb68cab2b93724f9625d53c309e73fa194e6e ]

With current code, the checksum of odd-length buffers is wrong on
big endian CPUs: the last byte is not properly summed to the
accumulator.

Fix this by left-shifting the remaining byte by 8. For instance,
if the last byte is 0x42, we should add 0x4200 to the accumulator
on big endian CPUs.

This change is similar to what is suggested in Errata 3133 of
RFC 1071.

Fixes: 6006818cfb26("net: new checksum functions")

Signed-off-by: Hongzhi Guo <guohongzhi1@huawei.com>
Reviewed-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_net/rte_ip.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 728a045b9d..a589a702af 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -132,6 +132,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
 
 	/* if length is in odd bytes */
-	if (len == 1)
-		sum += *((const uint8_t *)u16_buf);
+	if (len == 1) {
+		uint16_t left = 0;
+		*(uint8_t *)&left = *(const uint8_t *)u16_buf;
+		sum += left;
+	}
 
 	return sum;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.588499082 +0100
+++ 0020-net-fix-checksum-on-big-endian-CPUs.patch	2020-08-20 16:26:15.805324152 +0100
@@ -1 +1 @@
-From 982bb68cab2b93724f9625d53c309e73fa194e6e Mon Sep 17 00:00:00 2001
+From 9f6bad9ea2c5df814893c78c97cbe16c3d45b0f4 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 982bb68cab2b93724f9625d53c309e73fa194e6e ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index a9ffc33571..fcd1eb342d 100644
+index 728a045b9d..a589a702af 100644
@@ -34 +35 @@
-@@ -140,6 +140,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
+@@ -132,6 +132,9 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)


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

* [dpdk-stable] patch 'eal: fix parentheses in alignment macros' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (18 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix checksum on big endian CPUs' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'vhost: fix virtio ready flag check' " Kevin Traynor
                   ` (14 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Harman Kalra; +Cc: dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/53d8ebacc1392439d183de6dd65ca8bee7ce16c5

Thanks.

Kevin.

---
From 53d8ebacc1392439d183de6dd65ca8bee7ce16c5 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra@marvell.com>
Date: Wed, 24 Jun 2020 15:50:47 +0530
Subject: [PATCH] eal: fix parentheses in alignment macros

[ upstream commit 3596a037ab44a1ad588fb388d5d4ee8f3d2a1ca7 ]

Found an issue while using RTE_ALIGN_MUL_NEAR with an
expression, like as passed in estimate_tsc_freq().
RTE_ALIGN_MUL_FLOOR resulted in unexpected value as
parathesis are required to evaluate an expression.

Fixes: 5120203d753f ("eal: add macros to align value to multiple")

Signed-off-by: Harman Kalra <hkalra@marvell.com>
---
 lib/librte_eal/common/include/rte_common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
index 5006ba8cad..a9d617482a 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -239,5 +239,5 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
  */
 #define RTE_ALIGN_MUL_CEIL(v, mul) \
-	(((v + (typeof(v))(mul) - 1) / ((typeof(v))(mul))) * (typeof(v))(mul))
+	((((v) + (typeof(v))(mul) - 1) / ((typeof(v))(mul))) * (typeof(v))(mul))
 
 /**
@@ -247,5 +247,5 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
  */
 #define RTE_ALIGN_MUL_FLOOR(v, mul) \
-	((v / ((typeof(v))(mul))) * (typeof(v))(mul))
+	(((v) / ((typeof(v))(mul))) * (typeof(v))(mul))
 
 /**
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.615867793 +0100
+++ 0021-eal-fix-parentheses-in-alignment-macros.patch	2020-08-20 16:26:15.806324161 +0100
@@ -1 +1 @@
-From 3596a037ab44a1ad588fb388d5d4ee8f3d2a1ca7 Mon Sep 17 00:00:00 2001
+From 53d8ebacc1392439d183de6dd65ca8bee7ce16c5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3596a037ab44a1ad588fb388d5d4ee8f3d2a1ca7 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -16,2 +17,2 @@
- lib/librte_eal/include/rte_common.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ lib/librte_eal/common/include/rte_common.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -19,5 +20,5 @@
-diff --git a/lib/librte_eal/include/rte_common.h b/lib/librte_eal/include/rte_common.h
-index 586f815c54..8f487a563d 100644
---- a/lib/librte_eal/include/rte_common.h
-+++ b/lib/librte_eal/include/rte_common.h
-@@ -305,5 +305,5 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
+diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
+index 5006ba8cad..a9d617482a 100644
+--- a/lib/librte_eal/common/include/rte_common.h
++++ b/lib/librte_eal/common/include/rte_common.h
+@@ -239,5 +239,5 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
@@ -30 +31 @@
-@@ -313,5 +313,5 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
+@@ -247,5 +247,5 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
@@ -37,7 +37,0 @@
-@@ -324,5 +324,5 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void)
- 		typeof(v) ceil = RTE_ALIGN_MUL_CEIL(v, mul);	\
- 		typeof(v) floor = RTE_ALIGN_MUL_FLOOR(v, mul);	\
--		(ceil - v) > (v - floor) ? floor : ceil;	\
-+		(ceil - (v)) > ((v) - floor) ? floor : ceil;	\
- 	})
- 


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

* [dpdk-stable] patch 'vhost: fix virtio ready flag check' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (19 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'eal: fix parentheses in alignment macros' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'bus/fslmc: fix getting FD error' " Kevin Traynor
                   ` (13 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: Chenbo Xia, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/3cb4625e7b526db21cf96ae34a16d3dae7f4c7ea

Thanks.

Kevin.

---
From 3cb4625e7b526db21cf96ae34a16d3dae7f4c7ea Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Mon, 6 Jul 2020 13:24:45 +0200
Subject: [PATCH] vhost: fix virtio ready flag check

[ upstream commit 1c3df72bda9893784267d02d2c6a3fd0047c38cd ]

Before checking whether the device is ready is done
a check on whether the RUNNING flag is set. Then the
READY flag is set if virtio_is_ready() returns true.

While it seems to not cause any issue, it makes more
sense to check whether the READY flag is set and not
the RUNNING one.

Fixes: c0674b1bc898 ("vhost: move the device ready check at proper place")

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
---
 lib/librte_vhost/vhost_user.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 4ed75104b9..c88275c24f 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -2289,5 +2289,5 @@ skip_to_reply:
 	}
 
-	if (!(dev->flags & VIRTIO_DEV_RUNNING) && virtio_is_ready(dev)) {
+	if (!(dev->flags & VIRTIO_DEV_READY) && virtio_is_ready(dev)) {
 		dev->flags |= VIRTIO_DEV_READY;
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.644268315 +0100
+++ 0022-vhost-fix-virtio-ready-flag-check.patch	2020-08-20 16:26:15.808324179 +0100
@@ -1 +1 @@
-From 1c3df72bda9893784267d02d2c6a3fd0047c38cd Mon Sep 17 00:00:00 2001
+From 3cb4625e7b526db21cf96ae34a16d3dae7f4c7ea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1c3df72bda9893784267d02d2c6a3fd0047c38cd ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index aa8605523a..bac3e89713 100644
+index 4ed75104b9..c88275c24f 100644
@@ -27,2 +28,2 @@
-@@ -2843,5 +2843,5 @@ skip_to_post_handle:
- 
+@@ -2289,5 +2289,5 @@ skip_to_reply:
+ 	}


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

* [dpdk-stable] patch 'bus/fslmc: fix getting FD error' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (20 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'vhost: fix virtio ready flag check' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/dpaa: fix FD offset data type' " Kevin Traynor
                   ` (12 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Nipun Gupta; +Cc: Akhil Goyal, Hemant Agrawal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/5ab31105f3f630d897d8dbd5397cda0317334458

Thanks.

Kevin.

---
From 5ab31105f3f630d897d8dbd5397cda0317334458 Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta@nxp.com>
Date: Tue, 7 Jul 2020 14:52:16 +0530
Subject: [PATCH] bus/fslmc: fix getting FD error

[ upstream commit 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b ]

Fix the incorrect register for getting error

Fixes: 03e36408b9fb ("bus/fslmc: add macros required by QDMA for FLE and FD")

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
index 0a59f9d84f..9609f359fa 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h
@@ -253,5 +253,5 @@ enum qbman_fd_format {
 #define DPAA2_GET_FD_FLC(fd) \
 	(((uint64_t)((fd)->simple.flc_hi) << 32) + (fd)->simple.flc_lo)
-#define DPAA2_GET_FD_ERR(fd)   ((fd)->simple.bpid_offset & 0x000000FF)
+#define DPAA2_GET_FD_ERR(fd)   ((fd)->simple.ctrl & 0x000000FF)
 #define DPAA2_GET_FLE_OFFSET(fle) (((fle)->fin_bpid_offset & 0x0FFF0000) >> 16)
 #define DPAA2_SET_FLE_SG_EXT(fle) ((fle)->fin_bpid_offset |= (uint64_t)1 << 29)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.674631298 +0100
+++ 0023-bus-fslmc-fix-getting-FD-error.patch	2020-08-20 16:26:15.808324179 +0100
@@ -1 +1 @@
-From 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b Mon Sep 17 00:00:00 2001
+From 5ab31105f3f630d897d8dbd5397cda0317334458 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3827197dabf9ddd8ffb918aa15f64f8e9aa9502b ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 4682a52998..f1c70251aa 100644
+index 0a59f9d84f..9609f359fa 100644
@@ -22 +23 @@
-@@ -287,5 +287,5 @@ enum qbman_fd_format {
+@@ -253,5 +253,5 @@ enum qbman_fd_format {


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

* [dpdk-stable] patch 'net/dpaa: fix FD offset data type' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (21 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'bus/fslmc: fix getting FD error' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix socket ID check' " Kevin Traynor
                   ` (11 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Nipun Gupta; +Cc: Akhil Goyal, Hemant Agrawal, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/60e0fc57b77bc79fa96a0574962dd88bd86c85b7

Thanks.

Kevin.

---
From 60e0fc57b77bc79fa96a0574962dd88bd86c85b7 Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta@nxp.com>
Date: Tue, 7 Jul 2020 14:52:17 +0530
Subject: [PATCH] net/dpaa: fix FD offset data type

[ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ]

On DPAA fd offset is 9 bits, but we are using uint8_t in the
SG case. This patch fixes the same.

Fixes: 8cffdcbe85aa ("net/dpaa: support scattered Rx")

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/net/dpaa/dpaa_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c
index ba01bd17e6..2089ed5f59 100644
--- a/drivers/net/dpaa/dpaa_rxtx.c
+++ b/drivers/net/dpaa/dpaa_rxtx.c
@@ -305,5 +305,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
 	void *vaddr, *sg_vaddr;
 	int i = 0;
-	uint8_t fd_offset = fd->offset;
+	uint16_t fd_offset = fd->offset;
 
 	vaddr = DPAA_MEMPOOL_PTOV(bp_info, qm_fd_addr(fd));
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.701438452 +0100
+++ 0024-net-dpaa-fix-FD-offset-data-type.patch	2020-08-20 16:26:15.809324188 +0100
@@ -1 +1 @@
-From 287f4256f9af9291abd1e1f129144cd47eb2d206 Mon Sep 17 00:00:00 2001
+From 60e0fc57b77bc79fa96a0574962dd88bd86c85b7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 287f4256f9af9291abd1e1f129144cd47eb2d206 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 5dba1db8b3..3aeecb7d2e 100644
+index ba01bd17e6..2089ed5f59 100644
@@ -23 +24 @@
-@@ -306,5 +306,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)
+@@ -305,5 +305,5 @@ dpaa_eth_sg_to_mbuf(const struct qm_fd *fd, uint32_t ifid)


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

* [dpdk-stable] patch 'net/bonding: fix socket ID check' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (22 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/dpaa: fix FD offset data type' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/netvsc: fix underflow when Rx external mbuf' " Kevin Traynor
                   ` (10 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: David Marchand; +Cc: Chas Williams, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/f3f75f632ac2175b103801d5ad238d0971573761

Thanks.

Kevin.

---
From f3f75f632ac2175b103801d5ad238d0971573761 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Tue, 16 Jun 2020 11:46:37 +0200
Subject: [PATCH] net/bonding: fix socket ID check

[ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ]

Caught by code review, rte_eth_dev_socket_id() returns -1 on error.
The code should behave the same, but still, do not use LCORE_ID_ANY for
something that is not a lcore id.

Fixes: c15c5897340d ("net/bonding: avoid allocating mempool on unknown socket")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Chas Williams <chas3@att.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index 0beea19c47..a66a027545 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -959,5 +959,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
 
 	socket_id = rte_eth_dev_socket_id(slave_id);
-	if (socket_id == (int)LCORE_ID_ANY)
+	if (socket_id == -1)
 		socket_id = rte_socket_id();
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.730174530 +0100
+++ 0025-net-bonding-fix-socket-ID-check.patch	2020-08-20 16:26:15.810324197 +0100
@@ -1 +1 @@
-From 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 Mon Sep 17 00:00:00 2001
+From f3f75f632ac2175b103801d5ad238d0971573761 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 46dac7d1115c66762aa78e308d5f1c401ee5e3a0 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index b77a37ddb3..b7ffa2f2cf 100644
+index 0beea19c47..a66a027545 100644
@@ -23 +24 @@
-@@ -1044,5 +1044,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,
+@@ -959,5 +959,5 @@ bond_mode_8023ad_activate_slave(struct rte_eth_dev *bond_dev,


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

* [dpdk-stable] patch 'net/netvsc: fix underflow when Rx external mbuf' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (23 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix socket ID check' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' " Kevin Traynor
                   ` (9 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Long Li; +Cc: Stephen Hemminger, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/77cf88c0c6a69b720007ec5a683b389b1e253a20

Thanks.

Kevin.

---
From 77cf88c0c6a69b720007ec5a683b389b1e253a20 Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Tue, 23 Jun 2020 18:11:45 -0700
Subject: [PATCH] net/netvsc: fix underflow when Rx external mbuf

[ upstream commit d43b8c710836db953fad1bb6449a827e19b5a87a ]

When rte_pktmbuf_attach_extbuf() is used, the driver should not decrease
the reference count in its callback function hn_rx_buf_free_cb, because
the reference count is already decreased by rte_pktmbuf. Doing it twice
may result in underflow and driver may never send an ack packet over
vmbus to host.

Also declares rxbuf_outstanding as atomic, because this value is shared
among all receive queues.

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

Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/netvsc/hn_nvs.c  |  1 -
 drivers/net/netvsc/hn_rxtx.c | 32 ++++++++++++--------------------
 drivers/net/netvsc/hn_var.h  |  2 +-
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c
index 76a7281f1b..f97bb10846 100644
--- a/drivers/net/netvsc/hn_nvs.c
+++ b/drivers/net/netvsc/hn_nvs.c
@@ -100,5 +100,4 @@ __hn_nvs_execute(struct hn_data *hv,
 	if (hdr->type == NVS_TYPE_RNDIS) {
 		hn_nvs_ack_rxbuf(chan, xactid);
-		--hv->rxbuf_outstanding;
 		goto retry;
 	}
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index b526b490b2..d7940b8119 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -489,22 +489,11 @@ next:
 }
 
-/*
- * Ack the consumed RXBUF associated w/ this channel packet,
- * so that this RXBUF can be recycled by the hypervisor.
- */
-static void hn_rx_buf_release(struct hn_rx_bufinfo *rxb)
-{
-	struct rte_mbuf_ext_shared_info *shinfo = &rxb->shinfo;
-	struct hn_data *hv = rxb->hv;
-
-	if (rte_mbuf_ext_refcnt_update(shinfo, -1) == 0) {
-		hn_nvs_ack_rxbuf(rxb->chan, rxb->xactid);
-		--hv->rxbuf_outstanding;
-	}
-}
-
 static void hn_rx_buf_free_cb(void *buf __rte_unused, void *opaque)
 {
-	hn_rx_buf_release(opaque);
+	struct hn_rx_bufinfo *rxb = opaque;
+	struct hn_data *hv = rxb->hv;
+
+	rte_atomic32_dec(&hv->rxbuf_outstanding);
+	hn_nvs_ack_rxbuf(rxb->chan, rxb->xactid);
 }
 
@@ -546,5 +535,6 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
 	 */
 	if (dlen >= HN_RXCOPY_THRESHOLD &&
-	    hv->rxbuf_outstanding < hv->rxbuf_section_cnt / 2) {
+	    (uint32_t)rte_atomic32_read(&hv->rxbuf_outstanding) <
+			hv->rxbuf_section_cnt / 2) {
 		struct rte_mbuf_ext_shared_info *shinfo;
 		const void *rxbuf;
@@ -560,6 +550,7 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
 		shinfo = &rxb->shinfo;
 
-		if (rte_mbuf_ext_refcnt_update(shinfo, 1) == 1)
-			++hv->rxbuf_outstanding;
+		/* shinfo is already set to 1 by the caller */
+		if (rte_mbuf_ext_refcnt_update(shinfo, 1) == 2)
+			rte_atomic32_inc(&hv->rxbuf_outstanding);
 
 		rte_pktmbuf_attach_extbuf(m, data, iova,
@@ -793,5 +784,6 @@ hn_nvs_handle_rxbuf(struct rte_eth_dev *dev,
 
 	/* Send ACK now if external mbuf not used */
-	hn_rx_buf_release(rxb);
+	if (rte_mbuf_ext_refcnt_update(&rxb->shinfo, -1) == 0)
+		hn_nvs_ack_rxbuf(rxb->chan, rxb->xactid);
 }
 
diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h
index 5dcd53638a..34cd11d641 100644
--- a/drivers/net/netvsc/hn_var.h
+++ b/drivers/net/netvsc/hn_var.h
@@ -112,5 +112,5 @@ struct hn_data {
 	struct hn_rx_bufinfo *rxbuf_info;
 	uint32_t	rxbuf_section_cnt;	/* # of Rx sections */
-	volatile uint32_t rxbuf_outstanding;
+	rte_atomic32_t	rxbuf_outstanding;
 	uint16_t	max_queues;		/* Max available queues */
 	uint16_t	num_queues;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.760344814 +0100
+++ 0026-net-netvsc-fix-underflow-when-Rx-external-mbuf.patch	2020-08-20 16:26:15.811324206 +0100
@@ -1 +1 @@
-From d43b8c710836db953fad1bb6449a827e19b5a87a Mon Sep 17 00:00:00 2001
+From 77cf88c0c6a69b720007ec5a683b389b1e253a20 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d43b8c710836db953fad1bb6449a827e19b5a87a ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 477202b2a0..f88854dafc 100644
+index 76a7281f1b..f97bb10846 100644
@@ -37 +38 @@
-index 6a52885d58..cc4ced37aa 100644
+index b526b490b2..d7940b8119 100644
@@ -40 +41 @@
-@@ -520,22 +520,11 @@ next:
+@@ -489,22 +489,11 @@ next:
@@ -68 +69 @@
-@@ -577,5 +566,6 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
+@@ -546,5 +535,6 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
@@ -76 +77 @@
-@@ -591,6 +581,7 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
+@@ -560,6 +550,7 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,
@@ -86 +87 @@
-@@ -833,5 +824,6 @@ hn_nvs_handle_rxbuf(struct rte_eth_dev *dev,
+@@ -793,5 +784,6 @@ hn_nvs_handle_rxbuf(struct rte_eth_dev *dev,
@@ -95 +96 @@
-index 881832d857..7cb7713e93 100644
+index 5dcd53638a..34cd11d641 100644
@@ -98 +99 @@
-@@ -114,5 +114,5 @@ struct hn_data {
+@@ -112,5 +112,5 @@ struct hn_data {


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

* [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (24 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/netvsc: fix underflow when Rx external mbuf' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' " Kevin Traynor
                   ` (8 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Guinan Sun; +Cc: Mateusz Kowalski, Wei Zhao, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/2517cab65dffeb61dc4f2ea0c4ca5c5cd9f42368

Thanks.

Kevin.

---
From 2517cab65dffeb61dc4f2ea0c4ca5c5cd9f42368 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Thu, 9 Jul 2020 08:00:28 +0000
Subject: [PATCH] net/ixgbe/base: fix host interface shadow RAM read

[ upstream commit 713fc4dd340e5eadd3bfa9a468446afaa5188624 ]

Host interface Shadow RAM Read (0x31) command response
buffer length should be stored in two bytes, instead of one byte.
This patch fixes it.

Fixes: e6102361b1d4 ("net/ixgbe/base: use 2 bytes for flash read command")

Signed-off-by: Mateusz Kowalski <mateusz.kowalski@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_common.c |  3 ++-
 drivers/net/ixgbe/base/ixgbe_type.h   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index 4eb98dc198..5889410f98 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -4601,5 +4601,6 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
 	 * two byes instead of one byte
 	 */
-	if (resp->cmd == 0x30) {
+	if (resp->cmd == IXGBE_HOST_INTERFACE_FLASH_READ_CMD ||
+	    resp->cmd == IXGBE_HOST_INTERFACE_SHADOW_RAM_READ_CMD) {
 		for (; bi < dword_len + 2; bi++) {
 			buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG,
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h
index 15e9370105..bc927a34ee 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -4365,3 +4365,15 @@ struct ixgbe_hw {
 				(0x1F << IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD_SHIFT)
 
+/* Code Command (Flash I/F Interface) */
+#define IXGBE_HOST_INTERFACE_FLASH_READ_CMD			0x30
+#define IXGBE_HOST_INTERFACE_SHADOW_RAM_READ_CMD		0x31
+#define IXGBE_HOST_INTERFACE_FLASH_WRITE_CMD			0x32
+#define IXGBE_HOST_INTERFACE_SHADOW_RAM_WRITE_CMD		0x33
+#define IXGBE_HOST_INTERFACE_FLASH_MODULE_UPDATE_CMD		0x34
+#define IXGBE_HOST_INTERFACE_FLASH_BLOCK_EREASE_CMD		0x35
+#define IXGBE_HOST_INTERFACE_SHADOW_RAM_DUMP_CMD		0x36
+#define IXGBE_HOST_INTERFACE_FLASH_INFO_CMD			0x37
+#define IXGBE_HOST_INTERFACE_APPLY_UPDATE_CMD			0x38
+#define IXGBE_HOST_INTERFACE_MASK_CMD				0x000000FF
+
 #endif /* _IXGBE_TYPE_H_ */
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.791021086 +0100
+++ 0027-net-ixgbe-base-fix-host-interface-shadow-RAM-read.patch	2020-08-20 16:26:15.817324260 +0100
@@ -1 +1 @@
-From 713fc4dd340e5eadd3bfa9a468446afaa5188624 Mon Sep 17 00:00:00 2001
+From 2517cab65dffeb61dc4f2ea0c4ca5c5cd9f42368 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 713fc4dd340e5eadd3bfa9a468446afaa5188624 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org


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

* [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (25 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix infinite recursion on PCIe link down' " Kevin Traynor
                   ` (7 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Guinan Sun; +Cc: Piotr Skajewski, Wei Zhao, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/6af0060f513880664da242dd750b60682e162b92

Thanks.

Kevin.

---
From 6af0060f513880664da242dd750b60682e162b92 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Thu, 9 Jul 2020 08:00:30 +0000
Subject: [PATCH] net/ixgbe/base: fix x550em 10G NIC link status

[ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ]

With the NVM image for x550em XFI will not report
the auto-negotiation feature correctly. The auto-negotiation
should be "No" for supports and advertised items.
At the same time update speed makes it support 1G and 10G.

Fixes: 833df43399e7 ("net/ixgbe/base: add SGMII link for X550")

Signed-off-by: Piotr Skajewski <piotrx.skajewski@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c
index f2c8e5425e..265b5704ee 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1892,5 +1892,12 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 			*speed = IXGBE_LINK_SPEED_10GB_FULL;
 	} else {
+		*autoneg = true;
+
 		switch (hw->phy.type) {
+		case ixgbe_phy_x550em_xfi:
+			*speed = IXGBE_LINK_SPEED_1GB_FULL |
+				 IXGBE_LINK_SPEED_10GB_FULL;
+			*autoneg = false;
+			break;
 		case ixgbe_phy_ext_1g_t:
 #ifdef PREBOOT_SUPPORT
@@ -1926,5 +1933,4 @@ s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw,
 			break;
 		}
-		*autoneg = true;
 	}
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.829505854 +0100
+++ 0028-net-ixgbe-base-fix-x550em-10G-NIC-link-status.patch	2020-08-20 16:26:15.820324288 +0100
@@ -1 +1 @@
-From fb03b51da940f1d56d701776fd85a0dfc1ace098 Mon Sep 17 00:00:00 2001
+From 6af0060f513880664da242dd750b60682e162b92 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fb03b51da940f1d56d701776fd85a0dfc1ace098 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 3de406fd35..9fa999e01d 100644
+index f2c8e5425e..265b5704ee 100644


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

* [dpdk-stable] patch 'net/ixgbe/base: fix infinite recursion on PCIe link down' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (26 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix data room size verification in Rx queue setup' " Kevin Traynor
                   ` (6 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Guinan Sun; +Cc: Robert Konklewski, Wei Zhao, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/223b828be2e333cd6ada65d79855b060c5b4a927

Thanks.

Kevin.

---
From 223b828be2e333cd6ada65d79855b060c5b4a927 Mon Sep 17 00:00:00 2001
From: Guinan Sun <guinanx.sun@intel.com>
Date: Thu, 9 Jul 2020 08:00:31 +0000
Subject: [PATCH] net/ixgbe/base: fix infinite recursion on PCIe link down

[ upstream commit 2d04b9e856125197ec8e967471426d56ab7efcf0 ]

In some corner cases the functions ixgbe_clear_rar_generic and
ixgbe_clear_vmdq_generic may call one another leading to infinite
recursion.

When ixgbe_clear_vmdq_generic is called with IXGBE_CLEAR_VMDQ_ALL
flag, it's going to clear MPSAR registers, and proceed to call
ixgbe_clear_rar_generic, which in turn will clear the RAR registers,
and recursively call back ixgbe_clear_vmdq_generic. Normally, the
latter would detect that MPSAR registers have already been cleared
and terminate the recursion.

However, when PCIe link is down, and before the driver has had the
opportunity to shut itself down, all register reads return 0xFFFFFFFF,
and all register writes fail silently. In such case, because
ixgbe_clear_vmdq_generic blindly assumes that clearing MPSAR registers
succeeded, it's going to always call ixgbe_clear_rar_generic, which
in turn will always call back ixgbe_clear_vmdq_generic, creating
infinite recursion.

This patch re-reads MPSAR register values after they had been cleared.
In case of PCIe link failure, the values read will be non-zero, which
will terminate the recursion. On the other hand, under normal
circumstances the value read from MPSAR registers is going to be equal
to the value previously written, so this patch is expected not to cause
any regressions.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Robert Konklewski <robertx.konklewski@intel.com>
Signed-off-by: Guinan Sun <guinanx.sun@intel.com>
Reviewed-by: Wei Zhao <wei.zhao1@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index 5889410f98..9e7182eb33 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -3778,9 +3778,9 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
 		if (mpsar_lo) {
 			IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(rar), 0);
-			mpsar_lo = 0;
+			mpsar_lo = IXGBE_READ_REG(hw, IXGBE_MPSAR_LO(rar));
 		}
 		if (mpsar_hi) {
 			IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(rar), 0);
-			mpsar_hi = 0;
+			mpsar_hi = IXGBE_READ_REG(hw, IXGBE_MPSAR_HI(rar));
 		}
 	} else if (vmdq < 32) {
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.862152879 +0100
+++ 0029-net-ixgbe-base-fix-infinite-recursion-on-PCIe-link-d.patch	2020-08-20 16:26:15.822324306 +0100
@@ -1 +1 @@
-From 2d04b9e856125197ec8e967471426d56ab7efcf0 Mon Sep 17 00:00:00 2001
+From 223b828be2e333cd6ada65d79855b060c5b4a927 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2d04b9e856125197ec8e967471426d56ab7efcf0 ]
+
@@ -33 +34,0 @@
-Cc: stable@dpdk.org
@@ -43 +44 @@
-index fec6241f5b..2d848a02b3 100644
+index 5889410f98..9e7182eb33 100644


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

* [dpdk-stable] patch 'ethdev: fix data room size verification in Rx queue setup' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (27 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix infinite recursion on PCIe link down' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' " Kevin Traynor
                   ` (5 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Wei Hu (Xavier)
  Cc: Chengchang Tang, Andrew Rybchenko, Sachin Saxena,
	Viacheslav Ovsiienko, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/6c46685a125415958e1eca79151da3a27f5279e0

Thanks.

Kevin.

---
From 6c46685a125415958e1eca79151da3a27f5279e0 Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei@huawei.com>
Date: Thu, 9 Jul 2020 18:43:13 +0800
Subject: [PATCH] ethdev: fix data room size verification in Rx queue setup

[ upstream commit 36fbaaf30d6ae5b3734c9b31a2dcd33695b09ef2 ]

In the rte_eth_rx_queue_setup API function, the local variable named
mbp_buf_size, which is the data room size of the input parameter mp,
is checked to guarantee that each memory chunk used for net device
in the mbuf is bigger than the min_rx_bufsize. But if mbp_buf_size is
less than RTE_PKTMBUF_HEADROOM, the value of the following  statement
will be a large number since the mbp_buf_size is a unsigned value.
    mbp_buf_size - RTE_PKTMBUF_HEADROOM
As a result, it will cause a segment fault in this situation.

This patch fixes it by modify the check condition to guarantee that the
local variable named mbp_buf_size is bigger than RTE_PKTMBUF_HEADROOM.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Sachin Saxena <sachin.saxena@nxp.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 lib/librte_ethdev/rte_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 7769b0f4bc..336ad1b83a 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1571,5 +1571,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
 	mbp_buf_size = rte_pktmbuf_data_room_size(mp);
 
-	if ((mbp_buf_size - RTE_PKTMBUF_HEADROOM) < dev_info.min_rx_bufsize) {
+	if (mbp_buf_size < dev_info.min_rx_bufsize + RTE_PKTMBUF_HEADROOM) {
 		RTE_ETHDEV_LOG(ERR,
 			"%s mbuf_data_room_size %d < %d (RTE_PKTMBUF_HEADROOM=%d + min_rx_bufsize(dev)=%d)\n",
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.894964697 +0100
+++ 0030-ethdev-fix-data-room-size-verification-in-Rx-queue-s.patch	2020-08-20 16:26:15.824324324 +0100
@@ -1 +1 @@
-From 36fbaaf30d6ae5b3734c9b31a2dcd33695b09ef2 Mon Sep 17 00:00:00 2001
+From 6c46685a125415958e1eca79151da3a27f5279e0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 36fbaaf30d6ae5b3734c9b31a2dcd33695b09ef2 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 7022bd7f56..e3b2a09761 100644
+index 7769b0f4bc..336ad1b83a 100644
@@ -34 +35 @@
-@@ -1821,5 +1821,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
+@@ -1571,5 +1571,5 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,


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

* [dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (28 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix data room size verification in Rx queue setup' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/net: fix exposing internal headers' " Kevin Traynor
                   ` (4 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Heinrich Kuhn; +Cc: Simon Horman, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/eb152c07bc9dc33964a229d183787c78fd06266f

Thanks.

Kevin.

---
From eb152c07bc9dc33964a229d183787c78fd06266f Mon Sep 17 00:00:00 2001
From: Heinrich Kuhn <heinrich.kuhn@netronome.com>
Date: Fri, 10 Jul 2020 16:28:46 +0200
Subject: [PATCH] net/nfp: fix RSS hash configuration reporting

[ upstream commit 198e745083b960d167bd769e2f81818c835f68b8 ]

Prior to this fix the NFP PMD implementation of the .rss_hash_conf_get
callback did not propagate the current hardware state of rss_hf back up
to the caller. Users of the hash_conf_get callback would receive an
incorrect representation of what the RSS configuration currently is in
hardware.

Fixes: 934e4c60fbff ("nfp: add RSS")

Signed-off-by: Heinrich Kuhn <heinrich.kuhn@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
 drivers/net/nfp/nfp_net.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 68c853c94f..e1034b2f43 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -2576,4 +2576,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 		rss_hf |= ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_NONFRAG_IPV6_UDP;
 
+	/* Propagate current RSS hash functions to caller */
+	rss_conf->rss_hf = rss_hf;
+
 	/* Reading the key size */
 	rss_conf->rss_key_len = nn_cfg_readl(hw, NFP_NET_CFG_RSS_KEY_SZ);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.927492321 +0100
+++ 0031-net-nfp-fix-RSS-hash-configuration-reporting.patch	2020-08-20 16:26:15.826324342 +0100
@@ -1 +1 @@
-From 198e745083b960d167bd769e2f81818c835f68b8 Mon Sep 17 00:00:00 2001
+From eb152c07bc9dc33964a229d183787c78fd06266f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 198e745083b960d167bd769e2f81818c835f68b8 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 474719b79c..99946279db 100644
+index 68c853c94f..e1034b2f43 100644
@@ -25 +26 @@
-@@ -2622,4 +2622,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -2576,4 +2576,7 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,


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

* [dpdk-stable] patch 'drivers/net: fix exposing internal headers' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (29 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix LACP negotiation' " Kevin Traynor
                   ` (3 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Ferruh Yigit; +Cc: Thomas Monjalon, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/eed7f1e8986dd632eeb0eda6deafd1dba7edbf84

Thanks.

Kevin.

---
From eed7f1e8986dd632eeb0eda6deafd1dba7edbf84 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Fri, 10 Jul 2020 22:43:41 +0100
Subject: [PATCH] drivers/net: fix exposing internal headers

[ upstream commit 61ede39537f45e561dc80eaa23621ce3d2cf9e73 ]

Using '__rte_internal' tag in 'rte_ethdev_driver.h' causing build error
for applications and examples. Because they don't define
'ALLOW_INTERNAL_API' flag and '__rte_internal' causes the error.
This patch is preparation for future '__rte_internal' usage.

At first place, applications/examples should not include
'rte_ethdev_driver.h', this is happening because of PMD public header
files include 'rte_ethdev_driver.h' by mistake.

Updated PMD public header files to not include internal header files.

But for unit test application, 'app/test', enable accessing internal
APIs, since some unit tests need them.

Fixes: ffc905f3b856 ("ethdev: separate driver APIs")
Fixes: ec0dec44ecb9 ("net/atlantic: enable MACsec configuration")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
---
 drivers/net/bnxt/rte_pmd_bnxt.h   | 3 ++-
 drivers/net/dpaa/rte_pmd_dpaa.h   | 2 --
 drivers/net/i40e/rte_pmd_i40e.h   | 4 +++-
 drivers/net/ixgbe/rte_pmd_ixgbe.h | 4 +++-
 test/test/meson.build             | 3 +++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/rte_pmd_bnxt.h b/drivers/net/bnxt/rte_pmd_bnxt.h
index 68fbe34d69..3206be75ff 100644
--- a/drivers/net/bnxt/rte_pmd_bnxt.h
+++ b/drivers/net/bnxt/rte_pmd_bnxt.h
@@ -7,5 +7,6 @@
 #define _PMD_BNXT_H_
 
-#include <rte_ethdev_driver.h>
+#include <rte_ethdev.h>
+#include <rte_ether.h>
 
 /*
diff --git a/drivers/net/dpaa/rte_pmd_dpaa.h b/drivers/net/dpaa/rte_pmd_dpaa.h
index 37eea9b032..8d244bb491 100644
--- a/drivers/net/dpaa/rte_pmd_dpaa.h
+++ b/drivers/net/dpaa/rte_pmd_dpaa.h
@@ -16,6 +16,4 @@
  */
 
-#include <rte_ethdev_driver.h>
-
 /**
  * Enable/Disable TX loopback
diff --git a/drivers/net/i40e/rte_pmd_i40e.h b/drivers/net/i40e/rte_pmd_i40e.h
index a1313146b6..1ef1624236 100644
--- a/drivers/net/i40e/rte_pmd_i40e.h
+++ b/drivers/net/i40e/rte_pmd_i40e.h
@@ -15,5 +15,7 @@
  */
 
-#include <rte_ethdev_driver.h>
+#include <rte_compat.h>
+#include <rte_ethdev.h>
+#include <rte_ether.h>
 
 /**
diff --git a/drivers/net/ixgbe/rte_pmd_ixgbe.h b/drivers/net/ixgbe/rte_pmd_ixgbe.h
index 72a941f9dc..1eee5733a5 100644
--- a/drivers/net/ixgbe/rte_pmd_ixgbe.h
+++ b/drivers/net/ixgbe/rte_pmd_ixgbe.h
@@ -12,5 +12,7 @@
 #define _PMD_IXGBE_H_
 
-#include <rte_ethdev_driver.h>
+#include <rte_compat.h>
+#include <rte_ethdev.h>
+#include <rte_ether.h>
 
 /**
diff --git a/test/test/meson.build b/test/test/meson.build
index 09b51a7ca6..4ce4fb94b1 100644
--- a/test/test/meson.build
+++ b/test/test/meson.build
@@ -262,4 +262,7 @@ endif
 cflags += '-D_GNU_SOURCE'
 
+# Enable using internal APIs in unit tests
+cflags += ['-DALLOW_INTERNAL_API']
+
 test_dep_objs = []
 compress_test_dep = dependency('zlib', required: false)
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.957494631 +0100
+++ 0032-drivers-net-fix-exposing-internal-headers.patch	2020-08-20 16:26:15.828324360 +0100
@@ -1 +1 @@
-From 61ede39537f45e561dc80eaa23621ce3d2cf9e73 Mon Sep 17 00:00:00 2001
+From eed7f1e8986dd632eeb0eda6deafd1dba7edbf84 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 61ede39537f45e561dc80eaa23621ce3d2cf9e73 ]
+
@@ -22 +23,0 @@
-Cc: stable@dpdk.org
@@ -27,31 +28,7 @@
- app/test/meson.build                    | 3 +++
- drivers/net/atlantic/rte_pmd_atlantic.h | 2 +-
- drivers/net/bnxt/rte_pmd_bnxt.h         | 3 ++-
- drivers/net/dpaa/rte_pmd_dpaa.h         | 2 --
- drivers/net/i40e/rte_pmd_i40e.h         | 4 +++-
- drivers/net/ixgbe/rte_pmd_ixgbe.h       | 4 +++-
- 6 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/app/test/meson.build b/app/test/meson.build
-index e0d33ea5ef..786a213972 100644
---- a/app/test/meson.build
-+++ b/app/test/meson.build
-@@ -397,4 +397,7 @@ cflags += '-D_GNU_SOURCE'
- cflags += '-fno-strict-aliasing'
- 
-+# Enable using internal APIs in unit tests
-+cflags += ['-DALLOW_INTERNAL_API']
-+
- test_dep_objs = []
- if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV')
-diff --git a/drivers/net/atlantic/rte_pmd_atlantic.h b/drivers/net/atlantic/rte_pmd_atlantic.h
-index c0208569b6..0100fc16e5 100644
---- a/drivers/net/atlantic/rte_pmd_atlantic.h
-+++ b/drivers/net/atlantic/rte_pmd_atlantic.h
-@@ -12,5 +12,5 @@
- #define _PMD_ATLANTIC_H_
- 
--#include <rte_ethdev_driver.h>
-+#include <rte_compat.h>
- 
- /**
+ drivers/net/bnxt/rte_pmd_bnxt.h   | 3 ++-
+ drivers/net/dpaa/rte_pmd_dpaa.h   | 2 --
+ drivers/net/i40e/rte_pmd_i40e.h   | 4 +++-
+ drivers/net/ixgbe/rte_pmd_ixgbe.h | 4 +++-
+ test/test/meson.build             | 3 +++
+ 5 files changed, 11 insertions(+), 5 deletions(-)
+
@@ -59 +36 @@
-index 2e893cc7bf..81d0d0e032 100644
+index 68fbe34d69..3206be75ff 100644
@@ -82 +59 @@
-index 0f6715efc8..fc3560c28c 100644
+index a1313146b6..1ef1624236 100644
@@ -95 +72 @@
-index 8b6bb99a58..90fc8160b1 100644
+index 72a941f9dc..1eee5733a5 100644
@@ -106,0 +84,12 @@
+diff --git a/test/test/meson.build b/test/test/meson.build
+index 09b51a7ca6..4ce4fb94b1 100644
+--- a/test/test/meson.build
++++ b/test/test/meson.build
+@@ -262,4 +262,7 @@ endif
+ cflags += '-D_GNU_SOURCE'
+ 
++# Enable using internal APIs in unit tests
++cflags += ['-DALLOW_INTERNAL_API']
++
+ test_dep_objs = []
+ compress_test_dep = dependency('zlib', required: false)


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

* [dpdk-stable] patch 'net/bonding: fix LACP negotiation' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (30 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/net: fix exposing internal headers' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/bnxt: remove unused enum declaration' " Kevin Traynor
                   ` (2 subsequent siblings)
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Yicai Lu; +Cc: Wei Hu, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/42f2a8331c4b65fa1f18e61533d60fbca2f408a1

Thanks.

Kevin.

---
From 42f2a8331c4b65fa1f18e61533d60fbca2f408a1 Mon Sep 17 00:00:00 2001
From: Yicai Lu <luyicai@huawei.com>
Date: Fri, 10 Jul 2020 11:29:35 +0800
Subject: [PATCH] net/bonding: fix LACP negotiation

[ upstream commit a9cbca743083ace5232e9df90119b4defa7df6e5 ]

When two host is connected directly without any devices like switch,
rx_machine_update would receiving partner LACP negotiation packets,
and partner's port mac is filled with zeros in this packet, which is
different with internal's mode4 mac. So in this situation, it would
never go rx_machine branch and then execute mac swap for negotiation!
Thus bond mode 4 will negotiation failed.

Fixes: 56cbc0817399 ("net/bonding: fix LACP negotiation")

Signed-off-by: Yicai Lu <luyicai@huawei.com>
Reviewed-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c
index a66a027545..99884c0049 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -790,5 +790,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
 
 		partner = &lacp->lacpdu.partner;
-		if (is_same_ether_addr(&partner->port_params.system,
+		if (is_zero_ether_addr(&partner->port_params.system) ||
+			is_same_ether_addr(&partner->port_params.system,
 			&internals->mode4.mac_addr)) {
 			/* This LACP frame is sending to the bonding port
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:16.988120619 +0100
+++ 0033-net-bonding-fix-LACP-negotiation.patch	2020-08-20 16:26:15.829324369 +0100
@@ -1 +1 @@
-From a9cbca743083ace5232e9df90119b4defa7df6e5 Mon Sep 17 00:00:00 2001
+From 42f2a8331c4b65fa1f18e61533d60fbca2f408a1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a9cbca743083ace5232e9df90119b4defa7df6e5 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index b7ffa2f2cf..3991825ad9 100644
+index a66a027545..99884c0049 100644
@@ -26 +27 @@
-@@ -799,5 +799,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
+@@ -790,5 +790,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id,
@@ -29,3 +30,3 @@
--		if (rte_is_same_ether_addr(&partner->port_params.system,
-+		if (rte_is_zero_ether_addr(&partner->port_params.system) ||
-+			rte_is_same_ether_addr(&partner->port_params.system,
+-		if (is_same_ether_addr(&partner->port_params.system,
++		if (is_zero_ether_addr(&partner->port_params.system) ||
++			is_same_ether_addr(&partner->port_params.system,


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

* [dpdk-stable] patch 'net/bnxt: remove unused enum declaration' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (31 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix LACP negotiation' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix parsing of TDES vectors' " Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' " Kevin Traynor
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Kalesh AP; +Cc: Ajit Khaparde, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/44d5c4ffa7d4863bbd9d9de749bfa0798139373c

Thanks.

Kevin.

---
From 44d5c4ffa7d4863bbd9d9de749bfa0798139373c Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Date: Thu, 9 Jul 2020 15:08:29 +0530
Subject: [PATCH] net/bnxt: remove unused enum declaration

[ upstream commit df3a6666cbc3d27177359ae74066b35811dc0418 ]

"enum bnxt_hw_context" is defined in the header file, but is not
used anywhere.

Fixes: 9738793f28ec ("net/bnxt: add VNIC functions and structs")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 5e5f91d730..6ecdc5585a 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -135,11 +135,4 @@ struct bnxt_led_cfg {
 	rte_cpu_to_le_32(BNXT_LED_DFLT_ENA << (BNXT_LED_DFLT_ENA_SHIFT * (x)))
 
-enum bnxt_hw_context {
-	HW_CONTEXT_NONE     = 0,
-	HW_CONTEXT_IS_RSS   = 1,
-	HW_CONTEXT_IS_COS   = 2,
-	HW_CONTEXT_IS_LB    = 3,
-};
-
 struct bnxt_vlan_table_entry {
 	uint16_t		tpid;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:17.017535897 +0100
+++ 0034-net-bnxt-remove-unused-enum-declaration.patch	2020-08-20 16:26:15.830324378 +0100
@@ -1 +1 @@
-From df3a6666cbc3d27177359ae74066b35811dc0418 Mon Sep 17 00:00:00 2001
+From 44d5c4ffa7d4863bbd9d9de749bfa0798139373c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit df3a6666cbc3d27177359ae74066b35811dc0418 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index f69ba24933..8325e87968 100644
+index 5e5f91d730..6ecdc5585a 100644
@@ -22 +23 @@
-@@ -184,11 +184,4 @@ struct bnxt_led_cfg {
+@@ -135,11 +135,4 @@ struct bnxt_led_cfg {


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

* [dpdk-stable] patch 'examples/fips_validation: fix parsing of TDES vectors' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (32 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'net/bnxt: remove unused enum declaration' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' " Kevin Traynor
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Ayuj Verma; +Cc: Archana Muniganti, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/7071c6483383b50bdf795de442635b7e4c94a2ac

Thanks.

Kevin.

---
From 7071c6483383b50bdf795de442635b7e4c94a2ac Mon Sep 17 00:00:00 2001
From: Ayuj Verma <ayverma@marvell.com>
Date: Thu, 11 Jun 2020 19:14:16 +0530
Subject: [PATCH] examples/fips_validation: fix parsing of TDES vectors

[ upstream commit 32440cdf2af9ad38fd32a533f51a32da92345007 ]

Processing of test vector for COUNT = 0 is getting skipped, as
some of the NIST TDES files doesn't have an empty line after
[ENCRYPT]/[DECRYPT] and thus treated as an interim block.

Parse function now identifies such blocks, separates out interim
and test vector data, and then parses each with their respective
callbacks.

Fixes: 3d0fad56b74a ("examples/fips_validation: add crypto FIPS application")

Signed-off-by: Archana Muniganti <marchana@marvell.com>
Signed-off-by: Ayuj Verma <ayverma@marvell.com>
---
 examples/fips_validation/fips_validation.c | 21 +++++++++++++++------
 examples/fips_validation/fips_validation.h |  1 +
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index a835cc3fa6..6d14fe8ed4 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -289,9 +289,11 @@ fips_test_parse_one_case(void)
 {
 	uint32_t i, j = 0;
-	uint32_t is_interim = 0;
+	uint32_t is_interim;
+	uint32_t interim_cnt = 0;
 	int ret;
 
 	if (info.interim_callbacks) {
 		for (i = 0; i < info.nb_vec_lines; i++) {
+			is_interim = 0;
 			for (j = 0; info.interim_callbacks[j].key != NULL; j++)
 				if (strstr(info.vec[i],
@@ -306,15 +308,22 @@ fips_test_parse_one_case(void)
 						return ret;
 				}
+
+			if (is_interim)
+				interim_cnt += 1;
 		}
 	}
 
-	if (is_interim) {
-		for (i = 0; i < info.nb_vec_lines; i++)
+	info.vec_start_off = interim_cnt;
+
+	if (interim_cnt) {
+		for (i = 0; i < interim_cnt; i++)
 			fprintf(info.fp_wr, "%s\n", info.vec[i]);
 		fprintf(info.fp_wr, "\n");
-		return 1;
+
+		if (info.nb_vec_lines == interim_cnt)
+			return 1;
 	}
 
-	for (i = 0; i < info.nb_vec_lines; i++) {
+	for (i = info.vec_start_off; i < info.nb_vec_lines; i++) {
 		for (j = 0; info.callbacks[j].key != NULL; j++)
 			if (strstr(info.vec[i], info.callbacks[j].key)) {
@@ -336,5 +345,5 @@ fips_test_write_one_case(void)
 	uint32_t i;
 
-	for (i = 0; i < info.nb_vec_lines; i++)
+	for (i = info.vec_start_off; i < info.nb_vec_lines; i++)
 		fprintf(info.fp_wr, "%s\n", info.vec[i]);
 }
diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h
index 3e291bc365..80ead1cf07 100644
--- a/examples/fips_validation/fips_validation.h
+++ b/examples/fips_validation/fips_validation.h
@@ -143,4 +143,5 @@ struct fips_test_interim_info {
 	char *one_line_text;
 	char *vec[MAX_LINE_PER_VECTOR];
+	uint32_t vec_start_off;
 	uint32_t nb_vec_lines;
 	char device_name[MAX_STRING_SIZE];
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:17.045556209 +0100
+++ 0035-examples-fips_validation-fix-parsing-of-TDES-vectors.patch	2020-08-20 16:26:15.831324387 +0100
@@ -1 +1 @@
-From 32440cdf2af9ad38fd32a533f51a32da92345007 Mon Sep 17 00:00:00 2001
+From 7071c6483383b50bdf795de442635b7e4c94a2ac Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 32440cdf2af9ad38fd32a533f51a32da92345007 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index a34e34d25a..3aaec20fb4 100644
+index a835cc3fa6..6d14fe8ed4 100644
@@ -28 +29 @@
-@@ -341,9 +341,11 @@ fips_test_parse_one_case(void)
+@@ -289,9 +289,11 @@ fips_test_parse_one_case(void)
@@ -41 +42 @@
-@@ -358,15 +360,22 @@ fips_test_parse_one_case(void)
+@@ -306,15 +308,22 @@ fips_test_parse_one_case(void)
@@ -68 +69 @@
-@@ -388,5 +397,5 @@ fips_test_write_one_case(void)
+@@ -336,5 +345,5 @@ fips_test_write_one_case(void)
@@ -76 +77 @@
-index 5aee955c16..75fa555fa6 100644
+index 3e291bc365..80ead1cf07 100644
@@ -79 +80 @@
-@@ -162,4 +162,5 @@ struct fips_test_interim_info {
+@@ -143,4 +143,5 @@ struct fips_test_interim_info {


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

* [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' has been queued to LTS release 18.11.10
  2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
                   ` (33 preceding siblings ...)
  2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix parsing of TDES vectors' " Kevin Traynor
@ 2020-08-20 15:33 ` Kevin Traynor
  34 siblings, 0 replies; 36+ messages in thread
From: Kevin Traynor @ 2020-08-20 15:33 UTC (permalink / raw)
  To: Archana Muniganti; +Cc: Kanaka Durga Kotamarthy, dpdk stable

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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/65dc134f9a0c0467a174d91b57f2d181e6dc8ce2

Thanks.

Kevin.

---
From 65dc134f9a0c0467a174d91b57f2d181e6dc8ce2 Mon Sep 17 00:00:00 2001
From: Archana Muniganti <marchana@marvell.com>
Date: Thu, 11 Jun 2020 19:14:17 +0530
Subject: [PATCH] examples/fips_validation: fix count overwrite for TDES

[ upstream commit 2b84d2bd47df6545797ed9841636eb8023c4db7b ]

Application updates first line of each test vector with
COUNT = i(where i = 1,2,3..) assuming first line contains
COUNT string. But few of the TDES input test vectors don't
contain COUNT string and thus COUNT is getting overwritten on
other data.

Fixes: 527cbf3d5ee3 ("examples/fips_validation: support TDES parsing")

Signed-off-by: Archana Muniganti <marchana@marvell.com>
Signed-off-by: Kanaka Durga Kotamarthy <kkotamarthy@marvell.com>
---
 examples/fips_validation/fips_validation.c | 8 ++++++++
 examples/fips_validation/main.c            | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c
index 6d14fe8ed4..489c8bac98 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -589,4 +589,12 @@ update_info_vec(uint32_t count)
 	cb = &info.writeback_callbacks[0];
 
+	if (!(strstr(info.vec[0], cb->key))) {
+		fprintf(info.fp_wr, "%s%u\n", cb->key, count);
+		i = 0;
+	} else {
+		snprintf(info.vec[0], strlen(info.vec[0]) + 4, "%s%u", cb->key,
+				count);
+		i = 1;
+	}
 	snprintf(info.vec[0], strlen(info.vec[0]) + 4, "%s%u", cb->key, count);
 
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 27558baa4a..d28569d23c 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -871,5 +871,8 @@ fips_mct_tdes_test(void)
 
 	for (i = 0; i < TDES_EXTERN_ITER; i++) {
-		if (i != 0)
+		if (i == 0) {
+			if (!(strstr(info.vec[0], "COUNT")))
+				fprintf(info.fp_wr, "%s%u\n", "COUNT = ", 0);
+		} else
 			update_info_vec(i);
 
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-20 16:26:17.073237627 +0100
+++ 0036-examples-fips_validation-fix-count-overwrite-for-TDE.patch	2020-08-20 16:26:15.832324397 +0100
@@ -1 +1 @@
-From 2b84d2bd47df6545797ed9841636eb8023c4db7b Mon Sep 17 00:00:00 2001
+From 65dc134f9a0c0467a174d91b57f2d181e6dc8ce2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2b84d2bd47df6545797ed9841636eb8023c4db7b ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 3aaec20fb4..9bdf257b8b 100644
+index 6d14fe8ed4..489c8bac98 100644
@@ -26 +27 @@
-@@ -641,4 +641,12 @@ update_info_vec(uint32_t count)
+@@ -589,4 +589,12 @@ update_info_vec(uint32_t count)
@@ -40 +41 @@
-index f9b2056bfc..efd32a86a5 100644
+index 27558baa4a..d28569d23c 100644
@@ -43 +44 @@
-@@ -1071,5 +1071,8 @@ fips_mct_tdes_test(void)
+@@ -871,5 +871,8 @@ fips_mct_tdes_test(void)


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

end of thread, other threads:[~2020-08-20 15:35 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-20 15:33 [dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to LTS release 18.11.10 Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: allow getting info for unknown device' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: fill NUMA socket ID in info' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'rawdev: export dump function in map file' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'cfgfile: fix stack buffer underflow' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'test/crypto: fix asymmetric session mempool creation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'common/cpt: fix encryption offset' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'crypto/dpaax_sec: fix inline query for descriptors' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix core mapping reset' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe: report 10Mbps link speed for x553' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/iavf: fix uninitialized variable' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: remove dead code' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/i40e: fix getting EEPROM information' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: use clock time in throughput calculation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'app/testpmd: fix burst percentage " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix log type for some error messages' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'service: fix C++ linkage' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix unneeded replacement of TCP checksum 0' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net: fix checksum on big endian CPUs' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'eal: fix parentheses in alignment macros' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'vhost: fix virtio ready flag check' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'bus/fslmc: fix getting FD error' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/dpaa: fix FD offset data type' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix socket ID check' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/netvsc: fix underflow when Rx external mbuf' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix host interface shadow RAM read' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix x550em 10G NIC link status' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/ixgbe/base: fix infinite recursion on PCIe link down' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'ethdev: fix data room size verification in Rx queue setup' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'drivers/net: fix exposing internal headers' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bonding: fix LACP negotiation' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'net/bnxt: remove unused enum declaration' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix parsing of TDES vectors' " Kevin Traynor
2020-08-20 15:33 ` [dpdk-stable] patch 'examples/fips_validation: fix count overwrite for TDES' " 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