patch 'mempool: fix default ops for an empty mempool' has been queued to stable release 21.11.6

patch 'mempool: fix default ops for an empty mempool' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From acafc55e2672613b92e966975b1e359486de31d6 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 16 Aug 2023 16:34:29 +0100
Subject: [PATCH] mempool: fix default ops for an empty mempool
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit c2c6b2f413051b022488518d040508b9ea6e0130 ]

An empty mempool's ops were not initialised to a default value wrt to
what the application requested via the flags parameter.  As
rte_mempool_create() relies on rte_mempool_create_empty(), simply move
this ops initialisation to rte_mempool_create_empty().

Fixes: aa10457eb4c2 ("mempool: make mempool populate and free api public")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Morten Brørup <mb@smartsharesystems.com>
---
 lib/mempool/rte_mempool.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 40e6d17409..4dbff7fbc4 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -917,4 +917,20 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
 	STAILQ_INIT(&mp->mem_list);
 
+	/*
+	 * Since we have 4 combinations of the SP/SC/MP/MC examine the flags to
+	 * set the correct index into the table of ops structs.
+	 */
+	if ((flags & RTE_MEMPOOL_F_SP_PUT) && (flags & RTE_MEMPOOL_F_SC_GET))
+		ret = rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL);
+	else if (flags & RTE_MEMPOOL_F_SP_PUT)
+		ret = rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL);
+	else if (flags & RTE_MEMPOOL_F_SC_GET)
+		ret = rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL);
+	else
+		ret = rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL);
+
+	if (ret)
+		goto exit_unlock;
+
 	/*
 	 * local_cache pointer is set even if cache_size is zero.
@@ -957,5 +973,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
 	int socket_id, unsigned flags)
 {
-	int ret;
 	struct rte_mempool *mp;
 
@@ -965,20 +980,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
 		return NULL;
 
-	/*
-	 * Since we have 4 combinations of the SP/SC/MP/MC examine the flags to
-	 * set the correct index into the table of ops structs.
-	 */
-	if ((flags & RTE_MEMPOOL_F_SP_PUT) && (flags & RTE_MEMPOOL_F_SC_GET))
-		ret = rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL);
-	else if (flags & RTE_MEMPOOL_F_SP_PUT)
-		ret = rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL);
-	else if (flags & RTE_MEMPOOL_F_SC_GET)
-		ret = rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL);
-	else
-		ret = rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL);
-
-	if (ret)
-		goto fail;
-
 	/* call the mempool priv initializer */
 	if (mp_init)
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:40.945642681 +0000
+++ 0001-mempool-fix-default-ops-for-an-empty-mempool.patch	2023-11-02 13:09:40.760163165 +0000
@@ -1 +1 @@
-From c2c6b2f413051b022488518d040508b9ea6e0130 Mon Sep 17 00:00:00 2001
+From acafc55e2672613b92e966975b1e359486de31d6 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit c2c6b2f413051b022488518d040508b9ea6e0130 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 4d337fca8d..7a7a9bf6db 100644
+index 40e6d17409..4dbff7fbc4 100644
@@ -28 +29 @@
-@@ -915,4 +915,20 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
+@@ -917,4 +917,20 @@ rte_mempool_create_empty(const char *name, unsigned n, unsigned elt_size,
@@ -49 +50 @@
-@@ -955,5 +971,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
+@@ -957,5 +973,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
@@ -55 +56 @@
-@@ -963,20 +978,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
+@@ -965,20 +980,4 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,

patch 'eal/unix: fix firmware reading with external xz helper' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From c8f024efd852b3826a1cd8faabfa372be638e00d Mon Sep 17 00:00:00 2001
From: Srikanth Yalavarthi <syalavarthi@marvell.com>
Date: Tue, 26 Sep 2023 07:44:54 -0700
Subject: [PATCH] eal/unix: fix firmware reading with external xz helper

[ upstream commit 39970abcf4850e070aa4709c87bcac15cb27caf8 ]

libarchive may support xz decompression only through an
external (slower) helper.

In such a case, archive_read_support_filter_xz() returns
ARCHIVE_WARN.

Fixes: 40edb9c0d36b ("eal: handle compressed firmware")

Signed-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
 lib/eal/unix/eal_firmware.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/eal/unix/eal_firmware.c b/lib/eal/unix/eal_firmware.c
index d1616b0bd9..1a7cf8e7b7 100644
--- a/lib/eal/unix/eal_firmware.c
+++ b/lib/eal/unix/eal_firmware.c
@@ -26,17 +26,29 @@ firmware_open(struct firmware_read_ctx *ctx, const char *name, size_t blocksize)
 {
 	struct archive_entry *e;
+	int err;
 
 	ctx->a = archive_read_new();
 	if (ctx->a == NULL)
 		return -1;
-	if (archive_read_support_format_raw(ctx->a) != ARCHIVE_OK ||
-			archive_read_support_filter_xz(ctx->a) != ARCHIVE_OK ||
-			archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK ||
-			archive_read_next_header(ctx->a, &e) != ARCHIVE_OK) {
-		archive_read_free(ctx->a);
-		ctx->a = NULL;
-		return -1;
-	}
+
+	if (archive_read_support_format_raw(ctx->a) != ARCHIVE_OK)
+		goto error;
+
+	err = archive_read_support_filter_xz(ctx->a);
+	if (err != ARCHIVE_OK && err != ARCHIVE_WARN)
+		goto error;
+
+	if (archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK)
+		goto error;
+
+	if (archive_read_next_header(ctx->a, &e) != ARCHIVE_OK)
+		goto error;
+
 	return 0;
+
+error:
+	archive_read_free(ctx->a);
+	ctx->a = NULL;
+	return -1;
 }
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:40.967609150 +0000
+++ 0002-eal-unix-fix-firmware-reading-with-external-xz-helpe.patch	2023-11-02 13:09:40.762163172 +0000
@@ -1 +1 @@
-From 39970abcf4850e070aa4709c87bcac15cb27caf8 Mon Sep 17 00:00:00 2001
+From c8f024efd852b3826a1cd8faabfa372be638e00d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 39970abcf4850e070aa4709c87bcac15cb27caf8 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

patch 'rawdev: fix device class in log message' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 2e32b7f95837afecdafd26c4f9c3d6664d03ed38 Mon Sep 17 00:00:00 2001
From: Tomasz Duszynski <tduszynski@marvell.com>
Date: Mon, 24 Jul 2023 15:36:46 +0200
Subject: [PATCH] rawdev: fix device class in log message

[ upstream commit eab2364c0e1bdb2a17ba601c1f7f48b213532e2a ]

Use proper naming when dealing with a raw device.

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

Signed-off-by: Tomasz Duszynski <tduszynski@marvell.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 lib/rawdev/rte_rawdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c
index a6134e76ea..c06ed8b9c7 100644
--- a/lib/rawdev/rte_rawdev.c
+++ b/lib/rawdev/rte_rawdev.c
@@ -495,6 +495,5 @@ rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)
 
 	if (rte_rawdev_pmd_get_named_dev(name) != NULL) {
-		RTE_RDEV_ERR("Event device with name %s already allocated!",
-			     name);
+		RTE_RDEV_ERR("Raw device with name %s already allocated!", name);
 		return NULL;
 	}
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:40.989207496 +0000
+++ 0003-rawdev-fix-device-class-in-log-message.patch	2023-11-02 13:09:40.764163178 +0000
@@ -1 +1 @@
-From eab2364c0e1bdb2a17ba601c1f7f48b213532e2a Mon Sep 17 00:00:00 2001
+From 2e32b7f95837afecdafd26c4f9c3d6664d03ed38 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit eab2364c0e1bdb2a17ba601c1f7f48b213532e2a ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index dacaa60e22..474bdc9540 100644
+index a6134e76ea..c06ed8b9c7 100644
@@ -21 +22 @@
-@@ -506,6 +506,5 @@ rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)
+@@ -495,6 +495,5 @@ rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)

patch 'net/bonding: fix header for C++' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 41073f2809c8ad0648689fe698fdc80523da0850 Mon Sep 17 00:00:00 2001
From: Visa Hankala <visa@hankala.org>
Date: Wed, 9 Aug 2023 15:52:41 +0000
Subject: [PATCH] net/bonding: fix header for C++

[ upstream commit 25fac202f4e00dd1be4eef794174b689a5f64d54 ]

Apply C linkage to the whole header to allow use with C++.

Fixes: dc40f17a36bc ("net/bonding: allow external state machine in mode 4")

Signed-off-by: Visa Hankala <visa@hankala.org>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h
index 7eb392f8c8..025bd0ec54 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.h
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.h
@@ -198,8 +198,4 @@ rte_eth_bond_8023ad_slave_info(uint16_t port_id, uint16_t slave_id,
 		struct rte_eth_bond_8023ad_slave_info *conf);
 
-#ifdef __cplusplus
-}
-#endif
-
 /**
  * Configure a slave port to start collecting.
@@ -332,3 +328,8 @@ int
 rte_eth_bond_8023ad_agg_selection_set(uint16_t port_id,
 		enum rte_bond_8023ad_agg_selection agg_selection);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* RTE_ETH_BOND_8023AD_H_ */
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.011100356 +0000
+++ 0004-net-bonding-fix-header-for-C.patch	2023-11-02 13:09:40.765163181 +0000
@@ -1 +1 @@
-From 25fac202f4e00dd1be4eef794174b689a5f64d54 Mon Sep 17 00:00:00 2001
+From 41073f2809c8ad0648689fe698fdc80523da0850 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 25fac202f4e00dd1be4eef794174b689a5f64d54 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 7ad8d6d00b..921b4446b7 100644
+index 7eb392f8c8..025bd0ec54 100644

patch 'net/sfc: set max Rx packet length for representors' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From c0edca24f2c33aca49353d4b716419f85f3c3252 Mon Sep 17 00:00:00 2001
From: Viacheslav Galaktionov <viacheslav.galaktionov@arknetworks.am>
Date: Mon, 11 Sep 2023 14:47:23 +0400
Subject: [PATCH] net/sfc: set max Rx packet length for representors

[ upstream commit a51985667d50aadd58d1fbcefb084b9791df4992 ]

Maximum packet length must be set to configure representor devices.

Fixes: a62ec90522a6 ("net/sfc: add port representors infrastructure")

Signed-off-by: Viacheslav Galaktionov <viacheslav.galaktionov@arknetworks.am>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 drivers/net/sfc/sfc_repr.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/sfc/sfc_repr.c b/drivers/net/sfc/sfc_repr.c
index 170f110048..8593ee80f5 100644
--- a/drivers/net/sfc/sfc_repr.c
+++ b/drivers/net/sfc/sfc_repr.c
@@ -536,4 +536,5 @@ sfc_repr_dev_infos_get(struct rte_eth_dev *dev,
 	dev_info->device = dev->device;
 
+	dev_info->max_rx_pktlen = EFX_MAC_PDU_MAX;
 	dev_info->max_rx_queues = SFC_REPR_RXQ_MAX;
 	dev_info->max_tx_queues = SFC_REPR_TXQ_MAX;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.032296628 +0000
+++ 0005-net-sfc-set-max-Rx-packet-length-for-representors.patch	2023-11-02 13:09:40.767163188 +0000
@@ -1 +1 @@
-From a51985667d50aadd58d1fbcefb084b9791df4992 Mon Sep 17 00:00:00 2001
+From c0edca24f2c33aca49353d4b716419f85f3c3252 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a51985667d50aadd58d1fbcefb084b9791df4992 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 6c7727d569..5f93192522 100644
+index 170f110048..8593ee80f5 100644
@@ -22 +23 @@
-@@ -503,4 +503,5 @@ sfc_repr_dev_infos_get(struct rte_eth_dev *dev,
+@@ -536,4 +536,5 @@ sfc_repr_dev_infos_get(struct rte_eth_dev *dev,

patch 'net/sfc: account for data offset on Tx' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 0ea692c019ba9271499d658bae1cee724a849a20 Mon Sep 17 00:00:00 2001
From: Viacheslav Galaktionov <viacheslav.galaktionov@arknetworks.am>
Date: Mon, 11 Sep 2023 14:47:41 +0400
Subject: [PATCH] net/sfc: account for data offset on Tx

[ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ]

Memory buffers passed by the application may contain private data,
which must not be sent to the NIC. Omit this private data by using
the actual data address instead of the default one.

Fixes: 3037e6cf3dde ("net/sfc: support regioned NIC DMA memory mapping type")

Signed-off-by: Viacheslav Galaktionov <viacheslav.galaktionov@arknetworks.am>
Reviewed-by: Ivan Malov <ivan.malov@arknetworks.am>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
 drivers/net/sfc/sfc_ef100_tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/sfc/sfc_ef100_tx.c b/drivers/net/sfc/sfc_ef100_tx.c
index 4c2205f7a4..1b6374775f 100644
--- a/drivers/net/sfc/sfc_ef100_tx.c
+++ b/drivers/net/sfc/sfc_ef100_tx.c
@@ -406,5 +406,5 @@ sfc_ef100_tx_qdesc_send_create(const struct sfc_ef100_txq *txq,
 	}
 
-	rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova_default(m),
+	rc = sfc_ef100_tx_map(txq, rte_mbuf_data_iova(m),
 			      rte_pktmbuf_data_len(m), &dma_addr);
 	if (unlikely(rc != 0))
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.054123499 +0000
+++ 0006-net-sfc-account-for-data-offset-on-Tx.patch	2023-11-02 13:09:40.769163194 +0000
@@ -1 +1 @@
-From e7694b080de025fbc4bb31fbe7eb149f20a10373 Mon Sep 17 00:00:00 2001
+From 0ea692c019ba9271499d658bae1cee724a849a20 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e7694b080de025fbc4bb31fbe7eb149f20a10373 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

patch 'net/sfc: add missing error code indication to MAE init path' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 2a40eeaf9a135861410dda10589bf90372ba094d Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov@arknetworks.am>
Date: Thu, 10 Aug 2023 21:36:14 +0400
Subject: [PATCH] net/sfc: add missing error code indication to MAE init path

[ upstream commit 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 ]

A failure to allocate a bounce buffer for encap. header
parsing results in falling to the error path but does
not set an appropriate error code. Fix this.

Fixes: 1bbd1ec2348a ("net/sfc: support action VXLAN encap in MAE backend")

Signed-off-by: Ivan Malov <ivan.malov@arknetworks.am>
Reviewed-by: Andy Moreton <andy.moreton@amd.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 .mailmap                  | 2 +-
 drivers/net/sfc/sfc_mae.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 7de8dbf81d..eddb8a2c4f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -104,5 +104,5 @@ Andrzej Ostruszka <amo@semihalf.com> <aostruszka@marvell.com>
 Andy Gospodarek <andrew.gospodarek@broadcom.com> <gospo@broadcom.com>
 Andy Green <andy@warmcat.com>
-Andy Moreton <amoreton@xilinx.com> <amoreton@solarflare.com>
+Andy Moreton <andy.moreton@amd.com> <amoreton@xilinx.com> <amoreton@solarflare.com>
 Andy Pei <andy.pei@intel.com>
 Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 76b7c59ac0..eb97524dc3 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -282,6 +282,8 @@ sfc_mae_attach(struct sfc_adapter *sa)
 		bounce_eh->buf = rte_malloc("sfc_mae_bounce_eh",
 					    bounce_eh->buf_size, 0);
-		if (bounce_eh->buf == NULL)
+		if (bounce_eh->buf == NULL) {
+			rc = ENOMEM;
 			goto fail_mae_alloc_bounce_eh;
+		}
 
 		mae->nb_outer_rule_prios_max = limits.eml_max_n_outer_prios;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.075448187 +0000
+++ 0007-net-sfc-add-missing-error-code-indication-to-MAE-ini.patch	2023-11-02 13:09:40.776163217 +0000
@@ -1 +1 @@
-From 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 Mon Sep 17 00:00:00 2001
+From 2a40eeaf9a135861410dda10589bf90372ba094d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1f5e6bb633cafc2789ec74e80bf90fa54ef5b788 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 864d33ee46..ec31ab8bd0 100644
+index 7de8dbf81d..eddb8a2c4f 100644
@@ -25 +26 @@
-@@ -107,5 +107,5 @@ Andrzej Ostruszka <amo@semihalf.com> <aostruszka@marvell.com>
+@@ -104,5 +104,5 @@ Andrzej Ostruszka <amo@semihalf.com> <aostruszka@marvell.com>
@@ -33 +34 @@
-index f5fe55b46f..bf1c2f60c2 100644
+index 76b7c59ac0..eb97524dc3 100644
@@ -36 +37 @@
-@@ -216,6 +216,8 @@ sfc_mae_attach(struct sfc_adapter *sa)
+@@ -282,6 +282,8 @@ sfc_mae_attach(struct sfc_adapter *sa)

patch 'net/hns3: fix VF default MAC modified when set failed' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From e5a349762af673a5744b5fa9f0a80e02ce7f0ff4 Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui@huawei.com>
Date: Sat, 5 Aug 2023 16:36:23 +0800
Subject: [PATCH] net/hns3: fix VF default MAC modified when set failed

[ upstream commit ed7faab2a717347077d9e657fba010bb145a2b54 ]

When the VF fail to set the default MAC address,
"hw->mac.mac_addr" should not be updated.

Fixes: a5475d61fa34 ("net/hns3: support VF")

Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
 drivers/net/hns3/hns3_ethdev_vf.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index ff1ee52dba..a125cfbeb9 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -251,4 +251,6 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,
 				 mac_str, ret);
 		}
+		rte_spinlock_unlock(&hw->lock);
+		return ret;
 	}
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.100570476 +0000
+++ 0008-net-hns3-fix-VF-default-MAC-modified-when-set-failed.patch	2023-11-02 13:09:40.779163226 +0000
@@ -1 +1 @@
-From ed7faab2a717347077d9e657fba010bb145a2b54 Mon Sep 17 00:00:00 2001
+From e5a349762af673a5744b5fa9f0a80e02ce7f0ff4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ed7faab2a717347077d9e657fba010bb145a2b54 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 3729615159..007f5d619f 100644
+index ff1ee52dba..a125cfbeb9 100644
@@ -22 +23 @@
-@@ -170,4 +170,6 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,
+@@ -251,4 +251,6 @@ hns3vf_set_default_mac_addr(struct rte_eth_dev *dev,

patch 'net/hns3: fix error code for multicast resource' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 21874e8d89190f3a1fa311a2705b7632c43fccce Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui@huawei.com>
Date: Sat, 5 Aug 2023 16:36:24 +0800
Subject: [PATCH] net/hns3: fix error code for multicast resource

[ upstream commit c8cd885352d58bcfcc514770cb6068dd689d0dc3 ]

Return ENOSPC instead of EINVAL when the hardware
has not enough multicast filtering resources.

Fixes: 7d7f9f80bbfb ("net/hns3: support MAC address related operations")

Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
 drivers/net/hns3/hns3_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c
index 07e9b3f979..76e2796255 100644
--- a/drivers/net/hns3/hns3_common.c
+++ b/drivers/net/hns3/hns3_common.c
@@ -350,5 +350,5 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw,
 			 "invalid. valid range: 0~%d",
 			 nb_mc_addr, HNS3_MC_MACADDR_NUM);
-		return -EINVAL;
+		return -ENOSPC;
 	}
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.122988742 +0000
+++ 0009-net-hns3-fix-error-code-for-multicast-resource.patch	2023-11-02 13:09:40.779163226 +0000
@@ -1 +1 @@
-From c8cd885352d58bcfcc514770cb6068dd689d0dc3 Mon Sep 17 00:00:00 2001
+From 21874e8d89190f3a1fa311a2705b7632c43fccce Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c8cd885352d58bcfcc514770cb6068dd689d0dc3 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index a11ea686fd..043c7673b4 100644
+index 07e9b3f979..76e2796255 100644
@@ -22 +23 @@
-@@ -387,5 +387,5 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw,
+@@ -350,5 +350,5 @@ hns3_set_mc_addr_chk_param(struct hns3_hw *hw,

patch 'net/hns3: fix flushing multicast MAC address' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 7690a37723502aced124c8e573a502121c55ca1f Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui@huawei.com>
Date: Sat, 5 Aug 2023 16:36:25 +0800
Subject: [PATCH] net/hns3: fix flushing multicast MAC address

[ upstream commit 49d1ab205b033b6131fb895b5e4d9ebc14081e51 ]

According rte_eth_dev_set_mc_addr_list() API definition,
support flush multicast MAC address if mc_addr_set is NULL
or nb_mc_addr is zero.

Fixes: 7d7f9f80bbfb ("net/hns3: support MAC address related operations")

Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
 drivers/net/hns3/hns3_common.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c
index 76e2796255..6dae69347c 100644
--- a/drivers/net/hns3/hns3_common.c
+++ b/drivers/net/hns3/hns3_common.c
@@ -408,4 +408,5 @@ hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,
 {
 	struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+	struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
 	struct rte_ether_addr *addr;
 	int cur_addr_num;
@@ -415,4 +416,13 @@ hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,
 	int i;
 
+	if (mc_addr_set == NULL || nb_mc_addr == 0) {
+		rte_spinlock_lock(&hw->lock);
+		ret = hns3_configure_all_mc_mac_addr(hns, true);
+		if (ret == 0)
+			hw->mc_addrs_num = 0;
+		rte_spinlock_unlock(&hw->lock);
+		return ret;
+	}
+
 	/* Check if input parameters are valid */
 	ret = hns3_set_mc_addr_chk_param(hw, mc_addr_set, nb_mc_addr);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.144382037 +0000
+++ 0010-net-hns3-fix-flushing-multicast-MAC-address.patch	2023-11-02 13:09:40.780163230 +0000
@@ -1 +1 @@
-From 49d1ab205b033b6131fb895b5e4d9ebc14081e51 Mon Sep 17 00:00:00 2001
+From 7690a37723502aced124c8e573a502121c55ca1f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 49d1ab205b033b6131fb895b5e4d9ebc14081e51 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 043c7673b4..c4d47f43fe 100644
+index 76e2796255..6dae69347c 100644
@@ -23 +24 @@
-@@ -445,4 +445,5 @@ hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,
+@@ -408,4 +408,5 @@ hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,
@@ -29 +30 @@
-@@ -452,4 +453,13 @@ hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,
+@@ -415,4 +416,13 @@ hns3_set_mc_mac_addr_list(struct rte_eth_dev *dev,

patch 'net/hns3: fix order in NEON Rx' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 03a4383ed726dce9be60a4e098cc186882639e4e Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Tue, 11 Jul 2023 18:24:45 +0800
Subject: [PATCH] net/hns3: fix order in NEON Rx

[ upstream commit 7dd439ed998c36c8d0204c436cc656af08cfa5fc ]

This patch reorders the order of the NEON Rx for better maintenance
and easier understanding.

Fixes: a3d4f4d291d7 ("net/hns3: support NEON Rx")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
 drivers/net/hns3/hns3_rxtx_vec_neon.h | 80 +++++++++++----------------
 1 file changed, 32 insertions(+), 48 deletions(-)

diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h b/drivers/net/hns3/hns3_rxtx_vec_neon.h
index a5b2011654..2d1ecf93e6 100644
--- a/drivers/net/hns3/hns3_rxtx_vec_neon.h
+++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h
@@ -181,7 +181,4 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
 		bd_vld = vset_lane_u16(rxdp[3].rx.bdtype_vld_udp0, bd_vld, 3);
 
-		/* load 2 mbuf pointer */
-		mbp1 = vld1q_u64((uint64_t *)&sw_ring[pos]);
-
 		bd_vld = vshl_n_u16(bd_vld,
 				    HNS3_UINT16_BIT - 1 - HNS3_RXD_VLD_B);
@@ -190,8 +187,4 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
 					   HNS3_UINT16_BIT - 1));
 		stat = ~vget_lane_u64(vreinterpret_u64_u16(bd_vld), 0);
-
-		/* load 2 mbuf pointer again */
-		mbp2 = vld1q_u64((uint64_t *)&sw_ring[pos + 2]);
-
 		if (likely(stat == 0))
 			bd_valid_num = HNS3_DEFAULT_DESCS_PER_LOOP;
@@ -201,18 +194,18 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
 			break;
 
+		/* load 4 mbuf pointer */
+		mbp1 = vld1q_u64((uint64_t *)&sw_ring[pos]);
+		mbp2 = vld1q_u64((uint64_t *)&sw_ring[pos + 2]);
+
+		/* store 4 mbuf pointer into rx_pkts */
+		vst1q_u64((uint64_t *)&rx_pkts[pos], mbp1);
+		vst1q_u64((uint64_t *)&rx_pkts[pos + 2], mbp2);
+
 		/* use offset to control below data load oper ordering */
 		offset = rxq->offset_table[bd_valid_num];
 
-		/* store 2 mbuf pointer into rx_pkts */
-		vst1q_u64((uint64_t *)&rx_pkts[pos], mbp1);
-
-		/* read first two descs */
+		/* read 4 descs */
 		descs[0] = vld2q_u64((uint64_t *)(rxdp + offset));
 		descs[1] = vld2q_u64((uint64_t *)(rxdp + offset + 1));
-
-		/* store 2 mbuf pointer into rx_pkts again */
-		vst1q_u64((uint64_t *)&rx_pkts[pos + 2], mbp2);
-
-		/* read remains two descs */
 		descs[2] = vld2q_u64((uint64_t *)(rxdp + offset + 2));
 		descs[3] = vld2q_u64((uint64_t *)(rxdp + offset + 3));
@@ -222,21 +215,4 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
 		pkt_mbuf2.val[0] = vreinterpretq_u8_u64(descs[1].val[0]);
 		pkt_mbuf2.val[1] = vreinterpretq_u8_u64(descs[1].val[1]);
-
-		/* pkt 1,2 convert format from desc to pktmbuf */
-		pkt_mb1 = vqtbl2q_u8(pkt_mbuf1, shuf_desc_fields_msk);
-		pkt_mb2 = vqtbl2q_u8(pkt_mbuf2, shuf_desc_fields_msk);
-
-		/* store the first 8 bytes of pkt 1,2 mbuf's rearm_data */
-		*(uint64_t *)&sw_ring[pos + 0].mbuf->rearm_data =
-			rxq->mbuf_initializer;
-		*(uint64_t *)&sw_ring[pos + 1].mbuf->rearm_data =
-			rxq->mbuf_initializer;
-
-		/* pkt 1,2 remove crc */
-		tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb1), crc_adjust);
-		pkt_mb1 = vreinterpretq_u8_u16(tmp);
-		tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb2), crc_adjust);
-		pkt_mb2 = vreinterpretq_u8_u16(tmp);
-
 		pkt_mbuf3.val[0] = vreinterpretq_u8_u64(descs[2].val[0]);
 		pkt_mbuf3.val[1] = vreinterpretq_u8_u64(descs[2].val[1]);
@@ -244,15 +220,15 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
 		pkt_mbuf4.val[1] = vreinterpretq_u8_u64(descs[3].val[1]);
 
-		/* pkt 3,4 convert format from desc to pktmbuf */
+		/* 4 packets convert format from desc to pktmbuf */
+		pkt_mb1 = vqtbl2q_u8(pkt_mbuf1, shuf_desc_fields_msk);
+		pkt_mb2 = vqtbl2q_u8(pkt_mbuf2, shuf_desc_fields_msk);
 		pkt_mb3 = vqtbl2q_u8(pkt_mbuf3, shuf_desc_fields_msk);
 		pkt_mb4 = vqtbl2q_u8(pkt_mbuf4, shuf_desc_fields_msk);
 
-		/* pkt 1,2 save to rx_pkts mbuf */
-		vst1q_u8((void *)&sw_ring[pos + 0].mbuf->rx_descriptor_fields1,
-			 pkt_mb1);
-		vst1q_u8((void *)&sw_ring[pos + 1].mbuf->rx_descriptor_fields1,
-			 pkt_mb2);
-
-		/* pkt 3,4 remove crc */
+		/* 4 packets remove crc */
+		tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb1), crc_adjust);
+		pkt_mb1 = vreinterpretq_u8_u16(tmp);
+		tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb2), crc_adjust);
+		pkt_mb2 = vreinterpretq_u8_u16(tmp);
 		tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb3), crc_adjust);
 		pkt_mb3 = vreinterpretq_u8_u16(tmp);
@@ -260,11 +236,9 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
 		pkt_mb4 = vreinterpretq_u8_u16(tmp);
 
-		/* store the first 8 bytes of pkt 3,4 mbuf's rearm_data */
-		*(uint64_t *)&sw_ring[pos + 2].mbuf->rearm_data =
-			rxq->mbuf_initializer;
-		*(uint64_t *)&sw_ring[pos + 3].mbuf->rearm_data =
-			rxq->mbuf_initializer;
-
-		/* pkt 3,4 save to rx_pkts mbuf */
+		/* save packet info to rx_pkts mbuf */
+		vst1q_u8((void *)&sw_ring[pos + 0].mbuf->rx_descriptor_fields1,
+			 pkt_mb1);
+		vst1q_u8((void *)&sw_ring[pos + 1].mbuf->rx_descriptor_fields1,
+			 pkt_mb2);
 		vst1q_u8((void *)&sw_ring[pos + 2].mbuf->rx_descriptor_fields1,
 			 pkt_mb3);
@@ -272,4 +246,14 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq,
 			 pkt_mb4);
 
+		/* store the first 8 bytes of packets mbuf's rearm_data */
+		*(uint64_t *)&sw_ring[pos + 0].mbuf->rearm_data =
+			rxq->mbuf_initializer;
+		*(uint64_t *)&sw_ring[pos + 1].mbuf->rearm_data =
+			rxq->mbuf_initializer;
+		*(uint64_t *)&sw_ring[pos + 2].mbuf->rearm_data =
+			rxq->mbuf_initializer;
+		*(uint64_t *)&sw_ring[pos + 3].mbuf->rearm_data =
+			rxq->mbuf_initializer;
+
 		rte_prefetch_non_temporal(rxdp + HNS3_DEFAULT_DESCS_PER_LOOP);
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.165996965 +0000
+++ 0011-net-hns3-fix-order-in-NEON-Rx.patch	2023-11-02 13:09:40.781163233 +0000
@@ -1 +1 @@
-From 7dd439ed998c36c8d0204c436cc656af08cfa5fc Mon Sep 17 00:00:00 2001
+From 03a4383ed726dce9be60a4e098cc186882639e4e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7dd439ed998c36c8d0204c436cc656af08cfa5fc ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 564d831a48..0dc6b9f0a2 100644
+index a5b2011654..2d1ecf93e6 100644

patch 'random: initialize state for unregistered non-EAL threads' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 81b71fcdab51c54c9f5cbaa2d99f8696c4c9a728 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Thu, 7 Sep 2023 08:24:55 -0700
Subject: [PATCH] random: initialize state for unregistered non-EAL threads
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 3a4e21301c7a8bf709ff9e74d05628f87450a11e ]

The per-lcore PRNG was not initializing the rand_state of all
the lcores. Any usage of rte_random by an unregistered non-EAL thread
would use rand_states[RTE_MAX_LCORE] which was never initialized.

Fix by using RTE_DIM() which will get all lcores.

Fixes: 3f002f069612 ("eal: replace libc-based random generation with LFSR")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Mattias Rönnblom <mattias.ronnblom@ericsson.com>
---
 lib/eal/common/rte_random.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/eal/common/rte_random.c b/lib/eal/common/rte_random.c
index ce21c2242a..ac5876dd1f 100644
--- a/lib/eal/common/rte_random.c
+++ b/lib/eal/common/rte_random.c
@@ -83,5 +83,5 @@ rte_srand(uint64_t seed)
 
 	/* add lcore_id to seed to avoid having the same sequence */
-	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++)
+	for (lcore_id = 0; lcore_id < RTE_DIM(rand_states); lcore_id++)
 		__rte_srand_lfsr258(seed + lcore_id, &rand_states[lcore_id]);
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.187154927 +0000
+++ 0012-random-initialize-state-for-unregistered-non-EAL-thr.patch	2023-11-02 13:09:40.781163233 +0000
@@ -1 +1 @@
-From 3a4e21301c7a8bf709ff9e74d05628f87450a11e Mon Sep 17 00:00:00 2001
+From 81b71fcdab51c54c9f5cbaa2d99f8696c4c9a728 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 3a4e21301c7a8bf709ff9e74d05628f87450a11e ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 53636331a2..812e5b4757 100644
+index ce21c2242a..ac5876dd1f 100644
@@ -29 +30 @@
-@@ -85,5 +85,5 @@ rte_srand(uint64_t seed)
+@@ -83,5 +83,5 @@ rte_srand(uint64_t seed)

patch 'bus/dpaa: fix build with asserts for GCC 13' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 171c6bf70d375dbceecb9507496baaaeff85d7e5 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh@nxp.com>
Date: Fri, 21 Jul 2023 10:58:10 +0530
Subject: [PATCH] bus/dpaa: fix build with asserts for GCC 13

