ethdev: allow to get RSS hash functions and key
[dpdk.git] / app / test-pmd / config.c
index 5ae6553..d12f46c 100644 (file)
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without
@@ -100,12 +100,12 @@ static void
 print_ethaddr(const char *name, struct ether_addr *eth_addr)
 {
        printf("%s%02X:%02X:%02X:%02X:%02X:%02X", name,
-              eth_addr->addr_bytes[0],
-              eth_addr->addr_bytes[1],
-              eth_addr->addr_bytes[2],
-              eth_addr->addr_bytes[3],
-              eth_addr->addr_bytes[4],
-              eth_addr->addr_bytes[5]);
+              (unsigned int)eth_addr->addr_bytes[0],
+              (unsigned int)eth_addr->addr_bytes[1],
+              (unsigned int)eth_addr->addr_bytes[2],
+              (unsigned int)eth_addr->addr_bytes[3],
+              (unsigned int)eth_addr->addr_bytes[4],
+              (unsigned int)eth_addr->addr_bytes[5]);
 }
 
 void
@@ -166,6 +166,14 @@ nic_stats_display(portid_t port_id)
                }
        }
 
+       /* Display statistics of XON/XOFF pause frames, if any. */
+       if ((stats.tx_pause_xon  | stats.rx_pause_xon |
+            stats.tx_pause_xoff | stats.rx_pause_xoff) > 0) {
+               printf("  RX-XOFF:    %-10"PRIu64" RX-XON:    %-10"PRIu64"\n",
+                      stats.rx_pause_xoff, stats.rx_pause_xon);
+               printf("  TX-XOFF:    %-10"PRIu64" TX-XON:    %-10"PRIu64"\n",
+                      stats.tx_pause_xoff, stats.tx_pause_xon);
+       }
        printf("  %s############################%s\n",
               nic_stats_border, nic_stats_border);
 }
@@ -236,7 +244,6 @@ port_infos_display(portid_t port_id)
        struct rte_port *port;
        struct rte_eth_link link;
        int vlan_offload;
-       int socket_id;
        struct rte_mempool * mp;
        static const char *info_border = "*********************";
 
@@ -246,11 +253,10 @@ port_infos_display(portid_t port_id)
        }
        port = &ports[port_id];
        rte_eth_link_get_nowait(port_id, &link);
-       socket_id = rte_eth_dev_socket_id(port_id);
        printf("\n%s Infos for port %-2d %s\n",
               info_border, port_id, info_border);
        print_ethaddr("MAC address: ", &port->eth_addr);
-       printf("\nConnect to socket: %d",socket_id);
+       printf("\nConnect to socket: %u", port->socket_id);
 
        if (port_numa[port_id] != NUMA_NO_CONFIG) {
                mp = mbuf_pool_find(port_numa[port_id]);
@@ -258,7 +264,7 @@ port_infos_display(portid_t port_id)
                        printf("\nmemory allocation on the socket: %d",
                                                        port_numa[port_id]);
        } else
-               printf("\nmemory allocation on the socket: %d",socket_id);
+               printf("\nmemory allocation on the socket: %u",port->socket_id);
 
        printf("\nLink status: %s\n", (link.link_status) ? ("up") : ("down"));
        printf("Link speed: %u Mbps\n", (unsigned) link.link_speed);
@@ -675,6 +681,71 @@ port_rss_reta_info(portid_t port_id,struct rte_eth_rss_reta *reta_conf)
        }
 }
 
