app/testpmd: move forward streams initialisation

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index a585aad..38cddca 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -591,6 +591,8 @@ init_config(void)
        /* Configuration of packet forwarding streams. */
        if (init_fwd_streams() < 0)
                rte_exit(EXIT_FAILURE, "FAIL from init_fwd_streams()\n");
+
+       fwd_config_setup();
 }
 
 
@@ -992,6 +994,12 @@ start_packet_forwarding(int with_tx_first)
                printf("Packet forwarding already started\n");
                return;
        }
+
+       if (init_fwd_streams() < 0) {
+               printf("Fail from init_fwd_streams()\n");
+               return;
+       }
+
        if(dcb_test) {
                for (i = 0; i < nb_fwd_ports; i++) {
                        pt_id = fwd_ports_ids[i];
@@ -1279,19 +1287,9 @@ start_port(portid_t pid)
        struct rte_port *port;
        struct ether_addr mac_addr;
 
-       if (test_done == 0) {
-               printf("Please stop forwarding first\n");
-               return -1;
-       }
-
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return 0;
 
-       if (init_fwd_streams() < 0) {
-               printf("Fail from init_fwd_streams()\n");
-               return -1;
-       }
-
        if(dcb_config)
                dcb_test = 1;
        FOREACH_PORT(pi, ports) {
@@ -1435,10 +1433,6 @@ stop_port(portid_t pid)
        struct rte_port *port;
        int need_check_link_status = 0;
 
-       if (test_done == 0) {
-               printf("Please stop forwarding first\n");
-               return;
-       }
        if (dcb_test) {
                dcb_test = 0;
                dcb_config = 0;
@@ -1453,6 +1447,16 @@ stop_port(portid_t pid)
                if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
                        continue;
 
+               if (port_is_forwarding(pi) != 0 && test_done == 0) {
+                       printf("Please remove port %d from forwarding configuration.\n", pi);
+                       continue;
+               }
+
+               if (port_is_bonding_slave(pi)) {
+                       printf("Please remove port %d from bonded device.\n", pi);
+                       continue;
+               }
+
                port = &ports[pi];
                if (rte_atomic16_cmpset(&(port->port_status), RTE_PORT_STARTED,
                                                RTE_PORT_HANDLING) == 0)
@@ -1477,11 +1481,6 @@ close_port(portid_t pid)
        portid_t pi;
        struct rte_port *port;
 
-       if (test_done == 0) {
-               printf("Please stop forwarding first\n");
-               return;
-       }
-
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return;
 
@@ -1491,6 +1490,16 @@ close_port(portid_t pid)
                if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
                        continue;
 
+               if (port_is_forwarding(pi) != 0 && test_done == 0) {
+                       printf("Please remove port %d from forwarding configuration.\n", pi);
+                       continue;
+               }
+
+               if (port_is_bonding_slave(pi)) {
+                       printf("Please remove port %d from bonded device.\n", pi);
+                       continue;
+               }
+
                port = &ports[pi];
                if (rte_atomic16_cmpset(&(port->port_status),
                        RTE_PORT_CLOSED, RTE_PORT_CLOSED) == 1) {
@@ -1508,7 +1517,7 @@ close_port(portid_t pid)
 
                if (rte_atomic16_cmpset(&(port->port_status),
                        RTE_PORT_HANDLING, RTE_PORT_CLOSED) == 0)
-                       printf("Port %d can not be set into stopped\n", pi);
+                       printf("Port %d cannot be set to closed\n", pi);
        }
 
        printf("Done\n");
@@ -1517,7 +1526,7 @@ close_port(portid_t pid)
 void
 attach_port(char *identifier)
 {
-       portid_t i, j, pi = 0;
+       portid_t pi = 0;
 
        printf("Attaching a new port...\n");
 
@@ -1526,11 +1535,6 @@ attach_port(char *identifier)
                return;
        }
 
-       if (test_done == 0) {
-               printf("Please stop forwarding first\n");
-               return;
-       }
-
        if (rte_eth_dev_attach(identifier, &pi))
                return;
 
@@ -1540,16 +1544,6 @@ attach_port(char *identifier)
 
        nb_ports = rte_eth_dev_count();
 
-       /* set_default_fwd_ports_config(); */
-       memset(fwd_ports_ids, 0, sizeof(fwd_ports_ids));
-       i = 0;
-       FOREACH_PORT(j, ports) {
-               fwd_ports_ids[i] = j;
-               i++;
-       }
-       nb_cfg_ports = nb_ports;
-       nb_fwd_ports++;
-
        ports[pi].port_status = RTE_PORT_STOPPED;
 
        printf("Port %d is attached. Now total ports is %d\n", pi, nb_ports);
@@ -1559,7 +1553,6 @@ attach_port(char *identifier)
 void
 detach_port(uint8_t port_id)
 {
-       portid_t i, pi = 0;
        char name[RTE_ETH_NAME_MAX_LEN];
 
        printf("Detaching a port...\n");
@@ -1575,16 +1568,6 @@ detach_port(uint8_t port_id)
        ports[port_id].enabled = 0;
        nb_ports = rte_eth_dev_count();
 
-       /* set_default_fwd_ports_config(); */
-       memset(fwd_ports_ids, 0, sizeof(fwd_ports_ids));
-       i = 0;
-       FOREACH_PORT(pi, ports) {
-               fwd_ports_ids[i] = pi;
-               i++;
-       }
-       nb_cfg_ports = nb_ports;
-       nb_fwd_ports--;
-
        printf("Port '%s' is detached. Now total ports is %d\n",
                        name, nb_ports);
        printf("Done\n");
@@ -1854,6 +1837,14 @@ void clear_port_slave_flag(portid_t slave_pid)
        port->slave_flag = 0;
 }
 
+uint8_t port_is_bonding_slave(portid_t slave_pid)
+{
+       struct rte_port *port;
+
+       port = &ports[slave_pid];
+       return port->slave_flag;
+}
+
 const uint16_t vlan_tags[] = {
                0,  1,  2,  3,  4,  5,  6,  7,
                8,  9, 10, 11,  12, 13, 14, 15,