[ upstream commit 3bcd5b3198d4a31176b1ac73fc7236a12186fffe ]

when RTE_ENABLE_ASSERT is enable, DPAA driver is doing
wrong NULL check on frame queue which allows the code
to have access to NULL address.
GCC v13 is giving array bounds error if code is
accessing any memory region less than 4KB.
This patch fixes this issue by adding proper NULL checks
on frame queue.

Bugzilla ID: 1233
Fixes: c47ff048b99a ("bus/dpaa: add QMAN driver core routines")

Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 drivers/bus/dpaa/base/qbman/qman.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c
index 447c091770..aa8da96627 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -2,5 +2,5 @@
  *
  * Copyright 2008-2016 Freescale Semiconductor Inc.
- * Copyright 2017,2019 NXP
+ * Copyright 2017,2019-2023 NXP
  *
  */
@@ -898,5 +898,5 @@ mr_loop:
 				fq = table_find_fq(p,
 						   be32_to_cpu(msg->fq.fqid));
-				DPAA_BUG_ON(!fq);
+				DPAA_BUG_ON(fq != NULL);
 				fq_state_change(p, fq, &swapped_msg, verb);
 				if (fq->cb.fqs)
@@ -910,4 +910,5 @@ mr_loop:
 				fq = (void *)(uintptr_t)msg->fq.contextB;
 #endif
+				DPAA_BUG_ON(fq != NULL);
 				fq_state_change(p, fq, msg, verb);
 				if (fq->cb.fqs)
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.208344145 +0000
+++ 0013-bus-dpaa-fix-build-with-asserts-for-GCC-13.patch	2023-11-02 13:09:40.784163242 +0000
@@ -1 +1 @@
-From 3bcd5b3198d4a31176b1ac73fc7236a12186fffe Mon Sep 17 00:00:00 2001
+From 171c6bf70d375dbceecb9507496baaaeff85d7e5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3bcd5b3198d4a31176b1ac73fc7236a12186fffe ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -26 +27 @@
-index 3949bf8712..83db0a534e 100644
+index 447c091770..aa8da96627 100644

patch 'hash: align SSE lookup to scalar implementation' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 25123c091bb4e33e760cca9a72be5f4b2ac9a145 Mon Sep 17 00:00:00 2001
From: Jieqiang Wang <jieqiang.wang@arm.com>
Date: Sat, 7 Oct 2023 15:36:34 +0800
Subject: [PATCH] hash: align SSE lookup to scalar implementation

[ upstream commit e93bbaa72cca7ec912d756afdf10e393f9d71791 ]

__mm_cmpeq_epi16 returns 0xFFFF if the corresponding 16-bit elements are
equal. In original SSE2 implementation for function compare_signatures,
it utilizes _mm_movemask_epi8 to create mask from the MSB of each 8-bit
element, while we should only care about the MSB of lower 8-bit in each
16-bit element.

For example, if the comparison result is all equal, SSE2 path returns
0xFFFF while NEON and default scalar path return 0x5555.
Although this bug is not causing any negative effects since the caller
function solely examines the trailing zeros of each match mask, we
recommend this fix to ensure consistency with NEON and default scalar
code behaviors.

Fixes: c7d93df552c2 ("hash: use partial-key hashing")

Signed-off-by: Feifei Wang <feifei.wang2@arm.com>
Signed-off-by: Jieqiang Wang <jieqiang.wang@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/hash/rte_cuckoo_hash.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index cff4242f79..95c3e6c2f4 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -1867,4 +1867,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
 					(__m128i const *)prim_bkt->sig_current),
 				_mm_set1_epi16(sig)));
+		/* Extract the even-index bits only */
+		*prim_hash_matches &= 0x5555;
 		/* Compare all signatures in the bucket */
 		*sec_hash_matches = _mm_movemask_epi8(_mm_cmpeq_epi16(
@@ -1872,4 +1874,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
 					(__m128i const *)sec_bkt->sig_current),
 				_mm_set1_epi16(sig)));
+		/* Extract the even-index bits only */
+		*sec_hash_matches &= 0x5555;
 		break;
 #elif defined(__ARM_NEON)
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.231401528 +0000
+++ 0014-hash-align-SSE-lookup-to-scalar-implementation.patch	2023-11-02 13:09:40.786163249 +0000
@@ -1 +1 @@
-From e93bbaa72cca7ec912d756afdf10e393f9d71791 Mon Sep 17 00:00:00 2001
+From 25123c091bb4e33e760cca9a72be5f4b2ac9a145 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e93bbaa72cca7ec912d756afdf10e393f9d71791 ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index d92a903bb3..19b23f2a97 100644
+index cff4242f79..95c3e6c2f4 100644
@@ -34 +35 @@
-@@ -1869,4 +1869,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
+@@ -1867,4 +1867,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
@@ -41 +42 @@
-@@ -1874,4 +1876,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,
+@@ -1872,4 +1874,6 @@ compare_signatures(uint32_t *prim_hash_matches, uint32_t *sec_hash_matches,

patch 'net/netvsc: increase VSP response timeout to 60 seconds' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From eb6a3e4952b4db3bb76d47737a8de9e07a3cf79f Mon Sep 17 00:00:00 2001
From: Long Li <longli@microsoft.com>
Date: Wed, 26 Jul 2023 15:29:10 -0700
Subject: [PATCH] net/netvsc: increase VSP response timeout to 60 seconds

[ upstream commit d56475174855b1454cf004025b54d68e4a47f465 ]

The current timeout is set to 5 seconds. In Azure, tests show that it
may take up to 15 seconds for VSP to respond on busy nodes. The VSP
schedules unbounded work to process VSC request, there is no upper limit
on how long it takes to send response back to VSC.

In the NETVSC kernel mode driver, it waits forever for VSP response.
While in DPDK we can't wait forever, setting the timeout to 60 seconds.

Signed-off-by: Long Li <longli@microsoft.com>
---
 drivers/net/netvsc/hn_rndis.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c
index 8c205233a2..1ad255507e 100644
--- a/drivers/net/netvsc/hn_rndis.c
+++ b/drivers/net/netvsc/hn_rndis.c
@@ -36,5 +36,5 @@
 #include "ndis.h"
 
-#define RNDIS_TIMEOUT_SEC 5
+#define RNDIS_TIMEOUT_SEC 60
 #define RNDIS_DELAY_MS    10
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.253281250 +0000
+++ 0015-net-netvsc-increase-VSP-response-timeout-to-60-secon.patch	2023-11-02 13:09:40.787163252 +0000
@@ -1 +1 @@
-From d56475174855b1454cf004025b54d68e4a47f465 Mon Sep 17 00:00:00 2001
+From eb6a3e4952b4db3bb76d47737a8de9e07a3cf79f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d56475174855b1454cf004025b54d68e4a47f465 ]
+
@@ -14,2 +15,0 @@
-Cc: stable@dpdk.org
-
@@ -22 +22 @@
-index 29c6009b2c..fe36274df8 100644
+index 8c205233a2..1ad255507e 100644

patch 'net/txgbe: add Tx queue maximum limit' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 2a455021e4b81d57acbcf79f373e79200e3b57c0 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:48 +0800
Subject: [PATCH] net/txgbe: add Tx queue maximum limit

[ upstream commit afcba8586daa5abc3868180e96601babfef3cfc1 ]

Limit TX queue maximum to 64 when neither VT nor DCB are enabled,
since hardware doesn't support it.

Fixes: 75cbb1f0e8a6 ("net/txgbe: add device configuration")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 13 +++++++++++++
 drivers/net/txgbe/txgbe_ethdev.h |  1 +
 2 files changed, 14 insertions(+)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 8b57ca1ba7..13c096ed6f 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1487,4 +1487,17 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev)
 			}
 		}
+
+		/*
+		 * When DCB/VT is off, maximum number of queues changes
+		 */
+		if (dev_conf->txmode.mq_mode == RTE_ETH_MQ_TX_NONE) {
+			if (nb_tx_q > TXGBE_NONE_MODE_TX_NB_QUEUES) {
+				PMD_INIT_LOG(ERR,
+					     "Neither VT nor DCB are enabled, "
+					     "nb_tx_q > %d.",
+					     TXGBE_NONE_MODE_TX_NB_QUEUES);
+				return -EINVAL;
+			}
+		}
 	}
 	return 0;
diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index 262dbb5e38..edc3311e19 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -41,4 +41,5 @@
 #define TXGBE_MAX_RX_QUEUE_NUM	128
 #define TXGBE_VMDQ_DCB_NB_QUEUES     TXGBE_MAX_RX_QUEUE_NUM
+#define TXGBE_NONE_MODE_TX_NB_QUEUES 64
 
 #ifndef NBBY
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.275193541 +0000
+++ 0016-net-txgbe-add-Tx-queue-maximum-limit.patch	2023-11-02 13:09:40.791163265 +0000
@@ -1 +1 @@
-From afcba8586daa5abc3868180e96601babfef3cfc1 Mon Sep 17 00:00:00 2001
+From 2a455021e4b81d57acbcf79f373e79200e3b57c0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit afcba8586daa5abc3868180e96601babfef3cfc1 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 15911a3621..479cd810f8 100644
+index 8b57ca1ba7..13c096ed6f 100644
@@ -22 +23 @@
-@@ -1500,4 +1500,17 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev)
+@@ -1487,4 +1487,17 @@ txgbe_check_mq_mode(struct rte_eth_dev *dev)
@@ -41 +42 @@
-index 6b296d6fd1..7feb45d0cf 100644
+index 262dbb5e38..edc3311e19 100644
@@ -44 +45 @@
-@@ -42,4 +42,5 @@
+@@ -41,4 +41,5 @@

patch 'net/txgbe: fix GRE tunnel packet checksum' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 289d492046e8ac78bbe65f396ae83f175a9102c9 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:49 +0800
Subject: [PATCH] net/txgbe: fix GRE tunnel packet checksum

[ upstream commit 5bbaf75ed6df2605a8cf780057211f2592add80d ]

Fix transmit context descriptor for GRE tunnel packet to make the
hardware compute the checksum successfully.

Fixes: e5ece1f467aa ("net/txgbe: fix VXLAN-GPE packet checksum")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ptypes.c | 16 ----------------
 drivers/net/txgbe/txgbe_ptypes.h |  5 +++++
 drivers/net/txgbe/txgbe_rxtx.c   | 23 ++++++++++++-----------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/drivers/net/txgbe/txgbe_ptypes.c b/drivers/net/txgbe/txgbe_ptypes.c
index 0ed757d820..f9da4e4ceb 100644
--- a/drivers/net/txgbe/txgbe_ptypes.c
+++ b/drivers/net/txgbe/txgbe_ptypes.c
@@ -321,6 +321,4 @@ txgbe_encode_ptype_tunnel(u32 ptype)
 		break;
 	case RTE_PTYPE_TUNNEL_GRE:
-		ptid |= TXGBE_PTID_TUN_EIG;
-		break;
 	case RTE_PTYPE_TUNNEL_VXLAN:
 	case RTE_PTYPE_TUNNEL_VXLAN_GPE:
@@ -333,18 +331,4 @@ txgbe_encode_ptype_tunnel(u32 ptype)
 	}
 
-	switch (ptype & RTE_PTYPE_INNER_L2_MASK) {
-	case RTE_PTYPE_INNER_L2_ETHER:
-		ptid |= TXGBE_PTID_TUN_EIGM;
-		break;
-	case RTE_PTYPE_INNER_L2_ETHER_VLAN:
-		ptid |= TXGBE_PTID_TUN_EIGMV;
-		break;
-	case RTE_PTYPE_INNER_L2_ETHER_QINQ:
-		ptid |= TXGBE_PTID_TUN_EIGMV;
-		break;
-	default:
-		break;
-	}
-
 	switch (ptype & RTE_PTYPE_INNER_L3_MASK) {
 	case RTE_PTYPE_INNER_L3_IPV4:
diff --git a/drivers/net/txgbe/txgbe_ptypes.h b/drivers/net/txgbe/txgbe_ptypes.h
index fa6c347d53..6fa8147f05 100644
--- a/drivers/net/txgbe/txgbe_ptypes.h
+++ b/drivers/net/txgbe/txgbe_ptypes.h
@@ -349,3 +349,8 @@ struct txgbe_nvgrehdr {
 };
 
+struct txgbe_grehdr {
+	__be16 flags;
+	__be16 proto;
+};
+
 #endif /* _TXGBE_PTYPE_H_ */
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index 28e5a78cc9..d0f7fe6945 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -573,5 +573,4 @@ tx_desc_ol_flags_to_ptype(uint64_t oflags)
 			 RTE_PTYPE_L3_IPV4 |
 			 RTE_PTYPE_TUNNEL_GRE;
-		ptype |= RTE_PTYPE_INNER_L2_ETHER;
 		break;
 	case RTE_MBUF_F_TX_TUNNEL_GENEVE:
@@ -706,20 +705,22 @@ static inline uint8_t
 txgbe_parse_tun_ptid(struct rte_mbuf *tx_pkt)
 {
-	uint64_t l2_none, l2_mac, l2_mac_vlan;
+	uint64_t l2_vxlan, l2_vxlan_mac, l2_vxlan_mac_vlan;
+	uint64_t l2_gre, l2_gre_mac, l2_gre_mac_vlan;
 	uint8_t ptid = 0;
 
-	if ((tx_pkt->ol_flags & (RTE_MBUF_F_TX_TUNNEL_VXLAN |
-				RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE)) == 0)
-		return ptid;
+	l2_vxlan = sizeof(struct txgbe_udphdr) + sizeof(struct txgbe_vxlanhdr);
+	l2_vxlan_mac = l2_vxlan + sizeof(struct rte_ether_hdr);
+	l2_vxlan_mac_vlan = l2_vxlan_mac + sizeof(struct rte_vlan_hdr);
 
-	l2_none = sizeof(struct txgbe_udphdr) + sizeof(struct txgbe_vxlanhdr);
-	l2_mac = l2_none + sizeof(struct rte_ether_hdr);
-	l2_mac_vlan = l2_mac + sizeof(struct rte_vlan_hdr);
+	l2_gre = sizeof(struct txgbe_grehdr);
+	l2_gre_mac = l2_gre + sizeof(struct rte_ether_hdr);
+	l2_gre_mac_vlan = l2_gre_mac + sizeof(struct rte_vlan_hdr);
 
-	if (tx_pkt->l2_len == l2_none)
+	if (tx_pkt->l2_len == l2_vxlan || tx_pkt->l2_len == l2_gre)
 		ptid = TXGBE_PTID_TUN_EIG;
-	else if (tx_pkt->l2_len == l2_mac)
+	else if (tx_pkt->l2_len == l2_vxlan_mac || tx_pkt->l2_len == l2_gre_mac)
 		ptid = TXGBE_PTID_TUN_EIGM;
-	else if (tx_pkt->l2_len == l2_mac_vlan)
+	else if (tx_pkt->l2_len == l2_vxlan_mac_vlan ||
+			tx_pkt->l2_len == l2_gre_mac_vlan)
 		ptid = TXGBE_PTID_TUN_EIGMV;
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.299890918 +0000
+++ 0017-net-txgbe-fix-GRE-tunnel-packet-checksum.patch	2023-11-02 13:09:40.796163281 +0000
@@ -1 +1 @@
-From 5bbaf75ed6df2605a8cf780057211f2592add80d Mon Sep 17 00:00:00 2001
+From 289d492046e8ac78bbe65f396ae83f175a9102c9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5bbaf75ed6df2605a8cf780057211f2592add80d ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index e1299d7363..c444d5d3f1 100644
+index 0ed757d820..f9da4e4ceb 100644
@@ -63 +64 @@
-index 427f8b82ac..f7cd2333ab 100644
+index 28e5a78cc9..d0f7fe6945 100644

patch 'net/ngbe: fix flow control' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 51451e5516b4b0dd4320f8fb58f388cc83b88b0d Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:50 +0800
Subject: [PATCH] net/ngbe: fix flow control

[ upstream commit d19fa5a1f447244aa961a3cc8c52c9024f9109ab ]

Fix flow control high/low water limit.

Fixes: f40e9f0e2278 ("net/ngbe: support flow control")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/ngbe/base/ngbe_type.h | 40 ++++++++++++++
 drivers/net/ngbe/ngbe_ethdev.c    | 89 +++++++++++++++++++++++++++++++
 2 files changed, 129 insertions(+)

diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h
index 015f484e8f..8f87398c17 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -111,4 +111,44 @@ struct ngbe_fc_info {
 };
 
+/* Flow Control Data Sheet defined values
+ * Calculation and defines taken from 802.1bb Annex O
+ */
+/* BitTimes (BT) conversion */
+#define NGBE_BT2KB(BT)         (((BT) + (8 * 1024 - 1)) / (8 * 1024))
+#define NGBE_B2BT(BT)          ((BT) * 8)
+
+/* Calculate Delay to respond to PFC */
+#define NGBE_PFC_D     672
+
+/* Calculate Cable Delay */
+#define NGBE_CABLE_DC  5556 /* Delay Copper */
+
+/* Calculate Interface Delay */
+#define NGBE_PHY_D     12800
+#define NGBE_MAC_D     4096
+#define NGBE_XAUI_D    (2 * 1024)
+
+#define NGBE_ID        (NGBE_MAC_D + NGBE_XAUI_D + NGBE_PHY_D)
+
+/* Calculate Delay incurred from higher layer */
+#define NGBE_HD        6144
+
+/* Calculate PCI Bus delay for low thresholds */
+#define NGBE_PCI_DELAY 10000
+
+/* Calculate delay value in bit times */
+#define NGBE_DV(_max_frame_link, _max_frame_tc) \
+			((36 * \
+			  (NGBE_B2BT(_max_frame_link) + \
+			   NGBE_PFC_D + \
+			   (2 * NGBE_CABLE_DC) + \
+			   (2 * NGBE_ID) + \
+			   NGBE_HD) / 25 + 1) + \
+			 2 * NGBE_B2BT(_max_frame_tc))
+
+#define NGBE_LOW_DV(_max_frame_tc) \
+			(2 * ((2 * NGBE_B2BT(_max_frame_tc) + \
+			      (36 * NGBE_PCI_DELAY / 25) + 1)))
+
 /* Statistics counters collected by the MAC */
 /* PB[] RxTx */
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 4c927379d7..1e755f03a5 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -91,4 +91,5 @@ static int ngbe_dev_rxq_interrupt_setup(struct rte_eth_dev *dev);
 static void ngbe_dev_interrupt_handler(void *param);
 static void ngbe_configure_msix(struct rte_eth_dev *dev);
+static void ngbe_pbthresh_set(struct rte_eth_dev *dev);
 
 #define NGBE_SET_HWSTRIP(h, q) do {\
@@ -1021,4 +1022,5 @@ ngbe_dev_start(struct rte_eth_dev *dev)
 
 	hw->mac.setup_pba(hw);
+	ngbe_pbthresh_set(dev);
 	ngbe_configure_port(dev);
 
@@ -2341,4 +2343,91 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 }
 
+/* Additional bittime to account for NGBE framing */
+#define NGBE_ETH_FRAMING 20
+
+/*
+ * ngbe_fc_hpbthresh_set - calculate high water mark for flow control
+ *
+ * @dv_id: device interface delay
+ * @pb: packet buffer to calculate
+ */
+static s32
+ngbe_fc_hpbthresh_set(struct rte_eth_dev *dev)
+{
+	struct ngbe_hw *hw = ngbe_dev_hw(dev);
+	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+	u32 max_frame_size, tc, dv_id, rx_pb;
+	s32 kb, marker;
+
+	/* Calculate max LAN frame size */
+	max_frame_size = rd32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK);
+	tc = max_frame_size + NGBE_ETH_FRAMING;
+
+	/* Calculate delay value for device */
+	dv_id = NGBE_DV(tc, tc);
+
+	/* Loopback switch introduces additional latency */
+	if (pci_dev->max_vfs)
+		dv_id += NGBE_B2BT(tc);
+
+	/* Delay value is calculated in bit times convert to KB */
+	kb = NGBE_BT2KB(dv_id);
+	rx_pb = rd32(hw, NGBE_PBRXSIZE) >> 10;
+
+	marker = rx_pb - kb;
+
+	/* It is possible that the packet buffer is not large enough
+	 * to provide required headroom. In this case throw an error
+	 * to user and do the best we can.
+	 */
+	if (marker < 0) {
+		PMD_DRV_LOG(WARNING, "Packet Buffer can not provide enough headroom to support flow control.");
+		marker = tc + 1;
+	}
+
+	return marker;
+}
+
+/*
+ * ngbe_fc_lpbthresh_set - calculate low water mark for flow control
+ *
+ * @dv_id: device interface delay
+ */
+static s32
+ngbe_fc_lpbthresh_set(struct rte_eth_dev *dev)
+{
+	struct ngbe_hw *hw = ngbe_dev_hw(dev);
+	u32 max_frame_size, tc, dv_id;
+	s32 kb;
+
+	/* Calculate max LAN frame size */
+	max_frame_size = rd32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK);
+	tc = max_frame_size + NGBE_ETH_FRAMING;
+
+	/* Calculate delay value for device */
+	dv_id = NGBE_LOW_DV(tc);
+
+	/* Delay value is calculated in bit times convert to KB */
+	kb = NGBE_BT2KB(dv_id);
+
+	return kb;
+}
+
+/*
+ * ngbe_pbthresh_setup - calculate and setup high low water marks
+ */
+static void
+ngbe_pbthresh_set(struct rte_eth_dev *dev)
+{
+	struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+	hw->fc.high_water = ngbe_fc_hpbthresh_set(dev);
+	hw->fc.low_water = ngbe_fc_lpbthresh_set(dev);
+
+	/* Low water marks must not be larger than high water marks */
+	if (hw->fc.low_water > hw->fc.high_water)
+		hw->fc.low_water = 0;
+}
+
 int
 ngbe_dev_rss_reta_update(struct rte_eth_dev *dev,
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.323904618 +0000
+++ 0018-net-ngbe-fix-flow-control.patch	2023-11-02 13:09:40.798163287 +0000
@@ -1 +1 @@
-From d19fa5a1f447244aa961a3cc8c52c9024f9109ab Mon Sep 17 00:00:00 2001
+From 51451e5516b4b0dd4320f8fb58f388cc83b88b0d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d19fa5a1f447244aa961a3cc8c52c9024f9109ab ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 37be288a74..8a7d2cd331 100644
+index 015f484e8f..8f87398c17 100644
@@ -21 +22 @@
-@@ -117,4 +117,44 @@ struct ngbe_fc_info {
+@@ -111,4 +111,44 @@ struct ngbe_fc_info {
@@ -67 +68 @@
-index af77081d9a..a83fdc002a 100644
+index 4c927379d7..1e755f03a5 100644
@@ -76 +77 @@
-@@ -1038,4 +1039,5 @@ ngbe_dev_start(struct rte_eth_dev *dev)
+@@ -1021,4 +1022,5 @@ ngbe_dev_start(struct rte_eth_dev *dev)
@@ -82 +83 @@
-@@ -2387,4 +2389,91 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+@@ -2341,4 +2343,91 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)

patch 'net/txgbe: reconfigure MAC Rx when link update' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From b817c9e25091ec146ffd02240181894d019a6f69 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:52 +0800
Subject: [PATCH] net/txgbe: reconfigure MAC Rx when link update

[ upstream commit 950a6954df134f8bff41fc7ad541a9c9730a4201 ]

Fix the bug that after setting flow control parameters, link status
change (for example, hot-plug SFP module) causes the port to no longer
receive packets.

Fixes: 0c061eadec59 ("net/txgbe: add link status change")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 13c096ed6f..3b1baf7c48 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -2782,4 +2782,9 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,
 	}
 
+	/* Re configure MAC RX */
+	if (hw->mac.type == txgbe_mac_raptor)
+		wr32m(hw, TXGBE_MACRXFLT, TXGBE_MACRXFLT_PROMISC,
+			TXGBE_MACRXFLT_PROMISC);
+
 	return rte_eth_linkstatus_set(dev, &link);
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.347059331 +0000
+++ 0019-net-txgbe-reconfigure-MAC-Rx-when-link-update.patch	2023-11-02 13:09:40.800163294 +0000
@@ -1 +1 @@
-From 950a6954df134f8bff41fc7ad541a9c9730a4201 Mon Sep 17 00:00:00 2001
+From b817c9e25091ec146ffd02240181894d019a6f69 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 950a6954df134f8bff41fc7ad541a9c9730a4201 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 479cd810f8..e789e34c01 100644
+index 13c096ed6f..3b1baf7c48 100644
@@ -22 +23 @@
-@@ -2958,4 +2958,9 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,
+@@ -2782,4 +2782,9 @@ txgbe_dev_link_update_share(struct rte_eth_dev *dev,

patch 'net/ngbe: reconfigure MAC Rx when link update' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 709992facac5f0fe25282aa2f20e3afc177039ef Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:53 +0800
Subject: [PATCH] net/ngbe: reconfigure MAC Rx when link update

[ upstream commit a7c5f95ed9c24c0dfef6ab795e4916cbc0bf6598 ]

Fix the bug that after setting flow control parameters, link status
change (for example, set PHY power on/off) causes the port to no longer
receive packets.

Fixes: b9246b8fa280 ("net/ngbe: support link update")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/ngbe/ngbe_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 1e755f03a5..6ec15b60de 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1924,4 +1924,6 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev,
 				NGBE_MACTXCFG_SPEED_1G | NGBE_MACTXCFG_TE);
 		}
