patch 'net/bonding: fix slave device Rx/Tx offload configuration' has been queued to stable release 21.11.3

patch 'net/bonding: fix slave device Rx/Tx offload configuration' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 8bdb61a66fb9c9e8f93722939fec63c7f593299f Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Fri, 28 Oct 2022 10:36:46 +0800
Subject: [PATCH] net/bonding: fix slave device Rx/Tx offload configuration

[ upstream commit b5145667785e8954077c593480ddfb2bdd708eac ]

Normally, the Rx/Tx offload capability of bonding interface is
the intersection of the capability of all slave devices. And
Rx/Tx offloads configuration of slave device comes from bonding
interface. But now there is a risk that slave device retains its
previous offload configurations which is not within the offload
configurations of bond interface.

Fixes: 57b156540f51 ("net/bonding: fix offloading configuration")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Acked-by: Min Hu (Connor) <humin29@huawei.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 707c22a7a4..c25fa9df24 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1719,18 +1719,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 			bonded_eth_dev->data->dev_conf.rxmode.mtu;
 
-	slave_eth_dev->data->dev_conf.txmode.offloads |=
-		bonded_eth_dev->data->dev_conf.txmode.offloads;
-
-	slave_eth_dev->data->dev_conf.txmode.offloads &=
-		(bonded_eth_dev->data->dev_conf.txmode.offloads |
-		~internals->tx_offload_capa);
-
-	slave_eth_dev->data->dev_conf.rxmode.offloads |=
-		bonded_eth_dev->data->dev_conf.rxmode.offloads;
-
-	slave_eth_dev->data->dev_conf.rxmode.offloads &=
-		(bonded_eth_dev->data->dev_conf.rxmode.offloads |
-		~internals->rx_offload_capa);
+	slave_eth_dev->data->dev_conf.txmode.offloads =
+			bonded_eth_dev->data->dev_conf.txmode.offloads;
 
+	slave_eth_dev->data->dev_conf.rxmode.offloads =
+			bonded_eth_dev->data->dev_conf.rxmode.offloads;
 
 	nb_rx_queues = bonded_eth_dev->data->nb_rx_queues;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.146163339 +0000
+++ 0001-net-bonding-fix-slave-device-Rx-Tx-offload-configura.patch	2022-11-23 09:55:56.983149090 +0000
@@ -1 +1 @@
-From b5145667785e8954077c593480ddfb2bdd708eac Mon Sep 17 00:00:00 2001
+From 8bdb61a66fb9c9e8f93722939fec63c7f593299f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b5145667785e8954077c593480ddfb2bdd708eac ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index e0da1fa7c9..006e13838a 100644
+index 707c22a7a4..c25fa9df24 100644
@@ -26,2 +27,2 @@
-@@ -1742,18 +1742,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
- 			bonded_eth_dev->data->dev_conf.link_speeds;
+@@ -1719,18 +1719,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
+ 			bonded_eth_dev->data->dev_conf.rxmode.mtu;

patch 'app/testpmd: fix MAC header in checksum forward engine' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 185674ed26176597c820c136cbb133e9ab477b03 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Wed, 26 Oct 2022 14:07:20 +0300
Subject: [PATCH] app/testpmd: fix MAC header in checksum forward engine

[ upstream commit 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 ]

MLX5 SR-IOV Tx engine will not transmit Ethernet frame
if destination MAC address matched local port address. The frame ether
looped-back to Rx or dropped, depending on the port configuration.

Application running over MLX5 SR-IOV port cannot transmit packet
polled from Rx queue as is. The packet Ethernet destination address
must be changed.

Add new run-time configuration parameter to the `csum` forwarding
engine to control MAC addresses configuration:

testpmd> csum mac-swap on|off <port_id>

`mac-swap on`  replace MAC addresses.
`mac-swap off` keep Ethernet header unchanged.

Fixes: 9b4ea7ae77fa ("app/testpmd: revert MAC update in checksum forwarding")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Huisong Li <lihuisong@huawei.com>
---
 app/test-pmd/cmdline.c  | 50 +++++++++++++++++++++++++++++++++++++++++
 app/test-pmd/csumonly.c |  6 +++++
 app/test-pmd/testpmd.c  |  5 +++--
 app/test-pmd/testpmd.h  |  3 ++-
 4 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 82386c02ee..2e8fec3552 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -4898,4 +4898,53 @@ cmdline_parse_inst_t cmd_csum_tunnel = {
 };
 
+struct cmd_csum_mac_swap_result {
+	cmdline_fixed_string_t csum;
+	cmdline_fixed_string_t parse;
+	cmdline_fixed_string_t onoff;
+	portid_t port_id;
+};
+
+static void
+cmd_csum_mac_swap_parsed(void *parsed_result,
+		       __rte_unused struct cmdline *cl,
+		       __rte_unused void *data)
+{
+	struct cmd_csum_mac_swap_result *res = parsed_result;
+
+	if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+		return;
+	if (strcmp(res->onoff, "on") == 0)
+		ports[res->port_id].fwd_mac_swap = 1;
+	else
+		ports[res->port_id].fwd_mac_swap = 0;
+}
+
+static cmdline_parse_token_string_t cmd_csum_mac_swap_csum =
+	TOKEN_STRING_INITIALIZER(struct cmd_csum_mac_swap_result,
+				 csum, "csum");
+static cmdline_parse_token_string_t cmd_csum_mac_swap_parse =
+	TOKEN_STRING_INITIALIZER(struct cmd_csum_mac_swap_result,
+				 parse, "mac-swap");
+static cmdline_parse_token_string_t cmd_csum_mac_swap_onoff =
+	TOKEN_STRING_INITIALIZER(struct cmd_csum_mac_swap_result,
+				 onoff, "on#off");
+static cmdline_parse_token_num_t cmd_csum_mac_swap_portid =
+	TOKEN_NUM_INITIALIZER(struct cmd_csum_mac_swap_result,
+			      port_id, RTE_UINT16);
+
+static cmdline_parse_inst_t cmd_csum_mac_swap = {
+	.f = cmd_csum_mac_swap_parsed,
+	.data = NULL,
+	.help_str = "csum mac-swap on|off <port_id>: "
+		    "Enable/Disable forward mac address swap",
+	.tokens = {
+		(void *)&cmd_csum_mac_swap_csum,
+		(void *)&cmd_csum_mac_swap_parse,
+		(void *)&cmd_csum_mac_swap_onoff,
+		(void *)&cmd_csum_mac_swap_portid,
+		NULL,
+	},
+};
+
 /* *** ENABLE HARDWARE SEGMENTATION IN TX NON-TUNNELED PACKETS *** */
 struct cmd_tso_set_result {
@@ -17762,4 +17811,5 @@ cmdline_parse_ctx_t main_ctx[] = {
 	(cmdline_parse_inst_t *)&cmd_csum_show,
 	(cmdline_parse_inst_t *)&cmd_csum_tunnel,
+	(cmdline_parse_inst_t *)&cmd_csum_mac_swap,
 	(cmdline_parse_inst_t *)&cmd_tso_set,
 	(cmdline_parse_inst_t *)&cmd_tso_show,
diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index d661e21e02..0a72690c37 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -907,4 +907,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 
 		eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
+		if (ports[fs->tx_port].fwd_mac_swap) {
+			rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
+					    &eth_hdr->dst_addr);
+			rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
+					    &eth_hdr->src_addr);
+		}
 		parse_ethernet(eth_hdr, &info);
 		l3_hdr = (char *)eth_hdr + info.l2_len;
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 3a8eef48e4..b8b311f982 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -4198,8 +4198,9 @@ init_port(void)
 				RTE_MAX_ETHPORTS);
 	}
-	for (i = 0; i < RTE_MAX_ETHPORTS; i++)
+	for (i = 0; i < RTE_MAX_ETHPORTS; i++) {
+		ports[i].fwd_mac_swap = 1;
 		ports[i].xstats_info.allocated = false;
-	for (i = 0; i < RTE_MAX_ETHPORTS; i++)
 		LIST_INIT(&ports[i].flow_tunnel_list);
+	}
 	/* Initialize ports NUMA structures */
 	memset(port_numa, NUMA_NO_CONFIG, RTE_MAX_ETHPORTS);
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 8f3a89e9be..e53320e630 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -262,5 +262,6 @@ struct rte_port {
 	uint32_t                mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
 	uint8_t                 slave_flag : 1, /**< bonding slave port */
-				bond_flag : 1; /**< port is bond device */
+				bond_flag : 1, /**< port is bond device */
+				fwd_mac_swap : 1; /**< swap packet MAC before forward */
 	struct port_flow        *flow_list; /**< Associated flows. */
 	struct port_indirect_action *actions_list;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.167794705 +0000
+++ 0002-app-testpmd-fix-MAC-header-in-checksum-forward-engin.patch	2022-11-23 09:55:57.003149140 +0000
@@ -1 +1 @@
-From 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 Mon Sep 17 00:00:00 2001
+From 185674ed26176597c820c136cbb133e9ab477b03 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 236bc417e2dad4034e4b9b7ea4fc10e71a07c1f8 ]
+
@@ -23 +24,0 @@
-Cc: stable@dpdk.org
@@ -35 +36 @@
-index 8dc60e9388..3fbcb6ca8f 100644
+index 82386c02ee..2e8fec3552 100644
@@ -38 +39 @@
-@@ -4794,4 +4794,53 @@ static cmdline_parse_inst_t cmd_csum_tunnel = {
+@@ -4898,4 +4898,53 @@ cmdline_parse_inst_t cmd_csum_tunnel = {
@@ -92 +93 @@
-@@ -12629,4 +12678,5 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
+@@ -17762,4 +17811,5 @@ cmdline_parse_ctx_t main_ctx[] = {
@@ -99 +100 @@
-index 144f28819c..1c24598515 100644
+index d661e21e02..0a72690c37 100644
@@ -102 +103 @@
-@@ -916,4 +916,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
+@@ -907,4 +907,10 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
@@ -114 +115 @@
-index aa7ea29f15..bf589c4e8d 100644
+index 3a8eef48e4..b8b311f982 100644
@@ -117 +118 @@
-@@ -4215,8 +4215,9 @@ init_port(void)
+@@ -4198,8 +4198,9 @@ init_port(void)
@@ -130 +131 @@
-index 349f02e18a..93fdb9d331 100644
+index 8f3a89e9be..e53320e630 100644
@@ -133,2 +134,2 @@
-@@ -317,5 +317,6 @@ struct rte_port {
- 	uint32_t                queue_sz; /**< size of a queue for flow rules */
+@@ -262,5 +262,6 @@ struct rte_port {
+ 	uint32_t                mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
@@ -139,2 +140,2 @@
- 	struct port_template    *pattern_templ_list; /**< Pattern templates. */
- 	struct port_template    *actions_templ_list; /**< Actions templates. */
+ 	struct port_flow        *flow_list; /**< Associated flows. */
+ 	struct port_indirect_action *actions_list;

patch 'net/bonding: fix dropping valid MAC packets' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 194dea76b12d312adfba4fbc2faa1e62a9603b37 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Wed, 19 Oct 2022 11:32:31 +0800
Subject: [PATCH] net/bonding: fix dropping valid MAC packets

[ upstream commit 30bfba52cf356c03743b6f7deaeefce2f6cb39ed ]

Currently, by default, bond4 will first try to enable allmulti and
then enable promiscuous if fail to enable allmulti. On reception,
whether unicast and multicast packets should be dropped depends on
which mode has been enabled on the bonding interface.

In fact, if MAC address of packets in mac_addrs array of bonding
interface, these packets should not be dropped. However, now only
check the default MAC address, which will cause the packets with
MAC added by the '.mac_addr_add' are dropped.

Fixes: 68218b87c184 ("net/bonding: prefer allmulti to promiscuous for LACP")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 33 +++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index c25fa9df24..51758d4cca 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -272,4 +272,22 @@ bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint16_t slave_port) {
 }
 
+static bool
+is_bond_mac_addr(const struct rte_ether_addr *ea,
+		 const struct rte_ether_addr *mac_addrs, uint32_t max_mac_addrs)
+{
+	uint32_t i;
+
+	for (i = 0; i < max_mac_addrs; i++) {
+		/* skip zero address */
+		if (rte_is_zero_ether_addr(&mac_addrs[i]))
+			continue;
+
+		if (rte_is_same_ether_addr(ea, &mac_addrs[i]))
+			return true;
+	}
+
+	return false;
+}
+
 static inline uint16_t
 rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,
@@ -332,6 +350,7 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,
 			 * - it is slow packet but no dedicated rxq is present,
 			 * - slave is not in collecting state,
-			 * - bonding interface is not in promiscuous mode:
-			 *   - packet is unicast and address does not match,
+			 * - bonding interface is not in promiscuous mode and
+			 *   packet address isn't in mac_addrs array:
+			 *   - packet is unicast,
 			 *   - packet is multicast and bonding interface
 			 *     is not in allmulti,
@@ -343,10 +362,8 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,
 				!collecting ||
 				(!promisc &&
-				 ((rte_is_unicast_ether_addr(&hdr->dst_addr) &&
-				   !rte_is_same_ether_addr(bond_mac,
-						       &hdr->dst_addr)) ||
-				  (!allmulti &&
-				   rte_is_multicast_ether_addr(&hdr->dst_addr)))))) {
-
+				 !is_bond_mac_addr(&hdr->dst_addr, bond_mac,
+						   BOND_MAX_MAC_ADDRS) &&
+				 (rte_is_unicast_ether_addr(&hdr->dst_addr) ||
+				  !allmulti)))) {
 				if (hdr->ether_type == ether_type_slow_be) {
 					bond_mode_8023ad_handle_slow_pkt(
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.199068567 +0000
+++ 0003-net-bonding-fix-dropping-valid-MAC-packets.patch	2022-11-23 09:55:57.006149148 +0000
@@ -1 +1 @@
-From 30bfba52cf356c03743b6f7deaeefce2f6cb39ed Mon Sep 17 00:00:00 2001
+From 194dea76b12d312adfba4fbc2faa1e62a9603b37 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 30bfba52cf356c03743b6f7deaeefce2f6cb39ed ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 006e13838a..864e073db8 100644
+index c25fa9df24..51758d4cca 100644

patch 'app/testpmd: make quit flag volatile' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From a0521c13c14063d9d8179935280ea789b85fa07b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 8 Nov 2022 10:07:43 -0800
Subject: [PATCH] app/testpmd: make quit flag volatile

[ upstream commit 4c243bd4a8762163a7a1ba321bc8b8ff924c6358 ]

Since f_quit is set in a signal handler it needs to be marked
volatile.  Otherwise, compiler is allowed to optimize the loop because
it can assume the value never changes. The flag can also be made local
to the file it is used in.

Fixes: d9a191a00e81 ("app/testpmd: fix quitting in container")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
 app/test-pmd/testpmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b8b311f982..ce8fd3d7d3 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -229,5 +229,5 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */
  * option. Set flag to exit stats period loop after received SIGINT/SIGTERM.
  */
-uint8_t f_quit;
+static volatile uint8_t f_quit;
 uint8_t cl_quit; /* Quit testpmd from cmdline. */
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.221424573 +0000
+++ 0004-app-testpmd-make-quit-flag-volatile.patch	2022-11-23 09:55:57.009149156 +0000
@@ -1 +1 @@
-From 4c243bd4a8762163a7a1ba321bc8b8ff924c6358 Mon Sep 17 00:00:00 2001
+From a0521c13c14063d9d8179935280ea789b85fa07b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4c243bd4a8762163a7a1ba321bc8b8ff924c6358 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 7381dfd9e5..295856f1a8 100644
+index b8b311f982..ce8fd3d7d3 100644
@@ -24 +25 @@
-@@ -232,5 +232,5 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */
+@@ -229,5 +229,5 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */

patch 'net/bonding: fix mbuf fast free handling' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 89f4c06b0feb94e641380f52ba7d6242dcdc10fb Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Wed, 9 Nov 2022 10:22:37 +0800
Subject: [PATCH] net/bonding: fix mbuf fast free handling

[ upstream commit b4924c0db589b5d4698abfab3ce60978d9df518b ]

The RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE offload can't be used in bonding
mode Broadcast and mode 8023AD. Currently, bonding driver forcibly removes
from the dev->data->dev_conf.txmode.offloads and processes as success in
bond_ethdev_configure(). But this still cause that rte_eth_dev_configure()
fails to execute because of the failure of validating Tx offload in the
eth_dev_validate_offloads(). So this patch moves the modification of txmode
offlaods to the stage of adding slave device to report the correct txmode
offloads.

Fixes: 18c41457cbae ("net/bonding: fix mbuf fast free usage")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/bonding/rte_eth_bond_api.c |  5 +++++
 drivers/net/bonding/rte_eth_bond_pmd.c | 11 -----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c
index 919c580fb8..14dfd2059f 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -542,4 +542,9 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
 	}
 
+	/* Bond mode Broadcast & 8023AD don't support MBUF_FAST_FREE offload. */
+	if (internals->mode == BONDING_MODE_8023AD ||
+	    internals->mode == BONDING_MODE_BROADCAST)
+		internals->tx_offload_capa &= ~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
+
 	bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf &=
 			internals->flow_type_rss_offloads;
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 51758d4cca..d3bf95b845 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3600,5 +3600,4 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
 	struct bond_dev_private *internals = dev->data->dev_private;
 	struct rte_kvargs *kvlist = internals->kvlist;
-	uint64_t offloads;
 	int arg_count;
 	uint16_t port_id = dev - rte_eth_devices;
@@ -3661,14 +3660,4 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
 	}
 
-	offloads = dev->data->dev_conf.txmode.offloads;
-	if ((offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) &&
-			(internals->mode == BONDING_MODE_8023AD ||
-			internals->mode == BONDING_MODE_BROADCAST)) {
-		RTE_BOND_LOG(WARNING,
-			"bond mode broadcast & 8023AD don't support MBUF_FAST_FREE offload, force disable it.");
-		offloads &= ~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
-		dev->data->dev_conf.txmode.offloads = offloads;
-	}
-
 	/* set the max_rx_pktlen */
 	internals->max_rx_pktlen = internals->candidate_max_rx_pktlen;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.243251990 +0000
+++ 0005-net-bonding-fix-mbuf-fast-free-handling.patch	2022-11-23 09:55:57.012149163 +0000
@@ -1 +1 @@
-From b4924c0db589b5d4698abfab3ce60978d9df518b Mon Sep 17 00:00:00 2001
+From 89f4c06b0feb94e641380f52ba7d6242dcdc10fb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b4924c0db589b5d4698abfab3ce60978d9df518b ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 694fe86115..c0178369b4 100644
+index 919c580fb8..14dfd2059f 100644
@@ -29 +30 @@
-@@ -545,4 +545,9 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
+@@ -542,4 +542,9 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
@@ -40 +41 @@
-index 864e073db8..2efaad1e8e 100644
+index 51758d4cca..d3bf95b845 100644
@@ -43 +44 @@
-@@ -3644,5 +3644,4 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
+@@ -3600,5 +3600,4 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
@@ -49 +50 @@
-@@ -3709,14 +3708,4 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
+@@ -3661,14 +3660,4 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
@@ -62,2 +63,2 @@
- 	link_speeds = dev->data->dev_conf.link_speeds;
- 	/*
+ 	/* set the max_rx_pktlen */
+ 	internals->max_rx_pktlen = internals->candidate_max_rx_pktlen;

patch 'eal: fix doxygen comments for UUID' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 3ff124101d33b4ecb803ef6aa0566a47514c80f2 Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerinj@marvell.com>
Date: Wed, 9 Nov 2022 20:24:10 +0530
Subject: [PATCH] eal: fix doxygen comments for UUID

[ upstream commit 61c7dfe75a9ab345bbd8bdc30c2da0ee661660a8 ]

Fix following syntax error reported by doxygen 1.9.5 version.

lib/eal/include/rte_uuid.h:89: error: RTE_UUID_STRLEN
has @param documentation sections but no arguments
(warning treated as error, aborting now)

Fixes: 6bc67c497a51 ("eal: add uuid API")

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
---
 lib/eal/include/rte_uuid.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/eal/include/rte_uuid.h b/lib/eal/include/rte_uuid.h
index 8b42e070af..cfefd4308a 100644
--- a/lib/eal/include/rte_uuid.h
+++ b/lib/eal/include/rte_uuid.h
@@ -38,4 +38,7 @@ typedef unsigned char rte_uuid_t[16];
 }
 
+/** UUID string length */
+#define RTE_UUID_STRLEN	(36 + 1)
+
 /**
  * Test if UUID is all zeros.
@@ -96,5 +99,4 @@ int	rte_uuid_parse(const char *in, rte_uuid_t uu);
  *    Sizeof the available string buffer
  */
-#define RTE_UUID_STRLEN	(36 + 1)
 void	rte_uuid_unparse(const rte_uuid_t uu, char *out, size_t len);
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.265473944 +0000
+++ 0006-eal-fix-doxygen-comments-for-UUID.patch	2022-11-23 09:55:57.012149163 +0000
@@ -1 +1 @@
-From 61c7dfe75a9ab345bbd8bdc30c2da0ee661660a8 Mon Sep 17 00:00:00 2001
+From 3ff124101d33b4ecb803ef6aa0566a47514c80f2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 61c7dfe75a9ab345bbd8bdc30c2da0ee661660a8 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

patch 'power: fix some doxygen comments' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 5a4f6d16e87f274533ee1b2db1ae14b8e83e32b4 Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerinj@marvell.com>
Date: Wed, 9 Nov 2022 20:24:10 +0530
Subject: [PATCH] power: fix some doxygen comments

[ upstream commit 58794bf8d2d577b18e8bd430fd6419274678b34e ]

Fix following syntax error reported by doxygen 1.9.5 version.

lib/power/rte_power.h:169: error: rte_power_freq_up has
@param documentation sections but no arguments
(warning treated as error, aborting now)

Fixes: d7937e2e3d12 ("power: initial import")

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
---
 lib/power/rte_power.h | 55 -------------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/lib/power/rte_power.h b/lib/power/rte_power.h
index c5759afa39..829a22380d 100644
--- a/lib/power/rte_power.h
+++ b/lib/power/rte_power.h
@@ -172,12 +172,4 @@ typedef int (*rte_power_freq_change_t)(unsigned int lcore_id);
  * frequencies.
  * Review each environments specific documentation for usage.
- *
- * @param lcore_id
- *  lcore id.
- *
- * @return
- *  - 1 on success with frequency changed.
- *  - 0 on success without frequency changed.
- *  - Negative on error.
  */
 extern rte_power_freq_change_t rte_power_freq_up;
@@ -187,14 +179,5 @@ extern rte_power_freq_change_t rte_power_freq_up;
  * frequencies.
  * Review each environments specific documentation for usage.
- *
- * @param lcore_id
- *  lcore id.
- *
- * @return
- *  - 1 on success with frequency changed.
- *  - 0 on success without frequency changed.
- *  - Negative on error.
  */
-
 extern rte_power_freq_change_t rte_power_freq_down;
 
@@ -203,12 +186,4 @@ extern rte_power_freq_change_t rte_power_freq_down;
  * available frequencies.
  * Review each environments specific documentation for usage.
- *
- * @param lcore_id
- *  lcore id.
- *
- * @return
- *  - 1 on success with frequency changed.
- *  - 0 on success without frequency changed.
- *  - Negative on error.
  */
 extern rte_power_freq_change_t rte_power_freq_max;
@@ -218,12 +193,4 @@ extern rte_power_freq_change_t rte_power_freq_max;
  * available frequencies.
  * Review each environments specific documentation for usage..
- *
- * @param lcore_id
- *  lcore id.
- *
- * @return
- *  - 1 on success with frequency changed.
- *  - 0 on success without frequency changed.
- *  - Negative on error.
  */
 extern rte_power_freq_change_t rte_power_freq_min;
@@ -232,12 +199,4 @@ extern rte_power_freq_change_t rte_power_freq_min;
  * Query the Turbo Boost status of a specific lcore.
  * Review each environments specific documentation for usage..
- *
- * @param lcore_id
- *  lcore id.
- *
- * @return
- *  - 1 Turbo Boost is enabled for this lcore.
- *  - 0 Turbo Boost is disabled for this lcore.
- *  - Negative on error.
  */
 extern rte_power_freq_change_t rte_power_turbo_status;
