patch 'app/testpmd: fix bonding slave devices not released' has been queued to stable release 20.11.6

[Xueming Li <xuemingl@nvidia.com>]

Hi,

FYI, your patch has been queued to stable release 20.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/22/22. So please
shout if anyone has objections.

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

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/50c6ddd64239edff3d2c3dc00c3b10569443127a

Thanks.

Xueming Li <xuemingl@nvidia.com>

---
From 50c6ddd64239edff3d2c3dc00c3b10569443127a Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Thu, 9 Jun 2022 19:49:21 +0800
Subject: [PATCH] app/testpmd: fix bonding slave devices not released
Cc: Xueming Li <xuemingl@nvidia.com>

[ upstream commit 3889a3220c9b93f07dfdf95e30b2661e6e3f698f ]

Currently, some eth devices are added to bond device, these devices are
not released when the quit command is executed in testpmd. This patch
adds the release operation for all active slaves under a bond device.

Fixes: 0e545d3047fe ("app/testpmd: check stopping port is not in bonding")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
---
 app/test-pmd/cmdline.c |  1 +
 app/test-pmd/testpmd.c | 41 +++++++++++++++++++++++++++++++++++++++++
 app/test-pmd/testpmd.h |  2 ++
 3 files changed, 44 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index a84568aeea..83bb041484 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8233,6 +8233,7 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result,
 			    __rte_unused void *data)
 {
 	cmdline_quit(cl);
+	cl_quit = 1;
 }
 
 cmdline_parse_token_string_t cmd_quit_quit =
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 96e0f2d212..c29f1f153c 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -217,6 +217,7 @@ uint16_t stats_period; /**< Period to show statistics (disabled by default) */
  * option. Set flag to exit stats period loop after received SIGINT/SIGTERM.
  */
 uint8_t f_quit;
+uint8_t cl_quit; /* Quit testpmd from cmdline. */
 
 /*
  * Configuration of packet segments used to scatter received packets
@@ -2857,11 +2858,39 @@ remove_invalid_ports(void)
 	nb_cfg_ports = nb_fwd_ports;
 }
 
+static void
+clear_bonding_slave_device(portid_t *slave_pids, uint16_t num_slaves)
+{
+	struct rte_port *port;
+	portid_t slave_pid;
+	uint16_t i;
+
+	for (i = 0; i < num_slaves; i++) {
+		slave_pid = slave_pids[i];
+		if (port_is_started(slave_pid) == 1) {
+			if (rte_eth_dev_stop(slave_pid) != 0)
+				fprintf(stderr, "rte_eth_dev_stop failed for port %u\n",
+					slave_pid);
+
+			port = &ports[slave_pid];
+			port->port_status = RTE_PORT_STOPPED;
+		}
+
+		clear_port_slave_flag(slave_pid);
+
+		/* Close slave device when testpmd quit or is killed. */
+		if (cl_quit == 1 || f_quit == 1)
+			rte_eth_dev_close(slave_pid);
+	}
+}
+
 void
 close_port(portid_t pid)
 {
 	portid_t pi;
 	struct rte_port *port;
+	portid_t slave_pids[RTE_MAX_ETHPORTS];
+	int num_slaves = 0;
 
 	if (port_id_is_invalid(pid, ENABLED_WARN))
 		return;
@@ -2891,7 +2920,19 @@ close_port(portid_t pid)
 
 		mcast_addr_pool_destroy(pi);
 		port_flow_flush(pi);
+#ifdef RTE_NET_BOND
+			if (port->bond_flag == 1)
+				num_slaves = rte_eth_bond_slaves_get(pi,
+						slave_pids, RTE_MAX_ETHPORTS);
+#endif
 		rte_eth_dev_close(pi);
+			/*
+			 * If this port is bonded device, all slaves under the
+			 * device need to be removed or closed.
+			 */
+			if (port->bond_flag == 1 && num_slaves > 0)
+				clear_bonding_slave_device(slave_pids,
+							num_slaves);
 	}
 
 	remove_invalid_ports();
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index e97ab5d2a8..745e673b8d 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -24,6 +24,8 @@
 #define RTE_PORT_CLOSED         (uint16_t)2
 #define RTE_PORT_HANDLING       (uint16_t)3
 
+extern uint8_t cl_quit;
+
 /*
  * It is used to allocate the memory for hash key.
  * The hash key size is NIC dependent.
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-20 15:00:59.647279332 +0800
+++ 0019-app-testpmd-fix-bonding-slave-devices-not-released.patch	2022-07-20 15:00:58.704333841 +0800
@@ -1 +1 @@
-From 3889a3220c9b93f07dfdf95e30b2661e6e3f698f Mon Sep 17 00:00:00 2001
+From 50c6ddd64239edff3d2c3dc00c3b10569443127a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 3889a3220c9b93f07dfdf95e30b2661e6e3f698f ]
@@ -11 +13,0 @@
-Cc: stable@dpdk.org
@@ -24 +26 @@
-index 56a369e104..a59e6166d5 100644
+index a84568aeea..83bb041484 100644
@@ -27 +29 @@
-@@ -8918,6 +8918,7 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result,
+@@ -8233,6 +8233,7 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result,
@@ -34 +36 @@
- static cmdline_parse_token_string_t cmd_quit_quit =
+ cmdline_parse_token_string_t cmd_quit_quit =
@@ -36 +38 @@
-index 04c39adc21..205d98ee3d 100644
+index 96e0f2d212..c29f1f153c 100644
@@ -39 +41 @@
-@@ -229,6 +229,7 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */
+@@ -217,6 +217,7 @@ uint16_t stats_period; /**< Period to show statistics (disabled by default) */
@@ -46,2 +48,2 @@
-  * Max Rx frame size, set by '--max-pkt-len' parameter.
-@@ -3202,11 +3203,39 @@ remove_invalid_ports(void)
+  * Configuration of packet segments used to scatter received packets
+@@ -2857,11 +2858,39 @@ remove_invalid_ports(void)
@@ -87,4 +89,4 @@
-@@ -3242,7 +3271,19 @@ close_port(portid_t pid)
- 			port_flow_flush(pi);
- 			port_flex_item_flush(pi);
- 			port_action_handle_flush(pi);
+@@ -2891,7 +2920,19 @@ close_port(portid_t pid)
+ 
+ 		mcast_addr_pool_destroy(pi);
+ 		port_flow_flush(pi);
@@ -96 +98 @@
- 			rte_eth_dev_close(pi);
+ 		rte_eth_dev_close(pi);
@@ -104 +106 @@
- 		}
+ 	}
@@ -106 +108 @@
- 		free_xstats_display_info(pi);
+ 	remove_invalid_ports();
@@ -108 +110 @@
-index b90bba659a..ab333c7324 100644
+index e97ab5d2a8..745e673b8d 100644
@@ -111 +113 @@
-@@ -38,6 +38,8 @@
+@@ -24,6 +24,8 @@