app/testpmd: use SPDX tags in 6WIND copyrighted files
[dpdk.git] / app / test-pmd / cmdline_flow.c
index 0592969..a5cf84f 100644 (file)
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2016 6WIND S.A.
- *   Copyright 2016 Mellanox.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of 6WIND S.A. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2016 6WIND S.A.
+ * Copyright 2016 Mellanox.
  */
 
 #include <stddef.h>
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
 
 #include <rte_common.h>
 #include <rte_ethdev.h>
 #include <rte_byteorder.h>
 #include <cmdline_parse.h>
+#include <cmdline_parse_etheraddr.h>
 #include <rte_flow.h>
 
 #include "testpmd.h"
@@ -57,6 +32,11 @@ enum index {
        INTEGER,
        UNSIGNED,
        PREFIX,
+       BOOLEAN,
+       STRING,
+       MAC_ADDR,
+       IPV4_ADDR,
+       IPV6_ADDR,
        RULE_ID,
        PORT_ID,
        GROUP_ID,
@@ -72,6 +52,7 @@ enum index {
        FLUSH,
        QUERY,
        LIST,
+       ISOLATE,
 
        /* Destroy arguments. */
        DESTROY_RULE,
@@ -106,6 +87,69 @@ enum index {
        ITEM_VF_ID,
        ITEM_PORT,
        ITEM_PORT_INDEX,
+       ITEM_RAW,
+       ITEM_RAW_RELATIVE,
+       ITEM_RAW_SEARCH,
+       ITEM_RAW_OFFSET,
+       ITEM_RAW_LIMIT,
+       ITEM_RAW_PATTERN,
+       ITEM_ETH,
+       ITEM_ETH_DST,
+       ITEM_ETH_SRC,
+       ITEM_ETH_TYPE,
+       ITEM_VLAN,
+       ITEM_VLAN_TPID,
+       ITEM_VLAN_TCI,
+       ITEM_VLAN_PCP,
+       ITEM_VLAN_DEI,
+       ITEM_VLAN_VID,
+       ITEM_IPV4,
+       ITEM_IPV4_TOS,
+       ITEM_IPV4_TTL,
+       ITEM_IPV4_PROTO,
+       ITEM_IPV4_SRC,
+       ITEM_IPV4_DST,
+       ITEM_IPV6,
+       ITEM_IPV6_TC,
+       ITEM_IPV6_FLOW,
+       ITEM_IPV6_PROTO,
+       ITEM_IPV6_HOP,
+       ITEM_IPV6_SRC,
+       ITEM_IPV6_DST,
+       ITEM_ICMP,
+       ITEM_ICMP_TYPE,
+       ITEM_ICMP_CODE,
+       ITEM_UDP,
+       ITEM_UDP_SRC,
+       ITEM_UDP_DST,
+       ITEM_TCP,
+       ITEM_TCP_SRC,
+       ITEM_TCP_DST,
+       ITEM_TCP_FLAGS,
+       ITEM_SCTP,
+       ITEM_SCTP_SRC,
+       ITEM_SCTP_DST,
+       ITEM_SCTP_TAG,
+       ITEM_SCTP_CKSUM,
+       ITEM_VXLAN,
+       ITEM_VXLAN_VNI,
+       ITEM_E_TAG,
+       ITEM_E_TAG_GRP_ECID_B,
+       ITEM_NVGRE,
+       ITEM_NVGRE_TNI,
+       ITEM_MPLS,
+       ITEM_MPLS_LABEL,
+       ITEM_GRE,
+       ITEM_GRE_PROTO,
+       ITEM_FUZZY,
+       ITEM_FUZZY_THRESH,
+       ITEM_GTP,
+       ITEM_GTP_TEID,
+       ITEM_GTPC,
+       ITEM_GTPU,
+       ITEM_GENEVE,
+       ITEM_GENEVE_VNI,
+       ITEM_GENEVE_PROTO,
 
        /* Validate/create actions. */
        ACTIONS,
@@ -113,8 +157,41 @@ enum index {
        ACTION_END,
        ACTION_VOID,
        ACTION_PASSTHRU,
+       ACTION_MARK,
+       ACTION_MARK_ID,
+       ACTION_FLAG,
+       ACTION_QUEUE,
+       ACTION_QUEUE_INDEX,
+       ACTION_DROP,
+       ACTION_COUNT,
+       ACTION_DUP,
+       ACTION_DUP_INDEX,
+       ACTION_RSS,
+       ACTION_RSS_QUEUES,
+       ACTION_RSS_QUEUE,
+       ACTION_PF,
+       ACTION_VF,
+       ACTION_VF_ORIGINAL,
+       ACTION_VF_ID,
+       ACTION_METER,
+       ACTION_METER_ID,
 };
 
+/** Size of pattern[] field in struct rte_flow_item_raw. */
+#define ITEM_RAW_PATTERN_SIZE 36
+
+/** Storage size for struct rte_flow_item_raw including pattern. */
+#define ITEM_RAW_SIZE \
+       (offsetof(struct rte_flow_item_raw, pattern) + ITEM_RAW_PATTERN_SIZE)
+
+/** Number of queue[] entries in struct rte_flow_action_rss. */
+#define ACTION_RSS_NUM 32
+
+/** Storage size for struct rte_flow_action_rss including queues. */
+#define ACTION_RSS_SIZE \
+       (offsetof(struct rte_flow_action_rss, queue) + \
+        sizeof(*((struct rte_flow_action_rss *)0)->queue) * ACTION_RSS_NUM)
+
 /** Maximum number of subsequent tokens and arguments on the stack. */
 #define CTX_STACK_SIZE 16
 
@@ -128,10 +205,9 @@ struct context {
        enum index prev; /**< Index of the last token seen. */
        int next_num; /**< Number of entries in next[]. */
        int args_num; /**< Number of entries in args[]. */
-       uint32_t reparse:1; /**< Start over from the beginning. */
        uint32_t eol:1; /**< EOL has been detected. */
        uint32_t last:1; /**< No more arguments. */
-       uint16_t port; /**< Current port ID (for completions). */
+       portid_t port; /**< Current port ID (for completions). */
        uint32_t objdata; /**< Object-specific data. */
        void *object; /**< Address of current object for relative offsets. */
        void *objmask; /**< Object a full mask must be written to. */
@@ -210,16 +286,48 @@ struct token {
                .mask = (const void *)&(const s){ .f = (1 << (b)) - 1 }, \
        })
 
+/** Static initializer for ARGS() to target an arbitrary bit-mask. */
+#define ARGS_ENTRY_MASK(s, f, m) \
+       (&(const struct arg){ \
+               .offset = offsetof(s, f), \
+               .size = sizeof(((s *)0)->f), \
+               .mask = (const void *)(m), \
+       })
+
+/** Same as ARGS_ENTRY_MASK() using network byte ordering for the value. */
+#define ARGS_ENTRY_MASK_HTON(s, f, m) \
+       (&(const struct arg){ \
+               .hton = 1, \
+               .offset = offsetof(s, f), \
+               .size = sizeof(((s *)0)->f), \
+               .mask = (const void *)(m), \
+       })
+
 /** Static initializer for ARGS() to target a pointer. */
 #define ARGS_ENTRY_PTR(s, f) \
        (&(const struct arg){ \
                .size = sizeof(*((s *)0)->f), \
        })
 
+/** Static initializer for ARGS() with arbitrary size. */
+#define ARGS_ENTRY_USZ(s, f, sz) \
+       (&(const struct arg){ \
+               .offset = offsetof(s, f), \
+               .size = (sz), \
+       })
+
+/** Same as ARGS_ENTRY() using network byte ordering. */
+#define ARGS_ENTRY_HTON(s, f) \
+       (&(const struct arg){ \
+               .hton = 1, \
+               .offset = offsetof(s, f), \
+               .size = sizeof(((s *)0)->f), \
+       })
+
 /** Parser output buffer layout expected by cmd_flow_parsed(). */
 struct buffer {
        enum index command; /**< Flow command. */
-       uint16_t port; /**< Affected port ID. */
+       portid_t port; /**< Affected port ID. */
        union {
                struct {
                        struct rte_flow_attr attr;
@@ -241,6 +349,9 @@ struct buffer {
                        uint32_t *group;
                        uint32_t group_n;
                } list; /**< List arguments. */
+               struct {
+                       int set;
+               } isolate; /**< Isolated mode arguments. */
        } args; /**< Command arguments. */
 };
 
@@ -306,6 +417,31 @@ static const enum index next_item[] = {
        ITEM_PF,
        ITEM_VF,
        ITEM_PORT,
+       ITEM_RAW,
+       ITEM_ETH,
+       ITEM_VLAN,
+       ITEM_IPV4,
+       ITEM_IPV6,
+       ITEM_ICMP,
+       ITEM_UDP,
+       ITEM_TCP,
+       ITEM_SCTP,
+       ITEM_VXLAN,
+       ITEM_E_TAG,
+       ITEM_NVGRE,
+       ITEM_MPLS,
+       ITEM_GRE,
+       ITEM_FUZZY,
+       ITEM_GTP,
+       ITEM_GTPC,
+       ITEM_GTPU,
+       ITEM_GENEVE,
+       ZERO,
+};
+
+static const enum index item_fuzzy[] = {
+       ITEM_FUZZY_THRESH,
+       ITEM_NEXT,
        ZERO,
 };
 
@@ -327,10 +463,180 @@ static const enum index item_port[] = {
        ZERO,
 };
 
+static const enum index item_raw[] = {
+       ITEM_RAW_RELATIVE,
+       ITEM_RAW_SEARCH,
+       ITEM_RAW_OFFSET,
+       ITEM_RAW_LIMIT,
+       ITEM_RAW_PATTERN,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_eth[] = {
+       ITEM_ETH_DST,
+       ITEM_ETH_SRC,
+       ITEM_ETH_TYPE,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_vlan[] = {
+       ITEM_VLAN_TPID,
+       ITEM_VLAN_TCI,
+       ITEM_VLAN_PCP,
+       ITEM_VLAN_DEI,
+       ITEM_VLAN_VID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_ipv4[] = {
+       ITEM_IPV4_TOS,
+       ITEM_IPV4_TTL,
+       ITEM_IPV4_PROTO,
+       ITEM_IPV4_SRC,
+       ITEM_IPV4_DST,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_ipv6[] = {
+       ITEM_IPV6_TC,
+       ITEM_IPV6_FLOW,
+       ITEM_IPV6_PROTO,
+       ITEM_IPV6_HOP,
+       ITEM_IPV6_SRC,
+       ITEM_IPV6_DST,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_icmp[] = {
+       ITEM_ICMP_TYPE,
+       ITEM_ICMP_CODE,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_udp[] = {
+       ITEM_UDP_SRC,
+       ITEM_UDP_DST,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_tcp[] = {
+       ITEM_TCP_SRC,
+       ITEM_TCP_DST,
+       ITEM_TCP_FLAGS,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_sctp[] = {
+       ITEM_SCTP_SRC,
+       ITEM_SCTP_DST,
+       ITEM_SCTP_TAG,
+       ITEM_SCTP_CKSUM,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_vxlan[] = {
+       ITEM_VXLAN_VNI,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_e_tag[] = {
+       ITEM_E_TAG_GRP_ECID_B,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_nvgre[] = {
+       ITEM_NVGRE_TNI,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_mpls[] = {
+       ITEM_MPLS_LABEL,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_gre[] = {
+       ITEM_GRE_PROTO,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_gtp[] = {
+       ITEM_GTP_TEID,
+       ITEM_NEXT,
+       ZERO,
+};
+
+static const enum index item_geneve[] = {
+       ITEM_GENEVE_VNI,
+       ITEM_GENEVE_PROTO,
+       ITEM_NEXT,
+       ZERO,
+};
+
 static const enum index next_action[] = {
        ACTION_END,
        ACTION_VOID,
        ACTION_PASSTHRU,
+       ACTION_MARK,
+       ACTION_FLAG,
+       ACTION_QUEUE,
+       ACTION_DROP,
+       ACTION_COUNT,
+       ACTION_DUP,
+       ACTION_RSS,
+       ACTION_PF,
+       ACTION_VF,
+       ACTION_METER,
+       ZERO,
+};
+
+static const enum index action_mark[] = {
+       ACTION_MARK_ID,
+       ACTION_NEXT,
+       ZERO,
+};
+
+static const enum index action_queue[] = {
+       ACTION_QUEUE_INDEX,
+       ACTION_NEXT,
+       ZERO,
+};
+
+static const enum index action_dup[] = {
+       ACTION_DUP_INDEX,
+       ACTION_NEXT,
+       ZERO,
+};
+
+static const enum index action_rss[] = {
+       ACTION_RSS_QUEUES,
+       ACTION_NEXT,
+       ZERO,
+};
+
+static const enum index action_vf[] = {
+       ACTION_VF_ORIGINAL,
+       ACTION_VF_ID,
+       ACTION_NEXT,
+       ZERO,
+};
+
+static const enum index action_meter[] = {
+       ACTION_METER_ID,
+       ACTION_NEXT,
        ZERO,
 };
 
@@ -342,6 +648,11 @@ static int parse_vc(struct context *, const struct token *,
                    void *, unsigned int);
 static int parse_vc_spec(struct context *, const struct token *,
                         const char *, unsigned int, void *, unsigned int);
+static int parse_vc_conf(struct context *, const struct token *,
+                        const char *, unsigned int, void *, unsigned int);
+static int parse_vc_action_rss_queue(struct context *, const struct token *,
+                                    const char *, unsigned int, void *,
+                                    unsigned int);
 static int parse_destroy(struct context *, const struct token *,
                         const char *, unsigned int,
                         void *, unsigned int);
@@ -357,23 +668,45 @@ static int parse_action(struct context *, const struct token *,
 static int parse_list(struct context *, const struct token *,
                      const char *, unsigned int,
                      void *, unsigned int);
+static int parse_isolate(struct context *, const struct token *,
+                        const char *, unsigned int,
+                        void *, unsigned int);
 static int parse_int(struct context *, const struct token *,
                     const char *, unsigned int,
                     void *, unsigned int);
 static int parse_prefix(struct context *, const struct token *,
                        const char *, unsigned int,
                        void *, unsigned int);
+static int parse_boolean(struct context *, const struct token *,
+                        const char *, unsigned int,
+                        void *, unsigned int);
+static int parse_string(struct context *, const struct token *,
+                       const char *, unsigned int,
+                       void *, unsigned int);
+static int parse_mac_addr(struct context *, const struct token *,
+                         const char *, unsigned int,
+                         void *, unsigned int);
+static int parse_ipv4_addr(struct context *, const struct token *,
+                          const char *, unsigned int,
+                          void *, unsigned int);
+static int parse_ipv6_addr(struct context *, const struct token *,
+                          const char *, unsigned int,
+                          void *, unsigned int);
 static int parse_port(struct context *, const struct token *,
                      const char *, unsigned int,
                      void *, unsigned int);
 static int comp_none(struct context *, const struct token *,
                     unsigned int, char *, unsigned int);
+static int comp_boolean(struct context *, const struct token *,
+                       unsigned int, char *, unsigned int);
 static int comp_action(struct context *, const struct token *,
                       unsigned int, char *, unsigned int);
 static int comp_port(struct context *, const struct token *,
                     unsigned int, char *, unsigned int);
 static int comp_rule_id(struct context *, const struct token *,
                        unsigned int, char *, unsigned int);
+static int comp_vc_action_rss_queue(struct context *, const struct token *,
+                                   unsigned int, char *, unsigned int);
 
 /** Token definitions. */
 static const struct token token_list[] = {
@@ -410,6 +743,41 @@ static const struct token token_list[] = {
                .call = parse_prefix,
                .comp = comp_none,
        },
+       [BOOLEAN] = {
+               .name = "{boolean}",
+               .type = "BOOLEAN",
+               .help = "any boolean value",
+               .call = parse_boolean,
+               .comp = comp_boolean,
+       },
+       [STRING] = {
+               .name = "{string}",
+               .type = "STRING",
+               .help = "fixed string",
+               .call = parse_string,
+               .comp = comp_none,
+       },
+       [MAC_ADDR] = {
+               .name = "{MAC address}",
+               .type = "MAC-48",
+               .help = "standard MAC address notation",
+               .call = parse_mac_addr,
+               .comp = comp_none,
+       },
+       [IPV4_ADDR] = {
+               .name = "{IPv4 address}",
+               .type = "IPV4 ADDRESS",
+               .help = "standard IPv4 address notation",
+               .call = parse_ipv4_addr,
+               .comp = comp_none,
+       },
+       [IPV6_ADDR] = {
+               .name = "{IPv6 address}",
+               .type = "IPV6 ADDRESS",
+               .help = "standard IPv6 address notation",
+               .call = parse_ipv6_addr,
+               .comp = comp_none,
+       },
        [RULE_ID] = {
                .name = "{rule id}",
                .type = "RULE ID",
@@ -449,7 +817,8 @@ static const struct token token_list[] = {
                              DESTROY,
                              FLUSH,
                              LIST,
-                             QUERY)),
+                             QUERY,
+                             ISOLATE)),
                .call = parse_init,
        },
        /* Sub-level commands. */
@@ -499,6 +868,15 @@ static const struct token token_list[] = {
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_list,
        },
+       [ISOLATE] = {
+               .name = "isolate",
+               .help = "restrict ingress traffic to the defined flow rules",
+               .next = NEXT(NEXT_ENTRY(BOOLEAN),
+                            NEXT_ENTRY(PORT_ID)),
+               .args = ARGS(ARGS_ENTRY(struct buffer, args.isolate.set),
+                            ARGS_ENTRY(struct buffer, port)),
+               .call = parse_isolate,
+       },
        /* Destroy arguments. */
        [DESTROY_RULE] = {
                .name = "rule",
@@ -654,6 +1032,448 @@ static const struct token token_list[] = {
                .next = NEXT(item_port, NEXT_ENTRY(UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_port, index)),
        },
+       [ITEM_RAW] = {
+               .name = "raw",
+               .help = "match an arbitrary byte string",
+               .priv = PRIV_ITEM(RAW, ITEM_RAW_SIZE),
+               .next = NEXT(item_raw),
+               .call = parse_vc,
+       },
+       [ITEM_RAW_RELATIVE] = {
+               .name = "relative",
+               .help = "look for pattern after the previous item",
+               .next = NEXT(item_raw, NEXT_ENTRY(BOOLEAN), item_param),
+               .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_item_raw,
+                                          relative, 1)),
+       },
+       [ITEM_RAW_SEARCH] = {
+               .name = "search",
+               .help = "search pattern from offset (see also limit)",
+               .next = NEXT(item_raw, NEXT_ENTRY(BOOLEAN), item_param),
+               .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_item_raw,
+                                          search, 1)),
+       },
+       [ITEM_RAW_OFFSET] = {
+               .name = "offset",
+               .help = "absolute or relative offset for pattern",
+               .next = NEXT(item_raw, NEXT_ENTRY(INTEGER), item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_raw, offset)),
+       },
+       [ITEM_RAW_LIMIT] = {
+               .name = "limit",
+               .help = "search area limit for start of pattern",
+               .next = NEXT(item_raw, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_raw, limit)),
+       },
+       [ITEM_RAW_PATTERN] = {
+               .name = "pattern",
+               .help = "byte string to look for",
+               .next = NEXT(item_raw,
+                            NEXT_ENTRY(STRING),
+                            NEXT_ENTRY(ITEM_PARAM_IS,
+                                       ITEM_PARAM_SPEC,
+                                       ITEM_PARAM_MASK)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_raw, length),
+                            ARGS_ENTRY_USZ(struct rte_flow_item_raw,
+                                           pattern,
+                                           ITEM_RAW_PATTERN_SIZE)),
+       },
+       [ITEM_ETH] = {
+               .name = "eth",
+               .help = "match Ethernet header",
+               .priv = PRIV_ITEM(ETH, sizeof(struct rte_flow_item_eth)),
+               .next = NEXT(item_eth),
+               .call = parse_vc,
+       },
+       [ITEM_ETH_DST] = {
+               .name = "dst",
+               .help = "destination MAC",
+               .next = NEXT(item_eth, NEXT_ENTRY(MAC_ADDR), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, dst)),
+       },
+       [ITEM_ETH_SRC] = {
+               .name = "src",
+               .help = "source MAC",
+               .next = NEXT(item_eth, NEXT_ENTRY(MAC_ADDR), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, src)),
+       },
+       [ITEM_ETH_TYPE] = {
+               .name = "type",
+               .help = "EtherType",
+               .next = NEXT(item_eth, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, type)),
+       },
+       [ITEM_VLAN] = {
+               .name = "vlan",
+               .help = "match 802.1Q/ad VLAN tag",
+               .priv = PRIV_ITEM(VLAN, sizeof(struct rte_flow_item_vlan)),
+               .next = NEXT(item_vlan),
+               .call = parse_vc,
+       },
+       [ITEM_VLAN_TPID] = {
+               .name = "tpid",
+               .help = "tag protocol identifier",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vlan, tpid)),
+       },
+       [ITEM_VLAN_TCI] = {
+               .name = "tci",
+               .help = "tag control information",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vlan, tci)),
+       },
+       [ITEM_VLAN_PCP] = {
+               .name = "pcp",
+               .help = "priority code point",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_vlan,
+                                                 tci, "\xe0\x00")),
+       },
+       [ITEM_VLAN_DEI] = {
+               .name = "dei",
+               .help = "drop eligible indicator",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_vlan,
+                                                 tci, "\x10\x00")),
+       },
+       [ITEM_VLAN_VID] = {
+               .name = "vid",
+               .help = "VLAN identifier",
+               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_vlan,
+                                                 tci, "\x0f\xff")),
+       },
+       [ITEM_IPV4] = {
+               .name = "ipv4",
+               .help = "match IPv4 header",
+               .priv = PRIV_ITEM(IPV4, sizeof(struct rte_flow_item_ipv4)),
+               .next = NEXT(item_ipv4),
+               .call = parse_vc,
+       },
+       [ITEM_IPV4_TOS] = {
+               .name = "tos",
+               .help = "type of service",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.type_of_service)),
+       },
+       [ITEM_IPV4_TTL] = {
+               .name = "ttl",
+               .help = "time to live",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.time_to_live)),
+       },
+       [ITEM_IPV4_PROTO] = {
+               .name = "proto",
+               .help = "next protocol ID",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.next_proto_id)),
+       },
+       [ITEM_IPV4_SRC] = {
+               .name = "src",
+               .help = "source address",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(IPV4_ADDR), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.src_addr)),
+       },
+       [ITEM_IPV4_DST] = {
+               .name = "dst",
+               .help = "destination address",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(IPV4_ADDR), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.dst_addr)),
+       },
+       [ITEM_IPV6] = {
+               .name = "ipv6",
+               .help = "match IPv6 header",
+               .priv = PRIV_ITEM(IPV6, sizeof(struct rte_flow_item_ipv6)),
+               .next = NEXT(item_ipv6),
+               .call = parse_vc,
+       },
+       [ITEM_IPV6_TC] = {
+               .name = "tc",
+               .help = "traffic class",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_ipv6,
+                                                 hdr.vtc_flow,
+                                                 "\x0f\xf0\x00\x00")),
+       },
+       [ITEM_IPV6_FLOW] = {
+               .name = "flow",
+               .help = "flow label",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_ipv6,
+                                                 hdr.vtc_flow,
+                                                 "\x00\x0f\xff\xff")),
+       },
+       [ITEM_IPV6_PROTO] = {
+               .name = "proto",
+               .help = "protocol (next header)",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,
+                                            hdr.proto)),
+       },
+       [ITEM_IPV6_HOP] = {
+               .name = "hop",
+               .help = "hop limit",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,
+                                            hdr.hop_limits)),
+       },
+       [ITEM_IPV6_SRC] = {
+               .name = "src",
+               .help = "source address",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(IPV6_ADDR), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,
+                                            hdr.src_addr)),
+       },
+       [ITEM_IPV6_DST] = {
+               .name = "dst",
+               .help = "destination address",
+               .next = NEXT(item_ipv6, NEXT_ENTRY(IPV6_ADDR), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,
+                                            hdr.dst_addr)),
+       },
+       [ITEM_ICMP] = {
+               .name = "icmp",
+               .help = "match ICMP header",
+               .priv = PRIV_ITEM(ICMP, sizeof(struct rte_flow_item_icmp)),
+               .next = NEXT(item_icmp),
+               .call = parse_vc,
+       },
+       [ITEM_ICMP_TYPE] = {
+               .name = "type",
+               .help = "ICMP packet type",
+               .next = NEXT(item_icmp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
+                                            hdr.icmp_type)),
+       },
+       [ITEM_ICMP_CODE] = {
+               .name = "code",
+               .help = "ICMP packet code",
+               .next = NEXT(item_icmp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
+                                            hdr.icmp_code)),
+       },
+       [ITEM_UDP] = {
+               .name = "udp",
+               .help = "match UDP header",
+               .priv = PRIV_ITEM(UDP, sizeof(struct rte_flow_item_udp)),
+               .next = NEXT(item_udp),
+               .call = parse_vc,
+       },
+       [ITEM_UDP_SRC] = {
+               .name = "src",
+               .help = "UDP source port",
+               .next = NEXT(item_udp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_udp,
+                                            hdr.src_port)),
+       },
+       [ITEM_UDP_DST] = {
+               .name = "dst",
+               .help = "UDP destination port",
+               .next = NEXT(item_udp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_udp,
+                                            hdr.dst_port)),
+       },
+       [ITEM_TCP] = {
+               .name = "tcp",
+               .help = "match TCP header",
+               .priv = PRIV_ITEM(TCP, sizeof(struct rte_flow_item_tcp)),
+               .next = NEXT(item_tcp),
+               .call = parse_vc,
+       },
+       [ITEM_TCP_SRC] = {
+               .name = "src",
+               .help = "TCP source port",
+               .next = NEXT(item_tcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_tcp,
+                                            hdr.src_port)),
+       },
+       [ITEM_TCP_DST] = {
+               .name = "dst",
+               .help = "TCP destination port",
+               .next = NEXT(item_tcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_tcp,
+                                            hdr.dst_port)),
+       },
+       [ITEM_TCP_FLAGS] = {
+               .name = "flags",
+               .help = "TCP flags",
+               .next = NEXT(item_tcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_tcp,
+                                            hdr.tcp_flags)),
+       },
+       [ITEM_SCTP] = {
+               .name = "sctp",
+               .help = "match SCTP header",
+               .priv = PRIV_ITEM(SCTP, sizeof(struct rte_flow_item_sctp)),
+               .next = NEXT(item_sctp),
+               .call = parse_vc,
+       },
+       [ITEM_SCTP_SRC] = {
+               .name = "src",
+               .help = "SCTP source port",
+               .next = NEXT(item_sctp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
+                                            hdr.src_port)),
+       },
+       [ITEM_SCTP_DST] = {
+               .name = "dst",
+               .help = "SCTP destination port",
+               .next = NEXT(item_sctp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
+                                            hdr.dst_port)),
+       },
+       [ITEM_SCTP_TAG] = {
+               .name = "tag",
+               .help = "validation tag",
+               .next = NEXT(item_sctp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
+                                            hdr.tag)),
+       },
+       [ITEM_SCTP_CKSUM] = {
+               .name = "cksum",
+               .help = "checksum",
+               .next = NEXT(item_sctp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
+                                            hdr.cksum)),
+       },
+       [ITEM_VXLAN] = {
+               .name = "vxlan",
+               .help = "match VXLAN header",
+               .priv = PRIV_ITEM(VXLAN, sizeof(struct rte_flow_item_vxlan)),
+               .next = NEXT(item_vxlan),
+               .call = parse_vc,
+       },
+       [ITEM_VXLAN_VNI] = {
+               .name = "vni",
+               .help = "VXLAN identifier",
+               .next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)),
+       },
+       [ITEM_E_TAG] = {
+               .name = "e_tag",
+               .help = "match E-Tag header",
+               .priv = PRIV_ITEM(E_TAG, sizeof(struct rte_flow_item_e_tag)),
+               .next = NEXT(item_e_tag),
+               .call = parse_vc,
+       },
+       [ITEM_E_TAG_GRP_ECID_B] = {
+               .name = "grp_ecid_b",
+               .help = "GRP and E-CID base",
+               .next = NEXT(item_e_tag, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_e_tag,
+                                                 rsvd_grp_ecid_b,
+                                                 "\x3f\xff")),
+       },
+       [ITEM_NVGRE] = {
+               .name = "nvgre",
+               .help = "match NVGRE header",
+               .priv = PRIV_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
+               .next = NEXT(item_nvgre),
+               .call = parse_vc,
+       },
+       [ITEM_NVGRE_TNI] = {
+               .name = "tni",
+               .help = "virtual subnet ID",
+               .next = NEXT(item_nvgre, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_nvgre, tni)),
+       },
+       [ITEM_MPLS] = {
+               .name = "mpls",
+               .help = "match MPLS header",
+               .priv = PRIV_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
+               .next = NEXT(item_mpls),
+               .call = parse_vc,
+       },
+       [ITEM_MPLS_LABEL] = {
+               .name = "label",
+               .help = "MPLS label",
+               .next = NEXT(item_mpls, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_mpls,
+                                                 label_tc_s,
+                                                 "\xff\xff\xf0")),
+       },
+       [ITEM_GRE] = {
+               .name = "gre",
+               .help = "match GRE header",
+               .priv = PRIV_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
+               .next = NEXT(item_gre),
+               .call = parse_vc,
+       },
+       [ITEM_GRE_PROTO] = {
+               .name = "protocol",
+               .help = "GRE protocol type",
+               .next = NEXT(item_gre, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre,
+                                            protocol)),
+       },
+       [ITEM_FUZZY] = {
+               .name = "fuzzy",
+               .help = "fuzzy pattern match, expect faster than default",
+               .priv = PRIV_ITEM(FUZZY,
+                               sizeof(struct rte_flow_item_fuzzy)),
+               .next = NEXT(item_fuzzy),
+               .call = parse_vc,
+       },
+       [ITEM_FUZZY_THRESH] = {
+               .name = "thresh",
+               .help = "match accuracy threshold",
+               .next = NEXT(item_fuzzy, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_fuzzy,
+                                       thresh)),
+       },
+       [ITEM_GTP] = {
+               .name = "gtp",
+               .help = "match GTP header",
+               .priv = PRIV_ITEM(GTP, sizeof(struct rte_flow_item_gtp)),
+               .next = NEXT(item_gtp),
+               .call = parse_vc,
+       },
+       [ITEM_GTP_TEID] = {
+               .name = "teid",
+               .help = "tunnel endpoint identifier",
+               .next = NEXT(item_gtp, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp, teid)),
+       },
+       [ITEM_GTPC] = {
+               .name = "gtpc",
+               .help = "match GTP header",
+               .priv = PRIV_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)),
+               .next = NEXT(item_gtp),
+               .call = parse_vc,
+       },
+       [ITEM_GTPU] = {
+               .name = "gtpu",
+               .help = "match GTP header",
+               .priv = PRIV_ITEM(GTPU, sizeof(struct rte_flow_item_gtp)),
+               .next = NEXT(item_gtp),
+               .call = parse_vc,
+       },
+       [ITEM_GENEVE] = {
+               .name = "geneve",
+               .help = "match GENEVE header",
+               .priv = PRIV_ITEM(GENEVE, sizeof(struct rte_flow_item_geneve)),
+               .next = NEXT(item_geneve),
+               .call = parse_vc,
+       },
+       [ITEM_GENEVE_VNI] = {
+               .name = "vni",
+               .help = "virtual network identifier",
+               .next = NEXT(item_geneve, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_geneve, vni)),
+       },
+       [ITEM_GENEVE_PROTO] = {
+               .name = "protocol",
+               .help = "GENEVE protocol type",
+               .next = NEXT(item_geneve, NEXT_ENTRY(UNSIGNED), item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_geneve,
+                                            protocol)),
+       },
+
        /* Validate/create actions. */
        [ACTIONS] = {
                .name = "actions",
@@ -686,6 +1506,133 @@ static const struct token token_list[] = {
                .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
                .call = parse_vc,
        },
+       [ACTION_MARK] = {
+               .name = "mark",
+               .help = "attach 32 bit value to packets",
+               .priv = PRIV_ACTION(MARK, sizeof(struct rte_flow_action_mark)),
+               .next = NEXT(action_mark),
+               .call = parse_vc,
+       },
+       [ACTION_MARK_ID] = {
+               .name = "id",
+               .help = "32 bit value to return with packets",
+               .next = NEXT(action_mark, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_mark, id)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_FLAG] = {
+               .name = "flag",
+               .help = "flag packets",
+               .priv = PRIV_ACTION(FLAG, 0),
+               .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+               .call = parse_vc,
+       },
+       [ACTION_QUEUE] = {
+               .name = "queue",
+               .help = "assign packets to a given queue index",
+               .priv = PRIV_ACTION(QUEUE,
+                                   sizeof(struct rte_flow_action_queue)),
+               .next = NEXT(action_queue),
+               .call = parse_vc,
+       },
+       [ACTION_QUEUE_INDEX] = {
+               .name = "index",
+               .help = "queue index to use",
+               .next = NEXT(action_queue, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_DROP] = {
+               .name = "drop",
+               .help = "drop packets (note: passthru has priority)",
+               .priv = PRIV_ACTION(DROP, 0),
+               .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+               .call = parse_vc,
+       },
+       [ACTION_COUNT] = {
+               .name = "count",
+               .help = "enable counters for this rule",
+               .priv = PRIV_ACTION(COUNT, 0),
+               .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+               .call = parse_vc,
+       },
+       [ACTION_DUP] = {
+               .name = "dup",
+               .help = "duplicate packets to a given queue index",
+               .priv = PRIV_ACTION(DUP, sizeof(struct rte_flow_action_dup)),
+               .next = NEXT(action_dup),
+               .call = parse_vc,
+       },
+       [ACTION_DUP_INDEX] = {
+               .name = "index",
+               .help = "queue index to duplicate packets to",
+               .next = NEXT(action_dup, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_dup, index)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_RSS] = {
+               .name = "rss",
+               .help = "spread packets among several queues",
+               .priv = PRIV_ACTION(RSS, ACTION_RSS_SIZE),
+               .next = NEXT(action_rss),
+               .call = parse_vc,
+       },
+       [ACTION_RSS_QUEUES] = {
+               .name = "queues",
+               .help = "queue indices to use",
+               .next = NEXT(action_rss, NEXT_ENTRY(ACTION_RSS_QUEUE)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_RSS_QUEUE] = {
+               .name = "{queue}",
+               .help = "queue index",
+               .call = parse_vc_action_rss_queue,
+               .comp = comp_vc_action_rss_queue,
+       },
+       [ACTION_PF] = {
+               .name = "pf",
+               .help = "redirect packets to physical device function",
+               .priv = PRIV_ACTION(PF, 0),
+               .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+               .call = parse_vc,
+       },
+       [ACTION_VF] = {
+               .name = "vf",
+               .help = "redirect packets to virtual device function",
+               .priv = PRIV_ACTION(VF, sizeof(struct rte_flow_action_vf)),
+               .next = NEXT(action_vf),
+               .call = parse_vc,
+       },
+       [ACTION_VF_ORIGINAL] = {
+               .name = "original",
+               .help = "use original VF ID if possible",
+               .next = NEXT(action_vf, NEXT_ENTRY(BOOLEAN)),
+               .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_vf,
+                                          original, 1)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_VF_ID] = {
+               .name = "id",
+               .help = "VF ID to redirect packets to",
+               .next = NEXT(action_vf, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_vf, id)),
+               .call = parse_vc_conf,
+       },
+       [ACTION_METER] = {
+               .name = "meter",
+               .help = "meter the directed packets at given id",
+               .priv = PRIV_ACTION(METER,
+                                   sizeof(struct rte_flow_action_meter)),
+               .next = NEXT(action_meter),
+               .call = parse_vc,
+       },
+       [ACTION_METER_ID] = {
+               .name = "mtr_id",
+               .help = "meter id to use",
+               .next = NEXT(action_meter, NEXT_ENTRY(UNSIGNED)),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter, mtr_id)),
+               .call = parse_vc_conf,
+       },
 };
 
 /** Remove and return last entry from argument stack. */