@@ -246,11 +205,4 @@ extern rte_power_freq_change_t rte_power_turbo_status;
  * Enable Turbo Boost for this lcore.
  * Review each environments specific documentation for usage..
- *
- * @param lcore_id
- *  lcore id.
- *
- * @return
- *  - 0 on success.
- *  - Negative on error.
  */
 extern rte_power_freq_change_t rte_power_freq_enable_turbo;
@@ -259,11 +211,4 @@ extern rte_power_freq_change_t rte_power_freq_enable_turbo;
  * Disable Turbo Boost for this lcore.
  * Review each environments specific documentation for usage..
- *
- * @param lcore_id
- *  lcore id.
- *
- * @return
- *  - 0 on success.
- *  - Negative on error.
  */
 extern rte_power_freq_change_t rte_power_freq_disable_turbo;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.286441151 +0000
+++ 0007-power-fix-some-doxygen-comments.patch	2022-11-23 09:55:57.013149166 +0000
@@ -1 +1 @@
-From 58794bf8d2d577b18e8bd430fd6419274678b34e Mon Sep 17 00:00:00 2001
+From 5a4f6d16e87f274533ee1b2db1ae14b8e83e32b4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 58794bf8d2d577b18e8bd430fd6419274678b34e ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 47345e26df..7954299489 100644
+index c5759afa39..829a22380d 100644
@@ -24 +25 @@
-@@ -170,12 +170,4 @@ typedef int (*rte_power_freq_change_t)(unsigned int lcore_id);
+@@ -172,12 +172,4 @@ typedef int (*rte_power_freq_change_t)(unsigned int lcore_id);
@@ -37 +38 @@
-@@ -185,14 +177,5 @@ extern rte_power_freq_change_t rte_power_freq_up;
+@@ -187,14 +179,5 @@ extern rte_power_freq_change_t rte_power_freq_up;
@@ -52 +53 @@
-@@ -201,12 +184,4 @@ extern rte_power_freq_change_t rte_power_freq_down;
+@@ -203,12 +186,4 @@ extern rte_power_freq_change_t rte_power_freq_down;
@@ -65 +66 @@
-@@ -216,12 +191,4 @@ extern rte_power_freq_change_t rte_power_freq_max;
+@@ -218,12 +193,4 @@ extern rte_power_freq_change_t rte_power_freq_max;
@@ -78 +79 @@
-@@ -230,12 +197,4 @@ extern rte_power_freq_change_t rte_power_freq_min;
+@@ -232,12 +199,4 @@ extern rte_power_freq_change_t rte_power_freq_min;
@@ -91 +92 @@
-@@ -244,11 +203,4 @@ extern rte_power_freq_change_t rte_power_turbo_status;
+@@ -246,11 +205,4 @@ extern rte_power_freq_change_t rte_power_turbo_status;
@@ -103 +104 @@
-@@ -257,11 +209,4 @@ extern rte_power_freq_change_t rte_power_freq_enable_turbo;
+@@ -259,11 +211,4 @@ extern rte_power_freq_change_t rte_power_freq_enable_turbo;

patch 'hash: fix RCU configuration memory leak' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 84848bab5cdcd2e33ee9603b81c5e8a2b7cf9eb7 Mon Sep 17 00:00:00 2001
From: Jun Qiu <jun.qiu@jaguarmicro.com>
Date: Fri, 4 Nov 2022 09:51:23 +0000
Subject: [PATCH] hash: fix RCU configuration memory leak

[ upstream commit bdd0c62c69b2b3c07e65d66daa7c564280e72480 ]

The memory of h->hash_rcu_cfg which is allocated in
rte_hash_rcu_qsbr_add was leaked.

Fixes: 769b2de7fb52 ("hash: implement RCU resources reclamation")

Signed-off-by: Jun Qiu <jun.qiu@jaguarmicro.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 lib/hash/rte_cuckoo_hash.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 1191dfd81a..cff4242f79 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -528,4 +528,5 @@ rte_hash_free(struct rte_hash *h)
 	rte_free(h->tbl_chng_cnt);
 	rte_free(h->ext_bkt_to_free);
+	rte_free(h->hash_rcu_cfg);
 	rte_free(h);
 	rte_free(te);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.307411943 +0000
+++ 0008-hash-fix-RCU-configuration-memory-leak.patch	2022-11-23 09:55:57.014149168 +0000
@@ -1 +1 @@
-From bdd0c62c69b2b3c07e65d66daa7c564280e72480 Mon Sep 17 00:00:00 2001
+From 84848bab5cdcd2e33ee9603b81c5e8a2b7cf9eb7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bdd0c62c69b2b3c07e65d66daa7c564280e72480 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 62c762439a..829b79c89a 100644
+index 1191dfd81a..cff4242f79 100644
@@ -22 +23 @@
-@@ -522,4 +522,5 @@ rte_hash_free(struct rte_hash *h)
+@@ -528,4 +528,5 @@ rte_hash_free(struct rte_hash *h)

patch 'test/hash: remove dead code in extendable bucket test' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 1e81619d17d54cab69ceb6525a018bcbbcf57e9f Mon Sep 17 00:00:00 2001
From: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Date: Thu, 3 Nov 2022 18:12:39 +0000
Subject: [PATCH] test/hash: remove dead code in extendable bucket test

[ upstream commit e5408325f3b415421de90abde8445d8d268dfeea ]

Remove unnecessary variable assignment.

Coverity issue: 336800
Fixes: 3f9aab961ed3 ("test/hash: check lock-free extendable bucket")

Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
 app/test/test_hash_readwrite_lf_perf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/test/test_hash_readwrite_lf_perf.c b/app/test/test_hash_readwrite_lf_perf.c
index 32f9ec9250..cf86046a2f 100644
--- a/app/test/test_hash_readwrite_lf_perf.c
+++ b/app/test/test_hash_readwrite_lf_perf.c
@@ -1103,5 +1103,4 @@ test_hash_multi_add_lookup(struct rwc_perf *rwc_perf_results, int rwc_lf,
 						(void *)(uintptr_t)read_type,
 						enabled_core_ids[i]);
-				write_type = WRITE_KEY_SHIFT;
 				pos_core = 0;
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.329437831 +0000
+++ 0009-test-hash-remove-dead-code-in-extendable-bucket-test.patch	2022-11-23 09:55:57.015149171 +0000
@@ -1 +1 @@
-From e5408325f3b415421de90abde8445d8d268dfeea Mon Sep 17 00:00:00 2001
+From 1e81619d17d54cab69ceb6525a018bcbbcf57e9f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e5408325f3b415421de90abde8445d8d268dfeea ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

patch 'test/hash: fix bulk lookup check' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From e2413f64278495fcadf61a8dd127b6f0bcc9d127 Mon Sep 17 00:00:00 2001
From: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Date: Thu, 3 Nov 2022 18:52:56 +0000
Subject: [PATCH] test/hash: fix bulk lookup check

[ upstream commit 521171cf2a3cbc108ec920874cfa3706e7f89c73 ]

Check return value after bulk lookup.

Coverity issue: 357746
Fixes: 14b8ab576235 ("hash: add bulk lookup with signatures array")

Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 app/test/test_hash_perf.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c
index 76cdac5d53..199564bba3 100644
--- a/app/test/test_hash_perf.c
+++ b/app/test/test_hash_perf.c
@@ -481,4 +481,9 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data,
 					&signatures[j * BURST_SIZE],
 					BURST_SIZE, positions_burst);
