examples: adjust Rx and Tx descriptors to device limits

[dpdk.git] / examples / l2fwd-keepalive / main.c

diff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c
index 8da89aa..3c6a9d3 100644 (file)
--- a/examples/l2fwd-keepalive/main.c
+++ b/examples/l2fwd-keepalive/main.c
@@ -44,6 +44,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <getopt.h>
+#include <signal.h>
 
 #include <rte_common.h>
 #include <rte_log.h>
@@ -66,12 +67,13 @@
 #include <rte_debug.h>
 #include <rte_ether.h>
 #include <rte_ethdev.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_timer.h>
 #include <rte_keepalive.h>
 
+#include "shm.h"
+
 #define RTE_LOGTYPE_L2FWD RTE_LOGTYPE_USER1
 
 #define NB_MBUF   8192
@@ -115,7 +117,7 @@ static const struct rte_eth_conf port_conf = {
                .hw_ip_checksum = 0, /**< IP checksum offload disabled */
                .hw_vlan_filter = 0, /**< VLAN filtering disabled */
                .jumbo_frame    = 0, /**< Jumbo Frame Support disabled */
-               .hw_strip_crc   = 0, /**< CRC stripped by hardware */
+               .hw_strip_crc   = 1, /**< CRC stripped by hardware */
        },
        .txmode = {
                .mq_mode = ETH_MQ_TX_NONE,
@@ -141,6 +143,15 @@ static int64_t check_period = 5; /* default check cycle is 5ms */
 /* Keepalive structure */
 struct rte_keepalive *rte_global_keepalive_info;
 
+/* Termination signalling */
+static int terminate_signal_received;
+
+/* Termination signal handler */
+static void handle_sigterm(__rte_unused int value)
+{
+       terminate_signal_received = 1;
+}
+
 /* Print out statistics on packets dropped */
 static void
 print_stats(__attribute__((unused)) struct rte_timer *ptr_timer,
@@ -250,7 +261,7 @@ l2fwd_main_loop(void)
        uint64_t tsc_initial = rte_rdtsc();
        uint64_t tsc_lifetime = (rand()&0x07) * rte_get_tsc_hz();
 
-       while (1) {
+       while (!terminate_signal_received) {
                /* Keepalive heartbeat */
                rte_keepalive_mark_alive(rte_global_keepalive_info);
 
@@ -463,7 +474,7 @@ l2fwd_parse_args(int argc, char **argv)
                argv[optind-1] = prgname;
 
        ret = optind-1;
-       optind = 0; /* reset getopt lib */
+       optind = 1; /* reset getopt lib */
        return ret;
 }
 
@@ -523,8 +534,10 @@ check_all_ports_link_status(uint8_t port_num, uint32_t port_mask)
 }
 
 static void
-dead_core(__attribute__((unused)) void *ptr_data, const int id_core)
+dead_core(__rte_unused void *ptr_data, const int id_core)
 {
+       if (terminate_signal_received)
+               return;
        printf("Dead core %i - restarting..\n", id_core);
        if (rte_eal_get_lcore_state(id_core) == FINISHED) {
                rte_eal_wait_lcore(id_core);
@@ -534,6 +547,14 @@ dead_core(__attribute__((unused)) void *ptr_data, const int id_core)
        }
 }
 
+static void
+relay_core_state(void *ptr_data, const int id_core,
+       const enum rte_keepalive_state core_state, uint64_t last_alive)
+{
+       rte_keepalive_relayed_state((struct rte_keepalive_shm *)ptr_data,
+               id_core, core_state, last_alive);
+}
+
 int
 main(int argc, char **argv)
 {
@@ -545,6 +566,16 @@ main(int argc, char **argv)
        uint8_t portid, last_port;
        unsigned lcore_id, rx_lcore_id;
        unsigned nb_ports_in_mask = 0;
+       struct sigaction signal_handler;
+       struct rte_keepalive_shm *ka_shm;
+
+       memset(&signal_handler, 0, sizeof(signal_handler));
+       terminate_signal_received = 0;
+       signal_handler.sa_handler = &handle_sigterm;
+       if (sigaction(SIGINT, &signal_handler, NULL) == -1 ||
+                       sigaction(SIGTERM, &signal_handler, NULL) == -1)
+               rte_exit(EXIT_FAILURE, "SIGNAL\n");
+
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
@@ -570,9 +601,6 @@ main(int argc, char **argv)
        if (nb_ports == 0)
                rte_exit(EXIT_FAILURE, "No Ethernet ports - bye\n");
 
-       if (nb_ports > RTE_MAX_ETHPORTS)
-               nb_ports = RTE_MAX_ETHPORTS;
-
        /* reset l2fwd_dst_ports */
        for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++)
                l2fwd_dst_ports[portid] = 0;
@@ -649,6 +677,13 @@ main(int argc, char **argv)
                                "Cannot configure device: err=%d, port=%u\n",
                                ret, (unsigned) portid);
 
+               ret = rte_eth_dev_adjust_nb_rx_tx_desc(portid, &nb_rxd,
+                                                      &nb_txd);
+               if (ret < 0)
+                       rte_exit(EXIT_FAILURE,
+                               "Cannot adjust number of descriptors: err=%d, port=%u\n",
+                               ret, (unsigned) portid);
+
                rte_eth_macaddr_get(portid, &l2fwd_ports_eth_addr[portid]);
 
                /* init one RX queue */
@@ -724,11 +759,18 @@ main(int argc, char **argv)
        rte_timer_subsystem_init();
        rte_timer_init(&stats_timer);
 
+       ka_shm = NULL;
        if (check_period > 0) {
+               ka_shm = rte_keepalive_shm_create();
+               if (ka_shm == NULL)
+                       rte_exit(EXIT_FAILURE,
+                               "rte_keepalive_shm_create() failed");
                rte_global_keepalive_info =
-                       rte_keepalive_create(&dead_core, NULL);
+                       rte_keepalive_create(&dead_core, ka_shm);
                if (rte_global_keepalive_info == NULL)
                        rte_exit(EXIT_FAILURE, "init_keep_alive() failed");
+               rte_keepalive_register_relay_callback(rte_global_keepalive_info,
+                       relay_core_state, ka_shm);
                rte_timer_init(&hb_timer);
                if (rte_timer_reset(&hb_timer,
                                (check_period * rte_get_timer_hz()) / 1000,
@@ -768,7 +810,7 @@ main(int argc, char **argv)
                                lcore_id);
                }
        }
-       for (;;) {
+       while (!terminate_signal_received) {
                rte_timer_manage();
                rte_delay_ms(5);
                }
@@ -778,5 +820,7 @@ main(int argc, char **argv)
                        return -1;
        }
 
+       if (ka_shm != NULL)
+               rte_keepalive_shm_cleanup(ka_shm);
        return 0;
 }