app/testpmd: remove indirect RSS action query

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index caa711d..8ed1b97 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -246,9 +246,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
 /* current configuration is in DCB or not,0 means it is not in DCB mode */
 uint8_t dcb_config = 0;
 
-/* Whether the dcb is in testing status */
-uint8_t dcb_test = 0;
-
 /*
  * Configurable number of RX/TX queues.
  */
@@ -513,6 +510,11 @@ uint8_t gro_flush_cycles = GRO_DEFAULT_FLUSH_CYCLES;
  */
 enum rte_eth_rx_mq_mode rx_mq_mode = ETH_MQ_RX_VMDQ_DCB_RSS;
 
+/*
+ * Used to set forced link speed
+ */
+uint32_t eth_link_speed;
+
 /* Forward function declarations */
 static void setup_attached_port(portid_t pi);
 static void check_all_ports_link_status(uint32_t port_mask);
@@ -1484,6 +1486,9 @@ init_config(void)
                        port->tx_conf[k].offloads =
                                port->dev_conf.txmode.offloads;
 
+               if (eth_link_speed)
+                       port->dev_conf.link_speeds = eth_link_speed;
+
                /* set flag to initialize port/queue */
                port->need_reconfig = 1;
                port->need_reconfig_queues = 1;
@@ -1571,10 +1576,6 @@ init_config(void)
                fwd_lcores[lc_id]->gso_ctx.flag = 0;
        }
 
-       /* Configuration of packet forwarding streams. */
-       if (init_fwd_streams() < 0)
-               rte_exit(EXIT_FAILURE, "FAIL from init_fwd_streams()\n");
-
        fwd_config_setup();
 
        /* create a gro context for each lcore */
@@ -1796,6 +1797,8 @@ fwd_stream_stats_display(streamid_t stream_id)
                       " Rx- bad outer L4 checksum: %-14"PRIu64"\n",
                        fs->rx_bad_ip_csum, fs->rx_bad_l4_csum,
                        fs->rx_bad_outer_l4_csum);
+               printf(" RX- bad outer IP checksum: %-14"PRIu64"\n",
+                       fs->rx_bad_outer_ip_csum);
        } else {
                printf("\n");
        }
@@ -1818,6 +1821,7 @@ fwd_stats_display(void)
                uint64_t rx_bad_ip_csum;
                uint64_t rx_bad_l4_csum;
                uint64_t rx_bad_outer_l4_csum;
+               uint64_t rx_bad_outer_ip_csum;
        } ports_stats[RTE_MAX_ETHPORTS];
        uint64_t total_rx_dropped = 0;
        uint64_t total_tx_dropped = 0;
@@ -1850,6 +1854,8 @@ fwd_stats_display(void)
                ports_stats[fs->rx_port].rx_bad_l4_csum += fs->rx_bad_l4_csum;
                ports_stats[fs->rx_port].rx_bad_outer_l4_csum +=
                                fs->rx_bad_outer_l4_csum;
+               ports_stats[fs->rx_port].rx_bad_outer_ip_csum +=
+                               fs->rx_bad_outer_ip_csum;
 
                if (record_core_cycles)
                        fwd_cycles += fs->core_cycles;
@@ -1881,13 +1887,16 @@ fwd_stats_display(void)
                       "RX-total: %-"PRIu64"\n", stats.ipackets, stats.imissed,
                       stats.ipackets + stats.imissed);
 