+				if (ret != 0) {
+					printf("rte_hash_lookup_with_hash_bulk failed with %d\n",
+						ret);
+					return -1;
+				}
 				for (k = 0; k < BURST_SIZE; k++) {
 					if (positions_burst[k] !=
@@ -493,8 +498,12 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data,
 				}
 			} else {
-				rte_hash_lookup_bulk(h[table_index],
+				ret = rte_hash_lookup_bulk(h[table_index],
 						(const void **) keys_burst,
 						BURST_SIZE,
 						positions_burst);
+				if (ret != 0) {
+					printf("rte_hash_lookup_bulk failed with %d\n", ret);
+					return -1;
+				}
 				for (k = 0; k < BURST_SIZE; k++) {
 					if (positions_burst[k] != positions[j * BURST_SIZE + k]) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.350770858 +0000
+++ 0010-test-hash-fix-bulk-lookup-check.patch	2022-11-23 09:55:57.015149171 +0000
@@ -1 +1 @@
-From 521171cf2a3cbc108ec920874cfa3706e7f89c73 Mon Sep 17 00:00:00 2001
+From e2413f64278495fcadf61a8dd127b6f0bcc9d127 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 521171cf2a3cbc108ec920874cfa3706e7f89c73 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 5d36c0f454..14a1283aba 100644
+index 76cdac5d53..199564bba3 100644
@@ -22 +23 @@
-@@ -476,4 +476,9 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data,
+@@ -481,4 +481,9 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data,
@@ -32 +33 @@
-@@ -488,8 +493,12 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data,
+@@ -493,8 +498,12 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data,

patch 'bus/auxiliary: prevent device from being probed again' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 4468cce76b42c4030f3e32aa15f9d8745a54ee2f Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@nvidia.com>
Date: Wed, 9 Nov 2022 16:53:56 +0200
Subject: [PATCH] bus/auxiliary: prevent device from being probed again

[ upstream commit bc967149967fdf504249c3cc13d307a9c16193cc ]

The device on auxiliary bus doesn't support being probed again
without being removed firstly. The PMD will detect and return error
for this unsupported operation. Some of the resources would be
cleared wrongly. When quitting, there will be unexpected error like
crash.

To prevent this, the device driver will be checked before probing a
device.

Fixes: 1afce3086cf4 ("bus/auxiliary: introduce auxiliary bus")

Signed-off-by: Bing Zhao <bingz@nvidia.com>
Reviewed-by: Gregory Etelson <getelson@nvidia.com>
Reviewed-by: Matan Azrad <matan@nvidia.com>
---
 drivers/bus/auxiliary/auxiliary_common.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/bus/auxiliary/auxiliary_common.c b/drivers/bus/auxiliary/auxiliary_common.c
index 2cf8fe672d..a6b4b3de84 100644
--- a/drivers/bus/auxiliary/auxiliary_common.c
+++ b/drivers/bus/auxiliary/auxiliary_common.c
@@ -114,4 +114,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv,
 	}
 
+	if (rte_dev_is_probed(&dev->device)) {
+		RTE_LOG(DEBUG, EAL, "Device %s is already probed on auxiliary bus\n",
+			dev->device.name);
+		return -EEXIST;
+	}
+
 	iova_mode = rte_eal_iova_mode();
 	if ((drv->drv_flags & RTE_AUXILIARY_DRV_NEED_IOVA_AS_VA) > 0 &&
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.371796227 +0000
+++ 0011-bus-auxiliary-prevent-device-from-being-probed-again.patch	2022-11-23 09:55:57.016149173 +0000
@@ -1 +1 @@
-From bc967149967fdf504249c3cc13d307a9c16193cc Mon Sep 17 00:00:00 2001
+From 4468cce76b42c4030f3e32aa15f9d8745a54ee2f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bc967149967fdf504249c3cc13d307a9c16193cc ]
+
@@ -16 +17,0 @@
-CC: stable@dpdk.org
@@ -26 +27 @@
-index 6bb1fe7c96..ff1369353a 100644
+index 2cf8fe672d..a6b4b3de84 100644
@@ -29,2 +30,2 @@
-@@ -109,4 +109,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv,
- 		RTE_LOG(INFO, EAL, "Device %s is not NUMA-aware\n", dev->name);
+@@ -114,4 +114,10 @@ rte_auxiliary_probe_one_driver(struct rte_auxiliary_driver *drv,
+ 	}

patch 'net/mlx5: fix action flag data type' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 97b4706f1e9d10d414cda20aec6f5b4b79e9da32 Mon Sep 17 00:00:00 2001
From: Shun Hao <shunh@nvidia.com>
Date: Tue, 1 Nov 2022 12:07:24 +0200
Subject: [PATCH] net/mlx5: fix action flag data type

[ upstream commit e5517406963b07fa117e499a0474869dc236a1a6 ]

MLX5_FLOW_ACTION flags are used as uint64_t now, but some old flags
are not defined as 64 bits. So if they are type casted to uint64 after
bitwise operations, the high 32-bit data might be incorrect.

E.g. Currently MLX5_FLOW_ACTION_DROP is defined as 0x1u, when it is used
like:
	(action_flags & ~MLX5_FLOW_ACTION_DROP)
action_flags is uint64_t so (~MLX5_FLOW_ACTION_DROP) will be casted to
uint64_t as well, but its high 32 bits will be all 0s. This will make the
result not as expected.

This patch fixes this by making all action flags definition as 64-bit
data type.

Fixes: 4b7bf3ffb473 ("net/mlx5: support yellow in meter policy validation")

Signed-off-by: Shun Hao <shunh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.h | 56 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 29ccb98351..094e483325 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -225,32 +225,32 @@ enum mlx5_feature_name {
 
 /* Actions */
-#define MLX5_FLOW_ACTION_DROP (1u << 0)
-#define MLX5_FLOW_ACTION_QUEUE (1u << 1)
-#define MLX5_FLOW_ACTION_RSS (1u << 2)
-#define MLX5_FLOW_ACTION_FLAG (1u << 3)
-#define MLX5_FLOW_ACTION_MARK (1u << 4)
-#define MLX5_FLOW_ACTION_COUNT (1u << 5)
-#define MLX5_FLOW_ACTION_PORT_ID (1u << 6)
-#define MLX5_FLOW_ACTION_OF_POP_VLAN (1u << 7)
-#define MLX5_FLOW_ACTION_OF_PUSH_VLAN (1u << 8)
-#define MLX5_FLOW_ACTION_OF_SET_VLAN_VID (1u << 9)
-#define MLX5_FLOW_ACTION_OF_SET_VLAN_PCP (1u << 10)
-#define MLX5_FLOW_ACTION_SET_IPV4_SRC (1u << 11)
-#define MLX5_FLOW_ACTION_SET_IPV4_DST (1u << 12)
-#define MLX5_FLOW_ACTION_SET_IPV6_SRC (1u << 13)
-#define MLX5_FLOW_ACTION_SET_IPV6_DST (1u << 14)
-#define MLX5_FLOW_ACTION_SET_TP_SRC (1u << 15)
-#define MLX5_FLOW_ACTION_SET_TP_DST (1u << 16)
-#define MLX5_FLOW_ACTION_JUMP (1u << 17)
-#define MLX5_FLOW_ACTION_SET_TTL (1u << 18)
-#define MLX5_FLOW_ACTION_DEC_TTL (1u << 19)
-#define MLX5_FLOW_ACTION_SET_MAC_SRC (1u << 20)
-#define MLX5_FLOW_ACTION_SET_MAC_DST (1u << 21)
-#define MLX5_FLOW_ACTION_ENCAP (1u << 22)
-#define MLX5_FLOW_ACTION_DECAP (1u << 23)
-#define MLX5_FLOW_ACTION_INC_TCP_SEQ (1u << 24)
-#define MLX5_FLOW_ACTION_DEC_TCP_SEQ (1u << 25)
-#define MLX5_FLOW_ACTION_INC_TCP_ACK (1u << 26)
-#define MLX5_FLOW_ACTION_DEC_TCP_ACK (1u << 27)
+#define MLX5_FLOW_ACTION_DROP (1ull << 0)
+#define MLX5_FLOW_ACTION_QUEUE (1ull << 1)
+#define MLX5_FLOW_ACTION_RSS (1ull << 2)
+#define MLX5_FLOW_ACTION_FLAG (1ull << 3)
+#define MLX5_FLOW_ACTION_MARK (1ull << 4)
+#define MLX5_FLOW_ACTION_COUNT (1ull << 5)
+#define MLX5_FLOW_ACTION_PORT_ID (1ull << 6)
+#define MLX5_FLOW_ACTION_OF_POP_VLAN (1ull << 7)
+#define MLX5_FLOW_ACTION_OF_PUSH_VLAN (1ull << 8)
+#define MLX5_FLOW_ACTION_OF_SET_VLAN_VID (1ull << 9)
+#define MLX5_FLOW_ACTION_OF_SET_VLAN_PCP (1ull << 10)
+#define MLX5_FLOW_ACTION_SET_IPV4_SRC (1ull << 11)
+#define MLX5_FLOW_ACTION_SET_IPV4_DST (1ull << 12)
+#define MLX5_FLOW_ACTION_SET_IPV6_SRC (1ull << 13)
+#define MLX5_FLOW_ACTION_SET_IPV6_DST (1ull << 14)
+#define MLX5_FLOW_ACTION_SET_TP_SRC (1ull << 15)
+#define MLX5_FLOW_ACTION_SET_TP_DST (1ull << 16)
+#define MLX5_FLOW_ACTION_JUMP (1ull << 17)
+#define MLX5_FLOW_ACTION_SET_TTL (1ull << 18)
+#define MLX5_FLOW_ACTION_DEC_TTL (1ull << 19)
+#define MLX5_FLOW_ACTION_SET_MAC_SRC (1ull << 20)
+#define MLX5_FLOW_ACTION_SET_MAC_DST (1ull << 21)
+#define MLX5_FLOW_ACTION_ENCAP (1ull << 22)
+#define MLX5_FLOW_ACTION_DECAP (1ull << 23)
+#define MLX5_FLOW_ACTION_INC_TCP_SEQ (1ull << 24)
+#define MLX5_FLOW_ACTION_DEC_TCP_SEQ (1ull << 25)
+#define MLX5_FLOW_ACTION_INC_TCP_ACK (1ull << 26)
+#define MLX5_FLOW_ACTION_DEC_TCP_ACK (1ull << 27)
 #define MLX5_FLOW_ACTION_SET_TAG (1ull << 28)
 #define MLX5_FLOW_ACTION_MARK_EXT (1ull << 29)
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.391397221 +0000
+++ 0012-net-mlx5-fix-action-flag-data-type.patch	2022-11-23 09:55:57.017149176 +0000
@@ -1 +1 @@
-From e5517406963b07fa117e499a0474869dc236a1a6 Mon Sep 17 00:00:00 2001
+From 97b4706f1e9d10d414cda20aec6f5b4b79e9da32 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e5517406963b07fa117e499a0474869dc236a1a6 ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -30 +31 @@
-index da9b65d8fe..91691806ad 100644
+index 29ccb98351..094e483325 100644
@@ -33 +34 @@
-@@ -259,32 +259,32 @@ enum mlx5_feature_name {
+@@ -225,32 +225,32 @@ enum mlx5_feature_name {

patch 'common/mlx5: fix shared mempool subscription' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From bbddde24b26ec976c7249f5c7dc81eb4fd567116 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Thu, 3 Nov 2022 12:44:27 +0200
Subject: [PATCH] common/mlx5: fix shared mempool subscription

[ upstream commit aeca11f82a2f13c19e320dd337f4aa9627545c99 ]

MLX5 PMD counted each mempool subscribe invocation. The PMD expected
that the mempool subscription will be deleted after the mempool
counter dropped to 0. However, current PMD design unsubscribes mempool
callbacks only once.
As the result, the PMD destroyed mlx5_common_device but kept
shared RX subscription callback. EAL tried to activate that callback
and crashed.

The patch removes mempool subscriptions counter.
The PMD registers mempool subscription once only. An attempt
to register existing subscription returns EEXIST.
Also, the PMD expects to remove subscription when mempool unsubscribe
was activated.

Fixes: 8ad97e4b3215 ("common/mlx5: fix multi-process mempool registration")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/common/mlx5/mlx5_common.c    | 22 +++++++++++-----------
 drivers/common/mlx5/mlx5_common_mr.c |  1 -
 drivers/common/mlx5/mlx5_common_mr.h |  1 -
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.c b/drivers/common/mlx5/mlx5_common.c
index 2634661fd3..f355b3d741 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -410,4 +410,9 @@ mlx5_dev_mempool_event_cb(enum rte_mempool_event event, struct rte_mempool *mp,
 }
 
+/**
+ * Primary and secondary processes share the `cdev` pointer.
+ * Callbacks addresses are local in each process.
+ * Therefore, each process can register private callbacks.
+ */
 int
 mlx5_dev_mempool_subscribe(struct mlx5_common_device *cdev)
@@ -421,12 +426,11 @@ mlx5_dev_mempool_subscribe(struct mlx5_common_device *cdev)
 	ret = rte_mempool_event_callback_register(mlx5_dev_mempool_event_cb,
 						  cdev);
-	if (ret != 0 && rte_errno != EEXIST)
-		goto exit;
-	__atomic_add_fetch(&cdev->mr_scache.mempool_cb_reg_n, 1,
-			   __ATOMIC_ACQUIRE);
 	/* Register mempools only once for this device. */
-	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+	if (ret == 0 && rte_eal_process_type() == RTE_PROC_PRIMARY) {
 		rte_mempool_walk(mlx5_dev_mempool_register_cb, cdev);
-	ret = 0;
+		goto exit;
+	}
+	if (ret != 0 && rte_errno == EEXIST)
+		ret = 0;
 exit:
 	rte_rwlock_write_unlock(&cdev->mr_scache.mprwlock);
@@ -437,13 +441,9 @@ static void
 mlx5_dev_mempool_unsubscribe(struct mlx5_common_device *cdev)
 {
-	uint32_t mempool_cb_reg_n;
 	int ret;
 
+	MLX5_ASSERT(cdev->dev != NULL);
 	if (!cdev->config.mr_mempool_reg_en)
 		return;
-	mempool_cb_reg_n = __atomic_sub_fetch(&cdev->mr_scache.mempool_cb_reg_n,
-					      1, __ATOMIC_RELEASE);
-	if (mempool_cb_reg_n > 0)
-		return;
 	/* Stop watching for mempool events and unregister all mempools. */
 	ret = rte_mempool_event_callback_unregister(mlx5_dev_mempool_event_cb,
diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index 6899ba8e1a..7f56e1f973 100644
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -1140,5 +1140,4 @@ mlx5_mr_create_cache(struct mlx5_mr_share_cache *share_cache, int socket)
 	rte_rwlock_init(&share_cache->rwlock);
 	rte_rwlock_init(&share_cache->mprwlock);
-	share_cache->mempool_cb_reg_n = 0;
 	/* Initialize B-tree and allocate memory for global MR cache table. */
 	return mlx5_mr_btree_init(&share_cache->cache,
diff --git a/drivers/common/mlx5/mlx5_common_mr.h b/drivers/common/mlx5/mlx5_common_mr.h
index f774ccbf33..13eb350980 100644
--- a/drivers/common/mlx5/mlx5_common_mr.h
+++ b/drivers/common/mlx5/mlx5_common_mr.h
@@ -82,5 +82,4 @@ struct mlx5_mr_share_cache {
 	rte_rwlock_t rwlock; /* MR cache Lock. */
 	rte_rwlock_t mprwlock; /* Mempool Registration Lock. */
-	uint32_t mempool_cb_reg_n; /* Mempool event callback registrants. */
 	struct mlx5_mr_btree cache; /* Global MR cache table. */
 	struct mlx5_mr_list mr_list; /* Registered MR list. */
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.413452366 +0000
+++ 0013-common-mlx5-fix-shared-mempool-subscription.patch	2022-11-23 09:55:57.020149183 +0000
@@ -1 +1 @@
-From aeca11f82a2f13c19e320dd337f4aa9627545c99 Mon Sep 17 00:00:00 2001
+From bbddde24b26ec976c7249f5c7dc81eb4fd567116 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aeca11f82a2f13c19e320dd337f4aa9627545c99 ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -32 +33 @@
-index bf22c0694d..0ad14a48c7 100644
+index 2634661fd3..f355b3d741 100644
@@ -35 +36 @@
-@@ -578,4 +578,9 @@ mlx5_dev_mempool_event_cb(enum rte_mempool_event event, struct rte_mempool *mp,
+@@ -410,4 +410,9 @@ mlx5_dev_mempool_event_cb(enum rte_mempool_event event, struct rte_mempool *mp,
@@ -45 +46 @@
-@@ -589,12 +594,11 @@ mlx5_dev_mempool_subscribe(struct mlx5_common_device *cdev)
+@@ -421,12 +426,11 @@ mlx5_dev_mempool_subscribe(struct mlx5_common_device *cdev)
@@ -63 +64 @@
-@@ -605,13 +609,9 @@ static void
+@@ -437,13 +441,9 @@ static void
@@ -79 +80 @@
-index 1d54102b54..0e1d2434ab 100644
+index 6899ba8e1a..7f56e1f973 100644
@@ -82 +83 @@
-@@ -1139,5 +1139,4 @@ mlx5_mr_create_cache(struct mlx5_mr_share_cache *share_cache, int socket)
+@@ -1140,5 +1140,4 @@ mlx5_mr_create_cache(struct mlx5_mr_share_cache *share_cache, int socket)

patch 'net/mlx5: fix shared Rx queue config reuse' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 6f9e7bd90849a3e489957ff6474b745c7344b2af Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev@nvidia.com>
Date: Wed, 2 Nov 2022 16:25:00 +0200
Subject: [PATCH] net/mlx5: fix shared Rx queue config reuse

[ upstream commit 719eb23d44bb3f48a719c90a744d5f4bc321aeba ]

There is a check for the configuration match between
all the Rx queues shared among multiple ports in DPDK.
This check ensures that the configuration is the same.

The issue is this check takes place before the queue
is released and configured again in case of reconfiguration.
That leads to checking against the old configuration and
preventing the shared Rx queue to start properly.

Release the old configuration and prepare a new Rx queue
before checking that its parameters match the config.

Fixes: 09c2555303be ("net/mlx5: support shared Rx queue")

Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 807aaf2fc9..4358671a60 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -900,4 +900,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 		rxq_ctrl = mlx5_shared_rxq_get(dev, conf->share_group,
 					       conf->share_qid);
+		res = mlx5_rx_queue_pre_setup(dev, idx, &desc, &rxq_ctrl);
+		if (res)
+			return res;
 		if (rxq_ctrl != NULL &&
 		    !mlx5_shared_rxq_match(rxq_ctrl, dev, idx, desc, socket,
@@ -906,8 +909,9 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 			return -rte_errno;
 		}
+	} else {
+		res = mlx5_rx_queue_pre_setup(dev, idx, &desc, &rxq_ctrl);
+		if (res)
+			return res;
 	}
-	res = mlx5_rx_queue_pre_setup(dev, idx, &desc, &rxq_ctrl);
-	if (res)
-		return res;
 	/* Allocate RXQ. */
 	rxq = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, sizeof(*rxq), 0,
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.435703822 +0000
+++ 0014-net-mlx5-fix-shared-Rx-queue-config-reuse.patch	2022-11-23 09:55:57.021149186 +0000
@@ -1 +1 @@
-From 719eb23d44bb3f48a719c90a744d5f4bc321aeba Mon Sep 17 00:00:00 2001
+From 6f9e7bd90849a3e489957ff6474b745c7344b2af Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 719eb23d44bb3f48a719c90a744d5f4bc321aeba ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index b7818f9598..0d9d11680b 100644
+index 807aaf2fc9..4358671a60 100644
@@ -31 +32 @@
-@@ -903,4 +903,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+@@ -900,4 +900,7 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
@@ -39 +40 @@
-@@ -909,8 +912,9 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+@@ -906,8 +909,9 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,

patch 'net/mlx5: fix hairpin split with set VLAN VID action' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From b4524bef61097f77c0296fba02f0025d7016b501 Mon Sep 17 00:00:00 2001
From: Dariusz Sosnowski <dsosnowski@nvidia.com>
Date: Mon, 7 Nov 2022 10:28:52 +0000
Subject: [PATCH] net/mlx5: fix hairpin split with set VLAN VID action

[ upstream commit 5615d27b7a1bda7cc58ef07c2e77c6f9a7792c1d ]

Before this patch any flow rule which works on hairpin queues
and which has OF_SET_VLAN_VID action was split into 2 flow rules:

- one subflow for Rx,
- one subflow for Tx.

OF_SET_VLAN_VID action was always placed in the Tx subflow.

Assuming a flow rule which matches VLAN traffic and has both
OF_SET_VLAN_VID action, and MODIFY_FIELD action on VLAN VID,
but no OF_PUSH_VLAN action, the following happened:

- MODIFY_FIELD action was placed in Rx subflow,
- OF_SET_VLAN_VID action was placed in Tx subflow,
- OF_SET_VLAN_VID action is internally compiled to a header modify
  command.

This caused the following issues:

1. Since OF_SET_VLAN_VID was placed in Tx subflow, 2 header modify
   actions were allocated. One for Rx and one for Tx.
2. If OF_SET_VLAN_VID action was placed before MODIFY_FIELD on VLAN VID,
   the flow rule executed header modifications in reverse order.
   MODIFY_FIELD actions were executed first in the Rx subflow and
   OF_SET_VLAN_VID was executed second in Tx subflow.

This patch fixes this behavior by not splitting hairpin flow rules
if OF_SET_VLAN_VID action is used without OF_PUSH_VLAN.
On top of that, if flow rule is split, the OF_SET_VLAN_VID action
is not moved to Tx subflow (for flow rules mentioned above).

Fixes: 210008309b45 ("net/mlx5: fix VLAN push action on hairpin queue")

Signed-off-by: Dariusz Sosnowski <dsosnowski@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index ba0983ddf0..df3a132ee4 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4219,4 +4219,5 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 	int action_n = 0;
 	int split = 0;
+	int push_vlan = 0;
 	const struct rte_flow_action_queue *queue;
 	const struct rte_flow_action_rss *rss;
@@ -4227,4 +4228,6 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 		return 0;
 	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+		if (actions->type == RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN)
+			push_vlan = 1;
 		switch (actions->type) {
 		case RTE_FLOW_ACTION_TYPE_QUEUE:
@@ -4251,9 +4254,13 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
 		case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
-		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
 		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
 			split++;
 			action_n++;
 			break;
+		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
+			if (push_vlan)
+				split++;
+			action_n++;
+			break;
 		case RTE_FLOW_ACTION_TYPE_RAW_ENCAP:
 			raw_encap = actions->conf;
@@ -4716,12 +4723,14 @@ flow_hairpin_split(struct rte_eth_dev *dev,
 	struct rte_flow_item *item;
 	char *addr;
+	int push_vlan = 0;
 	int encap = 0;
 
 	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+		if (actions->type == RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN)
+			push_vlan = 1;
 		switch (actions->type) {
 		case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
 		case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
 		case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
-		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
 		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
 			rte_memcpy(actions_tx, actions,
@@ -4729,4 +4738,15 @@ flow_hairpin_split(struct rte_eth_dev *dev,
 			actions_tx++;
 			break;
+		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
+			if (push_vlan) {
+				rte_memcpy(actions_tx, actions,
+					   sizeof(struct rte_flow_action));
+				actions_tx++;
+			} else {
+				rte_memcpy(actions_rx, actions,
+					   sizeof(struct rte_flow_action));
+				actions_rx++;
+			}
+			break;
 		case RTE_FLOW_ACTION_TYPE_COUNT:
 			if (encap) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.457112769 +0000
+++ 0015-net-mlx5-fix-hairpin-split-with-set-VLAN-VID-action.patch	2022-11-23 09:55:57.029149206 +0000
@@ -1 +1 @@
-From 5615d27b7a1bda7cc58ef07c2e77c6f9a7792c1d Mon Sep 17 00:00:00 2001
+From b4524bef61097f77c0296fba02f0025d7016b501 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5615d27b7a1bda7cc58ef07c2e77c6f9a7792c1d ]
+
@@ -38 +39,0 @@
-Cc: stable@dpdk.org
@@ -47 +48 @@
-index 65af1b4dd5..ea88882b88 100644
+index ba0983ddf0..df3a132ee4 100644
@@ -50 +51 @@
-@@ -4592,4 +4592,5 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -4219,4 +4219,5 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
@@ -56 +57 @@
-@@ -4600,4 +4601,6 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -4227,4 +4228,6 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
@@ -63 +64 @@
-@@ -4624,9 +4627,13 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -4251,9 +4254,13 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
@@ -78 +79 @@
-@@ -5089,12 +5096,14 @@ flow_hairpin_split(struct rte_eth_dev *dev,
+@@ -4716,12 +4723,14 @@ flow_hairpin_split(struct rte_eth_dev *dev,
@@ -94 +95 @@
-@@ -5102,4 +5111,15 @@ flow_hairpin_split(struct rte_eth_dev *dev,
+@@ -4729,4 +4738,15 @@ flow_hairpin_split(struct rte_eth_dev *dev,

patch 'net/mlx5: fix first segment inline length' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 4cce54a549ecfb02c1939097b36622ed9b4dbfda Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev@nvidia.com>
Date: Tue, 8 Nov 2022 15:45:00 +0200
Subject: [PATCH] net/mlx5: fix first segment inline length

[ upstream commit da4470cb178b87c9637cb575719e022182ea38da ]

Packets can be split into several mbufs with various data sizes.
There is no limitation on how small these segments can be.
But there is a limitation on Tx side for inline configuration:
send WQEs with inline headers less than the required are dropped.
The very first segment must be more than minimal inline eth segment.
Enforce this requirement by merging a few segments in this case.

Fixes: ec837ad0fc7c ("net/mlx5: fix multi-segment inline for the first segments")

Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_tx.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h
index 13d6d434d7..9e097944cd 100644
--- a/drivers/net/mlx5/mlx5_tx.h
+++ b/drivers/net/mlx5/mlx5_tx.h
@@ -1942,4 +1942,6 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq,
 			   nxlen > txq->inlen_send) {
 			return mlx5_tx_packet_multi_send(txq, loc, olx);
+		} else if (nxlen <= MLX5_ESEG_MIN_INLINE_SIZE) {
+			inlen = MLX5_ESEG_MIN_INLINE_SIZE;
 		} else {
 			goto do_first;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.483863865 +0000
+++ 0016-net-mlx5-fix-first-segment-inline-length.patch	2022-11-23 09:55:57.031149211 +0000
@@ -1 +1 @@
-From da4470cb178b87c9637cb575719e022182ea38da Mon Sep 17 00:00:00 2001
+From 4cce54a549ecfb02c1939097b36622ed9b4dbfda Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit da4470cb178b87c9637cb575719e022182ea38da ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 6471ebf59f..a44050a1ce 100644
+index 13d6d434d7..9e097944cd 100644
@@ -26 +27 @@
-@@ -1995,4 +1995,6 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq,
+@@ -1942,4 +1942,6 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq,

patch 'net/mlx5: fix indexed pool local cache crash' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 815d59452a8ac311bfdf0ea1858d64ddd482a859 Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev@nvidia.com>
Date: Wed, 9 Nov 2022 14:58:19 +0200
Subject: [PATCH] net/mlx5: fix indexed pool local cache crash

[ upstream commit 7869d603807c447f357ec3b35c193a1019e6e1b2 ]

Local cache for an indexed pool is not initialized in the situation when
all the indices are allocated on one CPU core and freed on another one.
That leads to a crash once we try to check its reference counter.
Check that the local cache is initialized before accessing this counter.

Fixes: d15c0946beea ("net/mlx5: add indexed pool local cache")

Signed-off-by: Alexander Kozyrev <akozyrev@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_utils.c b/drivers/net/mlx5/mlx5_utils.c
index 4115a2ad77..b295702fd4 100644
--- a/drivers/net/mlx5/mlx5_utils.c
+++ b/drivers/net/mlx5/mlx5_utils.c
@@ -480,5 +480,5 @@ _mlx5_ipool_free_cache(struct mlx5_indexed_pool *pool, int cidx, uint32_t idx)
 	gc = pool->gc;
 	if (ilc->lc != gc) {
-		if (!(--ilc->lc->ref_cnt))
+		if (ilc->lc && !(--ilc->lc->ref_cnt))
 			olc = ilc->lc;
 		gc->ref_cnt++;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.506144177 +0000
+++ 0017-net-mlx5-fix-indexed-pool-local-cache-crash.patch	2022-11-23 09:55:57.032149214 +0000
@@ -1 +1 @@
-From 7869d603807c447f357ec3b35c193a1019e6e1b2 Mon Sep 17 00:00:00 2001
+From 815d59452a8ac311bfdf0ea1858d64ddd482a859 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7869d603807c447f357ec3b35c193a1019e6e1b2 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org

patch 'net/mlx5: fix port initialization with small LRO' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 4f1a129761a4b93cba0b279d11c70a0c7635aa75 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Wed, 9 Nov 2022 18:50:38 +0200
Subject: [PATCH] net/mlx5: fix port initialization with small LRO

[ upstream commit b9f1f4c2394d1fd03ec2e27f8bad6c24153fa228 ]

If application provided maximal LRO size was less than expected PMD
minimum, the PMD either crashed with assert, if asserts were enabled,
or proceeded with port initialization to set port private maximal
LRO size below supported minimum.

The patch terminates port start if LRO size
does not match PMD requirements and TCP LRO offload was requested
at least for one Rx queue.

Fixes: 50c00baff763 ("net/mlx5: limit LRO size to maximum Rx packet")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_rxq.c     |  1 -
 drivers/net/mlx5/mlx5_trigger.c | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 4358671a60..0e14cd9393 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1535,5 +1535,4 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
 		max_lro_size -= MLX5_MAX_TCP_HDR_OFFSET;
 	max_lro_size = RTE_MIN(max_lro_size, MLX5_MAX_LRO_SIZE);
-	MLX5_ASSERT(max_lro_size >= MLX5_LRO_SEG_CHUNK_SIZE);
 	max_lro_size /= MLX5_LRO_SEG_CHUNK_SIZE;
 	if (priv->max_lro_msg_size)
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index 2ba456ad7a..4800624ea3 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -1090,4 +1090,20 @@ mlx5_dev_start(struct rte_eth_dev *dev)
 		rte_net_mlx5_dynf_inline_mask = 0;
 	if (dev->data->nb_rx_queues > 0) {
+		uint32_t max_lro_msg_size = priv->max_lro_msg_size;
+
+		if (max_lro_msg_size < MLX5_LRO_SEG_CHUNK_SIZE) {
+			uint32_t i;
+			struct mlx5_rxq_priv *rxq;
+
+			for (i = 0; i != priv->rxqs_n; ++i) {
+				rxq = mlx5_rxq_get(dev, i);
+				if (rxq && rxq->ctrl && rxq->ctrl->rxq.lro) {
+					DRV_LOG(ERR, "port %u invalid max LRO size",
+						dev->data->port_id);
+					rte_errno = EINVAL;
+					return -rte_errno;
+				}
+			}
+		}
 		ret = mlx5_dev_configure_rss_reta(dev);
 		if (ret) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.527101461 +0000
+++ 0018-net-mlx5-fix-port-initialization-with-small-LRO.patch	2022-11-23 09:55:57.035149221 +0000
@@ -1 +1 @@
-From b9f1f4c2394d1fd03ec2e27f8bad6c24153fa228 Mon Sep 17 00:00:00 2001
+From 4f1a129761a4b93cba0b279d11c70a0c7635aa75 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b9f1f4c2394d1fd03ec2e27f8bad6c24153fa228 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 0d9d11680b..724cd6c7e6 100644
+index 4358671a60..0e14cd9393 100644
@@ -29 +30 @@
-@@ -1534,5 +1534,4 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
+@@ -1535,5 +1535,4 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
@@ -36 +37 @@
-index 4b821a1076..71089299b8 100644
+index 2ba456ad7a..4800624ea3 100644
@@ -39 +40 @@
-@@ -1168,4 +1168,20 @@ continue_dev_start:
+@@ -1090,4 +1090,20 @@ mlx5_dev_start(struct rte_eth_dev *dev)

patch 'net/mlx5: fix drop action validation' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 3e76df459a703b7fa745053282ba13117d00ad9f Mon Sep 17 00:00:00 2001
From: Shun Hao <shunh@nvidia.com>
Date: Thu, 10 Nov 2022 08:59:21 +0200
Subject: [PATCH] net/mlx5: fix drop action validation

[ upstream commit e2b05b22ec5c8fbe35abf8a38e02bd2997e052a3 ]

Currently there's limitation for Drop action that can only co-exist with
Count action.

Sample and Age actions are also able to exist with Drop within the same
flow, and this patch includes them in the Drop action validation.

Fixes: 70faf9ae0a29 ("net/mlx5: unify validation of drop action")

Signed-off-by: Shun Hao <shunh@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.h    | 3 +++
 drivers/net/mlx5/mlx5_flow_dv.c | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 094e483325..7b5fde4823 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -268,4 +268,7 @@ enum mlx5_feature_name {
 #define MLX5_FLOW_ACTION_CT (1ull << 41)
 
+#define MLX5_FLOW_DROP_INCLUSIVE_ACTIONS \
+	(MLX5_FLOW_ACTION_COUNT | MLX5_FLOW_ACTION_SAMPLE | MLX5_FLOW_ACTION_AGE)
+
 #define MLX5_FLOW_FATE_ACTIONS \
 	(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index c3a2a658e1..4603736c28 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7916,5 +7916,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 	 * Validate the drop action mutual exclusion with other actions.
 	 * Drop action is mutually-exclusive with any other action, except for
-	 * Count action.
+	 * Count/Sample/Age actions.
 	 * Drop action compatibility with tunnel offload was already validated.
 	 */
@@ -7922,10 +7922,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 			    MLX5_FLOW_ACTION_TUNNEL_MATCH));
 	else if ((action_flags & MLX5_FLOW_ACTION_DROP) &&
-	    (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_COUNT)))
+	    (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_DROP_INCLUSIVE_ACTIONS)))
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION, NULL,
 					  "Drop action is mutually-exclusive "
 					  "with any other action, except for "
-					  "Count action");
+					  "Count/Sample/Age action");
 	/* Eswitch has few restrictions on using items and actions */
 	if (attr->transfer) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.549328687 +0000
+++ 0019-net-mlx5-fix-drop-action-validation.patch	2022-11-23 09:55:57.049149256 +0000
@@ -1 +1 @@
-From e2b05b22ec5c8fbe35abf8a38e02bd2997e052a3 Mon Sep 17 00:00:00 2001
+From 3e76df459a703b7fa745053282ba13117d00ad9f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e2b05b22ec5c8fbe35abf8a38e02bd2997e052a3 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 955383dd07..94e0ac99b9 100644
+index 094e483325..7b5fde4823 100644
@@ -26,2 +27,2 @@
-@@ -305,4 +305,7 @@ enum mlx5_feature_name {
- #define MLX5_FLOW_ACTION_INDIRECT_AGE (1ull << 44)
+@@ -268,4 +268,7 @@ enum mlx5_feature_name {
+ #define MLX5_FLOW_ACTION_CT (1ull << 41)
@@ -35 +36 @@
-index d79dd8d5f0..bc9a75f225 100644
+index c3a2a658e1..4603736c28 100644
@@ -38 +39 @@
-@@ -8104,5 +8104,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -7916,5 +7916,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -45 +46 @@
-@@ -8110,10 +8110,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -7922,10 +7922,10 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,

patch 'net/ice/base: fix duplicate flow rules' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 59f67d1041ec6f26a6a94b263781e3fa42fddc35 Mon Sep 17 00:00:00 2001
From: Yiding Zhou <yidingx.zhou@intel.com>
Date: Thu, 13 Oct 2022 14:21:13 +0800
Subject: [PATCH] net/ice/base: fix duplicate flow rules

[ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ]

When a vsi that already exists in the created vsi_list subscribes to the
same filter again, the return value ICE_SUCCESS results in duplicate flow
rules to be stored, which will cause 'flush' and 'destroy' errors.

Fixes: fed0c5ca5f19 ("net/ice/base: support programming a new switch recipe")

Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
Tested-by: Ke Xu <ke1.xu@intel.com>
---
 drivers/net/ice/base/ice_switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c
index c94d15934b..7c6a258255 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -8806,5 +8806,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
 		/* A rule already exists with the new VSI being added */
 		if (ice_is_bit_set(m_entry->vsi_list_info->vsi_map, vsi_handle))
-			return ICE_SUCCESS;
+			return ICE_ERR_ALREADY_EXISTS;
 
 		/* Update the previously created VSI list set with
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.581374246 +0000
+++ 0020-net-ice-base-fix-duplicate-flow-rules.patch	2022-11-23 09:55:57.055149272 +0000
@@ -1 +1 @@
-From 43d30256b215937d9d8b554d39ac91f1866b0e5a Mon Sep 17 00:00:00 2001
+From 59f67d1041ec6f26a6a94b263781e3fa42fddc35 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 43d30256b215937d9d8b554d39ac91f1866b0e5a ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 4b115ce660..a2581f404d 100644
+index c94d15934b..7c6a258255 100644
@@ -23 +24 @@
-@@ -8787,5 +8787,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
+@@ -8806,5 +8806,5 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,

patch 'net/iavf: fix VLAN offload' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 12164b4b184fcf8716fde5ebf849ca850955c780 Mon Sep 17 00:00:00 2001
From: Wenzhuo Lu <wenzhuo.lu@intel.com>
Date: Wed, 2 Nov 2022 08:28:56 +0800
Subject: [PATCH] net/iavf: fix VLAN offload

[ upstream commit 5cbfb386aa3f4c49b3cd9579e4e928cc5ab08d35 ]

HW VLAN offload cannot be enabled because the HW capability flags
are not set correctly.

Fixes: eff56a7b9f97 ("net/iavf: add offload path for Rx AVX512")

Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index f835457e4f..630779fb21 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1095,4 +1095,5 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 		RTE_ETH_RX_OFFLOAD_SCATTER |
 		RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
+		RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
 		RTE_ETH_RX_OFFLOAD_RSS_HASH;
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.606224759 +0000
+++ 0021-net-iavf-fix-VLAN-offload.patch	2022-11-23 09:55:57.057149277 +0000
@@ -1 +1 @@
-From 5cbfb386aa3f4c49b3cd9579e4e928cc5ab08d35 Mon Sep 17 00:00:00 2001
+From 12164b4b184fcf8716fde5ebf849ca850955c780 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5cbfb386aa3f4c49b3cd9579e4e928cc5ab08d35 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 8d9f3a6d3d..3196210f2c 100644
+index f835457e4f..630779fb21 100644
@@ -22 +23 @@
-@@ -1126,4 +1126,5 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+@@ -1095,4 +1095,5 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)

patch 'net/i40e: fix pctype configuration for X722' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 43acbdad2296d50bc24f64c444282ca9414879d6 Mon Sep 17 00:00:00 2001
From: Mingjin Ye <mingjinx.ye@intel.com>
Date: Thu, 3 Nov 2022 16:57:15 +0000
Subject: [PATCH] net/i40e: fix pctype configuration for X722

[ upstream commit b95179d139fe8ea63de69aa9b500fcec70a0e7f7 ]

To make X722's PCTYPE is compatible with X710, the PCTYPE in the
FD programming descriptor is translated into different types by using
GLQF_FD_PCTYPE table. But the types of 'UNICAST_IPV4_UDP'
and 'MULTICAST_IPV4_UDP' are only supported for X722, so that
the corresponding registers can not be configured after translation.

This patch removes the transition before the FD filter is programmed.

Fixes: ef4c16fd9148 ("net/i40e: refactor RSS flow")

Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
Tested-by: Lingli Chen <linglix.chen@intel.com>
---
 drivers/net/i40e/i40e_hash.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/i40e/i40e_hash.c b/drivers/net/i40e/i40e_hash.c
index a1ff85fceb..0c84818977 100644
--- a/drivers/net/i40e/i40e_hash.c
+++ b/drivers/net/i40e/i40e_hash.c
@@ -660,8 +660,4 @@ i40e_hash_config_pctype_symmetric(struct i40e_hw *hw,
 	uint32_t reg;
 
-	/* For X722, get translated pctype in fd pctype register */
-	if (hw->mac.type == I40E_MAC_X722)
-		pctype = i40e_read_rx_ctl(hw, I40E_GLQF_FD_PCTYPES(pctype));
-
 	reg = i40e_read_rx_ctl(hw, I40E_GLQF_HSYM(pctype));
 	if (symmetric) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.628062103 +0000
+++ 0022-net-i40e-fix-pctype-configuration-for-X722.patch	2022-11-23 09:55:57.058149279 +0000
@@ -1 +1 @@
-From b95179d139fe8ea63de69aa9b500fcec70a0e7f7 Mon Sep 17 00:00:00 2001
+From 43acbdad2296d50bc24f64c444282ca9414879d6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b95179d139fe8ea63de69aa9b500fcec70a0e7f7 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org

patch 'net/ice: fix scalar Rx path segment' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From da678c35428a9e7fddc1495149ca8ad08cff35d7 Mon Sep 17 00:00:00 2001
From: Mingjin Ye <mingjinx.ye@intel.com>
Date: Fri, 11 Nov 2022 12:04:00 +0000
Subject: [PATCH] net/ice: fix scalar Rx path segment

[ upstream commit 90ba4442058a14763e57ca96d03ab1e6044e3e5c ]

CRC is stripped by the hardware in the scattered Rx path. The last buffer
is invalid if it's packet length is zero.

This patch adds a judgment for the last buffer length to fix this issue,
it would free the mbuf associated to the last one if the last buffer is
empty.

Fixes: 6eac0b7fde95 ("net/ice: support advance Rx/Tx")

Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 7675f8c405..b91e6eaad5 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1967,4 +1967,8 @@ ice_recv_scattered_pkts(void *rx_queue,
 				rxm->data_len = (uint16_t)(rx_packet_len -
 							   RTE_ETHER_CRC_LEN);
+		} else if (rx_packet_len == 0) {
+			rte_pktmbuf_free_seg(rxm);
+			first_seg->nb_segs--;
+			last_seg->next = NULL;
 		}
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.648622457 +0000
+++ 0023-net-ice-fix-scalar-Rx-path-segment.patch	2022-11-23 09:55:57.061149287 +0000
@@ -1 +1 @@
-From 90ba4442058a14763e57ca96d03ab1e6044e3e5c Mon Sep 17 00:00:00 2001
+From da678c35428a9e7fddc1495149ca8ad08cff35d7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 90ba4442058a14763e57ca96d03ab1e6044e3e5c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index cd046a3432..3224a02db2 100644
+index 7675f8c405..b91e6eaad5 100644
@@ -26 +27 @@
-@@ -2114,4 +2114,8 @@ ice_recv_scattered_pkts(void *rx_queue,
+@@ -1967,4 +1967,8 @@ ice_recv_scattered_pkts(void *rx_queue,

patch 'net/ice: fix scalar Tx path segment' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 1f7763504a9acc4f793b60ceee2c6b101e7c7b1d Mon Sep 17 00:00:00 2001
From: Mingjin Ye <mingjinx.ye@intel.com>
Date: Fri, 11 Nov 2022 16:12:41 +0000
Subject: [PATCH] net/ice: fix scalar Tx path segment

[ upstream commit 688cb2f2c61e48552fb9a211fdcfdb754a795b40 ]

The scalar Tx path would send empty buffer that causes the Tx queue to
overflow.

This patch adds the last buffer length judgment in tx_prepare to fix this
issue, rte_errno will be set to EINVAL and returned if the last buffer is
empty.

Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx")
Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes")

Signed-off-by: Mingjin Ye <mingjinx.ye@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index b91e6eaad5..ae2701f5e4 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -3460,4 +3460,20 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq)
 #define ICE_MAX_TSO_MSS            9728
 #define ICE_MAX_TSO_FRAME_SIZE     262144
+
+/*Check for empty mbuf*/
+static inline uint16_t
+ice_check_empty_mbuf(struct rte_mbuf *tx_pkt)
+{
+	struct rte_mbuf *txd = tx_pkt;
+
+	while (txd != NULL) {
+		if (txd->data_len == 0)
+			return -1;
+		txd = txd->next;
+	}
+
+	return 0;
+}
+
 uint16_t
 ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -3506,4 +3522,10 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 			return i;
 		}
+
+		if (ice_check_empty_mbuf(m) != 0) {
+			rte_errno = EINVAL;
+			PMD_DRV_LOG(ERR, "INVALID mbuf:	last mbuf data_len=[0]");
+			return i;
+		}
 	}
 	return i;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.670765585 +0000
+++ 0024-net-ice-fix-scalar-Tx-path-segment.patch	2022-11-23 09:55:57.063149292 +0000
@@ -1 +1 @@
-From 688cb2f2c61e48552fb9a211fdcfdb754a795b40 Mon Sep 17 00:00:00 2001
+From 1f7763504a9acc4f793b60ceee2c6b101e7c7b1d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 688cb2f2c61e48552fb9a211fdcfdb754a795b40 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 3224a02db2..0ea0045836 100644
+index b91e6eaad5..ae2701f5e4 100644
@@ -27 +28 @@
-@@ -3646,4 +3646,20 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq)
+@@ -3460,4 +3460,20 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq)
@@ -48 +49 @@
-@@ -3692,4 +3708,10 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -3506,4 +3522,10 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,

patch 'net/ice: fix interrupt handler unregister' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From b0df64d8a26ae8da6a1f3054858e18306920f3b1 Mon Sep 17 00:00:00 2001
From: Frank Du <frank.du@intel.com>
Date: Mon, 14 Nov 2022 15:03:29 +0800
Subject: [PATCH] net/ice: fix interrupt handler unregister

[ upstream commit 63bd26448539e8cd6da6813807f47eaaca616390 ]

rte_intr_callback_unregister may fail when irq cb is in handling,
use sync version to make sure unregister successfully.

Fixes: cf911d90e366 ("net/ice: support link update")

Signed-off-by: Frank Du <frank.du@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index fb2b1998f2..08edca79ce 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2457,10 +2457,15 @@ ice_dev_close(struct rte_eth_dev *dev)
 
 	/* Since stop will make link down, then the link event will be
-	 * triggered, disable the irq firstly to avoid the port_infoe etc
-	 * resources deallocation causing the interrupt service thread
-	 * crash.
+	 * triggered, disable the irq firstly.
 	 */
 	ice_pf_disable_irq0(hw);
 
+	/* Unregister callback func from eal lib, use sync version to
+	 * make sure all active interrupt callbacks is done, then it's
+	 * safe to free all resources.
+	 */
+	rte_intr_callback_unregister_sync(intr_handle,
+					  ice_interrupt_handler, dev);
+
 	ret = ice_dev_stop(dev);
 
@@ -2494,8 +2499,4 @@ ice_dev_close(struct rte_eth_dev *dev)
 	rte_intr_disable(intr_handle);
 
-	/* unregister callback func from eal lib */
-	rte_intr_callback_unregister(intr_handle,
-				     ice_interrupt_handler, dev);
-
 	return ret;
 }
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.693351158 +0000
+++ 0025-net-ice-fix-interrupt-handler-unregister.patch	2022-11-23 09:55:57.066149299 +0000
@@ -1 +1 @@
-From 63bd26448539e8cd6da6813807f47eaaca616390 Mon Sep 17 00:00:00 2001
+From b0df64d8a26ae8da6a1f3054858e18306920f3b1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 63bd26448539e8cd6da6813807f47eaaca616390 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 7294f38edc..0bc739daf0 100644
+index fb2b1998f2..08edca79ce 100644
@@ -22 +23 @@
-@@ -2556,10 +2556,15 @@ ice_dev_close(struct rte_eth_dev *dev)
+@@ -2457,10 +2457,15 @@ ice_dev_close(struct rte_eth_dev *dev)
@@ -41 +42 @@
-@@ -2596,8 +2601,4 @@ ice_dev_close(struct rte_eth_dev *dev)
+@@ -2494,8 +2499,4 @@ ice_dev_close(struct rte_eth_dev *dev)

patch 'ci: bump versions of actions in GHA' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 852ba6cf8429c21ba088e9306fe3913b746bc498 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 12 Oct 2022 18:29:41 +0200
Subject: [PATCH] ci: bump versions of actions in GHA

[ upstream commit 95da49a9eab3d8c97b7b1d8b047f8c895e3d5fce ]

GitHub started deprecating GHA actions based on Node 12 [1].
For now, only warnings are raised, but we might as well switch to v3
versions of the common actions, now.

1: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 .github/workflows/build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e9c4be6d0..a715a7d455 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,5 +74,5 @@ jobs:
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Generate cache keys
       id: get_ref_keys
@@ -85,5 +85,5 @@ jobs:
         echo 'abi-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-${{ env.LIBABIGAIL_VERSION }}-${{ env.REF_GIT_TAG }}'
     - name: Retrieve ccache cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.ccache
@@ -93,5 +93,5 @@ jobs:
     - name: Retrieve libabigail cache
       id: libabigail-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       if: env.ABI_CHECKS == 'true'
       with:
@@ -99,5 +99,5 @@ jobs:
         key: ${{ steps.get_ref_keys.outputs.libabigail }}
     - name: Retrieve ABI reference cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       if: env.ABI_CHECKS == 'true'
       with:
@@ -142,5 +142,5 @@ jobs:
     - name: Upload logs on failure
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: meson-logs-${{ join(matrix.config.*, '-') }}
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.716620842 +0000
+++ 0026-ci-bump-versions-of-actions-in-GHA.patch	2022-11-23 09:55:57.066149299 +0000
@@ -1 +1 @@
-From 95da49a9eab3d8c97b7b1d8b047f8c895e3d5fce Mon Sep 17 00:00:00 2001
+From 852ba6cf8429c21ba088e9306fe3913b746bc498 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 95da49a9eab3d8c97b7b1d8b047f8c895e3d5fce ]
+
@@ -12,2 +13,0 @@
-Cc: stable@dpdk.org
-
@@ -16,2 +16,2 @@
- .github/workflows/build.yml | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
+ .github/workflows/build.yml | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
@@ -20 +20 @@
-index a595c12354..e27a2642c8 100644
+index 2e9c4be6d0..a715a7d455 100644
@@ -23 +23 @@
-@@ -63,5 +63,5 @@ jobs:
+@@ -74,5 +74,5 @@ jobs:
@@ -30 +30 @@
-@@ -74,5 +74,5 @@ jobs:
+@@ -85,5 +85,5 @@ jobs:
@@ -37 +37 @@
-@@ -82,5 +82,5 @@ jobs:
+@@ -93,5 +93,5 @@ jobs:
@@ -44 +44 @@
-@@ -88,5 +88,5 @@ jobs:
+@@ -99,5 +99,5 @@ jobs:
@@ -51 +51 @@
-@@ -135,5 +135,5 @@ jobs:
+@@ -142,5 +142,5 @@ jobs:
@@ -58,35 +57,0 @@
-@@ -162,5 +162,5 @@ jobs:
-     - name: Retrieve image cache
-       id: image_cache
--      uses: actions/cache@v2
-+      uses: actions/cache@v3
-       with:
-         path: ~/.image
-@@ -208,5 +208,5 @@ jobs:
-     steps:
-     - name: Checkout sources
--      uses: actions/checkout@v2
-+      uses: actions/checkout@v3
-     - name: Generate various keys
-       id: get_keys
-@@ -220,5 +220,5 @@ jobs:
-     - name: Retrieve image cache
-       id: image_cache
--      uses: actions/cache@v2
-+      uses: actions/cache@v3
-       with:
-         path: ~/.image
-@@ -230,5 +230,5 @@ jobs:
-         false
-     - name: Retrieve ccache cache
--      uses: actions/cache@v2
-+      uses: actions/cache@v3
-       with:
-         path: ~/.ccache
-@@ -267,5 +267,5 @@ jobs:
-     - name: Upload logs on failure
-       if: failure()
--      uses: actions/upload-artifact@v2
-+      uses: actions/upload-artifact@v3
-       with:
-         name: ${{ steps.get_keys.outputs.logs }}

patch 'ci: update to new API for step outputs in GHA' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From fd7eb800f4f3dce7ec9c092c477810d9276251c1 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 12 Oct 2022 18:29:42 +0200
Subject: [PATCH] ci: update to new API for step outputs in GHA

[ upstream commit 1e249e0b47456b164a3139cdc85dc0ea20cbfeff ]

GitHub actions deprecated use of set-output [1], replaced with
GITHUB_OUTPUT.

1: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 .github/workflows/build.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a715a7d455..21414e9c17 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -78,10 +78,7 @@ jobs:
       id: get_ref_keys
       run: |
-        echo -n '::set-output name=ccache::'
-        echo 'ccache-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-'$(date -u +%Y-w%W)
-        echo -n '::set-output name=libabigail::'
-        echo 'libabigail-${{ matrix.config.os }}'
-        echo -n '::set-output name=abi::'
-        echo 'abi-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-${{ env.LIBABIGAIL_VERSION }}-${{ env.REF_GIT_TAG }}'
+        echo 'ccache=ccache-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-'$(date -u +%Y-w%W) >> $GITHUB_OUTPUT
+        echo 'libabigail=libabigail-${{ matrix.config.os }}' >> $GITHUB_OUTPUT
+        echo 'abi=abi-${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ matrix.config.cross }}-${{ env.LIBABIGAIL_VERSION }}-${{ env.REF_GIT_TAG }}' >> $GITHUB_OUTPUT
     - name: Retrieve ccache cache
       uses: actions/cache@v3
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.736894718 +0000
+++ 0027-ci-update-to-new-API-for-step-outputs-in-GHA.patch	2022-11-23 09:55:57.067149302 +0000
@@ -1 +1 @@
-From 1e249e0b47456b164a3139cdc85dc0ea20cbfeff Mon Sep 17 00:00:00 2001
+From fd7eb800f4f3dce7ec9c092c477810d9276251c1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1e249e0b47456b164a3139cdc85dc0ea20cbfeff ]
+
@@ -11,2 +12,0 @@
-Cc: stable@dpdk.org
-
@@ -15,2 +15,2 @@
- .github/workflows/build.yml | 21 +++++++--------------
- 1 file changed, 7 insertions(+), 14 deletions(-)
+ .github/workflows/build.yml | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
@@ -19 +19 @@
-index e27a2642c8..82d83f4030 100644
+index a715a7d455..21414e9c17 100644
@@ -22 +22 @@
-@@ -67,10 +67,7 @@ jobs:
+@@ -78,10 +78,7 @@ jobs:
@@ -36,22 +35,0 @@
-@@ -158,6 +155,5 @@ jobs:
-       id: get_keys
-       run: |
--        echo -n '::set-output name=image::'
--        echo 'image-${{ matrix.config.image }}-'$(date -u +%Y-%m-%d)
-+        echo 'image=image-${{ matrix.config.image }}-'$(date -u +%Y-%m-%d) >> $GITHUB_OUTPUT
-     - name: Retrieve image cache
-       id: image_cache
-@@ -212,10 +208,7 @@ jobs:
-       id: get_keys
-       run: |
--        echo -n '::set-output name=ccache::'
--        echo 'ccache-${{ matrix.config.image }}-${{ matrix.config.compiler }}-'$(date -u +%Y-w%W)
--        echo -n '::set-output name=image::'
--        echo 'image-${{ matrix.config.image }}-'$(date -u +%Y-%m-%d)
--        echo -n '::set-output name=logs::'
--        echo 'meson-logs-${{ join(matrix.config.*, '-') }}' | tr -d ':'
-+        echo 'ccache=ccache-${{ matrix.config.image }}-${{ matrix.config.compiler }}-'$(date -u +%Y-w%W) >> $GITHUB_OUTPUT
-+        echo 'image=image-${{ matrix.config.image }}-'$(date -u +%Y-%m-%d) >> $GITHUB_OUTPUT
-+        echo 'logs=meson-logs-${{ join(matrix.config.*, '-') }}' | tr -d ':' >> $GITHUB_OUTPUT
-     - name: Retrieve image cache
-       id: image_cache

patch 'doc: fix event timer adapter guide' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 40f8ea78a9b3390e885e58c8c25394998da9dc73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom@ericsson.com>
Date: Fri, 4 Nov 2022 07:52:37 +0100
Subject: [PATCH] doc: fix event timer adapter guide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 4109d71e5211e107e0524c40f77bccc32af7a3d8 ]

In the example:
* Properly initialize the socket id field.
* Remove comments redundant and/or not consistent with the code. 180
  seconds is not 2 minutes.
* Remove redundant pointer initialization.

In both the example and text, the flags field of the conf struct was
erroneously referred to as timer_adapter_flags and the max_tmo_ns
field as max_tmo_nsec.

Fixes: 30e7fbd62839 ("doc: add event timer adapter guide")

Signed-off-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
Acked-by: Erik Gabriel Carrillo <erik.g.carrillo@intel.com>
---
 doc/guides/prog_guide/event_timer_adapter.rst | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst
index 7547059a05..d7307a29bb 100644
--- a/doc/guides/prog_guide/event_timer_adapter.rst
+++ b/doc/guides/prog_guide/event_timer_adapter.rst
@@ -108,16 +108,17 @@ to ``rte_event_timer_adapter_create()``.
 .. code-block:: c
 
-	#define NSECPERSEC 1E9 // No of ns in 1 sec
+	#define NSECPERSEC 1E9
 	const struct rte_event_timer_adapter_conf adapter_config = {
                 .event_dev_id = event_dev_id,
                 .timer_adapter_id = 0,
+		.socket_id = rte_socket_id(),
                 .clk_src = RTE_EVENT_TIMER_ADAPTER_CPU_CLK,
-                .timer_tick_ns = NSECPERSEC / 10, // 100 milliseconds
-                .max_tmo_nsec = 180 * NSECPERSEC // 2 minutes
+                .timer_tick_ns = NSECPERSEC / 10,
+                .max_tmo_ns = 180 * NSECPERSEC,
                 .nb_timers = 40000,
-                .timer_adapter_flags = 0,
+                .flags = 0,
 	};
 
-	struct rte_event_timer_adapter *adapter = NULL;
+	struct rte_event_timer_adapter *adapter;
 	adapter = rte_event_timer_adapter_create(&adapter_config);
 
@@ -146,7 +147,7 @@ time interval repeatedly till it is cancelled. A non-periodic timer expires only
 once. The periodic capability flag, ``RTE_EVENT_TIMER_ADAPTER_CAP_PERIODIC``,
 can be set for implementations that support periodic mode if desired. To
-configure an adapter in periodic mode, ``timer_adapter_flags`` of
+configure an adapter in periodic mode, ``flags`` of
 ``rte_event_timer_adapter_conf`` is set to include the periodic flag
-``RTE_EVENT_TIMER_ADAPTER_F_PERIODIC``. Maximum timeout (``max_tmo_nsec``) does
+``RTE_EVENT_TIMER_ADAPTER_F_PERIODIC``. Maximum timeout (``max_tmo_ns``) does
 not apply to periodic mode.
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.757168014 +0000
+++ 0028-doc-fix-event-timer-adapter-guide.patch	2022-11-23 09:55:57.067149302 +0000
@@ -1 +1 @@
-From 4109d71e5211e107e0524c40f77bccc32af7a3d8 Mon Sep 17 00:00:00 2001
+From 40f8ea78a9b3390e885e58c8c25394998da9dc73 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 4109d71e5211e107e0524c40f77bccc32af7a3d8 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org

patch 'event/cnxk: fix mbuf offset calculation' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 80dfbebe4faa049758725e23d347ef1c9821018b Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Tue, 25 Oct 2022 21:41:29 +0530
Subject: [PATCH] event/cnxk: fix mbuf offset calculation

[ upstream commit 9b70a944b4d10ebb1afab6228fe14365a11e56ad ]

Fix incorrect mbuf offset calculation when HEADROOM exceeds 128B
while processing event vectors.

Fixes: 7fbbc981d54f ("event/cnxk: support vectorized Rx event fast path")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 drivers/net/cnxk/cn10k_rx.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
index 034e95186b..058221034a 100644
--- a/drivers/net/cnxk/cn10k_rx.h
+++ b/drivers/net/cnxk/cn10k_rx.h
@@ -637,7 +637,9 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
 		} else {
 			mbuf01 =
-				vsubq_u64(vld1q_u64((uint64_t *)cq0), data_off);
-			mbuf23 = vsubq_u64(vld1q_u64((uint64_t *)(cq0 + 16)),
-					   data_off);
+				vsubq_u64(vld1q_u64((uint64_t *)cq0),
+					  vdupq_n_u64(sizeof(struct rte_mbuf)));
+			mbuf23 =
+				vsubq_u64(vld1q_u64((uint64_t *)(cq0 + 16)),
+					  vdupq_n_u64(sizeof(struct rte_mbuf)));
 		}
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.777790592 +0000
+++ 0029-event-cnxk-fix-mbuf-offset-calculation.patch	2022-11-23 09:55:57.068149304 +0000
@@ -1 +1 @@
-From 9b70a944b4d10ebb1afab6228fe14365a11e56ad Mon Sep 17 00:00:00 2001
+From 80dfbebe4faa049758725e23d347ef1c9821018b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9b70a944b4d10ebb1afab6228fe14365a11e56ad ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 4e22ceda02..721127dddd 100644
+index 034e95186b..058221034a 100644
@@ -21 +22 @@
-@@ -1204,7 +1204,9 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
+@@ -637,7 +637,9 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,

patch 'app/eventdev: fix limits in error message' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 7773bb2b9a3cb4b3bb97baad0ae983b8b363b95a Mon Sep 17 00:00:00 2001
From: Volodymyr Fialko <vfialko@marvell.com>
Date: Mon, 31 Oct 2022 11:39:06 +0100
Subject: [PATCH] app/eventdev: fix limits in error message

[ upstream commit 5f111f924f1c1a0dc3a4737f62ed2b8cab058d68 ]

Swap min and max values to match their labels.

Fixes: 2eaa37b86635 ("app/eventdev: add vector mode in pipeline test")

Signed-off-by: Volodymyr Fialko <vfialko@marvell.com>
Acked-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 app/test-eventdev/test_pipeline_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-eventdev/test_pipeline_common.c b/app/test-eventdev/test_pipeline_common.c
index ddaa9f3fdb..7e745899c5 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -373,6 +373,6 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, uint8_t stride,
 			    opt->vector_size > limits.max_sz) {
 				evt_err("Vector size [%d] not within limits max[%d] min[%d]",
-					opt->vector_size, limits.min_sz,
-					limits.max_sz);
+					opt->vector_size, limits.max_sz,
+					limits.min_sz);
 				return -EINVAL;
 			}
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.799040445 +0000
+++ 0030-app-eventdev-fix-limits-in-error-message.patch	2022-11-23 09:55:57.069149307 +0000
@@ -1 +1 @@
-From 5f111f924f1c1a0dc3a4737f62ed2b8cab058d68 Mon Sep 17 00:00:00 2001
+From 7773bb2b9a3cb4b3bb97baad0ae983b8b363b95a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5f111f924f1c1a0dc3a4737f62ed2b8cab058d68 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 2a6f4ba3a8..b111690b7c 100644
+index ddaa9f3fdb..7e745899c5 100644
@@ -21 +22 @@
-@@ -535,6 +535,6 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, uint8_t stride,
+@@ -373,6 +373,6 @@ pipeline_event_rx_adapter_setup(struct evt_options *opt, uint8_t stride,

patch 'event/cnxk: fix missing mempool cookie marking' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From c8812bd8ec21b091690e521eceb6da45c01e700a Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Thu, 3 Nov 2022 21:46:31 +0530
Subject: [PATCH] event/cnxk: fix missing mempool cookie marking

[ upstream commit b33d79af2ecaf284c0502c72093a2d2bb9034fd2 ]

Mark chunks mempool objects as "put" as they are freed to NPA
automatically when they are parsed by TIM HW.

Fixes: 300b796262a1 ("event/cnxk: add timer arm routine")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 drivers/event/cnxk/cnxk_tim_worker.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/event/cnxk/cnxk_tim_worker.h b/drivers/event/cnxk/cnxk_tim_worker.h
index 0c9f29cfbe..2a6aa9eab2 100644
--- a/drivers/event/cnxk/cnxk_tim_worker.h
+++ b/drivers/event/cnxk/cnxk_tim_worker.h
@@ -217,4 +217,5 @@ cnxk_tim_insert_chunk(struct cnxk_tim_bkt *const bkt,
 		return NULL;
 
+	RTE_MEMPOOL_CHECK_COOKIES(tim_ring->chunk_pool, (void **)&chunk, 1, 0);
 	*(uint64_t *)(chunk + tim_ring->nb_chunk_slots) = 0;
 	if (bkt->nb_entry) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.819101154 +0000
+++ 0031-event-cnxk-fix-missing-mempool-cookie-marking.patch	2022-11-23 09:55:57.070149309 +0000
@@ -1 +1 @@
-From b33d79af2ecaf284c0502c72093a2d2bb9034fd2 Mon Sep 17 00:00:00 2001
+From c8812bd8ec21b091690e521eceb6da45c01e700a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b33d79af2ecaf284c0502c72093a2d2bb9034fd2 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 8d8ed1d3a1..eda84c6f31 100644
+index 0c9f29cfbe..2a6aa9eab2 100644
@@ -21 +22 @@
-@@ -218,4 +218,5 @@ cnxk_tim_insert_chunk(struct cnxk_tim_bkt *const bkt,
+@@ -217,4 +217,5 @@ cnxk_tim_insert_chunk(struct cnxk_tim_bkt *const bkt,

patch 'examples/fips_validation: fix typo in error log' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From aaf49e83ab1ba63bca7813f98e23594f8dfd1b49 Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Date: Mon, 7 Nov 2022 10:03:30 +0000
Subject: [PATCH] examples/fips_validation: fix typo in error log

[ upstream commit 8782b3b64b4c38c0e2d4cf5bda2795ddd268cf41 ]

Digest length is being printed out, not IV length.

Fixes: ac026f4668d0 ("examples/fips_validation: support CMAC parsing")
Fixes: f64adb6714e0 ("examples/fips_validation: support HMAC parsing")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Reviewed-by: Brian Dooley <brian.dooley@intel.com>
---
 examples/fips_validation/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index dc40bffe7d..e8223206f2 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -864,5 +864,5 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
 			auth_xform->key.length,
 			auth_xform->digest_length, 0) != 0) {
-		RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
+		RTE_LOG(ERR, USER1, "PMD %s key length %u Digest length %u\n",
 				info.device_name, auth_xform->key.length,
 				auth_xform->digest_length);
@@ -993,5 +993,5 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform)
 			auth_xform->key.length,
 			auth_xform->digest_length, 0) != 0) {
-		RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
+		RTE_LOG(ERR, USER1, "PMD %s key length %u Digest length %u\n",
 				info.device_name, auth_xform->key.length,
 				auth_xform->digest_length);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.839593611 +0000
+++ 0032-examples-fips_validation-fix-typo-in-error-log.patch	2022-11-23 09:55:57.071149312 +0000
@@ -1 +1 @@
-From 8782b3b64b4c38c0e2d4cf5bda2795ddd268cf41 Mon Sep 17 00:00:00 2001
+From aaf49e83ab1ba63bca7813f98e23594f8dfd1b49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8782b3b64b4c38c0e2d4cf5bda2795ddd268cf41 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 404a29d7b6..9a9babb53a 100644
+index dc40bffe7d..e8223206f2 100644
@@ -22 +23 @@
-@@ -1211,5 +1211,5 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
+@@ -864,5 +864,5 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
@@ -29 +30 @@
-@@ -1340,5 +1340,5 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform)
+@@ -993,5 +993,5 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform)

patch 'mempool/cnxk: fix destroying empty pool' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 08a6a565e788c323ce732422836b56dadb267e26 Mon Sep 17 00:00:00 2001
From: Ashwin Sekhar T K <asekhar@marvell.com>
Date: Tue, 8 Nov 2022 12:25:58 +0530
Subject: [PATCH] mempool/cnxk: fix destroying empty pool

[ upstream commit 3af7276eafaf41a93e83a04636c1542e7c82018a ]

In scenarios where rte_mempool_free() is called immediately
after rte_mempool_create_empty(), the NPA pool will not be
created. In such cases the free path should not call
roc_npa_pool_destroy().

Fixes: bbf19e89b87c ("mempool/cnxk: add generic operations")

Signed-off-by: Ashwin Sekhar T K <asekhar@marvell.com>
---
 drivers/mempool/cnxk/cnxk_mempool_ops.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/mempool/cnxk/cnxk_mempool_ops.c b/drivers/mempool/cnxk/cnxk_mempool_ops.c
index c7b75f026d..b3592d91dc 100644
--- a/drivers/mempool/cnxk/cnxk_mempool_ops.c
+++ b/drivers/mempool/cnxk/cnxk_mempool_ops.c
@@ -124,4 +124,12 @@ cnxk_mempool_free(struct rte_mempool *mp)
 
 	plt_npa_dbg("aura_handle=0x%" PRIx64, mp->pool_id);
+
+	/* It can happen that rte_mempool_free() is called immediately after
+	 * rte_mempool_create_empty(). In such cases the NPA pool will not be
+	 * allocated.
+	 */
+	if (roc_npa_aura_handle_to_base(mp->pool_id) == 0)
+		return;
+
 	rc = roc_npa_pool_destroy(mp->pool_id);
 	if (rc)
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.860284485 +0000
+++ 0033-mempool-cnxk-fix-destroying-empty-pool.patch	2022-11-23 09:55:57.071149312 +0000
@@ -1 +1 @@
-From 3af7276eafaf41a93e83a04636c1542e7c82018a Mon Sep 17 00:00:00 2001
+From 08a6a565e788c323ce732422836b56dadb267e26 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3af7276eafaf41a93e83a04636c1542e7c82018a ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index a0b94bb95c..3769afd3d1 100644
+index c7b75f026d..b3592d91dc 100644
@@ -23 +24 @@
-@@ -127,4 +127,12 @@ cnxk_mempool_free(struct rte_mempool *mp)
+@@ -124,4 +124,12 @@ cnxk_mempool_free(struct rte_mempool *mp)

patch 'doc: fix application name in procinfo guide' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 1c94187eec0a76e40cc595583713f8abd443f250 Mon Sep 17 00:00:00 2001
From: Dongdong Liu <liudongdong3@huawei.com>
Date: Tue, 11 Oct 2022 19:18:43 +0800
Subject: [PATCH] doc: fix application name in procinfo guide

[ upstream commit 2a65f12f6ab461e2cb81192c6bdd136191c82ea9 ]

In commit 996ef1176111 ("app: add all remaining apps to meson build"),
building the procinfo application through Meson has been done with a
binary name different from the previous Makefile build system [1].

When we dropped Makefile support, the documentation was not updated.

Fixes: 3cc6ecfdfe85 ("build: remove makefiles")

Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 doc/guides/tools/proc_info.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst
index 9772d97ef0..e4f0c83f1b 100644
--- a/doc/guides/tools/proc_info.rst
+++ b/doc/guides/tools/proc_info.rst
@@ -2,8 +2,8 @@
     Copyright(c) 2015 Intel Corporation.
 
-dpdk-procinfo Application
-=========================
+dpdk-proc-info Application
+==========================
 
-The dpdk-procinfo application is a Data Plane Development Kit (DPDK) application
+The dpdk-proc-info application is a Data Plane Development Kit (DPDK) application
 that runs as a DPDK secondary process and is capable of retrieving port
 statistics, resetting port statistics, printing DPDK memory information and
@@ -18,5 +18,5 @@ The application has a number of command line options:
 .. code-block:: console
 
-   ./<build_dir>/app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats |
+   ./<build_dir>/app/dpdk-proc-info -- -m | [-p PORTMASK] [--stats | --xstats |
    --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto |
    --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ]
@@ -73,13 +73,13 @@ Limitations
 -----------
 
-* dpdk-procinfo should run alongside primary process with same DPDK version.
+* dpdk-proc-info should run alongside primary process with same DPDK version.
 
-* When running ``dpdk-procinfo`` with shared library mode, it is required to
+* When running ``dpdk-proc-info`` with shared library mode, it is required to
   pass the same NIC PMD libraries as used for the primary application. Any
   mismatch in PMD library arguments can lead to undefined behavior and results
   affecting primary application too.
 
-* Stats retrieval using ``dpdk-procinfo`` is not supported for virtual devices like PCAP and TAP.
+* Stats retrieval using ``dpdk-proc-info`` is not supported for virtual devices like PCAP and TAP.
 
-* Since default DPDK EAL arguments for ``dpdk-procinfo`` are ``-c1, -n4 & --proc-type=secondary``,
+* Since default DPDK EAL arguments for ``dpdk-proc-info`` are ``-c1, -n4 & --proc-type=secondary``,
   It is not expected that the user passes any EAL arguments.
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.880537946 +0000
+++ 0034-doc-fix-application-name-in-procinfo-guide.patch	2022-11-23 09:55:57.071149312 +0000
@@ -1 +1 @@
-From 2a65f12f6ab461e2cb81192c6bdd136191c82ea9 Mon Sep 17 00:00:00 2001
+From 1c94187eec0a76e40cc595583713f8abd443f250 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2a65f12f6ab461e2cb81192c6bdd136191c82ea9 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

patch 'doc: document device dump in procinfo guide' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 5ffd9e4baf8f20638f4d2c49ac557c9f80928fb0 Mon Sep 17 00:00:00 2001
From: Dongdong Liu <liudongdong3@huawei.com>
Date: Tue, 11 Oct 2022 19:18:43 +0800
Subject: [PATCH] doc: document device dump in procinfo guide

[ upstream commit dd2658f8d0e4725f579ff098f1ee159d897d6abc ]

The --show-port-private option was not documented.

Fixes: bb947a7264da ("app/procinfo: dump device private info")

Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 doc/guides/tools/proc_info.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst
index e4f0c83f1b..5dd6f9ecae 100644
--- a/doc/guides/tools/proc_info.rst
+++ b/doc/guides/tools/proc_info.rst
@@ -20,5 +20,6 @@ The application has a number of command line options:
    ./<build_dir>/app/dpdk-proc-info -- -m | [-p PORTMASK] [--stats | --xstats |
    --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto |
-   --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ]
+   --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name |
+   --show-port-private ]
 
 Parameters
@@ -70,4 +71,7 @@ The iter-mempool parameter iterates and displays mempool elements specified
 by name. For invalid or no mempool name no elements are displayed.
 
+**--show-port-private**
+The show-port-private parameter displays ports private information.
+
 Limitations
 -----------
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.900475639 +0000
+++ 0035-doc-document-device-dump-in-procinfo-guide.patch	2022-11-23 09:55:57.072149315 +0000
@@ -1 +1 @@
-From dd2658f8d0e4725f579ff098f1ee159d897d6abc Mon Sep 17 00:00:00 2001
+From 5ffd9e4baf8f20638f4d2c49ac557c9f80928fb0 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,2 @@
+
+[ upstream commit dd2658f8d0e4725f579ff098f1ee159d897d6abc ]

patch 'test/crypto: fix bitwise operator in a SNOW3G case' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 4726dffdd296d2475a8f9a8f3a95dd954c73a09c Mon Sep 17 00:00:00 2001
From: Kai Ji <kai.ji@intel.com>
Date: Sat, 12 Nov 2022 00:27:15 +0800
Subject: [PATCH] test/crypto: fix bitwise operator in a SNOW3G case

[ upstream commit e23eccfd281e056eac4f287e9993d2b26d440134 ]

This patch remove incorrect bitwise and operator used in the
return function of sw snow3g testcase

Fixes: 24342ade2c9d ("test/crypto: check SNOW3G when digest is encrypted")

Signed-off-by: Kai Ji <kai.ji@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
---
 app/test/test_cryptodev.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 3c848f094b..fea06b8628 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -6893,6 +6893,8 @@ test_snow3g_decryption_with_digest_test_case_1(void)
 	snow3g_hash_test_vector_setup(&snow3g_test_case_7, &snow3g_hash_data);
 
-	return test_snow3g_decryption(&snow3g_test_case_7) &
-			test_snow3g_authentication_verify(&snow3g_hash_data);
+	if (test_snow3g_decryption(&snow3g_test_case_7))
+		return TEST_FAILED;
+
+	return test_snow3g_authentication_verify(&snow3g_hash_data);
 }
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.920248501 +0000
+++ 0036-test-crypto-fix-bitwise-operator-in-a-SNOW3G-case.patch	2022-11-23 09:55:57.080149335 +0000
@@ -1 +1 @@
-From e23eccfd281e056eac4f287e9993d2b26d440134 Mon Sep 17 00:00:00 2001
+From 4726dffdd296d2475a8f9a8f3a95dd954c73a09c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e23eccfd281e056eac4f287e9993d2b26d440134 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index e1122fcd7c..d6ae762df9 100644
+index 3c848f094b..fea06b8628 100644
@@ -22 +23 @@
-@@ -6871,6 +6871,8 @@ test_snow3g_decryption_with_digest_test_case_1(void)
+@@ -6893,6 +6893,8 @@ test_snow3g_decryption_with_digest_test_case_1(void)

patch 'doc: fix typo depreciated instead of deprecated' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From b16910eabc41621208379dd02e47e86e9c01bf10 Mon Sep 17 00:00:00 2001
From: Stephen Coleman <omegacoleman@gmail.com>
Date: Tue, 19 Apr 2022 17:01:02 +0800
Subject: [PATCH] doc: fix typo depreciated instead of deprecated

[ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ]

Same issue was fixed in ABI policy in ec5c0f8,
but more of this misuse persist in comments and docs.
'depreciated' means diminish in value over a period of time.
It should not appear here.

Signed-off-by: Stephen Coleman <omegacoleman@gmail.com>
Acked-by: Ray Kinsella <mdr@ashroe.eu>
---
 doc/guides/contributing/abi_policy.rst     | 2 +-
 doc/guides/contributing/abi_versioning.rst | 2 +-
 lib/kni/rte_kni.h                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/guides/contributing/abi_policy.rst b/doc/guides/contributing/abi_policy.rst
index 64919b6a2b..5fd4052585 100644
--- a/doc/guides/contributing/abi_policy.rst
+++ b/doc/guides/contributing/abi_policy.rst
@@ -168,5 +168,5 @@ The requirements for changing the ABI are:
    ``__rte_deprecated``.
 
-    - The depreciated API should follow the notification process to be removed,
+    - The deprecated API should follow the notification process to be removed,
       see  :ref:`deprecation_notices`.
 
diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
index dd96527ee5..7afd1c1886 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -95,5 +95,5 @@ that library.
 
 However when a new ABI version is declared, for example DPDK ``22``, old
-depreciated functions may be safely removed at this point and the entire old
+deprecated functions may be safely removed at this point and the entire old
 major ABI version removed, see the section :ref:`deprecating_entire_abi` on
 how this may be done.
diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h
index b0eaf46104..62fa4c792b 100644
--- a/lib/kni/rte_kni.h
+++ b/lib/kni/rte_kni.h
@@ -67,6 +67,6 @@ struct rte_kni_conf {
 	uint16_t group_id;  /* Group ID */
 	unsigned mbuf_size; /* mbuf size */
-	struct rte_pci_addr addr; /* depreciated */
-	struct rte_pci_id id; /* depreciated */
+	struct rte_pci_addr addr; /* deprecated */
+	struct rte_pci_id id; /* deprecated */
 
 	__extension__
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.948499544 +0000
+++ 0037-doc-fix-typo-depreciated-instead-of-deprecated.patch	2022-11-23 09:55:57.081149337 +0000
@@ -1 +1 @@
-From 98afdb15626841dd6580816678a6df63d12f22b9 Mon Sep 17 00:00:00 2001
+From b16910eabc41621208379dd02e47e86e9c01bf10 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ]
+
@@ -42 +44 @@
-index 37d67509a0..1e508acc82 100644
+index b0eaf46104..62fa4c792b 100644
@@ -45 +47 @@
-@@ -66,6 +66,6 @@ struct rte_kni_conf {
+@@ -67,6 +67,6 @@ struct rte_kni_conf {

patch 'drivers: fix typos found by Lintian' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 674f2e762d4eb5c00cf66f073cb80c1a69ec576e Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Mon, 14 Nov 2022 14:21:53 +0000
Subject: [PATCH] drivers: fix typos found by Lintian

[ upstream commit bdab5309193d8e1ed1a60b604677c86c322364e0 ]

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 2 +-
 drivers/net/hns3/hns3_ethdev.c         | 2 +-
 drivers/net/qede/base/ecore_int.c      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index d3bf95b845..85c8785e7e 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -199,5 +199,5 @@ bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,
 			slave_info.max_tx_queues < bond_dev->data->nb_tx_queues) {
 		RTE_BOND_LOG(ERR,
-			"%s: Slave %d capabilities doesn't allow to allocate additional queues",
+			"%s: Slave %d capabilities doesn't allow allocating additional queues",
 			__func__, slave_port);
 		return -1;
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 9cc1759a4a..3ff0ac2252 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -1673,5 +1673,5 @@ err_pause_addr_cfg:
 				      mac_addr);
 		hns3_warn(hw,
-			  "Failed to roll back to del setted mac addr(%s): %d",
+			  "Failed to roll back to del set mac addr(%s): %d",
 			  mac_str, ret_val);
 	}
diff --git a/drivers/net/qede/base/ecore_int.c b/drivers/net/qede/base/ecore_int.c
index 2c4aac9418..d9faf6bfcd 100644
--- a/drivers/net/qede/base/ecore_int.c
+++ b/drivers/net/qede/base/ecore_int.c
@@ -367,5 +367,5 @@ enum _ecore_status_t ecore_pglueb_rbc_attn_handler(struct ecore_hwfn *p_hwfn,
 	tmp = ecore_rd(p_hwfn, p_ptt, PGLUE_B_REG_TX_ERR_WR_DETAILS_ICPL);
 	if (tmp & ECORE_PGLUE_ATTENTION_ICPL_VALID)
-		DP_NOTICE(p_hwfn, false, "ICPL erorr - %08x\n", tmp);
+		DP_NOTICE(p_hwfn, false, "ICPL error - %08x\n", tmp);
 
 	tmp = ecore_rd(p_hwfn, p_ptt, PGLUE_B_REG_MASTER_ZLR_ERR_DETAILS);
@@ -379,5 +379,5 @@ enum _ecore_status_t ecore_pglueb_rbc_attn_handler(struct ecore_hwfn *p_hwfn,
 
 		DP_NOTICE(p_hwfn, false,
-			  "ICPL erorr - %08x [Address %08x:%08x]\n",
+			  "ICPL error - %08x [Address %08x:%08x]\n",
 			  tmp, addr_hi, addr_lo);
 	}
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.969485556 +0000
+++ 0038-drivers-fix-typos-found-by-Lintian.patch	2022-11-23 09:55:57.089149357 +0000
@@ -1 +1 @@
-From bdab5309193d8e1ed1a60b604677c86c322364e0 Mon Sep 17 00:00:00 2001
+From 674f2e762d4eb5c00cf66f073cb80c1a69ec576e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bdab5309193d8e1ed1a60b604677c86c322364e0 ]
+
@@ -8 +9,0 @@
- drivers/crypto/dpaa_sec/dpaa_sec.c     | 4 ++--
@@ -12 +13 @@
- 4 files changed, 6 insertions(+), 6 deletions(-)
+ 3 files changed, 4 insertions(+), 4 deletions(-)
@@ -14,18 +14,0 @@
-diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
-index b1e7027823..db52683847 100644
---- a/drivers/crypto/dpaa_sec/dpaa_sec.c
-+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
-@@ -755,5 +755,5 @@ mbuf_dump:
- 	printf("job->sg[0] output info:\n");
- 	memcpy(&sg[0], &job->sg[0], sizeof(sg[0]));
--	printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention = %d"
-+	printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d"
- 		"\n\tbpid = %d\n\toffset = %d\n",
- 		(uint64_t)sg[0].addr, sg[0].length, sg[0].final,
-@@ -762,5 +762,5 @@ mbuf_dump:
- 	memcpy(&sg[1], &job->sg[1], sizeof(sg[1]));
- 	hw_sg_to_cpu(&sg[1]);
--	printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textention = %d"
-+	printf("\taddr = %"PRIx64",\n\tlen = %d,\n\tfinal = %d,\n\textension = %d"
- 		"\n\tbpid = %d\n\toffset = %d\n",
- 		(uint64_t)sg[1].addr, sg[1].length, sg[1].final,
@@ -33 +16 @@
-index 2efaad1e8e..b9bcebc6cb 100644
+index d3bf95b845..85c8785e7e 100644
@@ -44 +27 @@
-index b4365b78be..d326f70129 100644
+index 9cc1759a4a..3ff0ac2252 100644
@@ -47,2 +30,2 @@
-@@ -1662,5 +1662,5 @@ err_pause_addr_cfg:
- 				       mac_addr);
+@@ -1673,5 +1673,5 @@ err_pause_addr_cfg:
+ 				      mac_addr);

patch 'ring: fix description' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From ecfdc8089d8e9d0c8946220860c5dcbacf8b9409 Mon Sep 17 00:00:00 2001
From: Haiyue Wang <haiyue.wang@intel.com>
Date: Fri, 8 Apr 2022 20:40:42 +0800
Subject: [PATCH] ring: fix description

[ upstream commit a2248c87e2ba9aa0b455e8b4b90ec713aa212749 ]

The index description isn't right,
correct it as the Programmer's guide said.

Also correct the guide's figure description about 'Dequeue First Step'.

Fixes: 4a22e6ee3d2f ("doc: refactor figure numbers into references")
Fixes: af75078fece3 ("first public release")

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
 doc/guides/prog_guide/ring_lib.rst | 2 +-
 lib/ring/rte_ring_core.h           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guides/prog_guide/ring_lib.rst b/doc/guides/prog_guide/ring_lib.rst
index 54e0bb4b68..515a715266 100644
--- a/doc/guides/prog_guide/ring_lib.rst
+++ b/doc/guides/prog_guide/ring_lib.rst
@@ -173,5 +173,5 @@ If there are not enough objects in the ring (this is detected by checking prod_t
 .. figure:: img/ring-dequeue1.*
 
-   Dequeue last step
+   Dequeue first step
 
 
diff --git a/lib/ring/rte_ring_core.h b/lib/ring/rte_ring_core.h
index 1252ca9546..82b237091b 100644
--- a/lib/ring/rte_ring_core.h
+++ b/lib/ring/rte_ring_core.h
@@ -112,6 +112,6 @@ struct rte_ring_hts_headtail {
  *
  * The producer and the consumer have a head and a tail index. The particularity
- * of these index is that they are not between 0 and size(ring). These indexes
- * are between 0 and 2^32, and we mask their value when we access the ring[]
+ * of these index is that they are not between 0 and size(ring)-1. These indexes
+ * are between 0 and 2^32 -1, and we mask their value when we access the ring[]
  * field. Thanks to this assumption, we can do subtractions between 2 index
  * values in a modulo-32bit base: that's why the overflow of the indexes is not
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.998157049 +0000
+++ 0039-ring-fix-description.patch	2022-11-23 09:55:57.090149360 +0000
@@ -1 +1 @@
-From a2248c87e2ba9aa0b455e8b4b90ec713aa212749 Mon Sep 17 00:00:00 2001
+From ecfdc8089d8e9d0c8946220860c5dcbacf8b9409 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a2248c87e2ba9aa0b455e8b4b90ec713aa212749 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

patch 'ring: remove leftover comment about watermark' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 29a2eb7cee5748722939a1bd3d2b26882e355c85 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 31 May 2022 10:20:41 -0700
Subject: [PATCH] ring: remove leftover comment about watermark

[ upstream commit 21dc24b746a7135dd799b462d9a6479dfd54a92f ]

The watermark support was removed from rte_ring since version
17.02 but there is leftover in comments.

Fixes: 77dd3064270c ("ring: remove watermark support")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/ring/rte_ring.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/ring/rte_ring.h b/lib/ring/rte_ring.h
index 937cfbb7a0..6f040dba55 100644
--- a/lib/ring/rte_ring.h
+++ b/lib/ring/rte_ring.h
@@ -67,8 +67,7 @@ ssize_t rte_ring_get_memsize(unsigned int count);
  * appropriate size.
  *
- * The ring size is set to *count*, which must be a power of two. Water
- * marking is disabled by default. The real usable ring size is
- * *count-1* instead of *count* to differentiate a free ring from an
- * empty ring.
+ * The ring size is set to *count*, which must be a power of two.
+ * The real usable ring size is *count-1* instead of *count* to
+ * differentiate a full ring from an empty ring.
  *
  * The ring is not added in RTE_TAILQ_RING global list. Indeed, the
@@ -120,8 +119,7 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
  * calls rte_ring_init() to initialize an empty ring.
  *
- * The new ring size is set to *count*, which must be a power of
- * two. Water marking is disabled by default. The real usable ring size
- * is *count-1* instead of *count* to differentiate a free ring from an
- * empty ring.
+ * The new ring size is set to *count*, which must be a power of two.
+ * The real usable ring size is *count-1* instead of *count* to
+ * differentiate a full ring from an empty ring.
  *
  * The ring is added in RTE_TAILQ_RING list.
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.018750954 +0000
+++ 0040-ring-remove-leftover-comment-about-watermark.patch	2022-11-23 09:55:57.091149362 +0000
@@ -1 +1 @@
-From 21dc24b746a7135dd799b462d9a6479dfd54a92f Mon Sep 17 00:00:00 2001
+From 29a2eb7cee5748722939a1bd3d2b26882e355c85 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21dc24b746a7135dd799b462d9a6479dfd54a92f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 7c48e35d27..7e4cd60650 100644
+index 937cfbb7a0..6f040dba55 100644
@@ -26 +27 @@
-- * *count-1* instead of *count* to differentiate a full ring from an
+- * *count-1* instead of *count* to differentiate a free ring from an
@@ -33 +34 @@
-@@ -128,8 +127,7 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
+@@ -120,8 +119,7 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
@@ -38 +39 @@
-- * is *count-1* instead of *count* to differentiate a full ring from an
+- * is *count-1* instead of *count* to differentiate a free ring from an

patch 'vdpa/ifc: handle data path update failure' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 3930398baae271d77ff8c5caa955bfb88e3ab2b4 Mon Sep 17 00:00:00 2001
From: Taekyung Kim <kim.tae.kyung@navercorp.com>
Date: Thu, 10 Nov 2022 13:09:43 +0900
Subject: [PATCH] vdpa/ifc: handle data path update failure

[ upstream commit 903ec2b1b49e496815c016b0104fd655cd972661 ]

Stop and return the error code when update_datapath fails.
update_datapath prepares resources for the vdpa device.
The driver should not perform any further actions
if update_datapath returns an error.

Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")

Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Andy Pei <andy.pei@intel.com>
---
 drivers/vdpa/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index 6a915b0d5e..f061d55b06 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -901,5 +901,10 @@ ifcvf_dev_config(int vid)
 	internal->vid = vid;
 	rte_atomic32_set(&internal->dev_attached, 1);
-	update_datapath(internal);
+	if (update_datapath(internal) < 0) {
+		DRV_LOG(ERR, "failed to update datapath for vDPA device %s",
+			vdev->device->name);
+		rte_atomic32_set(&internal->dev_attached, 0);
+		return -1;
+	}
 
 	if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
@@ -943,5 +948,10 @@ ifcvf_dev_close(int vid)
 	} else {
 		rte_atomic32_set(&internal->dev_attached, 0);
-		update_datapath(internal);
+		if (update_datapath(internal) < 0) {
+			DRV_LOG(ERR, "failed to update datapath for vDPA device %s",
+				vdev->device->name);
+			internal->configured = 0;
+			return -1;
+		}
 	}
 
@@ -1262,5 +1272,13 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 
 	rte_atomic32_set(&internal->started, 1);
-	update_datapath(internal);
+	if (update_datapath(internal) < 0) {
+		DRV_LOG(ERR, "failed to update datapath %s", pci_dev->name);
+		rte_atomic32_set(&internal->started, 0);
+		rte_vdpa_unregister_device(internal->vdev);
+		pthread_mutex_lock(&internal_list_lock);
+		TAILQ_REMOVE(&internal_list, list, next);
+		pthread_mutex_unlock(&internal_list_lock);
+		goto error;
+	}
 
 	rte_kvargs_free(kvlist);
@@ -1291,5 +1309,6 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
 	internal = list->internal;
 	rte_atomic32_set(&internal->started, 0);
-	update_datapath(internal);
+	if (update_datapath(internal) < 0)
+		DRV_LOG(ERR, "failed to update datapath %s", pci_dev->name);
 
 	rte_pci_unmap_device(internal->pdev);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.039872385 +0000
+++ 0041-vdpa-ifc-handle-data-path-update-failure.patch	2022-11-23 09:55:57.092149365 +0000
@@ -1 +1 @@
-From 903ec2b1b49e496815c016b0104fd655cd972661 Mon Sep 17 00:00:00 2001
+From 3930398baae271d77ff8c5caa955bfb88e3ab2b4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 903ec2b1b49e496815c016b0104fd655cd972661 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 8dfd49336e..49d68ad1b1 100644
+index 6a915b0d5e..f061d55b06 100644
@@ -26 +27 @@
-@@ -1099,5 +1099,10 @@ ifcvf_dev_config(int vid)
+@@ -901,5 +901,10 @@ ifcvf_dev_config(int vid)
@@ -37,2 +38,2 @@
- 	hw = &internal->hw;
-@@ -1147,5 +1152,10 @@ ifcvf_dev_close(int vid)
+ 	if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
+@@ -943,5 +948,10 @@ ifcvf_dev_close(int vid)
@@ -50 +51 @@
-@@ -1753,5 +1763,13 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+@@ -1262,5 +1272,13 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
@@ -65 +66 @@
-@@ -1782,5 +1800,6 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
+@@ -1291,5 +1309,6 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)

patch 'service: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 2d03c4e3eff227f26d5e9ad88a0eccbe4a484073 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:03 +0100
Subject: [PATCH] service: fix build with clang 15

[ upstream commit b41e574c2d2e8d82ec5e22a950e385c73efda850 ]

This variable is not used.

Bugzilla ID: 1130
Fixes: 21698354c832 ("service: introduce service cores concept")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 lib/eal/common/rte_service.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c
index a7775b99dd..fb5a5b61e2 100644
--- a/lib/eal/common/rte_service.c
+++ b/lib/eal/common/rte_service.c
@@ -104,5 +104,4 @@ rte_service_init(void)
 
 	int i;
-	int count = 0;
 	struct rte_config *cfg = rte_eal_get_configuration();
 	for (i = 0; i < RTE_MAX_LCORE; i++) {
@@ -111,5 +110,4 @@ rte_service_init(void)
 				continue;
 			rte_service_lcore_add(i);
-			count++;
 		}
 	}
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.061080514 +0000
+++ 0042-service-fix-build-with-clang-15.patch	2022-11-23 09:55:57.092149365 +0000
@@ -1 +1 @@
-From b41e574c2d2e8d82ec5e22a950e385c73efda850 Mon Sep 17 00:00:00 2001
+From 2d03c4e3eff227f26d5e9ad88a0eccbe4a484073 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b41e574c2d2e8d82ec5e22a950e385c73efda850 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index bcc2e19077..42ca1d001d 100644
+index a7775b99dd..fb5a5b61e2 100644
@@ -23 +24 @@
-@@ -108,5 +108,4 @@ rte_service_init(void)
+@@ -104,5 +104,4 @@ rte_service_init(void)
@@ -29 +30 @@
-@@ -115,5 +114,4 @@ rte_service_init(void)
+@@ -111,5 +110,4 @@ rte_service_init(void)

patch 'vhost: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From d116a5e6329b9cd828f0f486fb62da540453fb13 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:04 +0100
Subject: [PATCH] vhost: fix build with clang 15

[ upstream commit 6546b60733cf61d0a716e98b50b1d47bc4d7f1f0 ]

This variable is not used.

Fixes: abeb86525577 ("vhost: remove copy threshold for async path")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 lib/vhost/virtio_net.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index 64460e3e8c..e4cc9fdf49 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -1673,5 +1673,4 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev,
 {
 	uint32_t pkt_idx = 0;
-	uint32_t remained = count;
 	int32_t n_xfer;
 	uint16_t num_buffers;
@@ -1699,5 +1698,4 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev,
 
 		pkt_idx++;
-		remained--;
 		vq_inc_last_avail_packed(vq, num_descs);
 	} while (pkt_idx < count);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.081408561 +0000
+++ 0043-vhost-fix-build-with-clang-15.patch	2022-11-23 09:55:57.094149370 +0000
@@ -1 +1 @@
-From 6546b60733cf61d0a716e98b50b1d47bc4d7f1f0 Mon Sep 17 00:00:00 2001
+From d116a5e6329b9cd828f0f486fb62da540453fb13 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6546b60733cf61d0a716e98b50b1d47bc4d7f1f0 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 4358899718..9abf752f30 100644
+index 64460e3e8c..e4cc9fdf49 100644
@@ -22 +23 @@
-@@ -1878,5 +1878,4 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev, struct vhost_virtqueue
+@@ -1673,5 +1673,4 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev,
@@ -26 +27 @@
- 	uint16_t n_xfer;
+ 	int32_t n_xfer;
@@ -28 +29 @@
-@@ -1904,5 +1903,4 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev, struct vhost_virtqueue
+@@ -1699,5 +1698,4 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev,

patch 'bus/dpaa: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From c6ece015869e3cb2c1d1d02725a12b14f209965f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:05 +0100
Subject: [PATCH] bus/dpaa: fix build with clang 15

[ upstream commit 6d58990561fbfc04e2bd53e1778352ad1d117edf ]

This variable is not used.

Fixes: f38f61e982f8 ("bus/dpaa: add BMAN hardware interfaces")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 drivers/bus/dpaa/base/qbman/bman.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/bman.h b/drivers/bus/dpaa/base/qbman/bman.h
index 21a6bee778..b2aa93e046 100644
--- a/drivers/bus/dpaa/base/qbman/bman.h
+++ b/drivers/bus/dpaa/base/qbman/bman.h
@@ -520,5 +520,4 @@ static inline int bm_shutdown_pool(struct bm_portal *p, u32 bpid)
 	struct bm_mc_result *bm_res;
 
-	int aq_count = 0;
 	bool stop = false;
 
@@ -533,6 +532,5 @@ static inline int bm_shutdown_pool(struct bm_portal *p, u32 bpid)
 			/* Pool is empty */
 			stop = true;
-		} else
-			++aq_count;
+		}
 	};
 	return 0;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.103466648 +0000
