patch 'doc: fix typos and wording in flow API guide' has been queued to stable release 21.11.5

patch 'doc: fix typos and wording in flow API guide' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From dd28326d46529442343ce831beacd6e83640855c Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu@nvidia.com>
Date: Sun, 16 Jul 2023 09:58:26 +0300
Subject: [PATCH] doc: fix typos and wording in flow API guide

[ upstream commit d9f1751090ce1055a64f1d9a5f43758acae2c5ac ]

This fixes typos, punctuation and wording in the rte flow API guide.

Fixes: 2f82d143fb31 ("ethdev: add group jump action")

Signed-off-by: Ali Alnubani <alialnu@nvidia.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
---
 doc/guides/prog_guide/rte_flow.rst | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst
index 61d0d0899a..91ace7ae7a 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -149,12 +149,13 @@ Flow rules can be grouped by assigning them a common group number. Groups
 allow a logical hierarchy of flow rule groups (tables) to be defined. These
 groups can be supported virtually in the PMD or in the physical device.
-Group 0 is the default group and this is the only group which flows are
-guarantee to matched against, all subsequent groups can only be reached by
-way of the JUMP action from a matched flow rule.
+Group 0 is the default group and is the only group that
+flows are guaranteed to be matched against.
+All subsequent groups can only be reached by using a JUMP action
+from a matched flow rule.
 
 Although optional, applications are encouraged to group similar rules as
 much as possible to fully take advantage of hardware capabilities
 (e.g. optimized matching) and work around limitations (e.g. a single pattern
-type possibly allowed in a given group), while being aware that the groups
+type possibly allowed in a given group), while being aware that the groups'
 hierarchies must be programmed explicitly.
 
@@ -171,5 +172,5 @@ not need to be contiguous nor start from 0, however the maximum number
 varies between devices and may be affected by existing flow rules.
 
-A flow which matches multiple rules in the same group will always matched by
+A flow which matches multiple rules in the same group will always be matched by
 the rule with the highest priority in that group.
 
@@ -1832,10 +1833,10 @@ the specified group on that device.
 
 If a matched flow is redirected to a table which doesn't contain a matching
-rule for that flow then the behavior is undefined and the resulting behavior
-is up to the specific device. Best practice when using groups would be define
+rule for that flow, then the behavior is undefined and the resulting behavior
+is up to the specific device. Best practice when using groups would be to define
 a default flow rule for each group which a defines the default actions in that
 group so a consistent behavior is defined.
 
-Defining an action for matched flow in a group to jump to a group which is
+Defining an action for a matched flow in a group to jump to a group which is
 higher in the group hierarchy may not be supported by physical devices,
 depending on how groups are mapped to the physical devices. In the
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.046079280 +0100
+++ 0001-doc-fix-typos-and-wording-in-flow-API-guide.patch	2023-07-21 14:33:58.986253149 +0100
@@ -1 +1 @@
-From d9f1751090ce1055a64f1d9a5f43758acae2c5ac Mon Sep 17 00:00:00 2001
+From dd28326d46529442343ce831beacd6e83640855c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d9f1751090ce1055a64f1d9a5f43758acae2c5ac ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 28d09c58d5..5bc998a433 100644
+index 61d0d0899a..91ace7ae7a 100644
@@ -46 +47 @@
-@@ -1770,10 +1771,10 @@ the specified group on that device.
+@@ -1832,10 +1833,10 @@ the specified group on that device.

patch 'net/i40e: fix comments' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From 54b7e8bf5fc017d54841c8ac088056c022bc3f04 Mon Sep 17 00:00:00 2001
From: Jieqiang Wang <jieqiang.wang@arm.com>
Date: Wed, 12 Jul 2023 18:07:32 +0800
Subject: [PATCH] net/i40e: fix comments

[ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ]

The limitation of burst size in i40e vector rx has been removed, but the
comment lines have not been updated to reflect the code changes. Remove
those lines to avoid confusion. Additionally, fix a typo in
i40e_tx_queue.

Fixes: 9e27f00f3a61 ("net/i40e: fix vector Rx")

