patch 'net/bonding: fix dedicated queue setup' has been queued to stable release 22.11.8

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.8

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

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

Thanks.

Luca Boccassi

---
From 4c7148bc0ebe1a81b38b90cd3be73bb9f817c3b1 Mon Sep 17 00:00:00 2001
From: Long Wu <long.wu@corigine.com>
Date: Thu, 26 Dec 2024 09:26:18 +0800
Subject: [PATCH] net/bonding: fix dedicated queue setup

[ upstream commit 4da0705bf896327af062212b5a1e6cb1f1366aa5 ]

The bonding PMD hardcoded the value of dedicated hardware Rx/Tx
queue size as (128/512). This will cause the bonding port start
fail if some NIC requires more Rx/Tx descriptors than the hardcoded
number.

Therefore, use the minimum hardware queue size of the member port
to initialize dedicated hardware Rx/Tx queue. If obtaining the
minimum queue size failed, use the default queue size.

Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control")

Signed-off-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
---
 drivers/net/bonding/rte_eth_bond_8023ad.h |  3 +++
 drivers/net/bonding/rte_eth_bond_pmd.c    | 24 +++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h
index 025bd0ec54..d4c1d78d77 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.h
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.h
@@ -35,6 +35,9 @@ extern "C" {
 #define MARKER_TLV_TYPE_INFO                0x01
 #define MARKER_TLV_TYPE_RESP                0x02
 
+#define SLOW_TX_QUEUE_HW_DEFAULT_SIZE       512
+#define SLOW_RX_QUEUE_HW_DEFAULT_SIZE       512
+
 typedef void (*rte_eth_bond_8023ad_ext_slowrx_fn)(uint16_t slave_id,
 						  struct rte_mbuf *lacp_pkt);
 
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 8df632fa6e..0e6f3aa42b 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1681,10 +1681,27 @@ slave_configure_slow_queue(struct rte_eth_dev *bonded_eth_dev,
 	}
 
 	if (internals->mode4.dedicated_queues.enabled == 1) {
+		struct rte_eth_dev_info member_info = {};
+		uint16_t nb_rx_desc = SLOW_RX_QUEUE_HW_DEFAULT_SIZE;
+		uint16_t nb_tx_desc = SLOW_TX_QUEUE_HW_DEFAULT_SIZE;
+
+		errval = rte_eth_dev_info_get(slave_eth_dev->data->port_id,
+				&member_info);
+		if (errval != 0) {
+			RTE_BOND_LOG(ERR,
+					"rte_eth_dev_info_get: port=%d, err (%d)",
+					slave_eth_dev->data->port_id,
+					errval);
+			return errval;
+		}
+
+		if (member_info.rx_desc_lim.nb_min != 0)
+			nb_rx_desc = member_info.rx_desc_lim.nb_min;
+
 		/* Configure slow Rx queue */
 
 		errval = rte_eth_rx_queue_setup(slave_eth_dev->data->port_id,
-				internals->mode4.dedicated_queues.rx_qid, 128,
+				internals->mode4.dedicated_queues.rx_qid, nb_rx_desc,
 				rte_eth_dev_socket_id(slave_eth_dev->data->port_id),
 				NULL, port->slow_pool);
 		if (errval != 0) {
@@ -1696,8 +1713,11 @@ slave_configure_slow_queue(struct rte_eth_dev *bonded_eth_dev,
 			return errval;
 		}
 
+		if (member_info.tx_desc_lim.nb_min != 0)
+			nb_tx_desc = member_info.tx_desc_lim.nb_min;
+
 		errval = rte_eth_tx_queue_setup(slave_eth_dev->data->port_id,
-				internals->mode4.dedicated_queues.tx_qid, 512,
+				internals->mode4.dedicated_queues.tx_qid, nb_tx_desc,
 				rte_eth_dev_socket_id(slave_eth_dev->data->port_id),
 				NULL);
 		if (errval != 0) {
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-17 16:13:17.149873051 +0000
+++ 0007-net-bonding-fix-dedicated-queue-setup.patch	2025-02-17 16:13:16.786441593 +0000
@@ -1 +1 @@
-From 4da0705bf896327af062212b5a1e6cb1f1366aa5 Mon Sep 17 00:00:00 2001
+From 4c7148bc0ebe1a81b38b90cd3be73bb9f817c3b1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4da0705bf896327af062212b5a1e6cb1f1366aa5 ]
+
@@ -16 +17,0 @@
-Cc: stable@dpdk.org
@@ -22,2 +23,2 @@
- drivers/net/bonding/rte_eth_bond_pmd.c    | 25 ++++++++++++++++++++---
- 2 files changed, 25 insertions(+), 3 deletions(-)
+ drivers/net/bonding/rte_eth_bond_pmd.c    | 24 +++++++++++++++++++++--
+ 2 files changed, 25 insertions(+), 2 deletions(-)
@@ -26 +27 @@
-index 395e41ff95..4c30bd40ee 100644
+index 025bd0ec54..d4c1d78d77 100644
@@ -36 +37 @@
- typedef void (*rte_eth_bond_8023ad_ext_slowrx_fn)(uint16_t member_id,
+ typedef void (*rte_eth_bond_8023ad_ext_slowrx_fn)(uint16_t slave_id,
@@ -40 +41 @@
-index f69496feec..467f7fe7ea 100644
+index 8df632fa6e..0e6f3aa42b 100644
@@ -43 +44 @@
-@@ -1684,10 +1684,26 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev,
+@@ -1681,10 +1681,27 @@ slave_configure_slow_queue(struct rte_eth_dev *bonded_eth_dev,
@@ -51 +52 @@
-+		errval = rte_eth_dev_info_get(member_eth_dev->data->port_id,
++		errval = rte_eth_dev_info_get(slave_eth_dev->data->port_id,
@@ -56 +57 @@
-+					member_eth_dev->data->port_id,
++					slave_eth_dev->data->port_id,
@@ -65,2 +66,2 @@
--
- 		errval = rte_eth_rx_queue_setup(member_eth_dev->data->port_id,
+ 
+ 		errval = rte_eth_rx_queue_setup(slave_eth_dev->data->port_id,
@@ -69 +70 @@
- 				rte_eth_dev_socket_id(member_eth_dev->data->port_id),
+ 				rte_eth_dev_socket_id(slave_eth_dev->data->port_id),
@@ -72 +73 @@
-@@ -1699,8 +1715,11 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev,
+@@ -1696,8 +1713,11 @@ slave_configure_slow_queue(struct rte_eth_dev *bonded_eth_dev,
@@ -79 +80 @@
- 		errval = rte_eth_tx_queue_setup(member_eth_dev->data->port_id,
+ 		errval = rte_eth_tx_queue_setup(slave_eth_dev->data->port_id,
@@ -82 +83 @@
- 				rte_eth_dev_socket_id(member_eth_dev->data->port_id),
+ 				rte_eth_dev_socket_id(slave_eth_dev->data->port_id),