+++ 0044-bus-dpaa-fix-build-with-clang-15.patch	2022-11-23 09:55:57.095149373 +0000
@@ -1 +1 @@
-From 6d58990561fbfc04e2bd53e1778352ad1d117edf Mon Sep 17 00:00:00 2001
+From c6ece015869e3cb2c1d1d02725a12b14f209965f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6d58990561fbfc04e2bd53e1778352ad1d117edf ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

patch 'net/atlantic: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From c44d10cae9eabe11373e12e73e546be383004c7e Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:06 +0100
Subject: [PATCH] net/atlantic: fix build with clang 15

[ upstream commit f25fa03ad1a9df09870b55efa8b543ca60ab1b88 ]

This variable is not used.

Fixes: 2b1472d7150c ("net/atlantic: implement Tx path")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 drivers/net/atlantic/atl_rxtx.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c
index aeb79bf5a2..cb6f8141a8 100644
--- a/drivers/net/atlantic/atl_rxtx.c
+++ b/drivers/net/atlantic/atl_rxtx.c
@@ -1128,8 +1128,7 @@ atl_xmit_cleanup(struct atl_tx_queue *txq)
 		sw_ring = txq->sw_ring;
 		int head = txq->tx_head;
-		int cnt;
-		int i;
+		int cnt = head;
 
