doc: remove references to make from cryptodevs guide

[dpdk.git] / app / test-flow-perf / main.c

diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index 1b456e6..03d01a8 100644 (file)
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -53,6 +53,7 @@ static uint64_t flow_actions[MAX_ACTIONS_NUM];
 static uint64_t flow_attrs[MAX_ATTRS_NUM];
 static uint8_t items_idx, actions_idx, attrs_idx;
 
+static uint64_t ports_mask;
 static volatile bool force_quit;
 static bool dump_iterations;
 static bool delete_flag;
@@ -106,6 +107,7 @@ usage(char *progname)
        printf("  --dump-socket-mem: To dump all socket memory\n");
        printf("  --enable-fwd: To enable packets forwarding"
                " after insertion\n");
+       printf("  --portmask=N: hexadecimal bitmask of ports used\n");
 
        printf("To set flow attributes:\n");
        printf("  --ingress: set ingress attribute in flows\n");
@@ -128,6 +130,8 @@ usage(char *progname)
        printf("  --gtp: add gtp layer in flow items\n");
        printf("  --meta: add meta layer in flow items\n");
        printf("  --tag: add tag layer in flow items\n");
+       printf("  --icmpv4: add icmpv4 layer in flow items\n");
+       printf("  --icmpv6: add icmpv6 layer in flow items\n");
 
        printf("To set flow actions:\n");
        printf("  --port-id: add port-id action in flow actions\n");
@@ -180,13 +184,19 @@ usage(char *progname)
        printf("  --raw-decap=<data>: add raw decap action to flow actions\n"
                "Data is the data needed to be decaped\n"
                "Example: raw-decap=ether,ipv4,udp,vxlan\n");
+       printf("  --vxlan-encap: add vxlan-encap action to flow actions\n"
+               "Encapped data is fixed with pattern: ether,ipv4,udp,vxlan\n"
+               "With fixed values\n");
+       printf("  --vxlan-decap: add vxlan_decap action to flow actions\n");
 }
 
 static void
 args_parse(int argc, char **argv)
 {
+       uint64_t pm;
        char **argvopt;
        char *token;
+       char *end;
        int n, opt;
        int opt_idx;
        size_t i;
@@ -276,6 +286,18 @@ args_parse(int argc, char **argv)
                        .map = &flow_items[0],
                        .map_idx = &items_idx
                },
+               {
+                       .str = "icmpv4",
+                       .mask = FLOW_ITEM_MASK(RTE_FLOW_ITEM_TYPE_ICMP),
+                       .map = &flow_items[0],
+                       .map_idx = &items_idx
+               },
+               {
+                       .str = "icmpv6",
+                       .mask = FLOW_ITEM_MASK(RTE_FLOW_ITEM_TYPE_ICMP6),
+                       .map = &flow_items[0],
+                       .map_idx = &items_idx
+               },
                {
                        .str = "ingress",
                        .mask = INGRESS,
@@ -484,6 +506,22 @@ args_parse(int argc, char **argv)
                        .map = &flow_actions[0],
                        .map_idx = &actions_idx
                },
+               {
+                       .str = "vxlan-encap",
+                       .mask = FLOW_ACTION_MASK(
+                               RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP
+                       ),
+                       .map = &flow_actions[0],
+                       .map_idx = &actions_idx
+               },
+               {
+                       .str = "vxlan-decap",
+                       .mask = FLOW_ACTION_MASK(
+                               RTE_FLOW_ACTION_TYPE_VXLAN_DECAP
+                       ),
+                       .map = &flow_actions[0],
+                       .map_idx = &actions_idx
+               },
        };
 
        static const struct option lgopts[] = {
@@ -494,6 +532,7 @@ args_parse(int argc, char **argv)
                { "deletion-rate",              0, 0, 0 },
                { "dump-socket-mem",            0, 0, 0 },
                { "enable-fwd",                 0, 0, 0 },
+               { "portmask",                   1, 0, 0 },
                /* Attributes */
                { "ingress",                    0, 0, 0 },
                { "egress",                     0, 0, 0 },
@@ -513,6 +552,8 @@ args_parse(int argc, char **argv)
                { "gtp",                        0, 0, 0 },
                { "meta",                       0, 0, 0 },
                { "tag",                        0, 0, 0 },
+               { "icmpv4",                     0, 0, 0 },
+               { "icmpv6",                     0, 0, 0 },
                /* Actions */
                { "port-id",                    0, 0, 0 },
                { "rss",                        0, 0, 0 },
@@ -544,8 +585,13 @@ args_parse(int argc, char **argv)
                { "flag",                       0, 0, 0 },
                { "raw-encap",                  1, 0, 0 },
                { "raw-decap",                  1, 0, 0 },
+               { "vxlan-encap",                0, 0, 0 },
+               { "vxlan-decap",                0, 0, 0 },
        };
 
+       RTE_ETH_FOREACH_DEV(i)
+               ports_mask |= 1 << i;
+
        hairpin_queues_num = 0;
        argvopt = argv;
 
@@ -681,6 +727,15 @@ args_parse(int argc, char **argv)
                        if (strcmp(lgopts[opt_idx].name,
                                        "enable-fwd") == 0)
                                enable_fwd = true;
+                       if (strcmp(lgopts[opt_idx].name,
+                                       "portmask") == 0) {
+                               /* parse hexadecimal string */
+                               end = NULL;
+                               pm = strtoull(optarg, &end, 16);
+                               if ((optarg[0] == '\0') || (end == NULL) || (*end != '\0'))
+                                       rte_exit(EXIT_FAILURE, "Invalid fwd port mask\n");
+                               ports_mask = pm;
+                       }
                        break;
                default:
                        fprintf(stderr, "Invalid option: %s\n", argv[optind]);
@@ -858,6 +913,9 @@ flows_handler(void)
                rte_exit(EXIT_FAILURE, "No Memory available!");
 
        for (port_id = 0; port_id < nr_ports; port_id++) {
+               /* If port outside portmask */
+               if (!((ports_mask >> port_id) & 0x1))
+                       continue;
                cpu_time_used = 0;
                flow_index = 0;
                if (flow_group > 0) {
@@ -1387,12 +1445,13 @@ main(int argc, char **argv)
 
        if (enable_fwd) {
                init_lcore_info();
-               rte_eal_mp_remote_launch(start_forwarding, NULL, CALL_MASTER);
+               rte_eal_mp_remote_launch(start_forwarding, NULL, CALL_MAIN);
        }
 
        RTE_ETH_FOREACH_DEV(port) {
                rte_flow_flush(port, &error);
-               rte_eth_dev_stop(port);
+               if (rte_eth_dev_stop(port) != 0)
+                       printf("Failed to stop device on port %u\n", port);
                rte_eth_dev_close(port);
        }
        return 0;