patch 'net/hns3: enable PFC for all user priorities' has been queued to stable release 21.11.7

patch 'net/hns3: enable PFC for all user priorities' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 5c731f2f53b8af0685f58c16dfe7fa1c9e1ab167 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Wed, 6 Mar 2024 17:20:47 +0800
Subject: [PATCH] net/hns3: enable PFC for all user priorities

[ upstream commit aae6989df36c105b917cf69975c075dfde2e6b84 ]

When user set TC number to 4 and enable PFC and ETS by dev_configure,
driver only enable user priority 0-3.
The packet with user priority 4-7 cannot trigger PFC frame.

Fix by enabling PFC for all user priorities.

By the way, the nb_tcs from user can never be 0 because of the ahead
check in driver. So remove this redundant code.

Fixes: 62e3ccc2b94c ("net/hns3: support flow control")

Signed-off-by: Jie Hai <haijie1@huawei.com>
---
 drivers/net/hns3/hns3_dcb.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index 1a156cca7e..89f8eda223 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -1511,5 +1511,4 @@ static int
 hns3_dcb_hw_configure(struct hns3_adapter *hns)
 {
-	struct rte_eth_dcb_rx_conf *dcb_rx_conf;
 	struct hns3_pf *pf = &hns->pf;
 	struct hns3_hw *hw = &hns->hw;
@@ -1531,10 +1530,6 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
 
 	if (hw->data->dev_conf.dcb_capability_en & RTE_ETH_DCB_PFC_SUPPORT) {
-		dcb_rx_conf = &hw->data->dev_conf.rx_adv_conf.dcb_rx_conf;
-		if (dcb_rx_conf->nb_tcs == 0)
-			hw->dcb_info.pfc_en = 1; /* tc0 only */
-		else
-			hw->dcb_info.pfc_en =
-			RTE_LEN2MASK((uint8_t)dcb_rx_conf->nb_tcs, uint8_t);
+		hw->dcb_info.pfc_en =
+			RTE_LEN2MASK((uint8_t)HNS3_MAX_USER_PRIO, uint8_t);
 
 		hw->dcb_info.hw_pfc_map =
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:33.799204264 +0100
+++ 0001-net-hns3-enable-PFC-for-all-user-priorities.patch	2024-04-04 10:49:33.687457571 +0100
@@ -1 +1 @@
-From aae6989df36c105b917cf69975c075dfde2e6b84 Mon Sep 17 00:00:00 2001
+From 5c731f2f53b8af0685f58c16dfe7fa1c9e1ab167 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit aae6989df36c105b917cf69975c075dfde2e6b84 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 2831d3dc62..915e4eb768 100644
+index 1a156cca7e..89f8eda223 100644
@@ -27 +28 @@
-@@ -1500,5 +1500,4 @@ static int
+@@ -1511,5 +1511,4 @@ static int
@@ -33 +34 @@
-@@ -1520,10 +1519,6 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
+@@ -1531,10 +1530,6 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)

patch 'doc: add traffic manager in features table' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 4a74870ae48480e826f9eebee4c8bbe7cb2c7118 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Tue, 28 Nov 2023 20:40:56 +0800
Subject: [PATCH] doc: add traffic manager in features table

[ upstream commit a905e821007e884355e01289bdc67c3548591fec ]

Add Traffic Manager feature.

Fixes: 5d109deffa87 ("ethdev: add traffic management API")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 doc/guides/nics/features.rst         | 13 +++++++++++++
 doc/guides/nics/features/cnxk.ini    |  1 +
 doc/guides/nics/features/default.ini |  1 +
 doc/guides/nics/features/dpaa2.ini   |  1 +
 doc/guides/nics/features/hns3.ini    |  1 +
 doc/guides/nics/features/i40e.ini    |  1 +
 doc/guides/nics/features/iavf.ini    |  3 ++-
 doc/guides/nics/features/ice.ini     |  1 +
 doc/guides/nics/features/ice_dcf.ini |  1 +
 doc/guides/nics/features/ipn3ke.ini  |  1 +
 doc/guides/nics/features/ixgbe.ini   |  1 +
 doc/guides/nics/features/mvpp2.ini   |  3 ++-
 doc/guides/nics/features/txgbe.ini   |  1 +
 13 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index dc268a19ff..a2e7dc5d28 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -712,4 +712,17 @@ Supports configuring per-queue stat counter mapping.
 
 
+.. _nic_features_traffic_manager:
+
+Traffic manager
+---------------
+
+Supports Traffic manager.
+
+* **[implements] rte_tm_ops**: ``capabilities_get``, ``shaper_profile_add``,
+  ``hierarchy_commit`` and so on.
+* **[related]    API**: ``rte_tm_capabilities_get()``, ``rte_tm_shaper_profile_add()``,
+  ``rte_tm_hierarchy_commit()`` and so on.
+
+
 .. _nic_features_fw_version:
 
diff --git a/doc/guides/nics/features/cnxk.ini b/doc/guides/nics/features/cnxk.ini
index 1623a1803e..9be71e713f 100644
--- a/doc/guides/nics/features/cnxk.ini
+++ b/doc/guides/nics/features/cnxk.ini
@@ -28,4 +28,5 @@ RSS key update       = Y
 RSS reta update      = Y
 Inner RSS            = Y
+Traffic manager      = Y
 Inline protocol      = Y
 Flow control         = Y
diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini
index 8bd849e96f..d6cd84e2f8 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -42,4 +42,5 @@ VLAN filter          =
 Flow control         =
 Rate limitation      =
+Traffic manager      =
 Inline crypto        =
 Inline protocol      =
diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini
index 09ce66c788..eaee07cf24 100644
--- a/doc/guides/nics/features/dpaa2.ini
+++ b/doc/guides/nics/features/dpaa2.ini
@@ -18,4 +18,5 @@ RSS hash             = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 VLAN offload         = Y
 L3 checksum offload  = Y
diff --git a/doc/guides/nics/features/hns3.ini b/doc/guides/nics/features/hns3.ini
index 338b4e6864..a20ece20e8 100644
--- a/doc/guides/nics/features/hns3.ini
+++ b/doc/guides/nics/features/hns3.ini
@@ -29,4 +29,5 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini
index 6e141de326..2e9ae57db6 100644
--- a/doc/guides/nics/features/i40e.ini
+++ b/doc/guides/nics/features/i40e.ini
@@ -28,4 +28,5 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/iavf.ini b/doc/guides/nics/features/iavf.ini
index 3860f283d5..0ff4a1c44a 100644
--- a/doc/guides/nics/features/iavf.ini
+++ b/doc/guides/nics/features/iavf.ini
@@ -21,4 +21,6 @@ RSS key update       = Y
 RSS reta update      = Y
 VLAN filter          = Y
+Traffic manager      = Y
+Inline crypto        = Y
 CRC offload          = Y
 VLAN offload         = P
@@ -28,5 +30,4 @@ Packet type parsing  = Y
 Rx descriptor status = Y
 Tx descriptor status = Y
-Inline crypto        = Y
 Basic stats          = Y
 Multiprocess aware   = Y
diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini
index 0d911590b7..a80401c82d 100644
--- a/doc/guides/nics/features/ice.ini
+++ b/doc/guides/nics/features/ice.ini
@@ -26,4 +26,5 @@ RSS key update       = Y
 RSS reta update      = Y
 VLAN filter          = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/ice_dcf.ini b/doc/guides/nics/features/ice_dcf.ini
index 54073f0b88..02bbbad069 100644
--- a/doc/guides/nics/features/ice_dcf.ini
+++ b/doc/guides/nics/features/ice_dcf.ini
@@ -16,4 +16,5 @@ L4 checksum offload  = P
 Inner L3 checksum    = P
 Inner L4 checksum    = P
+Traffic manager      = Y
 Basic stats          = Y
 Linux                = Y
diff --git a/doc/guides/nics/features/ipn3ke.ini b/doc/guides/nics/features/ipn3ke.ini
index 1f6b780273..e412978820 100644
--- a/doc/guides/nics/features/ipn3ke.ini
+++ b/doc/guides/nics/features/ipn3ke.ini
@@ -26,4 +26,5 @@ DCB                  = Y
 VLAN filter          = Y
 Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 VLAN offload         = Y
diff --git a/doc/guides/nics/features/ixgbe.ini b/doc/guides/nics/features/ixgbe.ini
index e5cef81f9a..dc11d1bddf 100644
--- a/doc/guides/nics/features/ixgbe.ini
+++ b/doc/guides/nics/features/ixgbe.ini
@@ -28,4 +28,5 @@ VLAN filter          = Y
 Flow control         = Y
 Rate limitation      = Y
+Traffic manager      = Y
 Inline crypto        = Y
 CRC offload          = P
diff --git a/doc/guides/nics/features/mvpp2.ini b/doc/guides/nics/features/mvpp2.ini
index 653c9d08cb..ccc2c2d4f8 100644
--- a/doc/guides/nics/features/mvpp2.ini
+++ b/doc/guides/nics/features/mvpp2.ini
@@ -13,6 +13,7 @@ Unicast MAC filter   = Y
 Multicast MAC filter = Y
 RSS hash             = Y
-Flow control         = Y
 VLAN filter          = Y
+Flow control         = Y
+Traffic manager      = Y
 CRC offload          = Y
 L3 checksum offload  = Y
diff --git a/doc/guides/nics/features/txgbe.ini b/doc/guides/nics/features/txgbe.ini
index 958f8ac793..796e7ff313 100644
--- a/doc/guides/nics/features/txgbe.ini
+++ b/doc/guides/nics/features/txgbe.ini
@@ -27,4 +27,5 @@ VLAN filter          = Y
 Flow control         = Y
 Rate limitation      = Y
+Traffic manager      = Y
 Inline crypto        = Y
 CRC offload          = P
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:33.872923565 +0100
+++ 0002-doc-add-traffic-manager-in-features-table.patch	2024-04-04 10:49:33.691457582 +0100
@@ -1 +1 @@
-From a905e821007e884355e01289bdc67c3548591fec Mon Sep 17 00:00:00 2001
+From 4a74870ae48480e826f9eebee4c8bbe7cb2c7118 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a905e821007e884355e01289bdc67c3548591fec ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -33 +34 @@
-index 38eba8742c..b4f7f1ee61 100644
+index dc268a19ff..a2e7dc5d28 100644
@@ -36 +37 @@
-@@ -763,4 +763,17 @@ Supports congestion management.
+@@ -712,4 +712,17 @@ Supports configuring per-queue stat counter mapping.
@@ -55 +56 @@
-index 1c8db1ad13..2de156c695 100644
+index 1623a1803e..9be71e713f 100644
@@ -58 +59,2 @@
-@@ -29,4 +29,5 @@ RSS reta update      = Y
+@@ -28,4 +28,5 @@ RSS key update       = Y
+ RSS reta update      = Y
@@ -60 +61,0 @@
- Congestion management = Y
@@ -65 +66 @@
-index e21725bdea..c06b6fea9a 100644
+index 8bd849e96f..d6cd84e2f8 100644
@@ -68 +69,2 @@
-@@ -43,4 +43,5 @@ Flow control         =
+@@ -42,4 +42,5 @@ VLAN filter          =
+ Flow control         =
@@ -70 +71,0 @@
- Congestion management =
@@ -75 +76 @@
-index 26dc8c2178..f02da463d9 100644
+index 09ce66c788..eaee07cf24 100644
@@ -95 +96 @@
-index e241dad047..2d168199f0 100644
+index 6e141de326..2e9ae57db6 100644
@@ -105 +106 @@
-index db4f92ce71..c59115ae15 100644
+index 3860f283d5..0ff4a1c44a 100644
@@ -108 +109 @@
-@@ -26,4 +26,6 @@ RSS key update       = Y
+@@ -21,4 +21,6 @@ RSS key update       = Y
@@ -115 +116 @@
-@@ -36,5 +38,4 @@ Packet type parsing  = Y
+@@ -28,5 +30,4 @@ Packet type parsing  = Y
@@ -122 +123 @@
-index 13f8871dcc..8febbc4f1e 100644
+index 0d911590b7..a80401c82d 100644
@@ -125 +126 @@
-@@ -27,4 +27,5 @@ RSS key update       = Y
+@@ -26,4 +26,5 @@ RSS key update       = Y
@@ -132 +133 @@
-index 3b11622d4c..0e86338990 100644
+index 54073f0b88..02bbbad069 100644
@@ -135,3 +136,3 @@
-@@ -23,4 +23,5 @@ Allmulticast mode    = Y
- Unicast MAC filter   = Y
- VLAN filter          = Y
+@@ -16,4 +16,5 @@ L4 checksum offload  = P
+ Inner L3 checksum    = P
+ Inner L4 checksum    = P
@@ -139,2 +140,2 @@
- VLAN offload         = Y
- Extended stats       = Y
+ Basic stats          = Y
+ Linux                = Y
@@ -152 +153 @@
-index 8590ac857f..f05fcec455 100644
+index e5cef81f9a..dc11d1bddf 100644
@@ -175 +176 @@
-index e21083052c..3a11fb2037 100644
+index 958f8ac793..796e7ff313 100644

patch 'doc: add link speeds configuration in features table' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From b063b49cf44f6766d30349fc3dbda8ff5c7ef388 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Tue, 28 Nov 2023 21:00:05 +0800
Subject: [PATCH] doc: add link speeds configuration in features table

[ upstream commit 79758d40007c56231fce3cf1004ae5168616b3aa ]

Add features for link speeds.

Fixes: 82113036e4e5 ("ethdev: redesign link speed config")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 doc/guides/nics/features.rst          | 11 +++++++++++
 doc/guides/nics/features/atlantic.ini |  1 +
 doc/guides/nics/features/bnxt.ini     |  1 +
 doc/guides/nics/features/default.ini  |  1 +
 doc/guides/nics/features/dpaa.ini     |  1 +
 doc/guides/nics/features/hns3.ini     |  1 +
 doc/guides/nics/features/i40e.ini     |  1 +
 doc/guides/nics/features/ice.ini      |  1 +
 doc/guides/nics/features/igb.ini      |  1 +
 doc/guides/nics/features/igc.ini      |  1 +
 doc/guides/nics/features/ionic.ini    |  1 +
 doc/guides/nics/features/ixgbe.ini    |  1 +
 doc/guides/nics/features/ngbe.ini     |  1 +
 doc/guides/nics/features/octeontx.ini |  1 +
 doc/guides/nics/features/sfc.ini      |  1 +
 doc/guides/nics/features/thunderx.ini |  1 +
 doc/guides/nics/features/txgbe.ini    |  1 +
 17 files changed, 27 insertions(+)

diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst
index a2e7dc5d28..841f3704b1 100644
--- a/doc/guides/nics/features.rst
+++ b/doc/guides/nics/features.rst
@@ -35,4 +35,15 @@ Supports getting the speed capabilities that the current device is capable of.
 
 
+.. _nic_features_link_speeds_config:
+
+Link speed configuration
+------------------------
+
+Supports configurating fixed speed and link autonegotiation.
+
+* **[uses]     user config**: ``dev_conf.link_speeds:RTE_ETH_LINK_SPEED_*``.
+* **[related]  API**: ``rte_eth_dev_configure()``.
+
+
 .. _nic_features_link_status:
 
diff --git a/doc/guides/nics/features/atlantic.ini b/doc/guides/nics/features/atlantic.ini
index ef4155027c..29969c1493 100644
--- a/doc/guides/nics/features/atlantic.ini
+++ b/doc/guides/nics/features/atlantic.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/bnxt.ini b/doc/guides/nics/features/bnxt.ini
index ac682c5779..60b6da6d15 100644
--- a/doc/guides/nics/features/bnxt.ini
+++ b/doc/guides/nics/features/bnxt.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini
index d6cd84e2f8..465d579080 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -9,4 +9,5 @@
 [Features]
 Speed capabilities   =
+Link speed configuration =
 Link status          =
 Link status event    =
diff --git a/doc/guides/nics/features/dpaa.ini b/doc/guides/nics/features/dpaa.ini
index a382c7160c..b136ed191a 100644
--- a/doc/guides/nics/features/dpaa.ini
+++ b/doc/guides/nics/features/dpaa.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/hns3.ini b/doc/guides/nics/features/hns3.ini
index a20ece20e8..8b623d3077 100644
--- a/doc/guides/nics/features/hns3.ini
+++ b/doc/guides/nics/features/hns3.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini
index 2e9ae57db6..32a76919f7 100644
--- a/doc/guides/nics/features/i40e.ini
+++ b/doc/guides/nics/features/i40e.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini
index a80401c82d..3542f3f64a 100644
--- a/doc/guides/nics/features/ice.ini
+++ b/doc/guides/nics/features/ice.ini
@@ -9,4 +9,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/igb.ini b/doc/guides/nics/features/igb.ini
index 7b4af6f86c..ee2408f3ee 100644
--- a/doc/guides/nics/features/igb.ini
+++ b/doc/guides/nics/features/igb.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = P
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/igc.ini b/doc/guides/nics/features/igc.ini
index b5deea3f61..a43b8eaefd 100644
--- a/doc/guides/nics/features/igc.ini
+++ b/doc/guides/nics/features/igc.ini
@@ -5,4 +5,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/ionic.ini b/doc/guides/nics/features/ionic.ini
index 5bd18e39e9..a46874ad89 100644
--- a/doc/guides/nics/features/ionic.ini
+++ b/doc/guides/nics/features/ionic.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/ixgbe.ini b/doc/guides/nics/features/ixgbe.ini
index dc11d1bddf..55deaadc62 100644
--- a/doc/guides/nics/features/ixgbe.ini
+++ b/doc/guides/nics/features/ixgbe.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/ngbe.ini b/doc/guides/nics/features/ngbe.ini
index 2701c5f051..1dfd92e96b 100644
--- a/doc/guides/nics/features/ngbe.ini
+++ b/doc/guides/nics/features/ngbe.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/octeontx.ini b/doc/guides/nics/features/octeontx.ini
index 78fa7c719a..3165e41a21 100644
--- a/doc/guides/nics/features/octeontx.ini
+++ b/doc/guides/nics/features/octeontx.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/sfc.ini b/doc/guides/nics/features/sfc.ini
index 2e798b5ef5..3ae479223a 100644
--- a/doc/guides/nics/features/sfc.ini
+++ b/doc/guides/nics/features/sfc.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/thunderx.ini b/doc/guides/nics/features/thunderx.ini
index b33bb37c82..2ab8db7239 100644
--- a/doc/guides/nics/features/thunderx.ini
+++ b/doc/guides/nics/features/thunderx.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
diff --git a/doc/guides/nics/features/txgbe.ini b/doc/guides/nics/features/txgbe.ini
index 796e7ff313..a09bed5c84 100644
--- a/doc/guides/nics/features/txgbe.ini
+++ b/doc/guides/nics/features/txgbe.ini
@@ -6,4 +6,5 @@
 [Features]
 Speed capabilities   = Y
+Link speed configuration = Y
 Link status          = Y
 Link status event    = Y
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:33.925365738 +0100
+++ 0003-doc-add-link-speeds-configuration-in-features-table.patch	2024-04-04 10:49:33.695457592 +0100
@@ -1 +1 @@
-From 79758d40007c56231fce3cf1004ae5168616b3aa Mon Sep 17 00:00:00 2001
+From b063b49cf44f6766d30349fc3dbda8ff5c7ef388 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 79758d40007c56231fce3cf1004ae5168616b3aa ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -35 +36 @@
-index b4f7f1ee61..cd0115ffb3 100644
+index a2e7dc5d28..841f3704b1 100644
@@ -65 +66 @@
-index bd4e2295dc..c33889663d 100644
+index ac682c5779..60b6da6d15 100644
@@ -75 +76 @@
-index c06b6fea9a..1e9a156a2a 100644
+index d6cd84e2f8..465d579080 100644
@@ -105 +106 @@
-index 2d168199f0..ef7514c44b 100644
+index 2e9ae57db6..32a76919f7 100644
@@ -115 +116 @@
-index 8febbc4f1e..62869ef0a0 100644
+index a80401c82d..3542f3f64a 100644
@@ -135 +136 @@
-index 47d9344435..d6db18c1e8 100644
+index b5deea3f61..a43b8eaefd 100644
@@ -145 +146 @@
-index af0fc5462a..64b2316288 100644
+index 5bd18e39e9..a46874ad89 100644
@@ -155 +156 @@
-index f05fcec455..cb9331dbcd 100644
+index dc11d1bddf..55deaadc62 100644
@@ -175 +176 @@
-index fa1e18b120..46ae8318a9 100644
+index 78fa7c719a..3165e41a21 100644
@@ -185 +186 @@
-index 8a9198adcb..f9654e69ed 100644
+index 2e798b5ef5..3ae479223a 100644
@@ -205 +206 @@
-index 3a11fb2037..be0af3dfad 100644
+index 796e7ff313..a09bed5c84 100644

patch 'net/ena/base: limit exponential backoff' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From cb98b1b26d3f886fdec0ca5fc0e2cdc471490c3d Mon Sep 17 00:00:00 2001
From: Shai Brandes <shaibran@amazon.com>
Date: Tue, 12 Mar 2024 20:06:52 +0200
Subject: [PATCH] net/ena/base: limit exponential backoff

[ upstream commit 4b378679c88ff231b97b71aaedc2d424e82f1aba ]

Limit the value of the exponent used for this backoff
at (1<<16) to prevent it from reaching to an excessive
value (1<<32) or potentially even overflowing.
In addition, for uniformity and readability purposes,
the min/max parameter in the calls of ENA_MIN32 and
ENA_MAX32 macros was changed to be first.

Fixes: 0c84e04824db ("net/ena/base: make delay exponential in polling functions")

Signed-off-by: Shai Brandes <shaibran@amazon.com>
Reviewed-by: Amit Bernstein <amitbern@amazon.com>
---
 drivers/net/ena/base/ena_com.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 5ca36ab6d9..4bd85f29f5 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -35,4 +35,6 @@
 #define ENA_REGS_ADMIN_INTR_MASK 1
 
+#define ENA_MAX_BACKOFF_DELAY_EXP 16U
+
 #define ENA_MIN_ADMIN_POLL_US 100
 
@@ -540,6 +542,7 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,
 static void ena_delay_exponential_backoff_us(u32 exp, u32 delay_us)
 {
+	exp = ENA_MIN32(ENA_MAX_BACKOFF_DELAY_EXP, exp);
 	delay_us = ENA_MAX32(ENA_MIN_ADMIN_POLL_US, delay_us);
-	delay_us = ENA_MIN32(delay_us * (1U << exp), ENA_MAX_ADMIN_POLL_US);
+	delay_us = ENA_MIN32(ENA_MAX_ADMIN_POLL_US, delay_us * (1U << exp));
 	ENA_USLEEP(delay_us);
 }
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:33.979250354 +0100
+++ 0004-net-ena-base-limit-exponential-backoff.patch	2024-04-04 10:49:33.698457600 +0100
@@ -1 +1 @@
-From 4b378679c88ff231b97b71aaedc2d424e82f1aba Mon Sep 17 00:00:00 2001
+From cb98b1b26d3f886fdec0ca5fc0e2cdc471490c3d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4b378679c88ff231b97b71aaedc2d424e82f1aba ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 6953a1fa33..31c37b0ab3 100644
+index 5ca36ab6d9..4bd85f29f5 100644
@@ -33 +34 @@
-@@ -546,6 +548,7 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,
+@@ -540,6 +542,7 @@ static int ena_com_comp_status_to_errno(struct ena_com_admin_queue *admin_queue,

patch 'net/ena/base: restructure interrupt handling' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 4db5876a5eb477cb22b4cca81e008b6e3db8183f Mon Sep 17 00:00:00 2001
From: Shai Brandes <shaibran@amazon.com>
Date: Tue, 12 Mar 2024 20:07:00 +0200
Subject: [PATCH] net/ena/base: restructure interrupt handling

[ upstream commit 553653ccc18c1ed9fb0406e1b0130e945d5ab30f ]

When invoking an admin command, in interrupt mode, if the interrupt
is received after timeout and also after the calling function finished
running, the response will be written into a memory that is no longer
valid.

Fixes: 99ecfbf845b3 ("ena: import communication layer")

Signed-off-by: Shai Brandes <shaibran@amazon.com>
Reviewed-by: Amit Bernstein <amitbern@amazon.com>
---
 drivers/net/ena/base/ena_com.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 4bd85f29f5..98035f3cd4 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -174,4 +174,5 @@ static void comp_ctxt_release(struct ena_com_admin_queue *queue,
 				     struct ena_comp_ctx *comp_ctx)
 {
+	comp_ctx->user_cqe = NULL;
 	comp_ctx->occupied = false;
 	ATOMIC32_DEC(&queue->outstanding_cmds);
@@ -467,4 +468,7 @@ static void ena_com_handle_single_admin_completion(struct ena_com_admin_queue *a
 	}
 
+	if (!comp_ctx->occupied)
+		return;
+
 	comp_ctx->status = ENA_CMD_COMPLETED;
 	comp_ctx->comp_status = cqe->acq_common_descriptor.status;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.032128733 +0100
+++ 0005-net-ena-base-restructure-interrupt-handling.patch	2024-04-04 10:49:33.699457603 +0100
@@ -1 +1 @@
-From 553653ccc18c1ed9fb0406e1b0130e945d5ab30f Mon Sep 17 00:00:00 2001
+From 4db5876a5eb477cb22b4cca81e008b6e3db8183f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 553653ccc18c1ed9fb0406e1b0130e945d5ab30f ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index fb3ad27d0a..a0c88b1a0e 100644
+index 4bd85f29f5..98035f3cd4 100644
@@ -24 +25 @@
-@@ -182,4 +182,5 @@ static void comp_ctxt_release(struct ena_com_admin_queue *queue,
+@@ -174,4 +174,5 @@ static void comp_ctxt_release(struct ena_com_admin_queue *queue,
@@ -30 +31 @@
-@@ -475,4 +476,7 @@ static void ena_com_handle_single_admin_completion(struct ena_com_admin_queue *a
+@@ -467,4 +468,7 @@ static void ena_com_handle_single_admin_completion(struct ena_com_admin_queue *a

patch 'app/testpmd: fix --stats-period option check' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 300a10e4d36f89d0064cc128e920592b51c7d334 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Thu, 14 Mar 2024 10:17:02 +0100
Subject: [PATCH] app/testpmd: fix --stats-period option check

[ upstream commit 2ae06c579ea4e1cd234c5b14bef2957ee154ec74 ]

Rather than silently ignore an invalid value, raise an error for
stats-period user input.

Fixes: cfea1f3048d1 ("app/testpmd: print statistics periodically")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 app/test-pmd/parameters.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 79ba728f69..a6a4bf80f3 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -769,5 +769,5 @@ launch_args_parse(int argc, char** argv)
 				if ((optarg[0] == '\0') || (end == NULL) ||
 						(*end != '\0'))
-					break;
+					rte_exit(EXIT_FAILURE, "Invalid stats-period value\n");
 
 				stats_period = n;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.084022513 +0100
+++ 0006-app-testpmd-fix-stats-period-option-check.patch	2024-04-04 10:49:33.701457608 +0100
@@ -1 +1 @@
-From 2ae06c579ea4e1cd234c5b14bef2957ee154ec74 Mon Sep 17 00:00:00 2001
+From 300a10e4d36f89d0064cc128e920592b51c7d334 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2ae06c579ea4e1cd234c5b14bef2957ee154ec74 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 11b0cce577..d715750bb8 100644
+index 79ba728f69..a6a4bf80f3 100644
@@ -22 +23 @@
-@@ -777,5 +777,5 @@ launch_args_parse(int argc, char** argv)
+@@ -769,5 +769,5 @@ launch_args_parse(int argc, char** argv)

patch 'net/hns3: support new device' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 95826daab3c1f4210dc15790178d10a3068bd0c5 Mon Sep 17 00:00:00 2001
From: Jie Hai <haijie1@huawei.com>
Date: Fri, 15 Mar 2024 10:54:48 +0800
Subject: [PATCH] net/hns3: support new device

[ upstream commit 3f1436d7006c2659232305ef2b8b186796319041 ]

This patch introduces the new devices, which are on-chip network
interface controllers with RDMA/DCB/ROH supporting. One is 100GE
and the other is 200GE. Both can be found on HIP09/HIP10 SoCs.

Signed-off-by: Jie Hai <haijie1@huawei.com>
---
 doc/guides/nics/hns3.rst       | 2 +-
 drivers/net/hns3/hns3_cmd.c    | 4 +++-
 drivers/net/hns3/hns3_ethdev.c | 2 ++
 drivers/net/hns3/hns3_ethdev.h | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
index 380024600b..836a91f86e 100644
--- a/doc/guides/nics/hns3.rst
+++ b/doc/guides/nics/hns3.rst
@@ -7,5 +7,5 @@ HNS3 Poll Mode Driver
 The hns3 PMD (**librte_net_hns3**) provides poll mode driver support
 for the inbuilt HiSilicon Network Subsystem(HNS) network engine
-found in the HiSilicon Kunpeng 920 SoC and Kunpeng 930 SoC .
+found in the HiSilicon Kunpeng 920 SoC (HIP08) and Kunpeng 930 SoC (HIP09/HIP10).
 
 Features
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index 9ca2c0cbb9..924ac0cae3 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -544,5 +544,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
 	    device_id == HNS3_DEV_ID_50GE_RDMA ||
 	    device_id == HNS3_DEV_ID_100G_RDMA_MACSEC ||
-	    device_id == HNS3_DEV_ID_200G_RDMA)
+	    device_id == HNS3_DEV_ID_200G_RDMA ||
+	    device_id == HNS3_DEV_ID_100G_ROH ||
+	    device_id == HNS3_DEV_ID_200G_ROH)
 		hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_DCB_B, 1);
 }
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 4f60b83b3a..56af4a5ddd 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -6714,4 +6714,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_RDMA_MACSEC) },
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_RDMA) },
+	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_100G_ROH) },
+	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_HUAWEI, HNS3_DEV_ID_200G_ROH) },
 	{ .vendor_id = 0, }, /* sentinel */
 };
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 5ba9503bf8..4476251d7d 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -29,5 +29,7 @@
 #define HNS3_DEV_ID_50GE_RDMA			0xA224
 #define HNS3_DEV_ID_100G_RDMA_MACSEC		0xA226