-		for (i = 0, cnt = head; ; i++) {
+		while (true) {
 			txd = &txq->hw_ring[cnt];
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.123845739 +0000
+++ 0045-net-atlantic-fix-build-with-clang-15.patch	2022-11-23 09:55:57.095149373 +0000
@@ -1 +1 @@
-From f25fa03ad1a9df09870b55efa8b543ca60ab1b88 Mon Sep 17 00:00:00 2001
+From c44d10cae9eabe11373e12e73e546be383004c7e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f25fa03ad1a9df09870b55efa8b543ca60ab1b88 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

patch 'net/dpaa2: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From c5f336041e45ebe0635739f8225c7e5f509a1dbf Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:07 +0100
Subject: [PATCH] net/dpaa2: fix build with clang 15

[ upstream commit d9298902d8e3bdf9abe80b88f6d1abe64668c984 ]

This variable is not used.

Fixes: 4690a6114ff6 ("net/dpaa2: enable error queues optionally")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 drivers/net/dpaa2/dpaa2_rxtx.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index e372937926..2afa2d2a78 100644
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -578,5 +578,5 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
 	struct qbman_result *dq_storage;
 	uint32_t fqid = dpaa2_q->fqid;
-	int ret, num_rx = 0, num_pulled;
+	int ret, num_rx = 0;
 	uint8_t pending, status;
 	struct qbman_swp *swp;
@@ -618,5 +618,4 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
 		;
 
-	num_pulled = 0;
 	pending = 1;
 	do {
@@ -653,5 +652,4 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
 		dq_storage++;
 		num_rx++;
-		num_pulled++;
 	} while (pending);
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.144233424 +0000
+++ 0046-net-dpaa2-fix-build-with-clang-15.patch	2022-11-23 09:55:57.097149377 +0000
@@ -1 +1 @@
-From d9298902d8e3bdf9abe80b88f6d1abe64668c984 Mon Sep 17 00:00:00 2001
+From c5f336041e45ebe0635739f8225c7e5f509a1dbf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d9298902d8e3bdf9abe80b88f6d1abe64668c984 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 5b02260e71..f60e78e1fd 100644
+index e372937926..2afa2d2a78 100644
@@ -21 +22 @@
-@@ -621,5 +621,5 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
+@@ -578,5 +578,5 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
@@ -28 +29 @@
-@@ -661,5 +661,4 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
+@@ -618,5 +618,4 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
@@ -34 +35 @@
-@@ -696,5 +695,4 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)
+@@ -653,5 +652,4 @@ dump_err_pkts(struct dpaa2_queue *dpaa2_q)

patch 'app/testpmd: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From e5d36910cf328a0be9f3545c9b2b160af6a80e96 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:09 +0100
Subject: [PATCH] app/testpmd: fix build with clang 15

[ upstream commit ff3cc8657549a313d7d3199bc38fbcd0d8090bff ]

This variable is used to create some artificial load.

Fixes: 3c156061b938 ("app/testpmd: add noisy neighbour forwarding mode")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test-pmd/noisy_vnf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/noisy_vnf.c b/app/test-pmd/noisy_vnf.c
index a92e810190..d70940006d 100644
--- a/app/test-pmd/noisy_vnf.c
+++ b/app/test-pmd/noisy_vnf.c
@@ -57,6 +57,6 @@ static inline void
 do_read(char *vnf_mem)
 {
+	uint64_t r __rte_unused;
 	uint64_t i = rte_rand();
-	uint64_t r;
 
 	r = vnf_mem[i % ((noisy_lkup_mem_sz * 1024 * 1024) /
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.165551480 +0000
+++ 0047-app-testpmd-fix-build-with-clang-15.patch	2022-11-23 09:55:57.097149377 +0000
@@ -1 +1 @@
-From ff3cc8657549a313d7d3199bc38fbcd0d8090bff Mon Sep 17 00:00:00 2001
+From e5d36910cf328a0be9f3545c9b2b160af6a80e96 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff3cc8657549a313d7d3199bc38fbcd0d8090bff ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index b17a1febd3..c65ec6f06a 100644
+index a92e810190..d70940006d 100644
@@ -21 +22 @@
-@@ -58,6 +58,6 @@ static inline void
+@@ -57,6 +57,6 @@ static inline void

patch 'app/testpmd: fix build with clang 15 in flow code' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 1cd61dc7fb4534a070cc2cafc48ce2cd8bdf97a0 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:10 +0100
Subject: [PATCH] app/testpmd: fix build with clang 15 in flow code

[ upstream commit 2809981e858f5cfa3ea9182e400a2c67f7c4744d ]

This variable is not used and has been copy/pasted in a lot of other
code.

Fixes: 938a184a1870 ("app/testpmd: implement basic support for flow API")
Fixes: 55509e3a49fb ("app/testpmd: support shared flow action")
Fixes: 04cc665fab38 ("app/testpmd: add flow template management")
Fixes: c4b38873346b ("app/testpmd: add flow table management")
Fixes: ecdc927b99f2 ("app/testpmd: add async flow create/destroy operations")
Fixes: d906fff51878 ("app/testpmd: add async indirect actions operations")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test-pmd/config.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index ad1b5f51d5..fef7fa71e4 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1730,5 +1730,4 @@ port_action_handle_destroy(portid_t port_id,
 	struct rte_port *port;
 	struct port_indirect_action **tmp;
-	uint32_t c = 0;
 	int ret = 0;
 
@@ -1765,5 +1764,4 @@ port_action_handle_destroy(portid_t port_id,
 		if (i == n)
 			tmp = &(*tmp)->next;
-		++c;
 	}
 	return ret;
@@ -2197,5 +2195,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
 	struct rte_port *port;
 	struct port_flow **tmp;
-	uint32_t c = 0;
 	int ret = 0;
 
@@ -2230,5 +2227,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
 		if (i == n)
 			tmp = &(*tmp)->next;
-		++c;
 	}
 	return ret;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.185352005 +0000
+++ 0048-app-testpmd-fix-build-with-clang-15-in-flow-code.patch	2022-11-23 09:55:57.100149385 +0000
@@ -1 +1 @@
-From 2809981e858f5cfa3ea9182e400a2c67f7c4744d Mon Sep 17 00:00:00 2001
+From 1cd61dc7fb4534a070cc2cafc48ce2cd8bdf97a0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2809981e858f5cfa3ea9182e400a2c67f7c4744d ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -20,2 +21,2 @@
- app/test-pmd/config.c | 14 --------------
- 1 file changed, 14 deletions(-)
+ app/test-pmd/config.c | 4 ----
+ 1 file changed, 4 deletions(-)
@@ -24 +25 @@
-index 982549ffed..9103ba6c77 100644
+index ad1b5f51d5..fef7fa71e4 100644
@@ -27 +28 @@
-@@ -1788,5 +1788,4 @@ port_action_handle_destroy(portid_t port_id,
+@@ -1730,5 +1730,4 @@ port_action_handle_destroy(portid_t port_id,
@@ -33,61 +34 @@
-@@ -1823,5 +1822,4 @@ port_action_handle_destroy(portid_t port_id,
- 		if (i == n)
- 			tmp = &(*tmp)->next;
--		++c;
- 	}
- 	return ret;
-@@ -2252,5 +2250,4 @@ port_flow_pattern_template_destroy(portid_t port_id, uint32_t n,
- 	struct rte_port *port;
- 	struct port_template **tmp;
--	uint32_t c = 0;
- 	int ret = 0;
- 
-@@ -2289,5 +2286,4 @@ port_flow_pattern_template_destroy(portid_t port_id, uint32_t n,
- 		if (i == n)
- 			tmp = &(*tmp)->next;
--		++c;
- 	}
- 	return ret;
-@@ -2369,5 +2365,4 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n,
- 	struct rte_port *port;
- 	struct port_template **tmp;
--	uint32_t c = 0;
- 	int ret = 0;
- 
-@@ -2405,5 +2400,4 @@ port_flow_actions_template_destroy(portid_t port_id, uint32_t n,
- 		if (i == n)
- 			tmp = &(*tmp)->next;
--		++c;
- 	}
- 	return ret;
-@@ -2535,5 +2529,4 @@ port_flow_template_table_destroy(portid_t port_id,
- 	struct rte_port *port;
- 	struct port_table **tmp;
--	uint32_t c = 0;
- 	int ret = 0;
- 
-@@ -2572,5 +2565,4 @@ port_flow_template_table_destroy(portid_t port_id,
- 		if (i == n)
- 			tmp = &(*tmp)->next;
--		++c;
- 	}
- 	return ret;
-@@ -2720,5 +2712,4 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
- 	struct rte_port *port;
- 	struct port_flow **tmp;
--	uint32_t c = 0;
- 	int ret = 0;
- 	struct queue_job *job;
-@@ -2769,5 +2760,4 @@ port_queue_flow_destroy(portid_t port_id, queueid_t queue_id,
- 		if (i == n)
- 			tmp = &(*tmp)->next;
--		++c;
- 	}
- 	return ret;
-@@ -2837,5 +2827,4 @@ port_queue_action_handle_destroy(portid_t port_id,
- 	struct rte_port *port;
- 	struct port_indirect_action **tmp;
--	uint32_t c = 0;
- 	int ret = 0;
- 	struct queue_job *job;
-@@ -2887,5 +2876,4 @@ port_queue_action_handle_destroy(portid_t port_id,
+@@ -1765,5 +1764,4 @@ port_action_handle_destroy(portid_t port_id,
@@ -99 +40 @@
-@@ -3305,5 +3293,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
+@@ -2197,5 +2195,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
@@ -105 +46 @@
-@@ -3338,5 +3325,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)
+@@ -2230,5 +2227,4 @@ port_flow_destroy(portid_t port_id, uint32_t n, const uint32_t *rule)

patch 'test/efd: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 4cacbe5682dbdfbb363a7db79f3f9458c5139dfc Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:11 +0100
Subject: [PATCH] test/efd: fix build with clang 15

[ upstream commit 94ec062953778f986af4261c7f6eb31af7c84202 ]

This local variable hides the more global one.
The original intent was probably to use the global one.

Fixes: 0e925aef2779 ("app/test: add EFD functional and perf tests")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test/test_efd_perf.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/test/test_efd_perf.c b/app/test/test_efd_perf.c
index f3fe3b1736..1dd71e1008 100644
--- a/app/test/test_efd_perf.c
+++ b/app/test/test_efd_perf.c
@@ -144,5 +144,4 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)
 
 		/* Sift through the list of keys and look for duplicates */
-		int num_duplicates = 0;
 		for (i = 0; i < KEYS_TO_ADD - 1; i++) {
 			if (memcmp(keys[i], keys[i + 1], params->key_size) == 0) {
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.208932546 +0000
+++ 0049-test-efd-fix-build-with-clang-15.patch	2022-11-23 09:55:57.100149385 +0000
@@ -1 +1 @@
-From 94ec062953778f986af4261c7f6eb31af7c84202 Mon Sep 17 00:00:00 2001
+From 4cacbe5682dbdfbb363a7db79f3f9458c5139dfc Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 94ec062953778f986af4261c7f6eb31af7c84202 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index d7f4d83549..4d04ed93e3 100644
+index f3fe3b1736..1dd71e1008 100644
@@ -22 +23 @@
-@@ -154,5 +154,4 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)
+@@ -144,5 +144,4 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)

patch 'test/member: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From ca0952588a26631a81b3412ae33bbfff21bb0aab Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:12 +0100
Subject: [PATCH] test/member: fix build with clang 15

[ upstream commit 8f8ed0c1f7f20d821eba41f51243e805b66e2579 ]

This local variable hides the more global one.
The original intent was probably to use the global one.

Fixes: 0cc67a96e486 ("test/member: add functional and perf tests")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 app/test/test_member.c      | 1 -
 app/test/test_member_perf.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/test/test_member.c b/app/test/test_member.c
index af9d50915c..bb9b0228df 100644
--- a/app/test/test_member.c
+++ b/app/test/test_member.c
@@ -546,5 +546,4 @@ setup_keys_and_data(void)
 
 		/* Sift through the list of keys and look for duplicates */
-		int num_duplicates = 0;
 		for (i = 0; i < MAX_ENTRIES - 1; i++) {
 			if (memcmp(generated_keys[i], generated_keys[i + 1],
diff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c
index e2840f12d3..a312401992 100644
--- a/app/test/test_member_perf.c
+++ b/app/test/test_member_perf.c
@@ -151,5 +151,4 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
 
 		/* Sift through the list of keys and look for duplicates */
-		int num_duplicates = 0;
 		for (i = 0; i < KEYS_TO_ADD - 1; i++) {
 			if (memcmp(keys[i], keys[i + 1],
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.229101847 +0000
+++ 0050-test-member-fix-build-with-clang-15.patch	2022-11-23 09:55:57.101149388 +0000
@@ -1 +1 @@
-From 8f8ed0c1f7f20d821eba41f51243e805b66e2579 Mon Sep 17 00:00:00 2001
+From ca0952588a26631a81b3412ae33bbfff21bb0aab Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f8ed0c1f7f20d821eba41f51243e805b66e2579 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index c1b6a7d8b9..4a93f8bff4 100644
+index af9d50915c..bb9b0228df 100644
@@ -23 +24 @@
-@@ -574,5 +574,4 @@ setup_keys_and_data(void)
+@@ -546,5 +546,4 @@ setup_keys_and_data(void)
@@ -30 +31 @@
-index 7b6adf913e..2f79888fbd 100644
+index e2840f12d3..a312401992 100644
@@ -33 +34 @@
-@@ -179,5 +179,4 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
+@@ -151,5 +151,4 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,

patch 'test/event: fix build with clang 15' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 1961dbbdbd9f2cae4d2a5699b2fff5d096f3ca76 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 18 Nov 2022 09:53:13 +0100
Subject: [PATCH] test/event: fix build with clang 15

[ upstream commit ff5b90f9d0675f1fa92b449ed086b6641301be51 ]

This variable is not used.

Fixes: d1f3385d0076 ("test: add event timer adapter auto-test")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Tested-by: Daxue Gao <daxuex.gao@intel.com>
---
 app/test/test_event_timer_adapter.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/test/test_event_timer_adapter.c b/app/test/test_event_timer_adapter.c
index 25bac2d155..dfec499d60 100644
--- a/app/test/test_event_timer_adapter.c
+++ b/app/test/test_event_timer_adapter.c
@@ -868,5 +868,4 @@ _cancel_thread(void *args)
 	RTE_SET_USED(args);
 	struct rte_event_timer *ev_tim = NULL;
-	uint64_t cancel_count = 0;
 	uint16_t ret;
 
@@ -878,5 +877,4 @@ _cancel_thread(void *args)
 		TEST_ASSERT_EQUAL(ret, 1, "Failed to cancel timer");
 		rte_mempool_put(eventdev_test_mempool, (void *)ev_tim);
-		cancel_count++;
 	}
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.249797576 +0000
+++ 0051-test-event-fix-build-with-clang-15.patch	2022-11-23 09:55:57.103149393 +0000
@@ -1 +1 @@
-From ff5b90f9d0675f1fa92b449ed086b6641301be51 Mon Sep 17 00:00:00 2001
+From 1961dbbdbd9f2cae4d2a5699b2fff5d096f3ca76 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ff5b90f9d0675f1fa92b449ed086b6641301be51 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 654c412836..1a440dfd10 100644
+index 25bac2d155..dfec499d60 100644
@@ -22 +23 @@
-@@ -912,5 +912,4 @@ _cancel_thread(void *args)
+@@ -868,5 +868,4 @@ _cancel_thread(void *args)
@@ -28 +29 @@
-@@ -922,5 +921,4 @@ _cancel_thread(void *args)
+@@ -878,5 +877,4 @@ _cancel_thread(void *args)

patch 'net/ixgbevf: fix promiscuous and allmulti' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 4b50df7128c6444e85e6e9cec8e0be0e8fafde23 Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz@6wind.com>
Date: Thu, 29 Sep 2022 14:21:55 +0200
Subject: [PATCH] net/ixgbevf: fix promiscuous and allmulti

[ upstream commit 21e471abb548f91190479c75da0c28ebc25dec36 ]

The configuration of allmulti and promiscuous modes conflicts
together. For instance, if we enable promiscuous mode, then enable and
disable allmulti, then the promiscuous mode is wrongly disabled.

Fix this behavior by:
- doing nothing when we set/unset allmulti if promiscuous mode is on
- restorting the proper mode (none or allmulti) when we disable
  promiscuous mode

Fixes: 1f4564ed7696 ("net/ixgbevf: enable promiscuous mode")

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
Acked-by: Wenjun Wu <wenjun1.wu@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 31d06b6110..b56ac0e9f9 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -7790,7 +7790,11 @@ ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+	int mode = IXGBEVF_XCAST_MODE_NONE;
 	int ret;
 
-	switch (hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_NONE)) {
+	if (dev->data->all_multicast)
+		mode = IXGBEVF_XCAST_MODE_ALLMULTI;
+
+	switch (hw->mac.ops.update_xcast_mode(hw, mode)) {
 	case IXGBE_SUCCESS:
 		ret = 0;
@@ -7814,4 +7818,7 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
 	int mode = IXGBEVF_XCAST_MODE_ALLMULTI;
 
+	if (dev->data->promiscuous)
+		return 0;
+
 	switch (hw->mac.ops.update_xcast_mode(hw, mode)) {
 	case IXGBE_SUCCESS:
@@ -7835,4 +7842,7 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)
 	int ret;
 
+	if (dev->data->promiscuous)
+		return 0;
+
 	switch (hw->mac.ops.update_xcast_mode(hw, IXGBEVF_XCAST_MODE_MULTI)) {
 	case IXGBE_SUCCESS:
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.270962412 +0000
+++ 0052-net-ixgbevf-fix-promiscuous-and-allmulti.patch	2022-11-23 09:55:57.108149405 +0000
@@ -1 +1 @@
-From 21e471abb548f91190479c75da0c28ebc25dec36 Mon Sep 17 00:00:00 2001
+From 4b50df7128c6444e85e6e9cec8e0be0e8fafde23 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21e471abb548f91190479c75da0c28ebc25dec36 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index fd06ddbe35..ae9f65b334 100644
+index 31d06b6110..b56ac0e9f9 100644
@@ -28 +29 @@
-@@ -7788,7 +7788,11 @@ ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
+@@ -7790,7 +7790,11 @@ ixgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
@@ -41 +42 @@
-@@ -7812,4 +7816,7 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
+@@ -7814,4 +7818,7 @@ ixgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
@@ -49 +50 @@
-@@ -7833,4 +7840,7 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)
+@@ -7835,4 +7842,7 @@ ixgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)

patch 'net/mlx5: fix maximum LRO message size' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 8e04bc3773df69b44df18f58da7182e826a8ed24 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Thu, 17 Nov 2022 16:39:00 +0200
Subject: [PATCH] net/mlx5: fix maximum LRO message size

[ upstream commit a23640047c361500c0fe4a3e52394bb7b2e9faa5 ]

The PMD analyzes each Rx queue maximal LRO size and selects one that
fits all queues to configure TIR LRO attribute.
TIR LRO attribute is number of 256 bytes chunks that match the
selected maximal LRO size.

PMD used `priv->max_lro_msg_size` for selected maximal LRO size and
number of TIR chunks.

Fixes: b9f1f4c239 ("net/mlx5: fix port initialization with small LRO")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 drivers/net/mlx5/mlx5.h      | 2 +-
 drivers/net/mlx5/mlx5_devx.c | 3 ++-
 drivers/net/mlx5/mlx5_rxq.c  | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 128ebd6937..e99831a6bb 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1453,5 +1453,5 @@ struct mlx5_priv {
 	/**< Verbs modify header action object. */
 	uint8_t ft_type; /**< Flow table type, Rx or Tx. */
-	uint8_t max_lro_msg_size;
+	uint32_t max_lro_msg_size;
 	uint32_t link_speed_capa; /* Link speed capabilities. */
 	struct mlx5_xstats_ctrl xstats_ctrl; /* Extended stats control. */
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 44c439bb55..0d5de8303b 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -772,5 +772,6 @@ mlx5_devx_tir_attr_set(struct rte_eth_dev *dev, const uint8_t *rss_key,
 		MLX5_ASSERT(priv->config.lro.supported);
 		tir_attr->lro_timeout_period_usecs = priv->config.lro.timeout;
-		tir_attr->lro_max_msg_sz = priv->max_lro_msg_size;
+		tir_attr->lro_max_msg_sz =
+			priv->max_lro_msg_size / MLX5_LRO_SEG_CHUNK_SIZE;
 		tir_attr->lro_enable_mask =
 				MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO |
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 0e14cd9393..6bc89a2e5c 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1535,5 +1535,4 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
 		max_lro_size -= MLX5_MAX_TCP_HDR_OFFSET;
 	max_lro_size = RTE_MIN(max_lro_size, MLX5_MAX_LRO_SIZE);
-	max_lro_size /= MLX5_LRO_SEG_CHUNK_SIZE;
 	if (priv->max_lro_msg_size)
 		priv->max_lro_msg_size =
@@ -1543,6 +1542,5 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
 	DRV_LOG(DEBUG,
 		"port %u Rx Queue %u max LRO message size adjusted to %u bytes",
-		dev->data->port_id, idx,
-		priv->max_lro_msg_size * MLX5_LRO_SEG_CHUNK_SIZE);
+		dev->data->port_id, idx, priv->max_lro_msg_size);
 }
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.295350469 +0000
+++ 0053-net-mlx5-fix-maximum-LRO-message-size.patch	2022-11-23 09:55:57.112149415 +0000
@@ -1 +1 @@
-From a23640047c361500c0fe4a3e52394bb7b2e9faa5 Mon Sep 17 00:00:00 2001
+From 8e04bc3773df69b44df18f58da7182e826a8ed24 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a23640047c361500c0fe4a3e52394bb7b2e9faa5 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 02bee5808d..31982002ee 100644
+index 128ebd6937..e99831a6bb 100644
@@ -29 +30 @@
-@@ -1712,5 +1712,5 @@ struct mlx5_priv {
+@@ -1453,5 +1453,5 @@ struct mlx5_priv {
@@ -37 +38 @@
-index c1305836cf..02deaac612 100644
+index 44c439bb55..0d5de8303b 100644
@@ -40,3 +41,3 @@
-@@ -871,5 +871,6 @@ mlx5_devx_tir_attr_set(struct rte_eth_dev *dev, const uint8_t *rss_key,
- 		MLX5_ASSERT(priv->sh->config.lro_allowed);
- 		tir_attr->lro_timeout_period_usecs = priv->config.lro_timeout;
+@@ -772,5 +772,6 @@ mlx5_devx_tir_attr_set(struct rte_eth_dev *dev, const uint8_t *rss_key,
+ 		MLX5_ASSERT(priv->config.lro.supported);
+ 		tir_attr->lro_timeout_period_usecs = priv->config.lro.timeout;
@@ -49 +50 @@
-index 724cd6c7e6..81aa3f074a 100644
+index 0e14cd9393..6bc89a2e5c 100644
@@ -52 +53 @@
-@@ -1534,5 +1534,4 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
+@@ -1535,5 +1535,4 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
@@ -58 +59 @@
-@@ -1542,6 +1541,5 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,
+@@ -1543,6 +1542,5 @@ mlx5_max_lro_msg_size_adjust(struct rte_eth_dev *dev, uint16_t idx,

patch 'doc: add LRO size limitation in mlx5 guide' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From d42406e77e2c0aa3cc46397c8df6ce2e43e56df5 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Thu, 17 Nov 2022 16:39:01 +0200
Subject: [PATCH] doc: add LRO size limitation in mlx5 guide

[ upstream commit ea75808941c8020c568e47d1ef9b25223258c131 ]

Maximal LRO message size must be multiply of 256.
Otherwise, TCP payload may not fit into a single WQE.

Fixes: 1c7e57f9bd33 ("net/mlx5: set maximum LRO packet size")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 doc/guides/nics/mlx5.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index ce40d1cdac..593a71cf9a 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -389,4 +389,6 @@ Limitations
   - Rx queue with LRO offload enabled, receiving a non-LRO packet, can forward
     it with size limited to max LRO size, not to max RX packet length.
+  - The driver rounds down the port configuration value ``max_lro_pkt_size``
+    (from ``rte_eth_rxmode``) to a multiple of 256 due to hardware limitation.
   - LRO can be used with outer header of TCP packets of the standard format:
         eth (with or without vlan) / ipv4 or ipv6 / tcp / payload
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.321356612 +0000
+++ 0054-doc-add-LRO-size-limitation-in-mlx5-guide.patch	2022-11-23 09:55:57.114149421 +0000
@@ -1 +1 @@
-From ea75808941c8020c568e47d1ef9b25223258c131 Mon Sep 17 00:00:00 2001
+From d42406e77e2c0aa3cc46397c8df6ce2e43e56df5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ea75808941c8020c568e47d1ef9b25223258c131 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 4f0db21dde..ab9498a91e 100644
+index ce40d1cdac..593a71cf9a 100644
@@ -22 +23 @@
-@@ -405,4 +405,6 @@ Limitations
+@@ -389,4 +389,6 @@ Limitations

patch 'doc: fix underlines in testpmd guide' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 9f54b0a4f9008179cdc7ff80e68468151d5df442 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba@nvidia.com>
Date: Wed, 16 Nov 2022 14:56:23 +0200
Subject: [PATCH] doc: fix underlines in testpmd guide

[ upstream commit fb360c75062d71014c1bba90db64f493fb0ae9e2 ]

In testpmd documentation, there are two underlines which do not
match the length of the text above.

This patch update them to be align with the guideline [1].

[1]
https://doc.dpdk.org/guides/contributing/documentation.html#section-headers

Fixes: a69c335d56b5 ("doc: add flow dump command in testpmd guide")
Fixes: 0e459ffa0889 ("app/testpmd: support flow aging")

Signed-off-by: Michael Baum <michaelba@nvidia.com>
Reviewed-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Yuying Zhang <yuying.zhang@intel.com>
---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index d44424da67..db59ce1e88 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -4343,5 +4343,5 @@ Disabling isolated mode::
 
 Dumping HW internal information
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ``flow dump`` dumps the hardware's internal representation information of
@@ -4359,5 +4359,5 @@ Otherwise, it will complain error occurred::
 
 Listing and destroying aged flow rules
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ``flow aged`` simply lists aged flow rules be get from api ``rte_flow_get_aged_flows``,
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.343242272 +0000
+++ 0055-doc-fix-underlines-in-testpmd-guide.patch	2022-11-23 09:55:57.117149428 +0000
@@ -1 +1 @@
-From fb360c75062d71014c1bba90db64f493fb0ae9e2 Mon Sep 17 00:00:00 2001
+From 9f54b0a4f9008179cdc7ff80e68468151d5df442 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fb360c75062d71014c1bba90db64f493fb0ae9e2 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 96c5ae0fe4..b5649d9d9a 100644
+index d44424da67..db59ce1e88 100644
@@ -29 +30 @@
-@@ -4241,5 +4241,5 @@ Disabling isolated mode::
+@@ -4343,5 +4343,5 @@ Disabling isolated mode::
@@ -36 +37 @@
-@@ -4257,5 +4257,5 @@ Otherwise, it will complain error occurred::
+@@ -4359,5 +4359,5 @@ Otherwise, it will complain error occurred::

patch 'doc: fix colons in testpmd aged flow rules' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 24d76003e16d92fd4db48a4a443b20e25f941847 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba@nvidia.com>
Date: Wed, 16 Nov 2022 14:56:24 +0200
Subject: [PATCH] doc: fix colons in testpmd aged flow rules

[ upstream commit ea30023e5232084c2a455235487aa862a301fc22 ]

In testpmd documentation, for listing aged-out flow rules there is some
boxes of examples.

In Sphinx syntax, those boxes are achieved by "::" before. However,
in two places it uses ":" instead and the example looks like a regular
text.

This patch replace the ":" with "::" to get code box.

Fixes: 0e459ffa0889 ("app/testpmd: support flow aging")

Signed-off-by: Michael Baum <michaelba@nvidia.com>
Reviewed-by: Thomas Monjalon <thomas@monjalon.net>
---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index db59ce1e88..3a522a80a6 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -4362,5 +4362,5 @@ Listing and destroying aged flow rules
 
 ``flow aged`` simply lists aged flow rules be get from api ``rte_flow_get_aged_flows``,
-and ``destroy`` parameter can be used to destroy those flow rules in PMD.
+and ``destroy`` parameter can be used to destroy those flow rules in PMD::
 
    flow aged {port_id} [destroy]
@@ -4397,5 +4397,5 @@ will be ID 3, ID 1, ID 0::
    0       0       0       i--
 
-If attach ``destroy`` parameter, the command will destroy all the list aged flow rules.
+If attach ``destroy`` parameter, the command will destroy all the list aged flow rules::
 
    testpmd> flow aged 0 destroy
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.366211446 +0000
+++ 0056-doc-fix-colons-in-testpmd-aged-flow-rules.patch	2022-11-23 09:55:57.120149435 +0000
@@ -1 +1 @@
-From ea30023e5232084c2a455235487aa862a301fc22 Mon Sep 17 00:00:00 2001
+From 24d76003e16d92fd4db48a4a443b20e25f941847 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ea30023e5232084c2a455235487aa862a301fc22 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index b5649d9d9a..b5fea1396c 100644
+index db59ce1e88..3a522a80a6 100644
@@ -28 +29 @@
-@@ -4260,5 +4260,5 @@ Listing and destroying aged flow rules
+@@ -4362,5 +4362,5 @@ Listing and destroying aged flow rules
@@ -35 +36 @@
-@@ -4295,5 +4295,5 @@ will be ID 3, ID 1, ID 0::
+@@ -4397,5 +4397,5 @@ will be ID 3, ID 1, ID 0::

patch 'net/nfp: fix Rx descriptor DMA address' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 631e68c186067714ad100ebd454bf397d0ab5026 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he@corigine.com>
Date: Fri, 18 Nov 2022 09:44:06 +0800
Subject: [PATCH] net/nfp: fix Rx descriptor DMA address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 0c48f5ad446d17d3039432d629b1537d2b2d1b98 ]

When receiving a packet that is larger than the mbuf size, the Rx
function will break the receive loop and sent a free list descriptor
with random DMA address.

Fix this by moving the increment of the free list descriptor counter
to after the packet size have been checked and acted on.

Fixes: bb340f56fcb7 ("net/nfp: fix memory leak in Rx")

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
 drivers/net/nfp/nfp_rxtx.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c
index df2bc39b79..639c1c925b 100644
--- a/drivers/net/nfp/nfp_rxtx.c
+++ b/drivers/net/nfp/nfp_rxtx.c
@@ -346,6 +346,4 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 		}
 
-		nb_hold++;
-
 		/*
 		 * Grab the mbuf and refill the descriptor with the
@@ -418,4 +416,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 		rxds->fld.dma_addr_hi = (dma_addr >> 32) & 0xff;
 		rxds->fld.dma_addr_lo = dma_addr & 0xffffffff;
+		nb_hold++;
 
 		rxq->rd_p++;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.388614430 +0000
+++ 0057-net-nfp-fix-Rx-descriptor-DMA-address.patch	2022-11-23 09:55:57.121149438 +0000
@@ -1 +1 @@
-From 0c48f5ad446d17d3039432d629b1537d2b2d1b98 Mon Sep 17 00:00:00 2001
+From 631e68c186067714ad100ebd454bf397d0ab5026 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 0c48f5ad446d17d3039432d629b1537d2b2d1b98 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index b8c874d315..38377ca218 100644
+index df2bc39b79..639c1c925b 100644
@@ -29 +30 @@
-@@ -294,6 +294,4 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -346,6 +346,4 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
@@ -36 +37 @@
-@@ -366,4 +364,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+@@ -418,4 +416,5 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)

patch 'drivers: remove unused build variable' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 776c777a619c988dc710cfaeff82e7c7d022b000 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Mon, 31 Oct 2022 11:44:44 +0100
Subject: [PATCH] drivers: remove unused build variable

[ upstream commit abb98ed0b3869c89c5b307a99173ad9b6e587e2c ]

The variable fmt_name has been removed from DPDK 21.02-rc1.
Then some drivers were integrated in the same year with this variable.
Of course it has no effect, so it is cleaned up.

Fixes: 832a4cf1d11d ("compress/mlx5: introduce PMD")
Fixes: a7c86884f150 ("crypto/mlx5: introduce Mellanox crypto driver")
Fixes: 5e7596ba7cb3 ("vdpa/sfc: introduce Xilinx vDPA driver")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/compress/mlx5/meson.build | 1 -
 drivers/crypto/mlx5/meson.build   | 1 -
 drivers/vdpa/sfc/meson.build      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build
index 7aac329986..fb04835f36 100644
--- a/drivers/compress/mlx5/meson.build
+++ b/drivers/compress/mlx5/meson.build
@@ -8,5 +8,4 @@ if not is_linux
 endif
 
-fmt_name = 'mlx5_compress'
 deps += ['common_mlx5', 'eal', 'compressdev']
 sources = files(
diff --git a/drivers/crypto/mlx5/meson.build b/drivers/crypto/mlx5/meson.build
index 9d9c9c00bc..b09fc1a9d5 100644
--- a/drivers/crypto/mlx5/meson.build
+++ b/drivers/crypto/mlx5/meson.build
@@ -8,5 +8,4 @@ if not (is_linux or is_windows)
 endif
 
-fmt_name = 'mlx5_crypto'
 deps += ['common_mlx5', 'eal', 'cryptodev']
 sources = files(
diff --git a/drivers/vdpa/sfc/meson.build b/drivers/vdpa/sfc/meson.build
index b55f9cd691..933f3f18f3 100644
--- a/drivers/vdpa/sfc/meson.build
+++ b/drivers/vdpa/sfc/meson.build
@@ -9,5 +9,4 @@ if ((arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and
 endif
 
-fmt_name = 'sfc_vdpa'
 extra_flags = []
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.410334359 +0000
+++ 0058-drivers-remove-unused-build-variable.patch	2022-11-23 09:55:57.121149438 +0000
@@ -1 +1 @@
-From abb98ed0b3869c89c5b307a99173ad9b6e587e2c Mon Sep 17 00:00:00 2001
+From 776c777a619c988dc710cfaeff82e7c7d022b000 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit abb98ed0b3869c89c5b307a99173ad9b6e587e2c ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index df4f79fa7e..c906f2d7a2 100644
+index 7aac329986..fb04835f36 100644
@@ -32 +33 @@
- if not dpdk_conf.has('RTE_COMMON_MLX5')
+ sources = files(
@@ -34 +35 @@
-index 7e32095695..a830a4c7b9 100644
+index 9d9c9c00bc..b09fc1a9d5 100644
@@ -42 +43 @@
- if not dpdk_conf.has('RTE_COMMON_MLX5')
+ sources = files(

patch 'doc: fix maximum packet size of virtio driver' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 23f263e7bd97b912adc9b22cbef3e84ac95cd997 Mon Sep 17 00:00:00 2001
From: Yi Li <liyi1@chinatelecom.cn>
Date: Sat, 19 Nov 2022 16:24:20 +0800
Subject: [PATCH] doc: fix maximum packet size of virtio driver

[ upstream commit c4c1b97670602a616f7fcf3a6613967a2c730df6 ]

According to VIRTIO_MAX_RX_PKTLEN macro definition, for virtio driver
currently supported pkt size is 9728.

Fixes: fc1f2750a3ec ("doc: programmers guide")

Signed-off-by: Yi Li <liyi1@chinatelecom.cn>
---
 doc/guides/nics/virtio.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst
index 7c0ae2b3af..eef0cc2a5f 100644
--- a/doc/guides/nics/virtio.rst
+++ b/doc/guides/nics/virtio.rst
@@ -44,5 +44,5 @@ In this release, the virtio PMD provides the basic functionality of packet recep
 
 *   It supports merge-able buffers per packet when receiving packets and scattered buffer per packet
-    when transmitting packets. The packet size supported is from 64 to 1518.
+    when transmitting packets. The packet size supported is from 64 to 9728.
 
 *   It supports multicast packets and promiscuous mode.
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.430382110 +0000
+++ 0059-doc-fix-maximum-packet-size-of-virtio-driver.patch	2022-11-23 09:55:57.122149441 +0000
@@ -1 +1 @@
-From c4c1b97670602a616f7fcf3a6613967a2c730df6 Mon Sep 17 00:00:00 2001
+From 23f263e7bd97b912adc9b22cbef3e84ac95cd997 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c4c1b97670602a616f7fcf3a6613967a2c730df6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index aace780249..c422e7347a 100644
+index 7c0ae2b3af..eef0cc2a5f 100644

patch 'doc: avoid meson deprecation in setup' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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

Thanks.

Kevin

---
From 9a3294eb17e41b6a605944a4a94c6c9f57ca538e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 15 Nov 2022 09:35:16 -0800
Subject: [PATCH] doc: avoid meson deprecation in setup

[ upstream commit e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 ]

The command "meson build" causes a deprecation warning with meson 0.64.0.

WARNING: Running the setup command as `meson [options]` instead of
    `meson setup [options]` is ambiguous and deprecated.

Therefore fix the examples in the documentation.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Stanislaw Kardach <kda@semihalf.com>
---
 doc/guides/cryptodevs/armv8.rst               |  2 +-
 doc/guides/cryptodevs/bcmfs.rst               |  2 +-
 doc/guides/freebsd_gsg/build_dpdk.rst         |  2 +-
 doc/guides/gpus/cuda.rst                      |  4 +-
 doc/guides/howto/openwrt.rst                  |  2 +-
 doc/guides/linux_gsg/build_dpdk.rst           |  8 ++--
 .../linux_gsg/cross_build_dpdk_for_arm64.rst  | 12 +++---
 doc/guides/nics/ark.rst                       |  2 +-
 doc/guides/nics/mvneta.rst                    |  2 +-
 doc/guides/nics/mvpp2.rst                     |  2 +-
 doc/guides/platform/bluefield.rst             |  4 +-
 doc/guides/platform/cnxk.rst                  |  4 +-
 doc/guides/platform/octeontx.rst              |  8 ++--
 doc/guides/prog_guide/build-sdk-meson.rst     | 39 +++++++++++--------
 doc/guides/prog_guide/lto.rst                 |  2 +-
 doc/guides/prog_guide/profile_app.rst         |  4 +-
 .../sample_app_ug/vm_power_management.rst     |  4 +-
 doc/guides/windows_gsg/build_dpdk.rst         |  4 +-
 18 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst
index 8963f66a20..1a006754cb 100644
--- a/doc/guides/cryptodevs/armv8.rst
+++ b/doc/guides/cryptodevs/armv8.rst
@@ -48,5 +48,5 @@ To build DPDK with this virtual crypto PMD, the user is required to:
 .. code-block:: console
 
-   meson build
+   meson setup build
    ninja -C build
 
diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst
index f5dcd59c87..d18a253913 100644
--- a/doc/guides/cryptodevs/bcmfs.rst
+++ b/doc/guides/cryptodevs/bcmfs.rst
@@ -71,5 +71,5 @@ for cross compiling on x86 platform.
 
     cd <DPDK-source-directory>
-    meson <dest-dir> --cross-file config/arm/arm64_stingray_linux_gcc
+    meson setup <dest-dir> --cross-file config/arm/arm64_stingray_linux_gcc
     cd <dest-dir>
     ninja
diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst
index bed353473f..f35fd29a3d 100644
--- a/doc/guides/freebsd_gsg/build_dpdk.rst
+++ b/doc/guides/freebsd_gsg/build_dpdk.rst
@@ -43,5 +43,5 @@ The following commands can be used to build and install DPDK on a system.
 The final, install, step generally needs to be run as root::
 
-  meson build
+  meson setup build
   cd build
   ninja
diff --git a/doc/guides/gpus/cuda.rst b/doc/guides/gpus/cuda.rst
index 38e22dc2c0..9c40f5a0dd 100644
--- a/doc/guides/gpus/cuda.rst
+++ b/doc/guides/gpus/cuda.rst
@@ -25,6 +25,6 @@ Three ways:
 
 - Set ``export CFLAGS=-I/usr/local/cuda/include`` before building
-- Add CFLAGS in the meson command line ``CFLAGS=-I/usr/local/cuda/include meson build``
-- Add the ``-Dc_args`` in meson command line ``meson build -Dc_args=-I/usr/local/cuda/include``
+- Add CFLAGS in the meson command line ``CFLAGS=-I/usr/local/cuda/include meson setup build``
+- Add the ``-Dc_args`` in meson command line ``meson setup build -Dc_args=-I/usr/local/cuda/include``
 
 If headers are not found, the CUDA GPU driver library is not built.
diff --git a/doc/guides/howto/openwrt.rst b/doc/guides/howto/openwrt.rst
index e1d7db2a90..be902c505f 100644
--- a/doc/guides/howto/openwrt.rst
+++ b/doc/guides/howto/openwrt.rst
@@ -101,5 +101,5 @@ first.
     strip = 'x86_64-openwrt-linux-strip'
 
-    meson builddir --cross-file openwrt-cross
+    meson setup builddir --cross-file openwrt-cross
     ninja -C builddir
 
diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst
index 0b08492ca2..2615d7b588 100644
--- a/doc/guides/linux_gsg/build_dpdk.rst
+++ b/doc/guides/linux_gsg/build_dpdk.rst
@@ -43,5 +43,5 @@ To configure a DPDK build use:
 .. code-block:: console
 
-     meson <options> build
+     meson setup <options> build
 
 where "build" is the desired output build directory, and "<options>" can be
@@ -130,5 +130,5 @@ To do so, pass a comma-separated list of the examples to build to the
 `-Dexamples` meson option as below::
 
-  meson -Dexamples=l2fwd,l3fwd build
+  meson setup -Dexamples=l2fwd,l3fwd build
 
 As with other meson options, this can also be set post-initial-config using `meson configure` in the build directory.
@@ -156,10 +156,10 @@ assuming the relevant 32-bit development packages, such as a 32-bit libc, are in
 
   PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig \
-      meson -Dc_args='-m32' -Dc_link_args='-m32' build
+      meson setup -Dc_args='-m32' -Dc_link_args='-m32' build
 
 For Debian/Ubuntu systems, the equivalent command is::
 
   PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig \
-      meson -Dc_args='-m32' -Dc_link_args='-m32' build
+      meson setup -Dc_args='-m32' -Dc_link_args='-m32' build
 
 Once the build directory has been configured,
diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
index d59af58235..5cbcb67bae 100644
--- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
@@ -117,5 +117,5 @@ To cross-compile DPDK on a desired target machine we can use the following
 command::
 
-   meson cross-build --cross-file <target_machine_configuration>
+   meson setup cross-build --cross-file <target_machine_configuration>
    ninja -C cross-build
 
@@ -123,10 +123,10 @@ For example if the target machine is aarch64 we can use the following
 command::
 
-   meson aarch64-build-gcc --cross-file config/arm/arm64_armv8_linux_gcc
+   meson setup aarch64-build-gcc --cross-file config/arm/arm64_armv8_linux_gcc
    ninja -C aarch64-build-gcc
 
 If the target machine is aarch32 we can use the following command::
 
-   meson aarch32-build --cross-file config/arm/arm32_armv8_linux_gcc
+   meson setup aarch32-build --cross-file config/arm/arm32_armv8_linux_gcc
    ninja -C aarch32-build
 
@@ -179,5 +179,5 @@ is named ``arm64_armv8_linux_clang``,
 use the following command to cross-compile DPDK for the target machine::
 
-   meson aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang
+   meson setup aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang
    ninja -C aarch64-build-clang
 
@@ -196,5 +196,5 @@ On Ubuntu 18.04, these packages are needed:
 Use the following command to cross-compile DPDK for the target machine::
 
-   meson aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804
+   meson setup aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804
    ninja -C aarch64-build-clang
 
@@ -207,5 +207,5 @@ configuration options. To build for an aarch64 SoC, use the -Dplatform meson
 option::
 
-   meson soc_build -Dplatform=<target_soc>
+   meson setup soc_build -Dplatform=<target_soc>
 
 Substitute <target_soc> with one of the supported SoCs
diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index da61814b5d..7897226203 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -283,5 +283,5 @@ CFLAGS environment prior to the meson build step. I.e.,
 
     export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60"
-    meson build
+    meson setup build
 
 
diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst
index b7f279c3cb..2ee2637a58 100644
--- a/doc/guides/nics/mvneta.rst
+++ b/doc/guides/nics/mvneta.rst
@@ -118,5 +118,5 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
 
    export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
-   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   meson setup build --cross-file config/arm/arm64_armada_linux_gcc
    ninja -C build
 
diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst
index e40fed7286..cbfa47afd8 100644
--- a/doc/guides/nics/mvpp2.rst
+++ b/doc/guides/nics/mvpp2.rst
@@ -134,5 +134,5 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable.
    export PKG_CONFIG_PATH=$<musdk_install_dir>/lib/pkgconfig/:$PKG_CONFIG_PATH
 
-   meson build --cross-file config/arm/arm64_armada_linux_gcc
+   meson setup build --cross-file config/arm/arm64_armada_linux_gcc
    ninja -C build
 
diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst
index 635e414600..e96c43c71e 100644
--- a/doc/guides/platform/bluefield.rst
+++ b/doc/guides/platform/bluefield.rst
@@ -63,5 +63,5 @@ rdma-core library with corresponding kernel drivers is required.
 .. code-block:: console
 
-        meson build
+        meson setup build
         ninja -C build
 
@@ -117,4 +117,4 @@ Then, untar the tarball at the cross toolchain directory on the x86 host.
 .. code-block:: console
 
-        meson build --cross-file config/arm/arm64_bluefield_linux_gcc
+        meson setup build --cross-file config/arm/arm64_bluefield_linux_gcc
         ninja -C build
diff --git a/doc/guides/platform/cnxk.rst b/doc/guides/platform/cnxk.rst
index 88995cc70c..149dbda09a 100644
--- a/doc/guides/platform/cnxk.rst
+++ b/doc/guides/platform/cnxk.rst
@@ -573,5 +573,5 @@ Native Compilation
 .. code-block:: console
 
-        meson build
+        meson setup build
         ninja -C build
 
@@ -583,5 +583,5 @@ Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 detail
 .. code-block:: console
 
-        meson build --cross-file config/arm/arm64_cn10k_linux_gcc
+        meson setup build --cross-file config/arm/arm64_cn10k_linux_gcc
         ninja -C build
 
diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst
index 42ddb1762e..1459dc7109 100644
--- a/doc/guides/platform/octeontx.rst
+++ b/doc/guides/platform/octeontx.rst
@@ -95,5 +95,5 @@ drivers can be compiled with the following steps,
 .. code-block:: console
 
-        meson build -Dexamples=<application>
+        meson setup build -Dexamples=<application>
         ninja -C build
 
@@ -102,5 +102,5 @@ The example applications can be compiled using the following:
 .. code-block:: console
 
-        meson build -Dexamples=<application>
+        meson setup build -Dexamples=<application>
         ninja -C build
 
@@ -128,5 +128,5 @@ Now this build system can be used to build applications for **OCTEON TX** :sup:`
 
         cd <dpdk directory>
-        meson build --cross-file config/arm/arm64_thunderx_linux_gcc
+        meson setup build --cross-file config/arm/arm64_thunderx_linux_gcc
         ninja -C build
 
@@ -136,5 +136,5 @@ The example applications can be compiled using the following:
 
         cd <dpdk directory>
-        meson build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples=<application>
+        meson setup build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples=<application>
         ninja -C build
 
diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
index 30ce805902..b3c1517931 100644
--- a/doc/guides/prog_guide/build-sdk-meson.rst
+++ b/doc/guides/prog_guide/build-sdk-meson.rst
@@ -10,5 +10,5 @@ For many platforms, compiling and installing DPDK should work using the
 following set of commands::
 
-	meson build
+	meson setup build
 	cd build
 	ninja
@@ -58,10 +58,10 @@ Configuring the Build
 
 To configure a build, run the meson tool, passing the path to the directory
-to be used for the build e.g. ``meson build``, as shown above. If calling
+to be used for the build e.g. ``meson setup build``, as shown above. If calling
 meson from somewhere other than the root directory of the DPDK project the
 path to the root directory should be passed as the first parameter, and the
 build path as the second. For example, to build DPDK in /tmp/dpdk-build::
 
-	user@host:/tmp$ meson ~user/dpdk dpdk-build
+	user@host:/tmp$ meson setup ~user/dpdk dpdk-build
 
 Meson will then configure the build based on settings in the project's
@@ -81,22 +81,27 @@ Examples of adjusting the defaults when doing initial meson configuration.
 Project-specific options are passed used -Doption=value::
 
-	meson --werror werrorbuild  # build with warnings as errors
+	# build with warnings as errors
+	meson setup --werror werrorbuild
 
-	meson --buildtype=debug debugbuild  # build for debugging
+	# build for debugging
+	meson setup --buildtype=debug debugbuild
 
-	meson -Dexamples=l3fwd,l2fwd fwdbuild  # build some examples as
-					# part of the normal DPDK build
+	# build some examples as part of the normal DPDK build
+	meson setup -Dexamples=l3fwd,l2fwd fwdbuild
 
-	meson -Dmax_lcores=8 smallbuild  # scale build for smaller systems
+	# scale build for smaller systems
+	meson setup -Dmax_lcores=8 smallbuild
 
-	meson -Denable_docs=true fullbuild  # build and install docs
+	# build and install docs
+	meson setup -Denable_docs=true fullbuild
 
-	meson -Dcpu_instruction_set=generic  # use builder-independent baseline -march
+	# use builder-independent baseline -march
+	meson setup -Dcpu_instruction_set=generic
 
-	meson -Ddisable_drivers=event/*,net/tap  # disable tap driver and all
-					# eventdev PMDs for a smaller build
+	# disable tap driver and all eventdev PMDs for a smaller build
+	meson setup -Ddisable_drivers=event/*,net/tap
 
-	meson -Denable_trace_fp=true tracebuild # build with fast path traces
-					# enabled
+	# build with fast path traces enabled
+	meson setup -Denable_trace_fp=true tracebuild
 
 Examples of setting some of the same options using meson configure::
@@ -136,5 +141,5 @@ such as the compiler to use can be passed via environment variables. For
 example::
 
-	CC=clang meson clang-build
+	CC=clang meson setup clang-build
 
 .. note::
@@ -189,10 +194,10 @@ To cross-compile DPDK on a desired target machine we can use the following
 command::
 
-	meson cross-build --cross-file <target_machine_configuration>
+	meson setup cross-build --cross-file <target_machine_configuration>
 
 For example if the target machine is arm64 we can use the following
 command::
 
-        meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc
+        meson setup arm-build --cross-file config/arm/arm64_armv8_linux_gcc
 
 where config/arm/arm64_armv8_linux_gcc contains settings for the compilers
diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst
index f79c449598..ff9f47a8f4 100644
--- a/doc/guides/prog_guide/lto.rst
+++ b/doc/guides/prog_guide/lto.rst
@@ -31,3 +31,3 @@ Link time optimization can be enabled by setting meson built-in 'b_lto' option:
 .. code-block:: console
 
-    meson build -Db_lto=true
+    meson setup build -Db_lto=true
diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst
index bd6700ef85..14292d4c25 100644
--- a/doc/guides/prog_guide/profile_app.rst
+++ b/doc/guides/prog_guide/profile_app.rst
@@ -43,5 +43,5 @@ and recompile the DPDK:
 .. code-block:: console
 
-   meson build
+   meson setup build
    meson configure build -Dc_args=-DRTE_ETHDEV_PROFILE_WITH_VTUNE
    ninja -C build
@@ -104,5 +104,5 @@ Example:
 .. code-block:: console
 
-   meson --cross config/arm/arm64_armv8_linux_gcc -Dc_args='-DRTE_ARM_EAL_RDTSC_USE_PMU' build
+   meson setup --cross config/arm/arm64_armv8_linux_gcc -Dc_args='-DRTE_ARM_EAL_RDTSC_USE_PMU' build
 
 .. warning::
diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst
index 9ce87956c9..e0af729e66 100644
--- a/doc/guides/sample_app_ug/vm_power_management.rst
+++ b/doc/guides/sample_app_ug/vm_power_management.rst
@@ -256,5 +256,5 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``:
 
    cd dpdk
-   meson build
+   meson setup build
    cd build
    ninja
@@ -495,5 +495,5 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``:
 
    cd dpdk
-   meson build
+   meson setup build
    cd build
    ninja
diff --git a/doc/guides/windows_gsg/build_dpdk.rst b/doc/guides/windows_gsg/build_dpdk.rst
index 38b3068d7b..29f2b38feb 100644
--- a/doc/guides/windows_gsg/build_dpdk.rst
+++ b/doc/guides/windows_gsg/build_dpdk.rst
@@ -105,5 +105,5 @@ To compile the examples, the flag ``-Dexamples`` is required.
 
     cd C:\Users\me\dpdk
-    meson -Dexamples=helloworld build
+    meson setup -Dexamples=helloworld build
     ninja -C build
 
@@ -116,4 +116,4 @@ Depending on the distribution, paths in this file may need adjustments.
 .. code-block:: console
 
-    meson --cross-file config/x86/cross-mingw -Dexamples=helloworld build
+    meson setup --cross-file config/x86/cross-mingw -Dexamples=helloworld build
     ninja -C build
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:58.450824998 +0000
+++ 0060-doc-avoid-meson-deprecation-in-setup.patch	2022-11-23 09:55:57.128149456 +0000
@@ -1 +1 @@
-From e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 Mon Sep 17 00:00:00 2001
+From 9a3294eb17e41b6a605944a4a94c6c9f57ca538e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 ]
+
@@ -13,2 +14,0 @@
-Cc: stable@dpdk.org
-
@@ -23 +22,0 @@
- doc/guides/cryptodevs/uadk.rst                |  2 +-
@@ -25 +24 @@
- doc/guides/gpus/cuda.rst                      |  6 +--
+ doc/guides/gpus/cuda.rst                      |  4 +-
@@ -29,2 +27,0 @@
- .../cross_build_dpdk_for_loongarch.rst        |  2 +-
- .../linux_gsg/cross_build_dpdk_for_riscv.rst  |  4 +-
@@ -35 +32 @@
- doc/guides/platform/cnxk.rst                  |  8 ++--
+ doc/guides/platform/cnxk.rst                  |  4 +-
@@ -42 +39 @@
- 21 files changed, 63 insertions(+), 58 deletions(-)
+ 18 files changed, 56 insertions(+), 51 deletions(-)
@@ -66,11 +62,0 @@
-diff --git a/doc/guides/cryptodevs/uadk.rst b/doc/guides/cryptodevs/uadk.rst
-index 1325eaca3f..9af6b88a5a 100644
---- a/doc/guides/cryptodevs/uadk.rst
-+++ b/doc/guides/cryptodevs/uadk.rst
-@@ -88,5 +88,5 @@ Test steps
-       cd dpdk
-       mkdir build
--      meson build (--reconfigure)
-+      meson setup build (--reconfigure)
-       cd build
-       ninja
@@ -78 +64 @@
-index d335b97cfc..514d18c870 100644
+index bed353473f..f35fd29a3d 100644
@@ -81 +67 @@
-@@ -45,5 +45,5 @@ The following commands can be used to build and install DPDK on a system.
+@@ -43,5 +43,5 @@ The following commands can be used to build and install DPDK on a system.
@@ -89 +75 @@
-index 55fc7d1e86..114e3bc8cb 100644
+index 38e22dc2c0..9c40f5a0dd 100644
@@ -101,7 +86,0 @@
-@@ -52,5 +52,5 @@ An example would be:
- .. code-block:: console
- 
--  $ meson build -Dc_args="-I/usr/local/cuda/include -I/path/to/gdrcopy/include"
-+  $ meson setup build -Dc_args="-I/usr/local/cuda/include -I/path/to/gdrcopy/include"
- 
- If headers are not found, the CUDA GPU driver library is built without the CPU map capability
@@ -120 +99 @@
-index 4f2def15ed..bbd2efc9d8 100644
+index 0b08492ca2..2615d7b588 100644
@@ -123 +102 @@
-@@ -54,5 +54,5 @@ To configure a DPDK build use:
+@@ -43,5 +43,5 @@ To configure a DPDK build use:
@@ -130 +109 @@
-@@ -141,5 +141,5 @@ To do so, pass a comma-separated list of the examples to build to the
+@@ -130,5 +130,5 @@ To do so, pass a comma-separated list of the examples to build to the
@@ -137 +116 @@
-@@ -167,10 +167,10 @@ assuming the relevant 32-bit development packages, such as a 32-bit libc, are in
+@@ -156,10 +156,10 @@ assuming the relevant 32-bit development packages, such as a 32-bit libc, are in
@@ -151 +130 @@
-index cbe9d171f8..e4de5c8d18 100644
+index d59af58235..5cbcb67bae 100644
@@ -154 +133 @@
-@@ -168,5 +168,5 @@ To cross-compile DPDK on a desired target machine we can use the following
+@@ -117,5 +117,5 @@ To cross-compile DPDK on a desired target machine we can use the following
@@ -161,2 +140,2 @@
-@@ -174,5 +174,5 @@ For example if the target machine is aarch64 we can use the following
- command, provided the cross file has been modified accordingly::
+@@ -123,10 +123,10 @@ For example if the target machine is aarch64 we can use the following
+ command::
@@ -168,2 +147 @@
-@@ -180,5 +180,5 @@ If the target machine is aarch32 we can use the following command,
- provided the cross file has been modified accordingly::
+ If the target machine is aarch32 we can use the following command::
@@ -175 +153 @@
-@@ -231,5 +231,5 @@ is named ``arm64_armv8_linux_clang``,
+@@ -179,5 +179,5 @@ is named ``arm64_armv8_linux_clang``,
@@ -182 +160 @@
-@@ -248,5 +248,5 @@ On Ubuntu 18.04, these packages are needed:
+@@ -196,5 +196,5 @@ On Ubuntu 18.04, these packages are needed:
@@ -189 +167 @@
-@@ -259,5 +259,5 @@ configuration options. To build for an aarch64 SoC, use the -Dplatform meson
+@@ -207,5 +207,5 @@ configuration options. To build for an aarch64 SoC, use the -Dplatform meson
@@ -196,29 +173,0 @@
-diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst
-index 1549cc86d5..7f75960e9e 100644
---- a/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst
-+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst
-@@ -82,5 +82,5 @@ To cross-compile DPDK for generic LoongArch we can use the following command:
- .. code-block:: console
- 
--   meson cross-build --cross-file config/loongarch/loongarch_loongarch64_linux_gcc
-+   meson setup cross-build --cross-file config/loongarch/loongarch_loongarch64_linux_gcc
-    ninja -C cross-build
- 
-diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst
-index 9e121645a8..7d7f7ac72b 100644
---- a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst
-+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst
-@@ -69,5 +69,5 @@ Cross Compiling DPDK with GNU toolchain using Meson
- To cross-compile DPDK for a desired target machine use the following command::
- 
--   meson cross-build --cross-file <target_machine_configuration>
-+   meson setup cross-build --cross-file <target_machine_configuration>
-    ninja -C cross-build
- 
-@@ -75,5 +75,5 @@ For example if the target machine is a generic rv64gc RISC-V, use the following
- command::
- 
--   meson riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc
-+   meson setup riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc
-    ninja -C riscv64-build-gcc
- 
@@ -226 +175 @@
-index 591e41799c..ba00f14e80 100644
+index da61814b5d..7897226203 100644
@@ -259 +208 @@
-index 3e3078c85e..09486747b1 100644
+index 635e414600..e96c43c71e 100644
@@ -262 +211 @@
-@@ -62,5 +62,5 @@ rdma-core library with corresponding kernel drivers is required.
+@@ -63,5 +63,5 @@ rdma-core library with corresponding kernel drivers is required.
@@ -269 +218 @@
-@@ -116,4 +116,4 @@ Then, untar the tarball at the cross toolchain directory on the x86 host.
+@@ -117,4 +117,4 @@ Then, untar the tarball at the cross toolchain directory on the x86 host.
@@ -276 +225 @@
-index 562ed7d7a6..aadd60b5d4 100644
+index 88995cc70c..149dbda09a 100644
@@ -279,8 +228 @@
-@@ -588,5 +588,5 @@ CN9K:
- .. code-block:: console
- 
--        meson -Dplatform=cn9k build
-+        meson setup -Dplatform=cn9k build
-         ninja -C build
- 
-@@ -595,5 +595,5 @@ CN10K:
+@@ -573,5 +573,5 @@ Native Compilation
@@ -289,9 +231,2 @@
--        meson -Dplatform=cn10k build
-+        meson setup -Dplatform=cn10k build
-         ninja -C build
- 
-@@ -607,5 +607,5 @@ CN9K:
- .. code-block:: console
- 
--        meson build --cross-file config/arm/arm64_cn9k_linux_gcc
-+        meson setup build --cross-file config/arm/arm64_cn9k_linux_gcc
+-        meson build
++        meson setup build
@@ -300 +235 @@
-@@ -614,5 +614,5 @@ CN10K:
+@@ -583,5 +583,5 @@ Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 detail
@@ -340 +275 @@
-index 58d9b553a0..5deabbe54c 100644
+index 30ce805902..b3c1517931 100644