Signed-off-by: Jieqiang Wang <jieqiang.wang@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
 .mailmap                                 | 1 +
 drivers/net/i40e/i40e_rxtx.h             | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_altivec.c | 2 --
 drivers/net/i40e/i40e_rxtx_vec_neon.c    | 2 --
 drivers/net/i40e/i40e_rxtx_vec_sse.c     | 2 --
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.mailmap b/.mailmap
index 12f6084945..2b254e64ef 100644
--- a/.mailmap
+++ b/.mailmap
@@ -611,4 +611,5 @@ Jie Pan <panjie5@jd.com>
 Jie Wang <jie1x.wang@intel.com>
 Jie Zhou <jizh@linux.microsoft.com> <jizh@microsoft.com>
+Jieqiang Wang <jieqiang.wang@arm.com>
 Jijiang Liu <jijiang.liu@intel.com>
 Jilei Chen <chenjilei@cmss.chinamobile.com>
diff --git a/drivers/net/i40e/i40e_rxtx.h b/drivers/net/i40e/i40e_rxtx.h
index 0376c219be..a8686224e5 100644
--- a/drivers/net/i40e/i40e_rxtx.h
+++ b/drivers/net/i40e/i40e_rxtx.h
@@ -170,5 +170,5 @@ struct i40e_tx_queue {
 	bool tx_deferred_start; /**< don't start this queue in dev start */
 	uint8_t dcb_tc;         /**< Traffic class of tx queue */
-	uint64_t offloads; /**< Tx offload flags of RTE_ETH_RX_OFFLOAD_* */
+	uint64_t offloads; /**< Tx offload flags of RTE_ETH_TX_OFFLOAD_* */
 	const struct rte_memzone *mz;
 };
diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
index 00a015013e..3d2cbe03fb 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c
@@ -449,6 +449,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  /* Notice:
   * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
-  * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
-  *   numbers of DD bits
   */
 uint16_t
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 507468531f..f274af2c6a 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -437,6 +437,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq,
  * Notice:
  * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
- * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
- *   numbers of DD bits
  */
 uint16_t
diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c
index 3782e8052f..63806a723d 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c
@@ -596,6 +596,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
  * Notice:
  * - nb_pkts < RTE_I40E_DESCS_PER_LOOP, just return no packet
- * - nb_pkts > RTE_I40E_VPMD_RX_BURST, only scan RTE_I40E_VPMD_RX_BURST
- *   numbers of DD bits
  */
 uint16_t
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.069163728 +0100
+++ 0002-net-i40e-fix-comments.patch	2023-07-21 14:33:58.994253178 +0100
@@ -1 +1 @@
-From 5267a2ae78e873d3a7e175944dcedffdadab6483 Mon Sep 17 00:00:00 2001
+From 54b7e8bf5fc017d54841c8ac088056c022bc3f04 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5267a2ae78e873d3a7e175944dcedffdadab6483 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 6eccf0c555..670d312f84 100644
+index 12f6084945..2b254e64ef 100644
@@ -28 +29 @@
-@@ -629,4 +629,5 @@ Jie Pan <panjie5@jd.com>
+@@ -611,4 +611,5 @@ Jie Pan <panjie5@jd.com>
@@ -46 +47 @@
-index 8672ad1c41..4cd78f4e58 100644
+index 00a015013e..3d2cbe03fb 100644
@@ -49 +50 @@
-@@ -450,6 +450,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
+@@ -449,6 +449,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
@@ -57 +58 @@
-index 49391fe4c7..d873e30972 100644
+index 507468531f..f274af2c6a 100644
@@ -60 +61 @@
-@@ -575,6 +575,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq,
+@@ -437,6 +437,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq,
@@ -68 +69 @@
-index baf83cb3df..b94c37cbb8 100644
+index 3782e8052f..63806a723d 100644
@@ -71 +72 @@
-@@ -597,6 +597,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
+@@ -596,6 +596,4 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,

patch 'net/iavf: fix stop ordering' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From 5a0e07583487a16021f43a1a740b26a925e5c656 Mon Sep 17 00:00:00 2001
From: Zhichao Zeng <zhichaox.zeng@intel.com>
Date: Wed, 12 Jul 2023 13:35:37 +0800
Subject: [PATCH] net/iavf: fix stop ordering

[ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ]

The current implementation stops queue before disabling the Rx interrupt,
and when there are still unprocessed packets remaining in the queue,
this may cause the Rx ring to timeout, leading to IOMMU fault.

This patch disables the Rx interrupt before stopping the queue, ensuring
that no packets received when disabling the queues.

Fixes: 02d212ca3125 ("net/iavf: rename remaining avf strings")

Signed-off-by: Bartosz Staszewski <bartoszx.staszewski@intel.com>
Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 .mailmap                       | 1 +
 drivers/net/iavf/iavf_ethdev.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 2b254e64ef..495f89e75d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -145,4 +145,5 @@ Bao-Long Tran <longtb5@viettel.com.vn>
 Barak Enat <barak@saguna.net>
 Barry Cao <barry.cao@nxp.com>
+Bartosz Staszewski <bartoszx.staszewski@intel.com>
 Baruch Siach <baruch@tkos.co.il>
 Bassam Zaid AlKilani <bzalkilani@nvidia.com>
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 1afbc22d54..e40af1316d 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1048,6 +1048,4 @@ iavf_dev_stop(struct rte_eth_dev *dev)
 		return 0;
 
-	iavf_stop_queues(dev);
-
 	/* Disable the interrupt for Rx */
 	rte_intr_efd_disable(intr_handle);
@@ -1062,4 +1060,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)
 				  false);
 
+	iavf_stop_queues(dev);
+
 	adapter->stopped = 1;
 	dev->data->dev_started = 0;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.093677247 +0100
+++ 0003-net-iavf-fix-stop-ordering.patch	2023-07-21 14:33:59.001253204 +0100
@@ -1 +1 @@
-From 87b2afdea3aae6095aa80956ae2e15f602594185 Mon Sep 17 00:00:00 2001
+From 5a0e07583487a16021f43a1a740b26a925e5c656 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 670d312f84..9ce554451b 100644
+index 2b254e64ef..495f89e75d 100644
@@ -28 +29 @@
-@@ -152,4 +152,5 @@ Bar Neuman <bneuman@nvidia.com>
+@@ -145,4 +145,5 @@ Bao-Long Tran <longtb5@viettel.com.vn>
@@ -35 +36 @@
-index ac7154d720..f2fc5a5621 100644
+index 1afbc22d54..e40af1316d 100644
@@ -38 +39 @@
-@@ -1088,6 +1088,4 @@ iavf_dev_stop(struct rte_eth_dev *dev)
+@@ -1048,6 +1048,4 @@ iavf_dev_stop(struct rte_eth_dev *dev)
@@ -45 +46 @@
-@@ -1102,4 +1100,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)
+@@ -1062,4 +1060,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)

patch 'common/iavf: fix MAC type for 710 NIC' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From 68c3c764a31d27bdbbf0862b314aefbb56b2c17e Mon Sep 17 00:00:00 2001
From: Wenjing Qiao <wenjing.qiao@intel.com>
Date: Wed, 12 Jul 2023 07:38:13 +0000
Subject: [PATCH] common/iavf: fix MAC type for 710 NIC

[ upstream commit 03b7b90ac2bbda4eb0366898dd4284fb88310734 ]

Fix MAC type according to PCI ID list.

Fixes: eb385183edac ("net/iavf/base: update device IDs")

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

diff --git a/drivers/common/iavf/iavf_common.c b/drivers/common/iavf/iavf_common.c
index 855a0ab2f5..dc7662bc1b 100644
--- a/drivers/common/iavf/iavf_common.c
+++ b/drivers/common/iavf/iavf_common.c
@@ -28,4 +28,6 @@ enum iavf_status iavf_set_mac_type(struct iavf_hw *hw)
 		case IAVF_DEV_ID_VF:
 		case IAVF_DEV_ID_VF_HV:
+			hw->mac.type = IAVF_MAC_XL710;
+			break;
 		case IAVF_DEV_ID_ADAPTIVE_VF:
 			hw->mac.type = IAVF_MAC_VF;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.117274265 +0100