-               if (cur_fwd_eng == &csum_fwd_engine)
+               if (cur_fwd_eng == &csum_fwd_engine) {
                        printf("  Bad-ipcsum: %-14"PRIu64
                               " Bad-l4csum: %-14"PRIu64
                               "Bad-outer-l4csum: %-14"PRIu64"\n",
                               ports_stats[pt_id].rx_bad_ip_csum,
                               ports_stats[pt_id].rx_bad_l4_csum,
                               ports_stats[pt_id].rx_bad_outer_l4_csum);
+                       printf("  Bad-outer-ipcsum: %-14"PRIu64"\n",
+                              ports_stats[pt_id].rx_bad_outer_ip_csum);
+               }
                if (stats.ierrors + stats.rx_nombuf > 0) {
                        printf("  RX-error: %-"PRIu64"\n", stats.ierrors);
                        printf("  RX-nombufs: %-14"PRIu64"\n", stats.rx_nombuf);
@@ -1965,6 +1974,7 @@ fwd_stats_reset(void)
                fs->rx_bad_ip_csum = 0;
                fs->rx_bad_l4_csum = 0;
                fs->rx_bad_outer_l4_csum = 0;
+               fs->rx_bad_outer_ip_csum = 0;
 
                memset(&fs->rx_burst_stats, 0, sizeof(fs->rx_burst_stats));
                memset(&fs->tx_burst_stats, 0, sizeof(fs->tx_burst_stats));
@@ -2124,9 +2134,7 @@ start_packet_forwarding(int with_tx_first)
 {
        port_fwd_begin_t port_fwd_begin;
        port_fwd_end_t  port_fwd_end;
-       struct rte_port *port;
        unsigned int i;
-       portid_t   pt_id;
 
        if (strcmp(cur_fwd_eng->fwd_mode_name, "rxonly") == 0 && !nb_rxq)
                rte_exit(EXIT_FAILURE, "rxq are 0, cannot use rxonly fwd mode\n");
@@ -2149,24 +2157,6 @@ start_packet_forwarding(int with_tx_first)
                printf("Packet forwarding already started\n");
                return;
        }
-
-
-       if(dcb_test) {
-               for (i = 0; i < nb_fwd_ports; i++) {
-                       pt_id = fwd_ports_ids[i];
-                       port = &ports[pt_id];
-                       if (!port->dcb_flag) {
-                               printf("In DCB mode, all forwarding ports must "
-                                       "be configured in this mode.\n");
-                               return;
-                       }
-               }
-               if (nb_fwd_lcores == 1) {
-                       printf("In DCB mode,the nb forwarding cores "
-                               "should be larger than 1.\n");
-                       return;
-               }
-       }
        test_done = 0;
 
        fwd_config_setup();
@@ -2459,8 +2449,6 @@ start_port(portid_t pid)
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return 0;
 
-       if(dcb_config)
-               dcb_test = 1;
        RTE_ETH_FOREACH_DEV(pi) {
                if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
                        continue;
@@ -2609,8 +2597,10 @@ start_port(portid_t pid)
                cnt_pi++;
 
                /* start port */
-               if (rte_eth_dev_start(pi) < 0) {
-                       printf("Fail to start port %d\n", pi);
+               diag = rte_eth_dev_start(pi);
+               if (diag < 0) {
+                       printf("Fail to start port %d: %s\n", pi,
+                              rte_strerror(-diag));
 
                        /* Fail to setup rx queue, return */
                        if (rte_atomic16_cmpset(&(port->port_status),
@@ -2698,11 +2688,6 @@ stop_port(portid_t pid)
        portid_t peer_pl[RTE_MAX_ETHPORTS];
        int peer_pi;
 
-       if (dcb_test) {
-               dcb_test = 0;
-               dcb_config = 0;
-       }
-
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return;
 
@@ -2996,8 +2981,6 @@ detach_devargs(char *identifier)
        memset(&da, 0, sizeof(da));
        if (rte_devargs_parsef(&da, "%s", identifier)) {
                printf("cannot parse identifier\n");
-               if (da.args)
-                       free(da.args);
                return;
        }
 
@@ -3006,6 +2989,7 @@ detach_devargs(char *identifier)
                        if (ports[port_id].port_status != RTE_PORT_STOPPED) {
                                printf("Port %u not stopped\n", port_id);
                                rte_eth_iterator_cleanup(&iterator);
+                               rte_devargs_reset(&da);
                                return;
                        }
                        port_flow_flush(port_id);
@@ -3015,6 +2999,7 @@ detach_devargs(char *identifier)
        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);
+               rte_devargs_reset(&da);
                return;
        }
 
@@ -3023,6 +3008,7 @@ detach_devargs(char *identifier)
        printf("Device %s is detached\n", identifier);
        printf("Now total ports is %d\n", nb_ports);
        printf("Done\n");
+       rte_devargs_reset(&da);
 }
 
 void
@@ -3605,8 +3591,6 @@ init_port_dcb_config(portid_t pid,
        rte_port = &ports[pid];
 
        memset(&port_conf, 0, sizeof(struct rte_eth_conf));
-       /* Enter DCB configuration status */
-       dcb_config = 1;
 
        port_conf.rxmode = rte_port->dev_conf.rxmode;
        port_conf.txmode = rte_port->dev_conf.txmode;
@@ -3674,6 +3658,9 @@ init_port_dcb_config(portid_t pid,
 
        rte_port->dcb_flag = 1;
 
+       /* Enter DCB configuration status */
+       dcb_config = 1;
+
        return 0;
 }