app/testpmd: fix port status of bonding slave device

Starting or stopping a bonded port also starts or stops all active slaves
under the bonded port. If this port is a bonded device, we need to modify
the port status of all slaves.

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>
Acked-by: Aman Singh <aman.deep.singh@intel.com>
Acked-by: Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 91e4090..44ddf9b 100644 (file)
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6667,6 +6667,7 @@ static void cmd_create_bonded_device_parsed(void *parsed_result,
                                "Failed to enable promiscuous mode for port %u: %s - ignore\n",
                                port_id, rte_strerror(-ret));
 
+               ports[port_id].bond_flag = 1;
                ports[port_id].need_setup = 0;
                ports[port_id].port_status = RTE_PORT_STOPPED;
        }

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 79bb232..777763f 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -66,6 +66,9 @@
 #ifdef RTE_EXEC_ENV_WINDOWS
 #include <process.h>
 #endif
+#ifdef RTE_NET_BOND
+#include <rte_eth_bond.h>
+#endif
 
 #include "testpmd.h"
 
@@ -597,11 +600,58 @@ eth_dev_configure_mp(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
        return 0;
 }
 
+static int
+change_bonding_slave_port_status(portid_t bond_pid, bool is_stop)
+{
+#ifdef RTE_NET_BOND
+
+       portid_t slave_pids[RTE_MAX_ETHPORTS];
+       struct rte_port *port;
+       int num_slaves;
+       portid_t slave_pid;
+       int i;
+
+       num_slaves = rte_eth_bond_slaves_get(bond_pid, slave_pids,
+                                               RTE_MAX_ETHPORTS);
+       if (num_slaves < 0) {
+               fprintf(stderr, "Failed to get slave list for port = %u\n",
+                       bond_pid);
+               return num_slaves;
+       }
+
+       for (i = 0; i < num_slaves; i++) {
+               slave_pid = slave_pids[i];
+               port = &ports[slave_pid];
+               port->port_status =
+                       is_stop ? RTE_PORT_STOPPED : RTE_PORT_STARTED;
+       }
+#else
+       RTE_SET_USED(bond_pid);
+       RTE_SET_USED(is_stop);
+#endif
+       return 0;
+}
+
 static int
 eth_dev_start_mp(uint16_t port_id)
 {
-       if (is_proc_primary())
-               return rte_eth_dev_start(port_id);
+       int ret;
+
+       if (is_proc_primary()) {
+               ret = rte_eth_dev_start(port_id);
+               if (ret != 0)
+                       return ret;
+
+               struct rte_port *port = &ports[port_id];
+
+               /*
+                * Starting a bonded port also starts all slaves under the bonded
+                * device. So if this port is bond device, we need to modify the
+                * port status of these slaves.
+                */
+               if (port->bond_flag == 1)
+                       return change_bonding_slave_port_status(port_id, false);
+       }
 
        return 0;
 }
@@ -609,8 +659,23 @@ eth_dev_start_mp(uint16_t port_id)
 static int
 eth_dev_stop_mp(uint16_t port_id)
 {
-       if (is_proc_primary())
-               return rte_eth_dev_stop(port_id);
+       int ret;
+
+       if (is_proc_primary()) {
+               ret = rte_eth_dev_stop(port_id);
+               if (ret != 0)
+                       return ret;
+
+               struct rte_port *port = &ports[port_id];
+
+               /*
+                * Stopping a bonded port also stops all slaves under the bonded
+                * device. So if this port is bond device, we need to modify the
+                * port status of these slaves.
+                */
+               if (port->bond_flag == 1)
+                       return change_bonding_slave_port_status(port_id, true);
+       }
 
        return 0;
 }

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 31f766c..67f253b 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -266,7 +266,8 @@ struct rte_port {
        uint32_t                mc_addr_nb; /**< nb. of addr. in mc_addr_pool */
        queueid_t               queue_nb; /**< nb. of queues for flow rules */
        uint32_t                queue_sz; /**< size of a queue for flow rules */
-       uint8_t                 slave_flag; /**< bonding slave port */
+       uint8_t                 slave_flag : 1, /**< bonding slave port */
+                               bond_flag : 1; /**< port is bond device */
        struct port_template    *pattern_templ_list; /**< Pattern templates. */
        struct port_template    *actions_templ_list; /**< Actions templates. */
        struct port_table       *table_list; /**< Flow tables. */