+++ 0004-common-iavf-fix-MAC-type-for-710-NIC.patch	2023-07-21 14:33:59.003253211 +0100
@@ -1 +1 @@
-From 03b7b90ac2bbda4eb0366898dd4284fb88310734 Mon Sep 17 00:00:00 2001
+From 68c3c764a31d27bdbbf0862b314aefbb56b2c17e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 03b7b90ac2bbda4eb0366898dd4284fb88310734 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

patch 'net/ixgbe: fix Rx and Tx queue status' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From a821b0298b6131989a1025269650b07c7dcb2fbe Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang@intel.com>
Date: Wed, 12 Jul 2023 08:31:51 +0000
Subject: [PATCH] net/ixgbe: fix Rx and Tx queue status

[ upstream commit 4a8490075692c32797be4280aea33772a5865038 ]

Ixgbevf driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.

Fixes: 429c6d86b371 ("ixgbe: prepare for vector pmd")
Fixes: f0c50e5f56fa ("ixgbe: move PMD specific fields out of base driver")

Signed-off-by: Qiming Yang <qiming.yang@intel.com>
Signed-off-by: Jie Hai <haijie1@huawei.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ixgbe/ixgbe_rxtx.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 12e8abcbef..c137707869 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -3381,4 +3381,5 @@ ixgbe_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;
 		}
 	}
@@ -3390,4 +3391,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
 			ixgbe_rx_queue_release_mbufs(rxq);
 			ixgbe_reset_rx_queue(adapter, rxq);
+			dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 		}
 	}
@@ -5827,4 +5829,6 @@ ixgbevf_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++) {
@@ -5844,4 +5848,6 @@ ixgbevf_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();
 		IXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), rxq->nb_rx_desc - 1);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.137776022 +0100
+++ 0005-net-ixgbe-fix-Rx-and-Tx-queue-status.patch	2023-07-21 14:33:59.010253237 +0100
@@ -1 +1 @@
-From 4a8490075692c32797be4280aea33772a5865038 Mon Sep 17 00:00:00 2001
+From a821b0298b6131989a1025269650b07c7dcb2fbe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4a8490075692c32797be4280aea33772a5865038 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 61f17cd90b..954ef241a0 100644
+index 12e8abcbef..c137707869 100644
@@ -27 +28 @@
-@@ -3379,4 +3379,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
+@@ -3381,4 +3381,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
@@ -33 +34 @@
-@@ -3388,4 +3389,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
+@@ -3390,4 +3391,5 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev)
@@ -39 +40 @@
-@@ -5897,4 +5899,6 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
+@@ -5827,4 +5829,6 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
@@ -46 +47 @@
-@@ -5914,4 +5918,6 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)
+@@ -5844,4 +5848,6 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)

patch 'net/igc: fix Rx and Tx queue status' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From 831bf81980d4b3eace7eca621e2f7e9b427a9a80 Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang@intel.com>
Date: Wed, 12 Jul 2023 08:31:52 +0000
Subject: [PATCH] net/igc: fix Rx and Tx queue status

[ upstream commit 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e ]

Igc driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.

Fixes: a5aeb2b9e225 ("net/igc: support Rx and Tx")

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

diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c
index ffd219b0df..160865e911 100644
--- a/drivers/net/igc/igc_txrx.c
+++ b/drivers/net/igc/igc_txrx.c
@@ -1292,4 +1292,5 @@ igc_rx_init(struct rte_eth_dev *dev)
 
 		IGC_WRITE_REG(hw, IGC_DVMOLR(rxq->reg_idx), dvmolr);
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	}
 
@@ -1935,4 +1936,5 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
 			igc_tx_queue_release_mbufs(txq);
 			igc_reset_tx_queue(txq);
+			dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 		}
 	}
@@ -1943,4 +1945,5 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
 			igc_rx_queue_release_mbufs(rxq);
 			igc_reset_rx_queue(rxq);
+			dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 		}
 	}
