app/testpmd: block secondary process

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 4f2a431..d0142ca 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -339,6 +339,11 @@ uint8_t flow_isolate_all;
  */
 uint8_t no_link_check = 0; /* check by default */
 
+/*
+ * Don't automatically start all ports in interactive mode.
+ */
+uint8_t no_device_start = 0;
+
 /*
  * Enable link status change notification
  */
@@ -1101,6 +1106,8 @@ init_config(void)
        uint8_t port_per_socket[RTE_MAX_NUMA_NODES];
        struct rte_gro_param gro_param;
        uint32_t gso_types;
+       uint16_t data_size;
+       bool warning = 0;
        int k;
 
        memset(port_per_socket,0,RTE_MAX_NUMA_NODES);
@@ -1168,8 +1175,28 @@ init_config(void)
                port->need_reconfig = 1;
                port->need_reconfig_queues = 1;
                port->tx_metadata = 0;
+
+               /* Check for maximum number of segments per MTU. Accordingly
+                * update the mbuf data size.
+                */
+               if (port->dev_info.rx_desc_lim.nb_mtu_seg_max != UINT16_MAX &&
+                               port->dev_info.rx_desc_lim.nb_mtu_seg_max != 0) {
+                       data_size = rx_mode.max_rx_pkt_len /
+                               port->dev_info.rx_desc_lim.nb_mtu_seg_max;
+
+                       if ((data_size + RTE_PKTMBUF_HEADROOM) >
+                                                       mbuf_data_size) {
+                               mbuf_data_size = data_size +
+                                                RTE_PKTMBUF_HEADROOM;
+                               warning = 1;
+                       }
+               }
        }
 
+       if (warning)
+               TESTPMD_LOG(WARNING, "Configured mbuf size %hu\n",
+                           mbuf_data_size);
+
        /*
         * Create pools of mbuf.
         * If NUMA support is disabled, create a single pool of mbuf in
@@ -2361,7 +2388,7 @@ attach_port(char *identifier)
                return;
        }
 
-       if (rte_dev_probe(identifier) != 0) {
+       if (rte_dev_probe(identifier) < 0) {
                TESTPMD_LOG(ERR, "Failed to attach port %s\n", identifier);
                return;
        }
@@ -2431,7 +2458,7 @@ detach_port_device(portid_t port_id)
                        port_flow_flush(port_id);
        }
 
-       if (rte_dev_remove(dev) != 0) {
+       if (rte_dev_remove(dev) < 0) {
                TESTPMD_LOG(ERR, "Failed to detach device %s\n", dev->name);
                return;
        }
@@ -2453,10 +2480,54 @@ detach_port_device(portid_t port_id)
        return;
 }
 
+void
+detach_device(char *identifier)
+{
+       struct rte_dev_iterator iterator;
+       struct rte_devargs da;
+       portid_t port_id;
+
+       printf("Removing a device...\n");
+
+       memset(&da, 0, sizeof(da));
+       if (rte_devargs_parsef(&da, "%s", identifier)) {
+               printf("cannot parse identifier\n");
+               if (da.args)
+                       free(da.args);
+               return;
+       }
+
+       RTE_ETH_FOREACH_MATCHING_DEV(port_id, identifier, &iterator) {
+               if (ports[port_id].port_status != RTE_PORT_CLOSED) {
+                       if (ports[port_id].port_status != RTE_PORT_STOPPED) {
+                               printf("Port %u not stopped\n", port_id);
+                               return;
+                       }
+
+                       /* sibling ports are forced to be closed */
+                       if (ports[port_id].flow_list)
+                               port_flow_flush(port_id);
+                       ports[port_id].port_status = RTE_PORT_CLOSED;
+                       printf("Port %u is now closed\n", port_id);
+               }
+       }
+
+       if (rte_eal_hotplug_remove(da.bus->name, da.name) != 0) {
+               TESTPMD_LOG(ERR, "Failed to detach device %s(%s)\n",
+                           da.name, da.bus->name);
+               return;
+       }
+
+       remove_invalid_ports();
+
+       printf("Device %s is detached\n", identifier);
+       printf("Now total ports is %d\n", nb_ports);
+       printf("Done\n");
+}
+
 void
 pmd_test_exit(void)
 {
-       struct rte_device *device;
        portid_t pt_id;
        int ret;
        int i;
@@ -2482,18 +2553,6 @@ pmd_test_exit(void)
                        printf("\nShutting down port %d...\n", pt_id);
                        fflush(stdout);
                        close_port(pt_id);
-
-                       /*
-                        * This is a workaround to fix a virtio-user issue that
-                        * requires to call clean-up routine to remove existing
-                        * socket.
-                        * This workaround valid only for testpmd, needs a fix
-                        * valid for all applications.
-                        * TODO: Implement proper resource cleanup
-                        */
-                       device = rte_eth_devices[pt_id].device;
-                       if (device && !strcmp(device->driver->name, "net_virtio_user"))
-                               detach_port_device(pt_id);
                }
        }
 
@@ -2815,7 +2874,8 @@ rxtx_port_config(struct rte_port *port)
        for (qid = 0; qid < nb_rxq; qid++) {
                offloads = port->rx_conf[qid].offloads;
                port->rx_conf[qid] = port->dev_info.default_rxconf;
-               port->rx_conf[qid].offloads |= offloads;
+               if (offloads != 0)
+                       port->rx_conf[qid].offloads = offloads;
 
                /* Check if any Rx parameters have been passed */
                if (rx_pthresh != RTE_PMD_PARAM_UNSET)
@@ -2839,7 +2899,8 @@ rxtx_port_config(struct rte_port *port)
        for (qid = 0; qid < nb_txq; qid++) {
                offloads = port->tx_conf[qid].offloads;
                port->tx_conf[qid] = port->dev_info.default_txconf;
-               port->tx_conf[qid].offloads |= offloads;
+               if (offloads != 0)
+                       port->tx_conf[qid].offloads = offloads;
 
                /* Check if any Tx parameters have been passed */
                if (tx_pthresh != RTE_PMD_PARAM_UNSET)
@@ -3173,15 +3234,18 @@ main(int argc, char** argv)
        signal(SIGINT, signal_handler);
        signal(SIGTERM, signal_handler);
 
-       diag = rte_eal_init(argc, argv);
-       if (diag < 0)
-               rte_panic("Cannot init EAL\n");
-
        testpmd_logtype = rte_log_register("testpmd");
        if (testpmd_logtype < 0)
                rte_panic("Cannot register log type");
        rte_log_set_level(testpmd_logtype, RTE_LOG_DEBUG);
 
+       diag = rte_eal_init(argc, argv);
+       if (diag < 0)
+               rte_panic("Cannot init EAL\n");
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY)
+               rte_panic("Secondary process type not supported.\n");
+
        ret = register_eth_event_callback();
        if (ret != 0)
                rte_panic("Cannot register for ethdev events");
@@ -3277,7 +3341,7 @@ main(int argc, char** argv)
                }
        }
 
-       if (start_port(RTE_PORT_ALL) != 0)
+       if (!no_device_start && start_port(RTE_PORT_ALL) != 0)
                rte_exit(EXIT_FAILURE, "Start ports failed\n");
 
        /* set all ports to promiscuous mode by default */