patch 'examples/qos_sched: fix config entries in wrong sections' has been queued to stable release 21.11.4

patch 'examples/qos_sched: fix config entries in wrong sections' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From a2a827725722a853d51f54f16c9ad1b7e9fc7df6 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Tue, 21 Mar 2023 13:13:49 +0000
Subject: [PATCH] examples/qos_sched: fix config entries in wrong sections

[ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ]

When specifying the QoS config, the profiles to be used for each pipe
within a subport must be specified in the subport section, not in the
section for the subport profile itself. Similarly for subport profiles,
those should be specified in the port section.

Fixes: de3cfa2c9823 ("sched: initial import")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 examples/qos_sched/profile.cfg    | 4 ++--
 examples/qos_sched/profile_ov.cfg | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/qos_sched/profile.cfg b/examples/qos_sched/profile.cfg
index 8da5777538..20b8b20f23 100644
--- a/examples/qos_sched/profile.cfg
+++ b/examples/qos_sched/profile.cfg
@@ -27,4 +27,6 @@ number of pipes per subport = 4096
 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
 
+pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
+
 [subport profile 0]
 tb rate = 1250000000           ; Bytes per second
@@ -47,6 +49,4 @@ tc 12 rate = 1250000000        ; Bytes per second
 tc period = 10                 ; Milliseconds
 
-pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
-
 ; Pipe configuration
 [pipe profile 0]
diff --git a/examples/qos_sched/profile_ov.cfg b/examples/qos_sched/profile_ov.cfg
index 14c89ae340..b6fe21ee1e 100644
--- a/examples/qos_sched/profile_ov.cfg
+++ b/examples/qos_sched/profile_ov.cfg
@@ -7,4 +7,6 @@ frame overhead = 24
 number of subports per port = 1
 
+subport 0-8 = 0
+
 ; Subport configuration
 [subport 0]
@@ -12,5 +14,5 @@ number of pipes per subport = 32
 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
 
-subport 0-8 = 0
+pipe 0-31 = 0               ; These pipes are configured with pipe profile 0
 
 [subport profile 0]
@@ -33,6 +35,4 @@ tc 12 rate = 8400000         ; Bytes per second
 tc period = 10              ; Milliseconds
 
-pipe 0-31 = 0               ; These pipes are configured with pipe profile 0
-
 ; Pipe configuration
 [pipe profile 0]
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.297194890 +0100
+++ 0001-examples-qos_sched-fix-config-entries-in-wrong-secti.patch	2023-03-30 09:30:45.228229225 +0100
@@ -1 +1 @@
-From 86dfed2a8ed704e013f054985a92d46f07ff48d1 Mon Sep 17 00:00:00 2001
+From a2a827725722a853d51f54f16c9ad1b7e9fc7df6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -17,5 +18,3 @@
- examples/qos_sched/profile.cfg     | 6 +++---
- examples/qos_sched/profile_ov.cfg  | 6 +++---
- examples/qos_sched/profile_pie.cfg | 6 +++---
- examples/qos_sched/profile_red.cfg | 6 +++---
- 4 files changed, 12 insertions(+), 12 deletions(-)
+ examples/qos_sched/profile.cfg    | 4 ++--
+ examples/qos_sched/profile_ov.cfg | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
@@ -24 +23 @@
-index e8de101b6c..00d4c7c1a5 100644
+index 8da5777538..20b8b20f23 100644
@@ -41,6 +39,0 @@
-@@ -72,3 +72,3 @@ tc period = 40                ; Milliseconds
- tc 12 oversubscription weight = 1
- 
--tc 12 wrr weights = 1 1 1 1
-\ No newline at end of file
-+tc 12 wrr weights = 1 1 1 1
@@ -69,50 +61,0 @@
--
- ; Pipe configuration
- [pipe profile 0]
-diff --git a/examples/qos_sched/profile_pie.cfg b/examples/qos_sched/profile_pie.cfg
-index 241f748b33..bbc09d912b 100644
---- a/examples/qos_sched/profile_pie.cfg
-+++ b/examples/qos_sched/profile_pie.cfg
-@@ -22,4 +22,6 @@ frame overhead = 24
- number of subports per port = 1
- 
-+subport 0-8 = 0                ; These subports are configured with subport profile 0
-+
- ; Subport configuration
- [subport 0]
-@@ -27,5 +29,5 @@ number of pipes per subport = 4096
- queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
- 
--subport 0-8 = 0                ; These subports are configured with subport profile 0
-+pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
- 
- [subport profile 0]
-@@ -49,6 +51,4 @@ tc 12 rate = 1250000000        ; Bytes per second
- tc period = 10                 ; Milliseconds
- 
--pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
--
- ; Pipe configuration
- [pipe profile 0]
-diff --git a/examples/qos_sched/profile_red.cfg b/examples/qos_sched/profile_red.cfg
-index 4486d2799e..cee1470fd7 100644
---- a/examples/qos_sched/profile_red.cfg
-+++ b/examples/qos_sched/profile_red.cfg
-@@ -22,4 +22,6 @@ frame overhead = 24
- number of subports per port = 1
- 
-+subport 0-8 = 0                ; These subports are configured with subport profile 0
-+
- ; Subport configuration
- [subport 0]
-@@ -27,5 +29,5 @@ number of pipes per subport = 4096
- queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64
- 
--subport 0-8 = 0                ; These subports are configured with subport profile 0
-+pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0
- 
- [subport profile 0]
-@@ -49,6 +51,4 @@ tc 12 rate = 1250000000        ; Bytes per second
- tc period = 10                 ; Milliseconds
- 
--pipe 0-4095 = 0                ; These pipes are configured with pipe profile 0