@@ -744,6 +1691,19 @@ arg_entry_bf_fill(void *dst, uintmax_t val, const struct arg *arg)
        return len;
 }
 
+/** Compare a string with a partial one of a given length. */
+static int
+strcmp_partial(const char *full, const char *partial, size_t partial_len)
+{
+       int r = strncmp(full, partial, partial_len);
+
+       if (r)
+               return r;
+       if (strlen(full) <= partial_len)
+               return 0;
+       return full[partial_len];
+}
+
 /**
  * Parse a prefix length and generate a bit-mask.
  *
@@ -826,7 +1786,7 @@ parse_default(struct context *ctx, const struct token *token,
        (void)ctx;
        (void)buf;
        (void)size;
-       if (strncmp(str, token->name, len))
+       if (strcmp_partial(token->name, str, len))
                return -1;
        return len;
 }
@@ -978,6 +1938,8 @@ parse_vc_spec(struct context *ctx, const struct token *token,
                return -1;
        /* Parse parameter types. */
        switch (ctx->curr) {
+               static const enum index prefix[] = NEXT_ENTRY(PREFIX);
+
        case ITEM_PARAM_IS:
                index = 0;
                objmask = 1;
@@ -992,7 +1954,7 @@ parse_vc_spec(struct context *ctx, const struct token *token,
                /* Modify next token to expect a prefix. */
                if (ctx->next_num < 2)
                        return -1;
-               ctx->next[ctx->next_num - 2] = NEXT_ENTRY(PREFIX);
+               ctx->next[ctx->next_num - 2] = prefix;
                /* Fall through. */
        case ITEM_PARAM_MASK:
                index = 2;
@@ -1020,6 +1982,78 @@ parse_vc_spec(struct context *ctx, const struct token *token,
        return len;
 }
 
+/** Parse action configuration field. */
+static int
+parse_vc_conf(struct context *ctx, const struct token *token,
+             const char *str, unsigned int len,
+             void *buf, unsigned int size)
+{
+       struct buffer *out = buf;
+       struct rte_flow_action *action;
+
+       (void)size;
+       /* Token name must match. */
+       if (parse_default(ctx, token, str, len, NULL, 0) < 0)
+               return -1;
+       /* Nothing else to do if there is no buffer. */
+       if (!out)
+               return len;
+       if (!out->args.vc.actions_n)
+               return -1;
+       action = &out->args.vc.actions[out->args.vc.actions_n - 1];
+       /* Point to selected object. */
+       ctx->object = out->args.vc.data;
+       ctx->objmask = NULL;
+       /* Update configuration pointer. */
+       action->conf = ctx->object;
+       return len;
+}
+
+/**
+ * Parse queue field for RSS action.
+ *
+ * Valid tokens are queue indices and the "end" token.
+ */
+static int
+parse_vc_action_rss_queue(struct context *ctx, const struct token *token,
+                         const char *str, unsigned int len,
+                         void *buf, unsigned int size)
+{
+       static const enum index next[] = NEXT_ENTRY(ACTION_RSS_QUEUE);
+       int ret;
+       int i;
+
+       (void)token;
+       (void)buf;
+       (void)size;
+       if (ctx->curr != ACTION_RSS_QUEUE)
+               return -1;
+       i = ctx->objdata >> 16;
+       if (!strcmp_partial("end", str, len)) {
+               ctx->objdata &= 0xffff;
+               return len;
+       }
+       if (i >= ACTION_RSS_NUM)
+               return -1;
+       if (push_args(ctx, ARGS_ENTRY(struct rte_flow_action_rss, queue[i])))
+               return -1;
+       ret = parse_int(ctx, token, str, len, NULL, 0);
+       if (ret < 0) {
+               pop_args(ctx);
+               return -1;
+       }
+       ++i;
+       ctx->objdata = i << 16 | (ctx->objdata & 0xffff);
+       /* Repeat token. */
+       if (ctx->next_num == RTE_DIM(ctx->next))
+               return -1;
+       ctx->next[ctx->next_num++] = next;
+       if (!ctx->object)
+               return len;
+       ((struct rte_flow_action_rss *)ctx->object)->num = i;
+       return len;
+}
+
 /** Parse tokens for destroy command. */
 static int
 parse_destroy(struct context *ctx, const struct token *token,
@@ -1130,7 +2164,7 @@ parse_action(struct context *ctx, const struct token *token,
                const struct parse_action_priv *priv;
 
                token = &token_list[next_action[i]];
-               if (strncmp(token->name, str, len))
+               if (strcmp_partial(token->name, str, len))
                        continue;
                priv = token->priv;
                if (!priv)
@@ -1183,6 +2217,33 @@ parse_list(struct context *ctx, const struct token *token,
        return len;
 }
 
+/** Parse tokens for isolate command. */
+static int
+parse_isolate(struct context *ctx, const struct token *token,
+             const char *str, unsigned int len,
+             void *buf, unsigned int size)
+{
+       struct buffer *out = buf;
+
+       /* Token name must match. */
+       if (parse_default(ctx, token, str, len, NULL, 0) < 0)
+               return -1;
+       /* Nothing else to do if there is no buffer. */
+       if (!out)
+               return len;
+       if (!out->command) {
+               if (ctx->curr != ISOLATE)
+                       return -1;
+               if (sizeof(*out) > size)
+                       return -1;
+               out->command = ctx->curr;
+               ctx->objdata = 0;
+               ctx->object = out;
+               ctx->objmask = NULL;
+       }
+       return len;
+}
+
 /**
  * Parse signed/unsigned integers 8 to 64-bit long.
  *
@@ -1226,6 +2287,19 @@ objmask:
        case sizeof(uint16_t):
                *(uint16_t *)buf = arg->hton ? rte_cpu_to_be_16(u) : u;
                break;
+       case sizeof(uint8_t [3]):
+#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
+               if (!arg->hton) {
+                       ((uint8_t *)buf)[0] = u;
+                       ((uint8_t *)buf)[1] = u >> 8;
+                       ((uint8_t *)buf)[2] = u >> 16;
+                       break;
+               }
+#endif
+               ((uint8_t *)buf)[0] = u >> 16;
+               ((uint8_t *)buf)[1] = u >> 8;
+               ((uint8_t *)buf)[2] = u;
+               break;
        case sizeof(uint32_t):
                *(uint32_t *)buf = arg->hton ? rte_cpu_to_be_32(u) : u;
                break;
@@ -1246,6 +2320,227 @@ error:
        return -1;
 }
 
+/**
+ * Parse a string.
+ *
+ * Two arguments (ctx->args) are retrieved from the stack to store data and
+ * its length (in that order).
+ */
+static int
+parse_string(struct context *ctx, const struct token *token,
+            const char *str, unsigned int len,
+            void *buf, unsigned int size)
+{
+       const struct arg *arg_data = pop_args(ctx);
+       const struct arg *arg_len = pop_args(ctx);
+       char tmp[16]; /* Ought to be enough. */
+       int ret;
+
+       /* Arguments are expected. */
+       if (!arg_data)
+               return -1;
+       if (!arg_len) {
+               push_args(ctx, arg_data);
+               return -1;
+       }
+       size = arg_data->size;
+       /* Bit-mask fill is not supported. */
+       if (arg_data->mask || size < len)
+               goto error;
+       if (!ctx->object)
+               return len;
+       /* Let parse_int() fill length information first. */
+       ret = snprintf(tmp, sizeof(tmp), "%u", len);
+       if (ret < 0)
+               goto error;
+       push_args(ctx, arg_len);
+       ret = parse_int(ctx, token, tmp, ret, NULL, 0);
+       if (ret < 0) {
+               pop_args(ctx);
+               goto error;
+       }
+       buf = (uint8_t *)ctx->object + arg_data->offset;
+       /* Output buffer is not necessarily NUL-terminated. */
+       memcpy(buf, str, len);
+       memset((uint8_t *)buf + len, 0x55, size - len);
+       if (ctx->objmask)
+               memset((uint8_t *)ctx->objmask + arg_data->offset, 0xff, len);
+       return len;
+error:
+       push_args(ctx, arg_len);
+       push_args(ctx, arg_data);
+       return -1;
+}
+
+/**
+ * Parse a MAC address.
+ *
+ * Last argument (ctx->args) is retrieved to determine storage size and
+ * location.
+ */
+static int
+parse_mac_addr(struct context *ctx, const struct token *token,
+              const char *str, unsigned int len,
+              void *buf, unsigned int size)
+{
+       const struct arg *arg = pop_args(ctx);
+       struct ether_addr tmp;
+       int ret;
+
+       (void)token;
+       /* Argument is expected. */
+       if (!arg)
+               return -1;
+       size = arg->size;
+       /* Bit-mask fill is not supported. */
+       if (arg->mask || size != sizeof(tmp))
+               goto error;
+       /* Only network endian is supported. */
+       if (!arg->hton)
+               goto error;
+       ret = cmdline_parse_etheraddr(NULL, str, &tmp, size);
+       if (ret < 0 || (unsigned int)ret != len)
+               goto error;
+       if (!ctx->object)
+               return len;
+       buf = (uint8_t *)ctx->object + arg->offset;
+       memcpy(buf, &tmp, size);
+       if (ctx->objmask)
+               memset((uint8_t *)ctx->objmask + arg->offset, 0xff, size);
+       return len;
+error:
+       push_args(ctx, arg);
+       return -1;
+}
+
+/**
+ * Parse an IPv4 address.
+ *
+ * Last argument (ctx->args) is retrieved to determine storage size and
+ * location.
+ */
+static int
+parse_ipv4_addr(struct context *ctx, const struct token *token,
+               const char *str, unsigned int len,
+               void *buf, unsigned int size)
+{
+       const struct arg *arg = pop_args(ctx);
+       char str2[len + 1];
+       struct in_addr tmp;
+       int ret;
+
+       /* Argument is expected. */
+       if (!arg)
+               return -1;
+       size = arg->size;
+       /* Bit-mask fill is not supported. */
+       if (arg->mask || size != sizeof(tmp))
+               goto error;
+       /* Only network endian is supported. */
+       if (!arg->hton)
+               goto error;
+       memcpy(str2, str, len);
+       str2[len] = '\0';
+       ret = inet_pton(AF_INET, str2, &tmp);
+       if (ret != 1) {
+               /* Attempt integer parsing. */
+               push_args(ctx, arg);
+               return parse_int(ctx, token, str, len, buf, size);
+       }
+       if (!ctx->object)
+               return len;
+       buf = (uint8_t *)ctx->object + arg->offset;
+       memcpy(buf, &tmp, size);
+       if (ctx->objmask)
+               memset((uint8_t *)ctx->objmask + arg->offset, 0xff, size);
+       return len;
+error:
+       push_args(ctx, arg);
+       return -1;
+}
+
+/**
+ * Parse an IPv6 address.
+ *
+ * Last argument (ctx->args) is retrieved to determine storage size and
+ * location.
+ */
+static int
+parse_ipv6_addr(struct context *ctx, const struct token *token,
+               const char *str, unsigned int len,
+               void *buf, unsigned int size)
+{
+       const struct arg *arg = pop_args(ctx);
+       char str2[len + 1];
+       struct in6_addr tmp;
+       int ret;
+
+       (void)token;
+       /* Argument is expected. */
+       if (!arg)
+               return -1;
+       size = arg->size;
+       /* Bit-mask fill is not supported. */
+       if (arg->mask || size != sizeof(tmp))
+               goto error;
+       /* Only network endian is supported. */
+       if (!arg->hton)
+               goto error;
+       memcpy(str2, str, len);
+       str2[len] = '\0';
+       ret = inet_pton(AF_INET6, str2, &tmp);
+       if (ret != 1)
+               goto error;
+       if (!ctx->object)
+               return len;
+       buf = (uint8_t *)ctx->object + arg->offset;
+       memcpy(buf, &tmp, size);
+       if (ctx->objmask)
+               memset((uint8_t *)ctx->objmask + arg->offset, 0xff, size);
+       return len;
+error:
+       push_args(ctx, arg);
+       return -1;
+}
+
+/** Boolean values (even indices stand for false). */
+static const char *const boolean_name[] = {
+       "0", "1",
+       "false", "true",
+       "no", "yes",
+       "N", "Y",
+       NULL,
+};
+
+/**
+ * Parse a boolean value.
+ *
+ * Last argument (ctx->args) is retrieved to determine storage size and
+ * location.
+ */
+static int
+parse_boolean(struct context *ctx, const struct token *token,
+             const char *str, unsigned int len,
+             void *buf, unsigned int size)
+{
+       const struct arg *arg = pop_args(ctx);
+       unsigned int i;
+       int ret;
+
+       /* Argument is expected. */
+       if (!arg)
+               return -1;
+       for (i = 0; boolean_name[i]; ++i)
+               if (!strcmp_partial(boolean_name[i], str, len))
+                       break;
+       /* Process token as integer. */
+       if (boolean_name[i])
+               str = i & 1 ? "1" : "0";
+       push_args(ctx, arg);
+       ret = parse_int(ctx, token, str, strlen(str), buf, size);
+       return ret > 0 ? (int)len : ret;
+}
+
 /** Parse port and update context. */
 static int
 parse_port(struct context *ctx, const struct token *token,
@@ -1284,6 +2579,23 @@ comp_none(struct context *ctx, const struct token *token,
        return 0;
 }
 
+/** Complete boolean values. */
+static int
+comp_boolean(struct context *ctx, const struct token *token,
+            unsigned int ent, char *buf, unsigned int size)
+{
+       unsigned int i;
+
+       (void)ctx;
+       (void)token;
+       for (i = 0; boolean_name[i]; ++i)
+               if (buf && i == ent)
+                       return snprintf(buf, size, "%s", boolean_name[i]);
+       if (buf)
+               return -1;
+       return i;
+}
+
 /** Complete action names. */
 static int
 comp_action(struct context *ctx, const struct token *token,
@@ -1312,7 +2624,7 @@ comp_port(struct context *ctx, const struct token *token,
 
        (void)ctx;
        (void)token;
-       FOREACH_PORT(p, ports) {
+       RTE_ETH_FOREACH_DEV(p) {
                if (buf && i == ent)
                        return snprintf(buf, size, "%u", p);
                ++i;
@@ -1333,7 +2645,7 @@ comp_rule_id(struct context *ctx, const struct token *token,
 
        (void)token;
        if (port_id_is_invalid(ctx->port, DISABLED_WARN) ||
-           ctx->port == (uint16_t)RTE_PORT_ALL)
+           ctx->port == (portid_t)RTE_PORT_ALL)
                return -1;
        port = &ports[ctx->port];
        for (pf = port->flow_list; pf != NULL; pf = pf->next) {
@@ -1346,6 +2658,24 @@ comp_rule_id(struct context *ctx, const struct token *token,
        return i;
 }
 
+/** Complete queue field for RSS action. */
+static int
+comp_vc_action_rss_queue(struct context *ctx, const struct token *token,
+                        unsigned int ent, char *buf, unsigned int size)
+{
+       static const char *const str[] = { "", "end", NULL };
+       unsigned int i;
+
+       (void)ctx;
+       (void)token;
+       for (i = 0; str[i] != NULL; ++i)
+               if (buf && i == ent)
+                       return snprintf(buf, size, "%s", str[i]);
+       if (buf)
+               return -1;
+       return i;
+}
+
 /** Internal context. */
 static struct context cmd_flow_context;
 
@@ -1361,7 +2691,6 @@ cmd_flow_context_init(struct context *ctx)
        ctx->prev = ZERO;
        ctx->next_num = 0;
        ctx->args_num = 0;
-       ctx->reparse = 0;
        ctx->eol = 0;
        ctx->last = 0;
        ctx->port = 0;
@@ -1382,9 +2711,6 @@ cmd_flow_parse(cmdline_parse_token_hdr_t *hdr, const char *src, void *result,
        int i;
 
        (void)hdr;
-       /* Restart as requested. */
-       if (ctx->reparse)
-               cmd_flow_context_init(ctx);
        token = &token_list[ctx->curr];
        /* Check argument length. */
        ctx->eol = 0;
@@ -1460,8 +2786,6 @@ cmd_flow_complete_get_nb(cmdline_parse_token_hdr_t *hdr)
        int i;
 
        (void)hdr;
-       /* Tell cmd_flow_parse() that context must be reinitialized. */
-       ctx->reparse = 1;
        /* Count number of tokens in current list. */
        if (ctx->next_num)
                list = ctx->next[ctx->next_num - 1];
@@ -1495,8 +2819,6 @@ cmd_flow_complete_get_elt(cmdline_parse_token_hdr_t *hdr, int index,
        int i;
 
        (void)hdr;
-       /* Tell cmd_flow_parse() that context must be reinitialized. */
-       ctx->reparse = 1;
        /* Count number of tokens in current list. */
        if (ctx->next_num)
                list = ctx->next[ctx->next_num - 1];
@@ -1531,8 +2853,6 @@ cmd_flow_get_help(cmdline_parse_token_hdr_t *hdr, char *dst, unsigned int size)
        const struct token *token = &token_list[ctx->prev];
 
        (void)hdr;
-       /* Tell cmd_flow_parse() that context must be reinitialized. */
-       ctx->reparse = 1;
        if (!size)
                return -1;
        /* Set token type and update global help with details. */
@@ -1558,12 +2878,12 @@ static struct cmdline_token_hdr cmd_flow_token_hdr = {
 /** Populate the next dynamic token. */
 static void
 cmd_flow_tok(cmdline_parse_token_hdr_t **hdr,
-            cmdline_parse_token_hdr_t *(*hdrs)[])
+            cmdline_parse_token_hdr_t **hdr_inst)
 {
        struct context *ctx = &cmd_flow_context;
 
        /* Always reinitialize context before requesting the first token. */
-       if (!(hdr - *hdrs))
+       if (!(hdr_inst - cmd_flow.tokens))
                cmd_flow_context_init(ctx);
        /* Return NULL when no more tokens are expected. */
        if (!ctx->next_num && ctx->curr) {
@@ -1613,6 +2933,9 @@ cmd_flow_parsed(const struct buffer *in)
                port_flow_list(in->port, in->args.list.group_n,
                               in->args.list.group);
                break;
+       case ISOLATE:
+               port_flow_isolate(in->port, in->args.isolate.set);
+               break;
        default:
                break;
        }