patch 'net/bonding: set initial value of descriptor count alignment' has been queued to stable release 19.11.14

patch 'net/bonding: set initial value of descriptor count alignment' has been queued to stable release 19.11.14

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/011fd38782d66715153eb1e6220b6597aa79254e

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 011fd38782d66715153eb1e6220b6597aa79254e Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov@oktetlabs.ru>
Date: Mon, 31 Oct 2022 16:17:44 +0300
Subject: [PATCH] net/bonding: set initial value of descriptor count alignment

[ upstream commit 550e8d6d340f93882e4a1183314fd5f4a408595f ]

The driver had once been broken by patch [1] looking to have
a non-zero "nb_max" value in a use case not involving adding
any back-end ports. That was addressed afterwards ([2]). But,
as per report [3], similar test cases exist which attempt to
setup Rx queues on a void bond before attaching any back-end
ports. Rx queue setup, in turn, involves device info get API
invocation, and one of the checks on received data causes an
exception (division by zero). The "nb_align" value is indeed
zero at that time, but, as explained in [2], such test cases
are totally incorrect since a bond device must have at least
one back-end port plugged before any ethdev APIs can be used.

Once again, to avoid any problems with fixing the test cases,
this patch adjusts the bond PMD itself to workaround the bug.

[1] commit 5be3b40fea60 ("net/bonding: fix values of descriptor limits")
[2] commit d03c0e83cc00 ("net/bonding: fix descriptor limit reporting")
[3] https://bugs.dpdk.org/show_bug.cgi?id=1118

Bugzilla ID: 1118
Fixes: d03c0e83cc00 ("net/bonding: fix descriptor limit reporting")

Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: Min Hu (Connor) <humin29@huawei.com>
Tested-by: Weiyuan Li <weiyuanx.li@intel.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 7e79bac42e..c555d4640e 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3332,6 +3332,8 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
 	 */
 	internals->rx_desc_lim.nb_max = UINT16_MAX;
 	internals->tx_desc_lim.nb_max = UINT16_MAX;
+	internals->rx_desc_lim.nb_align = 1;
+	internals->tx_desc_lim.nb_align = 1;
 
 	memset(internals->active_slaves, 0, sizeof(internals->active_slaves));
 	memset(internals->slaves, 0, sizeof(internals->slaves));
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.479327603 +0100
+++ 0001-net-bonding-set-initial-value-of-descriptor-count-al.patch	2022-11-16 11:36:50.388775301 +0100
@@ -1 +1 @@
-From 550e8d6d340f93882e4a1183314fd5f4a408595f Mon Sep 17 00:00:00 2001
+From 011fd38782d66715153eb1e6220b6597aa79254e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 550e8d6d340f93882e4a1183314fd5f4a408595f ]
+
@@ -27 +28,0 @@
-Cc: stable@dpdk.org
@@ -38 +39 @@
-index bd25040851..e0da1fa7c9 100644
+index 7e79bac42e..c555d4640e 100644
@@ -41 +42 @@
-@@ -3431,6 +3431,8 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)
+@@ -3332,6 +3332,8 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode)

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/5473354785648341ee1a811d5dc3c6f6ba721a47

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 5473354785648341ee1a811d5dc3c6f6ba721a47 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 c555d4640e..334a06cf73 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -271,6 +271,24 @@ bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint16_t slave_port) {
 	return 0;
 }
 
+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,
 		bool dedicated_rxq)
@@ -331,8 +349,9 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,
 			/* Remove packet from array if:
 			 * - 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,
 			 */
