app/testpmd: support hairpin

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

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 5244872..9b6e35b 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -68,7 +68,8 @@ usage(char* progname)
               "--rss-ip | --rss-udp | "
               "--rxpt= | --rxht= | --rxwt= | --rxfreet= | "
               "--txpt= | --txht= | --txwt= | --txfreet= | "
-              "--txrst= | --tx-offloads= | --vxlan-gpe-port= ]\n",
+              "--txrst= | --tx-offloads= | | --rx-offloads= | "
+              "--vxlan-gpe-port= ]\n",
               progname);
 #ifdef RTE_LIBRTE_CMDLINE
        printf("  --interactive: run in interactive mode.\n");
@@ -135,10 +136,11 @@ usage(char* progname)
        printf("  --enable-hw-vlan-filter: enable hardware vlan filter.\n");
        printf("  --enable-hw-vlan-strip: enable hardware vlan strip.\n");
        printf("  --enable-hw-vlan-extend: enable hardware vlan extend.\n");
+       printf("  --enable-hw-qinq-strip: enable hardware qinq strip.\n");
        printf("  --enable-drop-en: enable per queue packet drop.\n");
        printf("  --disable-rss: disable rss.\n");
-       printf("  --port-topology=N: set port topology (N: paired (default) or "
-              "chained).\n");
+       printf("  --port-topology=<paired|chained|loop>: set port topology (paired "
+              "is default).\n");
        printf("  --forward-mode=N: set forwarding mode (N: %s).\n",
               list_pkt_forwarding_modes());
        printf("  --rss-ip: set RSS functions to IPv4/IPv6 only .\n");
@@ -147,6 +149,8 @@ usage(char* progname)
        printf("  --rxd=N: set the number of descriptors in RX rings to N.\n");
        printf("  --txq=N: set the number of TX queues per port to N.\n");
        printf("  --txd=N: set the number of descriptors in TX rings to N.\n");
+       printf("  --hairpinq=N: set the number of hairpin queues per port to "
+              "N.\n");
        printf("  --burst=N: set the number of packets per burst to N.\n");
        printf("  --mbcache=N: set the cache of mbuf memory pool to N.\n");
        printf("  --rxpt=N: set prefetch threshold register of RX rings to N.\n");
@@ -186,6 +190,7 @@ usage(char* progname)
        printf("  --flow-isolate-all: "
               "requests flow API isolated mode on all ports at initialization time.\n");
        printf("  --tx-offloads=0xXXXXXXXX: hexadecimal bitmask of TX queue offloads\n");
+       printf("  --rx-offloads=0xXXXXXXXX: hexadecimal bitmask of RX queue offloads\n");
        printf("  --hot-plug: enable hot plug for device.\n");
        printf("  --vxlan-gpe-port=N: UPD port of tunnel VXLAN-GPE\n");
        printf("  --mlockall: lock all memory\n");
@@ -562,6 +567,7 @@ launch_args_parse(int argc, char** argv)
        uint64_t tx_offloads = tx_mode.offloads;
        struct rte_eth_dev_info dev_info;
        uint16_t rec_nb_pkts;
+       int ret;
 
        static struct option lgopts[] = {
                { "help",                       0, 0, 0 },
@@ -607,6 +613,7 @@ launch_args_parse(int argc, char** argv)
                { "enable-hw-vlan-filter",      0, 0, 0 },
                { "enable-hw-vlan-strip",       0, 0, 0 },
                { "enable-hw-vlan-extend",      0, 0, 0 },
+               { "enable-hw-qinq-strip",       0, 0, 0 },
                { "enable-drop-en",            0, 0, 0 },
                { "disable-rss",                0, 0, 0 },
                { "port-topology",              1, 0, 0 },
@@ -617,6 +624,7 @@ launch_args_parse(int argc, char** argv)
                { "txq",                        1, 0, 0 },
                { "rxd",                        1, 0, 0 },
                { "txd",                        1, 0, 0 },
+               { "hairpinq",                   1, 0, 0 },
                { "burst",                      1, 0, 0 },
                { "mbcache",                    1, 0, 0 },
                { "txpt",                       1, 0, 0 },
@@ -641,6 +649,7 @@ launch_args_parse(int argc, char** argv)
                { "print-event",                1, 0, 0 },
                { "mask-event",                 1, 0, 0 },
                { "tx-offloads",                1, 0, 0 },
+               { "rx-offloads",                1, 0, 0 },
                { "hot-plug",                   0, 0, 0 },
                { "vxlan-gpe-port",             1, 0, 0 },
                { "mlockall",                   0, 0, 0 },
@@ -994,6 +1003,10 @@ launch_args_parse(int argc, char** argv)
                                        "enable-hw-vlan-extend"))
                                rx_offloads |= DEV_RX_OFFLOAD_VLAN_EXTEND;
 
