ethdev: update VMDq/DCB support

[dpdk.git] / examples / multi_process / symmetric_mp / main.c

diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c
index bfd253b..efd6a47 100644 (file)
--- a/examples/multi_process/symmetric_mp/main.c
+++ b/examples/multi_process/symmetric_mp/main.c
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
  *   All rights reserved.
  * 
  *   Redistribution and use in source and binary forms, with or without 
@@ -76,6 +76,7 @@
 #include <rte_memcpy.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
+#include <rte_cycles.h>
 
 #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
 
@@ -233,22 +234,6 @@ smp_parse_args(int argc, char **argv)
        return (ret);
 }
 
-/* Queries the link status of a port and prints it to screen */
-static void
-report_link_status(uint8_t port)
-{
-       /* get link status */
-       struct rte_eth_link link;
-       rte_eth_link_get(port, &link);
-       if (link.link_status)
-               printf("Port %u: Link Up - %u Gbps - %s\n", (unsigned)port,
-                               (unsigned) link.link_speed / 1000,
-                               (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
-                                               ("full-duplex") : ("half-duplex\n"));
-       else
-               printf("Port %u: Link Down\n", (unsigned)port);
-}
-
 /*
  * Initialises a given port using global settings and with the rx buffers
  * coming from the mbuf_pool passed as parameter
@@ -258,7 +243,7 @@ smp_port_init(uint8_t port, struct rte_mempool *mbuf_pool, uint16_t num_queues)
 {
        struct rte_eth_conf port_conf = {
                        .rxmode = {
-                               .mq_mode = ETH_RSS,
+                               .mq_mode = ETH_MQ_RX_RSS,
                                .split_hdr_size = 0,
                                .header_split   = 0, /**< Header Split disabled */
                                .hw_ip_checksum = 1, /**< IP checksum offload enabled */
@@ -269,11 +254,11 @@ smp_port_init(uint8_t port, struct rte_mempool *mbuf_pool, uint16_t num_queues)
                        .rx_adv_conf = {
                                .rss_conf = {
                                        .rss_key = NULL,
-                                       .rss_hf = ETH_RSS_IPV4,
+                                       .rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6,
                                },
                        },
                        .txmode = {
-                               .mq_mode = ETH_DCB_NONE,
+                               .mq_mode = ETH_MQ_TX_NONE,
                        }
        };
        const uint16_t rx_rings = num_queues, tx_rings = num_queues;
@@ -400,6 +385,61 @@ lcore_main(void *arg __rte_unused)
        }
 }
 
+/* Check the link status of all ports in up to 9s, and print them finally */
+static void
+check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
+{
+#define CHECK_INTERVAL 100 /* 100ms */
+#define MAX_CHECK_TIME 90 /* 9s (90 * 100ms) in total */
+       uint8_t portid, count, all_ports_up, print_flag = 0;
+       struct rte_eth_link link;
+
+       printf("\nChecking link status");
+       fflush(stdout);
+       for (count = 0; count <= MAX_CHECK_TIME; count++) {
+               all_ports_up = 1;
+               for (portid = 0; portid < port_num; portid++) {
+                       if ((port_mask & (1 << portid)) == 0)
+                               continue;
+                       memset(&link, 0, sizeof(link));
+                       rte_eth_link_get_nowait(portid, &link);
+                       /* print link status if flag set */
+                       if (print_flag == 1) {
+                               if (link.link_status)
+                                       printf("Port %d Link Up - speed %u "
+                                               "Mbps - %s\n", (uint8_t)portid,
+                                               (unsigned)link.link_speed,
+                               (link.link_duplex == ETH_LINK_FULL_DUPLEX) ?
+                                       ("full-duplex") : ("half-duplex\n"));
+                               else
+                                       printf("Port %d Link Down\n",
+                                                       (uint8_t)portid);
+                               continue;
+                       }
+                       /* clear all_ports_up flag if any link down */
+                       if (link.link_status == 0) {
+                               all_ports_up = 0;
+                               break;
+                       }
+               }
+               /* after finally printing all link status, get out */
+               if (print_flag == 1)
+                       break;
+
+               if (all_ports_up == 0) {
+                       printf(".");
+                       fflush(stdout);
+                       rte_delay_ms(CHECK_INTERVAL);
+               }
+
+               /* set the print_flag if all ports up or timeout */
+               if (all_ports_up == 1 || count == (MAX_CHECK_TIME - 1)) {
+                       print_flag = 1;
+                       printf("done\n");
+               }
+       }
+}
+
 /* Main function.
  * Performs initialisation and then calls the lcore_main on each core
  * to do the packet-processing work.
@@ -452,9 +492,11 @@ main(int argc, char **argv)
                if(proc_type == RTE_PROC_PRIMARY)
                        if (smp_port_init(ports[i], mp, (uint16_t)num_procs) < 0)
                                rte_exit(EXIT_FAILURE, "Error initialising ports\n");
-               report_link_status(ports[i]);
        }
 
+       if (proc_type == RTE_PROC_PRIMARY)
+               check_all_ports_link_status((uint8_t)num_ports, (~0x0));
+
        assign_ports_to_cores();
 
        RTE_LOG(INFO, APP, "Finished Process Init.\n");