+		wr32m(hw, NGBE_MACRXFLT, NGBE_MACRXFLT_PROMISC,
+			NGBE_MACRXFLT_PROMISC);
 	}
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.371707318 +0000
+++ 0020-net-ngbe-reconfigure-MAC-Rx-when-link-update.patch	2023-11-02 13:09:40.802163300 +0000
@@ -1 +1 @@
-From a7c5f95ed9c24c0dfef6ab795e4916cbc0bf6598 Mon Sep 17 00:00:00 2001
+From 709992facac5f0fe25282aa2f20e3afc177039ef Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a7c5f95ed9c24c0dfef6ab795e4916cbc0bf6598 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index a83fdc002a..dd387779ab 100644
+index 1e755f03a5..6ec15b60de 100644
@@ -22 +23 @@
-@@ -1962,4 +1962,6 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev,
+@@ -1924,4 +1924,6 @@ ngbe_dev_link_update_share(struct rte_eth_dev *dev,

patch 'net/txgbe: keep link down after device close' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From a3d1c5eb0801284c0680c3de7fea48c8dd178fbe Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:54 +0800
Subject: [PATCH] net/txgbe: keep link down after device close

[ upstream commit 409a08c34fd20a25dd209438f52cb38ace081b19 ]

When the port is closed, hardware is reset to power on. And
txgbe_dev_stop() is just returned 0 to avoid secondary calls,
so that the link led remains on. Fix this bug by adding to turn
off the copper/laser.

Fixes: e0d876ef6bbc ("net/txgbe: support device stop and close")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 3b1baf7c48..2a3d9d9d5e 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1883,5 +1883,5 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
 
 	if (hw->adapter_stopped)
-		return 0;
+		goto out;
 
 	PMD_INIT_FUNC_TRACE();
@@ -1902,12 +1902,4 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
 		vfinfo[vf].clear_to_send = false;
 
-	if (hw->phy.media_type == txgbe_media_type_copper) {
-		/* Turn off the copper */
-		hw->phy.set_phy_power(hw, false);
-	} else {
-		/* Turn off the laser */
-		hw->mac.disable_tx_laser(hw);
-	}
-
 	txgbe_dev_clear_queues(dev);
 
@@ -1940,4 +1932,14 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
 	hw->dev_start = false;
 
+out:
+	/* close phy to prevent reset in dev_close from restarting physical link */
+	if (hw->phy.media_type == txgbe_media_type_copper) {
+		/* Turn off the copper */
+		hw->phy.set_phy_power(hw, false);
+	} else {
+		/* Turn off the laser */
+		hw->mac.disable_tx_laser(hw);
+	}
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.393952837 +0000
+++ 0021-net-txgbe-keep-link-down-after-device-close.patch	2023-11-02 13:09:40.804163307 +0000
@@ -1 +1 @@
-From 409a08c34fd20a25dd209438f52cb38ace081b19 Mon Sep 17 00:00:00 2001
+From a3d1c5eb0801284c0680c3de7fea48c8dd178fbe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 409a08c34fd20a25dd209438f52cb38ace081b19 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index e789e34c01..2dad820cb5 100644
+index 3b1baf7c48..2a3d9d9d5e 100644
@@ -23 +24 @@
-@@ -1930,5 +1930,5 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
+@@ -1883,5 +1883,5 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
@@ -30 +31 @@
-@@ -1954,12 +1954,4 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
+@@ -1902,12 +1902,4 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
@@ -43 +44 @@
-@@ -1992,4 +1984,14 @@ txgbe_dev_stop(struct rte_eth_dev *dev)
+@@ -1940,4 +1932,14 @@ txgbe_dev_stop(struct rte_eth_dev *dev)

patch 'net/ngbe: keep link down after device close' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 5658f2dd846746d6fd5ff567a8abfd5da41079c2 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:55 +0800
Subject: [PATCH] net/ngbe: keep link down after device close

[ upstream commit 3dd64cf80ed5142eeb0a8e3051a583fb38761221 ]

When the port is closed, hardware is reset to power on. And
ngbe_dev_stop() is just returned 0 to avoid secondary calls,
so that the link led remains on. Fix this bug by adding to turn
off the PHY power.

Fixes: 3518df5774c7 ("net/ngbe: support device start/stop")
Fixes: 708ebe7d0399 ("net/ngbe: fix external PHY power down")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/ngbe/ngbe_ethdev.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 6ec15b60de..c6e37150e2 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1146,5 +1146,5 @@ ngbe_dev_stop(struct rte_eth_dev *dev)
 
 	if (hw->adapter_stopped)
-		return 0;
+		goto out;
 
 	PMD_INIT_FUNC_TRACE();
@@ -1197,4 +1197,8 @@ ngbe_dev_stop(struct rte_eth_dev *dev)
 	dev->data->dev_started = 0;
 
+out:
+	/* close phy to prevent reset in dev_close from restarting physical link */
+	hw->phy.set_phy_power(hw, false);
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.418444165 +0000
+++ 0022-net-ngbe-keep-link-down-after-device-close.patch	2023-11-02 13:09:40.805163310 +0000
@@ -1 +1 @@
-From 3dd64cf80ed5142eeb0a8e3051a583fb38761221 Mon Sep 17 00:00:00 2001
+From 5658f2dd846746d6fd5ff567a8abfd5da41079c2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3dd64cf80ed5142eeb0a8e3051a583fb38761221 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/ngbe/ngbe_ethdev.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ drivers/net/ngbe/ngbe_ethdev.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
@@ -21 +22 @@
-index dd387779ab..1cdd56497e 100644
+index 6ec15b60de..c6e37150e2 100644
@@ -24 +25 @@
-@@ -1168,5 +1168,5 @@ ngbe_dev_stop(struct rte_eth_dev *dev)
+@@ -1146,5 +1146,5 @@ ngbe_dev_stop(struct rte_eth_dev *dev)
@@ -31,8 +32 @@
-@@ -1190,6 +1190,4 @@ ngbe_dev_stop(struct rte_eth_dev *dev)
- 		vfinfo[vf].clear_to_send = false;
- 
--	hw->phy.set_phy_power(hw, false);
--
- 	ngbe_dev_clear_queues(dev);
- 
-@@ -1218,4 +1216,8 @@ ngbe_dev_stop(struct rte_eth_dev *dev)
+@@ -1197,4 +1197,8 @@ ngbe_dev_stop(struct rte_eth_dev *dev)

patch 'net/txgbe: check process type in close operation' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 4a97dac6687dd2dfba201a9a0b25a260bed8eb2a Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:56 +0800
Subject: [PATCH] net/txgbe: check process type in close operation

[ upstream commit 21ed282505ed8f60f03a93a27ac01f4152b8ab40 ]

The secondary processes are not allowed to release shared resources.
Only process-private resources should be freed in a secondary process.
Most of the time, there is no process-private resource,
so the close operation is just forbidden in a secondary process.

Fixes: e1698e383c2a ("net/txgbe: add device init and uninit")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 2a3d9d9d5e..bd587b4f71 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -2001,4 +2001,7 @@ txgbe_dev_close(struct rte_eth_dev *dev)
 	PMD_INIT_FUNC_TRACE();
 
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
 	txgbe_pf_reset_hw(hw);
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.441177176 +0000
+++ 0023-net-txgbe-check-process-type-in-close-operation.patch	2023-11-02 13:09:40.807163316 +0000
@@ -1 +1 @@
-From 21ed282505ed8f60f03a93a27ac01f4152b8ab40 Mon Sep 17 00:00:00 2001
+From 4a97dac6687dd2dfba201a9a0b25a260bed8eb2a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 21ed282505ed8f60f03a93a27ac01f4152b8ab40 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 2dad820cb5..6bc231a130 100644
+index 2a3d9d9d5e..bd587b4f71 100644
@@ -23 +24 @@
-@@ -2053,4 +2053,7 @@ txgbe_dev_close(struct rte_eth_dev *dev)
+@@ -2001,4 +2001,7 @@ txgbe_dev_close(struct rte_eth_dev *dev)

patch 'net/ngbe: check process type in close operation' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 4cdc254d17bff073607d9d201531567020e388b6 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Thu, 28 Sep 2023 17:47:57 +0800
Subject: [PATCH] net/ngbe: check process type in close operation

[ upstream commit bf86fb0b7dd723421ea35826c0163c34b09d1c69 ]

The secondary processes are not allowed to release shared resources.
Only process-private resources should be freed in a secondary process.
Most of the time, there is no process-private resource,
so the close operation is just forbidden in a secondary process.

Fixes: cc63194e89cb ("net/ngbe: support close and reset device")

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/ngbe/ngbe_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index c6e37150e2..3038694042 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1218,4 +1218,7 @@ ngbe_dev_close(struct rte_eth_dev *dev)
 	PMD_INIT_FUNC_TRACE();
 
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+		return 0;
+
 	ngbe_pf_reset_hw(hw);
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.465243946 +0000
+++ 0024-net-ngbe-check-process-type-in-close-operation.patch	2023-11-02 13:09:40.808163319 +0000
@@ -1 +1 @@
-From bf86fb0b7dd723421ea35826c0163c34b09d1c69 Mon Sep 17 00:00:00 2001
+From 4cdc254d17bff073607d9d201531567020e388b6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bf86fb0b7dd723421ea35826c0163c34b09d1c69 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 1cdd56497e..478da014b2 100644
+index c6e37150e2..3038694042 100644
@@ -23 +24 @@
-@@ -1263,4 +1263,7 @@ ngbe_dev_close(struct rte_eth_dev *dev)
+@@ -1218,4 +1218,7 @@ ngbe_dev_close(struct rte_eth_dev *dev)

patch 'net/tap: use MAC address parse API instead of local parser' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From da9e764370f62bfa407a93531452b2e0e69ee95b Mon Sep 17 00:00:00 2001
From: David Christensen <drc@linux.vnet.ibm.com>
Date: Tue, 3 Oct 2023 13:29:09 -0700
Subject: [PATCH] net/tap: use MAC address parse API instead of local parser

[ upstream commit b79d825f32cb0012164b26428272b1ea268f839d ]

Building DPDK with gcc 12 on a ppc64le system generates a
stringop-overflow warning. Replace the local MAC address
validation function parse_user_mac() with a call to
rte_ether_unformat_addr() instead.

Bugzilla ID: 1197

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/tap/rte_eth_tap.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index 2dbb25f85d..470ea65f93 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -2240,27 +2240,4 @@ set_remote_iface(const char *key __rte_unused,
 }
 
-static int parse_user_mac(struct rte_ether_addr *user_mac,
-		const char *value)
-{
-	unsigned int index = 0;
-	char mac_temp[strlen(ETH_TAP_USR_MAC_FMT) + 1], *mac_byte = NULL;
-
-	if (user_mac == NULL || value == NULL)
-		return 0;
-
-	strlcpy(mac_temp, value, sizeof(mac_temp));
-	mac_byte = strtok(mac_temp, ":");
-
-	while ((mac_byte != NULL) &&
-			(strlen(mac_byte) <= 2) &&
-			(strlen(mac_byte) == strspn(mac_byte,
-					ETH_TAP_CMP_MAC_FMT))) {
-		user_mac->addr_bytes[index++] = strtoul(mac_byte, NULL, 16);
-		mac_byte = strtok(NULL, ":");
-	}
-
-	return index;
-}
-
 static int
 set_mac_type(const char *key __rte_unused,
@@ -2284,5 +2261,5 @@ set_mac_type(const char *key __rte_unused,
 	}
 
-	if (parse_user_mac(user_mac, value) != 6)
+	if (rte_ether_unformat_addr(value, user_mac) < 0)
 		goto error;
 success:
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.487951720 +0000
+++ 0025-net-tap-use-MAC-address-parse-API-instead-of-local-p.patch	2023-11-02 13:09:40.810163326 +0000
@@ -1 +1 @@
-From b79d825f32cb0012164b26428272b1ea268f839d Mon Sep 17 00:00:00 2001
+From da9e764370f62bfa407a93531452b2e0e69ee95b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b79d825f32cb0012164b26428272b1ea268f839d ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index bf98f75559..b25a52655f 100644
+index 2dbb25f85d..470ea65f93 100644
@@ -25 +26 @@
-@@ -2268,27 +2268,4 @@ set_remote_iface(const char *key __rte_unused,
+@@ -2240,27 +2240,4 @@ set_remote_iface(const char *key __rte_unused,
@@ -53 +54 @@
-@@ -2312,5 +2289,5 @@ set_mac_type(const char *key __rte_unused,
+@@ -2284,5 +2261,5 @@ set_mac_type(const char *key __rte_unused,

patch 'app/testpmd: fix help string' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 64513c3fd4fab7cb98e24b9a65ce5c2fdce9f9c2 Mon Sep 17 00:00:00 2001
From: Dengdui Huang <huangdengdui@huawei.com>
Date: Sun, 8 Oct 2023 14:46:19 +0800
Subject: [PATCH] app/testpmd: fix help string

[ upstream commit 42661fb8f18e52684d0d9f0d376017082fca45e0 ]

Command help string is missing 'mcast_addr add|remove'.
This patch add it.

Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove multicast MAC addresses")

Signed-off-by: Dengdui Huang <huangdengdui@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 app/test-pmd/cmdline.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 2e8fec3552..64e6f4159c 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -505,4 +505,10 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"    Add a MAC address for a VF on the port.\n\n"
 
+			"mcast_addr add (port_id) (mcast_addr)\n"
+			"    Add a multicast MAC addresses on port_id.\n\n"
+
+			"mcast_addr remove (port_id) (mcast_addr)\n"
+			"    Remove a multicast MAC address from port_id.\n\n"
+
 			"set vf mac addr (port_id) (vf_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Set the MAC address for a VF from the PF.\n\n"
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.509997974 +0000
+++ 0026-app-testpmd-fix-help-string.patch	2023-11-02 13:09:40.822163364 +0000
@@ -1 +1 @@
-From 42661fb8f18e52684d0d9f0d376017082fca45e0 Mon Sep 17 00:00:00 2001
+From 64513c3fd4fab7cb98e24b9a65ce5c2fdce9f9c2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 42661fb8f18e52684d0d9f0d376017082fca45e0 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index a0e97719b3..7f75ae13d6 100644
+index 2e8fec3552..64e6f4159c 100644
@@ -23 +24 @@
-@@ -501,4 +501,10 @@ static void cmd_help_long_parsed(void *parsed_result,
+@@ -505,4 +505,10 @@ static void cmd_help_long_parsed(void *parsed_result,

patch 'cryptodev: add missing doc for security context' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 9ee1a46fe7d23e95f34eb311184d1570506e3b2e Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj@marvell.com>
Date: Tue, 12 Sep 2023 16:12:14 +0530
Subject: [PATCH] cryptodev: add missing doc for security context

[ upstream commit 1e71cb205047fd7f151018179279de92b2e92fa2 ]

Description for rte_cryptodev_get_sec_ctx is missing. Add the same.

Fixes: eadb4fa1e1fe ("cryptodev: support security APIs")

Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>
---
 lib/cryptodev/rte_cryptodev.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
index 59ea5a54df..99fd4c3569 100644
--- a/lib/cryptodev/rte_cryptodev.h
+++ b/lib/cryptodev/rte_cryptodev.h
@@ -898,4 +898,13 @@ struct rte_cryptodev_cb_rcu {
 };
 
+/**
+ * Get the security context for the cryptodev.
+ *
+ * @param dev_id
+ *   The device identifier.
+ * @return
+ *   - NULL on error.
+ *   - Pointer to security context on success.
+ */
 void *
 rte_cryptodev_get_sec_ctx(uint8_t dev_id);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.538844700 +0000
+++ 0027-cryptodev-add-missing-doc-for-security-context.patch	2023-11-02 13:09:40.823163368 +0000
@@ -1 +1 @@
-From 1e71cb205047fd7f151018179279de92b2e92fa2 Mon Sep 17 00:00:00 2001
+From 9ee1a46fe7d23e95f34eb311184d1570506e3b2e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1e71cb205047fd7f151018179279de92b2e92fa2 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 9246df90ef..9f07e1ed2c 100644
+index 59ea5a54df..99fd4c3569 100644
@@ -21 +22 @@
-@@ -972,4 +972,13 @@ struct rte_cryptodev_cb_rcu {
+@@ -898,4 +898,13 @@ struct rte_cryptodev_cb_rcu {

patch 'doc: replace code blocks with includes in security guide' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From de8bdca2b3b761a8833de512c695913c54a76fc8 Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoobj@marvell.com>
Date: Fri, 18 Aug 2023 14:59:42 +0530
Subject: [PATCH] doc: replace code blocks with includes in security guide

[ upstream commit 03e3cfda1679998aa512464affb8dd293146364a ]

Add literal includes to copy code block while compiling. Having a copy
may lead to mismatch if code is updated without updating the doc.

Fixes: 40ff8c99ea99 ("doc: add details of security library")

Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>
---
 doc/guides/prog_guide/rte_security.rst | 65 +++++---------------------
 lib/security/rte_security.h            |  6 +++
 2 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/doc/guides/prog_guide/rte_security.rst b/doc/guides/prog_guide/rte_security.rst
index 72ca0bd330..8619757e84 100644
--- a/doc/guides/prog_guide/rte_security.rst
+++ b/doc/guides/prog_guide/rte_security.rst
@@ -593,23 +593,8 @@ Security session configuration
 Security Session configuration structure is defined as ``rte_security_session_conf``
 
-.. code-block:: c
-
-    struct rte_security_session_conf {
-        enum rte_security_session_action_type action_type;
-        /**< Type of action to be performed on the session */
-        enum rte_security_session_protocol protocol;
-        /**< Security protocol to be configured */
-        union {
-                struct rte_security_ipsec_xform ipsec;
-                struct rte_security_macsec_xform macsec;
-                struct rte_security_pdcp_xform pdcp;
-                struct rte_security_docsis_xform docsis;
-        };
-        /**< Configuration parameters for security session */
-        struct rte_crypto_sym_xform *crypto_xform;
-        /**< Security Session Crypto Transformations */
-        void *userdata;
-        /**< Application specific userdata to be saved with session */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Structure rte_security_session_conf 8<
+   :end-before: >8 End of structure rte_security_session_conf.
 
 The configuration structure reuses the ``rte_crypto_sym_xform`` struct for crypto related
@@ -618,41 +603,15 @@ session is configured for Lookaside Protocol offload or Inline Crypto or Inline
 Offload.
 
-.. code-block:: c
-
-    enum rte_security_session_action_type {
-        RTE_SECURITY_ACTION_TYPE_NONE,
-        /**< No security actions */
-        RTE_SECURITY_ACTION_TYPE_INLINE_CRYPTO,
-        /**< Crypto processing for security protocol is processed inline
-         * during transmission
-         */
-        RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL,
-        /**< All security protocol processing is performed inline during
-         * transmission
-         */
-        RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
-        /**< All security protocol processing including crypto is performed
-         * on a lookaside accelerator
-         */
-        RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO
-        /**< Similar to ACTION_TYPE_NONE but crypto processing for security
-         * protocol is processed synchronously by a CPU.
-         */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Enumeration of rte_security_session_action_type 8<
+   :end-before: >8 End enumeration of rte_security_session_action_type.
 
 The ``rte_security_session_protocol`` is defined as
 
-.. code-block:: c
-
-    enum rte_security_session_protocol {
-        RTE_SECURITY_PROTOCOL_IPSEC = 1,
-        /**< IPsec Protocol */
-        RTE_SECURITY_PROTOCOL_MACSEC,
-        /**< MACSec Protocol */
-        RTE_SECURITY_PROTOCOL_PDCP,
-        /**< PDCP Protocol */
-        RTE_SECURITY_PROTOCOL_DOCSIS,
-        /**< DOCSIS Protocol */
-    };
+.. literalinclude:: ../../../lib/security/rte_security.h
+   :language: c
+   :start-after: Enumeration of rte_security_session_protocol 8<
+   :end-before: >8 End enumeration of rte_security_session_protocol.
 
 Currently the library defines configuration parameters for IPsec and PDCP only.
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index 1a15e95267..71af1bf3e3 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -454,4 +454,5 @@ struct rte_security_docsis_xform {
  * Security session action type.
  */
+/* Enumeration of rte_security_session_action_type 8<*/
 enum rte_security_session_action_type {
 	RTE_SECURITY_ACTION_TYPE_NONE,
@@ -474,6 +475,8 @@ enum rte_security_session_action_type {
 	 */
 };
+/* >8 End enumeration of rte_security_session_action_type. */
 
 /** Security session protocol definition */
+/* Enumeration of rte_security_session_protocol 8<*/
 enum rte_security_session_protocol {
 	RTE_SECURITY_PROTOCOL_IPSEC = 1,
@@ -486,8 +489,10 @@ enum rte_security_session_protocol {
 	/**< DOCSIS Protocol */
 };
+/* >8 End enumeration of rte_security_session_protocol. */
 
 /**
  * Security session configuration
  */
+/* Structure rte_security_session_conf 8< */
 struct rte_security_session_conf {
 	enum rte_security_session_action_type action_type;
@@ -508,4 +513,5 @@ struct rte_security_session_conf {
 	/**< Application specific userdata to be saved with session */
 };
+/* >8 End of structure rte_security_session_conf. */
 
 struct rte_security_session {
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.561249512 +0000
+++ 0028-doc-replace-code-blocks-with-includes-in-security-gu.patch	2023-11-02 13:09:40.824163371 +0000
@@ -1 +1 @@
-From 03e3cfda1679998aa512464affb8dd293146364a Mon Sep 17 00:00:00 2001
+From de8bdca2b3b761a8833de512c695913c54a76fc8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 03e3cfda1679998aa512464affb8dd293146364a ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 7418e35c1b..ae8b0aaef3 100644
+index 72ca0bd330..8619757e84 100644
@@ -23 +24 @@
-@@ -672,23 +672,8 @@ Security session configuration
+@@ -593,23 +593,8 @@ Security session configuration
@@ -51 +52 @@
-@@ -697,41 +682,15 @@ session is configured for Lookaside Protocol offload or Inline Crypto or Inline
+@@ -618,41 +603,15 @@ session is configured for Lookaside Protocol offload or Inline Crypto or Inline
@@ -102 +103 @@
-index 3f8abfef15..c6550f4d8d 100644
+index 1a15e95267..71af1bf3e3 100644
@@ -105 +106 @@
-@@ -623,4 +623,5 @@ struct rte_security_docsis_xform {
+@@ -454,4 +454,5 @@ struct rte_security_docsis_xform {
@@ -111 +112 @@
-@@ -643,6 +644,8 @@ enum rte_security_session_action_type {
+@@ -474,6 +475,8 @@ enum rte_security_session_action_type {
@@ -120 +121 @@
-@@ -655,8 +658,10 @@ enum rte_security_session_protocol {
+@@ -486,8 +489,10 @@ enum rte_security_session_protocol {
@@ -131 +132 @@
-@@ -676,4 +681,5 @@ struct rte_security_session_conf {
+@@ -508,4 +513,5 @@ struct rte_security_session_conf {
@@ -136 +137 @@
- /**
+ struct rte_security_session {

patch 'test/crypto: fix IV in some vectors' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 956aa99fcbff63e72ab2392b234910634c0b1b95 Mon Sep 17 00:00:00 2001
From: Brian Dooley <brian.dooley@intel.com>
Date: Tue, 19 Sep 2023 10:42:16 +0000
Subject: [PATCH] test/crypto: fix IV in some vectors

[ upstream commit af7be52316e8a94f4fba75e644fc1c0fb9531424 ]

SNOW3G and ZUC algorithms require non-zero length IVs.

Fixes: c6c267a00a92 ("test/crypto: add mixed encypted-digest")

Signed-off-by: Brian Dooley <brian.dooley@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
---
 app/test/test_cryptodev_mixed_test_vectors.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/test/test_cryptodev_mixed_test_vectors.h b/app/test/test_cryptodev_mixed_test_vectors.h
index f50dcb0457..db58dbdd72 100644
--- a/app/test/test_cryptodev_mixed_test_vectors.h
+++ b/app/test/test_cryptodev_mixed_test_vectors.h
@@ -285,6 +285,8 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_snow_test_case_1 = {
 	.cipher_iv = {
 		.data = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 		},
-		.len = 0,
+		.len = 16,
 	},
 	.cipher = {
@@ -724,6 +726,8 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_zuc_test_case_1 = {
 	.cipher_iv = {
 		.data = {
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 		},
-		.len = 0,
+		.len = 16,
 	},
 	.cipher = {
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.583770387 +0000
+++ 0029-test-crypto-fix-IV-in-some-vectors.patch	2023-11-02 13:09:40.825163374 +0000
@@ -1 +1 @@
-From af7be52316e8a94f4fba75e644fc1c0fb9531424 Mon Sep 17 00:00:00 2001
+From 956aa99fcbff63e72ab2392b234910634c0b1b95 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit af7be52316e8a94f4fba75e644fc1c0fb9531424 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 161e2d905f..9c4313185e 100644
+index f50dcb0457..db58dbdd72 100644
@@ -21 +22 @@
-@@ -479,6 +479,8 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_snow_test_case_1 = {
+@@ -285,6 +285,8 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_snow_test_case_1 = {
@@ -31 +32 @@
-@@ -918,6 +920,8 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_zuc_test_case_1 = {
+@@ -724,6 +726,8 @@ struct mixed_cipher_auth_test_data auth_aes_cmac_cipher_zuc_test_case_1 = {

patch 'test/crypto: skip some synchronous tests with CPU crypto' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 0ad8ae6b1840cd7b9ae07e393aa3621a49c540fb Mon Sep 17 00:00:00 2001
From: Brian Dooley <brian.dooley@intel.com>
Date: Tue, 19 Sep 2023 10:42:17 +0000
Subject: [PATCH] test/crypto: skip some synchronous tests with CPU crypto

[ upstream commit 38318ce05459391344acb53a73c9a99537a0bd0f ]

Some synchronous tests are not supported for CPU crypto and
need to be skipped. This commit adds in extra skips for these tests.

Fixes: 55ab4a8c4fb5 ("test/crypto: disable wireless cases for CPU crypto API")

Signed-off-by: Brian Dooley <brian.dooley@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
---
 app/test/test_cryptodev.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index ccebeedcc6..0bd4517bf8 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -6492,4 +6492,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
 		return TEST_SKIPPED;
 
+	if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+		return TEST_SKIPPED;
+
 	rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -7572,4 +7575,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
 		return TEST_SKIPPED;
 
+	if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+		return TEST_SKIPPED;
+
 	rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.605517645 +0000
+++ 0030-test-crypto-skip-some-synchronous-tests-with-CPU-cry.patch	2023-11-02 13:09:40.832163396 +0000
@@ -1 +1 @@
-From 38318ce05459391344acb53a73c9a99537a0bd0f Mon Sep 17 00:00:00 2001
+From 0ad8ae6b1840cd7b9ae07e393aa3621a49c540fb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 38318ce05459391344acb53a73c9a99537a0bd0f ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 8fc90342de..aff1c8e55b 100644
+index ccebeedcc6..0bd4517bf8 100644
@@ -22 +23 @@
-@@ -6395,4 +6395,7 @@ test_zuc_auth_cipher(const struct wireless_test_data *tdata,
+@@ -6492,4 +6492,7 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
@@ -30 +31 @@
-@@ -7830,4 +7833,7 @@ test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
+@@ -7572,4 +7575,7 @@ test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,

patch 'test/crypto: fix typo in asym tests' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 4346110ba497700691883bbd4d09a11ed7d27084 Mon Sep 17 00:00:00 2001
From: Sivaramakrishnan Venkat <venkatx.sivaramakrishnan@intel.com>
Date: Fri, 18 Aug 2023 09:52:47 +0000
Subject: [PATCH] test/crypto: fix typo in asym tests

[ upstream commit ea7b0e1a17717872a1d7d74b075a77fdb9414fa4 ]

test_dh_keygenration() changed to test_dh_key_generation()

Fixes: fc6c9066e40d ("test/crypto: add DH and DSA tests")
Fixes: da74df7d38c0 ("test/crypto: move test suite parameters to header file")

Signed-off-by: Sivaramakrishnan Venkat <venkatx.sivaramakrishnan@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
---
 .mailmap                       | 1 +
 app/test/test_cryptodev_asym.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index eddb8a2c4f..d101d0b24c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1260,4 +1260,5 @@ Siobhan Butler <siobhan.a.butler@intel.com>
 Sirshak Das <sirshak.das@arm.com>
 Sivaprasad Tummala <sivaprasad.tummala@amd.com> <sivaprasad.tummala@intel.com>
+Sivaramakrishnan Venkat <venkatx.sivaramakrishnan@intel.com>
 Siwar Zitouni <siwar.zitouni@6wind.com>
 Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 7210497a84..952b927d60 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -1718,5 +1718,5 @@ error_exit:
 
 static int
-test_dh_keygenration(void)
+test_dh_key_generation(void)
 {
 	int status;
@@ -2292,5 +2292,5 @@ static struct unit_test_suite cryptodev_openssl_asym_testsuite  = {
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_dsa),
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
-				test_dh_keygenration),
+				test_dh_key_generation),
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_rsa_enc_dec),
 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.635276479 +0000
+++ 0031-test-crypto-fix-typo-in-asym-tests.patch	2023-11-02 13:09:40.833163400 +0000
@@ -1 +1 @@
-From ea7b0e1a17717872a1d7d74b075a77fdb9414fa4 Mon Sep 17 00:00:00 2001
+From 4346110ba497700691883bbd4d09a11ed7d27084 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ea7b0e1a17717872a1d7d74b075a77fdb9414fa4 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index aa3a55cd99..4765aa26b6 100644
+index eddb8a2c4f..d101d0b24c 100644
@@ -23 +24 @@
-@@ -1301,4 +1301,5 @@ Siobhan Butler <siobhan.a.butler@intel.com>
+@@ -1260,4 +1260,5 @@ Siobhan Butler <siobhan.a.butler@intel.com>
@@ -30 +31 @@
-index 9820b80f7e..39de0bdac5 100644
+index 7210497a84..952b927d60 100644
@@ -33 +34 @@
-@@ -1212,5 +1212,5 @@ error_exit:
+@@ -1718,5 +1718,5 @@ error_exit:
@@ -40 +41 @@
-@@ -2685,5 +2685,5 @@ static struct unit_test_suite cryptodev_openssl_asym_testsuite  = {
+@@ -2292,5 +2292,5 @@ static struct unit_test_suite cryptodev_openssl_asym_testsuite  = {
@@ -45,2 +46,2 @@
- 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_sm2_sign_rnd_secret),
- 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_sm2_verify),
+ 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_rsa_enc_dec),
+ 		TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,

patch 'crypto/ipsec_mb: add dependency check for cross build' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 27a64dc2dd4083a2b9465b6ddf82d7e3064db73e Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 31 Aug 2023 13:10:57 +0100
Subject: [PATCH] crypto/ipsec_mb: add dependency check for cross build

[ upstream commit fb94d8243894524316d872c8299b9e793832d991 ]

When cross-compiling for PowerPC on Ubuntu, the x86 IPSec_MB library was
getting found by the build system for use in the PPC build. This led to
failures at compile time due to the library not being linkable.

We can avoid these failures by checking the discovered library for
compatibility at configuration time. This needs a version check as it is
supported only from version 0.60 of meson onwards.

Fixes: c75542ae4200 ("crypto/ipsec_mb: introduce IPsec_mb framework")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Ciara Power <ciara.power@intel.com>
---
 drivers/crypto/ipsec_mb/meson.build | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build
index a89b29d6c3..e6448532bd 100644
--- a/drivers/crypto/ipsec_mb/meson.build
+++ b/drivers/crypto/ipsec_mb/meson.build
@@ -13,4 +13,9 @@ if not lib.found()
     build = false
     reason = 'missing dependency, "libIPSec_MB"'
+# if the lib is found, check it's the right format
+elif meson.version().version_compare('>=0.60') and not cc.links(
+        'int main(void) {return 0;}', dependencies: lib)
+    build = false
+    reason = 'incompatible dependency, "libIPSec_MB"'
 else
     ext_deps += lib
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.658616276 +0000
+++ 0032-crypto-ipsec_mb-add-dependency-check-for-cross-build.patch	2023-11-02 13:09:40.834163403 +0000
@@ -1 +1 @@
-From fb94d8243894524316d872c8299b9e793832d991 Mon Sep 17 00:00:00 2001
+From 27a64dc2dd4083a2b9465b6ddf82d7e3064db73e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fb94d8243894524316d872c8299b9e793832d991 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 3057e6fd10..87bf965554 100644
+index a89b29d6c3..e6448532bd 100644
@@ -27 +28 @@
-@@ -17,4 +17,9 @@ if not lib.found()
+@@ -13,4 +13,9 @@ if not lib.found()

patch 'eventdev: fix symbol export for port maintenance' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 0882f0ecd2f5fec6cad0a249c5fe0d4ebaf6c6dd Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Tue, 10 Oct 2023 16:00:29 +0200
Subject: [PATCH] eventdev: fix symbol export for port maintenance

[ upstream commit 4d23cf66ec1b666676b228f3d2a54d0c74b289da ]

Trying to call rte_event_maintain out of the eventdev library triggers
a link failure, as the tracepoint symbol associated to this inline
helper was not exported.

Fixes: 54f17843a887 ("eventdev: add port maintenance API")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 lib/eventdev/version.map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map
index ade1f1182e..5c90739873 100644
--- a/lib/eventdev/version.map
+++ b/lib/eventdev/version.map
@@ -102,4 +102,5 @@ EXPERIMENTAL {
 
 	# added in 21.11
+	__rte_eventdev_trace_maintain;
 	rte_event_eth_rx_adapter_create_with_params;
 	rte_event_eth_rx_adapter_queue_conf_get;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.679759602 +0000
+++ 0033-eventdev-fix-symbol-export-for-port-maintenance.patch	2023-11-02 13:09:40.834163403 +0000
@@ -1 +1 @@
-From 4d23cf66ec1b666676b228f3d2a54d0c74b289da Mon Sep 17 00:00:00 2001
+From 0882f0ecd2f5fec6cad0a249c5fe0d4ebaf6c6dd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4d23cf66ec1b666676b228f3d2a54d0c74b289da ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index b03c10d99f..2b2cd06c6f 100644
+index ade1f1182e..5c90739873 100644

patch 'bus/pci: fix device ID log' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 13b3789404780f30bba8a7df316b9726bbd7622e Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang@intel.com>
Date: Wed, 13 Sep 2023 08:23:33 +0000
Subject: [PATCH] bus/pci: fix device ID log

[ upstream commit 5019f6c856fbd9663dd83465c11be423c3424e94 ]

This patch fixes the issue where device ID first 0 does not print.

Fixes: e4f27af0f448 ("bus/pci: reduce boot-up logs to absolute minimum")

Signed-off-by: Qiming Yang <qiming.yang@intel.com>
---
 drivers/bus/pci/pci_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index def372b67e..6ff136f083 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -263,5 +263,5 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
 	}
 
-	RTE_LOG(INFO, EAL, "Probe PCI driver: %s (%x:%x) device: "PCI_PRI_FMT" (socket %i)\n",
+	RTE_LOG(INFO, EAL, "Probe PCI driver: %s (%x:%04x) device: "PCI_PRI_FMT" (socket %i)\n",
 			dr->driver.name, dev->id.vendor_id, dev->id.device_id,
 			loc->domain, loc->bus, loc->devid, loc->function,
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.700729610 +0000
+++ 0034-bus-pci-fix-device-ID-log.patch	2023-11-02 13:09:40.834163403 +0000
@@ -1 +1 @@
-From 5019f6c856fbd9663dd83465c11be423c3424e94 Mon Sep 17 00:00:00 2001
+From 13b3789404780f30bba8a7df316b9726bbd7622e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5019f6c856fbd9663dd83465c11be423c3424e94 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index f149963364..921d957bf6 100644
+index def372b67e..6ff136f083 100644
@@ -20 +21 @@
-@@ -305,5 +305,5 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
+@@ -263,5 +263,5 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,

patch 'event/cnxk: fix getwork mode devargs parsing' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From d31f9b208dd10423874a5d66d87cc33750570a8a Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula@marvell.com>
Date: Mon, 24 Jul 2023 14:06:44 +0530
Subject: [PATCH] event/cnxk: fix getwork mode devargs parsing

[ upstream commit 343216ff0c9f89d8d31060c53ad7271c87bc1323 ]

CN10K can support up to three types of getwork modes, use parse value
function to parse the device arguments.

Fixes: 5fb651552c79 ("event/cnxk: fix SSO and TIM argument parsing")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 drivers/event/cnxk/cnxk_eventdev.c | 2 +-
 drivers/event/cnxk/cnxk_eventdev.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c
index 74bf39205a..27c1840f71 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -575,5 +575,5 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
 	rte_kvargs_process(kvlist, CN9K_SSO_SINGLE_WS, &parse_kvargs_flag,
 			   &single_ws);
-	rte_kvargs_process(kvlist, CN10K_SSO_GW_MODE, &parse_kvargs_flag,
+	rte_kvargs_process(kvlist, CN10K_SSO_GW_MODE, &parse_kvargs_value,
 			   &dev->gw_mode);
 	dev->dual_ws = !single_ws;
diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h
index 39c13b02fc..981a2efc5f 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -114,5 +114,5 @@ struct cnxk_sso_evdev {
 	uint8_t dual_ws;
 	/* CN10K */
-	uint8_t gw_mode;
+	uint32_t gw_mode;
 	/* Crypto adapter */
 	uint8_t is_ca_internal_port;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.721575041 +0000
+++ 0035-event-cnxk-fix-getwork-mode-devargs-parsing.patch	2023-11-02 13:09:40.835163406 +0000
@@ -1 +1 @@
-From 343216ff0c9f89d8d31060c53ad7271c87bc1323 Mon Sep 17 00:00:00 2001
+From d31f9b208dd10423874a5d66d87cc33750570a8a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 343216ff0c9f89d8d31060c53ad7271c87bc1323 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 27883a3619..9c9192bd40 100644
+index 74bf39205a..27c1840f71 100644
@@ -22 +23 @@
-@@ -613,5 +613,5 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
+@@ -575,5 +575,5 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
@@ -28 +29 @@
- 	rte_kvargs_process(kvlist, CN10K_SSO_STASH,
+ 	dev->dual_ws = !single_ws;
@@ -30 +31 @@
-index 962e630256..9d95092669 100644
+index 39c13b02fc..981a2efc5f 100644
@@ -33 +34 @@
-@@ -120,5 +120,5 @@ struct cnxk_sso_evdev {
+@@ -114,5 +114,5 @@ struct cnxk_sso_evdev {
@@ -38,2 +39,2 @@
- 	uint16_t stash_cnt;
- 	struct cnxk_sso_stash *stash_parse_data;
+ 	/* Crypto adapter */
+ 	uint8_t is_ca_internal_port;

patch 'event/cnxk: fix return values for capability API' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 107d68ad4d5247be953193394b0d670b3bfbdc46 Mon Sep 17 00:00:00 2001
From: Aakash Sasidharan <asasidharan@marvell.com>
Date: Tue, 22 Aug 2023 18:46:47 +0530
Subject: [PATCH] event/cnxk: fix return values for capability API

[ upstream commit bccb1d4f10e12c396058c06c3ba9e3565633390e ]

When event_cnxk or crypto_cnxk PMDs are not available,
return -ENOTSUP instead of -EINVAL.
This would allow unit test to be skipped when
the devices are not available.

Fixes: 19f81cb59cb4 ("event/cnxk: add crypto adapter operations")

Signed-off-by: Aakash Sasidharan <asasidharan@marvell.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>
---
 drivers/event/cnxk/cn10k_eventdev.c | 12 ++++++------
 drivers/event/cnxk/cn9k_eventdev.c  | 16 ++++++++--------
 drivers/event/cnxk/cnxk_eventdev.h  |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c
index 9e51fa2385..5fce6a22ac 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -749,6 +749,6 @@ cn10k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,
 			      const struct rte_cryptodev *cdev, uint32_t *caps)
 {
-	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k");
-	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k");
+	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k", ENOTSUP);
+	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k", ENOTSUP);
 
 	*caps = RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD |
@@ -768,6 +768,6 @@ cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
 	RTE_SET_USED(event);
 
-	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k");
-	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k");
+	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k", EINVAL);
+	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k", EINVAL);
 
 	dev->is_ca_internal_port = 1;
@@ -782,6 +782,6 @@ cn10k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev,
 			    int32_t queue_pair_id)
 {
-	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k");
-	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k");
+	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k", EINVAL);
+	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k", EINVAL);
 
 	return cnxk_crypto_adapter_qp_del(cdev, queue_pair_id);
diff --git a/drivers/event/cnxk/cn9k_eventdev.c b/drivers/event/cnxk/cn9k_eventdev.c
index 73cf61670a..16075aab86 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -997,9 +997,9 @@ cn9k_sso_tx_adapter_queue_del(uint8_t id, const struct rte_eventdev *event_dev,
 
 static int
-cn9k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,
-			     const struct rte_cryptodev *cdev, uint32_t *caps)
+cn9k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev, const struct rte_cryptodev *cdev,
+			     uint32_t *caps)
 {
-	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k");
-	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k");
+	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k", ENOTSUP);
+	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k", ENOTSUP);
 
 	*caps = RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD |
@@ -1018,6 +1018,6 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
 	RTE_SET_USED(event);
 
-	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k");
-	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k");
+	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k", EINVAL);
+	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k", EINVAL);
 
 	dev->is_ca_internal_port = 1;
@@ -1032,6 +1032,6 @@ cn9k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev,
 			   int32_t queue_pair_id)
 {
-	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k");
-	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k");
+	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k", EINVAL);
+	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k", EINVAL);
 
 	return cnxk_crypto_adapter_qp_del(cdev, queue_pair_id);
diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h
index 981a2efc5f..9cd1d37010 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -55,8 +55,8 @@
 #define CN10K_GW_MODE_PREF_WFE 2
 
-#define CNXK_VALID_DEV_OR_ERR_RET(dev, drv_name)                               \
+#define CNXK_VALID_DEV_OR_ERR_RET(dev, drv_name, err_val)                      \
 	do {                                                                   \
 		if (strncmp(dev->driver->name, drv_name, strlen(drv_name)))    \
-			return -EINVAL;                                        \
+			return -err_val;                                       \
 	} while (0)
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.743304416 +0000
+++ 0036-event-cnxk-fix-return-values-for-capability-API.patch	2023-11-02 13:09:40.836163409 +0000
@@ -1 +1 @@
-From bccb1d4f10e12c396058c06c3ba9e3565633390e Mon Sep 17 00:00:00 2001
+From 107d68ad4d5247be953193394b0d670b3bfbdc46 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bccb1d4f10e12c396058c06c3ba9e3565633390e ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
- drivers/event/cnxk/cn10k_eventdev.c | 16 ++++++++--------
+ drivers/event/cnxk/cn10k_eventdev.c | 12 ++++++------
@@ -20 +21 @@
- 3 files changed, 18 insertions(+), 18 deletions(-)
+ 3 files changed, 16 insertions(+), 16 deletions(-)
@@ -23 +24 @@
-index 499a3aace7..c5d4be0474 100644
+index 9e51fa2385..5fce6a22ac 100644
@@ -26 +27 @@
-@@ -912,6 +912,6 @@ cn10k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,
+@@ -749,6 +749,6 @@ cn10k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,
@@ -35,2 +36,2 @@
-@@ -930,6 +930,6 @@ cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
- 	int ret;
+@@ -768,6 +768,6 @@ cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
+ 	RTE_SET_USED(event);
@@ -43,2 +44,2 @@
- 	cn10k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
-@@ -945,6 +945,6 @@ cn10k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev, const struct r
+ 	dev->is_ca_internal_port = 1;
+@@ -782,6 +782,6 @@ cn10k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev,
@@ -53,9 +53,0 @@
-@@ -964,6 +964,6 @@ cn10k_crypto_adapter_vec_limits(const struct rte_eventdev *event_dev,
- 				struct rte_event_crypto_adapter_vector_limits *limits)
- {
--	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k");
--	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k");
-+	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k", EINVAL);
-+	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k", EINVAL);
- 
- 	limits->log2_sz = false;
@@ -63 +55 @@
-index 6cce5477f0..f77a9d7085 100644
+index 73cf61670a..16075aab86 100644
@@ -66 +58 @@
-@@ -943,9 +943,9 @@ cn9k_sso_tx_adapter_queue_del(uint8_t id, const struct rte_eventdev *event_dev,
+@@ -997,9 +997,9 @@ cn9k_sso_tx_adapter_queue_del(uint8_t id, const struct rte_eventdev *event_dev,
@@ -80,2 +72,2 @@
-@@ -963,6 +963,6 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
- 	int ret;
+@@ -1018,6 +1018,6 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
+ 	RTE_SET_USED(event);
@@ -88,2 +80,2 @@
- 	cn9k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
-@@ -978,6 +978,6 @@ cn9k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev, const struct rt
+ 	dev->is_ca_internal_port = 1;
+@@ -1032,6 +1032,6 @@ cn9k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev,
@@ -99 +91 @@
-index 9d95092669..bd50de87c0 100644
+index 981a2efc5f..9cd1d37010 100644
@@ -102,2 +94,2 @@
-@@ -49,8 +49,8 @@
- #define CNXK_SSO_FLUSH_RETRY_MAX 0xfff
+@@ -55,8 +55,8 @@
+ #define CN10K_GW_MODE_PREF_WFE 2

patch 'test/event: fix crypto null device creation' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 9ff70c4b78a6c594f8f79622a81d29c841551403 Mon Sep 17 00:00:00 2001
From: Aakash Sasidharan <asasidharan@marvell.com>
Date: Tue, 22 Aug 2023 18:46:49 +0530
Subject: [PATCH] test/event: fix crypto null device creation

[ upstream commit cf57682e1b6fea41566325eb92b0978bd0209904 ]

Create crypto null device only if no other crypto devices
were found.

Fixes: 3c2c535ecfc0 ("test: add event crypto adapter auto-test")

Signed-off-by: Aakash Sasidharan <asasidharan@marvell.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>
Acked-by: Abhinandan Gujjar <abhinandan.gujjar@intel.com>
---
 app/test/test_event_crypto_adapter.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c
index 3d7e9fb93c..ea14094f02 100644
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -524,9 +524,8 @@ configure_cryptodev(void)
 	}
 
-	/* Create a NULL crypto device */
-	nb_devs = rte_cryptodev_device_count_by_driver(
-			rte_cryptodev_driver_id_get(
-			RTE_STR(CRYPTODEV_NAME_NULL_PMD)));
+
+	nb_devs = rte_cryptodev_count();
 	if (!nb_devs) {
+		/* Create a NULL crypto device */
 		ret = rte_vdev_init(
 			RTE_STR(CRYPTODEV_NAME_NULL_PMD), NULL);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.765487339 +0000
+++ 0037-test-event-fix-crypto-null-device-creation.patch	2023-11-02 13:09:40.837163413 +0000
@@ -1 +1 @@
-From cf57682e1b6fea41566325eb92b0978bd0209904 Mon Sep 17 00:00:00 2001
+From 9ff70c4b78a6c594f8f79622a81d29c841551403 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cf57682e1b6fea41566325eb92b0978bd0209904 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 00b20fa443..0c56744ba0 100644
+index 3d7e9fb93c..ea14094f02 100644
@@ -23 +24 @@
-@@ -1073,9 +1073,8 @@ configure_cryptodev(void)
+@@ -524,9 +524,8 @@ configure_cryptodev(void)

patch 'event/sw: remove obsolete comment' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 2ab27f391f3ccd67abfd93d000e94f7f5e77964b Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 14 Sep 2023 10:37:51 +0100
Subject: [PATCH] event/sw: remove obsolete comment

[ upstream commit 34b067274c3b8b405e56322009844539a708820c ]

Code that the comment refers to was previously removed, but the
comment remained.

Fixes: dca926ca9faa ("event/sw: use dynamically-sized IQs")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/event/sw/sw_evdev_scheduler.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/event/sw/sw_evdev_scheduler.c b/drivers/event/sw/sw_evdev_scheduler.c
index 809a54d731..95caebb418 100644
--- a/drivers/event/sw/sw_evdev_scheduler.c
+++ b/drivers/event/sw/sw_evdev_scheduler.c
@@ -369,10 +369,4 @@ __pull_port_lb(struct sw_evdev *sw, uint32_t port_id, int allow_reorder)
 			flags = QE_FLAG_VALID;
 
-		/*
-		 * if we don't have space for this packet in an IQ,
-		 * then move on to next queue. Technically, for a
-		 * packet that needs reordering, we don't need to check
-		 * here, but it simplifies things not to special-case
-		 */
 		uint32_t iq_num = PRIO_TO_IQ(qe->priority);
 		struct sw_qid *qid = &sw->qids[qe->queue_id];
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.787098211 +0000
+++ 0038-event-sw-remove-obsolete-comment.patch	2023-11-02 13:09:40.837163413 +0000
@@ -1 +1 @@
-From 34b067274c3b8b405e56322009844539a708820c Mon Sep 17 00:00:00 2001
+From 2ab27f391f3ccd67abfd93d000e94f7f5e77964b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 34b067274c3b8b405e56322009844539a708820c ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index de6ed21643..17953fde0e 100644
+index 809a54d731..95caebb418 100644

patch 'eventdev/eth_rx: fix timestamp field register in mbuf' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 9ae9b9761710653f34c18a14bb973d757be557c6 Mon Sep 17 00:00:00 2001
From: Rahul Bhansali <rbhansali@marvell.com>
Date: Wed, 20 Sep 2023 22:18:22 +0530
Subject: [PATCH] eventdev/eth_rx: fix timestamp field register in mbuf

[ upstream commit 5083736a4752e0701002297f871325c57568e1d0 ]

For eventdev internal port, timestamp dynamic field registration
in mbuf is not required as that will be done from net device.
For SW eventdev, Rx timestamp field registration will be
done during rxa service initialization.

Fixes: 83ab470d1259 ("eventdev/eth_rx: use timestamp as dynamic mbuf field")

Signed-off-by: Rahul Bhansali <rbhansali@marvell.com>
Acked-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
---
 lib/eventdev/rte_event_eth_rx_adapter.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index 2356e2a535..54115cc899 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -1858,4 +1858,11 @@ rxa_init_service(struct event_eth_rx_adapter *rx_adapter, uint8_t id)
 		return 0;
 
+	if (rte_mbuf_dyn_rx_timestamp_register(
+			&event_eth_rx_timestamp_dynfield_offset,
+			&event_eth_rx_timestamp_dynflag) != 0) {
+		RTE_EDEV_LOG_ERR("Error registering timestamp field in mbuf\n");
+		return -rte_errno;
+	}
+
 	memset(&service, 0, sizeof(service));
 	snprintf(service.name, ETH_RX_ADAPTER_SERVICE_NAME_LEN,
@@ -2422,11 +2429,4 @@ rxa_create(uint8_t id, uint8_t dev_id,
 		rx_adapter->default_cb_arg = 1;
 
-	if (rte_mbuf_dyn_rx_timestamp_register(
-			&event_eth_rx_timestamp_dynfield_offset,
-			&event_eth_rx_timestamp_dynflag) != 0) {
-		RTE_EDEV_LOG_ERR("Error registering timestamp field in mbuf\n");
-		return -rte_errno;
-	}
-
 	rte_eventdev_trace_eth_rx_adapter_create(id, dev_id, conf_cb,
 		conf_arg);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.808313704 +0000
+++ 0039-eventdev-eth_rx-fix-timestamp-field-register-in-mbuf.patch	2023-11-02 13:09:40.840163422 +0000
@@ -1 +1 @@
-From 5083736a4752e0701002297f871325c57568e1d0 Mon Sep 17 00:00:00 2001
+From 9ae9b9761710653f34c18a14bb973d757be557c6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5083736a4752e0701002297f871325c57568e1d0 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index e1660713cd..ea7106a1fe 100644
+index 2356e2a535..54115cc899 100644
@@ -24 +25 @@
-@@ -1913,4 +1913,11 @@ rxa_init_service(struct event_eth_rx_adapter *rx_adapter, uint8_t id)
+@@ -1858,4 +1858,11 @@ rxa_init_service(struct event_eth_rx_adapter *rx_adapter, uint8_t id)
@@ -36 +37 @@
-@@ -2475,11 +2482,4 @@ rxa_create(uint8_t id, uint8_t dev_id,
+@@ -2422,11 +2429,4 @@ rxa_create(uint8_t id, uint8_t dev_id,

patch 'event/sw: fix ordering corruption with op release' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 77810d067de53ea224104a76e7a04bce12b0ecf8 Mon Sep 17 00:00:00 2001
From: Harry van Haaren <harry.van.haaren@intel.com>
Date: Mon, 2 Oct 2023 11:58:35 +0100
Subject: [PATCH] event/sw: fix ordering corruption with op release

[ upstream commit 5078a8f37d82f3b54cf373389b6754e2bafd584f ]

This commit changes the logic in the scheduler to always
reset reorder-buffer (and QID/FID) entries when writing
them. This avoids stale ROB/QID/FID data re-use, which
previously caused ordering issues.

Before this commit, release events left the history-list
in an inconsistent state, and future events with op type of
forward could be incorrectly reordered.

There was a partial fix previously committed which is now
being resolved for all cases in a more general way, hence
the two fixlines here.

Fixes: 2e516d18dc01 ("event/sw: fix events mis-identified as needing reorder")
Fixes: 617995dfc5b2 ("event/sw: add scheduling logic")

Suggested-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/event/sw/sw_evdev_scheduler.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/event/sw/sw_evdev_scheduler.c b/drivers/event/sw/sw_evdev_scheduler.c
index 95caebb418..2ee5d1b2d8 100644
--- a/drivers/event/sw/sw_evdev_scheduler.c
+++ b/drivers/event/sw/sw_evdev_scheduler.c
@@ -91,6 +91,8 @@ sw_schedule_atomic_to_cq(struct sw_evdev *sw, struct sw_qid * const qid,
 
 		int head = (p->hist_head++ & (SW_PORT_HIST_LIST-1));
-		p->hist_list[head].fid = flow_id;
-		p->hist_list[head].qid = qid_id;
+		p->hist_list[head] = (struct sw_hist_list_entry) {
+			.qid = qid_id,
+			.fid = flow_id,
+		};
 
 		p->stats.tx_pkts++;
@@ -163,6 +165,8 @@ sw_schedule_parallel_to_cq(struct sw_evdev *sw, struct sw_qid * const qid,
 
 		const int head = (p->hist_head & (SW_PORT_HIST_LIST-1));
-		p->hist_list[head].fid = SW_HASH_FLOWID(qe->flow_id);
-		p->hist_list[head].qid = qid_id;
+		p->hist_list[head] = (struct sw_hist_list_entry) {
+			.qid = qid_id,
+			.fid = SW_HASH_FLOWID(qe->flow_id),
+		};
 
 		if (keep_order)
@@ -414,5 +418,4 @@ __pull_port_lb(struct sw_evdev *sw, uint32_t port_id, int allow_reorder)
 						hist_entry->rob_entry;
 
-				hist_entry->rob_entry = NULL;
 				/* Although fragmentation not currently
 				 * supported by eventdev API, we support it
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.831012810 +0000
+++ 0040-event-sw-fix-ordering-corruption-with-op-release.patch	2023-11-02 13:09:40.840163422 +0000
@@ -1 +1 @@
-From 5078a8f37d82f3b54cf373389b6754e2bafd584f Mon Sep 17 00:00:00 2001
+From 77810d067de53ea224104a76e7a04bce12b0ecf8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5078a8f37d82f3b54cf373389b6754e2bafd584f ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index 17953fde0e..a5fdcf301b 100644
+index 95caebb418..2ee5d1b2d8 100644

patch 'common/cnxk: fix default flow action setting' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From b2da49e41868a4ff34e54f23efed2bfc7e9fa657 Mon Sep 17 00:00:00 2001
From: Satheesh Paul <psatheesh@marvell.com>
Date: Mon, 31 Jul 2023 08:26:07 +0530
Subject: [PATCH] common/cnxk: fix default flow action setting

[ upstream commit b1f677d4386f7d9ad26a71615c00a2bdcb125c5e ]

For MCAM rules with PF/VF action, the PF's default rule action is
is copied and overwritten over the user provided action. Fixing this
by setting default action only if no other action (like queue) is
specified by user.

Fixes: a07f7ced436d ("common/cnxk: add NPC init and fini")

Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
Reviewed-by: Kiran Kumar K <kirankumark@marvell.com>
---
 drivers/common/cnxk/hw/nix.h            |  1 +
 drivers/common/cnxk/roc_npc.c           | 17 ++++++++++-------
 drivers/common/cnxk/roc_npc_mcam_dump.c |  4 ++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/drivers/common/cnxk/hw/nix.h b/drivers/common/cnxk/hw/nix.h
index dd2ebecc6a..8231c94f0f 100644
--- a/drivers/common/cnxk/hw/nix.h
+++ b/drivers/common/cnxk/hw/nix.h
@@ -617,4 +617,5 @@
 #define NIX_RX_ACTIONOP_PF_FUNC_DROP (0x5ull)
 #define NIX_RX_ACTIONOP_MIRROR	     (0x6ull)
+#define NIX_RX_ACTIONOP_DEFAULT	     (0xfull)
 
 #define NIX_RX_VTAGACTION_VTAG0_RELPTR (0x0ull)
diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
index 5ee7ff5e41..9422a42457 100644
--- a/drivers/common/cnxk/roc_npc.c
+++ b/drivers/common/cnxk/roc_npc.c
@@ -517,9 +517,13 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
 		/* Only VLAN action is provided */
 		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-	} else if (req_act &
-		   (ROC_NPC_ACTION_TYPE_PF | ROC_NPC_ACTION_TYPE_VF)) {
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-		if (req_act & ROC_NPC_ACTION_TYPE_QUEUE)
-			flow->npc_action |= (uint64_t)rq << 20;
+	} else if (req_act & (ROC_NPC_ACTION_TYPE_PF | ROC_NPC_ACTION_TYPE_VF)) {
+		/* Check if any other action is set */
+		if ((req_act == ROC_NPC_ACTION_TYPE_PF) || (req_act == ROC_NPC_ACTION_TYPE_VF)) {
+			flow->npc_action = NIX_RX_ACTIONOP_DEFAULT;
+		} else {
+			flow->npc_action = NIX_RX_ACTIONOP_UCAST;
+			if (req_act & ROC_NPC_ACTION_TYPE_QUEUE)
+				flow->npc_action |= (uint64_t)rq << 20;
+		}
 	} else if (req_act & ROC_NPC_ACTION_TYPE_DROP) {
 		flow->npc_action = NIX_RX_ACTIONOP_DROP;
@@ -532,6 +536,5 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
 		flow->npc_action = NIX_RX_ACTIONOP_UCAST_IPSEC;
 		flow->npc_action |= (uint64_t)rq << 20;
-	} else if (req_act &
-		   (ROC_NPC_ACTION_TYPE_FLAG | ROC_NPC_ACTION_TYPE_MARK)) {
+	} else if (req_act & (ROC_NPC_ACTION_TYPE_FLAG | ROC_NPC_ACTION_TYPE_MARK)) {
 		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
 	} else if (req_act & ROC_NPC_ACTION_TYPE_COUNT) {
diff --git a/drivers/common/cnxk/roc_npc_mcam_dump.c b/drivers/common/cnxk/roc_npc_mcam_dump.c
index 51305b4c2c..1ba3d8f2cf 100644
--- a/drivers/common/cnxk/roc_npc_mcam_dump.c
+++ b/drivers/common/cnxk/roc_npc_mcam_dump.c
@@ -443,4 +443,8 @@ npc_flow_dump_rx_action(FILE *file, uint64_t npc_action)
 			    NPC_MAX_FIELD_NAME_SIZE);
 		break;
+	case NIX_RX_ACTIONOP_DEFAULT:
+		fprintf(file, "NIX_RX_ACTIONOP_DEFAULT (%" PRIu64 ")\n",
+			(uint64_t)NIX_RX_ACTIONOP_DEFAULT);
+		break;
 	default:
 		plt_err("Unknown NIX_RX_ACTIONOP found");
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.852417823 +0000
+++ 0041-common-cnxk-fix-default-flow-action-setting.patch	2023-11-02 13:09:40.842163429 +0000
@@ -1 +1 @@
-From b1f677d4386f7d9ad26a71615c00a2bdcb125c5e Mon Sep 17 00:00:00 2001
+From b2da49e41868a4ff34e54f23efed2bfc7e9fa657 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b1f677d4386f7d9ad26a71615c00a2bdcb125c5e ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 319fe36e04..1720eb3815 100644
+index dd2ebecc6a..8231c94f0f 100644
@@ -26 +27 @@
-@@ -620,4 +620,5 @@
+@@ -617,4 +617,5 @@
@@ -33 +34 @@
-index 86f4d85350..3f4a19b539 100644
+index 5ee7ff5e41..9422a42457 100644
@@ -36 +37 @@
-@@ -727,9 +727,13 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
+@@ -517,9 +517,13 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
@@ -55 +56 @@
-@@ -742,6 +746,5 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
+@@ -532,6 +536,5 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
@@ -64 +65 @@
-index a88e166fbe..ff831b0a71 100644
+index 51305b4c2c..1ba3d8f2cf 100644
@@ -67 +68 @@
-@@ -497,4 +497,8 @@ npc_flow_dump_rx_action(FILE *file, uint64_t npc_action)
+@@ -443,4 +443,8 @@ npc_flow_dump_rx_action(FILE *file, uint64_t npc_action)

patch 'common/cnxk: fix xstats for different packet sizes' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 981e2093cb96a8afbaa9a29d37b1b2ed0beaa6d4 Mon Sep 17 00:00:00 2001
From: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Date: Fri, 11 Aug 2023 14:27:41 +0530
Subject: [PATCH] common/cnxk: fix xstats for different packet sizes

[ upstream commit c68c442ff41c150e6d40b96817cfa8c17c44007e ]

xstats for transmitted packets with different sizes
are not updated as sizeof mailbox response structure
are different in DPDK and kernel. This patch fixes the
same.

Fixes: 503b82de2cbf ("common/cnxk: add mbox request and response definitions")

Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
---
 drivers/common/cnxk/roc_mbox.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h
index 9a8ae6b216..564bf29bc2 100644
--- a/drivers/common/cnxk/roc_mbox.h
+++ b/drivers/common/cnxk/roc_mbox.h
@@ -454,5 +454,5 @@ struct lmtst_tbl_setup_req {
 struct cgx_stats_rsp {
 	struct mbox_msghdr hdr;
-#define CGX_RX_STATS_COUNT 13
+#define CGX_RX_STATS_COUNT 9
 #define CGX_TX_STATS_COUNT 18
 	uint64_t __io rx_stats[CGX_RX_STATS_COUNT];
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.875897343 +0000
+++ 0042-common-cnxk-fix-xstats-for-different-packet-sizes.patch	2023-11-02 13:09:40.844163435 +0000
@@ -1 +1 @@
-From c68c442ff41c150e6d40b96817cfa8c17c44007e Mon Sep 17 00:00:00 2001
+From 981e2093cb96a8afbaa9a29d37b1b2ed0beaa6d4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c68c442ff41c150e6d40b96817cfa8c17c44007e ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 1f267de980..8150e0c5e1 100644
+index 9a8ae6b216..564bf29bc2 100644
@@ -23 +24 @@
-@@ -561,5 +561,5 @@ enum cgx_af_status {
+@@ -454,5 +454,5 @@ struct lmtst_tbl_setup_req {

patch 'common/cnxk: fix different size bit operations' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 3e087130fcfd9b04dc8b69fa3561f4e290f768e7 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <gakhil@marvell.com>
Date: Fri, 11 Aug 2023 14:27:44 +0530
Subject: [PATCH] common/cnxk: fix different size bit operations

[ upstream commit 199e78ab167b0df2b048353c499fa80e1e38977c ]

WORD_SIZE is made as unsigned long long so that
bit operations are done on same size of variables.

Fixes: 1ec23c7523b4 ("common/cnxk: support anti-replay check in SW for cn9k")

Signed-off-by: Akhil Goyal <gakhil@marvell.com>
---
 drivers/common/cnxk/cnxk_security_ar.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/common/cnxk/cnxk_security_ar.h b/drivers/common/cnxk/cnxk_security_ar.h
index 3ec4c296c2..b4c51bd50e 100644
--- a/drivers/common/cnxk/cnxk_security_ar.h
+++ b/drivers/common/cnxk/cnxk_security_ar.h
@@ -18,5 +18,5 @@
 
 #define WORD_SHIFT 6
-#define WORD_SIZE  (1 << WORD_SHIFT)
+#define WORD_SIZE  (1ULL << WORD_SHIFT)
 #define WORD_MASK  (WORD_SIZE - 1)
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.899042351 +0000
+++ 0043-common-cnxk-fix-different-size-bit-operations.patch	2023-11-02 13:09:40.844163435 +0000
@@ -1 +1 @@
-From 199e78ab167b0df2b048353c499fa80e1e38977c Mon Sep 17 00:00:00 2001
+From 3e087130fcfd9b04dc8b69fa3561f4e290f768e7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 199e78ab167b0df2b048353c499fa80e1e38977c ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index deb38db0d0..d0151a752c 100644
+index 3ec4c296c2..b4c51bd50e 100644

patch 'net/cnxk: fix uninitialized variable' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 723ae321d20065b0c4c48b8788d071e578959ff4 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <gakhil@marvell.com>
Date: Fri, 11 Aug 2023 14:28:00 +0530
Subject: [PATCH] net/cnxk: fix uninitialized variable

[ upstream commit 06f089b8e80d102a899c97b8691b4e1b82f25d7e ]

sa_base may be uninitialized in for cases. Initialize it.

Fixes: 4382a7ccf781 ("net/cnxk: support Rx security offload on cn10k")

Signed-off-by: Akhil Goyal <gakhil@marvell.com>
---
 drivers/net/cnxk/cn10k_rx.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
index 42812d5bd3..9d71a9352e 100644
--- a/drivers/net/cnxk/cn10k_rx.h
+++ b/drivers/net/cnxk/cn10k_rx.h
@@ -425,5 +425,5 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
 	struct rte_mbuf *mbuf;
 	uint64_t aura_handle;
-	uint64_t sa_base;
+	uint64_t sa_base = 0;
 	uint16_t lmt_id;
 	uint64_t laddr;
@@ -549,7 +549,7 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
 	uint8x16_t f0, f1, f2, f3;
 	uint16_t lmt_id, d_off;
+	uintptr_t sa_base = 0;
 	uint16_t packets = 0;
 	uint16_t pkts_left;
-	uintptr_t sa_base;
 	uint32_t head;
 	uintptr_t cq0;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.920717938 +0000
+++ 0044-net-cnxk-fix-uninitialized-variable.patch	2023-11-02 13:09:40.845163438 +0000
@@ -1 +1 @@
-From 06f089b8e80d102a899c97b8691b4e1b82f25d7e Mon Sep 17 00:00:00 2001
+From 723ae321d20065b0c4c48b8788d071e578959ff4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 06f089b8e80d102a899c97b8691b4e1b82f25d7e ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index a2ecb25211..cc224eb154 100644
+index 42812d5bd3..9d71a9352e 100644
@@ -20 +21 @@
-@@ -995,6 +995,6 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
+@@ -425,5 +425,5 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
@@ -23,2 +23,0 @@
-+	uint64_t sa_base = 0;
- 	uintptr_t cpth = 0;
@@ -25,0 +25 @@
++	uint64_t sa_base = 0;
@@ -28 +28,2 @@
-@@ -1144,7 +1144,7 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
+@@ -549,7 +549,7 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
+ 	uint8x16_t f0, f1, f2, f3;
@@ -30 +30,0 @@
- 	uint64_t lbase, laddr;

patch 'net/cnxk: fix uninitialized variable' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From a2e1ba51cd186af8ada2bdfcd20b1f0397f56ad6 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <gakhil@marvell.com>
Date: Fri, 11 Aug 2023 14:28:02 +0530
Subject: [PATCH] net/cnxk: fix uninitialized variable

[ upstream commit 7feaf39ce6047ca346dbf141670515b4be4c2fbf ]

Shift may be uninitialized in certain case, initialize it.

Fixes: 55bfac717c72 ("net/cnxk: support Tx security offload on cn10k")

Signed-off-by: Akhil Goyal <gakhil@marvell.com>
---
 drivers/net/cnxk/cn10k_tx.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h
index 692d7978fc..bd9eba08e9 100644
--- a/drivers/net/cnxk/cn10k_tx.h
+++ b/drivers/net/cnxk/cn10k_tx.h
@@ -1497,4 +1497,5 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
 	struct cn10k_eth_txq *txq = tx_queue;
 	rte_iova_t io_addr = txq->io_addr;
+	uint8_t lnum, shift = 0, loff;
 	uintptr_t laddr = txq->lmt_base;
 	uint8_t c_lnum, c_shft, c_loff;
@@ -1503,5 +1504,4 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
 	uint64x2_t xmask01, xmask23;
 	uintptr_t c_laddr = laddr;
-	uint8_t lnum, shift, loff;
 	rte_iova_t c_io_addr;
 	uint64_t sa_base;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.942117657 +0000
+++ 0045-net-cnxk-fix-uninitialized-variable.patch	2023-11-02 13:09:40.846163442 +0000
@@ -1 +1 @@
-From 7feaf39ce6047ca346dbf141670515b4be4c2fbf Mon Sep 17 00:00:00 2001
+From a2e1ba51cd186af8ada2bdfcd20b1f0397f56ad6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7feaf39ce6047ca346dbf141670515b4be4c2fbf ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -17 +18 @@
-index 59a318a597..cb9751b81f 100644
+index 692d7978fc..bd9eba08e9 100644
@@ -20,2 +21,2 @@
-@@ -2000,4 +2000,5 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
- 	uint64x2_t xmask01_w1, xmask23_w1;
+@@ -1497,4 +1497,5 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
+ 	struct cn10k_eth_txq *txq = tx_queue;
@@ -23 +24 @@
-+	uint8_t lnum, shift = 0, loff = 0;
++	uint8_t lnum, shift = 0, loff;
@@ -26 +27 @@
-@@ -2007,5 +2008,4 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
+@@ -1503,5 +1504,4 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -29 +30 @@
--	uint8_t lnum, shift, loff = 0;
+-	uint8_t lnum, shift, loff;

patch 'common/cnxk: fix DPI memzone name' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 7c35f7b1c549b8c3f5afef562917797caf079f61 Mon Sep 17 00:00:00 2001
From: Amit Prakash Shukla <amitprakashs@marvell.com>
Date: Wed, 23 Aug 2023 16:45:14 +0530
Subject: [PATCH] common/cnxk: fix DPI memzone name

[ upstream commit 7ca20b053cb739d021d2ff33a5ba75651048c322 ]

roc_dpi was using vfid as part of name for memzone allocation.
This led to memzone allocation failure in case of multiple
physical functions. vfid is not unique by itself since multiple
physical functions can have the same virtual function indices.
So use complete DBDF as part of memzone name to make it unique.

Fixes: b6e395692b6d ("common/cnxk: add DPI DMA support")

Signed-off-by: Radha Mohan Chintakuntla <radhac@marvell.com>
Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com>
---
 drivers/common/cnxk/roc_dpi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/common/cnxk/roc_dpi.c b/drivers/common/cnxk/roc_dpi.c
index 23b2cc41a4..1666fe5fad 100644
--- a/drivers/common/cnxk/roc_dpi.c
+++ b/drivers/common/cnxk/roc_dpi.c
@@ -82,8 +82,8 @@ roc_dpi_configure(struct roc_dpi *roc_dpi)
 	}
 
-	snprintf(name, sizeof(name), "dpimem%d", roc_dpi->vfid);
+	snprintf(name, sizeof(name), "dpimem%d:%d:%d:%d", pci_dev->addr.domain, pci_dev->addr.bus,
+		 pci_dev->addr.devid, pci_dev->addr.function);
 	buflen = DPI_CMD_QUEUE_SIZE * DPI_CMD_QUEUE_BUFS;
-	dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0,
-					     DPI_CMD_QUEUE_SIZE);
+	dpi_mz = plt_memzone_reserve_aligned(name, buflen, 0, DPI_CMD_QUEUE_SIZE);
 	if (dpi_mz == NULL) {
 		plt_err("dpi memzone reserve failed");
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.965471083 +0000
+++ 0046-common-cnxk-fix-DPI-memzone-name.patch	2023-11-02 13:09:40.847163445 +0000
@@ -1 +1 @@
-From 7ca20b053cb739d021d2ff33a5ba75651048c322 Mon Sep 17 00:00:00 2001
+From 7c35f7b1c549b8c3f5afef562917797caf079f61 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7ca20b053cb739d021d2ff33a5ba75651048c322 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 93c8318a3d..0e2f803077 100644
+index 23b2cc41a4..1666fe5fad 100644

patch 'dma/cnxk: fix device state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From f2a2d57884c625c0a86223d6a2f4b722ff70d19b Mon Sep 17 00:00:00 2001
From: Amit Prakash Shukla <amitprakashs@marvell.com>
Date: Wed, 23 Aug 2023 16:45:16 +0530
Subject: [PATCH] dma/cnxk: fix device state

[ upstream commit 190b2239b801d84179e5f57a1dda7ed19539281c ]

When a device is not set to a ready state, on exiting the application
proper cleanup is not done. This causes the application to fail on
trying to run next time.

Setting the device to ready state on successful probe fixes the issue.

Fixes: 53f6d7328bf4 ("dma/cnxk: create and initialize device on PCI probing")

Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com>
---
 drivers/dma/cnxk/cnxk_dmadev.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c
index 2824c1b44f..e923b2cea3 100644
--- a/drivers/dma/cnxk/cnxk_dmadev.c
+++ b/drivers/dma/cnxk/cnxk_dmadev.c
@@ -448,6 +448,5 @@ static const struct rte_dma_dev_ops cnxk_dmadev_ops = {
 
 static int
-cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused,
-		  struct rte_pci_device *pci_dev)
+cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_pci_device *pci_dev)
 {
 	struct cnxk_dpi_vf_s *dpivf = NULL;
@@ -468,6 +467,5 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
 
-	dmadev = rte_dma_pmd_allocate(name, pci_dev->device.numa_node,
-				      sizeof(*dpivf));
+	dmadev = rte_dma_pmd_allocate(name, pci_dev->device.numa_node, sizeof(*dpivf));
 	if (dmadev == NULL) {
 		plt_err("dma device allocation failed for %s", name);
@@ -494,4 +492,6 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused,
 		goto err_out_free;
 
+	dmadev->state = RTE_DMA_DEV_READY;
+
 	return 0;
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:41.986626484 +0000
+++ 0047-dma-cnxk-fix-device-state.patch	2023-11-02 13:09:40.847163445 +0000
@@ -1 +1 @@
-From 190b2239b801d84179e5f57a1dda7ed19539281c Mon Sep 17 00:00:00 2001
+From f2a2d57884c625c0a86223d6a2f4b722ff70d19b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 190b2239b801d84179e5f57a1dda7ed19539281c ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index f06c979b9c..d8bd61a048 100644
+index 2824c1b44f..e923b2cea3 100644
@@ -24 +25 @@
-@@ -669,6 +669,5 @@ static const struct rte_dma_dev_ops cnxk_dmadev_ops = {
+@@ -448,6 +448,5 @@ static const struct rte_dma_dev_ops cnxk_dmadev_ops = {
@@ -32 +33 @@
-@@ -689,6 +688,5 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused,
+@@ -468,6 +467,5 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused,
@@ -40 +41 @@
-@@ -724,4 +722,6 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused,
+@@ -494,4 +492,6 @@ cnxk_dmadev_probe(struct rte_pci_driver *pci_drv __rte_unused,

patch 'mempool/cnxk: fix free from non-EAL threads' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 5bbab978092b6753c0dcec94bb2c07ae70a7b014 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra@marvell.com>
Date: Tue, 22 Aug 2023 22:31:56 +0530
Subject: [PATCH] mempool/cnxk: fix free from non-EAL threads

[ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ]

For non-EAL pthreads, rte_lcore_id() will not be valid.
So, batch free cannot be used as those threads won't have
dedicated lmtlines. So, fallback to bulk alloc in such cases.

Fixes: ecbc731a2286 ("mempool/cnxk: add cn10k batch enqueue")

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

diff --git a/drivers/mempool/cnxk/cn10k_mempool_ops.c b/drivers/mempool/cnxk/cn10k_mempool_ops.c
index 6ebbf91de5..55ebd6bfeb 100644
--- a/drivers/mempool/cnxk/cn10k_mempool_ops.c
+++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c
@@ -145,4 +145,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,
 	rte_io_wmb();
 
+	/* For non-EAL threads, rte_lcore_id() will not be valid. Hence
+	 * fallback to bulk alloc
+	 */
+	if (unlikely(rte_lcore_id() == LCORE_ID_ANY))
+		return cnxk_mempool_enq(mp, obj_table, n);
+
 	if (n == 1) {
 		roc_npa_aura_op_free(mp->pool_id, 1, ptr[0]);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.007667831 +0000
+++ 0048-mempool-cnxk-fix-free-from-non-EAL-threads.patch	2023-11-02 13:09:40.847163445 +0000
@@ -1 +1 @@
-From e97668dd1e34c7049a7a568bb945f739d7eff9da Mon Sep 17 00:00:00 2001
+From 5bbab978092b6753c0dcec94bb2c07ae70a7b014 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 41b755b52b..2e46204c8d 100644
+index 6ebbf91de5..55ebd6bfeb 100644
@@ -23 +24 @@
-@@ -163,4 +163,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,
+@@ -145,4 +145,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,

patch 'common/cnxk: fix aura disable handling' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From e50b6544bb8fb40b6080442d9fd3038a952e0bca Mon Sep 17 00:00:00 2001
From: Ashwin Sekhar T K <asekhar@marvell.com>
Date: Fri, 25 Aug 2023 09:27:21 +0530
Subject: [PATCH] common/cnxk: fix aura disable handling

[ upstream commit b1c7a08b1afc838809ed196c177c5aac0ca63a21 ]

As done in FLR, similar to CQ disable, in process of
aura disable we need to explicitly clear BP_ENA in order to
deassert backpressure if it was earlier asserted.

Fixes: f765f5611240 ("common/cnxk: add NPA pool HW operations")

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
Signed-off-by: Ashwin Sekhar T K <asekhar@marvell.com>
---
 drivers/common/cnxk/roc_npa.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c
index efcb7582eb..86796fd7fa 100644
--- a/drivers/common/cnxk/roc_npa.c
+++ b/drivers/common/cnxk/roc_npa.c
@@ -116,4 +116,6 @@ npa_aura_pool_fini(struct mbox *mbox, uint32_t aura_id, uint64_t aura_handle)
 	aura_req->aura.ena = 0;
 	aura_req->aura_mask.ena = ~aura_req->aura_mask.ena;
+	aura_req->aura.bp_ena = 0;
+	aura_req->aura_mask.bp_ena = ~aura_req->aura_mask.bp_ena;
 
 	rc = mbox_process(mbox);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.028612041 +0000
+++ 0049-common-cnxk-fix-aura-disable-handling.patch	2023-11-02 13:09:40.848163448 +0000
@@ -1 +1 @@
-From b1c7a08b1afc838809ed196c177c5aac0ca63a21 Mon Sep 17 00:00:00 2001
+From e50b6544bb8fb40b6080442d9fd3038a952e0bca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b1c7a08b1afc838809ed196c177c5aac0ca63a21 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index e092b27ec3..1943bc5420 100644
+index efcb7582eb..86796fd7fa 100644
@@ -23 +24 @@
-@@ -186,4 +186,6 @@ npa_aura_pool_fini(struct mbox *m_box, uint32_t aura_id, uint64_t aura_handle)
+@@ -116,4 +116,6 @@ npa_aura_pool_fini(struct mbox *mbox, uint32_t aura_id, uint64_t aura_handle)

patch 'common/cnxk: remove dead Meson code' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 8816d35798665a8798e1c971386401993d880140 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 13 Sep 2023 15:02:42 +0100
Subject: [PATCH] common/cnxk: remove dead Meson code

[ upstream commit 9b99bf003793fe3e2108ea8f2fdef555542730d9 ]

config_flag_fmt was used in the past and was dropped with commit
762bfccc8abf ("config: remove compatibility build defines").

Fixes: fa8f86a14e2e ("common/cnxk: add build infrastructre and HW definition")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/common/cnxk/meson.build | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index 4928f7e549..9e7ccd285a 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -9,5 +9,4 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 endif
 
-config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
 deps = ['eal', 'pci', 'bus_pci', 'mbuf', 'security']
 sources = files(
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.049980279 +0000
+++ 0050-common-cnxk-remove-dead-Meson-code.patch	2023-11-02 13:09:40.848163448 +0000
@@ -1 +1 @@
-From 9b99bf003793fe3e2108ea8f2fdef555542730d9 Mon Sep 17 00:00:00 2001
+From 8816d35798665a8798e1c971386401993d880140 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9b99bf003793fe3e2108ea8f2fdef555542730d9 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index d5dfd93e31..56eea52909 100644
+index 4928f7e549..9e7ccd285a 100644

patch 'baseband/acc: fix ACC100 HARQ input alignment' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From e166b7fd155b3fa656385f429dc0b8aa53135bea Mon Sep 17 00:00:00 2001
From: Hernan Vargas <hernan.vargas@intel.com>
Date: Tue, 19 Sep 2023 11:24:17 -0700
Subject: [PATCH] baseband/acc: fix ACC100 HARQ input alignment

[ upstream commit 7d048916644d7777872f957901222f2654b234dd ]

Some constraints are imposed onto the ACC100 HARQ input size,
but that value is incorrectly aligned down when getting close to
max (Ncb-F) which is not required.
The wireless performance impact is negligeable but still causes a
few LLRs no to be combined at the very end of the circular buffer.

Fixes: 5802f36dd492 ("baseband/acc100: enforce additional check on FCW")

Signed-off-by: Hernan Vargas <hernan.vargas@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/baseband/acc100/rte_acc100_pmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c
index 5ac2f96a84..d84a8839e0 100644
--- a/drivers/baseband/acc100/rte_acc100_pmd.c
+++ b/drivers/baseband/acc100/rte_acc100_pmd.c
@@ -1376,5 +1376,5 @@ acc100_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fcw,
 
 		/* Alignment on next 64B - Already enforced from HC output */
-		harq_in_length = RTE_ALIGN_FLOOR(harq_in_length, ACC100_HARQ_ALIGN_64B);
+		harq_in_length = RTE_ALIGN_CEIL(harq_in_length, ACC100_HARQ_ALIGN_64B);
 
 		/* Stronger alignment requirement when in decompression mode */
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.070780222 +0000
+++ 0051-baseband-acc-fix-ACC100-HARQ-input-alignment.patch	2023-11-02 13:09:40.852163461 +0000
@@ -1 +1 @@
-From 7d048916644d7777872f957901222f2654b234dd Mon Sep 17 00:00:00 2001
+From e166b7fd155b3fa656385f429dc0b8aa53135bea Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7d048916644d7777872f957901222f2654b234dd ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
- drivers/baseband/acc/rte_acc100_pmd.c | 2 +-
+ drivers/baseband/acc100/rte_acc100_pmd.c | 2 +-
@@ -21,5 +22,5 @@
-diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c
-index 5362d39c30..c736f3e420 100644
---- a/drivers/baseband/acc/rte_acc100_pmd.c
-+++ b/drivers/baseband/acc/rte_acc100_pmd.c
-@@ -1219,5 +1219,5 @@ acc100_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc_fcw_ld *fcw,
+diff --git a/drivers/baseband/acc100/rte_acc100_pmd.c b/drivers/baseband/acc100/rte_acc100_pmd.c
+index 5ac2f96a84..d84a8839e0 100644
+--- a/drivers/baseband/acc100/rte_acc100_pmd.c
++++ b/drivers/baseband/acc100/rte_acc100_pmd.c
+@@ -1376,5 +1376,5 @@ acc100_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc100_fcw_ld *fcw,
@@ -28,2 +29,2 @@
--		harq_in_length = RTE_ALIGN_FLOOR(harq_in_length, ACC_HARQ_ALIGN_64B);
-+		harq_in_length = RTE_ALIGN_CEIL(harq_in_length, ACC_HARQ_ALIGN_64B);
+-		harq_in_length = RTE_ALIGN_FLOOR(harq_in_length, ACC100_HARQ_ALIGN_64B);
++		harq_in_length = RTE_ALIGN_CEIL(harq_in_length, ACC100_HARQ_ALIGN_64B);

patch 'app/bbdev: fix link with NXP LA12XX' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From cbc624f53545df2be4cf3c035ab069ba8040947f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 13 Sep 2023 14:58:42 +0100
Subject: [PATCH] app/bbdev: fix link with NXP LA12XX

[ upstream commit 77f913752a55c0262bfda99a1b69ca0bd804c6c7 ]

The LA12XX driver was not linked to the dpdk-test-bbdev tool because of
what looks like a rebase issue.

Fixes: 2b504721bfda ("app/bbdev: enable la12xx")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Nicolas Chautru <nicolas.chautru@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 app/test-bbdev/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-bbdev/meson.build b/app/test-bbdev/meson.build
index 76d4c26999..c4686251b9 100644
--- a/app/test-bbdev/meson.build
+++ b/app/test-bbdev/meson.build
@@ -24,5 +24,5 @@ if dpdk_conf.has('RTE_BASEBAND_ACC100')
     deps += ['baseband_acc100']
 endif
-if dpdk_conf.has('RTE_LIBRTE_PMD_BBDEV_LA12XX')
+if dpdk_conf.has('RTE_BASEBAND_LA12XX')
     deps += ['baseband_la12xx']
 endif
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.094659468 +0000
+++ 0052-app-bbdev-fix-link-with-NXP-LA12XX.patch	2023-11-02 13:09:40.852163461 +0000
@@ -1 +1 @@
-From 77f913752a55c0262bfda99a1b69ca0bd804c6c7 Mon Sep 17 00:00:00 2001
+From cbc624f53545df2be4cf3c035ab069ba8040947f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 77f913752a55c0262bfda99a1b69ca0bd804c6c7 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index cd6a5089d5..926e0a5271 100644
+index 76d4c26999..c4686251b9 100644
@@ -24,2 +25,2 @@
-@@ -24,5 +24,5 @@ if dpdk_conf.has('RTE_BASEBAND_ACC')
-     deps += ['baseband_acc']
+@@ -24,5 +24,5 @@ if dpdk_conf.has('RTE_BASEBAND_ACC100')
+     deps += ['baseband_acc100']

patch 'net/i40e: fix FDIR queue receives broadcast packets' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 1d231c0c2699f60802599fa5764ad77e3075404c Mon Sep 17 00:00:00 2001
From: Beilei Xing <beilei.xing@intel.com>
Date: Fri, 21 Jul 2023 05:35:13 +0000
Subject: [PATCH] net/i40e: fix FDIR queue receives broadcast packets

[ upstream commit c07aa47b6272cc14842af06e437cda870e867fbd ]

FDIR Rxq is excepted to only receive FDIR programming status, won't
receive broadcast packets.

Fixes: a778a1fa2e4e ("i40e: set up and initialize flow director")

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 07deb272c3..d829467f41 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -5987,12 +5987,14 @@ i40e_vsi_setup(struct i40e_pf *pf,
 	}
 
-	/* MAC/VLAN configuration */
-	rte_memcpy(&filter.mac_addr, &broadcast, RTE_ETHER_ADDR_LEN);
-	filter.filter_type = I40E_MACVLAN_PERFECT_MATCH;
+	if (vsi->type != I40E_VSI_FDIR) {
+		/* MAC/VLAN configuration for non-FDIR VSI*/
+		rte_memcpy(&filter.mac_addr, &broadcast, RTE_ETHER_ADDR_LEN);
+		filter.filter_type = I40E_MACVLAN_PERFECT_MATCH;
 
-	ret = i40e_vsi_add_mac(vsi, &filter);
-	if (ret != I40E_SUCCESS) {
-		PMD_DRV_LOG(ERR, "Failed to add MACVLAN filter");
-		goto fail_msix_alloc;
+		ret = i40e_vsi_add_mac(vsi, &filter);
+		if (ret != I40E_SUCCESS) {
+			PMD_DRV_LOG(ERR, "Failed to add MACVLAN filter");
+			goto fail_msix_alloc;
+		}
 	}
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.115271715 +0000
+++ 0053-net-i40e-fix-FDIR-queue-receives-broadcast-packets.patch	2023-11-02 13:09:40.860163486 +0000
@@ -1 +1 @@
-From c07aa47b6272cc14842af06e437cda870e867fbd Mon Sep 17 00:00:00 2001
+From 1d231c0c2699f60802599fa5764ad77e3075404c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c07aa47b6272cc14842af06e437cda870e867fbd ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 50ba9aac94..0482647cc1 100644
+index 07deb272c3..d829467f41 100644
@@ -22 +23 @@
-@@ -6027,12 +6027,14 @@ i40e_vsi_setup(struct i40e_pf *pf,
+@@ -5987,12 +5987,14 @@ i40e_vsi_setup(struct i40e_pf *pf,

patch 'net/ice: write timestamp to first segment in scattered Rx' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From e7bd53b384fbc000dd9d30f04bd3ac90bb7bb0fd Mon Sep 17 00:00:00 2001
From: Martin Weiser <martin.weiser@allegro-packets.com>
Date: Tue, 8 Aug 2023 11:39:52 +0000
Subject: [PATCH] net/ice: write timestamp to first segment in scattered Rx

[ upstream commit 6fc6b7260e0cd122433b4e439d7372a5281fff69 ]

Previously, the Rx timestamp was written to the last segment of the mbuf
chain, which was unexpected.

Fixes: 5543827fc6df ("net/ice: improve performance of Rx timestamp offload")

Signed-off-by: Martin Weiser <martin.weiser@allegro-packets.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 19bc94b6a6..a6921e1c18 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -2003,5 +2003,5 @@ ice_recv_scattered_pkts(void *rx_queue,
 			rxq->hw_time_update = rte_get_timer_cycles() /
 					     (rte_get_timer_hz() / 1000);
-			*RTE_MBUF_DYNFIELD(rxm,
+			*RTE_MBUF_DYNFIELD(first_seg,
 					   (ice_timestamp_dynfield_offset),
 					   rte_mbuf_timestamp_t *) = ts_ns;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.143123001 +0000
+++ 0054-net-ice-write-timestamp-to-first-segment-in-scattere.patch	2023-11-02 13:09:40.862163493 +0000
@@ -1 +1 @@
-From 6fc6b7260e0cd122433b4e439d7372a5281fff69 Mon Sep 17 00:00:00 2001
+From e7bd53b384fbc000dd9d30f04bd3ac90bb7bb0fd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6fc6b7260e0cd122433b4e439d7372a5281fff69 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 64c4486b4b..e07c6d1f15 100644
+index 19bc94b6a6..a6921e1c18 100644
@@ -22 +23 @@
-@@ -2151,5 +2151,5 @@ ice_recv_scattered_pkts(void *rx_queue,
+@@ -2003,5 +2003,5 @@ ice_recv_scattered_pkts(void *rx_queue,

patch 'net/iavf: fix VLAN offload strip flag' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 71663e247f0090389df21a9f70cd1bba6983dbad Mon Sep 17 00:00:00 2001
From: Wenjing Qiao <wenjing.qiao@intel.com>
Date: Mon, 21 Aug 2023 09:52:12 +0000
Subject: [PATCH] net/iavf: fix VLAN offload strip flag

[ upstream commit e25c7ed114b296ddaa583427824acc30bcf9c85d ]

For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP,
it will set strip on when setting filter on but dpdk side will not
change strip flag. To be consistent with dpdk side, disable strip
again.

Fixes: cb25d4323fbf ("net/avf: enable MAC VLAN and promisc ops")

Signed-off-by: Wenjing Qiao <wenjing.qiao@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index e40af1316d..476a8fd1b5 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1317,4 +1317,5 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 		IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
 	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+	struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
 	int err;
 
@@ -1335,4 +1336,21 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 	if (err)
 		return -EIO;
+
+	/* For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP,
+	 * it will set strip on when setting filter on but dpdk side will not
+	 * change strip flag. To be consistent with dpdk side, disable strip
+	 * again.
+	 *
+	 * For i40e kernel driver which supports vlan v2, dpdk will invoke vlan v2
+	 * related function, so it won't go through here.
+	 */
+	if (adapter->hw.mac.type == IAVF_MAC_XL710 ||
+	    adapter->hw.mac.type == IAVF_MAC_X722_VF) {
+		if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {
+			err = iavf_disable_vlan_strip(adapter);
+			if (err)
+				return -EIO;
+		}
+	}
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.167006403 +0000
+++ 0055-net-iavf-fix-VLAN-offload-strip-flag.patch	2023-11-02 13:09:40.863163496 +0000
@@ -1 +1 @@
-From e25c7ed114b296ddaa583427824acc30bcf9c85d Mon Sep 17 00:00:00 2001
+From 71663e247f0090389df21a9f70cd1bba6983dbad Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e25c7ed114b296ddaa583427824acc30bcf9c85d ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index c0ca733c67..9591acef65 100644
+index e40af1316d..476a8fd1b5 100644
@@ -24 +25 @@
-@@ -1370,4 +1370,5 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+@@ -1317,4 +1317,5 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
@@ -30 +31 @@
-@@ -1388,4 +1389,21 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+@@ -1335,4 +1336,21 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)

patch 'net/iavf: fix checksum offloading' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From bf23d4ca4785eef62723969dd03b3826975b2509 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 23 Aug 2023 08:29:11 +0200
Subject: [PATCH] net/iavf: fix checksum offloading

[ upstream commit 3c715591ece0771b7a5503ffe5340c6f3cc1cb62 ]

l2_len and l3_len fields are related to Tx offloading features.

It is undefined in the DPDK API what those fields may contain if an
application did not request a Tx offload.

Skip reading them if no Tx offloads has been requested.

Fixes: 1e728b01120c ("net/iavf: rework Tx path")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 19b46b2a5d..1881f97803 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2441,4 +2441,7 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,
 	}
 
+	if ((m->ol_flags & IAVF_TX_CKSUM_OFFLOAD_MASK) == 0)
+		goto skip_cksum;
+
 	/* Set MACLEN */
 	offset |= (m->l2_len >> 1) << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;
@@ -2494,4 +2497,5 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,
 	}
 
+skip_cksum:
 	*qw1 = rte_cpu_to_le_64((((uint64_t)command <<
 		IAVF_TXD_DATA_QW1_CMD_SHIFT) & IAVF_TXD_DATA_QW1_CMD_MASK) |
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.189140254 +0000
+++ 0056-net-iavf-fix-checksum-offloading.patch	2023-11-02 13:09:40.864163499 +0000
@@ -1 +1 @@
-From 3c715591ece0771b7a5503ffe5340c6f3cc1cb62 Mon Sep 17 00:00:00 2001
+From bf23d4ca4785eef62723969dd03b3826975b2509 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3c715591ece0771b7a5503ffe5340c6f3cc1cb62 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index f7df4665d1..33b0f9f482 100644
+index 19b46b2a5d..1881f97803 100644
@@ -26 +27 @@
-@@ -2644,4 +2644,7 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,
+@@ -2441,4 +2441,7 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,
@@ -33,2 +34,2 @@
- 	if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK &&
-@@ -2703,4 +2706,5 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,
+ 	offset |= (m->l2_len >> 1) << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;
+@@ -2494,4 +2497,5 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t *qw1,

patch 'net/i40e: fix buffer leak on Rx reconfiguration' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 13662a31d2e40a3e89f1a3741163d2dfcb6f16f2 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 31 Aug 2023 13:33:34 +0100
Subject: [PATCH] net/i40e: fix buffer leak on Rx reconfiguration

[ upstream commit 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c ]

When reconfiguring a single queue on a device, the mbuf initializer
value was not getting set, and remained at zero. This lead to mbuf leaks
as the refcount was incorrect (0), so on free it wrapped around to
UINT16_MAX. When setting up the mbuf initializer, also ensure that the
queue is explicitly marked as using a vector function by setting the
"rx_using_sse" flag.

Fixes: a3c83a2527e1 ("net/i40e: enable runtime queue setup")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_rxtx.c            | 6 ++++++
 drivers/net/i40e/i40e_rxtx_vec_common.h | 1 +
 2 files changed, 7 insertions(+)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 1c9e51fe2e..8a277dfe31 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1918,4 +1918,10 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev,
 			ad->rx_bulk_alloc_allowed = false;
 		i40e_set_rx_function(dev);
+
+		if (ad->rx_vec_allowed && i40e_rxq_vec_setup(rxq)) {
+			PMD_DRV_LOG(ERR, "Failed vector rx setup.");
+			return -EINVAL;
+		}
+
 		return 0;
 	} else if (ad->rx_vec_allowed && !rte_is_power_of_2(rxq->nb_rx_desc)) {
diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h
index f9a7f46550..489ea0b1f6 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_common.h
+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h
@@ -202,4 +202,5 @@ i40e_rxq_vec_setup_default(struct i40e_rx_queue *rxq)
 	p = (uintptr_t)&mb_def.rearm_data;
 	rxq->mbuf_initializer = *(uint64_t *)p;
+	rxq->rx_using_sse = 1;
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.213434831 +0000
+++ 0057-net-i40e-fix-buffer-leak-on-Rx-reconfiguration.patch	2023-11-02 13:09:40.866163506 +0000
@@ -1 +1 @@
-From 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c Mon Sep 17 00:00:00 2001
+From 13662a31d2e40a3e89f1a3741163d2dfcb6f16f2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index f37bf30d56..9aa5facb53 100644
+index 1c9e51fe2e..8a277dfe31 100644
@@ -27 +28 @@
-@@ -1919,4 +1919,10 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev,
+@@ -1918,4 +1918,10 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev,
@@ -39 +40 @@
-index fe1a6ec75e..8b745630e4 100644
+index f9a7f46550..489ea0b1f6 100644

patch 'net/ice: fix TM configuration clearing' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 28ddcaf4a6195f728cb5ead6a8e529f82dd525e6 Mon Sep 17 00:00:00 2001
From: Kaiwen Deng <kaiwenx.deng@intel.com>
Date: Wed, 6 Sep 2023 15:49:30 +0800
Subject: [PATCH] net/ice: fix TM configuration clearing

[ upstream commit c21a6a3ff6c49965d4373677255058d041dafe96 ]

When the device is stopped, the PMD resets the commit flag so that
we can update the hierarchy configuration. The commit flag is also
used to determine if the hierarchy configuration needs to be cleared.
When the PMD exits, it always stops the device first and also resets
the commit flag result in the hierarchy configuration is not cleared.

This commit changes the PMD to not reset the commit flag when the
device is stopped. And we prevent additional commit when device is
running by only checking the stop flag.

Fixes: f5ec6a3a1987 ("net/ice: fix TM hierarchy commit flag reset")

Signed-off-by: Kaiwen Deng <kaiwenx.deng@intel.com>
Acked-by: Wenjun Wu <wenjun1.wu@intel.com>
---
 drivers/net/ice/ice_dcf_ethdev.c |  2 --
 drivers/net/ice/ice_dcf_sched.c  | 14 ++++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c
index 20888f1980..8954dc0f8d 100644
--- a/drivers/net/ice/ice_dcf_ethdev.c
+++ b/drivers/net/ice/ice_dcf_ethdev.c
@@ -612,5 +612,4 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
 	struct rte_intr_handle *intr_handle = dev->intr_handle;
 	struct ice_adapter *ad = &dcf_ad->parent;
-	struct ice_dcf_hw *hw = &dcf_ad->real_hw;
 
 	if (ad->pf.adapter_stopped == 1) {
@@ -630,5 +629,4 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
 	dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN;
 	ad->pf.adapter_stopped = 1;
-	hw->tm_conf.committed = false;
 
 	return 0;
diff --git a/drivers/net/ice/ice_dcf_sched.c b/drivers/net/ice/ice_dcf_sched.c
index a231c1e60b..b08bc5f1de 100644
--- a/drivers/net/ice/ice_dcf_sched.c
+++ b/drivers/net/ice/ice_dcf_sched.c
@@ -238,4 +238,5 @@ ice_dcf_node_add(struct rte_eth_dev *dev, uint32_t node_id,
 	struct ice_dcf_tm_shaper_profile *shaper_profile = NULL;
 	struct ice_dcf_adapter *adapter = dev->data->dev_private;
+	struct ice_adapter *ad = &adapter->parent;
 	struct ice_dcf_hw *hw = &adapter->real_hw;
 	struct ice_dcf_tm_node *parent_node;
@@ -247,8 +248,8 @@ ice_dcf_node_add(struct rte_eth_dev *dev, uint32_t node_id,
 		return -EINVAL;
 
-	/* if already committed */
-	if (hw->tm_conf.committed) {
+	/* if port is running */
+	if (!ad->pf.adapter_stopped) {
 		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "already committed";
+		error->message = "port is running";
 		return -EINVAL;
 	}
@@ -401,4 +402,5 @@ ice_dcf_node_delete(struct rte_eth_dev *dev, uint32_t node_id,
 	enum ice_dcf_tm_node_type node_type = ICE_DCF_TM_NODE_TYPE_MAX;
 	struct ice_dcf_adapter *adapter = dev->data->dev_private;
+	struct ice_adapter *ad = &adapter->parent;
 	struct ice_dcf_hw *hw = &adapter->real_hw;
 	struct ice_dcf_tm_node *tm_node;
@@ -407,8 +409,8 @@ ice_dcf_node_delete(struct rte_eth_dev *dev, uint32_t node_id,
 		return -EINVAL;
 
-	/* if already committed */
-	if (hw->tm_conf.committed) {
+	/* if port is running */
+	if (!ad->pf.adapter_stopped) {
 		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "already committed";
+		error->message = "port is running";
 		return -EINVAL;
 	}
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.237147124 +0000
+++ 0058-net-ice-fix-TM-configuration-clearing.patch	2023-11-02 13:09:40.867163509 +0000
@@ -1 +1 @@
-From c21a6a3ff6c49965d4373677255058d041dafe96 Mon Sep 17 00:00:00 2001
+From 28ddcaf4a6195f728cb5ead6a8e529f82dd525e6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c21a6a3ff6c49965d4373677255058d041dafe96 ]
+
@@ -17 +18,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 30ad18d8fc..065ec728c2 100644
+index 20888f1980..8954dc0f8d 100644
@@ -30 +31 @@
-@@ -671,5 +671,4 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
+@@ -612,5 +612,4 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
@@ -36 +37 @@
-@@ -698,5 +697,4 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)
+@@ -630,5 +629,4 @@ ice_dcf_dev_stop(struct rte_eth_dev *dev)

patch 'net/iavf: fix port stats clearing' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 1b0d948303a8c2c9ab2c33b03630633f6ad277e8 Mon Sep 17 00:00:00 2001
From: Yiding Zhou <yidingx.zhou@intel.com>
Date: Thu, 7 Sep 2023 10:39:42 +0800
Subject: [PATCH] net/iavf: fix port stats clearing

[ upstream commit 57fc68cf11cf3ec49526d8a8eca98956d5b77989 ]

After VF reset, kernel driver may reuse the original VSI without reset its
stats. Call 'iavf_dev_stats_reset' during the initialization of the VF in
order to clear any statistics that may exist from the last use of the VF
and to avoid statistics errors.

Fixes: 22b123a36d07 ("net/avf: initialize PMD")

Signed-off-by: Kuan Xu <kuanx.xu@intel.com>
Signed-off-by: Yiding Zhou <yidingx.zhou@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 .mailmap                       | 1 +
 drivers/net/iavf/iavf_ethdev.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index d101d0b24c..743366389a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -727,4 +727,5 @@ Krzysztof Kanas <kkanas@marvell.com> <krzysztof.kanas@caviumnetworks.com>
 Krzysztof Karas <krzysztof.karas@intel.com>
 Krzysztof Witek <krzysztof.witek@6wind.com>
+Kuan Xu <kuanx.xu@intel.com>
 Kuba Kozak <kubax.kozak@intel.com>
 Kumar Amber <kumar.amber@intel.com>
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 476a8fd1b5..f9eef7233d 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -2626,4 +2626,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
 	iavf_default_rss_disable(adapter);
 
+	iavf_dev_stats_reset(eth_dev);
 
 	/* Start device watchdog */
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.259435567 +0000
+++ 0059-net-iavf-fix-port-stats-clearing.patch	2023-11-02 13:09:40.869163515 +0000
@@ -1 +1 @@
-From 57fc68cf11cf3ec49526d8a8eca98956d5b77989 Mon Sep 17 00:00:00 2001
+From 1b0d948303a8c2c9ab2c33b03630633f6ad277e8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 57fc68cf11cf3ec49526d8a8eca98956d5b77989 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 85682c3ec4..013ad8cbca 100644
+index d101d0b24c..743366389a 100644
@@ -26 +27 @@
-@@ -753,4 +753,5 @@ Krzysztof Kanas <kkanas@marvell.com> <krzysztof.kanas@caviumnetworks.com>
+@@ -727,4 +727,5 @@ Krzysztof Kanas <kkanas@marvell.com> <krzysztof.kanas@caviumnetworks.com>
@@ -33 +34 @@
-index c71b6565f3..27a6a7b80f 100644
+index 476a8fd1b5..f9eef7233d 100644
@@ -36 +37 @@
-@@ -2749,4 +2749,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2626,4 +2626,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)

patch 'net/iavf: unregister interrupt handler before FD close' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 77aff6a04619079eb4fc934ba5c8859be5288b28 Mon Sep 17 00:00:00 2001
From: Saurabh Singhal <saurabhs@arista.com>
Date: Wed, 6 Sep 2023 20:15:29 -0700
Subject: [PATCH] net/iavf: unregister interrupt handler before FD close

[ upstream commit e35a5737a7469423880a0946afffd2568f6156dd ]

Unregister VFIO interrupt handler before the interrupt fd gets closed in
case iavf_dev_init() returns an error.

dpdk creates a standalone thread named eal-intr-thread for processing
interrupts for the PCI devices. The interrupt handler callbacks are
registered by the VF driver(iavf, in this case).

When we do a PCI probe of the network interfaces, we register an
interrupt handler, open a vfio-device fd using ioctl, and an eventfd in
dpdk. These interrupt sources are registered in a global linked list
that the eal-intr-thread keeps iterating over for handling the
interrupts. In our internal testing, we see eal-intr-thread crash in
these two ways:

Error adding fd 660 epoll_ctl, Operation not permitted

or

Error adding fd 660 epoll_ctl, Bad file descriptor

epoll_ctl() returns EPERM if the target fd does not support poll.
It returns EBADF when the epoll fd itself is closed or the target fd is
closed.

When the first type of crash happens, we see that the fd 660 is
anon_inode:[vfio-device] which does not support poll.

When the second type of crash happens, we could see from the fd map of
the crashing process that the fd 660 was already closed.

This means the said fd has been closed and in certain cases may have
been reassigned to a different device by the operating system but the
eal-intr-thread does not know about it.

We observed that these crashes were always accompanied by an error in
iavf_dev_init() after rte_intr_callback_register() and
iavf_enable_irq0() have already happened. In the error path, the
intr_handle_fd was being closed but the interrupt handler wasn't being
unregistered.

The fix is to unregister the interrupt handle in the
iavf_dev_init() error path.

Ensure proper cleanup if iavf_security_init() or
iavf_security_ctx_create() fail. Earlier, we were leaking memory by
simply returning from iavf_dev_init().

Fixes: 22b123a36d07 ("net/avf: initialize PMD")
Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto")

Signed-off-by: Saurabh Singhal <saurabhs@arista.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 .mailmap                       |  1 +
 drivers/net/iavf/iavf_ethdev.c | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 743366389a..f0aac43189 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1194,4 +1194,5 @@ Satha Rao <skoteshwar@marvell.com> <skoteshwar@caviumnetworks.com>
 Satheesh Paul <psatheesh@marvell.com>
 Sathesh Edara <sedara@marvell.com>
+Saurabh Singhal <saurabhs@arista.com>
 Savinay Dharmappa <savinay.dharmappa@intel.com>
 Scott Branden <scott.branden@broadcom.com>
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index f9eef7233d..2214ba9545 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -126,4 +126,6 @@ static int iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
 static int iavf_dev_rx_queue_intr_disable(struct rte_eth_dev *dev,
 					 uint16_t queue_id);
+static void iavf_dev_interrupt_handler(void *param);
+static void iavf_disable_irq0(struct iavf_hw *hw);
 static int iavf_dev_flow_ops_get(struct rte_eth_dev *dev,
 				 const struct rte_flow_ops **ops);
@@ -2614,5 +2616,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
 		if (ret) {
 			PMD_INIT_LOG(ERR, "failed to create ipsec crypto security instance");
-			return ret;
+			goto flow_init_err;
 		}
 
@@ -2620,5 +2622,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
 		if (ret) {
 			PMD_INIT_LOG(ERR, "failed to initialized ipsec crypto resources");
-			return ret;
+			goto security_init_err;
 		}
 	}
@@ -2634,5 +2636,21 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
 	return 0;
 
+security_init_err:
+	iavf_security_ctx_destroy(adapter);
+
 flow_init_err:
+	iavf_disable_irq0(hw);
+
+	if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) {
+		/* disable uio intr before callback unregiser */
+		rte_intr_disable(pci_dev->intr_handle);
+
+		/* unregister callback func from eal lib */
+		rte_intr_callback_unregister(pci_dev->intr_handle,
+					     iavf_dev_interrupt_handler, eth_dev);
+	} else {
+		rte_eal_alarm_cancel(iavf_dev_alarm_handler, eth_dev);
+	}
+
 	rte_free(eth_dev->data->mac_addrs);
 	eth_dev->data->mac_addrs = NULL;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.283195979 +0000
+++ 0060-net-iavf-unregister-interrupt-handler-before-FD-clos.patch	2023-11-02 13:09:40.870163518 +0000
@@ -1 +1 @@
-From e35a5737a7469423880a0946afffd2568f6156dd Mon Sep 17 00:00:00 2001
+From 77aff6a04619079eb4fc934ba5c8859be5288b28 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e35a5737a7469423880a0946afffd2568f6156dd ]
+
@@ -55 +56,0 @@
-Cc: stable@dpdk.org
@@ -65 +66 @@
-index 013ad8cbca..d35257d6eb 100644
+index 743366389a..f0aac43189 100644
@@ -68 +69 @@
-@@ -1236,4 +1236,5 @@ Satha Rao <skoteshwar@marvell.com> <skoteshwar@caviumnetworks.com>
+@@ -1194,4 +1194,5 @@ Satha Rao <skoteshwar@marvell.com> <skoteshwar@caviumnetworks.com>
@@ -75 +76 @@
-index 27a6a7b80f..97390237ba 100644
+index f9eef7233d..2214ba9545 100644
@@ -78 +79 @@
-@@ -134,4 +134,6 @@ static int iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
+@@ -126,4 +126,6 @@ static int iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev,
@@ -85 +86 @@
-@@ -2737,5 +2739,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2614,5 +2616,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
@@ -92 +93 @@
-@@ -2743,5 +2745,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2620,5 +2622,5 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
@@ -99 +100 @@
-@@ -2757,5 +2759,21 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
+@@ -2634,5 +2636,21 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)

patch 'net/iavf: fix ESN session update' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From f89cd0418dc102e8155e6b2f4189fc0b1b3ed151 Mon Sep 17 00:00:00 2001
From: Radu Nicolau <radu.nicolau@intel.com>
Date: Mon, 11 Sep 2023 10:20:40 +0100
Subject: [PATCH] net/iavf: fix ESN session update

[ upstream commit 53f85be62be6cfd4b55b9b011bf235eb14dd484a ]

Update both high and low section of the ESN.

Fixes: 6bc987ecb860 ("net/iavf: support IPsec inline crypto")

Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
Reviewed-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_ipsec_crypto.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/iavf/iavf_ipsec_crypto.c b/drivers/net/iavf/iavf_ipsec_crypto.c
index e7d8fb968c..9ab09778e2 100644
--- a/drivers/net/iavf/iavf_ipsec_crypto.c
+++ b/drivers/net/iavf/iavf_ipsec_crypto.c
@@ -840,4 +840,5 @@ iavf_ipsec_crypto_sa_update_esn(struct iavf_adapter *adapter,
 	request->ipsec_data.sa_update->sa_index = sess->sa.hw_idx;
 	request->ipsec_data.sa_update->esn_hi = sess->esn.hi;
+	request->ipsec_data.sa_update->esn_low = sess->esn.low;
 
 	/* send virtual channel request to add SA to hardware database */
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.307266881 +0000
+++ 0061-net-iavf-fix-ESN-session-update.patch	2023-11-02 13:09:40.872163525 +0000
@@ -1 +1 @@
-From 53f85be62be6cfd4b55b9b011bf235eb14dd484a Mon Sep 17 00:00:00 2001
+From f89cd0418dc102e8155e6b2f4189fc0b1b3ed151 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 53f85be62be6cfd4b55b9b011bf235eb14dd484a ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 408b410f15..07a69db540 100644
+index e7d8fb968c..9ab09778e2 100644
@@ -21 +22 @@
-@@ -829,4 +829,5 @@ iavf_ipsec_crypto_sa_update_esn(struct iavf_adapter *adapter,
+@@ -840,4 +840,5 @@ iavf_ipsec_crypto_sa_update_esn(struct iavf_adapter *adapter,

patch 'net/ice: fix initial link status' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 1cc6a40c0d254f27811f0c04653d426fbb4b63c0 Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang@intel.com>
Date: Wed, 13 Sep 2023 09:02:08 +0000
Subject: [PATCH] net/ice: fix initial link status

[ upstream commit 5274d4309139e963bbd369c5639ab24695c5574f ]

This patch fixed the issue which the link status still up
when the link status changed from up to downi after device
restart.

Fixes: fdcf92ed6637 ("net/ice: fix link status recovery")

Signed-off-by: Qiming Yang <qiming.yang@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index cefbccd3e4..9768a6eb85 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -3496,4 +3496,6 @@ ice_get_init_link_status(struct rte_eth_dev *dev)
 	if (link_status.link_info & ICE_AQ_LINK_UP)
 		pf->init_link_up = true;
+	else
+		pf->init_link_up = false;
 }
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.329094967 +0000
+++ 0062-net-ice-fix-initial-link-status.patch	2023-11-02 13:09:40.874163531 +0000
@@ -1 +1 @@
-From 5274d4309139e963bbd369c5639ab24695c5574f Mon Sep 17 00:00:00 2001
+From 1cc6a40c0d254f27811f0c04653d426fbb4b63c0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5274d4309139e963bbd369c5639ab24695c5574f ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 4bad39c2c1..ed9771be1c 100644
+index cefbccd3e4..9768a6eb85 100644
@@ -23 +24 @@
-@@ -3647,4 +3647,6 @@ ice_get_init_link_status(struct rte_eth_dev *dev)
+@@ -3496,4 +3496,6 @@ ice_get_init_link_status(struct rte_eth_dev *dev)

patch 'net/iavf: fix Tx debug' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 11e3255ee88cb4613c3610ca2bb31b1784a0b8df Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 13 Sep 2023 15:03:27 +0100
Subject: [PATCH] net/iavf: fix Tx debug

[ upstream commit 145b3f04a2971423c483c7f4cc00a7491668a893 ]

Commit 1e728b01120c ("net/iavf: rework Tx path") reintroduced a check on
RTE_LIBRTE_IAVF_DEBUG_TX that has been dropped in favor of
RTE_ETHDEV_DEBUG_TX.

Fixes: 1e728b01120c ("net/iavf: rework Tx path")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 1881f97803..88a00ca2c3 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2327,5 +2327,5 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,
 	}
 
-#ifdef RTE_LIBRTE_IAVF_DEBUG_TX
+#ifdef RTE_ETHDEV_DEBUG_TX
 	if (!m->l4_len || !m->tso_segsz)
 		PMD_TX_LOG(DEBUG, "L4 length %d, LSO Segment size %d",
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.354021330 +0000
+++ 0063-net-iavf-fix-Tx-debug.patch	2023-11-02 13:09:40.875163535 +0000
@@ -1 +1 @@
-From 145b3f04a2971423c483c7f4cc00a7491668a893 Mon Sep 17 00:00:00 2001
+From 11e3255ee88cb4613c3610ca2bb31b1784a0b8df Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 145b3f04a2971423c483c7f4cc00a7491668a893 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index e2d61659cd..72e8ae8aa6 100644
+index 1881f97803..88a00ca2c3 100644
@@ -23 +24 @@
-@@ -2537,5 +2537,5 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,
+@@ -2327,5 +2327,5 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,

patch 'net/iavf: remove log from Tx prepare function' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 296c529c25fa62d755343bf0e486b45e4391a183 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 27 Sep 2023 11:41:45 +0200
Subject: [PATCH] net/iavf: remove log from Tx prepare function

[ upstream commit 4015aed58aefb3cceba6766f1fcaaa483c21ede0 ]

iavf_prep_pkts reports to the application that the packet is invalid
(from the driver pov). Having a log message only in this branch is not
consistent with all other checks in this function and it may slow down
the application if such invalid packets are being sent continuously.

Fixes: 19ee91c6bd9a ("net/iavf: check illegal packet sizes")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 88a00ca2c3..bef06800de 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2820,5 +2820,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 			m->data_len > max_frame_size) {
 			rte_errno = EINVAL;
-			PMD_DRV_LOG(ERR, "INVALID mbuf: bad data_len=[%hu]", m->data_len);
 			return i;
 		}
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.377491924 +0000
+++ 0064-net-iavf-remove-log-from-Tx-prepare-function.patch	2023-11-02 13:09:40.877163541 +0000
@@ -1 +1 @@
-From 4015aed58aefb3cceba6766f1fcaaa483c21ede0 Mon Sep 17 00:00:00 2001
+From 296c529c25fa62d755343bf0e486b45e4391a183 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4015aed58aefb3cceba6766f1fcaaa483c21ede0 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 0484988d13..21a06b8351 100644
+index 88a00ca2c3..bef06800de 100644
@@ -24 +25 @@
-@@ -3670,5 +3670,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -2820,5 +2820,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,

patch 'net/iavf: fix TSO with big segments' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 49e338a2b26ce9b5f586bbf6aba3f21b388d8848 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 27 Sep 2023 11:41:46 +0200
Subject: [PATCH] net/iavf: fix TSO with big segments

[ upstream commit 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 ]

Packets to be segmented with TSO are usually larger than MTU.
Plus, a single segment for the whole packet may be used: in OVS case,
an external rte_malloc'd buffer is used for packets received
from vhost-user ports.

Before this fix, TSO packets were dropped by net/iavf with the following
message:
2023-09-18T14:08:52.739Z|00610|dpdk(pmd-c31/id:11)|ERR|iavf_prep_pkts():
	INVALID mbuf: bad data_len=[2962]

Remove the check on data_len.

Fixes: 19ee91c6bd9a ("net/iavf: check illegal packet sizes")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index bef06800de..7374d36499 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2787,5 +2787,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 	struct iavf_tx_queue *txq = tx_queue;
 	struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id];
-	uint16_t max_frame_size = dev->data->mtu + IAVF_ETH_OVERHEAD;
 	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
 	struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
@@ -2816,7 +2815,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 		}
 
-		/* check the data_len in mbuf */
-		if (m->data_len < IAVF_TX_MIN_PKT_LEN ||
-			m->data_len > max_frame_size) {
+		if (m->pkt_len < IAVF_TX_MIN_PKT_LEN) {
 			rte_errno = EINVAL;
 			return i;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.402328603 +0000
+++ 0065-net-iavf-fix-TSO-with-big-segments.patch	2023-11-02 13:09:40.878163544 +0000
@@ -1 +1 @@
-From 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 Mon Sep 17 00:00:00 2001
+From 49e338a2b26ce9b5f586bbf6aba3f21b388d8848 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8a1a5327ba71a19d8a6e1b9ceb5563b4af2c2029 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index 21a06b8351..c6ef6af1d8 100644
+index bef06800de..7374d36499 100644
@@ -31 +32 @@
-@@ -3637,5 +3637,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -2787,5 +2787,4 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -37 +38 @@
-@@ -3666,7 +3665,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -2816,7 +2815,5 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,

patch 'net/ice: remove log from Tx prepare function' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From d4041c9e0561e7ddcd3ad1fa3ef28287120c26f2 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 27 Sep 2023 11:41:47 +0200
Subject: [PATCH] net/ice: remove log from Tx prepare function

[ upstream commit 9aa546d868b60027a6723f1a772d287d44f17ef8 ]

ice_prep_pkts reports to the application that the packet is invalid
(from the driver pov). Having a log message in those branches is not
consistent with all other checks in this function and it may slow down
the application if such invalid packets are being sent continuously.

Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes")
Fixes: 688cb2f2c61e ("net/ice: fix scalar Tx path segment")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index a6921e1c18..6e91cc226b 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -3514,5 +3514,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 			m->data_len > max_frame_size) {
 			rte_errno = EINVAL;
-			PMD_DRV_LOG(ERR, "INVALID mbuf: bad data_len=[%hu]", m->data_len);
 			return i;
 		}
@@ -3533,5 +3532,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 		if (ice_check_empty_mbuf(m) != 0) {
 			rte_errno = EINVAL;
-			PMD_DRV_LOG(ERR, "INVALID mbuf:	last mbuf data_len=[0]");
 			return i;
 		}
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.426064994 +0000
+++ 0066-net-ice-remove-log-from-Tx-prepare-function.patch	2023-11-02 13:09:40.879163547 +0000
@@ -1 +1 @@
-From 9aa546d868b60027a6723f1a772d287d44f17ef8 Mon Sep 17 00:00:00 2001
+From d4041c9e0561e7ddcd3ad1fa3ef28287120c26f2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9aa546d868b60027a6723f1a772d287d44f17ef8 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index e07c6d1f15..d5513e9e93 100644
+index a6921e1c18..6e91cc226b 100644
@@ -25 +26 @@
-@@ -3709,5 +3709,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -3514,5 +3514,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -31 +32 @@
-@@ -3728,5 +3727,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -3533,5 +3532,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,

patch 'net/ice: fix TSO with big segments' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 1b21ab31ce9b43241fc71f56e8ddf1832594132f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Wed, 27 Sep 2023 11:41:48 +0200
Subject: [PATCH] net/ice: fix TSO with big segments

[ upstream commit d7b35f53cadd6f228b3787f8dceca5481c034740 ]

Packets to be segmented with TSO are usually larger than MTU.
Plus, a single segment for the whole packet may be used: in OVS case,
an external rte_malloc'd buffer is used for packets received
from vhost-user ports.

Before this fix, TSO packets were dropped by net/ice with the following
message:
2023-09-18T13:34:31.064Z|00020|dpdk(pmd-c31/id:22)|ERR|ice_prep_pkts():
	INVALID mbuf: bad data_len=[2962]

Remove the check on data_len.

Fixes: ccf33dccf7aa ("net/ice: check illegal packet sizes")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_rxtx.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 6e91cc226b..9db511acdc 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -3491,7 +3491,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 	uint64_t ol_flags;
 	struct rte_mbuf *m;
-	struct ice_tx_queue *txq = tx_queue;
-	struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id];
-	uint16_t max_frame_size = dev->data->mtu + ICE_ETH_OVERHEAD;
 
 	for (i = 0; i < nb_pkts; i++) {
@@ -3510,7 +3507,5 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
 		}
 
-		/* check the data_len in mbuf */
-		if (m->data_len < ICE_TX_MIN_PKT_LEN ||
-			m->data_len > max_frame_size) {
+		if (m->pkt_len < ICE_TX_MIN_PKT_LEN) {
 			rte_errno = EINVAL;
 			return i;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.449482010 +0000
+++ 0067-net-ice-fix-TSO-with-big-segments.patch	2023-11-02 13:09:40.881163554 +0000
@@ -1 +1 @@
-From d7b35f53cadd6f228b3787f8dceca5481c034740 Mon Sep 17 00:00:00 2001
+From 1b21ab31ce9b43241fc71f56e8ddf1832594132f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d7b35f53cadd6f228b3787f8dceca5481c034740 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index d5513e9e93..ee9cb7b955 100644
+index 6e91cc226b..9db511acdc 100644
@@ -31 +32 @@
-@@ -3686,7 +3686,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -3491,7 +3491,4 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
@@ -39 +40 @@
-@@ -3705,7 +3702,5 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,
+@@ -3510,7 +3507,5 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts,

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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 70b49bf5ef686e5c62d776c032627ba12050b704 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Tue, 1 Aug 2023 17:18:31 +0200
Subject: [PATCH] net/mlx5: fix leak in sysfs port name translation

[ upstream commit 1296e8d0d0fe74646fbb0339969cf3946f1ce84d ]

getline() may allocate a buffer even though it returns -1:
"""
If  *lineptr  is set to NULL before the call, then getline() will allocate
a buffer for storing the line.  This buffer should be freed by the user
program even if getline() failed.
"""

This leak has been observed on a RHEL8 system with two CX5 PF devices
(no VFs).

ASan reports:
==8899==ERROR: LeakSanitizer: detected memory leaks

Direct leak of 120 byte(s) in 1 object(s) allocated from:
    #0 0x7fe58576aba8 in __interceptor_malloc
	(/lib64/libasan.so.5+0xefba8)
    #1 0x7fe583e866b2 in __getdelim (/lib64/libc.so.6+0x886b2)
    #2 0x327bd23 in mlx5_sysfs_switch_info
	../drivers/net/mlx5/linux/mlx5_ethdev_os.c:1084
    #3 0x3271f86 in mlx5_os_pci_probe_pf
	../drivers/net/mlx5/linux/mlx5_os.c:2282
    #4 0x3273c83 in mlx5_os_pci_probe
	../drivers/net/mlx5/linux/mlx5_os.c:2497
    #5 0x327475f in mlx5_os_net_probe
	../drivers/net/mlx5/linux/mlx5_os.c:2578
    #6 0xc6eac7 in drivers_probe
	../drivers/common/mlx5/mlx5_common.c:937
    #7 0xc6f150 in mlx5_common_dev_probe
	../drivers/common/mlx5/mlx5_common.c:1027
    #8 0xc8ef80 in mlx5_common_pci_probe
	../drivers/common/mlx5/mlx5_common_pci.c:168
    #9 0xc21b67 in rte_pci_probe_one_driver
	../drivers/bus/pci/pci_common.c:312
    #10 0xc2224c in pci_probe_all_drivers
	../drivers/bus/pci/pci_common.c:396
    #11 0xc222f4 in pci_probe ../drivers/bus/pci/pci_common.c:423
    #12 0xb71fff in rte_bus_probe ../lib/eal/common/eal_common_bus.c:78
    #13 0xbe6888 in rte_eal_init ../lib/eal/linux/eal.c:1300
    #14 0x5ec717 in main ../app/test-pmd/testpmd.c:4515
    #15 0x7fe583e38d84 in __libc_start_main (/lib64/libc.so.6+0x3ad84)

As far as why getline() errors, strace gives a hint:
8516  openat(AT_FDCWD, "/sys/class/net/enp130s0f0/phys_port_name",
	O_RDONLY) = 34
8516  fstat(34, {st_mode=S_IFREG|0444, st_size=4096, ...}) = 0
8516  read(34, 0x621000098900, 4096)    = -1 EOPNOTSUPP (Operation
	not supported)

Fixes: f8a226ed65fa ("net/mlx5: fix sysfs port name translation")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/linux/mlx5_ethdev_os.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index a22ffab3f7..dbfe00ea6d 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -1154,4 +1154,5 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
 		line_size = getline(&port_name, &port_name_size, file);
 		if (line_size < 0) {
+			free(port_name);
 			fclose(file);
 			rte_errno = errno;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.473160538 +0000
+++ 0068-net-mlx5-fix-leak-in-sysfs-port-name-translation.patch	2023-11-02 13:09:40.881163554 +0000
@@ -1 +1 @@
-From 1296e8d0d0fe74646fbb0339969cf3946f1ce84d Mon Sep 17 00:00:00 2001
+From 70b49bf5ef686e5c62d776c032627ba12050b704 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1296e8d0d0fe74646fbb0339969cf3946f1ce84d ]
+
@@ -55 +56,0 @@
-Cc: stable@dpdk.org
@@ -64 +65 @@
-index 639e629fe4..dd5a0c546d 100644
+index a22ffab3f7..dbfe00ea6d 100644
@@ -67 +68 @@
-@@ -1084,4 +1084,5 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)
+@@ -1154,4 +1154,5 @@ mlx5_sysfs_switch_info(unsigned int ifindex, struct mlx5_switch_info *info)

patch 'fib: fix adding default route overwriting entire table' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From e9cd35de3caa2e80f7f297cd3481ff016bc272d7 Mon Sep 17 00:00:00 2001
From: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Date: Mon, 2 Oct 2023 15:11:48 +0000
Subject: [PATCH] fib: fix adding default route overwriting entire table

[ upstream commit ab1b927cd73e96643cfe93dc2493d03c737b59ae ]

When FIB contains any route covering last IP address
(255.255.255.255), upon adding a new default route
the entire FIB table will be overwritten with corresponding
default route next hop.

Previous fix added check for ledge against 0 for case
if default route is added as a first route, however
this check was also erroneously triggered in case when
ledge was wrapped around the address space
(this would happen if FIB contains any route covering
last possible address - 255.255.255.255).

This fix prevents wrap around from happening.

Fixes: 880bc2b5f3bd ("fib: fix adding default route")

Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
---
 lib/fib/dir24_8.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c
index 181ed03dee..49407ba638 100644
--- a/lib/fib/dir24_8.c
+++ b/lib/fib/dir24_8.c
@@ -393,4 +393,10 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip,
 			ledge = redge +
 				(uint32_t)(1ULL << (32 - tmp_depth));
+			/*
+			 * we got to the end of address space
+			 * and wrapped around
+			 */
+			if (ledge == 0)
+				break;
 		} else {
 			redge = ip + (uint32_t)(1ULL << (32 - depth));
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.495396876 +0000
+++ 0069-fib-fix-adding-default-route-overwriting-entire-tabl.patch	2023-11-02 13:09:40.882163557 +0000
@@ -1 +1 @@
-From ab1b927cd73e96643cfe93dc2493d03c737b59ae Mon Sep 17 00:00:00 2001
+From e9cd35de3caa2e80f7f297cd3481ff016bc272d7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ab1b927cd73e96643cfe93dc2493d03c737b59ae ]
+
@@ -21 +22,0 @@
-Cc: stable@dpdk.org
@@ -29 +30 @@
-index a61897667b..c739e92304 100644
+index 181ed03dee..49407ba638 100644
@@ -32 +33 @@
-@@ -389,4 +389,10 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip,
+@@ -393,4 +393,10 @@ modify_fib(struct dir24_8_tbl *dp, struct rte_rib *rib, uint32_t ip,

patch 'fib6: fix adding default route as first route' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From f3baeaa7574b41b0d7628651fbce19633e411876 Mon Sep 17 00:00:00 2001
From: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Date: Mon, 2 Oct 2023 15:12:01 +0000
Subject: [PATCH] fib6: fix adding default route as first route

[ upstream commit fd66617c5774a2869cbb69f86494d1b4803890fc ]

Currently when adding default route as first route
it is not added and no error is reported.
When we enter the loop over an address range in
the general case we will eventually reach the check
for when the range has ended, and exit the loop.
However when adding default route as first route,
since address range covered begins and ends at zero
this also triggers loop exit without writing to the table.

Fixed by adding check for default route,
i.e. both ledge and redge are equal to 0::0.

Bugzilla ID: 1272
Fixes: c3e12e0f0354 ("fib: add dataplane algorithm for IPv6")

Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
---
 lib/fib/trie.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/fib/trie.c b/lib/fib/trie.c
index 044095bf03..b096743086 100644
--- a/lib/fib/trie.c
+++ b/lib/fib/trie.c
@@ -457,4 +457,12 @@ get_nxt_net(uint8_t *ip, uint8_t depth)
 }
 
+static int
+v6_addr_is_zero(const uint8_t ip[RTE_FIB6_IPV6_ADDR_SIZE])
+{
+	uint8_t ip_addr[RTE_FIB6_IPV6_ADDR_SIZE] = {0};
+
+	return rte_rib6_is_equal(ip, ip_addr);
+}
+
 static int
 modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib,
@@ -490,9 +498,17 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib,
 			get_nxt_net(redge, tmp_depth);
 			rte_rib6_copy_addr(ledge, redge);
+			/*
+			 * we got to the end of address space
+			 * and wrapped around
+			 */
+			if (v6_addr_is_zero(ledge))
+				break;
 		} else {
 			rte_rib6_copy_addr(redge, ip);
 			get_nxt_net(redge, depth);
-			if (rte_rib6_is_equal(ledge, redge))
+			if (rte_rib6_is_equal(ledge, redge) &&
+					!v6_addr_is_zero(ledge))
 				break;
+
 			ret = install_to_dp(dp, ledge, redge,
 				next_hop);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.516599357 +0000
+++ 0070-fib6-fix-adding-default-route-as-first-route.patch	2023-11-02 13:09:40.883163560 +0000
@@ -1 +1 @@
-From fd66617c5774a2869cbb69f86494d1b4803890fc Mon Sep 17 00:00:00 2001
+From f3baeaa7574b41b0d7628651fbce19633e411876 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fd66617c5774a2869cbb69f86494d1b4803890fc ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
-index 3e780afdaf..09470e7287 100644
+index 044095bf03..b096743086 100644
@@ -31 +32 @@
-@@ -452,4 +452,12 @@ get_nxt_net(uint8_t *ip, uint8_t depth)
+@@ -457,4 +457,12 @@ get_nxt_net(uint8_t *ip, uint8_t depth)
@@ -44 +45 @@
-@@ -485,9 +493,17 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib,
+@@ -490,9 +498,17 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib,

patch 'net/af_packet: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From d59c16678080dfe1cd775f542e601ab4978f73ac Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:27 +0800
Subject: [PATCH] net/af_packet: fix Rx and Tx queue state

[ upstream commit a059e4632df46ab0ab10ffe4f0b78a3e23c69f9c ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/af_packet/rte_eth_af_packet.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 1396f32c3d..88cdc7ee2e 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -313,5 +313,12 @@ static int
 eth_dev_start(struct rte_eth_dev *dev)
 {
+	struct pmd_internals *internals = dev->data->dev_private;
+	uint16_t i;
+
 	dev->data->dev_link.link_status = RTE_ETH_LINK_UP;
+	for (i = 0; i < internals->nb_queues; i++) {
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	}
 	return 0;
 }
@@ -341,4 +348,6 @@ eth_dev_stop(struct rte_eth_dev *dev)
 		internals->rx_queue[i].sockfd = -1;
 		internals->tx_queue[i].sockfd = -1;
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 	}
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.538225950 +0000
+++ 0071-net-af_packet-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.883163560 +0000
@@ -1 +1 @@
-From a059e4632df46ab0ab10ffe4f0b78a3e23c69f9c Mon Sep 17 00:00:00 2001
+From d59c16678080dfe1cd775f542e601ab4978f73ac Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a059e4632df46ab0ab10ffe4f0b78a3e23c69f9c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index c13a0942aa..397a32db58 100644
+index 1396f32c3d..88cdc7ee2e 100644
@@ -26 +27 @@
-@@ -314,5 +314,12 @@ static int
+@@ -313,5 +313,12 @@ static int
@@ -39 +40 @@
-@@ -342,4 +349,6 @@ eth_dev_stop(struct rte_eth_dev *dev)
+@@ -341,4 +348,6 @@ eth_dev_stop(struct rte_eth_dev *dev)

patch 'net/af_xdp: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 36cbe7901c26227fae6ac606bf7c1115cd659996 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:28 +0800
Subject: [PATCH] net/af_xdp: fix Rx and Tx queue state

[ upstream commit 9a204f7e4e86d8270cae3cdec2b7949f5954fde2 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/af_xdp/rte_eth_af_xdp.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index 68bae5610e..9918d3c5fd 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -654,5 +654,11 @@ static int
 eth_dev_start(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
 	dev->data->dev_link.link_status = RTE_ETH_LINK_UP;
+	for (i = 0; i < dev->data->nb_rx_queues; i++) {
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	}
 
 	return 0;
@@ -663,5 +669,12 @@ static int
 eth_dev_stop(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
 	dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN;
+	for (i = 0; i < dev->data->nb_rx_queues; i++) {
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	}
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.559703575 +0000
+++ 0072-net-af_xdp-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.884163563 +0000
@@ -1 +1 @@
-From 9a204f7e4e86d8270cae3cdec2b7949f5954fde2 Mon Sep 17 00:00:00 2001
+From 36cbe7901c26227fae6ac606bf7c1115cd659996 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9a204f7e4e86d8270cae3cdec2b7949f5954fde2 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index c7786cc53a..0cc51223ba 100644
+index 68bae5610e..9918d3c5fd 100644
@@ -26 +27 @@
-@@ -695,5 +695,11 @@ static int
+@@ -654,5 +654,11 @@ static int
@@ -38 +39 @@
-@@ -704,5 +710,12 @@ static int
+@@ -663,5 +669,12 @@ static int

patch 'net/avp: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 0a4aa9fa9e71ee98a6de0b2e9c3167b726e89eac Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:29 +0800
Subject: [PATCH] net/avp: fix Rx and Tx queue state

[ upstream commit 68601507b43cc2441baaa172115034870ab618a6 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/avp/avp_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/avp/avp_ethdev.c b/drivers/net/avp/avp_ethdev.c
index 7ac55584ff..4676c19a78 100644
--- a/drivers/net/avp/avp_ethdev.c
+++ b/drivers/net/avp/avp_ethdev.c
@@ -2037,4 +2037,5 @@ avp_dev_start(struct rte_eth_dev *eth_dev)
 {
 	struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+	uint16_t i;
 	int ret;
 
@@ -2057,4 +2058,9 @@ avp_dev_start(struct rte_eth_dev *eth_dev)
 	avp->flags |= AVP_F_LINKUP;
 
+	for (i = 0; i < avp->num_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < avp->num_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	ret = 0;
 
@@ -2068,4 +2074,5 @@ avp_dev_stop(struct rte_eth_dev *eth_dev)
 {
 	struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+	uint16_t i;
 	int ret;
 
@@ -2087,4 +2094,9 @@ avp_dev_stop(struct rte_eth_dev *eth_dev)
 	}
 
+	for (i = 0; i < avp->num_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < avp->num_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 unlock:
 	rte_spinlock_unlock(&avp->lock);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.582593200 +0000
+++ 0073-net-avp-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.886163570 +0000
@@ -1 +1 @@
-From 68601507b43cc2441baaa172115034870ab618a6 Mon Sep 17 00:00:00 2001
+From 0a4aa9fa9e71ee98a6de0b2e9c3167b726e89eac Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 68601507b43cc2441baaa172115034870ab618a6 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index b2a08f5635..53d9e38c93 100644
+index 7ac55584ff..4676c19a78 100644

patch 'net/bnx2x: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 8b1f7ca7385597d400d6752778424e63b144de0d Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:30 +0800
Subject: [PATCH] net/bnx2x: fix Rx and Tx queue state

[ upstream commit 3eaf4ba9372f1c5ffdbcbc8fa0ba86defe8d19a4 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/bnx2x/bnx2x_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index f36ad30e17..e0be3c137c 100644
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -212,4 +212,5 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
 	struct bnx2x_softc *sc = dev->data->dev_private;
 	int ret = 0;
+	uint16_t i;
 
 	PMD_INIT_FUNC_TRACE(sc);
@@ -245,4 +246,9 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
 	bnx2x_print_device_info(sc);
 
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return ret;
 }
@@ -253,4 +259,5 @@ bnx2x_dev_stop(struct rte_eth_dev *dev)
 	struct bnx2x_softc *sc = dev->data->dev_private;
 	int ret = 0;
+	uint16_t i;
 
 	PMD_INIT_FUNC_TRACE(sc);
@@ -278,4 +285,9 @@ bnx2x_dev_stop(struct rte_eth_dev *dev)
 	}
 
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.605287381 +0000
+++ 0074-net-bnx2x-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.886163570 +0000
@@ -1 +1 @@
-From 3eaf4ba9372f1c5ffdbcbc8fa0ba86defe8d19a4 Mon Sep 17 00:00:00 2001
+From 8b1f7ca7385597d400d6752778424e63b144de0d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3eaf4ba9372f1c5ffdbcbc8fa0ba86defe8d19a4 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 4448cf2de2..1327cbe912 100644
+index f36ad30e17..e0be3c137c 100644

patch 'net/bnxt: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From af16f64988ba98be5aa451d62278f64052572bb9 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:31 +0800
Subject: [PATCH] net/bnxt: fix Rx and Tx queue state

[ upstream commit 4664c4ea4ae33efcdcc46b30ff20ecc8ced22021 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 31394a0401..44fd45a4e9 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1481,4 +1481,5 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev)
 	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
 	struct rte_eth_link link;
+	uint16_t i;
 	int ret;
 
@@ -1542,4 +1543,9 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev)
 	eth_dev->data->scattered_rx = 0;
 
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.626265646 +0000
+++ 0075-net-bnxt-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.890163583 +0000
@@ -1 +1 @@
-From 4664c4ea4ae33efcdcc46b30ff20ecc8ced22021 Mon Sep 17 00:00:00 2001
+From af16f64988ba98be5aa451d62278f64052572bb9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4664c4ea4ae33efcdcc46b30ff20ecc8ced22021 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index ce21c4b1b0..5c4d96d4b1 100644
+index 31394a0401..44fd45a4e9 100644
@@ -26 +27 @@
-@@ -1508,4 +1508,5 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev)
+@@ -1481,4 +1481,5 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev)
@@ -32 +33 @@
-@@ -1568,4 +1569,9 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev)
+@@ -1542,4 +1543,9 @@ static int bnxt_dev_stop(struct rte_eth_dev *eth_dev)

patch 'net/bonding: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From b251cfe68f970c35acc2090ecfca10dfb863f760 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:32 +0800
Subject: [PATCH] net/bonding: fix Rx and Tx queue state

[ upstream commit 419d3e33078e6f1772faf076a5f46bd9bf3443f2 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 9f970ae4ed..d9fcd21d9f 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2064,4 +2064,9 @@ bond_ethdev_start(struct rte_eth_dev *eth_dev)
 		bond_tlb_enable(internals);
 
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 
@@ -2149,4 +2154,9 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
 	}
 
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.650742088 +0000
+++ 0076-net-bonding-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.891163586 +0000
@@ -1 +1 @@
-From 419d3e33078e6f1772faf076a5f46bd9bf3443f2 Mon Sep 17 00:00:00 2001
+From b251cfe68f970c35acc2090ecfca10dfb863f760 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 419d3e33078e6f1772faf076a5f46bd9bf3443f2 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 122b1187fd..aa7c911f19 100644
+index 9f970ae4ed..d9fcd21d9f 100644
@@ -26 +27 @@
-@@ -2094,4 +2094,9 @@ bond_ethdev_start(struct rte_eth_dev *eth_dev)
+@@ -2064,4 +2064,9 @@ bond_ethdev_start(struct rte_eth_dev *eth_dev)
@@ -36 +37 @@
-@@ -2179,4 +2184,9 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
+@@ -2149,4 +2154,9 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)

patch 'net/cxgbe: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 92c7732d1164b7b17af1430a5c7ba06427842ef0 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:33 +0800
Subject: [PATCH] net/cxgbe: fix Rx and Tx queue state

[ upstream commit a2bce003b9f071cd2053cb593b56f0fa8785cbea ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/cxgbe/cxgbe_ethdev.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c
index e7ea76180f..b2c8c1a03f 100644
--- a/drivers/net/cxgbe/cxgbe_ethdev.c
+++ b/drivers/net/cxgbe/cxgbe_ethdev.c
@@ -415,4 +415,5 @@ int cxgbe_dev_stop(struct rte_eth_dev *eth_dev)
 	struct port_info *pi = eth_dev->data->dev_private;
 	struct adapter *adapter = pi->adapter;
+	uint16_t i;
 
 	CXGBE_FUNC_TRACE();
@@ -430,4 +431,9 @@ int cxgbe_dev_stop(struct rte_eth_dev *eth_dev)
 	eth_dev->data->scattered_rx = 0;
 
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.674446406 +0000
+++ 0077-net-cxgbe-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.893163592 +0000
@@ -1 +1 @@
-From a2bce003b9f071cd2053cb593b56f0fa8785cbea Mon Sep 17 00:00:00 2001
+From 92c7732d1164b7b17af1430a5c7ba06427842ef0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a2bce003b9f071cd2053cb593b56f0fa8785cbea ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 45bbeaef0c..8cc3d9f257 100644
+index e7ea76180f..b2c8c1a03f 100644

patch 'net/dpaa: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 87695a10d692b5a42243eb686477d577a7adcb4c Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:34 +0800
Subject: [PATCH] net/dpaa: fix Rx and Tx queue state

[ upstream commit f1d381b48d4673b14eb3c3378f3b890334015489 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/net/dpaa/dpaa_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index d7660fb894..bae6c5abf2 100644
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -388,4 +388,5 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
 {
 	struct dpaa_if *dpaa_intf = dev->data->dev_private;
+	uint16_t i;
 
 	PMD_INIT_FUNC_TRACE();
@@ -402,4 +403,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
 	fman_if_enable_rx(dev->process_private);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -408,4 +414,5 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev)
 {
 	struct fman_if *fif = dev->process_private;
+	uint16_t i;
 
 	PMD_INIT_FUNC_TRACE();
@@ -416,4 +423,9 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev)
 	dev->tx_pkt_burst = dpaa_eth_tx_drop_all;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.696744885 +0000
+++ 0078-net-dpaa-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.894163595 +0000
@@ -1 +1 @@
-From f1d381b48d4673b14eb3c3378f3b890334015489 Mon Sep 17 00:00:00 2001
+From 87695a10d692b5a42243eb686477d577a7adcb4c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f1d381b48d4673b14eb3c3378f3b890334015489 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index a6c86113d1..ef4c06db6a 100644
+index d7660fb894..bae6c5abf2 100644
@@ -26 +27 @@
-@@ -400,4 +400,5 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
+@@ -388,4 +388,5 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -414,4 +415,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
+@@ -402,4 +403,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -420,4 +426,5 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev)
+@@ -408,4 +414,5 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev)
@@ -48 +49 @@
-@@ -428,4 +435,9 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev)
+@@ -416,4 +423,9 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev)

patch 'net/dpaa2: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 09058bb2bbc2d80bc7589eb0cb48c5f5e39e5221 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:35 +0800
Subject: [PATCH] net/dpaa2: fix Rx and Tx queue state

[ upstream commit f4909c42166c211a63229adfc49d630b30883d0c ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index eb2d87ecbc..6dc5f1390f 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -1244,4 +1244,9 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
 		dev->tx_pkt_burst = dpaa2_dev_tx_ordered;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -1261,4 +1266,5 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
 	struct rte_intr_handle *intr_handle;
 	struct rte_dpaa2_device *dpaa2_dev;
+	uint16_t i;
 
 	dpaa2_dev = container_of(rdev, struct rte_dpaa2_device, device);
@@ -1295,4 +1301,9 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
 	rte_eth_linkstatus_set(dev, &link);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.718806003 +0000
+++ 0079-net-dpaa2-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.896163602 +0000
@@ -1 +1 @@
-From f4909c42166c211a63229adfc49d630b30883d0c Mon Sep 17 00:00:00 2001
+From 09058bb2bbc2d80bc7589eb0cb48c5f5e39e5221 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f4909c42166c211a63229adfc49d630b30883d0c ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 679f33ae1a..8e610b6bba 100644
+index eb2d87ecbc..6dc5f1390f 100644
@@ -26 +27 @@
-@@ -1279,4 +1279,9 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
+@@ -1244,4 +1244,9 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
@@ -36 +37 @@
-@@ -1296,4 +1301,5 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
+@@ -1261,4 +1266,5 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -1330,4 +1336,9 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)
+@@ -1295,4 +1301,9 @@ dpaa2_dev_stop(struct rte_eth_dev *dev)

patch 'net/e1000: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 180c47a4a4cde0a7f881277907bc569a62ede4d9 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:36 +0800
Subject: [PATCH] net/e1000: fix Rx and Tx queue state

[ upstream commit f679a8d646b62138cf02f173ad80885ca9881f9f ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/e1000/em_rxtx.c  | 8 ++++++++
 drivers/net/e1000/igb_rxtx.c | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index 73602313a7..2d40854d1d 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -1577,4 +1577,6 @@ em_dev_clear_queues(struct rte_eth_dev *dev)
 			em_reset_tx_queue(txq);
 		}
+
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 	}
 
@@ -1585,4 +1587,6 @@ em_dev_clear_queues(struct rte_eth_dev *dev)
 			em_reset_rx_queue(rxq);
 		}
+
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 	}
 }
@@ -1813,4 +1817,6 @@ eth_em_rx_init(struct rte_eth_dev *dev)
 		E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl);
 
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 		/*
 		 * Due to EM devices not having any sort of hardware
@@ -1947,4 +1953,6 @@ eth_em_tx_init(struct rte_eth_dev *dev)
 		txdctl |= E1000_TXDCTL_GRAN;
 		E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl);
+
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	}
 
diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index 1d23e081b6..6027cfbfb1 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -2745,4 +2745,6 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)
 			rxdctl |= ((rxq->wthresh & 0x1F) << 16);
 		E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl);
+
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	}
 
@@ -2816,4 +2818,6 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)
 		txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
 		E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl);
+
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	}
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.741565039 +0000
+++ 0080-net-e1000-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.898163608 +0000
@@ -1 +1 @@
-From f679a8d646b62138cf02f173ad80885ca9881f9f Mon Sep 17 00:00:00 2001
+From 180c47a4a4cde0a7f881277907bc569a62ede4d9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f679a8d646b62138cf02f173ad80885ca9881f9f ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index cb5ce2307b..df5fbb7823 100644
+index 73602313a7..2d40854d1d 100644
@@ -56 +57 @@
-index 61c6394310..448c4b7d9d 100644
+index 1d23e081b6..6027cfbfb1 100644
@@ -59 +60 @@
-@@ -2746,4 +2746,6 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)
+@@ -2745,4 +2745,6 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev)
@@ -66 +67 @@
-@@ -2817,4 +2819,6 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)
+@@ -2816,4 +2818,6 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)

patch 'net/ena: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From b69c78275b3ab73bf35c117225e417344234e87c Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:37 +0800
Subject: [PATCH] net/ena: fix Rx and Tx queue state

[ upstream commit 9210f0ca3dd2f0bbb66d6281f883e9d81a948a25 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/ena/ena_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 770b101688..1c61f793e6 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -911,4 +911,5 @@ static int ena_start(struct rte_eth_dev *dev)
 	uint64_t ticks;
 	int rc = 0;
+	uint16_t i;
 
 	/* Cannot allocate memory in secondary process */
@@ -952,4 +953,9 @@ static int ena_start(struct rte_eth_dev *dev)
 	adapter->state = ENA_ADAPTER_STATE_RUNNING;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 
@@ -967,4 +973,5 @@ static int ena_stop(struct rte_eth_dev *dev)
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
+	uint16_t i;
 	int rc;
 
@@ -998,4 +1005,9 @@ static int ena_stop(struct rte_eth_dev *dev)
 	dev->data->dev_started = 0;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.765940389 +0000
+++ 0081-net-ena-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.900163615 +0000
@@ -1 +1 @@
-From 9210f0ca3dd2f0bbb66d6281f883e9d81a948a25 Mon Sep 17 00:00:00 2001
+From b69c78275b3ab73bf35c117225e417344234e87c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9210f0ca3dd2f0bbb66d6281f883e9d81a948a25 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index efcb163027..7345e480f8 100644
+index 770b101688..1c61f793e6 100644
@@ -26 +27 @@
-@@ -1172,4 +1172,5 @@ static int ena_start(struct rte_eth_dev *dev)
+@@ -911,4 +911,5 @@ static int ena_start(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -1209,4 +1210,9 @@ static int ena_start(struct rte_eth_dev *dev)
+@@ -952,4 +953,9 @@ static int ena_start(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -1224,4 +1230,5 @@ static int ena_stop(struct rte_eth_dev *dev)
+@@ -967,4 +973,5 @@ static int ena_stop(struct rte_eth_dev *dev)
@@ -48 +49 @@
-@@ -1255,4 +1262,9 @@ static int ena_stop(struct rte_eth_dev *dev)
+@@ -998,4 +1005,9 @@ static int ena_stop(struct rte_eth_dev *dev)

patch 'net/enetc: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From ee101d104549172707fa3876d033c9b0724768fa Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:38 +0800
Subject: [PATCH] net/enetc: fix Rx and Tx queue state

[ upstream commit 308eceec7519eba5b3369c501977e61c6a4af52e ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/enetc/enetc_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c
index 7cdb8ce463..c3eebc6fa4 100644
--- a/drivers/net/enetc/enetc_ethdev.c
+++ b/drivers/net/enetc/enetc_ethdev.c
@@ -18,4 +18,5 @@ enetc_dev_start(struct rte_eth_dev *dev)
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t val;
+	uint16_t i;
 
 	PMD_INIT_FUNC_TRACE();
@@ -43,4 +44,9 @@ enetc_dev_start(struct rte_eth_dev *dev)
 	}
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -53,4 +59,5 @@ enetc_dev_stop(struct rte_eth_dev *dev)
 	struct enetc_hw *enetc_hw = &hw->hw;
 	uint32_t val;
+	uint16_t i;
 
 	PMD_INIT_FUNC_TRACE();
@@ -64,4 +71,9 @@ enetc_dev_stop(struct rte_eth_dev *dev)
 		      val & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN)));
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.789134608 +0000
+++ 0082-net-enetc-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.901163618 +0000
@@ -1 +1 @@
-From 308eceec7519eba5b3369c501977e61c6a4af52e Mon Sep 17 00:00:00 2001
+From ee101d104549172707fa3876d033c9b0724768fa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 308eceec7519eba5b3369c501977e61c6a4af52e ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 1b4337bc48..c9352f0746 100644
+index 7cdb8ce463..c3eebc6fa4 100644
@@ -32 +33 @@
-@@ -46,4 +47,9 @@ enetc_dev_start(struct rte_eth_dev *dev)
+@@ -43,4 +44,9 @@ enetc_dev_start(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -56,4 +62,5 @@ enetc_dev_stop(struct rte_eth_dev *dev)
+@@ -53,4 +59,5 @@ enetc_dev_stop(struct rte_eth_dev *dev)
@@ -48 +49 @@
-@@ -70,4 +77,9 @@ enetc_dev_stop(struct rte_eth_dev *dev)
+@@ -64,4 +71,9 @@ enetc_dev_stop(struct rte_eth_dev *dev)

patch 'net/enic: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 10ccc32cc073cde14de66f783d43278e27bbc964 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:39 +0800
Subject: [PATCH] net/enic: fix Rx and Tx queue state

[ upstream commit 880b9220feba570f0b30acf3035016037c32ce45 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/enic/enic_ethdev.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index 163be09809..426912bb83 100644
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -369,4 +369,5 @@ static int enicpmd_dev_stop(struct rte_eth_dev *eth_dev)
 	struct rte_eth_link link;
 	struct enic *enic = pmd_priv(eth_dev);
+	uint16_t i;
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -379,4 +380,9 @@ static int enicpmd_dev_stop(struct rte_eth_dev *eth_dev)
 	rte_eth_linkstatus_set(eth_dev, &link);
 
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.810607467 +0000
+++ 0083-net-enic-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.902163621 +0000
@@ -1 +1 @@
-From 880b9220feba570f0b30acf3035016037c32ce45 Mon Sep 17 00:00:00 2001
+From 10ccc32cc073cde14de66f783d43278e27bbc964 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 880b9220feba570f0b30acf3035016037c32ce45 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index cdf0915591..a487256fa1 100644
+index 163be09809..426912bb83 100644

patch 'net/hinic: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 9323a4e3c74cf7fd93231db0135b6acfcd34c143 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:40 +0800
Subject: [PATCH] net/hinic: fix Rx and Tx queue state

[ upstream commit b0f9c8e26a6a37cf73f311af96e23a7d9bda2fc0 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/hinic/hinic_pmd_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c
index e8d9aaba84..992ba37b3f 100644
--- a/drivers/net/hinic/hinic_pmd_ethdev.c
+++ b/drivers/net/hinic/hinic_pmd_ethdev.c
@@ -981,4 +981,5 @@ static int hinic_dev_start(struct rte_eth_dev *dev)
 	char *name;
 	struct hinic_nic_dev *nic_dev;
+	uint16_t i;
 
 	nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
@@ -1048,4 +1049,9 @@ static int hinic_dev_start(struct rte_eth_dev *dev)
 	rte_bit_relaxed_set32(HINIC_DEV_START, &nic_dev->dev_status);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 
@@ -1170,4 +1176,5 @@ static int hinic_dev_stop(struct rte_eth_dev *dev)
 	struct hinic_nic_dev *nic_dev;
 	struct rte_eth_link link;
+	uint16_t i;
 
 	nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev);
@@ -1216,4 +1223,9 @@ static int hinic_dev_stop(struct rte_eth_dev *dev)
 	hinic_free_all_tx_mbuf(dev);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.832552952 +0000
+++ 0084-net-hinic-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.904163628 +0000
@@ -1 +1 @@
-From b0f9c8e26a6a37cf73f311af96e23a7d9bda2fc0 Mon Sep 17 00:00:00 2001
+From 9323a4e3c74cf7fd93231db0135b6acfcd34c143 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b0f9c8e26a6a37cf73f311af96e23a7d9bda2fc0 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 7aa5e7d8e9..adc9f75c81 100644
+index e8d9aaba84..992ba37b3f 100644

patch 'net/ipn3ke: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 5c8a28346909a14e05257e6ea4e5752a34e8a378 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:41 +0800
Subject: [PATCH] net/ipn3ke: fix Rx and Tx queue state

[ upstream commit c05fa97fbe14cb58acc4ca7fffbde3a21b78fd18 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Reviewed-by: Rosen Xu <rosen.xu@intel.com>
---
 drivers/net/ipn3ke/ipn3ke_representor.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/ipn3ke/ipn3ke_representor.c b/drivers/net/ipn3ke/ipn3ke_representor.c
index 9059e4ce0a..b0ead3197b 100644
--- a/drivers/net/ipn3ke/ipn3ke_representor.c
+++ b/drivers/net/ipn3ke/ipn3ke_representor.c
@@ -121,4 +121,5 @@ ipn3ke_rpst_dev_start(struct rte_eth_dev *dev)
 	uint32_t val;
 	char attr_name[IPN3KE_RAWDEV_ATTR_LEN_MAX];
+	uint16_t i;
 
 	rawdev = hw->rawdev;
@@ -191,4 +192,9 @@ ipn3ke_rpst_dev_start(struct rte_eth_dev *dev)
 	ipn3ke_rpst_link_update(dev, 0);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -199,4 +205,5 @@ ipn3ke_rpst_dev_stop(struct rte_eth_dev *dev)
 	struct ipn3ke_hw *hw = IPN3KE_DEV_PRIVATE_TO_HW(dev);
 	struct ipn3ke_rpst *rpst = IPN3KE_DEV_PRIVATE_TO_RPST(dev);
+	uint16_t i;
 
 	if (hw->retimer.mac_type == IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) {
@@ -208,4 +215,9 @@ ipn3ke_rpst_dev_stop(struct rte_eth_dev *dev)
 	}
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.855692836 +0000
+++ 0085-net-ipn3ke-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.905163631 +0000
@@ -1 +1 @@
-From c05fa97fbe14cb58acc4ca7fffbde3a21b78fd18 Mon Sep 17 00:00:00 2001
+From 5c8a28346909a14e05257e6ea4e5752a34e8a378 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c05fa97fbe14cb58acc4ca7fffbde3a21b78fd18 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 57ec7a19bc..8145f1bb2a 100644
+index 9059e4ce0a..b0ead3197b 100644

patch 'net/memif: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 72786175fbcc74a801ee3bf21a6a04a3e50bfd5b Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:42 +0800
Subject: [PATCH] net/memif: fix Rx and Tx queue state

[ upstream commit 1b5e3493b8058f3980a14d00ecd31e2bbe88d535 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/memif/rte_eth_memif.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c
index 2c716355be..abaf98c65e 100644
--- a/drivers/net/memif/rte_eth_memif.c
+++ b/drivers/net/memif/rte_eth_memif.c
@@ -1244,4 +1244,5 @@ memif_dev_start(struct rte_eth_dev *dev)
 	struct pmd_internals *pmd = dev->data->dev_private;
 	int ret = 0;
+	uint16_t i;
 
 	switch (pmd->role) {
@@ -1258,4 +1259,11 @@ memif_dev_start(struct rte_eth_dev *dev)
 	}
 
+	if (ret == 0) {
+		for (i = 0; i < dev->data->nb_rx_queues; i++)
+			dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+		for (i = 0; i < dev->data->nb_tx_queues; i++)
+			dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	}
+
 	return ret;
 }
@@ -1264,5 +1272,13 @@ static int
 memif_dev_stop(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
 	memif_disconnect(dev);
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.878249795 +0000
+++ 0086-net-memif-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.907163637 +0000
@@ -1 +1 @@
-From 1b5e3493b8058f3980a14d00ecd31e2bbe88d535 Mon Sep 17 00:00:00 2001
+From 72786175fbcc74a801ee3bf21a6a04a3e50bfd5b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1b5e3493b8058f3980a14d00ecd31e2bbe88d535 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index f595656af5..7cc8c0da91 100644
+index 2c716355be..abaf98c65e 100644
@@ -26 +27 @@
-@@ -1359,4 +1359,5 @@ memif_dev_start(struct rte_eth_dev *dev)
+@@ -1244,4 +1244,5 @@ memif_dev_start(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -1373,4 +1374,11 @@ memif_dev_start(struct rte_eth_dev *dev)
+@@ -1258,4 +1259,11 @@ memif_dev_start(struct rte_eth_dev *dev)
@@ -44 +45 @@
-@@ -1379,5 +1387,13 @@ static int
+@@ -1264,5 +1272,13 @@ static int

patch 'net/mlx4: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 789097d1b99e2553659cf719fa667717b4c88c4a Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:44 +0800
Subject: [PATCH] net/mlx4: fix Rx and Tx queue state

[ upstream commit 7cc3ea8934785226c6fe6d403ea5b31761d5f52f ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/mlx4/mlx4.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 2e0b4a17e2..b89dfab215 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -293,4 +293,5 @@ mlx4_dev_start(struct rte_eth_dev *dev)
 	struct mlx4_priv *priv = dev->data->dev_private;
 	struct rte_flow_error error;
+	uint16_t i;
 	int ret;
 
@@ -328,4 +329,10 @@ mlx4_dev_start(struct rte_eth_dev *dev)
 	/* Enable datapath on secondary process. */
 	mlx4_mp_req_start_rxtx(dev);
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 err:
@@ -346,4 +353,5 @@ mlx4_dev_stop(struct rte_eth_dev *dev)
 {
 	struct mlx4_priv *priv = dev->data->dev_private;
+	uint16_t i;
 
 	if (!priv->started)
@@ -360,4 +368,9 @@ mlx4_dev_stop(struct rte_eth_dev *dev)
 	mlx4_rss_deinit(priv);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.900192537 +0000
+++ 0087-net-mlx4-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.908163640 +0000
@@ -1 +1 @@
-From 7cc3ea8934785226c6fe6d403ea5b31761d5f52f Mon Sep 17 00:00:00 2001
+From 789097d1b99e2553659cf719fa667717b4c88c4a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7cc3ea8934785226c6fe6d403ea5b31761d5f52f ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index a54016f4a2..1389b606cc 100644
+index 2e0b4a17e2..b89dfab215 100644

patch 'net/mvneta: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From bd403e9e6647f49d8eea7b3cb974b4fdbd90f54e Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:45 +0800
Subject: [PATCH] net/mvneta: fix Rx and Tx queue state

[ upstream commit 11f489ba1bebebba0d2c65d8439a64e589aa099d ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/mvneta/mvneta_ethdev.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/mvneta/mvneta_ethdev.c b/drivers/net/mvneta/mvneta_ethdev.c
index eef016aa0b..d79d069120 100644
--- a/drivers/net/mvneta/mvneta_ethdev.c
+++ b/drivers/net/mvneta/mvneta_ethdev.c
@@ -382,4 +382,8 @@ mvneta_dev_start(struct rte_eth_dev *dev)
 	}
 
+	/* start rx queues */
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	/* start tx queues */
 	for (i = 0; i < dev->data->nb_tx_queues; i++)
@@ -406,4 +410,5 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
 {
 	struct mvneta_priv *priv = dev->data->dev_private;
+	uint16_t i;
 
 	dev->data->dev_started = 0;
@@ -418,4 +423,12 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
 	priv->ppio = NULL;
 
+	/* stop rx queues */
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
+	/* stop tx queues */
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.922077055 +0000
+++ 0088-net-mvneta-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.908163640 +0000
@@ -1 +1 @@
-From 11f489ba1bebebba0d2c65d8439a64e589aa099d Mon Sep 17 00:00:00 2001
+From bd403e9e6647f49d8eea7b3cb974b4fdbd90f54e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 11f489ba1bebebba0d2c65d8439a64e589aa099d ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index d7953ac7cb..daa69e533a 100644
+index eef016aa0b..d79d069120 100644
@@ -26 +27 @@
-@@ -377,4 +377,8 @@ mvneta_dev_start(struct rte_eth_dev *dev)
+@@ -382,4 +382,8 @@ mvneta_dev_start(struct rte_eth_dev *dev)
@@ -35 +36 @@
-@@ -401,4 +405,5 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
+@@ -406,4 +410,5 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
@@ -41 +42 @@
-@@ -413,4 +418,12 @@ mvneta_dev_stop(struct rte_eth_dev *dev)
+@@ -418,4 +423,12 @@ mvneta_dev_stop(struct rte_eth_dev *dev)

patch 'net/mvpp2: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From eb249c2d5ffdd9363fb2e325a5aa51f8b37508f2 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:46 +0800
Subject: [PATCH] net/mvpp2: fix Rx and Tx queue state

[ upstream commit 228056938a340205fd295814829782e3ea6e1a46 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/mvpp2/mrvl_ethdev.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 735efb6cfc..a1c800aaf8 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -957,4 +957,7 @@ mrvl_dev_start(struct rte_eth_dev *dev)
 	}
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	mrvl_flow_init(dev);
 	mrvl_mtr_init(dev);
@@ -1082,4 +1085,11 @@ static int
 mrvl_dev_stop(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return mrvl_dev_set_link_down(dev);
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.943311495 +0000
+++ 0089-net-mvpp2-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.910163647 +0000
@@ -1 +1 @@
-From 228056938a340205fd295814829782e3ea6e1a46 Mon Sep 17 00:00:00 2001
+From eb249c2d5ffdd9363fb2e325a5aa51f8b37508f2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 228056938a340205fd295814829782e3ea6e1a46 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 359a5d1df7..c12364941d 100644
+index 735efb6cfc..a1c800aaf8 100644
@@ -26 +27 @@
-@@ -952,4 +952,7 @@ mrvl_dev_start(struct rte_eth_dev *dev)
+@@ -957,4 +957,7 @@ mrvl_dev_start(struct rte_eth_dev *dev)
@@ -34 +35 @@
-@@ -1077,4 +1080,11 @@ static int
+@@ -1082,4 +1085,11 @@ static int

patch 'net/ngbe: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 4cdfd0b40705160f4826aba7d98df62fbe4cdfc3 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:49 +0800
Subject: [PATCH] net/ngbe: fix Rx and Tx queue state

[ upstream commit 9179018ebb1dffd6b0b4fc229bafa1450035a3f0 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/ngbe/ngbe_rxtx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ngbe/ngbe_rxtx.c b/drivers/net/ngbe/ngbe_rxtx.c
index 2d159fd1cc..5df4186c72 100644
--- a/drivers/net/ngbe/ngbe_rxtx.c
+++ b/drivers/net/ngbe/ngbe_rxtx.c
@@ -2416,4 +2416,5 @@ ngbe_dev_clear_queues(struct rte_eth_dev *dev)
 			txq->ops->release_mbufs(txq);
 			txq->ops->reset(txq);
+			dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 		}
 	}
@@ -2425,4 +2426,5 @@ ngbe_dev_clear_queues(struct rte_eth_dev *dev)
 			ngbe_rx_queue_release_mbufs(rxq);
 			ngbe_reset_rx_queue(adapter, rxq);
+			dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 		}
 	}
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.965771684 +0000
+++ 0090-net-ngbe-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.911163650 +0000
@@ -1 +1 @@
-From 9179018ebb1dffd6b0b4fc229bafa1450035a3f0 Mon Sep 17 00:00:00 2001
+From 4cdfd0b40705160f4826aba7d98df62fbe4cdfc3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9179018ebb1dffd6b0b4fc229bafa1450035a3f0 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index f31906cc2f..ec353a30b1 100644
+index 2d159fd1cc..5df4186c72 100644

patch 'net/null: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From b86f8689f96358163463047bb20c90682a3058b8 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:50 +0800
Subject: [PATCH] net/null: fix Rx and Tx queue state

[ upstream commit 9b4b368ef7b9a00978e80fb2ee0beadde10a02de ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/null/rte_eth_null.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index ca03469d0e..bdaca02d86 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -187,8 +187,16 @@ static int
 eth_dev_start(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
 	if (dev == NULL)
 		return -EINVAL;
 
 	dev->data->dev_link.link_status = RTE_ETH_LINK_UP;
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -197,4 +205,6 @@ static int
 eth_dev_stop(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
 	if (dev == NULL)
 		return 0;
@@ -202,4 +212,9 @@ eth_dev_stop(struct rte_eth_dev *dev)
 	dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.989119927 +0000
+++ 0091-net-null-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.912163653 +0000
@@ -1 +1 @@
-From 9b4b368ef7b9a00978e80fb2ee0beadde10a02de Mon Sep 17 00:00:00 2001
+From b86f8689f96358163463047bb20c90682a3058b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9b4b368ef7b9a00978e80fb2ee0beadde10a02de ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 31081af797..d742bc415c 100644
+index ca03469d0e..bdaca02d86 100644
@@ -26 +27 @@
-@@ -193,8 +193,16 @@ static int
+@@ -187,8 +187,16 @@ static int
@@ -43 +44 @@
-@@ -203,4 +211,6 @@ static int
+@@ -197,4 +205,6 @@ static int
@@ -50 +51 @@
-@@ -208,4 +218,9 @@ eth_dev_stop(struct rte_eth_dev *dev)
+@@ -202,4 +212,9 @@ eth_dev_stop(struct rte_eth_dev *dev)

patch 'net/octeon_ep: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 2e34b54c6e61d82b9c92a21aa43070b5dd129804 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:51 +0800
Subject: [PATCH] net/octeon_ep: fix Rx and Tx queue state

[ upstream commit af2c10811034e1b1c0b4b4588a04b909cf69dcd1 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/octeontx_ep/otx_ep_ethdev.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeontx_ep/otx_ep_ethdev.c
index c3cec6d833..132429998b 100644
--- a/drivers/net/octeontx_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeontx_ep/otx_ep_ethdev.c
@@ -76,4 +76,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev)
 	otx_ep_info("dev started\n");
 
+	for (q = 0; q < eth_dev->data->nb_rx_queues; q++)
+		eth_dev->data->rx_queue_state[q] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (q = 0; q < eth_dev->data->nb_tx_queues; q++)
+		eth_dev->data->tx_queue_state[q] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -84,7 +89,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev)
 {
 	struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
+	uint16_t i;
 
 	otx_epvf->fn_list.disable_io_queues(otx_epvf);
 
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.010726665 +0000
+++ 0092-net-octeon_ep-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.912163653 +0000
@@ -1 +1 @@
-From af2c10811034e1b1c0b4b4588a04b909cf69dcd1 Mon Sep 17 00:00:00 2001
+From 2e34b54c6e61d82b9c92a21aa43070b5dd129804 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit af2c10811034e1b1c0b4b4588a04b909cf69dcd1 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
- drivers/net/octeon_ep/otx_ep_ethdev.c | 11 +++++++++++
+ drivers/net/octeontx_ep/otx_ep_ethdev.c | 11 +++++++++++
@@ -22,5 +23,5 @@
-diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
-index 57b965ad06..970372bbd7 100644
---- a/drivers/net/octeon_ep/otx_ep_ethdev.c
-+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
-@@ -157,4 +157,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev)
+diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeontx_ep/otx_ep_ethdev.c
+index c3cec6d833..132429998b 100644
+--- a/drivers/net/octeontx_ep/otx_ep_ethdev.c
++++ b/drivers/net/octeontx_ep/otx_ep_ethdev.c
+@@ -76,4 +76,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev)
@@ -36 +37 @@
-@@ -165,7 +170,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev)
+@@ -84,7 +89,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev)

patch 'net/pfe: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From ec33dc897df6095297301f251c0484019791a8d8 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:53 +0800
Subject: [PATCH] net/pfe: fix Rx and Tx queue state

[ upstream commit 6e7d7f57c167b086a4d67e7fb9aa04482d92e766 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/pfe/pfe_ethdev.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c
index ebb5d1ae0e..c5158bbf31 100644
--- a/drivers/net/pfe/pfe_ethdev.c
+++ b/drivers/net/pfe/pfe_ethdev.c
@@ -258,4 +258,5 @@ pfe_eth_open(struct rte_eth_dev *dev)
 	struct hif_client_s *client;
 	struct hif_shm *hif_shm;
+	uint16_t i;
 	int rc;
 
@@ -335,4 +336,8 @@ pfe_eth_open(struct rte_eth_dev *dev)
 	}
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 
 err0:
@@ -378,4 +383,5 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
 {
 	struct pfe_eth_priv_s *priv = dev->data->dev_private;
+	uint16_t i;
 
 	dev->data->dev_started = 0;
@@ -387,4 +393,9 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
 	dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.031829258 +0000
+++ 0093-net-pfe-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.913163656 +0000
@@ -1 +1 @@
-From 6e7d7f57c167b086a4d67e7fb9aa04482d92e766 Mon Sep 17 00:00:00 2001
+From ec33dc897df6095297301f251c0484019791a8d8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6e7d7f57c167b086a4d67e7fb9aa04482d92e766 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 0352a57950..551f3cf193 100644
+index ebb5d1ae0e..c5158bbf31 100644
@@ -26 +27 @@
-@@ -242,4 +242,5 @@ pfe_eth_open(struct rte_eth_dev *dev)
+@@ -258,4 +258,5 @@ pfe_eth_open(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -319,4 +320,8 @@ pfe_eth_open(struct rte_eth_dev *dev)
+@@ -335,4 +336,8 @@ pfe_eth_open(struct rte_eth_dev *dev)
@@ -41 +42 @@
-@@ -362,4 +367,5 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
+@@ -378,4 +383,5 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
@@ -47,2 +48,2 @@
-@@ -371,4 +377,9 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
- 	dev->tx_pkt_burst = rte_eth_pkt_burst_dummy;
+@@ -387,4 +393,9 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/)
+ 	dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;

patch 'net/ring: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From d849664d39d87f4203bf952ac39b39fadb653749 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:54 +0800
Subject: [PATCH] net/ring: fix Rx and Tx queue state

[ upstream commit 3d0c550d20f265547c434738f7a4673e6a097570 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/ring/rte_eth_ring.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index db10f035df..d32424aa53 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -110,6 +110,13 @@ static int
 eth_dev_stop(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
 	dev->data->dev_started = 0;
 	dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN;
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	return 0;
 }
@@ -118,5 +125,13 @@ static int
 eth_dev_set_link_down(struct rte_eth_dev *dev)
 {
+	uint16_t i;
+
 	dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN;
+
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.053485503 +0000
+++ 0094-net-ring-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.914163660 +0000
@@ -1 +1 @@
-From 3d0c550d20f265547c434738f7a4673e6a097570 Mon Sep 17 00:00:00 2001
+From d849664d39d87f4203bf952ac39b39fadb653749 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3d0c550d20f265547c434738f7a4673e6a097570 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index c43dccea7f..48953dd7a0 100644
+index db10f035df..d32424aa53 100644
@@ -26 +27 @@
-@@ -114,6 +114,13 @@ static int
+@@ -110,6 +110,13 @@ static int
@@ -40 +41 @@
-@@ -122,5 +129,13 @@ static int
+@@ -118,5 +125,13 @@ static int

patch 'net/sfc: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 7a88ec18c1e99f4f88765d453fbe09f3cd850517 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:55 +0800
Subject: [PATCH] net/sfc: fix Rx and Tx queue state

[ upstream commit 35ac4f275f37d6002ed62e78342af96b9cf7e1e7 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/sfc/sfc_repr.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/sfc/sfc_repr.c b/drivers/net/sfc/sfc_repr.c
index 8593ee80f5..2a60f1cc31 100644
--- a/drivers/net/sfc/sfc_repr.c
+++ b/drivers/net/sfc/sfc_repr.c
@@ -292,4 +292,5 @@ sfc_repr_dev_start(struct rte_eth_dev *dev)
 {
 	struct sfc_repr *sr = sfc_repr_by_eth_dev(dev);
+	uint16_t i;
 	int ret;
 
@@ -303,4 +304,9 @@ sfc_repr_dev_start(struct rte_eth_dev *dev)
 		goto fail_start;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	sfcr_info(sr, "done");
 
@@ -367,4 +373,5 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev)
 {
 	struct sfc_repr *sr = sfc_repr_by_eth_dev(dev);
+	uint16_t i;
 	int ret;
 
@@ -381,4 +388,9 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev)
 	sfc_repr_unlock(sr);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	sfcr_info(sr, "done");
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.075012096 +0000
+++ 0095-net-sfc-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.914163660 +0000
@@ -1 +1 @@
-From 35ac4f275f37d6002ed62e78342af96b9cf7e1e7 Mon Sep 17 00:00:00 2001
+From 7a88ec18c1e99f4f88765d453fbe09f3cd850517 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 35ac4f275f37d6002ed62e78342af96b9cf7e1e7 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 5f93192522..c2e5d4eb9e 100644
+index 8593ee80f5..2a60f1cc31 100644
@@ -26 +27 @@
-@@ -264,4 +264,5 @@ sfc_repr_dev_start(struct rte_eth_dev *dev)
+@@ -292,4 +292,5 @@ sfc_repr_dev_start(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -275,4 +276,9 @@ sfc_repr_dev_start(struct rte_eth_dev *dev)
+@@ -303,4 +304,9 @@ sfc_repr_dev_start(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -339,4 +345,5 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev)
+@@ -367,4 +373,5 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev)
@@ -48 +49 @@
-@@ -353,4 +360,9 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev)
+@@ -381,4 +388,9 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev)

patch 'net/softnic: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 4e0e44f7ef09a21d4ee57cc36786f2e6f845db60 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:56 +0800
Subject: [PATCH] net/softnic: fix Rx and Tx queue state

[ upstream commit 7143a21342ef611a4159f03f24f0c4fbd8686aa1 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 drivers/net/softnic/rte_eth_softnic.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c
index 8c098cad5b..009cc911f4 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -165,4 +165,5 @@ pmd_dev_start(struct rte_eth_dev *dev)
 	struct pmd_internals *p = dev->data->dev_private;
 	int status;
+	uint16_t i;
 
 	/* Firmware */
@@ -177,4 +178,9 @@ pmd_dev_start(struct rte_eth_dev *dev)
 	dev->data->dev_link.link_status = RTE_ETH_LINK_UP;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -184,4 +190,5 @@ pmd_dev_stop(struct rte_eth_dev *dev)
 {
 	struct pmd_internals *p = dev->data->dev_private;
+	uint16_t i;
 
 	/* Link DOWN */
@@ -202,4 +209,9 @@ pmd_dev_stop(struct rte_eth_dev *dev)
 	softnic_mtr_free(p);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.097025992 +0000
+++ 0096-net-softnic-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.915163663 +0000
@@ -1 +1 @@
-From 7143a21342ef611a4159f03f24f0c4fbd8686aa1 Mon Sep 17 00:00:00 2001
+From 4e0e44f7ef09a21d4ee57cc36786f2e6f845db60 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7143a21342ef611a4159f03f24f0c4fbd8686aa1 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index bcf6664460..1b90cf7a21 100644
+index 8c098cad5b..009cc911f4 100644
@@ -26 +27 @@
-@@ -135,4 +135,5 @@ pmd_dev_start(struct rte_eth_dev *dev)
+@@ -165,4 +165,5 @@ pmd_dev_start(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -147,4 +148,9 @@ pmd_dev_start(struct rte_eth_dev *dev)
+@@ -177,4 +178,9 @@ pmd_dev_start(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -154,4 +160,5 @@ pmd_dev_stop(struct rte_eth_dev *dev)
+@@ -184,4 +190,5 @@ pmd_dev_stop(struct rte_eth_dev *dev)
@@ -48,2 +49,2 @@
-@@ -164,4 +171,9 @@ pmd_dev_stop(struct rte_eth_dev *dev)
- 	softnic_mempool_free(p);
+@@ -202,4 +209,9 @@ pmd_dev_stop(struct rte_eth_dev *dev)
+ 	softnic_mtr_free(p);

patch 'net/txgbe: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 358e6d50e7cf7ff71413f976641d8f7185d86167 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:57 +0800
Subject: [PATCH] net/txgbe: fix Rx and Tx queue state

[ upstream commit b6e8560d9c4067f321f5c838b7faad68258a203a ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/txgbe/txgbe_rxtx.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index d0f7fe6945..f85ec77dd5 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -2807,4 +2807,6 @@ txgbe_dev_clear_queues(struct rte_eth_dev *dev)
 			txq->ops->reset(txq);
 		}
+
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 	}
 
@@ -2816,4 +2818,6 @@ txgbe_dev_clear_queues(struct rte_eth_dev *dev)
 			txgbe_reset_rx_queue(adapter, rxq);
 		}
+
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 	}
 }
@@ -5006,4 +5010,6 @@ txgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
 		if (!poll_ms)
 			PMD_INIT_LOG(ERR, "Could not enable Tx Queue %d", i);
+		else
+			dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	}
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
@@ -5020,4 +5026,6 @@ txgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
 		if (!poll_ms)
 			PMD_INIT_LOG(ERR, "Could not enable Rx Queue %d", i);
+		else
+			dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 		rte_wmb();
 		wr32(hw, TXGBE_RXWP(i), rxq->nb_rx_desc - 1);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.118258317 +0000
+++ 0097-net-txgbe-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.917163669 +0000
@@ -1 +1 @@
-From b6e8560d9c4067f321f5c838b7faad68258a203a Mon Sep 17 00:00:00 2001
+From 358e6d50e7cf7ff71413f976641d8f7185d86167 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b6e8560d9c4067f321f5c838b7faad68258a203a ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index f7cd2333ab..834ada886a 100644
+index d0f7fe6945..f85ec77dd5 100644

patch 'net/vhost: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 1213bcc82656621cd6e03a4e2b2fcf94a2ac5ebe Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:58 +0800
Subject: [PATCH] net/vhost: fix Rx and Tx queue state

[ upstream commit def31f40b59f5f20eae89b68dd47bdca3f2a9d0a ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/vhost/rte_eth_vhost.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 4e44e123eb..1306cc2935 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -1098,4 +1098,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev)
 	struct pmd_internal *internal = eth_dev->data->dev_private;
 	struct rte_eth_conf *dev_conf = &eth_dev->data->dev_conf;
+	uint16_t i;
 
 	eth_vhost_uninstall_intr(eth_dev);
@@ -1113,4 +1114,9 @@ eth_dev_start(struct rte_eth_dev *eth_dev)
 	update_queuing_status(eth_dev, false);
 
+	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
+		eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+		eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return 0;
 }
@@ -1120,4 +1126,5 @@ eth_dev_stop(struct rte_eth_dev *dev)
 {
 	struct pmd_internal *internal = dev->data->dev_private;
+	uint16_t i;
 
 	dev->data->dev_started = 0;
@@ -1125,4 +1132,9 @@ eth_dev_stop(struct rte_eth_dev *dev)
 	update_queuing_status(dev, true);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.142641548 +0000
+++ 0098-net-vhost-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.918163672 +0000
@@ -1 +1 @@
-From def31f40b59f5f20eae89b68dd47bdca3f2a9d0a Mon Sep 17 00:00:00 2001
+From 1213bcc82656621cd6e03a4e2b2fcf94a2ac5ebe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit def31f40b59f5f20eae89b68dd47bdca3f2a9d0a ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 48a9a79efe..21bbb008e0 100644
+index 4e44e123eb..1306cc2935 100644
@@ -26 +27 @@
-@@ -1136,4 +1136,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev)
+@@ -1098,4 +1098,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev)
@@ -32 +33 @@
-@@ -1151,4 +1152,9 @@ eth_dev_start(struct rte_eth_dev *eth_dev)
+@@ -1113,4 +1114,9 @@ eth_dev_start(struct rte_eth_dev *eth_dev)
@@ -42 +43 @@
-@@ -1158,4 +1164,5 @@ eth_dev_stop(struct rte_eth_dev *dev)
+@@ -1120,4 +1126,5 @@ eth_dev_stop(struct rte_eth_dev *dev)
@@ -48 +49 @@
-@@ -1163,4 +1170,9 @@ eth_dev_stop(struct rte_eth_dev *dev)
+@@ -1125,4 +1132,9 @@ eth_dev_stop(struct rte_eth_dev *dev)

patch 'net/virtio: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From a508510366ea6eed6e2b74a6177ccb142b34e8ce Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:28:59 +0800
Subject: [PATCH] net/virtio: fix Rx and Tx queue state

[ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/virtio/virtio_ethdev.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index f4d13ec3a1..a23559850c 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -2853,4 +2853,9 @@ virtio_dev_start(struct rte_eth_dev *dev)
 	hw->started = 1;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	/* Initialize Link state */
 	virtio_dev_link_update(dev, 0);
@@ -2942,4 +2947,5 @@ virtio_dev_stop(struct rte_eth_dev *dev)
 	struct rte_eth_link link;
 	struct rte_eth_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
+	uint16_t i;
 
 	PMD_INIT_LOG(DEBUG, "stop");
@@ -2969,4 +2975,9 @@ out_unlock:
 	rte_spinlock_unlock(&hw->state_lock);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.164316678 +0000
+++ 0099-net-virtio-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.919163676 +0000
@@ -1 +1 @@
-From 0170be6f4f90fdf3295c23520fc1547c1a2405db Mon Sep 17 00:00:00 2001
+From a508510366ea6eed6e2b74a6177ccb142b34e8ce Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 2c23f1c00e..3ab56ef769 100644
+index f4d13ec3a1..a23559850c 100644
@@ -26 +27 @@
-@@ -2418,4 +2418,9 @@ virtio_dev_start(struct rte_eth_dev *dev)
+@@ -2853,4 +2853,9 @@ virtio_dev_start(struct rte_eth_dev *dev)
@@ -36 +37 @@
-@@ -2507,4 +2512,5 @@ virtio_dev_stop(struct rte_eth_dev *dev)
+@@ -2942,4 +2947,5 @@ virtio_dev_stop(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -2534,4 +2540,9 @@ out_unlock:
+@@ -2969,4 +2975,9 @@ out_unlock:

patch 'net/vmxnet3: fix Rx and Tx queue state' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 91c5c25915e850945121a8b0c73448fdd11bbf5c Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:29:00 +0800
Subject: [PATCH] net/vmxnet3: fix Rx and Tx queue state

[ upstream commit aa400e679625afe3756fed1435e7e44f1f902223 ]

The DPDK framework reports the queue state, which is stored in
dev->data->tx_queue_state and dev->data->rx_queue_state. The
state is maintained by the driver. Users may determine whether
a queue participates in packet forwarding based on the state.
Therefore, the driver needs to modify the queue state in time
according to the actual situation.

Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index d4aea74026..a48a355d39 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -891,4 +891,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
 	int ret;
 	struct vmxnet3_hw *hw = dev->data->dev_private;
+	uint16_t i;
 
 	PMD_INIT_FUNC_TRACE();
@@ -986,4 +987,9 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
 	__vmxnet3_dev_link_update(dev, 0);
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
+
 	return VMXNET3_SUCCESS;
 }
@@ -998,4 +1004,5 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
 	struct vmxnet3_hw *hw = dev->data->dev_private;
 	struct rte_intr_handle *intr_handle = dev->intr_handle;
+	uint16_t i;
 	int ret;
 
@@ -1053,4 +1060,9 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
 	dev->data->dev_started = 0;
 
+	for (i = 0; i < dev->data->nb_rx_queues; i++)
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+	for (i = 0; i < dev->data->nb_tx_queues; i++)
+		dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
+
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.187140734 +0000
+++ 0100-net-vmxnet3-fix-Rx-and-Tx-queue-state.patch	2023-11-02 13:09:40.920163679 +0000
@@ -1 +1 @@
-From aa400e679625afe3756fed1435e7e44f1f902223 Mon Sep 17 00:00:00 2001
+From 91c5c25915e850945121a8b0c73448fdd11bbf5c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aa400e679625afe3756fed1435e7e44f1f902223 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 76e80e3025..e49191718a 100644
+index d4aea74026..a48a355d39 100644
@@ -26 +27 @@
-@@ -1049,4 +1049,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
+@@ -891,4 +891,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -1152,4 +1153,9 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
+@@ -986,4 +987,9 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
@@ -42 +43 @@
-@@ -1164,4 +1170,5 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
+@@ -998,4 +1004,5 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
@@ -48 +49 @@
-@@ -1219,4 +1226,9 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
+@@ -1053,4 +1060,9 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)

patch 'app/testpmd: fix primary process not polling all queues' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 097657f9bc334a0fc69215e33bf25e5277d41e22 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 8 Sep 2023 19:29:01 +0800
Subject: [PATCH] app/testpmd: fix primary process not polling all queues

[ upstream commit 37b68fa1445cb6fe287178607bac6fa3d90b835f ]

Here's how the problem arises.
step1: Start the app.
    dpdk-testpmd -a 0000:35:00.0 -l 0-3 -- -i --rxq=10 --txq=10

step2: Perform the following steps and send traffic. As expected,
queue 7 does not send or receive packets, and other queues do.
    port 0 rxq 7 stop
    port 0 txq 7 stop
    set fwd mac
    start

step3: Perform the following steps and send traffic. All queues
are expected to send and receive packets normally, but that's not
the case for queue 7.
    stop
    port stop all
    port start all
    start
    show port xstats all

In fact, only the value of rx_q7_packets for queue 7 is not zero,
which means queue 7 is enabled for the driver but is not involved
in packet receiving and forwarding by software. If we check queue
state by command 'show rxq info 0 7' and 'show txq info 0 7',
we see queue 7 is started as other queues are.
    Rx queue state: started
    Tx queue state: started
The queue 7 is started but cannot forward. That's the problem.

We know that each stream has a read-only "disabled" field that
control if this stream should be used to forward. This field
depends on testpmd local queue state, please see
commit 3c4426db54fc ("app/testpmd: do not poll stopped queues").
DPDK framework maintains ethdev queue state that drivers reported,
which indicates the real state of queues.

There are commands that update these two kind queue state such as
'port X rxq|txq start|stop'. But these operations take effect only
in one stop-start round. In the following stop-start round, the
preceding operations do not take effect anymore. However, only
the ethdev queue state is updated, causing the testpmd and ethdev
state information to diverge and causing unexpected side effects
as above problem.

There was a similar problem for the secondary process, please see
commit 5028f207a4fa ("app/testpmd: fix secondary process packet
forwarding").

This patch applies its workaround with some difference to the
primary process. Not all PMDs implement rte_eth_rx_queue_info_get and
rte_eth_tx_queue_info_get, however they may support deferred_start
with primary process. To not break their behavior, retain the original
testpmd local queue state for those PMDs.

Fixes: 3c4426db54fc ("app/testpmd: do not poll stopped queues")

Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 app/test-pmd/testpmd.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 9f4a0e0a78..5f34641e90 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2376,4 +2376,11 @@ update_rx_queue_state(uint16_t port_id, uint16_t queue_id)
 			rx_qinfo.queue_state;
 	} else if (rc == -ENOTSUP) {
+		/*
+		 * Do not change the rxq state for primary process
+		 * to ensure that the PMDs do not implement
+		 * rte_eth_rx_queue_info_get can forward as before.
+		 */
+		if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+			return;
 		/*
 		 * Set the rxq state to RTE_ETH_QUEUE_STATE_STARTED
@@ -2401,4 +2408,11 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
 			tx_qinfo.queue_state;
 	} else if (rc == -ENOTSUP) {
+		/*
+		 * Do not change the txq state for primary process
+		 * to ensure that the PMDs do not implement
+		 * rte_eth_tx_queue_info_get can forward as before.
+		 */
+		if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+			return;
 		/*
 		 * Set the txq state to RTE_ETH_QUEUE_STATE_STARTED
@@ -2415,5 +2429,5 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
 
 static void
-update_queue_state(void)
+update_queue_state(portid_t pid)
 {
 	portid_t pi;
@@ -2421,4 +2435,7 @@ update_queue_state(void)
 
 	RTE_ETH_FOREACH_DEV(pi) {
+		if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
+			continue;
+
 		for (qi = 0; qi < nb_rxq; qi++)
 			update_rx_queue_state(pi, qi);
@@ -2468,6 +2485,5 @@ start_packet_forwarding(int with_tx_first)
 
 	if (stream_init != NULL) {
-		if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-			update_queue_state();
+		update_queue_state(RTE_PORT_ALL);
 		for (i = 0; i < cur_fwd_config.nb_fwd_streams; i++)
 			stream_init(fwd_streams[i]);
@@ -3127,6 +3143,5 @@ start_port(portid_t pid)
 	}
 
-	if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-		update_queue_state();
+	update_queue_state(pi);
 
 	if (at_least_one_port_successfully_started && !no_link_check)
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.209083868 +0000
+++ 0101-app-testpmd-fix-primary-process-not-polling-all-queu.patch	2023-11-02 13:09:40.923163688 +0000
@@ -1 +1 @@
-From 37b68fa1445cb6fe287178607bac6fa3d90b835f Mon Sep 17 00:00:00 2001
+From 097657f9bc334a0fc69215e33bf25e5277d41e22 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 37b68fa1445cb6fe287178607bac6fa3d90b835f ]
+
@@ -61 +62,0 @@
-Cc: stable@dpdk.org
@@ -70 +71 @@
-index b3d6ce7127..595b77748c 100644
+index 9f4a0e0a78..5f34641e90 100644
@@ -73 +74 @@
-@@ -2426,4 +2426,11 @@ update_rx_queue_state(uint16_t port_id, uint16_t queue_id)
+@@ -2376,4 +2376,11 @@ update_rx_queue_state(uint16_t port_id, uint16_t queue_id)
@@ -85 +86 @@
-@@ -2451,4 +2458,11 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
+@@ -2401,4 +2408,11 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
@@ -97 +98 @@
-@@ -2465,5 +2479,5 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
+@@ -2415,5 +2429,5 @@ update_tx_queue_state(uint16_t port_id, uint16_t queue_id)
@@ -104 +105 @@
-@@ -2471,4 +2485,7 @@ update_queue_state(void)
+@@ -2421,4 +2435,7 @@ update_queue_state(void)
@@ -112 +113 @@
-@@ -2518,6 +2535,5 @@ start_packet_forwarding(int with_tx_first)
+@@ -2468,6 +2485,5 @@ start_packet_forwarding(int with_tx_first)
@@ -120 +121 @@
-@@ -3282,6 +3298,5 @@ start_port(portid_t pid)
+@@ -3127,6 +3143,5 @@ start_port(portid_t pid)

patch 'net/bonding: fix link status callback stop' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 6b396dceec44c55e02173c5d4e4ed087ec883dc2 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Mon, 16 Oct 2023 10:47:43 +0200
Subject: [PATCH] net/bonding: fix link status callback stop

[ upstream commit 615bd385b93e89e062b4e134e9cc09a79289a0f6 ]

If a bonding port gets released, a link status alarm callback still
referenced the ethdev port that may be reused later.
Cancel this callback when stopping the port.

Bugzilla ID: 1301
Fixes: a45b288ef21a ("bond: support link status polling")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index d9fcd21d9f..7d957133e3 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -2135,4 +2135,8 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
 	eth_dev->data->dev_started = 0;
 
+	if (internals->link_status_polling_enabled) {
+		rte_eal_alarm_cancel(bond_ethdev_slave_link_status_change_monitor,
+			(void *)&rte_eth_devices[internals->port_id]);
+	}
 	internals->link_status_polling_enabled = 0;
 	for (i = 0; i < internals->slave_count; i++) {
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.232413589 +0000
+++ 0102-net-bonding-fix-link-status-callback-stop.patch	2023-11-02 13:09:40.925163695 +0000
@@ -1 +1 @@
-From 615bd385b93e89e062b4e134e9cc09a79289a0f6 Mon Sep 17 00:00:00 2001
+From 6b396dceec44c55e02173c5d4e4ed087ec883dc2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 615bd385b93e89e062b4e134e9cc09a79289a0f6 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index aa7c911f19..c40d18d128 100644
+index d9fcd21d9f..7d957133e3 100644
@@ -25 +26 @@
-@@ -2165,4 +2165,8 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
+@@ -2135,4 +2135,8 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev)
@@ -29 +30 @@
-+		rte_eal_alarm_cancel(bond_ethdev_member_link_status_change_monitor,
++		rte_eal_alarm_cancel(bond_ethdev_slave_link_status_change_monitor,
@@ -33 +34 @@
- 	for (i = 0; i < internals->member_count; i++) {
+ 	for (i = 0; i < internals->slave_count; i++) {

patch 'app/procinfo: remove unnecessary rte_malloc' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 997c669059a4ff49e551deec11b899adba4d73ee Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 7 Aug 2023 13:43:10 -0700
Subject: [PATCH] app/procinfo: remove unnecessary rte_malloc

[ upstream commit cfe29906c69bedb5f87dadcc02703ce46e80f37e ]

Better to use malloc() which is faster than rte_malloc()
and has more error checking, as is done already for statistics.

Fixes: 077c546704da ("app/proc_info: add metrics displaying")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/proc-info/main.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index e1ccdbbaa5..f628377c19 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -20,5 +20,4 @@
 #include <rte_debug.h>
 #include <rte_ethdev.h>
-#include <rte_malloc.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
@@ -622,6 +621,5 @@ metrics_display(int port_id)
 	}
 
-	metrics = rte_malloc("proc_info_metrics",
-		sizeof(struct rte_metric_value) * len, 0);
+	metrics = malloc(sizeof(struct rte_metric_value) * len);
 	if (metrics == NULL) {
 		printf("Cannot allocate memory for metrics\n");
@@ -629,8 +627,8 @@ metrics_display(int port_id)
 	}
 
-	names =  rte_malloc(NULL, sizeof(struct rte_metric_name) * len, 0);
+	names = malloc(sizeof(struct rte_metric_name) * len);
 	if (names == NULL) {
 		printf("Cannot allocate memory for metrics names\n");
-		rte_free(metrics);
+		free(metrics);
 		return;
 	}
@@ -638,6 +636,6 @@ metrics_display(int port_id)
 	if (len != rte_metrics_get_names(names, len)) {
 		printf("Cannot get metrics names\n");
-		rte_free(metrics);
-		rte_free(names);
+		free(metrics);
+		free(names);
 		return;
 	}
@@ -651,6 +649,6 @@ metrics_display(int port_id)
 	if (ret < 0 || ret > len) {
 		printf("Cannot get metrics values\n");
-		rte_free(metrics);
-		rte_free(names);
+		free(metrics);
+		free(names);
 		return;
 	}
@@ -661,6 +659,6 @@ metrics_display(int port_id)
 
 	printf("%s############################\n", nic_stats_border);
-	rte_free(metrics);
-	rte_free(names);
+	free(metrics);
+	free(names);
 }
 #endif
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.256329124 +0000
+++ 0103-app-procinfo-remove-unnecessary-rte_malloc.patch	2023-11-02 13:09:40.926163698 +0000
@@ -1 +1 @@
-From cfe29906c69bedb5f87dadcc02703ce46e80f37e Mon Sep 17 00:00:00 2001
+From 997c669059a4ff49e551deec11b899adba4d73ee Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cfe29906c69bedb5f87dadcc02703ce46e80f37e ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index af4c1d8bcb..ce53bc30df 100644
+index e1ccdbbaa5..f628377c19 100644
@@ -28 +29 @@
-@@ -910,6 +909,5 @@ metrics_display(int port_id)
+@@ -622,6 +621,5 @@ metrics_display(int port_id)
@@ -36 +37 @@
-@@ -917,8 +915,8 @@ metrics_display(int port_id)
+@@ -629,8 +627,8 @@ metrics_display(int port_id)
@@ -47 +48 @@
-@@ -926,6 +924,6 @@ metrics_display(int port_id)
+@@ -638,6 +636,6 @@ metrics_display(int port_id)
@@ -56 +57 @@
-@@ -939,6 +937,6 @@ metrics_display(int port_id)
+@@ -651,6 +649,6 @@ metrics_display(int port_id)
@@ -65 +66 @@
-@@ -949,6 +947,6 @@ metrics_display(int port_id)
+@@ -661,6 +659,6 @@ metrics_display(int port_id)

patch 'malloc: remove return from void functions' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. So please
shout if anyone has objections.

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

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

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

Thanks.

Kevin

---
From 7a268dfe93b27babb992f5c5e776d105dbe0d945 Mon Sep 17 00:00:00 2001
From: Tyler Retzlaff <roretzla@linux.microsoft.com>
Date: Tue, 17 Oct 2023 06:03:39 -0700
Subject: [PATCH] malloc: remove return from void functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ]

Remove return from rte_free and eal_free_no_trace both functions are
declared to have a return type of void so they shouldn't return a value.

Fixes: 52f409d614a0 ("trace: add memory tracepoints")

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Reviewed-by: Morten Brørup <mb@smartsharesystems.com>
---
 lib/eal/common/rte_malloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/rte_malloc.c b/lib/eal/common/rte_malloc.c
index d0bec26920..c5a7757deb 100644
--- a/lib/eal/common/rte_malloc.c
+++ b/lib/eal/common/rte_malloc.c
@@ -47,5 +47,5 @@ void
 rte_free(void *addr)
 {
-	return mem_free(addr, true);
+	mem_free(addr, true);
 }
 
@@ -53,5 +53,5 @@ void
 eal_free_no_trace(void *addr)
 {
-	return mem_free(addr, false);
+	mem_free(addr, false);
 }
 
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:43.278223314 +0000
+++ 0104-malloc-remove-return-from-void-functions.patch	2023-11-02 13:09:40.926163698 +0000
@@ -1 +1 @@
-From 732ba1be28f75c87aa2616660d34ed0a278c7ae6 Mon Sep 17 00:00:00 2001
+From 7a268dfe93b27babb992f5c5e776d105dbe0d945 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 732ba1be28f75c87aa2616660d34ed0a278c7ae6 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index ebafef3f6c..9db0c399ae 100644
+index d0bec26920..c5a7757deb 100644
@@ -25 +26 @@
-@@ -42,5 +42,5 @@ void
+@@ -47,5 +47,5 @@ void
@@ -32 +33 @@
-@@ -48,5 +48,5 @@ void
+@@ -53,5 +53,5 @@ void