@@ -2188,4 +2191,5 @@ igc_tx_init(struct rte_eth_dev *dev)
 		txdctl |= IGC_TXDCTL_QUEUE_ENABLE;
 		IGC_WRITE_REG(hw, IGC_TXDCTL(txq->reg_idx), 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-07-21 14:33:59.162375541 +0100
+++ 0006-net-igc-fix-Rx-and-Tx-queue-status.patch	2023-07-21 14:33:59.012253244 +0100
@@ -1 +1 @@
-From 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e Mon Sep 17 00:00:00 2001
+From 831bf81980d4b3eace7eca621e2f7e9b427a9a80 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index c11b6f7f25..5c60e3e997 100644
+index ffd219b0df..160865e911 100644
@@ -26 +27 @@
-@@ -1216,4 +1216,5 @@ igc_rx_init(struct rte_eth_dev *dev)
+@@ -1292,4 +1292,5 @@ igc_rx_init(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -1889,4 +1890,5 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
+@@ -1935,4 +1936,5 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
@@ -38 +39 @@
-@@ -1897,4 +1899,5 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
+@@ -1943,4 +1945,5 @@ igc_dev_clear_queues(struct rte_eth_dev *dev)
@@ -44 +45 @@
-@@ -2144,4 +2147,5 @@ igc_tx_init(struct rte_eth_dev *dev)
+@@ -2188,4 +2191,5 @@ igc_tx_init(struct rte_eth_dev *dev)

patch 'net/e1000: fix Rx and Tx queue status' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From c7a2de80c152960684b5c7cc72b1967c0b036f6c Mon Sep 17 00:00:00 2001
From: Qiming Yang <qiming.yang@intel.com>
Date: Wed, 12 Jul 2023 08:31:53 +0000
Subject: [PATCH] net/e1000: fix Rx and Tx queue status

[ upstream commit b2a0271188f3428ad5dc1ea600e1e2254b9d6781 ]

Igb driver don't enable queue start/stop functions, queue status is not
updated when the HW queue enabled or disabled. It caused application can't
get correct queue status.
This patch fixes the issue by updating the queue states when the queue is
disabled or enabled.

Fixes: be2d648a2dd3 ("igb: add PF support")

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

diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index f32dee46df..1d23e081b6 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -1854,4 +1854,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
 			igb_tx_queue_release_mbufs(txq);
 			igb_reset_tx_queue(txq, dev);
+			dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 		}
 	}
@@ -1862,4 +1863,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
 			igb_rx_queue_release_mbufs(rxq);
 			igb_reset_rx_queue(rxq);
+			dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED;
 		}
 	}
@@ -2442,4 +2444,5 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
 		rxdctl |= ((rxq->wthresh & 0x1F) << 16);
 		E1000_WRITE_REG(hw, E1000_RXDCTL(rxq->reg_idx), rxdctl);
+		dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED;
 	}
 
@@ -2606,4 +2609,5 @@ eth_igb_tx_init(struct rte_eth_dev *dev)
 		txdctl |= E1000_TXDCTL_QUEUE_ENABLE;
 		E1000_WRITE_REG(hw, E1000_TXDCTL(txq->reg_idx), 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-07-21 14:33:59.184309758 +0100
+++ 0007-net-e1000-fix-Rx-and-Tx-queue-status.patch	2023-07-21 14:33:59.015253255 +0100
@@ -1 +1 @@
-From b2a0271188f3428ad5dc1ea600e1e2254b9d6781 Mon Sep 17 00:00:00 2001
+From c7a2de80c152960684b5c7cc72b1967c0b036f6c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b2a0271188f3428ad5dc1ea600e1e2254b9d6781 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 25ad9eb4e5..61c6394310 100644
+index f32dee46df..1d23e081b6 100644
@@ -26 +27 @@
-@@ -1855,4 +1855,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
+@@ -1854,4 +1854,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
@@ -32 +33 @@
-@@ -1863,4 +1864,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
+@@ -1862,4 +1863,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev)
@@ -38 +39 @@
-@@ -2443,4 +2445,5 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
+@@ -2442,4 +2444,5 @@ eth_igb_rx_init(struct rte_eth_dev *dev)
@@ -44 +45 @@
-@@ -2607,4 +2610,5 @@ eth_igb_tx_init(struct rte_eth_dev *dev)
+@@ -2606,4 +2609,5 @@ eth_igb_tx_init(struct rte_eth_dev *dev)

