app/testpmd: fix bonding slave devices not released

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")
Cc: stable@dpdk.org
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>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 56a369e10435cab2622e98671ad2f60976d4a311..a59e6166d5d9da6dec83e7a33cb864a795c94265 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -8918,6 +8918,7 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result,
                            __rte_unused void *data)
 {
        cmdline_quit(cl);
+       cl_quit = 1;
 }
 
 static cmdline_parse_token_string_t cmd_quit_quit =

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 04c39adc21c182e71b992a83f48be9bfd8accee1..205d98ee3da60c8ad7e583f4acdb9d8c70aaaa57 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -229,6 +229,7 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */
  * option. Set flag to exit stats period loop after received SIGINT/SIGTERM.
  */
 uint8_t f_quit;
+uint8_t cl_quit; /* Quit testpmd from cmdline. */
 
 /*
  * Max Rx frame size, set by '--max-pkt-len' parameter.
@@ -3202,11 +3203,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;
@@ -3242,7 +3271,19 @@ close_port(portid_t pid)
                        port_flow_flush(pi);
                        port_flex_item_flush(pi);
                        port_action_handle_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);
                }
 
                free_xstats_display_info(pi);

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index b90bba659ae77563e0332a5dc6e04d43d73682fe..ab333c7324678e8864039b9c8b732c9a6c758b2d 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -38,6 +38,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.