patch 'net/mlx5: fix build with GCC 12 and ASan' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From 9950bb97caf0b3daad6282d678c9d3ce7df98518 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 22 Mar 2023 18:06:27 +0100
Subject: [PATCH] net/mlx5: fix build with GCC 12 and ASan
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit e17840756179410283ef03660578310874432f40 ]

Building with gcc 12 and ASan raises this warning:

../drivers/net/mlx5/mlx5_txpp.c: In function ‘mlx5_txpp_xstats_get_names’:
../drivers/net/mlx5/mlx5_txpp.c:1066:25: error: ‘strncpy’ specified bound
	64 equals destination size [-Werror=stringop-truncation]
 1066 |                         strncpy(xstats_names[i + n_used].name,
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 1067 |                                 mlx5_txpp_stat_names[i],
      |                                 ~~~~~~~~~~~~~~~~~~~~~~~~
 1068 |                                 RTE_ETH_XSTATS_NAME_SIZE);
      |                                 ~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Prefer strlcpy for xstats.

Fixes: 3b025c0ca425 ("net/mlx5: provide send scheduling error statistics")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Raslan Darawsheh <rasland@nvidia.com>
---
 drivers/net/mlx5/mlx5_stats.c | 3 +--
 drivers/net/mlx5/mlx5_txpp.c  | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_stats.c b/drivers/net/mlx5/mlx5_stats.c