patch 'net/mlx5: fix drop action memory leak' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From bdcd4305c74e0870e8dca0b3928ea4ec5db69023 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@nvidia.com>
Date: Thu, 13 Jul 2023 14:19:41 +0300
Subject: [PATCH] net/mlx5: fix drop action memory leak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 177d90ddd6e0e223966c2fb8a55e036cfb47db7a ]

In DV mode, when quitting an application, the default drop action
and its resources should be released. The Devx action for the TIR
was not destroyed and it would cause 80B memory leak.

With this commit, in DV mode, the action should be destroyed in the
mlx5_devx_drop_action_destroy() explicitly.

Bugzilla ID: 1192
Bugzilla ID: 1255

Fixes: bc5bee028ebc ("net/mlx5: create drop queue using DevX")

Reported-by: David Marchand <david.marchand@redhat.com>
Reported-by: Mário Kuka <kuka@cesnet.cz>
Signed-off-by: Bing Zhao <bingz@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_devx.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 0d5de8303b..b59c5d81bd 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -1019,4 +1019,8 @@ mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev)
 	struct mlx5_hrxq *hrxq = priv->drop_queue.hrxq;
 
+#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
+	if (hrxq->action != NULL)
+		mlx5_flow_os_destroy_flow_action(hrxq->action);
+#endif
 	if (hrxq->tir != NULL)
 		mlx5_devx_tir_destroy(hrxq);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.206826566 +0100
+++ 0008-net-mlx5-fix-drop-action-memory-leak.patch	2023-07-21 14:33:59.016253259 +0100
@@ -1 +1 @@
-From 177d90ddd6e0e223966c2fb8a55e036cfb47db7a Mon Sep 17 00:00:00 2001
+From bdcd4305c74e0870e8dca0b3928ea4ec5db69023 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 177d90ddd6e0e223966c2fb8a55e036cfb47db7a ]
+
@@ -20 +21,0 @@
-Cc: stable@dpdk.org
@@ -31 +32 @@
-index d286cfe864..9fa400fc48 100644
+index 0d5de8303b..b59c5d81bd 100644
@@ -34 +35 @@
-@@ -1135,4 +1135,8 @@ mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev)
+@@ -1019,4 +1019,8 @@ mlx5_devx_drop_action_destroy(struct rte_eth_dev *dev)

patch 'net/mlx5: fix LRO TCP checksum' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From 2788848cca3e531f425e809ce9715cbe3d83f403 Mon Sep 17 00:00:00 2001
From: Heng Jiang <jiangheng14@huawei.com>
Date: Tue, 18 Jul 2023 11:56:13 +0300
Subject: [PATCH] net/mlx5: fix LRO TCP checksum

[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ]

The variable csum is the sum of three 16 bits integers, the max value
is 0x2FFFD. The corner case of sum of 3 is 0x1FFFF gives the wrong
result: 0x1 + 0xFFFF = 0x10000, the upper 16 bits are not 0.
It must be folded again to ensure that the upper 16 bits are 0.

Fixes: e4c2a16eb1de ("net/mlx5: handle LRO packets in Rx queue")

Signed-off-by: Heng Jiang <jiangheng14@huawei.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 .mailmap                   | 1 +
 drivers/net/mlx5/mlx5_rx.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 495f89e75d..7de8dbf81d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -483,4 +483,5 @@ Hemant Agrawal <hemant.agrawal@nxp.com> <hemant@freescale.com>
 Heng Ding <hengx.ding@intel.com>
 Hengjian Zhang <hengjianx.zhang@intel.com>
+Heng Jiang <jiangheng14@huawei.com>
 Heng Wang <heng.wang@ericsson.com>
 Henning Schild <henning.schild@siemens.com>
diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c
index d354862cff..ab88f2526f 100644
--- a/drivers/net/mlx5/mlx5_rx.c
+++ b/drivers/net/mlx5/mlx5_rx.c
@@ -1028,4 +1028,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
 	csum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4);
 	csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff);