+/*
+ * Displays the RSS hash functions of a port, and, optionaly, the RSS hash
+ * key of the port.
+ */
+void
+port_rss_hash_conf_show(portid_t port_id, int show_rss_key)
+{
+       struct rte_eth_rss_conf rss_conf;
+       uint8_t rss_key[10 * 4];
+       uint16_t rss_hf;
+       uint8_t i;
+       int diag;
+
+       if (port_id_is_invalid(port_id))
+               return;
+       /* Get RSS hash key if asked to display it */
+       rss_conf.rss_key = (show_rss_key) ? rss_key : NULL;
+       diag = rte_eth_dev_rss_hash_conf_get(port_id, &rss_conf);
+       if (diag != 0) {
+               switch (diag) {
+               case -ENODEV:
+                       printf("port index %d invalid\n", port_id);
+                       break;
+               case -ENOTSUP:
+                       printf("operation not supported by device\n");
+                       break;
+               default:
+                       printf("operation failed - diag=%d\n", diag);
+                       break;
+               }
+               return;
+       }
+       rss_hf = rss_conf.rss_hf;
+       if (rss_hf == 0) {
+               printf("RSS disabled\n");
+               return;
+       }
+       printf("RSS functions:\n ");
+       if (rss_hf & ETH_RSS_IPV4)
+               printf("ip4");
+       if (rss_hf & ETH_RSS_IPV4_TCP)
+               printf(" tcp4");
+       if (rss_hf & ETH_RSS_IPV4_UDP)
+               printf(" udp4");
+       if (rss_hf & ETH_RSS_IPV6)
+               printf(" ip6");
+       if (rss_hf & ETH_RSS_IPV6_EX)
+               printf(" ip6-ex");
+       if (rss_hf & ETH_RSS_IPV6_TCP)
+               printf(" tcp6");
+       if (rss_hf & ETH_RSS_IPV6_TCP_EX)
+               printf(" tcp6-ex");
+       if (rss_hf & ETH_RSS_IPV6_UDP)
+               printf(" udp6");
+       if (rss_hf & ETH_RSS_IPV6_UDP_EX)
+               printf(" udp6-ex");
+       printf("\n");
+       if (!show_rss_key)
+               return;
+       printf("RSS key:\n");
+       for (i = 0; i < sizeof(rss_key); i++)
+               printf("%02X", rss_key[i]);
+       printf("\n");
+}
+
 /*
  * Setup forwarding configuration for each logical core.
  */
@@ -725,7 +796,8 @@ simple_fwd_config_setup(void)
        portid_t j;
        portid_t inc = 2;
 