+                       if (!strcmp(lgopts[opt_idx].name,
+                                       "enable-hw-qinq-strip"))
+                               rx_offloads |= DEV_RX_OFFLOAD_QINQ_STRIP;
+
                        if (!strcmp(lgopts[opt_idx].name, "enable-drop-en"))
                                rx_drop_en = 1;
 
@@ -1035,6 +1048,31 @@ launch_args_parse(int argc, char** argv)
                                                  " >= 0 && <= %u\n", n,
                                                  get_allowed_max_nb_txq(&pid));
                        }
+                       if (!strcmp(lgopts[opt_idx].name, "hairpinq")) {
+                               n = atoi(optarg);
+                               if (n >= 0 &&
+                                   check_nb_hairpinq((queueid_t)n) == 0)
+                                       nb_hairpinq = (queueid_t) n;
+                               else
+                                       rte_exit(EXIT_FAILURE, "txq %d invalid - must be"
+                                                 " >= 0 && <= %u\n", n,
+                                                 get_allowed_max_nb_hairpinq
+                                                 (&pid));
+                               if ((n + nb_txq) < 0 ||
+                                   check_nb_txq((queueid_t)(n + nb_txq)) != 0)
+                                       rte_exit(EXIT_FAILURE, "txq + hairpinq "
+                                                "%d invalid - must be"
+                                                 " >= 0 && <= %u\n",
+                                                 n + nb_txq,
+                                                 get_allowed_max_nb_txq(&pid));
+                               if ((n + nb_rxq) < 0 ||
+                                   check_nb_rxq((queueid_t)(n + nb_rxq)) != 0)
+                                       rte_exit(EXIT_FAILURE, "rxq + hairpinq "
+                                                "%d invalid - must be"
+                                                 " >= 0 && <= %u\n",
+                                                 n + nb_rxq,
+                                                 get_allowed_max_nb_rxq(&pid));
+                       }
                        if (!nb_rxq && !nb_txq) {
                                rte_exit(EXIT_FAILURE, "Either rx or tx queues should "
                                                "be non-zero\n");
@@ -1050,7 +1088,12 @@ launch_args_parse(int argc, char** argv)
                                         * value, on the assumption that all
                                         * ports are of the same NIC model.
                                         */
-                                       rte_eth_dev_info_get(0, &dev_info);
+                                       ret = eth_dev_info_get_print_err(
+                                                               0,
+                                                               &dev_info);
+                                       if (ret != 0)
+                                               return;
+
                                        rec_nb_pkts = dev_info
                                                .default_rxportconf.burst_size;
 
@@ -1215,6 +1258,17 @@ launch_args_parse(int argc, char** argv)
                                        rte_exit(EXIT_FAILURE,
                                                 "tx-offloads must be >= 0\n");
                        }
+
+                       if (!strcmp(lgopts[opt_idx].name, "rx-offloads")) {
+                               char *end = NULL;
+                               n = strtoull(optarg, &end, 16);
+                               if (n >= 0)
+                                       rx_offloads = (uint64_t)n;
+                               else
+                                       rte_exit(EXIT_FAILURE,
+                                                "rx-offloads must be >= 0\n");
+                       }
+
                        if (!strcmp(lgopts[opt_idx].name, "vxlan-gpe-port")) {
                                n = atoi(optarg);
                                if (n >= 0)