index f64fa3587b..615e1d073d 100644
--- a/drivers/net/mlx5/mlx5_stats.c
+++ b/drivers/net/mlx5/mlx5_stats.c
@@ -289,8 +289,7 @@ mlx5_xstats_get_names(struct rte_eth_dev *dev,
 	if (n >= mlx5_xstats_n && xstats_names) {
 		for (i = 0; i != mlx5_xstats_n; ++i) {
-			strncpy(xstats_names[i].name,
+			strlcpy(xstats_names[i].name,
 				xstats_ctrl->info[i].dpdk_name,
 				RTE_ETH_XSTATS_NAME_SIZE);
-			xstats_names[i].name[RTE_ETH_XSTATS_NAME_SIZE - 1] = 0;
 		}
 	}
diff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c
index af77e91e4c..83d17997d1 100644
--- a/drivers/net/mlx5/mlx5_txpp.c
+++ b/drivers/net/mlx5/mlx5_txpp.c
@@ -1065,9 +1065,7 @@ int mlx5_txpp_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
 	if (n >= n_used + n_txpp && xstats_names) {
 		for (i = 0; i < n_txpp; ++i) {
-			strncpy(xstats_names[i + n_used].name,
+			strlcpy(xstats_names[i + n_used].name,
 				mlx5_txpp_stat_names[i],
 				RTE_ETH_XSTATS_NAME_SIZE);
-			xstats_names[i + n_used].name
-					[RTE_ETH_XSTATS_NAME_SIZE - 1] = 0;
 		}
 	}
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.343886598 +0100
+++ 0003-net-mlx5-fix-build-with-GCC-12-and-ASan.patch	2023-03-30 09:30:45.242229240 +0100
@@ -1 +1 @@
-From e17840756179410283ef03660578310874432f40 Mon Sep 17 00:00:00 2001
+From 9950bb97caf0b3daad6282d678c9d3ce7df98518 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit e17840756179410283ef03660578310874432f40 ]
+
@@ -25 +26,0 @@
-Cc: stable@dpdk.org
@@ -49 +50 @@
-index 63d98dbde9..0e1da1d5f5 100644
+index af77e91e4c..83d17997d1 100644
@@ -52 +53 @@
-@@ -1064,9 +1064,7 @@ int mlx5_txpp_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
+@@ -1065,9 +1065,7 @@ int mlx5_txpp_xstats_get_names(struct rte_eth_dev *dev __rte_unused,

patch 'net/mlx5: fix CQE dump for Tx' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From 663a819dae91431201620a7af9e2e8f1c7716c73 Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev@nvidia.com>
Date: Fri, 24 Mar 2023 01:51:40 +0200
Subject: [PATCH] net/mlx5: fix CQE dump for Tx

[ upstream commit cd4158177434d557742b4bb0fbe68e59d2c2db21 ]

The regular CQE size can be 64 bytes or 128 bytes depending
on the cache line size. The error CQE is always 64 bytes long.
Only 64 bytes are dumped to the log file in case of Tx queue
recovery form the error. Use the CQE size, not the error CQE size.

Fixes: 957e45fb7bcb ("net/mlx5: handle Tx completion with error")

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

diff --git a/drivers/net/mlx5/mlx5_tx.c b/drivers/net/mlx5/mlx5_tx.c
index fd2cf20967..8f03743986 100644
--- a/drivers/net/mlx5/mlx5_tx.c
+++ b/drivers/net/mlx5/mlx5_tx.c
@@ -108,5 +108,5 @@ mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq,
 						    (const void *)((uintptr_t)
 						    txq->cqes),
-						    sizeof(*err_cqe) *
+						    sizeof(struct mlx5_cqe) *
 						    (1 << txq->cqe_n));
 			mlx5_dump_debug_information(name, "MLX5 Error SQ:",
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.366387335 +0100
+++ 0004-net-mlx5-fix-CQE-dump-for-Tx.patch	2023-03-30 09:30:45.245229242 +0100
@@ -1 +1 @@
-From cd4158177434d557742b4bb0fbe68e59d2c2db21 Mon Sep 17 00:00:00 2001
+From 663a819dae91431201620a7af9e2e8f1c7716c73 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cd4158177434d557742b4bb0fbe68e59d2c2db21 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index a13c7e937c..14e1487e59 100644
+index fd2cf20967..8f03743986 100644

patch 'net/mlx5: fix sysfs port name translation' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From 80a576917cceba0b3eeeae7ad08d93162f1c877e Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@nvidia.com>
Date: Thu, 23 Mar 2023 12:54:14 +0200
Subject: [PATCH] net/mlx5: fix sysfs port name translation

[ upstream commit f8a226ed65fa1c6e085fb0d5a91bab7fb5034aec ]

With some OFED or upstream kernel of mlx5, the port name fetched from
"/sys/class/net/[DEV]/phys_port_name" may have a tailing "\n" as the
EOL. The sscanf() will return the scanned items number with this EOL.

In such case, the "equal to" condition is considered as false and
the function mlx5_translate_port_name() will recognize the port type
wrongly with UNKNOWN result.

The tailing carriage return character should be removed before
calling the mlx5_translate_port_name(), this was already done in the
NL message handling. In the meanwhile, the possible incorrect line
feed character is also taken into consideration.

Fixes: 654810b56828 ("common/mlx5: share Netlink commands")
Fixes: 420bbdae89f2 ("net/mlx5: fix host physical function representor naming")

Signed-off-by: Bing Zhao <bingz@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/linux/mlx5_ethdev_os.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index 368d22de89..89095e856f 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -1106,5 +1106,6 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 {
 	char ifname[IF_NAMESIZE];
-	char port_name[IF_NAMESIZE];
+	char *port_name = NULL;
+	size_t port_name_size = 0;
 	FILE *file;
 	struct mlx5_switch_info data = {
@@ -1119,4 +1120,5 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 	bool device_dir = false;
 	char c;
+	ssize_t line_size;
 
 	if (!if_indextoname(ifindex, ifname)) {
@@ -1134,6 +1136,19 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 	file = fopen(phys_port_name, "rb");
 	if (file != NULL) {
-		if (fgets(port_name, IF_NAMESIZE, file) != NULL)
+		char *tail_nl;
+
+		line_size = getline(&port_name, &port_name_size, file);
+		if (line_size < 0) {
+			fclose(file);
+			rte_errno = errno;
+			return -rte_errno;
+		} else if (line_size > 0) {
+			/* Remove tailing newline character. */
+			tail_nl = strchr(port_name, '\n');
+			if (tail_nl)
+				*tail_nl = '\0';
 			mlx5_translate_port_name(port_name, &data);
+		}
+		free(port_name);
 		fclose(file);
 	}
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.388825455 +0100
+++ 0005-net-mlx5-fix-sysfs-port-name-translation.patch	2023-03-30 09:30:45.251229249 +0100
@@ -1 +1 @@
-From f8a226ed65fa1c6e085fb0d5a91bab7fb5034aec Mon Sep 17 00:00:00 2001
+From 80a576917cceba0b3eeeae7ad08d93162f1c877e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f8a226ed65fa1c6e085fb0d5a91bab7fb5034aec ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -30 +31 @@
-index f1ff6f49f9..55801534d1 100644
+index 368d22de89..89095e856f 100644
@@ -33 +34 @@
-@@ -1036,5 +1036,6 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
+@@ -1106,5 +1106,6 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
@@ -41 +42 @@
-@@ -1049,4 +1050,5 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
+@@ -1119,4 +1120,5 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
@@ -47 +48 @@
-@@ -1064,6 +1066,19 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
+@@ -1134,6 +1136,19 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)

patch 'test/crypto: fix statistics error messages' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From 57915a44ed68f9fb9141a37de495148dbb7ced44 Mon Sep 17 00:00:00 2001
From: Saoirse O'Donovan <saoirse.odonovan@intel.com>
Date: Mon, 20 Mar 2023 09:29:56 +0000
Subject: [PATCH] test/crypto: fix statistics error messages

[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ]

The test stats testcase was printing the same error message for
multiple errors in the test stats testcase. This is now replaced
with descriptive error messages, which match the cause of the failure.

Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests")

Signed-off-by: Saoirse O'Donovan <saoirse.odonovan@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
---
 .mailmap                  |  1 +
 app/test/test_cryptodev.c | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.mailmap b/.mailmap
index 3337f8a9e6..c1b73055da 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1177,4 +1177,5 @@ Sankar Chokkalingam <sankarx.chokkalingam@intel.com>
 Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
 Santosh Shukla <santosh.shukla@caviumnetworks.com> <sshukla@mvista.com>
+Saoirse O'Donovan <saoirse.odonovan@intel.com>
 Saori Usami <susami@igel.co.jp>
 Sarath Somasekharan <sarathx.somasekharan@intel.com>
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index a18b15d7c2..f3509bcb22 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -11100,9 +11100,9 @@ test_stats(void)
 		"rte_cryptodev_stats_get returned unexpected enqueued stat");
 	TEST_ASSERT((stats.dequeued_count == 1),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued stat");
 	TEST_ASSERT((stats.enqueue_err_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued error count stat");
 	TEST_ASSERT((stats.dequeue_err_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued error count stat");
 
 	/* invalid device but should ignore and not reset device stats*/
@@ -11112,5 +11112,5 @@ test_stats(void)
 		"rte_cryptodev_stats_get failed");
 	TEST_ASSERT((stats.enqueued_count == 1),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued stat after invalid reset");
 
 	/* check that a valid reset clears stats */
@@ -11120,7 +11120,7 @@ test_stats(void)
 					  "rte_cryptodev_stats_get failed");
 	TEST_ASSERT((stats.enqueued_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected enqueued stat after valid reset");
 	TEST_ASSERT((stats.dequeued_count == 0),
-		"rte_cryptodev_stats_get returned unexpected enqueued stat");
+		"rte_cryptodev_stats_get returned unexpected dequeued stat after valid reset");
 
 	return TEST_SUCCESS;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.412423258 +0100
+++ 0006-test-crypto-fix-statistics-error-messages.patch	2023-03-30 09:30:45.274229272 +0100
@@ -1 +1 @@
-From 051af8d174dd0f100f407269c25c007216c912ad Mon Sep 17 00:00:00 2001
+From 57915a44ed68f9fb9141a37de495148dbb7ced44 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index dc30369117..cac02a6f48 100644
+index 3337f8a9e6..c1b73055da 100644
@@ -24 +25 @@
-@@ -1183,4 +1183,5 @@ Sankar Chokkalingam <sankarx.chokkalingam@intel.com>
+@@ -1177,4 +1177,5 @@ Sankar Chokkalingam <sankarx.chokkalingam@intel.com>
@@ -31 +32 @@
-index f4648755e5..9c670e9a35 100644
+index a18b15d7c2..f3509bcb22 100644
@@ -34 +35 @@
-@@ -12342,9 +12342,9 @@ test_stats(void)
+@@ -11100,9 +11100,9 @@ test_stats(void)
@@ -47 +48 @@
-@@ -12354,5 +12354,5 @@ test_stats(void)
+@@ -11112,5 +11112,5 @@ test_stats(void)
@@ -54 +55 @@
-@@ -12362,7 +12362,7 @@ test_stats(void)
+@@ -11120,7 +11120,7 @@ test_stats(void)

patch 'pdump: fix build with GCC 12' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From f27d1cb2ffa3c923741726b0b549dec941ad0669 Mon Sep 17 00:00:00 2001
From: Joyce Kong <joyce.kong@arm.com>
Date: Mon, 27 Mar 2023 07:07:12 +0000
Subject: [PATCH] pdump: fix build with GCC 12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit b182466683a5c76657efb4b6b8d43e7d71979034 ]

The following warning is observed with GCC12 compilation
with release 20.11:

In function ‘__rte_ring_enqueue_elems_64’,
    inlined from ‘__rte_ring_enqueue_elems’ at
            ../lib/librte_ring/rte_ring_elem.h:225:3,
    inlined from ‘__rte_ring_do_enqueue_elem’ at
            ../lib/librte_ring/rte_ring_elem.h:424:2,
    inlined from ‘rte_ring_mp_enqueue_burst_elem’ at
            ../lib/librte_ring/rte_ring_elem.h:884:9,
    inlined from ‘rte_ring_enqueue_burst_elem’ at
            ../lib/librte_ring/rte_ring_elem.h:946:10,
    inlined from ‘rte_ring_enqueue_burst’ at
            ../lib/librte_ring/rte_ring.h:721:9,
    inlined from ‘pdump_copy’ at
            ../lib/librte_pdump/rte_pdump.c:94:13:
../lib/librte_ring/rte_ring_elem.h:162:40: warning: ‘*dup_bufs.36_42
+ _89’ may be used uninitialized [-Wmaybe-uninitialized]
  162 |                         ring[idx] = obj[i];
      |                                     ~~~^~~
../lib/librte_ring/rte_ring_elem.h:163:44: warning: ‘*dup_bufs.36_42
+ _98’ may be used uninitialized [-Wmaybe-uninitialized]
  163 |                         ring[idx + 1] = obj[i + 1];
      |                                         ~~~^~~~~~~
../lib/librte_ring/rte_ring_elem.h:164:44: warning: ‘*dup_bufs.36_42
+ _107’ may be used uninitialized [-Wmaybe-uninitialized]
  164 |                         ring[idx + 2] = obj[i + 2];
      |                                         ~~~^~~~~~~
../lib/librte_ring/rte_ring_elem.h:165:44: warning: ‘*dup_bufs.36_42
+ _116’ may be used uninitialized [-Wmaybe-uninitialized]
  165 |                         ring[idx + 3] = obj[i + 3];
      |                                         ~~~^~~~~~~
../lib/librte_ring/rte_ring_elem.h:169:42: warning: ‘*dup_bufs.36_42
+ _129’ may be used uninitialized [-Wmaybe-uninitialized]
  169 |                         ring[idx++] = obj[i++]; /* fallthrough */
      |                                       ~~~^~~~~
../lib/librte_ring/rte_ring_elem.h:171:42: warning: ‘*dup_bufs.36_42
+ _139’ may be used uninitialized [-Wmaybe-uninitialized]
  171 |                         ring[idx++] = obj[i++]; /* fallthrough */
      |                                       ~~~^~~~~
../lib/librte_ring/rte_ring_elem.h:173:42: warning: ‘*dup_bufs.36_42
+ _149’ may be used uninitialized [-Wmaybe-uninitialized]
  173 |                         ring[idx++] = obj[i++];

Actually, this is an alias warning as -O3 enables strict alias.
This patch fixes it by replacing 'dup_bufs' with '&dup_bufs[0]'
as the compiler represents them differently.

Fixes: 278f945402c5 ("pdump: add new library for packet capture")

Signed-off-by: Joyce Kong <joyce.kong@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 lib/pdump/rte_pdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c
index f0dee81e77..805d12236c 100644
--- a/lib/pdump/rte_pdump.c
+++ b/lib/pdump/rte_pdump.c
@@ -134,5 +134,5 @@ pdump_copy(uint16_t port_id, uint16_t queue,
 	__atomic_fetch_add(&stats->accepted, d_pkts, __ATOMIC_RELAXED);
 
-	ring_enq = rte_ring_enqueue_burst(ring, (void *)dup_bufs, d_pkts, NULL);
+	ring_enq = rte_ring_enqueue_burst(ring, (void *)&dup_bufs[0], d_pkts, NULL);
 	if (unlikely(ring_enq < d_pkts)) {
 		unsigned int drops = d_pkts - ring_enq;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.443529827 +0100
+++ 0007-pdump-fix-build-with-GCC-12.patch	2023-03-30 09:30:45.274229272 +0100
@@ -1 +1 @@
-From b182466683a5c76657efb4b6b8d43e7d71979034 Mon Sep 17 00:00:00 2001
+From f27d1cb2ffa3c923741726b0b549dec941ad0669 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit b182466683a5c76657efb4b6b8d43e7d71979034 ]
+
@@ -58 +59,0 @@
-Cc: stable@dpdk.org
@@ -69 +70 @@
-index 9bc4bab4f2..53cca1034d 100644
+index f0dee81e77..805d12236c 100644
@@ -72 +73 @@
-@@ -135,5 +135,5 @@ pdump_copy(uint16_t port_id, uint16_t queue,
+@@ -134,5 +134,5 @@ pdump_copy(uint16_t port_id, uint16_t queue,

patch 'acl: fix crash on PPC64 with GCC 11' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From 27af78b522f13ed10453373a87c0db6389c9a6cd Mon Sep 17 00:00:00 2001
From: David Christensen <drc@linux.vnet.ibm.com>
Date: Wed, 22 Mar 2023 13:29:33 -0400
Subject: [PATCH] acl: fix crash on PPC64 with GCC 11

[ upstream commit 3f62bba2e7aa15e5f1e418cdced0f4160de154b3 ]

Original ACL implementation of Altivec optimized code included an
explicit -O2 optimization level for a particular inlined function.
When DPDK is built with the default -O3 optimization level on gcc
11.x or later, the resulting code may generate a segmentation
fault as observed in acl_autotest.

Since there is no explicit reason given for the local function
optimization level in the original commit, and testing with gcc
versions 8.x through 12.x results in working code at all -O
optimization settings, the local optimization is removed.

Bugzilla ID: 1197

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Tested-by: Thinh Tran <thinhtr@linux.vnet.ibm.com>
---
 lib/acl/acl_run_altivec.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h
index 4dfe7a14b4..4556e1503b 100644
--- a/lib/acl/acl_run_altivec.h
+++ b/lib/acl/acl_run_altivec.h
@@ -103,5 +103,5 @@ acl_match_check_x4(int slot, const struct rte_acl_ctx *ctx, struct parms *parms,
  * Process 4 transitions (in 2 XMM registers) in parallel
  */
-static inline __attribute__((optimize("O2"))) xmm_t
+static __rte_always_inline xmm_t
 transition4(xmm_t next_input, const uint64_t *trans,
 	xmm_t *indices1, xmm_t *indices2)
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.465810753 +0100
+++ 0008-acl-fix-crash-on-PPC64-with-GCC-11.patch	2023-03-30 09:30:45.275229273 +0100
@@ -1 +1 @@
-From 3f62bba2e7aa15e5f1e418cdced0f4160de154b3 Mon Sep 17 00:00:00 2001
+From 27af78b522f13ed10453373a87c0db6389c9a6cd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3f62bba2e7aa15e5f1e418cdced0f4160de154b3 ]
+
@@ -18 +19,0 @@
-Cc: stable@dpdk.org

patch 'doc: fix pipeline example path in user guide' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

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

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

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

Thanks.

Kevin

---
From 1ae194289fa5b0ad0731a36ac103f7f8cccc2e65 Mon Sep 17 00:00:00 2001
From: Harshad Narayane <harshad.suresh.narayane@intel.com>
Date: Mon, 28 Nov 2022 04:33:24 +0530
Subject: [PATCH] doc: fix pipeline example path in user guide

[ upstream commit 0ab37572614c695f3087f4edaa8e0a95d1bf4a93 ]

Updated the pipeline example path in the Sample Application User Guide.

Fixes: 29485dd07bc3 ("doc: add pipeline example user guide")

Signed-off-by: Harshad Narayane <harshad.suresh.narayane@intel.com>
Signed-off-by: Kamalakannan R <kamalakannan.r@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 doc/guides/sample_app_ug/pipeline.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/sample_app_ug/pipeline.rst b/doc/guides/sample_app_ug/pipeline.rst
index 49d50136bc..7c86bf484a 100644
--- a/doc/guides/sample_app_ug/pipeline.rst
+++ b/doc/guides/sample_app_ug/pipeline.rst
@@ -59,5 +59,5 @@ The following is an example command to run the application configured for the VX
 .. code-block:: console
 
-    $ ./<build_dir>/examples/dpdk-pipeline -c 0x3 -- -s examples/vxlan.cli
+    $ ./<build_dir>/examples/dpdk-pipeline -c 0x3 -- -s examples/pipeline/examples/vxlan.cli
 
 The application should start successfully and display as follows:
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-30 09:30:45.487075298 +0100
+++ 0009-doc-fix-pipeline-example-path-in-user-guide.patch	2023-03-30 09:30:45.275229273 +0100
@@ -1 +1 @@
-From 0ab37572614c695f3087f4edaa8e0a95d1bf4a93 Mon Sep 17 00:00:00 2001
+From 1ae194289fa5b0ad0731a36ac103f7f8cccc2e65 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0ab37572614c695f3087f4edaa8e0a95d1bf4a93 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org