+	csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff);
 	csum = (~csum) & 0xffff;
 	if (csum == 0)
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.228180227 +0100
+++ 0009-net-mlx5-fix-LRO-TCP-checksum.patch	2023-07-21 14:33:59.020253274 +0100
@@ -1 +1 @@
-From 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 Mon Sep 17 00:00:00 2001
+From 2788848cca3e531f425e809ce9715cbe3d83f403 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 9ce554451b..864d33ee46 100644
+index 495f89e75d..7de8dbf81d 100644
@@ -25 +26 @@
-@@ -497,4 +497,5 @@ Hemant Agrawal <hemant.agrawal@nxp.com> <hemant@freescale.com>
+@@ -483,4 +483,5 @@ Hemant Agrawal <hemant.agrawal@nxp.com> <hemant@freescale.com>
@@ -32 +33 @@
-index 71c4638251..392784050f 100644
+index d354862cff..ab88f2526f 100644
@@ -35 +36 @@
-@@ -1091,4 +1091,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
+@@ -1028,4 +1028,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,

patch 'net/mlx5: fix validation for conntrack indirect action' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From d0af29e47446713f2b00eff3881bdf84711a086f Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@nvidia.com>
Date: Tue, 18 Jul 2023 16:32:12 +0300
Subject: [PATCH] net/mlx5: fix validation for conntrack indirect action

[ upstream commit a9156d685fa1b8927f68606c69521c5eae3184a2 ]

After rte_flow_shared_action_* API was replaced with
rte_flow_action_handle_* API, one input parameter of the update
interface was also changed. A generic pointer was used instead of the
"const struct rte_flow_action *" pointer.

In the entrance of mlx5 PMD callback for update, the validation is
called for all indirect actions. But for conntrack type, the pointer
is no longer with rte_flow_action pointer type and it will cause an
incorrect casting and error.

The content for updating should only be validated when needed. It
should skip the validation in the entrance. Right now, the content
was already added before updating the hardware by WQE. So the type
of the indirect action should be checked before calling the action
validate function.

When creating a new conntrack object, the validation is still needed
since all the content will be used to update the hardware context.

Fixes: 4b61b8774be9 ("ethdev: introduce indirect flow action")

Signed-off-by: Bing Zhao <bingz@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 133dca5dcf..c11ccf91f6 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -8956,7 +8956,16 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,
 			flow_get_drv_ops(flow_get_drv_type(dev, &attr));
 	int ret;
+	uint32_t act_idx = (uint32_t)(uintptr_t)handle;
+	uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;
 
-	ret = flow_drv_action_validate(dev, NULL,
-			(const struct rte_flow_action *)update, fops, error);
+	switch (type) {
+	case MLX5_INDIRECT_ACTION_TYPE_CT:
+		ret = 0;
+		break;
+	default:
+		ret = flow_drv_action_validate(dev, NULL,
+				(const struct rte_flow_action *)update,
+				fops, error);
+	}
 	if (ret)
 		return ret;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.250351808 +0100
+++ 0010-net-mlx5-fix-validation-for-conntrack-indirect-actio.patch	2023-07-21 14:33:59.027253299 +0100
@@ -1 +1 @@
-From a9156d685fa1b8927f68606c69521c5eae3184a2 Mon Sep 17 00:00:00 2001
+From d0af29e47446713f2b00eff3881bdf84711a086f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a9156d685fa1b8927f68606c69521c5eae3184a2 ]
+
@@ -26 +27,0 @@
-Cc: stable@dpdk.org
@@ -35 +36 @@
-index 4b567f61dd..9bd92f28fd 100644
+index 133dca5dcf..c11ccf91f6 100644
@@ -38 +39 @@
-@@ -10754,7 +10754,16 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,
+@@ -8956,7 +8956,16 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,

patch 'doc: update BIOS settings and supported HW for NTB' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.5

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

Thanks.

Kevin

---
From f6a2ff27686d5c629ed85c9a7df8913a3f239975 Mon Sep 17 00:00:00 2001
From: Junfeng Guo <junfeng.guo@intel.com>
Date: Mon, 3 Jul 2023 17:24:34 +0800
Subject: [PATCH] doc: update BIOS settings and supported HW for NTB