+#define HNS3_DEV_ID_100G_ROH	                0xA227
 #define HNS3_DEV_ID_200G_RDMA			0xA228
+#define HNS3_DEV_ID_200G_ROH	                0xA22C
 #define HNS3_DEV_ID_100G_VF			0xA22E
 #define HNS3_DEV_ID_100G_RDMA_PFC_VF		0xA22F
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.133927089 +0100
+++ 0007-net-hns3-support-new-device.patch	2024-04-04 10:49:33.711457635 +0100
@@ -1 +1 @@
-From 3f1436d7006c2659232305ef2b8b186796319041 Mon Sep 17 00:00:00 2001
+From 95826daab3c1f4210dc15790178d10a3068bd0c5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3f1436d7006c2659232305ef2b8b186796319041 ]
+
@@ -10,2 +11,0 @@
-Cc: stable@dpdk.org
-
@@ -14,6 +14,5 @@
- doc/guides/nics/hns3.rst               | 2 +-
- doc/guides/rel_notes/release_24_03.rst | 4 ++++
- drivers/net/hns3/hns3_cmd.c            | 4 +++-
- drivers/net/hns3/hns3_ethdev.c         | 2 ++
- drivers/net/hns3/hns3_ethdev.h         | 2 ++
- 5 files changed, 12 insertions(+), 2 deletions(-)
+ doc/guides/nics/hns3.rst       | 2 +-
+ drivers/net/hns3/hns3_cmd.c    | 4 +++-
+ drivers/net/hns3/hns3_ethdev.c | 2 ++
+ drivers/net/hns3/hns3_ethdev.h | 2 ++
+ 4 files changed, 8 insertions(+), 2 deletions(-)
@@ -22 +21 @@
-index 3b0613fc1b..3e84d1ff1c 100644
+index 380024600b..836a91f86e 100644
@@ -32,13 +30,0 @@
-diff --git a/doc/guides/rel_notes/release_24_03.rst b/doc/guides/rel_notes/release_24_03.rst
-index 8e809456aa..14826ea08f 100644
---- a/doc/guides/rel_notes/release_24_03.rst
-+++ b/doc/guides/rel_notes/release_24_03.rst
-@@ -124,4 +124,8 @@ New Features
-   * Added support for 5760X device family.
- 
-+* **Updated HiSilicon hns3 ethdev driver.**
-+
-+  * Added new device supporting RDMA/DCB/ROH with PCI IDs: ``0xa227, 0xa22c``.
-+
- * **Updated Marvell cnxk net driver.**
- 
@@ -46 +32 @@
-index 2c1664485b..001ff49b36 100644
+index 9ca2c0cbb9..924ac0cae3 100644
@@ -49 +35 @@
-@@ -546,5 +546,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
+@@ -544,5 +544,7 @@ hns3_set_dcb_capability(struct hns3_hw *hw)
@@ -59 +45 @@
-index b10d1216d2..9730b9a7e9 100644
+index 4f60b83b3a..56af4a5ddd 100644
@@ -62 +48 @@
-@@ -6650,4 +6650,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
+@@ -6714,4 +6714,6 @@ static const struct rte_pci_id pci_id_hns3_map[] = {
@@ -70 +56 @@
-index 12d8299def..e70c5fff2a 100644
+index 5ba9503bf8..4476251d7d 100644

patch 'doc: update link to Windows DevX in mlx5 guide' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 123f0bcf24e70e5b9cf93375b1c513e8aafc479e Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu@nvidia.com>
Date: Thu, 29 Feb 2024 18:45:26 +0200
Subject: [PATCH] doc: update link to Windows DevX in mlx5 guide

[ upstream commit 5ddc8269192ca7aeec0bf903704c0385ebbd9e87 ]

The older link no longer works.

Signed-off-by: Ali Alnubani <alialnu@nvidia.com>
Acked-by: Tal Shnaiderman <talshn@nvidia.com>
---
 doc/guides/nics/mlx5.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index e2fb45b1db..95bafa230d 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -1426,5 +1426,5 @@ The DevX SDK must be installed on the machine building the Windows PMD.
 Additional information can be found at
 `How to Integrate Windows DevX in Your Development Environment
-<https://docs.mellanox.com/display/winof2v250/RShim+Drivers+and+Usage#RShimDriversandUsage-DevXInterface>`__.
+<https://docs.nvidia.com/networking/display/winof2v290/devx+interface>`_.
 
 Runtime Prerequisites
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.182297107 +0100
+++ 0008-doc-update-link-to-Windows-DevX-in-mlx5-guide.patch	2024-04-04 10:49:33.714457643 +0100
@@ -1 +1 @@
-From 5ddc8269192ca7aeec0bf903704c0385ebbd9e87 Mon Sep 17 00:00:00 2001
+From 123f0bcf24e70e5b9cf93375b1c513e8aafc479e Mon Sep 17 00:00:00 2001
@@ -6 +6 @@
-The older link no longer works.
+[ upstream commit 5ddc8269192ca7aeec0bf903704c0385ebbd9e87 ]
@@ -8 +8 @@
-Cc: stable@dpdk.org
+The older link no longer works.
@@ -13 +13 @@
- doc/guides/platform/mlx5.rst | 2 +-
+ doc/guides/nics/mlx5.rst | 2 +-
@@ -16,5 +16,5 @@
-diff --git a/doc/guides/platform/mlx5.rst b/doc/guides/platform/mlx5.rst
-index a66cf778d1..e9a1f52aca 100644
---- a/doc/guides/platform/mlx5.rst
-+++ b/doc/guides/platform/mlx5.rst
-@@ -231,5 +231,5 @@ The DevX SDK must be installed on the machine building the Windows PMD.
+diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
+index e2fb45b1db..95bafa230d 100644
+--- a/doc/guides/nics/mlx5.rst
++++ b/doc/guides/nics/mlx5.rst
+@@ -1426,5 +1426,5 @@ The DevX SDK must be installed on the machine building the Windows PMD.
@@ -23 +23 @@
--<https://docs.nvidia.com/networking/display/winof2v260/RShim+Drivers+and+Usage#RShimDriversandUsage-DevXInterface>`_.
+-<https://docs.mellanox.com/display/winof2v250/RShim+Drivers+and+Usage#RShimDriversandUsage-DevXInterface>`__.
@@ -25 +24,0 @@
- The minimal supported WinOF2 version is 2.60.
@@ -26,0 +26 @@
+ Runtime Prerequisites

patch 'net/mlx5: prevent ioctl failure log flooding' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From eadfb0fbb89359dcd3e846ab88a6988a1c69f61d Mon Sep 17 00:00:00 2001
From: Eli Britstein <elibr@nvidia.com>
Date: Thu, 7 Mar 2024 08:13:45 +0200
Subject: [PATCH] net/mlx5: prevent ioctl failure log flooding

[ upstream commit 84ba1440c5dff8d716c1a2643aa3eb5e806619ff ]

The following log is printed in WARNING severity:

mlx5_net: port 1 ioctl(SIOCETHTOOL, ETHTOOL_GPAUSEPARAM) failed:
    Operation not supported

Reduce the severity to DEBUG to prevent this log from flooding
when there are hundreds of ports probed without supporting this
flow ctrl query.

Fixes: 1256805dd54d ("net/mlx5: move Linux-specific functions")

Signed-off-by: Eli Britstein <elibr@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/linux/mlx5_ethdev_os.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/linux/mlx5_ethdev_os.c b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
index 5d73076cb3..a181a19f29 100644
--- a/drivers/net/mlx5/linux/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/linux/mlx5_ethdev_os.c
@@ -671,5 +671,5 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 	ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
 	if (ret) {
-		DRV_LOG(WARNING,
+		DRV_LOG(DEBUG,
 			"port %u ioctl(SIOCETHTOOL, ETHTOOL_GPAUSEPARAM) failed:"
 			" %s",
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.215740322 +0100
+++ 0009-net-mlx5-prevent-ioctl-failure-log-flooding.patch	2024-04-04 10:49:33.716457648 +0100
@@ -1 +1 @@
-From 84ba1440c5dff8d716c1a2643aa3eb5e806619ff Mon Sep 17 00:00:00 2001
+From eadfb0fbb89359dcd3e846ab88a6988a1c69f61d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 84ba1440c5dff8d716c1a2643aa3eb5e806619ff ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index e1bc3f7c2e..1f511d6e00 100644
+index 5d73076cb3..a181a19f29 100644
@@ -28 +29 @@
-@@ -672,5 +672,5 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+@@ -671,5 +671,5 @@ mlx5_dev_get_flow_ctrl(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)

patch 'net/mlx5: fix age position in hairpin split' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 165b252b21bdc04bbaac67f4ad76e36f9e16cfce Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@nvidia.com>
Date: Thu, 7 Mar 2024 10:09:24 +0200
Subject: [PATCH] net/mlx5: fix age position in hairpin split

[ upstream commit 4c89815eab7471b98388dc958b95777d341f05fc ]

When splitting a hairpin rule implicitly, the count action will
be on either Tx or Rx subflow based on the encapsulation checking.

Once there is a flow rule with both count and age action, one counter
will be reused. If there is only age action and the ASO flow hit is
supported, the flow hit will be chosen instead of a counter.

In the previous flow splitting, the age would always be in the Rx
part, while the count would be on the Tx part when there is an encap.

Before this commit, 2 issues can be observed with a hairpin split:
  1. On the root table, one counter was used on both Rx and Tx parts
     for age and count actions. Then one ingress packet will be
     counted twice.
  2. On the non-root table, an extra ASO flow hit was used on the Rx
     part. This would cause some overhead.

The age and count actions should be in the same subflow instead of 2.

Fixes: daed4b6e3db2 ("net/mlx5: use aging by counter when counter exists")

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

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 6399d93b93..533cc13f2a 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4760,4 +4760,5 @@ flow_hairpin_split(struct rte_eth_dev *dev,
 			break;
 		case RTE_FLOW_ACTION_TYPE_COUNT:
+		case RTE_FLOW_ACTION_TYPE_AGE:
 			if (encap) {
 				rte_memcpy(actions_tx, actions,
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index e3132995a3..1bf9517638 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -17682,6 +17682,5 @@ flow_dv_get_aged_flows(struct rte_eth_dev *dev,
 		nb_flows++;
 		if (nb_contexts) {
-			context[nb_flows - 1] =
-						act->age_params.context;
+			context[nb_flows - 1] = act->age_params.context;
 			if (!(--nb_contexts))
 				break;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.249701898 +0100
+++ 0010-net-mlx5-fix-age-position-in-hairpin-split.patch	2024-04-04 10:49:33.737457703 +0100
@@ -1 +1 @@
-From 4c89815eab7471b98388dc958b95777d341f05fc Mon Sep 17 00:00:00 2001
+From 165b252b21bdc04bbaac67f4ad76e36f9e16cfce Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4c89815eab7471b98388dc958b95777d341f05fc ]
+
@@ -26 +27,0 @@
-Cc: stable@dpdk.org
@@ -36 +37 @@
-index 6484874c35..f31fdfbf3d 100644
+index 6399d93b93..533cc13f2a 100644
@@ -39 +40 @@
-@@ -5400,4 +5400,5 @@ flow_hairpin_split(struct rte_eth_dev *dev,
+@@ -4760,4 +4760,5 @@ flow_hairpin_split(struct rte_eth_dev *dev,
@@ -46 +47 @@
-index 80239bebee..4badde1a9a 100644
+index e3132995a3..1bf9517638 100644
@@ -49 +50 @@
-@@ -19362,6 +19362,5 @@ flow_dv_get_aged_flows(struct rte_eth_dev *dev,
+@@ -17682,6 +17682,5 @@ flow_dv_get_aged_flows(struct rte_eth_dev *dev,

patch 'net/mlx5: fix drop action release timing' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 61aa88de549503b234bb05ceab42fe3b698b1f69 Mon Sep 17 00:00:00 2001
From: Bing Zhao <bingz@nvidia.com>
Date: Fri, 8 Mar 2024 05:22:37 +0200
Subject: [PATCH] net/mlx5: fix drop action release timing

[ upstream commit 22a3761b782b7c46ca428209b15b4f7382a40a62 ]

When creating the drop action Devx object, the global counter set
is also used as in the regular or hairpin queue creation.

The drop action should be destroyed before the global counter set
release procedure. Or else, the counter set object is still
referenced and cannot be released successfully. This would cause
the counter set resources to be exhausted after starting and stopping
the ports repeatedly.

Fixes: 65b3cd0dc39b ("net/mlx5: create global drop action")

Signed-off-by: Bing Zhao <bingz@nvidia.com>
Acked-by: Suanming Mou <suanmingm@nvidia.com>
---
 drivers/net/mlx5/mlx5.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 9fc34f05e2..b339ccce84 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1606,10 +1606,10 @@ mlx5_dev_close(struct rte_eth_dev *dev)
 	}
 	mlx5_proc_priv_uninit(dev);
+	if (priv->drop_queue.hrxq)
+		mlx5_drop_action_destroy(dev);
 	if (priv->q_counters) {
 		mlx5_devx_cmd_destroy(priv->q_counters);
 		priv->q_counters = NULL;
 	}
-	if (priv->drop_queue.hrxq)
-		mlx5_drop_action_destroy(dev);
 	if (priv->mreg_cp_tbl)
 		mlx5_hlist_destroy(priv->mreg_cp_tbl);
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.297375830 +0100
+++ 0011-net-mlx5-fix-drop-action-release-timing.patch	2024-04-04 10:49:33.739457709 +0100
@@ -1 +1 @@
-From 22a3761b782b7c46ca428209b15b4f7382a40a62 Mon Sep 17 00:00:00 2001
+From 61aa88de549503b234bb05ceab42fe3b698b1f69 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 22a3761b782b7c46ca428209b15b4f7382a40a62 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 8b54843a43..d1a63822a5 100644
+index 9fc34f05e2..b339ccce84 100644
@@ -28 +29 @@
-@@ -2383,10 +2383,10 @@ mlx5_dev_close(struct rte_eth_dev *dev)
+@@ -1606,10 +1606,10 @@ mlx5_dev_close(struct rte_eth_dev *dev)

patch 'net/mlx5: fix warning about copy length' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 307a7cc705b9a907a227c68933e64e7e546b310c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Br=C3=B8rup?= <mb@smartsharesystems.com>
Date: Mon, 16 Jan 2023 14:07:23 +0100
Subject: [PATCH] net/mlx5: fix warning about copy length
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit c19580fb8e9ad6f153d46f731ec7cd2050b3021b ]

Use RTE_PTR_ADD where copying to the offset of a field in a structure
holding multiple fields, to avoid compiler warnings with decorated
rte_memcpy.

Fixes: 16a7dbc4f690 ("net/mlx5: make flow modify action list thread safe")

Signed-off-by: Morten Brørup <mb@smartsharesystems.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 1bf9517638..7a3e7ef96f 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -5465,5 +5465,5 @@ flow_dv_modify_create_cb(void *tool_ctx, void *cb_ctx)
 		return NULL;
 	}
-	rte_memcpy(&entry->ft_type,
+	rte_memcpy(RTE_PTR_ADD(entry, offsetof(typeof(*entry), ft_type)),
 		   RTE_PTR_ADD(ref, offsetof(typeof(*ref), ft_type)),
 		   key_len + data_len);
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.319861495 +0100
+++ 0012-net-mlx5-fix-warning-about-copy-length.patch	2024-04-04 10:49:33.752457743 +0100
@@ -1 +1 @@
-From c19580fb8e9ad6f153d46f731ec7cd2050b3021b Mon Sep 17 00:00:00 2001
+From 307a7cc705b9a907a227c68933e64e7e546b310c Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit c19580fb8e9ad6f153d46f731ec7cd2050b3021b ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 4badde1a9a..d434c678c8 100644
+index 1bf9517638..7a3e7ef96f 100644
@@ -26 +27 @@
-@@ -6206,5 +6206,5 @@ flow_dv_modify_create_cb(void *tool_ctx, void *cb_ctx)
+@@ -5465,5 +5465,5 @@ flow_dv_modify_create_cb(void *tool_ctx, void *cb_ctx)

patch 'net/bnxt: fix number of Tx queues being created' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 0bcf927db287664951fed5a0745b67a269977463 Mon Sep 17 00:00:00 2001
From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Date: Mon, 13 Nov 2023 11:08:52 -0500
Subject: [PATCH] net/bnxt: fix number of Tx queues being created

[ upstream commit 05b67582cc93128bbf2eb26726d781b8c5c561b3 ]

The number of Tx queues for the representor port is limited by
number of Rx rings instead of Tx rings.

Fixes: 322bd6e70272 ("net/bnxt: add port representor infrastructure")

Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_reps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index ea3a1fab8e..2f21e78e5c 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -741,8 +741,8 @@ int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
 	struct bnxt_vf_rep_tx_queue *vfr_txq;
 
-	if (queue_idx >= rep_bp->rx_nr_rings) {
+	if (queue_idx >= rep_bp->tx_nr_rings) {
 		PMD_DRV_LOG(ERR,
 			    "Cannot create Tx rings %d. %d rings available\n",
-			    queue_idx, rep_bp->rx_nr_rings);
+			    queue_idx, rep_bp->tx_nr_rings);
 		return -EINVAL;
 	}
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.351618161 +0100
+++ 0013-net-bnxt-fix-number-of-Tx-queues-being-created.patch	2024-04-04 10:49:33.753457746 +0100
@@ -1 +1 @@
-From 05b67582cc93128bbf2eb26726d781b8c5c561b3 Mon Sep 17 00:00:00 2001
+From 0bcf927db287664951fed5a0745b67a269977463 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 05b67582cc93128bbf2eb26726d781b8c5c561b3 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index edcc27f556..79b3583636 100644
+index ea3a1fab8e..2f21e78e5c 100644
@@ -22 +23 @@
-@@ -740,8 +740,8 @@ int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev *eth_dev,
+@@ -741,8 +741,8 @@ int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev *eth_dev,

patch 'doc: fix default IP fragments maximum in programmer guide' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 46f9124cae76db161f2670fd22a4cf0ae9c37661 Mon Sep 17 00:00:00 2001
From: Simei Su <simei.su@intel.com>
Date: Fri, 5 Jan 2024 10:44:17 +0800
Subject: [PATCH] doc: fix default IP fragments maximum in programmer guide

[ upstream commit 0219d467bcb1d19b386b5bae8eecd3514ba13fdb ]

Update documentation value to match default value in code base.

Fixes: f8e0f8ce9030 ("ip_frag: increase default maximum of fragments")

Signed-off-by: Simei Su <simei.su@intel.com>
Acked-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 doc/guides/prog_guide/ip_fragment_reassembly_lib.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
index 314d4adbb8..b14289eb73 100644
--- a/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
+++ b/doc/guides/prog_guide/ip_fragment_reassembly_lib.rst
@@ -44,5 +44,5 @@ So if different execution contexts (threads/processes) will access the same tabl
 then some external syncing mechanism have to be provided.
 
-Each table entry can hold information about packets consisting of up to RTE_LIBRTE_IP_FRAG_MAX (by default: 4) fragments.
+Each table entry can hold information about packets consisting of up to RTE_LIBRTE_IP_FRAG_MAX (by default: 8) fragments.
 
 Code example, that demonstrates creation of a new Fragment table:
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.372936234 +0100
+++ 0014-doc-fix-default-IP-fragments-maximum-in-programmer-g.patch	2024-04-04 10:49:33.753457746 +0100
@@ -1 +1 @@
-From 0219d467bcb1d19b386b5bae8eecd3514ba13fdb Mon Sep 17 00:00:00 2001
+From 46f9124cae76db161f2670fd22a4cf0ae9c37661 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0219d467bcb1d19b386b5bae8eecd3514ba13fdb ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org

patch 'net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 2ee1c5556735ef6f2021a5357a72f8ab23a8c227 Mon Sep 17 00:00:00 2001
From: Tom Jones <thj@freebsd.org>
Date: Thu, 21 Mar 2024 10:31:33 +0000
Subject: [PATCH] net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD

[ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ]

Interrupts disabled on FreeBSD for the vmxnet3 driver as they are not
supported. Rx queue interrupts were missed by this change, don't
attempt to enable them on FreeBSD.

Without this change applications enabling interrupts encounter an
immediate abort on FreeBSD.

Fixes: 40d5676ff1ea ("net/vmxnet3: fix initialization on FreeBSD")

Signed-off-by: Tom Jones <thj@freebsd.org>
Acked-by: Ferruh Yigit <ferruh.yigit@amd.com>
---
 .mailmap                             | 1 +
 drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.mailmap b/.mailmap
index 2e60e2b813..d7ac5b5247 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1390,4 +1390,5 @@ Tomasz Zawadzki <tomasz.zawadzki@intel.com>
 Tom Barbette <barbette@kth.se> <tom.barbette@ulg.ac.be>
 Tom Crugnale <tcrugnale@sandvine.com>
+Tom Jones <thj@freebsd.org>
 Tom Millington <tmillington@solarflare.com>
 Tom Rix <trix@redhat.com>
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index da9635507e..32d1036c4f 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -1690,4 +1690,5 @@ static int
 vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
 {
+#ifndef RTE_EXEC_ENV_FREEBSD
 	struct vmxnet3_hw *hw = dev->data->dev_private;
 
@@ -1695,4 +1696,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
 			    rte_intr_vec_list_index_get(dev->intr_handle,
 							       queue_id));
+#endif
 
 	return 0;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.393440246 +0100
+++ 0015-net-vmxnet3-ignore-Rx-queue-interrupt-setup-on-FreeB.patch	2024-04-04 10:49:33.756457753 +0100
@@ -1 +1 @@
-From 19fede459e0d22f5ac891366465dce07e68196bc Mon Sep 17 00:00:00 2001
+From 2ee1c5556735ef6f2021a5357a72f8ab23a8c227 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index a0b19832b5..491af1f6ff 100644
+index 2e60e2b813..d7ac5b5247 100644
@@ -27 +28 @@
-@@ -1459,4 +1459,5 @@ Tomasz Zawadzki <tomasz.zawadzki@intel.com>
+@@ -1390,4 +1390,5 @@ Tomasz Zawadzki <tomasz.zawadzki@intel.com>
@@ -34 +35 @@
-index 2707b25148..ce7c347254 100644
+index da9635507e..32d1036c4f 100644
@@ -37 +38 @@
-@@ -1937,4 +1937,5 @@ static int
+@@ -1690,4 +1690,5 @@ static int
@@ -43 +44 @@
-@@ -1942,4 +1943,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+@@ -1695,4 +1696,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)

patch 'doc: fix typo in profiling guide' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 13e54713ae251e2e403657935a70dbf5e29cb55e Mon Sep 17 00:00:00 2001
From: Emi Aoki <embm29@gmail.com>
Date: Thu, 21 Mar 2024 19:02:25 -0400
Subject: [PATCH] doc: fix typo in profiling guide

[ upstream commit a67ce452919a3381ccdc53af7bcc0196838b3586 ]

Caught by codespell.

Fixes: 9d5ba88c2d41 ("doc: add ARM profiling methods")

Signed-off-by: Emi Aoki <embm29@gmail.com>
---
 .mailmap                              | 1 +
 doc/guides/prog_guide/profile_app.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index d7ac5b5247..44212ef422 100644
--- a/.mailmap
+++ b/.mailmap
@@ -353,4 +353,5 @@ Elena Agostini <eagostini@nvidia.com>
 Eli Britstein <elibr@nvidia.com> <elibr@mellanox.com>
 Elza Mathew <elza.mathew@intel.com>
+Emi Aoki <embm29@gmail.com>
 Emma Finn <emma.finn@intel.com>
 Emma Kenny <emma.kenny@intel.com>
diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst
index 14292d4c25..a6b5fb4d5e 100644
--- a/doc/guides/prog_guide/profile_app.rst
+++ b/doc/guides/prog_guide/profile_app.rst
@@ -60,5 +60,5 @@ specific PMU (Performance Monitor Unit) events through raw events (``-e``
 ``-rXX``).
 
-For more derails refer to the
+For more details refer to the
 `ARM64 specific PMU events enumeration <http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.100095_0002_04_en/way1382543438508.html>`_.
 
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.416681641 +0100
+++ 0016-doc-fix-typo-in-profiling-guide.patch	2024-04-04 10:49:33.758457759 +0100
@@ -1 +1 @@
-From a67ce452919a3381ccdc53af7bcc0196838b3586 Mon Sep 17 00:00:00 2001
+From 13e54713ae251e2e403657935a70dbf5e29cb55e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a67ce452919a3381ccdc53af7bcc0196838b3586 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index f53fb59513..67687d21b1 100644
+index d7ac5b5247..44212ef422 100644
@@ -21 +22 @@
-@@ -374,4 +374,5 @@ Elena Agostini <eagostini@nvidia.com>
+@@ -353,4 +353,5 @@ Elena Agostini <eagostini@nvidia.com>

patch 'doc: fix typo in packet framework guide' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From fe97b1e3edcd2d17e12c7d4e179c921e3df451ff Mon Sep 17 00:00:00 2001
From: Flore Norceide <florestecien@gmail.com>
Date: Thu, 21 Mar 2024 19:03:52 -0400
Subject: [PATCH] doc: fix typo in packet framework guide

[ upstream commit e4e1f2f7d24240d476cfa757e218d1532759b65d ]

Caught by codespell

Fixes: fc1f2750a3ec ("doc: programmers guide")

Signed-off-by: Flore Norceide <florestecien@gmail.com>
---
 .mailmap                                   | 1 +
 doc/guides/prog_guide/packet_framework.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 44212ef422..1f846973ee 100644
--- a/.mailmap
+++ b/.mailmap
@@ -390,4 +390,5 @@ Fiona Trahe <fiona.trahe@intel.com>
 Flavia Musatescu <flavia.musatescu@intel.com>
 Flavio Leitner <fbl@redhat.com> <fbl@sysclose.org>
+Flore Norceide <florestecien@gmail.com>
 Forrest Shi <xuelin.shi@nxp.com>
 Francesco Mancino <francesco.mancino@tutus.se>
diff --git a/doc/guides/prog_guide/packet_framework.rst b/doc/guides/prog_guide/packet_framework.rst
index 3d4e3b66cc..b263f23f17 100644
--- a/doc/guides/prog_guide/packet_framework.rst
+++ b/doc/guides/prog_guide/packet_framework.rst
@@ -513,5 +513,5 @@ This is because the cost of L2/L3 cache memory miss on memory read accesses is h
 the CPU execution units have to stall until the read operation is completed from L3 cache memory or external DRAM memory.
 By using prefetch instructions, the latency of memory read accesses is hidden,
-provided that it is preformed early enough before the respective data structure is actually used.
+provided that it is performed early enough before the respective data structure is actually used.
 
 By splitting the processing into several stages that are executed on different packets (the packets from the input burst are interlaced),
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.438169157 +0100
+++ 0017-doc-fix-typo-in-packet-framework-guide.patch	2024-04-04 10:49:33.761457767 +0100
@@ -1 +1 @@
-From e4e1f2f7d24240d476cfa757e218d1532759b65d Mon Sep 17 00:00:00 2001
+From fe97b1e3edcd2d17e12c7d4e179c921e3df451ff Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e4e1f2f7d24240d476cfa757e218d1532759b65d ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 67687d21b1..ac50264e66 100644
+index 44212ef422..1f846973ee 100644
@@ -21 +22 @@
-@@ -412,4 +412,5 @@ Fiona Trahe <fiona.trahe@intel.com>
+@@ -390,4 +390,5 @@ Fiona Trahe <fiona.trahe@intel.com>
@@ -28 +29 @@
-index ebc69d8c3e..9987ead6c5 100644
+index 3d4e3b66cc..b263f23f17 100644
@@ -31 +32 @@
-@@ -510,5 +510,5 @@ This is because the cost of L2/L3 cache memory miss on memory read accesses is h
+@@ -513,5 +513,5 @@ This is because the cost of L2/L3 cache memory miss on memory read accesses is h

patch 'test/power: fix typo in error message' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 6e0fe10015c8f91b6e344c2a52a53711f1c5faaf Mon Sep 17 00:00:00 2001
From: Fidel Castro <fidelcastro.s@hotmail.com>
Date: Thu, 21 Mar 2024 18:35:52 -0400
Subject: [PATCH] test/power: fix typo in error message

[ upstream commit 4e335241a44cf8e3a34c0549293ca73d272b6c05 ]

Caught by codespell.

Fixes: 2653bee888b4 ("test/power: check all environment types")

Signed-off-by: Fidel Castro <fidelcastro.s@hotmail.com>
---
 .mailmap              | 1 +
 app/test/test_power.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 1f846973ee..3851a80bbf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -387,4 +387,5 @@ Ferdinand Thiessen <rpm@fthiessen.de>
 Ferruh Yigit <ferruh.yigit@amd.com> <ferruh.yigit@intel.com> <ferruh.yigit@xilinx.com> <ferruhy@gmail.com>
 Fidaullah Noonari <fidaullah.noonari@emumba.com>
+Fidel Castro <fidelcastro.s@hotmail.com>
 Fiona Trahe <fiona.trahe@intel.com>
 Flavia Musatescu <flavia.musatescu@intel.com>
diff --git a/app/test/test_power.c b/app/test/test_power.c
index b7b5561348..a1b32adf58 100644
--- a/app/test/test_power.c
+++ b/app/test/test_power.c
@@ -143,5 +143,5 @@ test_power(void)
 		ret = rte_power_set_env(envs[i]);
 		if (ret != 0) {
-			printf("Unexpectedly unsucceeded on setting a valid environment\n");
+			printf("Unexpectedly unsuccessful on setting a valid environment\n");
 			return -1;
 		}
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.461770144 +0100
+++ 0018-test-power-fix-typo-in-error-message.patch	2024-04-04 10:49:33.763457772 +0100
@@ -1 +1 @@
-From 4e335241a44cf8e3a34c0549293ca73d272b6c05 Mon Sep 17 00:00:00 2001
+From 6e0fe10015c8f91b6e344c2a52a53711f1c5faaf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4e335241a44cf8e3a34c0549293ca73d272b6c05 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index ac50264e66..6bb0855236 100644
+index 1f846973ee..3851a80bbf 100644
@@ -21 +22 @@
-@@ -409,4 +409,5 @@ Ferdinand Thiessen <rpm@fthiessen.de>
+@@ -387,4 +387,5 @@ Ferdinand Thiessen <rpm@fthiessen.de>
@@ -28 +29 @@
-index f1e80299d3..403adc22d6 100644
+index b7b5561348..a1b32adf58 100644
@@ -31 +32 @@
-@@ -144,5 +144,5 @@ test_power(void)
+@@ -143,5 +143,5 @@ test_power(void)

patch 'test/cfgfile: fix typo in error messages' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From c6ab7f724167b5530314e2607312aa3d056f8b9d Mon Sep 17 00:00:00 2001
From: Holly Nichols <hollynichols04@gmail.com>
Date: Thu, 21 Mar 2024 19:05:29 -0400
Subject: [PATCH] test/cfgfile: fix typo in error messages

[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ]

Caught by codespell.

Fixes: c54e7234bc9e ("test/cfgfile: add basic unit tests")

Signed-off-by: Holly Nichols <hollynichols04@gmail.com>
Signed-off-by: Vinh Tran <vinh.t.tran10@gmail.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 .mailmap                | 2 ++
 app/test/test_cfgfile.c | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 3851a80bbf..055e44f239 100644
--- a/.mailmap
+++ b/.mailmap
@@ -506,4 +506,5 @@ Hiroki Shirokura <slank.dev@gmail.com>
 Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
 Hiroyuki Mikita <h.mikita89@gmail.com>
+Holly Nichols <hollynichols04@gmail.com>
 Hongbo Zheng <zhenghongbo3@huawei.com>
 Hongjun Ni <hongjun.ni@intel.com>
@@ -1440,4 +1441,5 @@ Vincent Jardin <vincent.jardin@6wind.com>
 Vincent Li <vincent.mc.li@gmail.com>
 Vincent S. Cojot <vcojot@redhat.com>
+Vinh Tran <vinh.t.tran10@gmail.com>
 Vipin Varghese <vipin.varghese@amd.com> <vipin.varghese@intel.com>
 Vipul Ashri <vipul.ashri@oracle.com>
diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c
index 2f596affee..a5e3d8699c 100644
--- a/app/test/test_cfgfile.c
+++ b/app/test/test_cfgfile.c
@@ -169,5 +169,5 @@ test_cfgfile_invalid_section_header(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/invalid_section.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -186,5 +186,5 @@ test_cfgfile_invalid_comment(void)
 	cfgfile = rte_cfgfile_load_with_params(CFG_FILES_ETC "/sample2.ini", 0,
 					       &params);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -197,5 +197,5 @@ test_cfgfile_invalid_key_value_pair(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty_key_value.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
@@ -237,5 +237,5 @@ test_cfgfile_missing_section(void)
 
 	cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/missing_section.ini", 0);
-	TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur");
+	TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur");
 
 	return 0;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.483347668 +0100
+++ 0019-test-cfgfile-fix-typo-in-error-messages.patch	2024-04-04 10:49:33.765457777 +0100
@@ -1 +1 @@
-From fbca1ad85f7725b876d032cb732b3332d247e1f4 Mon Sep 17 00:00:00 2001
+From c6ab7f724167b5530314e2607312aa3d056f8b9d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 6bb0855236..f3a25a7402 100644
+index 3851a80bbf..055e44f239 100644
@@ -23 +24 @@
-@@ -529,4 +529,5 @@ Hiroki Shirokura <slank.dev@gmail.com>
+@@ -506,4 +506,5 @@ Hiroki Shirokura <slank.dev@gmail.com>
@@ -29 +30 @@
-@@ -1514,4 +1515,5 @@ Vincent Jardin <vincent.jardin@6wind.com>
+@@ -1440,4 +1441,5 @@ Vincent Jardin <vincent.jardin@6wind.com>

patch 'examples/ipsec-secgw: fix typo in error message' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From aa99de99938079b321bac76f979cfc22ba5593b7 Mon Sep 17 00:00:00 2001
From: Masoumeh Farhadi Nia <masoumeh.farhadinia@gmail.com>
Date: Thu, 21 Mar 2024 18:41:35 -0400
Subject: [PATCH] examples/ipsec-secgw: fix typo in error message

[ upstream commit 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 ]

Caught by codespell.

Fixes: 7622291b641d ("examples/ipsec-secgw: allow to specify neighbour MAC address")

Signed-off-by: Masoumeh Farhadi Nia <masoumeh.farhadinia@gmail.com>
---
 .mailmap                      | 1 +
 examples/ipsec-secgw/parser.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 055e44f239..434b0b53b7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -867,4 +867,5 @@ Martyna Szapar <martyna.szapar@intel.com>
 Maryam Tahhan <maryam.tahhan@intel.com>
 Masoud Hasanifard <masoudhasanifard@gmail.com>
+Masoumeh Farhadi Nia <masoumeh.farhadinia@gmail.com>
 Matan Azrad <matan@nvidia.com> <matan@mellanox.com>
 Matej Vido <matejvido@gmail.com> <vido@cesnet.cz>
diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c
index 98dff93b87..f49f8ede6d 100644
--- a/examples/ipsec-secgw/parser.c
+++ b/examples/ipsec-secgw/parser.c
@@ -388,5 +388,5 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,
 	APP_CHECK(rc == 0, st, "invalid ether addr:%s", res->mac);
 	rc = add_dst_ethaddr(res->port, &mac);
-	APP_CHECK(rc == 0, st, "invalid port numer:%hu", res->port);
+	APP_CHECK(rc == 0, st, "invalid port number:%hu", res->port);
 	if (st->status < 0)
 		return;
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.505566289 +0100
+++ 0020-examples-ipsec-secgw-fix-typo-in-error-message.patch	2024-04-04 10:49:33.768457785 +0100
@@ -1 +1 @@
-From 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 Mon Sep 17 00:00:00 2001
+From aa99de99938079b321bac76f979cfc22ba5593b7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0dc91038201be67714f92a0fd0e0e7ed4f25c6a0 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index f3a25a7402..3843868716 100644
+index 055e44f239..434b0b53b7 100644
@@ -21 +22 @@
-@@ -909,4 +909,5 @@ Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@intel.com> <martyna.szapar@intel.co
+@@ -867,4 +867,5 @@ Martyna Szapar <martyna.szapar@intel.com>
@@ -28 +29 @@
-index 98f8176651..2bd6df335b 100644
+index 98dff93b87..f49f8ede6d 100644
@@ -31 +32 @@
-@@ -389,5 +389,5 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,
+@@ -388,5 +388,5 @@ cfg_parse_neigh(void *parsed_result, __rte_unused struct cmdline *cl,

patch 'net/nfp: fix resource leak for PF initialization' has been queued to stable release 21.11.7

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.7

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

Thanks.

Kevin

---
From 6be826afff5fdc4ceb3f6ae68d8a0b6e50aaf0a0 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he@corigine.com>
Date: Mon, 4 Dec 2023 09:57:14 +0800
Subject: [PATCH] net/nfp: fix resource leak for PF initialization

[ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ]

Fix the resource leak problem in the abnormal logic of PF initialize
function.

Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file")
Fixes: 8ba461d1eecc ("net/nfp: introduce keepalive mechanism for multiple PF")

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
---
 drivers/net/nfp/nfp_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index e1da0bdebe..19076e8f18 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -941,5 +941,5 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev)
 
 hwqueues_cleanup:
-	nfp_cpp_area_free(pf_dev->hwqueues_area);
+	nfp_cpp_area_release_free(pf_dev->hwqueues_area);
 ctrl_area_cleanup:
 	nfp_cpp_area_free(pf_dev->ctrl_area);
-- 
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-04 10:49:34.527465795 +0100
+++ 0021-net-nfp-fix-resource-leak-for-PF-initialization.patch	2024-04-04 10:49:33.769457788 +0100
@@ -1 +1 @@
-From 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 Mon Sep 17 00:00:00 2001
+From 6be826afff5fdc4ceb3f6ae68d8a0b6e50aaf0a0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/nfp/nfp_ethdev.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ drivers/net/nfp/nfp_ethdev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -21 +22 @@
-index c132e97d1a..6fdde105ba 100644
+index e1da0bdebe..19076e8f18 100644
@@ -24 +25 @@
-@@ -1334,5 +1334,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev)
+@@ -941,5 +941,5 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev)
@@ -27,10 +28,4 @@
--	nfp_cpp_area_free(pf_dev->qc_area);
-+	nfp_cpp_area_release_free(pf_dev->qc_area);
- sym_tbl_cleanup:
- 	free(sym_tbl);
-@@ -1340,4 +1340,5 @@ fw_cleanup:
- 	nfp_fw_unload(cpp);
- 	nfp_net_keepalive_stop(&pf_dev->multi_pf);
-+	nfp_net_keepalive_uninit(&pf_dev->multi_pf);
- eth_table_cleanup:
- 	free(nfp_eth_table);
+-	nfp_cpp_area_free(pf_dev->hwqueues_area);
++	nfp_cpp_area_release_free(pf_dev->hwqueues_area);
+ ctrl_area_cleanup:
+ 	nfp_cpp_area_free(pf_dev->ctrl_area);

RE: patch 'net/bnxt: fix number of Tx queues being created' has been queued to stable release 21.11.7

[Kishore Padmanabha]

[-- Attachment #1: Type: text/plain, Size: 4047 bytes --]

Hi,

It should be fine to push this change in the older release.

Thanks,
Kishore


-----Original Message-----
From: Kevin Traynor <ktraynor@redhat.com>
Sent: Thursday, April 4, 2024 5:52 AM
To: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Cc: Ajit Khaparde <ajit.khaparde@broadcom.com>; dpdk stable
<stable@dpdk.org>
Subject: patch 'net/bnxt: fix number of Tx queues being created' has been
queued to stable release 21.11.7

Hi,

FYI, your patch has been queued to stable release 21.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/09/24. 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/0bcf927db287664951fed5a
0745b67a269977463

Thanks.

Kevin

---
From 0bcf927db287664951fed5a0745b67a269977463 Mon Sep 17 00:00:00 2001
From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Date: Mon, 13 Nov 2023 11:08:52 -0500
Subject: [PATCH] net/bnxt: fix number of Tx queues being created

[ upstream commit 05b67582cc93128bbf2eb26726d781b8c5c561b3 ]

The number of Tx queues for the representor port is limited by number of
Rx rings instead of Tx rings.

Fixes: 322bd6e70272 ("net/bnxt: add port representor infrastructure")

Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_reps.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index ea3a1fab8e..2f21e78e5c 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -741,8 +741,8 @@ int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev
*eth_dev,
 	struct bnxt_vf_rep_tx_queue *vfr_txq;

-	if (queue_idx >= rep_bp->rx_nr_rings) {
+	if (queue_idx >= rep_bp->tx_nr_rings) {
 		PMD_DRV_LOG(ERR,
 			    "Cannot create Tx rings %d. %d rings
available\n",
-			    queue_idx, rep_bp->rx_nr_rings);
+			    queue_idx, rep_bp->tx_nr_rings);
 		return -EINVAL;
 	}
--
2.44.0

---
  Diff of the applied patch vs upstream commit (please double-check if
non-empty:
---
--- -	2024-04-04 10:49:34.351618161 +0100
+++ 0013-net-bnxt-fix-number-of-Tx-queues-being-created.patch	2024-04-04
10:49:33.753457746 +0100
@@ -1 +1 @@
-From 05b67582cc93128bbf2eb26726d781b8c5c561b3 Mon Sep 17 00:00:00 2001
+From 0bcf927db287664951fed5a0745b67a269977463 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 05b67582cc93128bbf2eb26726d781b8c5c561b3 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index edcc27f556..79b3583636 100644
+index ea3a1fab8e..2f21e78e5c 100644
@@ -22 +23 @@
-@@ -740,8 +740,8 @@ int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev
*eth_dev,
+@@ -741,8 +741,8 @@ int bnxt_rep_tx_queue_setup_op(struct rte_eth_dev
+*eth_dev,

-- 
This electronic communication and the information and any files transmitted 
with it, or attached to it, are confidential and are intended solely for 
the use of the individual or entity to whom it is addressed and may contain 
information that is confidential, legally privileged, protected by privacy 
laws, or otherwise restricted from disclosure to anyone else. If you are 
not the intended recipient or the person responsible for delivering the 
e-mail to the intended recipient, you are hereby notified that any use, 
copying, distributing, dissemination, forwarding, printing, or copying of 
this e-mail is strictly prohibited. If you received this e-mail in error, 
please return the e-mail to the sender, delete it from your computer, and 
destroy any printed copy of it.

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4227 bytes --]