@@ -342,12 +361,10 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,
 						 bufs[j])) ||
 				!collecting ||
 				(!promisc &&
-				 ((rte_is_unicast_ether_addr(&hdr->d_addr) &&
-				   !rte_is_same_ether_addr(bond_mac,
-						       &hdr->d_addr)) ||
-				  (!allmulti &&
-				   rte_is_multicast_ether_addr(&hdr->d_addr)))))) {
-
+				 !is_bond_mac_addr(&hdr->d_addr, bond_mac,
+						   BOND_MAX_MAC_ADDRS) &&
+				 (rte_is_unicast_ether_addr(&hdr->d_addr) ||
+				  !allmulti)))) {
 				if (hdr->ether_type == ether_type_slow_be) {
 					bond_mode_8023ad_handle_slow_pkt(
 					    internals, slaves[idx], bufs[j]);
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.509846616 +0100
+++ 0002-net-bonding-fix-dropping-valid-MAC-packets.patch	2022-11-16 11:36:50.392775327 +0100
@@ -1 +1 @@
-From 30bfba52cf356c03743b6f7deaeefce2f6cb39ed Mon Sep 17 00:00:00 2001
+From 5473354785648341ee1a811d5dc3c6f6ba721a47 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 c555d4640e..334a06cf73 100644
@@ -70 +71 @@
--				 ((rte_is_unicast_ether_addr(&hdr->dst_addr) &&
+-				 ((rte_is_unicast_ether_addr(&hdr->d_addr) &&
@@ -72 +73 @@
--						       &hdr->dst_addr)) ||
+-						       &hdr->d_addr)) ||
@@ -74 +75 @@
--				   rte_is_multicast_ether_addr(&hdr->dst_addr)))))) {
+-				   rte_is_multicast_ether_addr(&hdr->d_addr)))))) {
@@ -76 +77 @@
-+				 !is_bond_mac_addr(&hdr->dst_addr, bond_mac,
++				 !is_bond_mac_addr(&hdr->d_addr, bond_mac,
@@ -78 +79 @@
-+				 (rte_is_unicast_ether_addr(&hdr->dst_addr) ||
++				 (rte_is_unicast_ether_addr(&hdr->d_addr) ||

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 2b7d18ba5301b56e88aa5fb204223cfde0ae9be1 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 379f867caa..9028b2d95a 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -208,7 +208,7 @@ uint16_t stats_period; /**< Period to show statistics (disabled by default) */
  * In container, it cannot terminate the process which running with 'stats-period'
  * 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-16 11:36:50.545917278 +0100
+++ 0003-app-testpmd-make-quit-flag-volatile.patch	2022-11-16 11:36:50.396775352 +0100
@@ -1 +1 @@
-From 4c243bd4a8762163a7a1ba321bc8b8ff924c6358 Mon Sep 17 00:00:00 2001
+From 2b7d18ba5301b56e88aa5fb204223cfde0ae9be1 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 379f867caa..9028b2d95a 100644
@@ -24 +25 @@
-@@ -231,7 +231,7 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */
+@@ -208,7 +208,7 @@ uint16_t stats_period; /**< Period to show statistics (disabled by default) */

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/03d094959aa50c899d5494599d579b64f60dc243

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 03d094959aa50c899d5494599d579b64f60dc243 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 7ae865c2cf..7b8d6fde91 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -536,6 +536,11 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
 			return ret;
 	}
 
+	/* 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 &= ~DEV_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 334a06cf73..24d9c1b414 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3569,7 +3569,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
 	const char *name = dev->device->name;
 	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;
 	uint8_t agg_mode;
@@ -3630,16 +3629,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
 		}
 	}
 
-	offloads = dev->data->dev_conf.txmode.offloads;
-	if ((offloads & DEV_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 &= ~DEV_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-16 11:36:50.581581891 +0100
+++ 0004-net-bonding-fix-mbuf-fast-free-handling.patch	2022-11-16 11:36:50.404775402 +0100
@@ -1 +1 @@
-From b4924c0db589b5d4698abfab3ce60978d9df518b Mon Sep 17 00:00:00 2001
+From 03d094959aa50c899d5494599d579b64f60dc243 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 7ae865c2cf..7b8d6fde91 100644
@@ -29 +30 @@
-@@ -544,6 +544,11 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
+@@ -536,6 +536,11 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id)
@@ -36 +37 @@
-+		internals->tx_offload_capa &= ~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
++		internals->tx_offload_capa &= ~DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@ -42 +43 @@
-index 864e073db8..2efaad1e8e 100644
+index 334a06cf73..24d9c1b414 100644
@@ -45 +46 @@
-@@ -3643,7 +3643,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
+@@ -3569,7 +3569,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
@@ -52,2 +53,2 @@
- 	uint32_t link_speeds;
-@@ -3708,16 +3707,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
+ 	uint8_t agg_mode;
+@@ -3630,16 +3629,6 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
@@ -58 +59 @@
--	if ((offloads & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE) &&
+-	if ((offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE) &&
@@ -63 +64 @@
--		offloads &= ~RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
+-		offloads &= ~DEV_TX_OFFLOAD_MBUF_FAST_FREE;
@@ -67,3 +68,3 @@
- 	link_speeds = dev->data->dev_conf.link_speeds;
- 	/*
- 	 * The default value of 'link_speeds' is zero. From its definition,
+ 	/* 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 19.11.14

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From e922afb57478f9dcf993197afcea4b2ea9555ccb 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/librte_eal/common/include/rte_uuid.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/include/rte_uuid.h b/lib/librte_eal/common/include/rte_uuid.h
index 8b42e070af..cfefd4308a 100644
--- a/lib/librte_eal/common/include/rte_uuid.h
+++ b/lib/librte_eal/common/include/rte_uuid.h
@@ -37,6 +37,9 @@ typedef unsigned char rte_uuid_t[16];
 	((e) >> 8) & 0xff, (e) & 0xff		\
 }
 
+/** UUID string length */
+#define RTE_UUID_STRLEN	(36 + 1)
+
 /**
  * Test if UUID is all zeros.
  *
@@ -95,7 +98,6 @@ int	rte_uuid_parse(const char *in, rte_uuid_t uu);
  * @param len
  *    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);
 
 #ifdef __cplusplus
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.617945255 +0100
+++ 0005-eal-fix-doxygen-comments-for-UUID.patch	2022-11-16 11:36:50.404775402 +0100
@@ -1 +1 @@
-From 61c7dfe75a9ab345bbd8bdc30c2da0ee661660a8 Mon Sep 17 00:00:00 2001
+From e922afb57478f9dcf993197afcea4b2ea9555ccb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 61c7dfe75a9ab345bbd8bdc30c2da0ee661660a8 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
- lib/eal/include/rte_uuid.h | 4 +++-
+ lib/librte_eal/common/include/rte_uuid.h | 4 +++-
@@ -20 +21 @@
-diff --git a/lib/eal/include/rte_uuid.h b/lib/eal/include/rte_uuid.h
+diff --git a/lib/librte_eal/common/include/rte_uuid.h b/lib/librte_eal/common/include/rte_uuid.h
@@ -22,2 +23,2 @@
---- a/lib/eal/include/rte_uuid.h
-+++ b/lib/eal/include/rte_uuid.h
+--- a/lib/librte_eal/common/include/rte_uuid.h
++++ b/lib/librte_eal/common/include/rte_uuid.h

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/52d2c5707971b114dac6ac5c3e8e051612f7e1a3

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 52d2c5707971b114dac6ac5c3e8e051612f7e1a3 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/librte_power/rte_power.h | 55 ------------------------------------
 1 file changed, 55 deletions(-)

diff --git a/lib/librte_power/rte_power.h b/lib/librte_power/rte_power.h
index 04dc4cb1da..14ed6c1cf2 100644
--- a/lib/librte_power/rte_power.h
+++ b/lib/librte_power/rte_power.h
@@ -153,14 +153,6 @@ typedef int (*rte_power_freq_change_t)(unsigned int lcore_id);
  * Scale up the frequency of a specific lcore according to the 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_up;
 
@@ -168,30 +160,13 @@ extern rte_power_freq_change_t rte_power_freq_up;
  * Scale down the frequency of a specific lcore according to the 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_down;
 
 /**
  * Scale up the frequency of a specific lcore to the highest according to the
  * 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;
 
@@ -199,54 +174,24 @@ extern rte_power_freq_change_t rte_power_freq_max;
  * Scale down the frequency of a specific lcore to the lowest according to the
  * 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;
 
 /**
  * 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;
 
 /**
  * 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;
 
 /**
  * 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-16 11:36:50.651642903 +0100
+++ 0006-power-fix-some-doxygen-comments.patch	2022-11-16 11:36:50.404775402 +0100
@@ -1 +1 @@
-From 58794bf8d2d577b18e8bd430fd6419274678b34e Mon Sep 17 00:00:00 2001
+From 52d2c5707971b114dac6ac5c3e8e051612f7e1a3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 58794bf8d2d577b18e8bd430fd6419274678b34e ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
- lib/power/rte_power.h | 55 -------------------------------------------
+ lib/librte_power/rte_power.h | 55 ------------------------------------
@@ -20,5 +21,5 @@
-diff --git a/lib/power/rte_power.h b/lib/power/rte_power.h
-index 47345e26df..7954299489 100644
---- a/lib/power/rte_power.h
-+++ b/lib/power/rte_power.h
-@@ -169,14 +169,6 @@ typedef int (*rte_power_freq_change_t)(unsigned int lcore_id);
+diff --git a/lib/librte_power/rte_power.h b/lib/librte_power/rte_power.h
+index 04dc4cb1da..14ed6c1cf2 100644
+--- a/lib/librte_power/rte_power.h
++++ b/lib/librte_power/rte_power.h
+@@ -153,14 +153,6 @@ typedef int (*rte_power_freq_change_t)(unsigned int lcore_id);
@@ -39 +40 @@
-@@ -184,30 +176,13 @@ extern rte_power_freq_change_t rte_power_freq_up;
+@@ -168,30 +160,13 @@ extern rte_power_freq_change_t rte_power_freq_up;
@@ -70 +71 @@
-@@ -215,54 +190,24 @@ extern rte_power_freq_change_t rte_power_freq_max;
+@@ -199,54 +174,24 @@ extern rte_power_freq_change_t rte_power_freq_max;

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From dbbe5c32de102a23d43354857e59e43b95149c36 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 858c883f24..8cf61c64c6 100644
--- a/app/test/test_hash_readwrite_lf_perf.c
+++ b/app/test/test_hash_readwrite_lf_perf.c
@@ -1112,7 +1112,6 @@ test_hash_multi_add_lookup(struct rwc_perf *rwc_perf_results, int rwc_lf,
 					rte_eal_remote_launch(test_rwc_reader,
 						(void *)(uintptr_t)read_type,
 						enabled_core_ids[i]);
-				write_type = WRITE_KEY_SHIFT;
 				pos_core = 0;
 
 				/* Launch writers */
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.684103488 +0100
+++ 0007-test-hash-remove-dead-code-in-extendable-bucket-test.patch	2022-11-16 11:36:50.408775426 +0100
@@ -1 +1 @@
-From e5408325f3b415421de90abde8445d8d268dfeea Mon Sep 17 00:00:00 2001
+From dbbe5c32de102a23d43354857e59e43b95149c36 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e5408325f3b415421de90abde8445d8d268dfeea ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 32f9ec9250..cf86046a2f 100644
+index 858c883f24..8cf61c64c6 100644
@@ -22 +23 @@
-@@ -1102,7 +1102,6 @@ test_hash_multi_add_lookup(struct rwc_perf *rwc_perf_results, int rwc_lf,
+@@ -1112,7 +1112,6 @@ test_hash_multi_add_lookup(struct rwc_perf *rwc_perf_results, int rwc_lf,

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/359adae4e7dd24e780de03b1eaee02d124704fcb

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 359adae4e7dd24e780de03b1eaee02d124704fcb 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 4d13bbb06c..6931ec50c6 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2870,6 +2870,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 	int queue_action = 0;
 	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;
 	const struct rte_flow_action_raw_encap *raw_encap;
@@ -2877,6 +2878,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 	if (!attr->ingress)
 		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:
 			queue = actions->conf;
@@ -2901,11 +2904,15 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 		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:
 			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;
 			if (raw_encap->size >
@@ -3364,20 +3371,33 @@ flow_hairpin_split(struct rte_eth_dev *dev,
 	struct mlx5_rte_flow_item_tag *tag_item;
 	struct rte_flow_item *item;
 	char *addr;
+	int push_vlan = 0;
 	int encap = 0;
 
 	mlx5_flow_id_get(priv->sh->flow_id_pool, flow_id);
 	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,
 			       sizeof(struct rte_flow_action));
 			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) {
 				rte_memcpy(actions_tx, actions,
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.717468320 +0100
+++ 0008-net-mlx5-fix-hairpin-split-with-set-VLAN-VID-action.patch	2022-11-16 11:36:50.412775451 +0100
@@ -1 +1 @@
-From 5615d27b7a1bda7cc58ef07c2e77c6f9a7792c1d Mon Sep 17 00:00:00 2001
+From 359adae4e7dd24e780de03b1eaee02d124704fcb 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 4d13bbb06c..6931ec50c6 100644
@@ -50 +51 @@
-@@ -4591,6 +4591,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -2870,6 +2870,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
@@ -58 +59 @@
-@@ -4599,6 +4600,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -2877,6 +2878,8 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
@@ -67 +68 @@
-@@ -4623,11 +4626,15 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -2901,11 +2904,15 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
@@ -83,2 +84,2 @@
- 			if (raw_encap->size > MLX5_ENCAPSULATION_DECISION_SIZE)
-@@ -5088,19 +5095,32 @@ flow_hairpin_split(struct rte_eth_dev *dev,
+ 			if (raw_encap->size >
+@@ -3364,20 +3371,33 @@ flow_hairpin_split(struct rte_eth_dev *dev,
@@ -90,0 +92 @@
+ 	mlx5_flow_id_get(priv->sh->flow_id_pool, flow_id);

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From abb751ede53458d3693527a3bd33397d9b544bdd 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 5fe6e9ea69..5daf29dbd0 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -6023,7 +6023,7 @@ 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
 		 * the new VSI ID passed in
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.757679285 +0100
+++ 0009-net-ice-base-fix-duplicate-flow-rules.patch	2022-11-16 11:36:50.420775502 +0100
@@ -1 +1 @@
-From 43d30256b215937d9d8b554d39ac91f1866b0e5a Mon Sep 17 00:00:00 2001
+From abb751ede53458d3693527a3bd33397d9b544bdd 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 5fe6e9ea69..5daf29dbd0 100644
@@ -23 +24 @@
-@@ -8786,7 +8786,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,
+@@ -6023,7 +6023,7 @@ ice_adv_add_update_vsi_list(struct ice_hw *hw,

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From dcad322034374223a5d514bf4eae2a554e542e90 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 f97d93a78d..6dcb2f702a 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -1726,6 +1726,10 @@ ice_recv_scattered_pkts(void *rx_queue,
 			} else
 				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;
 		}
 
 		first_seg->port = rxq->port_id;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.797570481 +0100
+++ 0010-net-ice-fix-scalar-Rx-path-segment.patch	2022-11-16 11:36:50.420775502 +0100
@@ -1 +1 @@
-From 90ba4442058a14763e57ca96d03ab1e6044e3e5c Mon Sep 17 00:00:00 2001
+From dcad322034374223a5d514bf4eae2a554e542e90 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 f97d93a78d..6dcb2f702a 100644
@@ -26 +27 @@
-@@ -2113,6 +2113,10 @@ ice_recv_scattered_pkts(void *rx_queue,
+@@ -1726,6 +1726,10 @@ ice_recv_scattered_pkts(void *rx_queue,

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/1274818d662debbe19758e0db331d537fce35dbe

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 1274818d662debbe19758e0db331d537fce35dbe 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 6dcb2f702a..c115fcf896 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2952,6 +2952,22 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq)
 #define ICE_MIN_TSO_MSS            64
 #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,
 	      uint16_t nb_pkts)
@@ -2998,6 +3014,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 			rte_errno = -ret;
 			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-16 11:36:50.834078304 +0100
+++ 0011-net-ice-fix-scalar-Tx-path-segment.patch	2022-11-16 11:36:50.424775526 +0100
@@ -1 +1 @@
-From 688cb2f2c61e48552fb9a211fdcfdb754a795b40 Mon Sep 17 00:00:00 2001
+From 1274818d662debbe19758e0db331d537fce35dbe 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 6dcb2f702a..c115fcf896 100644
@@ -27 +28 @@
-@@ -3645,6 +3645,22 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq)
+@@ -2952,6 +2952,22 @@ ice_set_tx_function_flag(struct rte_eth_dev *dev, struct ice_tx_queue *txq)
@@ -50 +51 @@
-@@ -3691,6 +3707,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -2998,6 +3014,12 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/9412df88ffeb26d1cdabe6dab50fcd14882833dc

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 9412df88ffeb26d1cdabe6dab50fcd14882833dc 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 739c93656f..52e4e424cb 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -745,7 +745,7 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
 	if (rte_cryptodev_sym_capability_check_auth(cap,
 			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);
 		return -EPERM;
@@ -829,7 +829,7 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform)
 	if (rte_cryptodev_sym_capability_check_auth(cap,
 			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);
 		return -EPERM;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.869764365 +0100
+++ 0012-examples-fips_validation-fix-typo-in-error-log.patch	2022-11-16 11:36:50.428775551 +0100
@@ -1 +1 @@
-From 8782b3b64b4c38c0e2d4cf5bda2795ddd268cf41 Mon Sep 17 00:00:00 2001
+From 9412df88ffeb26d1cdabe6dab50fcd14882833dc 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 739c93656f..52e4e424cb 100644
@@ -22 +23 @@
-@@ -1210,7 +1210,7 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
+@@ -745,7 +745,7 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
@@ -31 +32 @@
-@@ -1339,7 +1339,7 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform)
+@@ -829,7 +829,7 @@ prepare_cmac_xform(struct rte_crypto_sym_xform *xform)

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From b4efe678923d2c87af4a9b337d94ba1574992863 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 e23a68e0b1..39d97eab01 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -6233,8 +6233,10 @@ 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);
 }
 
 static int
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.903806028 +0100
+++ 0013-test-crypto-fix-bitwise-operator-in-a-SNOW3G-case.patch	2022-11-16 11:36:50.436775601 +0100
@@ -1 +1 @@
-From e23eccfd281e056eac4f287e9993d2b26d440134 Mon Sep 17 00:00:00 2001
+From b4efe678923d2c87af4a9b337d94ba1574992863 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 e23a68e0b1..39d97eab01 100644
@@ -22 +23 @@
-@@ -6870,8 +6870,10 @@ test_snow3g_decryption_with_digest_test_case_1(void)
+@@ -6233,8 +6233,10 @@ test_snow3g_decryption_with_digest_test_case_1(void)

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From fc30e9e6e09b562dbcb4d768acba28d5d6ad275a 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/librte_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 87942c8ac3..7d0a48e880 100644
--- a/doc/guides/contributing/abi_policy.rst
+++ b/doc/guides/contributing/abi_policy.rst
@@ -163,7 +163,7 @@ The requirements for changing the ABI are:
    API becomes non-experimental, then the old one is marked with
    ``__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`.
 
     - At the declaration of the next major ABI version, those ABI changes then
diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
index ea9d99606b..6160fa1ef3 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -94,7 +94,7 @@ that library.
  ...
 
 However when a new ABI version is declared, for example DPDK ``21``, 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/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 855facd1a3..0028a4de83 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -66,8 +66,8 @@ struct rte_kni_conf {
 	uint32_t core_id;   /* Core ID to bind kernel thread on */
 	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__
 	uint8_t force_bind : 1; /* Flag to bind kernel thread */
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:50.948338709 +0100
+++ 0014-doc-fix-typo-depreciated-instead-of-deprecated.patch	2022-11-16 11:36:50.440775625 +0100
@@ -1 +1 @@
-From 98afdb15626841dd6580816678a6df63d12f22b9 Mon Sep 17 00:00:00 2001
+From fc30e9e6e09b562dbcb4d768acba28d5d6ad275a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ]
+
@@ -16 +18 @@
- lib/kni/rte_kni.h                          | 4 ++--
+ lib/librte_kni/rte_kni.h                   | 4 ++--
@@ -20 +22 @@
-index 64919b6a2b..5fd4052585 100644
+index 87942c8ac3..7d0a48e880 100644
@@ -23 +25 @@
-@@ -167,7 +167,7 @@ The requirements for changing the ABI are:
+@@ -163,7 +163,7 @@ The requirements for changing the ABI are:
@@ -33 +35 @@
-index dd96527ee5..7afd1c1886 100644
+index ea9d99606b..6160fa1ef3 100644
@@ -39 +41 @@
- However when a new ABI version is declared, for example DPDK ``22``, old
+ However when a new ABI version is declared, for example DPDK ``21``, old
@@ -45,5 +47,5 @@
-diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h
-index 37d67509a0..1e508acc82 100644
---- a/lib/kni/rte_kni.h
-+++ b/lib/kni/rte_kni.h
-@@ -65,8 +65,8 @@ struct rte_kni_conf {
+diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
+index 855facd1a3..0028a4de83 100644
+--- a/lib/librte_kni/rte_kni.h
++++ b/lib/librte_kni/rte_kni.h
+@@ -66,8 +66,8 @@ struct rte_kni_conf {

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From fc4016bb2af627264240d44f9e632aba55286e34 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 24d9c1b414..a182e4306f 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -198,7 +198,7 @@ bond_ethdev_8023ad_flow_verify(struct rte_eth_dev *bond_dev,
 	if (slave_info.max_rx_queues < bond_dev->data->nb_rx_queues ||
 			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 4cf3eb1b47..7e58754249 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -1680,7 +1680,7 @@ err_pause_addr_cfg:
 		rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
 				      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
@@ -366,7 +366,7 @@ 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);
 	if (tmp & ECORE_PGLUE_ATTENTION_ZLR_VALID) {
@@ -378,7 +378,7 @@ enum _ecore_status_t ecore_pglueb_rbc_attn_handler(struct ecore_hwfn *p_hwfn,
 				   PGLUE_B_REG_MASTER_ZLR_ERR_ADD_63_32);
 
 		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-16 11:36:50.981555016 +0100
+++ 0015-drivers-fix-typos-found-by-Lintian.patch	2022-11-16 11:36:50.448775675 +0100
@@ -1 +1 @@
-From bdab5309193d8e1ed1a60b604677c86c322364e0 Mon Sep 17 00:00:00 2001
+From fc4016bb2af627264240d44f9e632aba55286e34 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,21 +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
-@@ -754,14 +754,14 @@ mbuf_dump:
- 	printf("ctx info:\n");
- 	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,
- 		sg[0].extension, sg[0].bpid, sg[0].offset);
- 	printf("\njob->sg[1] input info:\n");
- 	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,
- 		sg[1].extension, sg[1].bpid, sg[1].offset);
@@ -36 +16 @@
-index 2efaad1e8e..b9bcebc6cb 100644
+index 24d9c1b414..a182e4306f 100644
@@ -49 +29 @@
-index b4365b78be..d326f70129 100644
+index 4cf3eb1b47..7e58754249 100644
@@ -52,3 +32,3 @@
-@@ -1661,7 +1661,7 @@ err_pause_addr_cfg:
- 		hns3_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
- 				       mac_addr);
+@@ -1680,7 +1680,7 @@ err_pause_addr_cfg:
+ 		rte_ether_format_addr(mac_str, RTE_ETHER_ADDR_FMT_SIZE,
+ 				      mac_addr);

patch 'doc: fix net drivers ordering' has been queued to stable release 19.11.14

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/03d079370f672771942dfeaf305892ef436aa948

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 03d079370f672771942dfeaf305892ef436aa948 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 11 Oct 2022 14:48:35 -0700
Subject: [PATCH] doc: fix net drivers ordering

[ upstream commit 5135eedeea910920f3351cb570dc40dd4fde23af ]

The list was not quite in alpha order, and it looked
like it should be.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 doc/guides/nics/index.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index d61c27fdfa..555ed13e3f 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -26,6 +26,7 @@ Network Interface Controller Drivers
     ena
     enetc
     enic
+    fail_safe
     fm10k
     hinic
     hns3
@@ -33,9 +34,9 @@ Network Interface Controller Drivers
     ice
     ifc
     igb
+    intel_vf
     ipn3ke
     ixgbe
-    intel_vf
     kni
     liquidio
     memif
@@ -48,6 +49,7 @@ Network Interface Controller Drivers
     nfp
     octeontx
     octeontx2
+    pcap_ring
     pfe
     qede
     sfc_efx
@@ -56,8 +58,6 @@ Network Interface Controller Drivers
     tap
     thunderx
     vdev_netvsc
-    virtio
     vhost
+    virtio
     vmxnet3
-    pcap_ring
-    fail_safe
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:51.023653126 +0100
+++ 0016-doc-fix-net-drivers-ordering.patch	2022-11-16 11:36:50.448775675 +0100
@@ -1 +1 @@
-From 5135eedeea910920f3351cb570dc40dd4fde23af Mon Sep 17 00:00:00 2001
+From 03d079370f672771942dfeaf305892ef436aa948 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5135eedeea910920f3351cb570dc40dd4fde23af ]
+
@@ -11,2 +13,2 @@
- doc/guides/nics/index.rst | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ doc/guides/nics/index.rst | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
@@ -15 +17 @@
-index 12841ce407..df58a237ca 100644
+index d61c27fdfa..555ed13e3f 100644
@@ -18 +20,2 @@
-@@ -28,6 +28,7 @@ Network Interface Controller Drivers
+@@ -26,6 +26,7 @@ Network Interface Controller Drivers
+     ena
@@ -20 +22,0 @@
-     enetfec
@@ -24 +25,0 @@
-     gve
@@ -26,2 +27,4 @@
-@@ -37,10 +38,10 @@ Network Interface Controller Drivers
-     idpf
+     hns3
+@@ -33,9 +34,9 @@ Network Interface Controller Drivers
+     ice
+     ifc
@@ -29 +31,0 @@
-     igc
@@ -31 +32,0 @@
-     ionic
@@ -37,2 +38,2 @@
-     mana
-@@ -54,8 +55,9 @@ Network Interface Controller Drivers
+     memif
+@@ -48,6 +49,7 @@ Network Interface Controller Drivers
@@ -40,5 +41,2 @@
-     ngbe
-     null
--    octeontx
-     octeon_ep
-+    octeontx
+     octeontx
+     octeontx2
@@ -49 +47,2 @@
-@@ -64,8 +66,6 @@ Network Interface Controller Drivers
+@@ -56,8 +58,6 @@ Network Interface Controller Drivers
+     tap
@@ -51 +49,0 @@
-     txgbe

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

[christian.ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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/23/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/325a874c84f6962ad534a6882539a021880b6350

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 325a874c84f6962ad534a6882539a021880b6350 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/librte_ring/rte_ring.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
index 2a9f768a1c..f4a96ca845 100644
--- a/lib/librte_ring/rte_ring.h
+++ b/lib/librte_ring/rte_ring.h
@@ -146,10 +146,9 @@ ssize_t rte_ring_get_memsize(unsigned count);
  * object table. It is advised to use rte_ring_get_memsize() to get the
  * 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
  * memory given by the caller may not be shareable among dpdk
@@ -181,10 +180,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
  * This function uses ``memzone_reserve()`` to allocate memory. Then it
  * 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-16 11:36:51.057214642 +0100
+++ 0017-ring-remove-leftover-comment-about-watermark.patch	2022-11-16 11:36:50.452775701 +0100
@@ -1 +1 @@
-From 21dc24b746a7135dd799b462d9a6479dfd54a92f Mon Sep 17 00:00:00 2001
+From 325a874c84f6962ad534a6882539a021880b6350 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21dc24b746a7135dd799b462d9a6479dfd54a92f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -14 +15 @@
- lib/ring/rte_ring.h | 14 ++++++--------
+ lib/librte_ring/rte_ring.h | 14 ++++++--------
@@ -17,5 +18,5 @@
-diff --git a/lib/ring/rte_ring.h b/lib/ring/rte_ring.h
-index 7c48e35d27..7e4cd60650 100644
---- a/lib/ring/rte_ring.h
-+++ b/lib/ring/rte_ring.h
-@@ -66,10 +66,9 @@ ssize_t rte_ring_get_memsize(unsigned int count);
+diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h
+index 2a9f768a1c..f4a96ca845 100644
+--- a/lib/librte_ring/rte_ring.h
++++ b/lib/librte_ring/rte_ring.h
+@@ -146,10 +146,9 @@ ssize_t rte_ring_get_memsize(unsigned count);
@@ -27 +28 @@
-- * *count-1* instead of *count* to differentiate a full ring from an
+- * *count-1* instead of *count* to differentiate a free ring from an
@@ -35 +36 @@
-@@ -127,10 +126,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
+@@ -181,10 +180,9 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
@@ -41 +42 @@
-- * 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