[ upstream commit 00e57b0e550b7df2047e6d0bde8965c7ae17d203 ]

Update BIOS settings and supported platform list for Intel NTB.

Fixes: f5057be340e4 ("raw/ntb: support Intel Ice Lake")

Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
---
 doc/guides/rawdevs/ntb.rst | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/doc/guides/rawdevs/ntb.rst b/doc/guides/rawdevs/ntb.rst
index 2bb115d13f..f8befc6594 100644
--- a/doc/guides/rawdevs/ntb.rst
+++ b/doc/guides/rawdevs/ntb.rst
@@ -2,4 +2,6 @@
     Copyright(c) 2018 Intel Corporation.
 
+.. include:: <isonum.txt>
+
 NTB Rawdev Driver
 =================
@@ -18,17 +20,21 @@ BIOS setting on Intel Xeon
 --------------------------
 
-Intel Non-transparent Bridge needs special BIOS setting. The reference for
-Skylake is https://www.intel.com/content/dam/support/us/en/documents/server-products/Intel_Xeon_Processor_Scalable_Family_BIOS_User_Guide.pdf
-
-- Set the needed PCIe port as NTB to NTB mode on both hosts.
-- Enable NTB bars and set bar size of bar 23 and bar 45 as 12-29 (4K-512M)
-  on both hosts (for Ice Lake, bar size can be set as 12-51, namely 4K-128PB).
-  Note that bar size on both hosts should be the same.
-- Disable split bars for both hosts.
-- Set crosslink control override as DSD/USP on one host, USD/DSP on
-  another host.
-- Disable PCIe PII SSC (Spread Spectrum Clocking) for both hosts. This
-  is a hardware requirement.
+Intel Non-transparent Bridge (NTB) needs special BIOS settings on both systems.
+Note that for 4th Generation Intel\ |reg| Xeon\ |reg| Scalable Processors,
+option ``Port Subsystem Mode`` should be changed from ``Gen5`` to ``Gen4 Only``,
+then reboot.
 
+- Set ``Non-Transparent Bridge PCIe Port Definition`` for needed PCIe ports
+  as ``NTB to NTB`` mode, on both hosts.
+- Set ``Enable NTB BARs`` as ``Enabled``, on both hosts.
+- Set ``Enable SPLIT BARs`` as ``Disabled``, on both hosts.
+- Set ``Imbar1 Size``, ``Imbar2 Size``, ``Embar1 Size`` and ``Embar2 Size``,
+  as 12-29 (i.e., 4K-512M) for 2nd Generation Intel\ |reg| Xeon\ |reg| Scalable Processors;
+  as 12-51 (i.e., 4K-128PB) for 3rd and 4th Generation Intel\ |reg| Xeon\ |reg| Scalable Processors.
+  Note that those bar sizes on both hosts should be the same.
+- Set ``Crosslink Control override`` as ``DSD/USP`` on one host,
+  ``USD/DSP`` on another host.
+- Set ``PCIe PLL SSC (Spread Spectrum Clocking)`` as ``Disabled``, on both hosts.
+  This is a hardware requirement when using Re-timer Cards.
 
 Device Setup
@@ -146,3 +152,7 @@ Limitation
 ----------
 
-- This PMD only supports Intel Skylake and Ice Lake platforms.
+This PMD is only supported on Intel Xeon Platforms:
+
+- 4th Generation Intel® Xeon® Scalable Processors.
+- 3rd Generation Intel® Xeon® Scalable Processors.
+- 2nd Generation Intel® Xeon® Scalable Processors.
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-21 14:33:59.277928071 +0100
+++ 0011-doc-update-BIOS-settings-and-supported-HW-for-NTB.patch	2023-07-21 14:33:59.028253303 +0100
@@ -1 +1 @@
-From 00e57b0e550b7df2047e6d0bde8965c7ae17d203 Mon Sep 17 00:00:00 2001
+From f6a2ff27686d5c629ed85c9a7df8913a3f239975 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 00e57b0e550b7df2047e6d0bde8965c7ae17d203 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org