app/testpmd: check for valid socket id when attaching port

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index f22d1b6..fa6434c 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];
@@ -1282,11 +1290,6 @@ start_port(portid_t pid)
        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) {
@@ -1449,6 +1452,11 @@ stop_port(portid_t pid)
                        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)
@@ -1487,6 +1495,11 @@ close_port(portid_t pid)
                        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) {
@@ -1514,6 +1527,7 @@ void
 attach_port(char *identifier)
 {
        portid_t pi = 0;
+       unsigned int socket_id;
 
        printf("Attaching a new port...\n");
 
@@ -1526,7 +1540,11 @@ attach_port(char *identifier)
                return;
 
        ports[pi].enabled = 1;
-       reconfig(pi, rte_eth_dev_socket_id(pi));
+       socket_id = (unsigned)rte_eth_dev_socket_id(pi);
+       /* if socket_id is invalid, set to 0 */
+       if (check_socket_id(socket_id) < 0)
+               socket_id = 0;
+       reconfig(pi, socket_id);
        rte_eth_promiscuous_enable(pi);
 
        nb_ports = rte_eth_dev_count();
@@ -1824,6 +1842,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,