-       if (port_topology == PORT_TOPOLOGY_CHAINED) {
+       if (port_topology == PORT_TOPOLOGY_CHAINED ||
+           port_topology == PORT_TOPOLOGY_LOOP) {
                inc = 1;
        } else if (nb_fwd_ports % 2) {
                printf("\nWarning! Cannot handle an odd number of ports "
@@ -753,7 +825,10 @@ simple_fwd_config_setup(void)
        setup_fwd_config_of_each_lcore(&cur_fwd_config);
 
        for (i = 0; i < cur_fwd_config.nb_fwd_ports; i = (portid_t) (i + inc)) {
-               j = (portid_t) ((i + 1) % cur_fwd_config.nb_fwd_ports);
+               if (port_topology != PORT_TOPOLOGY_LOOP)
+                       j = (portid_t) ((i + 1) % cur_fwd_config.nb_fwd_ports);
+               else
+                       j = i;
                fwd_streams[i]->rx_port   = fwd_ports_ids[i];
                fwd_streams[i]->rx_queue  = 0;
                fwd_streams[i]->tx_port   = fwd_ports_ids[j];
@@ -817,10 +892,18 @@ rss_fwd_config_setup(void)
                struct fwd_stream *fs;
 
                fs = fwd_streams[lc_id];
+
                if ((rxp & 0x1) == 0)
                        txp = (portid_t) (rxp + 1);
                else
                        txp = (portid_t) (rxp - 1);
+               /*
+                * if we are in loopback, simply send stuff out through the
+                * ingress port
+                */
+               if (port_topology == PORT_TOPOLOGY_LOOP)
+                       txp = rxp;
+
                fs->rx_port = fwd_ports_ids[rxp];
                fs->rx_queue = rxq;
                fs->tx_port = fwd_ports_ids[txp];
@@ -952,10 +1035,69 @@ dcb_fwd_config_setup(void)
        }
 }
 
+static void
+icmp_echo_config_setup(void)
+{
+       portid_t  rxp;
+       queueid_t rxq;
+       lcoreid_t lc_id;
+       uint16_t  sm_id;
+
+       if ((nb_txq * nb_fwd_ports) < nb_fwd_lcores)
+               cur_fwd_config.nb_fwd_lcores = (lcoreid_t)
+                       (nb_txq * nb_fwd_ports);
+       else
+               cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
+       cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
+       cur_fwd_config.nb_fwd_streams =
+               (streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
+       if (cur_fwd_config.nb_fwd_streams < cur_fwd_config.nb_fwd_lcores)
+               cur_fwd_config.nb_fwd_lcores =
+                       (lcoreid_t)cur_fwd_config.nb_fwd_streams;
+       if (verbose_level > 0) {
+               printf("%s fwd_cores=%d fwd_ports=%d fwd_streams=%d\n",
+                      __FUNCTION__,
+                      cur_fwd_config.nb_fwd_lcores,
+                      cur_fwd_config.nb_fwd_ports,
+                      cur_fwd_config.nb_fwd_streams);
+       }
+
+       /* reinitialize forwarding streams */
+       init_fwd_streams();
+       setup_fwd_config_of_each_lcore(&cur_fwd_config);
+       rxp = 0; rxq = 0;
+       for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
+               if (verbose_level > 0)
+                       printf("  core=%d: \n", lc_id);
+               for (sm_id = 0; sm_id < fwd_lcores[lc_id]->stream_nb; sm_id++) {
+                       struct fwd_stream *fs;
+                       fs = fwd_streams[fwd_lcores[lc_id]->stream_idx + sm_id];
+                       fs->rx_port = fwd_ports_ids[rxp];
+                       fs->rx_queue = rxq;
+                       fs->tx_port = fs->rx_port;
+                       fs->tx_queue = lc_id;
+                       fs->peer_addr = fs->tx_port;
+                       if (verbose_level > 0)
+                               printf("  stream=%d port=%d rxq=%d txq=%d\n",
+                                      sm_id, fs->rx_port, fs->rx_queue,
+                                      fs->tx_queue);
+                       rxq = (queueid_t) (rxq + 1);
+                       if (rxq == nb_rxq) {
+                               rxq = 0;
+                               rxp = (portid_t) (rxp + 1);
+                       }
+               }
+       }
+}
+
 void
 fwd_config_setup(void)
 {
        cur_fwd_config.fwd_eng = cur_fwd_eng;
+       if (strcmp(cur_fwd_eng->fwd_mode_name, "icmpecho") == 0) {
+               icmp_echo_config_setup();
+               return;
+       }
        if ((nb_rxq > 1) && (nb_txq > 1)){
                if (dcb_config)
                        dcb_fwd_config_setup();
@@ -974,10 +1116,15 @@ pkt_fwd_config_display(struct fwd_config *cfg)
        streamid_t sm_id;
 
        printf("%s packet forwarding - ports=%d - cores=%d - streams=%d - "
-              "NUMA support %s\n",
-              cfg->fwd_eng->fwd_mode_name,
-              cfg->nb_fwd_ports, cfg->nb_fwd_lcores, cfg->nb_fwd_streams,
-              numa_support == 1 ? "enabled" : "disabled");
+               "NUMA support %s, MP over anonymous pages %s\n",
+               cfg->fwd_eng->fwd_mode_name,
+               cfg->nb_fwd_ports, cfg->nb_fwd_lcores, cfg->nb_fwd_streams,
+               numa_support == 1 ? "enabled" : "disabled",
+               mp_anon != 0 ? "enabled" : "disabled");
+
+       if (strcmp(cfg->fwd_eng->fwd_mode_name, "mac_retry") == 0)
+               printf("TX retry num: %u, delay between TX retries: %uus\n",
+                       burst_tx_retry_num, burst_tx_delay_time);
        for (lc_id = 0; lc_id < cfg->nb_fwd_lcores; lc_id++) {
                printf("Logical Core %u (socket %u) forwards packets on "
                       "%d streams:",
@@ -1208,6 +1355,25 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
        tx_pkt_nb_segs = (uint8_t) nb_segs;
 }
 
+char*
+list_pkt_forwarding_modes(void)
+{
+       static char fwd_modes[128] = "";
+       const char *separator = "|";
+       struct fwd_engine *fwd_eng;
+       unsigned i = 0;
+
+       if (strlen (fwd_modes) == 0) {
+               while ((fwd_eng = fwd_engines[i++]) != NULL) {
+                       strcat(fwd_modes, fwd_eng->fwd_mode_name);
+                       strcat(fwd_modes, separator);
+               }
+               fwd_modes[strlen(fwd_modes) - strlen(separator)] = '\0';
+       }
+
+       return fwd_modes;
+}
+
 void
 set_pkt_forwarding_mode(const char *fwd_mode_name)
 {