git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
eal/linux: fix build with glibc < 2.12
[dpdk.git] / examples / tep_termination / main.c
diff --git a/examples/tep_termination/main.c b/examples/tep_termination/main.c
index 69d73d6..f97d552 100644 (file)
--- a/examples/tep_termination/main.c
+++ b/examples/tep_termination/main.c
@@ -113,7 +113,11 @@
 
 #define CMD_LINE_OPT_NB_DEVICES "nb-devices"
 #define CMD_LINE_OPT_UDP_PORT "udp-port"
+#define CMD_LINE_OPT_TX_CHECKSUM "tx-checksum"
+#define CMD_LINE_OPT_TSO_SEGSZ "tso-segsz"
 #define CMD_LINE_OPT_FILTER_TYPE "filter-type"
+#define CMD_LINE_OPT_ENCAP "encap"
+#define CMD_LINE_OPT_DECAP "decap"
 #define CMD_LINE_OPT_RX_RETRY "rx-retry"
 #define CMD_LINE_OPT_RX_RETRY_DELAY "rx-retry-delay"
 #define CMD_LINE_OPT_RX_RETRY_NUM "rx-retry-num"
@@ -141,6 +145,18 @@ struct vpool {
 /* UDP tunneling port */
 uint16_t udp_port = 4789;
 
+/* enable/disable inner TX checksum */
+uint8_t tx_checksum = 0;
+
+/* TCP segment size */
+uint16_t tso_segsz = 0;
+
+/* enable/disable decapsulation */
+uint8_t rx_decap = 1;
+
+/* enable/disable encapsulation */
+uint8_t tx_encap = 1;
+
 /* RX filter type for tunneling packet */
 uint8_t filter_idx = 1;
 
@@ -260,6 +276,10 @@ tep_termination_usage(const char *prgname)
        RTE_LOG(INFO, VHOST_CONFIG, "%s [EAL options] -- -p PORTMASK\n"
        "               --udp-port: UDP destination port for VXLAN packet\n"
        "               --nb-devices[1-64]: The number of virtIO device\n"
+       "               --tx-checksum [0|1]: inner Tx checksum offload\n"
+       "               --tso-segsz [0-N]: TCP segment size\n"
+       "               --decap [0|1]: tunneling packet decapsulation\n"
+       "               --encap [0|1]: tunneling packet encapsulation\n"
        "               --filter-type[1-3]: filter type for tunneling packet\n"
        "                   1: Inner MAC and tenent ID\n"
        "                   2: Inner MAC and VLAN, and tenent ID\n"
@@ -289,6 +309,10 @@ tep_termination_parse_args(int argc, char **argv)
        static struct option long_option[] = {
                {CMD_LINE_OPT_NB_DEVICES, required_argument, NULL, 0},
                {CMD_LINE_OPT_UDP_PORT, required_argument, NULL, 0},
+               {CMD_LINE_OPT_TX_CHECKSUM, required_argument, NULL, 0},
+               {CMD_LINE_OPT_TSO_SEGSZ, required_argument, NULL, 0},
+               {CMD_LINE_OPT_DECAP, required_argument, NULL, 0},
+               {CMD_LINE_OPT_ENCAP, required_argument, NULL, 0},
                {CMD_LINE_OPT_FILTER_TYPE, required_argument, NULL, 0},
                {CMD_LINE_OPT_RX_RETRY, required_argument, NULL, 0},
                {CMD_LINE_OPT_RX_RETRY_DELAY, required_argument, NULL, 0},
@@ -341,6 +365,19 @@ tep_termination_parse_args(int argc, char **argv)
                                        enable_retry = ret;
                        }
 
+                       if (!strncmp(long_option[option_index].name,
+                               CMD_LINE_OPT_TSO_SEGSZ,
+                               sizeof(CMD_LINE_OPT_TSO_SEGSZ))) {
+                               ret = parse_num_opt(optarg, INT16_MAX);
+                               if (ret == -1) {
+                                       RTE_LOG(INFO, VHOST_CONFIG,
+                                               "Invalid argument for TCP segment size [0-N]\n");
+                                       tep_termination_usage(prgname);
+                                       return -1;
+                               } else
+                                       tso_segsz = ret;
+                       }
+
                        if (!strncmp(long_option[option_index].name,
                                        CMD_LINE_OPT_UDP_PORT,
                                        sizeof(CMD_LINE_OPT_UDP_PORT))) {
@@ -382,6 +419,19 @@ tep_termination_parse_args(int argc, char **argv)
                                        burst_rx_retry_num = ret;
                        }
 
+                       if (!strncmp(long_option[option_index].name,
+                               CMD_LINE_OPT_TX_CHECKSUM,
+                               sizeof(CMD_LINE_OPT_TX_CHECKSUM))) {
+                               ret = parse_num_opt(optarg, 1);
+                               if (ret == -1) {
+                                       RTE_LOG(INFO, VHOST_CONFIG,
+                                               "Invalid argument for tx-checksum [0|1]\n");
+                                       tep_termination_usage(prgname);
+                                       return -1;
+                               } else
+                                       tx_checksum = ret;
+                       }
+
                        if (!strncmp(long_option[option_index].name,
                                        CMD_LINE_OPT_FILTER_TYPE,
                                        sizeof(CMD_LINE_OPT_FILTER_TYPE))) {
@@ -395,6 +445,34 @@ tep_termination_parse_args(int argc, char **argv)
                                        filter_idx = ret - 1;
                        }
 
+                       /* Enable/disable encapsulation on RX. */
+                       if (!strncmp(long_option[option_index].name,
+                               CMD_LINE_OPT_DECAP,
+                               sizeof(CMD_LINE_OPT_DECAP))) {
+                               ret = parse_num_opt(optarg, 1);
+                               if (ret == -1) {
+                                       RTE_LOG(INFO, VHOST_CONFIG,
+                                               "Invalid argument for decap [0|1]\n");
+                                       tep_termination_usage(prgname);
+                                       return -1;
+                               } else
+                                       rx_decap = ret;
+                       }
+
+                       /* Enable/disable encapsulation on TX. */
+                       if (!strncmp(long_option[option_index].name,
+                               CMD_LINE_OPT_ENCAP,
+                               sizeof(CMD_LINE_OPT_ENCAP))) {
+                               ret = parse_num_opt(optarg, 1);
+                               if (ret == -1) {
+                                       RTE_LOG(INFO, VHOST_CONFIG,
+                                               "Invalid argument for encap [0|1]\n");
+                                       tep_termination_usage(prgname);
+                                       return -1;
+                               } else
+                                       tx_encap = ret;
+                       }
+
                        /* Enable/disable stats. */
                        if (!strncmp(long_option[option_index].name,
                                CMD_LINE_OPT_STATS,
@@ -1020,7 +1098,7 @@ print_stats(void)
 {
        struct virtio_net_data_ll *dev_ll;
        uint64_t tx_dropped, rx_dropped;
-       uint64_t tx, tx_total, rx, rx_total;
+       uint64_t tx, tx_total, rx, rx_total, rx_ip_csum, rx_l4_csum;
        uint32_t device_fh;
        const char clr[] = { 27, '[', '2', 'J', '\0' };
        const char top_left[] = { 27, '[', '1', ';', '1', 'H', '\0' };
@@ -1045,12 +1123,18 @@ print_stats(void)
                        rx = rte_atomic64_read(
                                &dev_statistics[device_fh].rx_atomic);
                        rx_dropped = rx_total - rx;
+                       rx_ip_csum = rte_atomic64_read(
+                               &dev_statistics[device_fh].rx_bad_ip_csum);
+                       rx_l4_csum = rte_atomic64_read(
+                               &dev_statistics[device_fh].rx_bad_l4_csum);
 
                        printf("\nStatistics for device %"PRIu32" ----------"
                                        "\nTX total:            %"PRIu64""
                                        "\nTX dropped:          %"PRIu64""
                                        "\nTX successful:               %"PRIu64""
                                        "\nRX total:            %"PRIu64""
+                                       "\nRX bad IP csum:      %"PRIu64""
+                                       "\nRX bad L4 csum:      %"PRIu64""
                                        "\nRX dropped:          %"PRIu64""
                                        "\nRX successful:               %"PRIu64"",
                                        device_fh,
@@ -1058,6 +1142,8 @@ print_stats(void)
                                        tx_dropped,
                                        tx,
                                        rx_total,
+                                       rx_ip_csum,
+                                       rx_l4_csum,
                                        rx_dropped,
                                        rx);
 
@@ -1081,6 +1167,7 @@ main(int argc, char *argv[])
        uint8_t portid;
        uint16_t queue_id;
        static pthread_t tid;
+       char thread_name[RTE_MAX_THREAD_NAME_LEN];
 
        /* init EAL */
        ret = rte_eal_init(argc, argv);
@@ -1157,8 +1244,15 @@ main(int argc, char *argv[])
        memset(&dev_statistics, 0, sizeof(dev_statistics));
 
        /* Enable stats if the user option is set. */
-       if (enable_stats)
-               pthread_create(&tid, NULL, (void *)print_stats, NULL);
+       if (enable_stats) {
+               ret = pthread_create(&tid, NULL, (void *)print_stats, NULL);
+               if (ret != 0)
+                       rte_exit(EXIT_FAILURE, "Cannot create print-stats thread\n");
+               snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "print-stats");
+               ret = rte_thread_setname(tid, thread_name);
+               if (ret != 0)
+                       RTE_LOG(ERR, VHOST_CONFIG, "Cannot set print-stats name\n");
+       }
 
        /* Launch all data cores. */
        RTE_LCORE_FOREACH_SLAVE(lcore_id) {
DPDK repo used for reviews