net/virtio: avoid unneeded link interrupt configuration
[dpdk.git] / app / test-pmd / cmdline_flow.c
index 7ba074e..6cd99bf 100644 (file)
@@ -10,8 +10,6 @@
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
 
 #include <rte_string_fns.h>
 #include <rte_common.h>
@@ -40,21 +38,25 @@ enum index {
        END_SET,
 
        /* Common tokens. */
-       INTEGER,
-       UNSIGNED,
-       PREFIX,
-       BOOLEAN,
-       STRING,
-       HEX,
-       FILE_PATH,
-       MAC_ADDR,
-       IPV4_ADDR,
-       IPV6_ADDR,
-       RULE_ID,
-       PORT_ID,
-       GROUP_ID,
-       PRIORITY_LEVEL,
-       SHARED_ACTION_ID,
+       COMMON_INTEGER,
+       COMMON_UNSIGNED,
+       COMMON_PREFIX,
+       COMMON_BOOLEAN,
+       COMMON_STRING,
+       COMMON_HEX,
+       COMMON_FILE_PATH,
+       COMMON_MAC_ADDR,
+       COMMON_IPV4_ADDR,
+       COMMON_IPV6_ADDR,
+       COMMON_RULE_ID,
+       COMMON_PORT_ID,
+       COMMON_GROUP_ID,
+       COMMON_PRIORITY_LEVEL,
+       COMMON_INDIRECT_ACTION_ID,
+       COMMON_POLICY_ID,
+
+       /* TOP-level command. */
+       ADD,
 
        /* Top-level command. */
        SET,
@@ -68,7 +70,7 @@ enum index {
        /* Top-level command. */
        FLOW,
        /* Sub-level commands. */
-       SHARED_ACTION,
+       INDIRECT_ACTION,
        VALIDATE,
        CREATE,
        DESTROY,
@@ -100,32 +102,36 @@ enum index {
        AGED_DESTROY,
 
        /* Validate/create arguments. */
-       GROUP,
-       PRIORITY,
-       INGRESS,
-       EGRESS,
-       TRANSFER,
-       TUNNEL_SET,
-       TUNNEL_MATCH,
-
-       /* Shared action arguments */
-       SHARED_ACTION_CREATE,
-       SHARED_ACTION_UPDATE,
-       SHARED_ACTION_DESTROY,
-       SHARED_ACTION_QUERY,
-
-       /* Shared action create arguments */
-       SHARED_ACTION_CREATE_ID,
-       SHARED_ACTION_INGRESS,
-       SHARED_ACTION_EGRESS,
-       SHARED_ACTION_TRANSFER,
-       SHARED_ACTION_SPEC,
-
-       /* Shared action destroy arguments */
-       SHARED_ACTION_DESTROY_ID,
+       VC_GROUP,
+       VC_PRIORITY,
+       VC_INGRESS,
+       VC_EGRESS,
+       VC_TRANSFER,
+       VC_TUNNEL_SET,
+       VC_TUNNEL_MATCH,
+
+       /* Dump arguments */
+       DUMP_ALL,
+       DUMP_ONE,
+
+       /* Indirect action arguments */
+       INDIRECT_ACTION_CREATE,
+       INDIRECT_ACTION_UPDATE,
+       INDIRECT_ACTION_DESTROY,
+       INDIRECT_ACTION_QUERY,
+
+       /* Indirect action create arguments */
+       INDIRECT_ACTION_CREATE_ID,
+       INDIRECT_ACTION_INGRESS,
+       INDIRECT_ACTION_EGRESS,
+       INDIRECT_ACTION_TRANSFER,
+       INDIRECT_ACTION_SPEC,
+
+       /* Indirect action destroy arguments */
+       INDIRECT_ACTION_DESTROY_ID,
 
        /* Validate/create pattern. */
-       PATTERN,
+       ITEM_PATTERN,
        ITEM_PARAM_IS,
        ITEM_PARAM_SPEC,
        ITEM_PARAM_LAST,
@@ -165,7 +171,9 @@ enum index {
        ITEM_VLAN_INNER_TYPE,
        ITEM_VLAN_HAS_MORE_VLAN,
        ITEM_IPV4,
+       ITEM_IPV4_VER_IHL,
        ITEM_IPV4_TOS,
+       ITEM_IPV4_ID,
        ITEM_IPV4_FRAGMENT_OFFSET,
        ITEM_IPV4_TTL,
        ITEM_IPV4_PROTO,
@@ -198,6 +206,7 @@ enum index {
        ITEM_SCTP_CKSUM,
        ITEM_VXLAN,
        ITEM_VXLAN_VNI,
+       ITEM_VXLAN_LAST_RSVD,
        ITEM_E_TAG,
        ITEM_E_TAG_GRP_ECID_B,
        ITEM_NVGRE,
@@ -236,6 +245,7 @@ enum index {
        ITEM_IPV6_FRAG_EXT,
        ITEM_IPV6_FRAG_EXT_NEXT_HDR,
        ITEM_IPV6_FRAG_EXT_FRAG_DATA,
+       ITEM_IPV6_FRAG_EXT_ID,
        ITEM_ICMP6,
        ITEM_ICMP6_TYPE,
        ITEM_ICMP6_CODE,
@@ -289,6 +299,13 @@ enum index {
        ITEM_GENEVE_OPT_TYPE,
        ITEM_GENEVE_OPT_LENGTH,
        ITEM_GENEVE_OPT_DATA,
+       ITEM_INTEGRITY,
+       ITEM_INTEGRITY_LEVEL,
+       ITEM_INTEGRITY_VALUE,
+       ITEM_CONNTRACK,
+       ITEM_POL_PORT,
+       ITEM_POL_METER,
+       ITEM_POL_POLICY,
 
        /* Validate/create actions. */
        ACTIONS,
@@ -331,6 +348,11 @@ enum index {
        ACTION_PORT_ID_ORIGINAL,
        ACTION_PORT_ID_ID,
        ACTION_METER,
+       ACTION_METER_COLOR,
+       ACTION_METER_COLOR_TYPE,
+       ACTION_METER_COLOR_GREEN,
+       ACTION_METER_COLOR_YELLOW,
+       ACTION_METER_COLOR_RED,
        ACTION_METER_ID,
        ACTION_OF_SET_MPLS_TTL,
        ACTION_OF_SET_MPLS_TTL_MPLS_TTL,
@@ -412,8 +434,8 @@ enum index {
        ACTION_SAMPLE_RATIO,
        ACTION_SAMPLE_INDEX,
        ACTION_SAMPLE_INDEX_VALUE,
-       ACTION_SHARED,
-       SHARED_ACTION_ID2PTR,
+       ACTION_INDIRECT,
+       INDIRECT_ACTION_ID2PTR,
        ACTION_MODIFY_FIELD,
        ACTION_MODIFY_FIELD_OP,
        ACTION_MODIFY_FIELD_OP_VALUE,
@@ -427,6 +449,13 @@ enum index {
        ACTION_MODIFY_FIELD_SRC_OFFSET,
        ACTION_MODIFY_FIELD_SRC_VALUE,
        ACTION_MODIFY_FIELD_WIDTH,
+       ACTION_CONNTRACK,
+       ACTION_CONNTRACK_UPDATE,
+       ACTION_CONNTRACK_UPDATE_DIR,
+       ACTION_CONNTRACK_UPDATE_CTX,
+       ACTION_POL_G,
+       ACTION_POL_Y,
+       ACTION_POL_R,
 };
 
 /** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -565,6 +594,8 @@ struct mplsoudp_encap_conf mplsoudp_encap_conf;
 
 struct mplsoudp_decap_conf mplsoudp_decap_conf;
 
+struct rte_flow_action_conntrack conntrack_context;
+
 #define ACTION_SAMPLE_ACTIONS_NUM 10
 #define RAW_SAMPLE_CONFS_MAX_NUM 8
 /** Storage for struct rte_flow_action_sample including external data. */
@@ -582,6 +613,8 @@ struct rte_flow_action_queue sample_queue[RAW_SAMPLE_CONFS_MAX_NUM];
 struct rte_flow_action_count sample_count[RAW_SAMPLE_CONFS_MAX_NUM];
 struct rte_flow_action_port_id sample_port_id[RAW_SAMPLE_CONFS_MAX_NUM];
 struct rte_flow_action_raw_encap sample_encap[RAW_SAMPLE_CONFS_MAX_NUM];
+struct action_vxlan_encap_data sample_vxlan_encap[RAW_SAMPLE_CONFS_MAX_NUM];
+struct action_nvgre_encap_data sample_nvgre_encap[RAW_SAMPLE_CONFS_MAX_NUM];
 struct action_rss_data sample_rss_data[RAW_SAMPLE_CONFS_MAX_NUM];
 struct rte_flow_action_vf sample_vf[RAW_SAMPLE_CONFS_MAX_NUM];
 
@@ -772,10 +805,10 @@ struct buffer {
                struct {
                        uint32_t *action_id;
                        uint32_t action_id_n;
-               } sa_destroy; /**< Shared action destroy arguments. */
+               } ia_destroy; /**< Indirect action destroy arguments. */
                struct {
                        uint32_t action_id;
-               } sa; /* Shared action query arguments */
+               } ia; /* Indirect action query arguments */
                struct {
                        struct rte_flow_attr attr;
                        struct tunnel_ops tunnel_ops;
@@ -791,6 +824,8 @@ struct buffer {
                } destroy; /**< Destroy arguments. */
                struct {
                        char file[128];
+                       bool mode;
+                       uint32_t rule;
                } dump; /**< Dump arguments. */
                struct {
                        uint32_t rule;
@@ -806,6 +841,9 @@ struct buffer {
                struct {
                        int destroy;
                } aged; /**< Aged arguments. */
+               struct {
+                       uint32_t policy_id;
+               } policy;/**< Policy arguments. */
        } args; /**< Command arguments. */
 };
 
@@ -833,32 +871,38 @@ struct parse_action_priv {
                .size = s, \
        })
 
-static const enum index next_sa_create_attr[] = {
-       SHARED_ACTION_CREATE_ID,
-       SHARED_ACTION_INGRESS,
-       SHARED_ACTION_EGRESS,
-       SHARED_ACTION_TRANSFER,
-       SHARED_ACTION_SPEC,
+static const enum index next_ia_create_attr[] = {
+       INDIRECT_ACTION_CREATE_ID,
+       INDIRECT_ACTION_INGRESS,
+       INDIRECT_ACTION_EGRESS,
+       INDIRECT_ACTION_TRANSFER,
+       INDIRECT_ACTION_SPEC,
+       ZERO,
+};
+
+static const enum index next_dump_subcmd[] = {
+       DUMP_ALL,
+       DUMP_ONE,
        ZERO,
 };
 
-static const enum index next_sa_subcmd[] = {
-       SHARED_ACTION_CREATE,
-       SHARED_ACTION_UPDATE,
-       SHARED_ACTION_DESTROY,
-       SHARED_ACTION_QUERY,
+static const enum index next_ia_subcmd[] = {
+       INDIRECT_ACTION_CREATE,
+       INDIRECT_ACTION_UPDATE,
+       INDIRECT_ACTION_DESTROY,
+       INDIRECT_ACTION_QUERY,
        ZERO,
 };
 
 static const enum index next_vc_attr[] = {
-       GROUP,
-       PRIORITY,
-       INGRESS,
-       EGRESS,
-       TRANSFER,
-       TUNNEL_SET,
-       TUNNEL_MATCH,
-       PATTERN,
+       VC_GROUP,
+       VC_PRIORITY,
+       VC_INGRESS,
+       VC_EGRESS,
+       VC_TRANSFER,
+       VC_TUNNEL_SET,
+       VC_TUNNEL_MATCH,
+       ITEM_PATTERN,
        ZERO,
 };
 
@@ -869,7 +913,7 @@ static const enum index next_destroy_attr[] = {
 };
 
 static const enum index next_dump_attr[] = {
-       FILE_PATH,
+       COMMON_FILE_PATH,
        END,
        ZERO,
 };
@@ -886,8 +930,8 @@ static const enum index next_aged_attr[] = {
        ZERO,
 };
 
-static const enum index next_sa_destroy_attr[] = {
-       SHARED_ACTION_DESTROY_ID,
+static const enum index next_ia_destroy_attr[] = {
+       INDIRECT_ACTION_DESTROY_ID,
        END,
        ZERO,
 };
@@ -954,6 +998,8 @@ static const enum index next_item[] = {
        ITEM_PFCP,
        ITEM_ECPRI,
        ITEM_GENEVE_OPT,
+       ITEM_INTEGRITY,
+       ITEM_CONNTRACK,
        END_SET,
        ZERO,
 };
@@ -1025,7 +1071,9 @@ static const enum index item_vlan[] = {
 };
 
 static const enum index item_ipv4[] = {
+       ITEM_IPV4_VER_IHL,
        ITEM_IPV4_TOS,
+       ITEM_IPV4_ID,
        ITEM_IPV4_FRAGMENT_OFFSET,
        ITEM_IPV4_TTL,
        ITEM_IPV4_PROTO,
@@ -1082,6 +1130,7 @@ static const enum index item_sctp[] = {
 
 static const enum index item_vxlan[] = {
        ITEM_VXLAN_VNI,
+       ITEM_VXLAN_LAST_RSVD,
        ITEM_NEXT,
        ZERO,
 };
@@ -1162,6 +1211,7 @@ static const enum index item_ipv6_ext[] = {
 static const enum index item_ipv6_frag_ext[] = {
        ITEM_IPV6_FRAG_EXT_NEXT_HDR,
        ITEM_IPV6_FRAG_EXT_FRAG_DATA,
+       ITEM_IPV6_FRAG_EXT_ID,
        ITEM_NEXT,
        ZERO,
 };
@@ -1305,6 +1355,19 @@ static const enum index item_geneve_opt[] = {
        ZERO,
 };
 
+static const enum index item_integrity[] = {
+       ITEM_INTEGRITY_LEVEL,
+       ITEM_INTEGRITY_VALUE,
+       ZERO,
+};
+
+static const enum index item_integrity_lv[] = {
+       ITEM_INTEGRITY_LEVEL,
+       ITEM_INTEGRITY_VALUE,
+       ITEM_NEXT,
+       ZERO,
+};
+
 static const enum index next_action[] = {
        ACTION_END,
        ACTION_VOID,
@@ -1321,6 +1384,7 @@ static const enum index next_action[] = {
        ACTION_PHY_PORT,
        ACTION_PORT_ID,
        ACTION_METER,
+       ACTION_METER_COLOR,
        ACTION_OF_SET_MPLS_TTL,
        ACTION_OF_DEC_MPLS_TTL,
        ACTION_OF_SET_NW_TTL,
@@ -1366,8 +1430,10 @@ static const enum index next_action[] = {
        ACTION_SET_IPV6_DSCP,
        ACTION_AGE,
        ACTION_SAMPLE,
-       ACTION_SHARED,
+       ACTION_INDIRECT,
        ACTION_MODIFY_FIELD,
+       ACTION_CONNTRACK,
+       ACTION_CONNTRACK_UPDATE,
        ZERO,
 };
 
@@ -1428,6 +1494,12 @@ static const enum index action_meter[] = {
        ZERO,
 };
 
+static const enum index action_meter_color[] = {
+       ACTION_METER_COLOR_TYPE,
+       ACTION_NEXT,
+       ZERO,
+};
+
 static const enum index action_of_set_mpls_ttl[] = {
        ACTION_OF_SET_MPLS_TTL_MPLS_TTL,
        ACTION_NEXT,
@@ -1615,6 +1687,8 @@ static const enum index next_action_sample[] = {
        ACTION_COUNT,
        ACTION_PORT_ID,
        ACTION_RAW_ENCAP,
+       ACTION_VXLAN_ENCAP,
+       ACTION_NVGRE_ENCAP,
        ACTION_NEXT,
        ZERO,
 };
@@ -1634,6 +1708,13 @@ static const enum index action_modify_field_src[] = {
        ZERO,
 };
 
+static const enum index action_update_conntrack[] = {
+       ACTION_CONNTRACK_UPDATE_DIR,
+       ACTION_CONNTRACK_UPDATE_CTX,
+       ACTION_NEXT,
+       ZERO,
+};
+
 static int parse_set_raw_encap_decap(struct context *, const struct token *,
                                     const char *, unsigned int,
                                     void *, unsigned int);
@@ -1656,6 +1737,10 @@ static int parse_vc_conf(struct context *, const struct token *,
 static int parse_vc_item_ecpri_type(struct context *, const struct token *,
                                    const char *, unsigned int,
                                    void *, unsigned int);
+static int parse_vc_action_meter_color_type(struct context *,
+                                       const struct token *,
+                                       const char *, unsigned int, void *,
+                                       unsigned int);
 static int parse_vc_action_rss(struct context *, const struct token *,
                               const char *, unsigned int, void *,
                               unsigned int);
@@ -1724,6 +1809,10 @@ static int
 parse_vc_modify_field_id(struct context *ctx, const struct token *token,
                                const char *str, unsigned int len, void *buf,
                                unsigned int size);
+static int
+parse_vc_action_conntrack_update(struct context *ctx, const struct token *token,
+                        const char *str, unsigned int len, void *buf,
+                        unsigned int size);
 static int parse_destroy(struct context *, const struct token *,
                         const char *, unsigned int,
                         void *, unsigned int);
@@ -1781,15 +1870,18 @@ static int parse_ipv6_addr(struct context *, const struct token *,
 static int parse_port(struct context *, const struct token *,
                      const char *, unsigned int,
                      void *, unsigned int);
-static int parse_sa(struct context *, const struct token *,
+static int parse_ia(struct context *, const struct token *,
                    const char *, unsigned int,
                    void *, unsigned int);
-static int parse_sa_destroy(struct context *ctx, const struct token *token,
+static int parse_ia_destroy(struct context *ctx, const struct token *token,
                            const char *str, unsigned int len,
                            void *buf, unsigned int size);
-static int parse_sa_id2ptr(struct context *ctx, const struct token *token,
+static int parse_ia_id2ptr(struct context *ctx, const struct token *token,
                           const char *str, unsigned int len, void *buf,
                           unsigned int size);
+static int parse_mp(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 *,
@@ -1819,7 +1911,7 @@ static const struct token token_list[] = {
        [ZERO] = {
                .name = "ZERO",
                .help = "null entry, abused as the entry point",
-               .next = NEXT(NEXT_ENTRY(FLOW)),
+               .next = NEXT(NEXT_ENTRY(FLOW, ADD)),
        },
        [END] = {
                .name = "",
@@ -1837,107 +1929,114 @@ static const struct token token_list[] = {
                .help = "set command may end here",
        },
        /* Common tokens. */
-       [INTEGER] = {
+       [COMMON_INTEGER] = {
                .name = "{int}",
                .type = "INTEGER",
                .help = "integer value",
                .call = parse_int,
                .comp = comp_none,
        },
-       [UNSIGNED] = {
+       [COMMON_UNSIGNED] = {
                .name = "{unsigned}",
                .type = "UNSIGNED",
                .help = "unsigned integer value",
                .call = parse_int,
                .comp = comp_none,
        },
-       [PREFIX] = {
+       [COMMON_PREFIX] = {
                .name = "{prefix}",
                .type = "PREFIX",
                .help = "prefix length for bit-mask",
                .call = parse_prefix,
                .comp = comp_none,
        },
-       [BOOLEAN] = {
+       [COMMON_BOOLEAN] = {
                .name = "{boolean}",
                .type = "BOOLEAN",
                .help = "any boolean value",
                .call = parse_boolean,
                .comp = comp_boolean,
        },
-       [STRING] = {
+       [COMMON_STRING] = {
                .name = "{string}",
                .type = "STRING",
                .help = "fixed string",
                .call = parse_string,
                .comp = comp_none,
        },
-       [HEX] = {
+       [COMMON_HEX] = {
                .name = "{hex}",
                .type = "HEX",
                .help = "fixed string",
                .call = parse_hex,
        },
-       [FILE_PATH] = {
+       [COMMON_FILE_PATH] = {
                .name = "{file path}",
                .type = "STRING",
                .help = "file path",
                .call = parse_string0,
                .comp = comp_none,
        },
-       [MAC_ADDR] = {
+       [COMMON_MAC_ADDR] = {
                .name = "{MAC address}",
                .type = "MAC-48",
                .help = "standard MAC address notation",
                .call = parse_mac_addr,
                .comp = comp_none,
        },
-       [IPV4_ADDR] = {
+       [COMMON_IPV4_ADDR] = {
                .name = "{IPv4 address}",
                .type = "IPV4 ADDRESS",
                .help = "standard IPv4 address notation",
                .call = parse_ipv4_addr,
                .comp = comp_none,
        },
-       [IPV6_ADDR] = {
+       [COMMON_IPV6_ADDR] = {
                .name = "{IPv6 address}",
                .type = "IPV6 ADDRESS",
                .help = "standard IPv6 address notation",
                .call = parse_ipv6_addr,
                .comp = comp_none,
        },
-       [RULE_ID] = {
+       [COMMON_RULE_ID] = {
                .name = "{rule id}",
                .type = "RULE ID",
                .help = "rule identifier",
                .call = parse_int,
                .comp = comp_rule_id,
        },
-       [PORT_ID] = {
+       [COMMON_PORT_ID] = {
                .name = "{port_id}",
                .type = "PORT ID",
                .help = "port identifier",
                .call = parse_port,
                .comp = comp_port,
        },
-       [GROUP_ID] = {
+       [COMMON_GROUP_ID] = {
                .name = "{group_id}",
                .type = "GROUP ID",
                .help = "group identifier",
                .call = parse_int,
                .comp = comp_none,
        },
-       [PRIORITY_LEVEL] = {
+       [COMMON_PRIORITY_LEVEL] = {
                .name = "{level}",
                .type = "PRIORITY",
                .help = "priority level",
                .call = parse_int,
                .comp = comp_none,
        },
-       [SHARED_ACTION_ID] = {
-               .name = "{shared_action_id}",
-               .type = "SHARED_ACTION_ID",
-               .help = "shared action id",
+       [COMMON_INDIRECT_ACTION_ID] = {
+               .name = "{indirect_action_id}",
+               .type = "INDIRECT_ACTION_ID",
+               .help = "indirect action id",
+               .call = parse_int,
+               .comp = comp_none,
+       },
+       [COMMON_POLICY_ID] = {
+               .name = "{policy_id}",
+               .type = "POLCIY_ID",
+               .help = "policy id",
                .call = parse_int,
                .comp = comp_none,
        },
@@ -1947,7 +2046,7 @@ static const struct token token_list[] = {
                .type = "{command} {port_id} [{arg} [...]]",
                .help = "manage ingress/egress flow rules",
                .next = NEXT(NEXT_ENTRY
-                            (SHARED_ACTION,
+                            (INDIRECT_ACTION,
                              VALIDATE,
                              CREATE,
                              DESTROY,
@@ -1961,85 +2060,86 @@ static const struct token token_list[] = {
                .call = parse_init,
        },
        /* Top-level command. */
-       [SHARED_ACTION] = {
-               .name = "shared_action",
+       [INDIRECT_ACTION] = {
+               .name = "indirect_action",
                .type = "{command} {port_id} [{arg} [...]]",
-               .help = "manage shared actions",
-               .next = NEXT(next_sa_subcmd, NEXT_ENTRY(PORT_ID)),
+               .help = "manage indirect actions",
+               .next = NEXT(next_ia_subcmd, NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
-               .call = parse_sa,
+               .call = parse_ia,
        },
        /* Sub-level commands. */
-       [SHARED_ACTION_CREATE] = {
+       [INDIRECT_ACTION_CREATE] = {
                .name = "create",
-               .help = "create shared action",
-               .next = NEXT(next_sa_create_attr),
-               .call = parse_sa,
+               .help = "create indirect action",
+               .next = NEXT(next_ia_create_attr),
+               .call = parse_ia,
        },
-       [SHARED_ACTION_UPDATE] = {
+       [INDIRECT_ACTION_UPDATE] = {
                .name = "update",
-               .help = "update shared action",
-               .next = NEXT(NEXT_ENTRY(SHARED_ACTION_SPEC),
-                            NEXT_ENTRY(SHARED_ACTION_ID)),
+               .help = "update indirect action",
+               .next = NEXT(NEXT_ENTRY(INDIRECT_ACTION_SPEC),
+                            NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.attr.group)),
-               .call = parse_sa,
+               .call = parse_ia,
        },
-       [SHARED_ACTION_DESTROY] = {
+       [INDIRECT_ACTION_DESTROY] = {
                .name = "destroy",
-               .help = "destroy shared action",
-               .next = NEXT(NEXT_ENTRY(SHARED_ACTION_DESTROY_ID)),
+               .help = "destroy indirect action",
+               .next = NEXT(NEXT_ENTRY(INDIRECT_ACTION_DESTROY_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
-               .call = parse_sa_destroy,
+               .call = parse_ia_destroy,
        },
-       [SHARED_ACTION_QUERY] = {
+       [INDIRECT_ACTION_QUERY] = {
                .name = "query",
-               .help = "query shared action",
-               .next = NEXT(NEXT_ENTRY(END), NEXT_ENTRY(SHARED_ACTION_ID)),
-               .args = ARGS(ARGS_ENTRY(struct buffer, args.sa.action_id)),
-               .call = parse_sa,
+               .help = "query indirect action",
+               .next = NEXT(NEXT_ENTRY(END),
+                            NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)),
+               .args = ARGS(ARGS_ENTRY(struct buffer, args.ia.action_id)),
+               .call = parse_ia,
        },
        [VALIDATE] = {
                .name = "validate",
                .help = "check whether a flow rule can be created",
-               .next = NEXT(next_vc_attr, NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(next_vc_attr, NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_vc,
        },
        [CREATE] = {
                .name = "create",
                .help = "create a flow rule",
-               .next = NEXT(next_vc_attr, NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(next_vc_attr, NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_vc,
        },
        [DESTROY] = {
                .name = "destroy",
                .help = "destroy specific flow rules",
-               .next = NEXT(NEXT_ENTRY(DESTROY_RULE), NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(NEXT_ENTRY(DESTROY_RULE),
+                            NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_destroy,
        },
        [FLUSH] = {
                .name = "flush",
                .help = "destroy all flow rules",
-               .next = NEXT(NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_flush,
        },
        [DUMP] = {
                .name = "dump",
-               .help = "dump all flow rules to file",
-               .next = NEXT(next_dump_attr, NEXT_ENTRY(PORT_ID)),
-               .args = ARGS(ARGS_ENTRY(struct buffer, args.dump.file),
-                            ARGS_ENTRY(struct buffer, port)),
+               .help = "dump single/all flow rules to file",
+               .next = NEXT(next_dump_subcmd, NEXT_ENTRY(COMMON_PORT_ID)),
+               .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_dump,
        },
        [QUERY] = {
                .name = "query",
                .help = "query an existing flow rule",
                .next = NEXT(NEXT_ENTRY(QUERY_ACTION),
-                            NEXT_ENTRY(RULE_ID),
-                            NEXT_ENTRY(PORT_ID)),
+                            NEXT_ENTRY(COMMON_RULE_ID),
+                            NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, args.query.action.type),
                             ARGS_ENTRY(struct buffer, args.query.rule),
                             ARGS_ENTRY(struct buffer, port)),
@@ -2048,22 +2148,22 @@ static const struct token token_list[] = {
        [LIST] = {
                .name = "list",
                .help = "list existing flow rules",
-               .next = NEXT(next_list_attr, NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(next_list_attr, NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_list,
        },
        [AGED] = {
                .name = "aged",
                .help = "list and destroy aged flows",
-               .next = NEXT(next_aged_attr, NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(next_aged_attr, NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_aged,
        },
        [ISOLATE] = {
                .name = "isolate",
                .help = "restrict ingress traffic to the defined flow rules",
-               .next = NEXT(NEXT_ENTRY(BOOLEAN),
-                            NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(NEXT_ENTRY(COMMON_BOOLEAN),
+                            NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, args.isolate.set),
                             ARGS_ENTRY(struct buffer, port)),
                .call = parse_isolate,
@@ -2080,14 +2180,14 @@ static const struct token token_list[] = {
                .name = "create",
                .help = "create new tunnel object",
                .next = NEXT(NEXT_ENTRY(TUNNEL_CREATE_TYPE),
-                            NEXT_ENTRY(PORT_ID)),
+                            NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_tunnel,
        },
        [TUNNEL_CREATE_TYPE] = {
                .name = "type",
                .help = "create new tunnel",
-               .next = NEXT(NEXT_ENTRY(FILE_PATH)),
+               .next = NEXT(NEXT_ENTRY(COMMON_FILE_PATH)),
                .args = ARGS(ARGS_ENTRY(struct tunnel_ops, type)),
                .call = parse_tunnel,
        },
@@ -2095,21 +2195,21 @@ static const struct token token_list[] = {
                .name = "destroy",
                .help = "destroy tunel",
                .next = NEXT(NEXT_ENTRY(TUNNEL_DESTROY_ID),
-                            NEXT_ENTRY(PORT_ID)),
+                            NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_tunnel,
        },
        [TUNNEL_DESTROY_ID] = {
                .name = "id",
                .help = "tunnel identifier to testroy",
-               .next = NEXT(NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct tunnel_ops, id)),
                .call = parse_tunnel,
        },
        [TUNNEL_LIST] = {
                .name = "list",
                .help = "list existing tunnels",
-               .next = NEXT(NEXT_ENTRY(PORT_ID)),
+               .next = NEXT(NEXT_ENTRY(COMMON_PORT_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, port)),
                .call = parse_tunnel,
        },
@@ -2117,10 +2217,26 @@ static const struct token token_list[] = {
        [DESTROY_RULE] = {
                .name = "rule",
                .help = "specify a rule identifier",
-               .next = NEXT(next_destroy_attr, NEXT_ENTRY(RULE_ID)),
+               .next = NEXT(next_destroy_attr, NEXT_ENTRY(COMMON_RULE_ID)),
                .args = ARGS(ARGS_ENTRY_PTR(struct buffer, args.destroy.rule)),
                .call = parse_destroy,
        },
+       /* Dump arguments. */
+       [DUMP_ALL] = {
+               .name = "all",
+               .help = "dump all",
+               .next = NEXT(next_dump_attr),
+               .args = ARGS(ARGS_ENTRY(struct buffer, args.dump.file)),
+               .call = parse_dump,
+       },
+       [DUMP_ONE] = {
+               .name = "rule",
+               .help = "dump one rule",
+               .next = NEXT(next_dump_attr, NEXT_ENTRY(COMMON_RULE_ID)),
+               .args = ARGS(ARGS_ENTRY(struct buffer, args.dump.file),
+                               ARGS_ENTRY(struct buffer, args.dump.rule)),
+               .call = parse_dump,
+       },
        /* Query arguments. */
        [QUERY_ACTION] = {
                .name = "{action}",
@@ -2133,7 +2249,7 @@ static const struct token token_list[] = {
        [LIST_GROUP] = {
                .name = "group",
                .help = "specify a group",
-               .next = NEXT(next_list_attr, NEXT_ENTRY(GROUP_ID)),
+               .next = NEXT(next_list_attr, NEXT_ENTRY(COMMON_GROUP_ID)),
                .args = ARGS(ARGS_ENTRY_PTR(struct buffer, args.list.group)),
                .call = parse_list,
        },
@@ -2144,54 +2260,54 @@ static const struct token token_list[] = {
                .comp = comp_none,
        },
        /* Validate/create attributes. */
-       [GROUP] = {
+       [VC_GROUP] = {
                .name = "group",
                .help = "specify a group",
-               .next = NEXT(next_vc_attr, NEXT_ENTRY(GROUP_ID)),
+               .next = NEXT(next_vc_attr, NEXT_ENTRY(COMMON_GROUP_ID)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_attr, group)),
                .call = parse_vc,
        },
-       [PRIORITY] = {
+       [VC_PRIORITY] = {
                .name = "priority",
                .help = "specify a priority level",
-               .next = NEXT(next_vc_attr, NEXT_ENTRY(PRIORITY_LEVEL)),
+               .next = NEXT(next_vc_attr, NEXT_ENTRY(COMMON_PRIORITY_LEVEL)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_attr, priority)),
                .call = parse_vc,
        },
-       [INGRESS] = {
+       [VC_INGRESS] = {
                .name = "ingress",
                .help = "affect rule to ingress",
                .next = NEXT(next_vc_attr),
                .call = parse_vc,
        },
-       [EGRESS] = {
+       [VC_EGRESS] = {
                .name = "egress",
                .help = "affect rule to egress",
                .next = NEXT(next_vc_attr),
                .call = parse_vc,
        },
-       [TRANSFER] = {
+       [VC_TRANSFER] = {
                .name = "transfer",
                .help = "apply rule directly to endpoints found in pattern",
                .next = NEXT(next_vc_attr),
                .call = parse_vc,
        },
-       [TUNNEL_SET] = {
+       [VC_TUNNEL_SET] = {
                .name = "tunnel_set",
                .help = "tunnel steer rule",
-               .next = NEXT(next_vc_attr, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(next_vc_attr, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct tunnel_ops, id)),
                .call = parse_vc,
        },
-       [TUNNEL_MATCH] = {
+       [VC_TUNNEL_MATCH] = {
                .name = "tunnel_match",
                .help = "tunnel match rule",
-               .next = NEXT(next_vc_attr, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(next_vc_attr, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct tunnel_ops, id)),
                .call = parse_vc,
        },
        /* Validate/create pattern. */
-       [PATTERN] = {
+       [ITEM_PATTERN] = {
                .name = "pattern",
                .help = "submit a list of pattern items",
                .next = NEXT(next_item),
@@ -2258,7 +2374,7 @@ static const struct token token_list[] = {
        [ITEM_ANY_NUM] = {
                .name = "num",
                .help = "number of layers covered",
-               .next = NEXT(item_any, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_any, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_any, num)),
        },
        [ITEM_PF] = {
@@ -2278,7 +2394,7 @@ static const struct token token_list[] = {
        [ITEM_VF_ID] = {
                .name = "id",
                .help = "VF ID",
-               .next = NEXT(item_vf, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_vf, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_vf, id)),
        },
        [ITEM_PHY_PORT] = {
@@ -2292,7 +2408,8 @@ static const struct token token_list[] = {
        [ITEM_PHY_PORT_INDEX] = {
                .name = "index",
                .help = "physical port index",
-               .next = NEXT(item_phy_port, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_phy_port, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_phy_port, index)),
        },
        [ITEM_PORT_ID] = {
@@ -2306,7 +2423,8 @@ static const struct token token_list[] = {
        [ITEM_PORT_ID_ID] = {
                .name = "id",
                .help = "DPDK port ID",
-               .next = NEXT(item_port_id, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_port_id, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_port_id, id)),
        },
        [ITEM_MARK] = {
@@ -2319,7 +2437,8 @@ static const struct token token_list[] = {
        [ITEM_MARK_ID] = {
                .name = "id",
                .help = "Integer value to match against",
-               .next = NEXT(item_mark, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_mark, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_mark, id)),
        },
        [ITEM_RAW] = {
@@ -2332,34 +2451,34 @@ static const struct token token_list[] = {
        [ITEM_RAW_RELATIVE] = {
                .name = "relative",
                .help = "look for pattern after the previous item",
-               .next = NEXT(item_raw, NEXT_ENTRY(BOOLEAN), item_param),
+               .next = NEXT(item_raw, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_raw, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_raw, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_raw, NEXT_ENTRY(COMMON_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(COMMON_STRING),
                             NEXT_ENTRY(ITEM_PARAM_IS,
                                        ITEM_PARAM_SPEC,
                                        ITEM_PARAM_MASK)),
@@ -2378,25 +2497,25 @@ static const struct token token_list[] = {
        [ITEM_ETH_DST] = {
                .name = "dst",
                .help = "destination MAC",
-               .next = NEXT(item_eth, NEXT_ENTRY(MAC_ADDR), item_param),
+               .next = NEXT(item_eth, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_eth, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_eth, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_eth, type)),
        },
        [ITEM_ETH_HAS_VLAN] = {
                .name = "has_vlan",
                .help = "packet header contains VLAN",
-               .next = NEXT(item_eth, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_eth, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_item_eth,
                                           has_vlan, 1)),
        },
@@ -2410,41 +2529,47 @@ static const struct token token_list[] = {
        [ITEM_VLAN_TCI] = {
                .name = "tci",
                .help = "tag control information",
-               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_vlan, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_vlan, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_vlan, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_vlan, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_vlan,
                                                  tci, "\x0f\xff")),
        },
        [ITEM_VLAN_INNER_TYPE] = {
                .name = "inner_type",
                .help = "inner EtherType",
-               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_vlan, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vlan,
                                             inner_type)),
        },
        [ITEM_VLAN_HAS_MORE_VLAN] = {
                .name = "has_more_vlan",
                .help = "packet header contains another VLAN",
-               .next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_vlan, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_item_vlan,
                                           has_more_vlan, 1)),
        },
@@ -2455,45 +2580,67 @@ static const struct token token_list[] = {
                .next = NEXT(item_ipv4),
                .call = parse_vc,
        },
+       [ITEM_IPV4_VER_IHL] = {
+               .name = "version_ihl",
+               .help = "match header length",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ipv4,
+                                    hdr.version_ihl)),
+       },
        [ITEM_IPV4_TOS] = {
                .name = "tos",
                .help = "type of service",
-               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
                                             hdr.type_of_service)),
        },
+       [ITEM_IPV4_ID] = {
+               .name = "packet_id",
+               .help = "fragment packet id",
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
+                                            hdr.packet_id)),
+       },
        [ITEM_IPV4_FRAGMENT_OFFSET] = {
                .name = "fragment_offset",
                .help = "fragmentation flags and fragment offset",
-               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
                                             hdr.fragment_offset)),
        },
        [ITEM_IPV4_TTL] = {
                .name = "ttl",
                .help = "time to live",
-               .next = NEXT(item_ipv4, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_ipv4, NEXT_ENTRY(COMMON_IPV4_ADDR),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,
                                             hdr.dst_addr)),
        },
@@ -2507,7 +2654,8 @@ static const struct token token_list[] = {
        [ITEM_IPV6_TC] = {
                .name = "tc",
                .help = "traffic class",
-               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv6, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_ipv6,
                                                  hdr.vtc_flow,
                                                  "\x0f\xf0\x00\x00")),
@@ -2515,7 +2663,8 @@ static const struct token token_list[] = {
        [ITEM_IPV6_FLOW] = {
                .name = "flow",
                .help = "flow label",
-               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv6, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_ipv6,
                                                  hdr.vtc_flow,
                                                  "\x00\x0f\xff\xff")),
@@ -2523,35 +2672,40 @@ static const struct token token_list[] = {
        [ITEM_IPV6_PROTO] = {
                .name = "proto",
                .help = "protocol (next header)",
-               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv6, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_ipv6, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_ipv6, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_ipv6, NEXT_ENTRY(COMMON_IPV6_ADDR),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,
                                             hdr.dst_addr)),
        },
        [ITEM_IPV6_HAS_FRAG_EXT] = {
                .name = "has_frag_ext",
                .help = "fragment packet attribute",
-               .next = NEXT(item_ipv6, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv6, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_item_ipv6,
                                           has_frag_ext, 1)),
        },
@@ -2565,28 +2719,32 @@ static const struct token token_list[] = {
        [ITEM_ICMP_TYPE] = {
                .name = "type",
                .help = "ICMP packet type",
-               .next = NEXT(item_icmp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_icmp, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_icmp, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
                                             hdr.icmp_code)),
        },
        [ITEM_ICMP_IDENT] = {
                .name = "ident",
                .help = "ICMP packet identifier",
-               .next = NEXT(item_icmp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_icmp, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
                                             hdr.icmp_ident)),
        },
        [ITEM_ICMP_SEQ] = {
                .name = "seq",
                .help = "ICMP packet sequence number",
-               .next = NEXT(item_icmp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_icmp, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
                                             hdr.icmp_seq_nb)),
        },
@@ -2600,14 +2758,15 @@ static const struct token token_list[] = {
        [ITEM_UDP_SRC] = {
                .name = "src",
                .help = "UDP source port",
-               .next = NEXT(item_udp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_udp, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_udp, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_udp,
                                             hdr.dst_port)),
        },
@@ -2621,21 +2780,21 @@ static const struct token token_list[] = {
        [ITEM_TCP_SRC] = {
                .name = "src",
                .help = "TCP source port",
-               .next = NEXT(item_tcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_tcp, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_tcp, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_tcp, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_tcp,
                                             hdr.tcp_flags)),
        },
@@ -2649,28 +2808,32 @@ static const struct token token_list[] = {
        [ITEM_SCTP_SRC] = {
                .name = "src",
                .help = "SCTP source port",
-               .next = NEXT(item_sctp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_sctp, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_sctp, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_sctp, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_sctp, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_sctp,
                                             hdr.cksum)),
        },
@@ -2684,9 +2847,18 @@ static const struct token token_list[] = {
        [ITEM_VXLAN_VNI] = {
                .name = "vni",
                .help = "VXLAN identifier",
-               .next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_vxlan, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)),
        },
+       [ITEM_VXLAN_LAST_RSVD] = {
+               .name = "last_rsvd",
+               .help = "VXLAN last reserved bits",
+               .next = NEXT(item_vxlan, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan,
+                                            rsvd1)),
+       },
        [ITEM_E_TAG] = {
                .name = "e_tag",
                .help = "match E-Tag header",
@@ -2697,7 +2869,8 @@ static const struct token token_list[] = {
        [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),
+               .next = NEXT(item_e_tag, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_e_tag,
                                                  rsvd_grp_ecid_b,
                                                  "\x3f\xff")),
@@ -2712,7 +2885,8 @@ static const struct token token_list[] = {
        [ITEM_NVGRE_TNI] = {
                .name = "tni",
                .help = "virtual subnet ID",
-               .next = NEXT(item_nvgre, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_nvgre, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_nvgre, tni)),
        },
        [ITEM_MPLS] = {
@@ -2725,7 +2899,8 @@ static const struct token token_list[] = {
        [ITEM_MPLS_LABEL] = {
                .name = "label",
                .help = "MPLS label",
-               .next = NEXT(item_mpls, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_mpls, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_mpls,
                                                  label_tc_s,
                                                  "\xff\xff\xf0")),
@@ -2733,7 +2908,8 @@ static const struct token token_list[] = {
        [ITEM_MPLS_TC] = {
                .name = "tc",
                .help = "MPLS Traffic Class",
-               .next = NEXT(item_mpls, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_mpls, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_mpls,
                                                  label_tc_s,
                                                  "\x00\x00\x0e")),
@@ -2741,7 +2917,8 @@ static const struct token token_list[] = {
        [ITEM_MPLS_S] = {
                .name = "s",
                .help = "MPLS Bottom-of-Stack",
-               .next = NEXT(item_mpls, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_mpls, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_mpls,
                                                  label_tc_s,
                                                  "\x00\x00\x01")),
@@ -2756,7 +2933,8 @@ static const struct token token_list[] = {
        [ITEM_GRE_PROTO] = {
                .name = "protocol",
                .help = "GRE protocol type",
-               .next = NEXT(item_gre, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gre, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre,
                                             protocol)),
        },
@@ -2766,14 +2944,16 @@ static const struct token token_list[] = {
                        "checksum (1b), undefined (1b), key bit (1b),"
                        " sequence number (1b), reserved 0 (9b),"
                        " version (3b)",
-               .next = NEXT(item_gre, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gre, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre,
                                             c_rsvd0_ver)),
        },
        [ITEM_GRE_C_BIT] = {
                .name = "c_bit",
                .help = "checksum bit (C)",
-               .next = NEXT(item_gre, NEXT_ENTRY(BOOLEAN), item_param),
+               .next = NEXT(item_gre, NEXT_ENTRY(COMMON_BOOLEAN),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_gre,
                                                  c_rsvd0_ver,
                                                  "\x80\x00\x00\x00")),
@@ -2781,7 +2961,7 @@ static const struct token token_list[] = {
        [ITEM_GRE_S_BIT] = {
                .name = "s_bit",
                .help = "sequence number bit (S)",
-               .next = NEXT(item_gre, NEXT_ENTRY(BOOLEAN), item_param),
+               .next = NEXT(item_gre, NEXT_ENTRY(COMMON_BOOLEAN), item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_gre,
                                                  c_rsvd0_ver,
                                                  "\x10\x00\x00\x00")),
@@ -2789,7 +2969,7 @@ static const struct token token_list[] = {
        [ITEM_GRE_K_BIT] = {
                .name = "k_bit",
                .help = "key bit (K)",
-               .next = NEXT(item_gre, NEXT_ENTRY(BOOLEAN), item_param),
+               .next = NEXT(item_gre, NEXT_ENTRY(COMMON_BOOLEAN), item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_gre,
                                                  c_rsvd0_ver,
                                                  "\x20\x00\x00\x00")),
@@ -2805,7 +2985,8 @@ static const struct token token_list[] = {
        [ITEM_FUZZY_THRESH] = {
                .name = "thresh",
                .help = "match accuracy threshold",
-               .next = NEXT(item_fuzzy, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_fuzzy, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_fuzzy,
                                        thresh)),
        },
@@ -2819,20 +3000,20 @@ static const struct token token_list[] = {
        [ITEM_GTP_FLAGS] = {
                .name = "v_pt_rsv_flags",
                .help = "GTP flags",
-               .next = NEXT(item_gtp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gtp, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_gtp,
                                        v_pt_rsv_flags)),
        },
        [ITEM_GTP_MSG_TYPE] = {
                .name = "msg_type",
                .help = "GTP message type",
-               .next = NEXT(item_gtp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gtp, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_gtp, msg_type)),
        },
        [ITEM_GTP_TEID] = {
                .name = "teid",
                .help = "tunnel endpoint identifier",
-               .next = NEXT(item_gtp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gtp, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp, teid)),
        },
        [ITEM_GTPC] = {
@@ -2859,20 +3040,23 @@ static const struct token token_list[] = {
        [ITEM_GENEVE_VNI] = {
                .name = "vni",
                .help = "virtual network identifier",
-               .next = NEXT(item_geneve, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_geneve, NEXT_ENTRY(COMMON_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),
+               .next = NEXT(item_geneve, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_geneve,
                                             protocol)),
        },
        [ITEM_GENEVE_OPTLEN] = {
                .name = "optlen",
                .help = "GENEVE options length in dwords",
-               .next = NEXT(item_geneve, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_geneve, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_geneve,
                                                  ver_opt_len_o_c_rsvd0,
                                                  "\x3f\x00")),
@@ -2888,7 +3072,8 @@ static const struct token token_list[] = {
        [ITEM_VXLAN_GPE_VNI] = {
                .name = "vni",
                .help = "VXLAN-GPE identifier",
-               .next = NEXT(item_vxlan_gpe, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_vxlan_gpe, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan_gpe,
                                             vni)),
        },
@@ -2903,7 +3088,7 @@ static const struct token token_list[] = {
        [ITEM_ARP_ETH_IPV4_SHA] = {
                .name = "sha",
                .help = "sender hardware address",
-               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(MAC_ADDR),
+               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_MAC_ADDR),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
                                             sha)),
@@ -2911,7 +3096,7 @@ static const struct token token_list[] = {
        [ITEM_ARP_ETH_IPV4_SPA] = {
                .name = "spa",
                .help = "sender IPv4 address",
-               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(IPV4_ADDR),
+               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_IPV4_ADDR),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
                                             spa)),
@@ -2919,7 +3104,7 @@ static const struct token token_list[] = {
        [ITEM_ARP_ETH_IPV4_THA] = {
                .name = "tha",
                .help = "target hardware address",
-               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(MAC_ADDR),
+               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_MAC_ADDR),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
                                             tha)),
@@ -2927,7 +3112,7 @@ static const struct token token_list[] = {
        [ITEM_ARP_ETH_IPV4_TPA] = {
                .name = "tpa",
                .help = "target IPv4 address",
-               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(IPV4_ADDR),
+               .next = NEXT(item_arp_eth_ipv4, NEXT_ENTRY(COMMON_IPV4_ADDR),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_arp_eth_ipv4,
                                             tpa)),
@@ -2943,7 +3128,8 @@ static const struct token token_list[] = {
        [ITEM_IPV6_EXT_NEXT_HDR] = {
                .name = "next_hdr",
                .help = "next header",
-               .next = NEXT(item_ipv6_ext, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ipv6_ext, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6_ext,
                                             next_hdr)),
        },
@@ -2958,19 +3144,27 @@ static const struct token token_list[] = {
        [ITEM_IPV6_FRAG_EXT_NEXT_HDR] = {
                .name = "next_hdr",
                .help = "next header",
-               .next = NEXT(item_ipv6_frag_ext, NEXT_ENTRY(UNSIGNED),
+               .next = NEXT(item_ipv6_frag_ext, NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ipv6_frag_ext,
                                        hdr.next_header)),
        },
        [ITEM_IPV6_FRAG_EXT_FRAG_DATA] = {
                .name = "frag_data",
-               .help = "Fragment flags and offset",
-               .next = NEXT(item_ipv6_frag_ext, NEXT_ENTRY(UNSIGNED),
+               .help = "fragment flags and offset",
+               .next = NEXT(item_ipv6_frag_ext, NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6_frag_ext,
                                             hdr.frag_data)),
        },
+       [ITEM_IPV6_FRAG_EXT_ID] = {
+               .name = "packet_id",
+               .help = "fragment packet id",
+               .next = NEXT(item_ipv6_frag_ext, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6_frag_ext,
+                                            hdr.id)),
+       },
        [ITEM_ICMP6] = {
                .name = "icmp6",
                .help = "match any ICMPv6 header",
@@ -2981,14 +3175,16 @@ static const struct token token_list[] = {
        [ITEM_ICMP6_TYPE] = {
                .name = "type",
                .help = "ICMPv6 type",
-               .next = NEXT(item_icmp6, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_icmp6, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6,
                                             type)),
        },
        [ITEM_ICMP6_CODE] = {
                .name = "code",
                .help = "ICMPv6 code",
-               .next = NEXT(item_icmp6, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_icmp6, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6,
                                             code)),
        },
@@ -3003,7 +3199,7 @@ static const struct token token_list[] = {
        [ITEM_ICMP6_ND_NS_TARGET_ADDR] = {
                .name = "target_addr",
                .help = "target address",
-               .next = NEXT(item_icmp6_nd_ns, NEXT_ENTRY(IPV6_ADDR),
+               .next = NEXT(item_icmp6_nd_ns, NEXT_ENTRY(COMMON_IPV6_ADDR),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6_nd_ns,
                                             target_addr)),
@@ -3019,7 +3215,7 @@ static const struct token token_list[] = {
        [ITEM_ICMP6_ND_NA_TARGET_ADDR] = {
                .name = "target_addr",
                .help = "target address",
-               .next = NEXT(item_icmp6_nd_na, NEXT_ENTRY(IPV6_ADDR),
+               .next = NEXT(item_icmp6_nd_na, NEXT_ENTRY(COMMON_IPV6_ADDR),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6_nd_na,
                                             target_addr)),
@@ -3036,7 +3232,7 @@ static const struct token token_list[] = {
        [ITEM_ICMP6_ND_OPT_TYPE] = {
                .name = "type",
                .help = "ND option type",
-               .next = NEXT(item_icmp6_nd_opt, NEXT_ENTRY(UNSIGNED),
+               .next = NEXT(item_icmp6_nd_opt, NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp6_nd_opt,
                                             type)),
@@ -3054,8 +3250,8 @@ static const struct token token_list[] = {
        [ITEM_ICMP6_ND_OPT_SLA_ETH_SLA] = {
                .name = "sla",
                .help = "source Ethernet LLA",
-               .next = NEXT(item_icmp6_nd_opt_sla_eth, NEXT_ENTRY(MAC_ADDR),
-                            item_param),
+               .next = NEXT(item_icmp6_nd_opt_sla_eth,
+                            NEXT_ENTRY(COMMON_MAC_ADDR), item_param),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_item_icmp6_nd_opt_sla_eth, sla)),
        },
@@ -3072,8 +3268,8 @@ static const struct token token_list[] = {
        [ITEM_ICMP6_ND_OPT_TLA_ETH_TLA] = {
                .name = "tla",
                .help = "target Ethernet LLA",
-               .next = NEXT(item_icmp6_nd_opt_tla_eth, NEXT_ENTRY(MAC_ADDR),
-                            item_param),
+               .next = NEXT(item_icmp6_nd_opt_tla_eth,
+                            NEXT_ENTRY(COMMON_MAC_ADDR), item_param),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_item_icmp6_nd_opt_tla_eth, tla)),
        },
@@ -3087,7 +3283,8 @@ static const struct token token_list[] = {
        [ITEM_META_DATA] = {
                .name = "data",
                .help = "metadata value",
-               .next = NEXT(item_meta, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_meta, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_MASK(struct rte_flow_item_meta,
                                             data, "\xff\xff\xff\xff")),
        },
@@ -3101,7 +3298,8 @@ static const struct token token_list[] = {
        [ITEM_GRE_KEY_VALUE] = {
                .name = "value",
                .help = "key value",
-               .next = NEXT(item_gre_key, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gre_key, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
        },
        [ITEM_GTP_PSC] = {
@@ -3115,14 +3313,16 @@ static const struct token token_list[] = {
        [ITEM_GTP_PSC_QFI] = {
                .name = "qfi",
                .help = "QoS flow identifier",
-               .next = NEXT(item_gtp_psc, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gtp_psc, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp_psc,
                                        qfi)),
        },
        [ITEM_GTP_PSC_PDU_T] = {
                .name = "pdu_t",
                .help = "PDU type",
-               .next = NEXT(item_gtp_psc, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_gtp_psc, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gtp_psc,
                                        pdu_type)),
        },
@@ -3143,7 +3343,8 @@ static const struct token token_list[] = {
        [ITEM_PPPOE_SEID] = {
                .name = "seid",
                .help = "session identifier",
-               .next = NEXT(item_pppoes, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_pppoes, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pppoe,
                                        session_id)),
        },
@@ -3152,7 +3353,7 @@ static const struct token token_list[] = {
                .help = "match PPPoE session protocol identifier",
                .priv = PRIV_ITEM(PPPOE_PROTO_ID,
                                sizeof(struct rte_flow_item_pppoe_proto_id)),
-               .next = NEXT(item_pppoe_proto_id, NEXT_ENTRY(UNSIGNED),
+               .next = NEXT(item_pppoe_proto_id, NEXT_ENTRY(COMMON_UNSIGNED),
                             item_param),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_item_pppoe_proto_id, proto_id)),
@@ -3169,14 +3370,16 @@ static const struct token token_list[] = {
        [ITEM_HIGIG2_CLASSIFICATION] = {
                .name = "classification",
                .help = "matches classification of higig2 header",
-               .next = NEXT(item_higig2, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_higig2, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_higig2_hdr,
                                        hdr.ppt1.classification)),
        },
        [ITEM_HIGIG2_VID] = {
                .name = "vid",
                .help = "matches vid of higig2 header",
-               .next = NEXT(item_higig2, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_higig2, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_higig2_hdr,
                                        hdr.ppt1.vid)),
        },
@@ -3190,13 +3393,13 @@ static const struct token token_list[] = {
        [ITEM_TAG_DATA] = {
                .name = "data",
                .help = "tag value to match",
-               .next = NEXT(item_tag, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_tag, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_tag, data)),
        },
        [ITEM_TAG_INDEX] = {
                .name = "index",
                .help = "index of tag array to match",
-               .next = NEXT(item_tag, NEXT_ENTRY(UNSIGNED),
+               .next = NEXT(item_tag, NEXT_ENTRY(COMMON_UNSIGNED),
                             NEXT_ENTRY(ITEM_PARAM_IS)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_tag, index)),
        },
@@ -3211,7 +3414,8 @@ static const struct token token_list[] = {
        [ITEM_L2TPV3OIP_SESSION_ID] = {
                .name = "session_id",
                .help = "session identifier",
-               .next = NEXT(item_l2tpv3oip, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_l2tpv3oip, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv3oip,
                                             session_id)),
        },
@@ -3225,7 +3429,7 @@ static const struct token token_list[] = {
        [ITEM_ESP_SPI] = {
                .name = "spi",
                .help = "security policy index",
-               .next = NEXT(item_esp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_esp, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_esp,
                                hdr.spi)),
        },
@@ -3239,7 +3443,7 @@ static const struct token token_list[] = {
        [ITEM_AH_SPI] = {
                .name = "spi",
                .help = "security parameters index",
-               .next = NEXT(item_ah, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_ah, NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ah, spi)),
        },
        [ITEM_PFCP] = {
@@ -3252,14 +3456,16 @@ static const struct token token_list[] = {
        [ITEM_PFCP_S_FIELD] = {
                .name = "s_field",
                .help = "S field",
-               .next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_pfcp, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp,
                                s_field)),
        },
        [ITEM_PFCP_SEID] = {
                .name = "seid",
                .help = "session endpoint identifier",
-               .next = NEXT(item_pfcp, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_pfcp, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_pfcp, seid)),
        },
        [ITEM_ECPRI] = {
@@ -3292,7 +3498,7 @@ static const struct token token_list[] = {
                .help = "Physical Channel ID",
                .next = NEXT(NEXT_ENTRY(ITEM_ECPRI_MSG_IQ_DATA_PCID,
                                ITEM_ECPRI_COMMON, ITEM_NEXT),
-                               NEXT_ENTRY(UNSIGNED), item_param),
+                               NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ecpri,
                                hdr.type0.pc_id)),
        },
@@ -3308,7 +3514,7 @@ static const struct token token_list[] = {
                .help = "Real-Time Control Data ID",
                .next = NEXT(NEXT_ENTRY(ITEM_ECPRI_MSG_RTC_CTRL_RTCID,
                                ITEM_ECPRI_COMMON, ITEM_NEXT),
-                               NEXT_ENTRY(UNSIGNED), item_param),
+                               NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ecpri,
                                hdr.type2.rtc_id)),
        },
@@ -3324,7 +3530,7 @@ static const struct token token_list[] = {
                .help = "Measurement ID",
                .next = NEXT(NEXT_ENTRY(ITEM_ECPRI_MSG_DLY_MSR_MSRID,
                                ITEM_ECPRI_COMMON, ITEM_NEXT),
-                               NEXT_ENTRY(UNSIGNED), item_param),
+                               NEXT_ENTRY(COMMON_UNSIGNED), item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ecpri,
                                hdr.type5.msr_id)),
        },
@@ -3340,21 +3546,24 @@ static const struct token token_list[] = {
        [ITEM_GENEVE_OPT_CLASS] = {
                .name = "class",
                .help = "GENEVE option class",
-               .next = NEXT(item_geneve_opt, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_geneve_opt, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_geneve_opt,
                                             option_class)),
        },
        [ITEM_GENEVE_OPT_TYPE] = {
                .name = "type",
                .help = "GENEVE option type",
-               .next = NEXT(item_geneve_opt, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_geneve_opt, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_geneve_opt,
                                        option_type)),
        },
        [ITEM_GENEVE_OPT_LENGTH] = {
                .name = "length",
                .help = "GENEVE option data length (in 32b words)",
-               .next = NEXT(item_geneve_opt, NEXT_ENTRY(UNSIGNED), item_param),
+               .next = NEXT(item_geneve_opt, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
                .args = ARGS(ARGS_ENTRY_BOUNDED(
                                struct rte_flow_item_geneve_opt, option_len,
                                0, 31)),
@@ -3362,13 +3571,43 @@ static const struct token token_list[] = {
        [ITEM_GENEVE_OPT_DATA] = {
                .name = "data",
                .help = "GENEVE option data pattern",
-               .next = NEXT(item_geneve_opt, NEXT_ENTRY(HEX), item_param),
+               .next = NEXT(item_geneve_opt, NEXT_ENTRY(COMMON_HEX),
+                            item_param),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_item_geneve_opt, data),
                             ARGS_ENTRY_ARB(0, 0),
                             ARGS_ENTRY_ARB
                                (sizeof(struct rte_flow_item_geneve_opt),
                                ITEM_GENEVE_OPT_DATA_SIZE)),
        },
+       [ITEM_INTEGRITY] = {
+               .name = "integrity",
+               .help = "match packet integrity",
+               .priv = PRIV_ITEM(INTEGRITY,
+                                 sizeof(struct rte_flow_item_integrity)),
+               .next = NEXT(item_integrity),
+               .call = parse_vc,
+       },
+       [ITEM_INTEGRITY_LEVEL] = {
+               .name = "level",
+               .help = "integrity level",
+               .next = NEXT(item_integrity_lv, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_integrity, level)),
+       },
+       [ITEM_INTEGRITY_VALUE] = {
+               .name = "value",
+               .help = "integrity value",
+               .next = NEXT(item_integrity_lv, NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_integrity, value)),
+       },
+       [ITEM_CONNTRACK] = {
+               .name = "conntrack",
+               .help = "conntrack state",
+               .next = NEXT(NEXT_ENTRY(ITEM_NEXT), NEXT_ENTRY(COMMON_UNSIGNED),
+                            item_param),
+               .args = ARGS(ARGS_ENTRY(struct rte_flow_item_conntrack, flags)),
+       },
        /* Validate/create actions. */
        [ACTIONS] = {
                .name = "actions",
@@ -3411,7 +3650,7 @@ static const struct token token_list[] = {
        [ACTION_JUMP_GROUP] = {
                .name = "group",
                .help = "group to redirect traffic to",
-               .next = NEXT(action_jump, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_jump, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_jump, group)),
                .call = parse_vc_conf,
        },
@@ -3425,7 +3664,7 @@ static const struct token token_list[] = {
        [ACTION_MARK_ID] = {
                .name = "id",
                .help = "32 bit value to return with packets",
-               .next = NEXT(action_mark, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_mark, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_mark, id)),
                .call = parse_vc_conf,
        },
@@ -3447,7 +3686,7 @@ static const struct token token_list[] = {
        [ACTION_QUEUE_INDEX] = {
                .name = "index",
                .help = "queue index to use",
-               .next = NEXT(action_queue, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_queue, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_queue, index)),
                .call = parse_vc_conf,
        },
@@ -3469,14 +3708,14 @@ static const struct token token_list[] = {
        [ACTION_COUNT_ID] = {
                .name = "identifier",
                .help = "counter identifier to use",
-               .next = NEXT(action_count, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_count, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_count, id)),
                .call = parse_vc_conf,
        },
        [ACTION_COUNT_SHARED] = {
                .name = "shared",
                .help = "shared counter",
-               .next = NEXT(action_count, NEXT_ENTRY(BOOLEAN)),
+               .next = NEXT(action_count, NEXT_ENTRY(COMMON_BOOLEAN)),
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_count,
                                           shared, 1)),
                .call = parse_vc_conf,
@@ -3520,7 +3759,7 @@ static const struct token token_list[] = {
        [ACTION_RSS_LEVEL] = {
                .name = "level",
                .help = "encapsulation level for \"types\"",
-               .next = NEXT(action_rss, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_rss, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_ARB
                             (offsetof(struct action_rss_data, conf) +
                              offsetof(struct rte_flow_action_rss, level),
@@ -3541,7 +3780,7 @@ static const struct token token_list[] = {
        [ACTION_RSS_KEY] = {
                .name = "key",
                .help = "RSS hash key",
-               .next = NEXT(action_rss, NEXT_ENTRY(HEX)),
+               .next = NEXT(action_rss, NEXT_ENTRY(COMMON_HEX)),
                .args = ARGS(ARGS_ENTRY_ARB
                             (offsetof(struct action_rss_data, conf) +
                              offsetof(struct rte_flow_action_rss, key),
@@ -3556,7 +3795,7 @@ static const struct token token_list[] = {
        [ACTION_RSS_KEY_LEN] = {
                .name = "key_len",
                .help = "RSS hash key length in bytes",
-               .next = NEXT(action_rss, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_rss, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_ARB_BOUNDED
                             (offsetof(struct action_rss_data, conf) +
                              offsetof(struct rte_flow_action_rss, key_len),
@@ -3594,7 +3833,7 @@ static const struct token token_list[] = {
        [ACTION_VF_ORIGINAL] = {
                .name = "original",
                .help = "use original VF ID if possible",
-               .next = NEXT(action_vf, NEXT_ENTRY(BOOLEAN)),
+               .next = NEXT(action_vf, NEXT_ENTRY(COMMON_BOOLEAN)),
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_vf,
                                           original, 1)),
                .call = parse_vc_conf,
@@ -3602,7 +3841,7 @@ static const struct token token_list[] = {
        [ACTION_VF_ID] = {
                .name = "id",
                .help = "VF ID",
-               .next = NEXT(action_vf, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_vf, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_vf, id)),
                .call = parse_vc_conf,
        },
@@ -3617,7 +3856,7 @@ static const struct token token_list[] = {
        [ACTION_PHY_PORT_ORIGINAL] = {
                .name = "original",
                .help = "use original port index if possible",
-               .next = NEXT(action_phy_port, NEXT_ENTRY(BOOLEAN)),
+               .next = NEXT(action_phy_port, NEXT_ENTRY(COMMON_BOOLEAN)),
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_phy_port,
                                           original, 1)),
                .call = parse_vc_conf,
@@ -3625,7 +3864,7 @@ static const struct token token_list[] = {
        [ACTION_PHY_PORT_INDEX] = {
                .name = "index",
                .help = "physical port index",
-               .next = NEXT(action_phy_port, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_phy_port, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_phy_port,
                                        index)),
                .call = parse_vc_conf,
@@ -3641,7 +3880,7 @@ static const struct token token_list[] = {
        [ACTION_PORT_ID_ORIGINAL] = {
                .name = "original",
                .help = "use original DPDK port ID if possible",
-               .next = NEXT(action_port_id, NEXT_ENTRY(BOOLEAN)),
+               .next = NEXT(action_port_id, NEXT_ENTRY(COMMON_BOOLEAN)),
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_port_id,
                                           original, 1)),
                .call = parse_vc_conf,
@@ -3649,7 +3888,7 @@ static const struct token token_list[] = {
        [ACTION_PORT_ID_ID] = {
                .name = "id",
                .help = "DPDK port ID",
-               .next = NEXT(action_port_id, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_port_id, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_port_id, id)),
                .call = parse_vc_conf,
        },
@@ -3661,10 +3900,41 @@ static const struct token token_list[] = {
                .next = NEXT(action_meter),
                .call = parse_vc,
        },
+       [ACTION_METER_COLOR] = {
+               .name = "color",
+               .help = "meter color for the packets",
+               .priv = PRIV_ACTION(METER_COLOR,
+                               sizeof(struct rte_flow_action_meter_color)),
+               .next = NEXT(action_meter_color),
+               .call = parse_vc,
+       },
+       [ACTION_METER_COLOR_TYPE] = {
+               .name = "type",
+               .help = "specific meter color",
+               .next = NEXT(NEXT_ENTRY(ACTION_NEXT),
+                               NEXT_ENTRY(ACTION_METER_COLOR_GREEN,
+                                       ACTION_METER_COLOR_YELLOW,
+                                       ACTION_METER_COLOR_RED)),
+       },
+       [ACTION_METER_COLOR_GREEN] = {
+               .name = "green",
+               .help = "meter color green",
+               .call = parse_vc_action_meter_color_type,
+       },
+       [ACTION_METER_COLOR_YELLOW] = {
+               .name = "yellow",
+               .help = "meter color yellow",
+               .call = parse_vc_action_meter_color_type,
+       },
+       [ACTION_METER_COLOR_RED] = {
+               .name = "red",
+               .help = "meter color red",
+               .call = parse_vc_action_meter_color_type,
+       },
        [ACTION_METER_ID] = {
                .name = "mtr_id",
                .help = "meter id to use",
-               .next = NEXT(action_meter, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_meter, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_meter, mtr_id)),
                .call = parse_vc_conf,
        },
@@ -3680,7 +3950,8 @@ static const struct token token_list[] = {
        [ACTION_OF_SET_MPLS_TTL_MPLS_TTL] = {
                .name = "mpls_ttl",
                .help = "MPLS TTL",
-               .next = NEXT(action_of_set_mpls_ttl, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_of_set_mpls_ttl,
+                            NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_of_set_mpls_ttl,
                                        mpls_ttl)),
                .call = parse_vc_conf,
@@ -3704,7 +3975,7 @@ static const struct token token_list[] = {
        [ACTION_OF_SET_NW_TTL_NW_TTL] = {
                .name = "nw_ttl",
                .help = "IP TTL",
-               .next = NEXT(action_of_set_nw_ttl, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_of_set_nw_ttl, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_of_set_nw_ttl,
                                        nw_ttl)),
                .call = parse_vc_conf,
@@ -3749,7 +4020,7 @@ static const struct token token_list[] = {
        [ACTION_OF_PUSH_VLAN_ETHERTYPE] = {
                .name = "ethertype",
                .help = "EtherType",
-               .next = NEXT(action_of_push_vlan, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_of_push_vlan, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_of_push_vlan,
                              ethertype)),
@@ -3767,7 +4038,8 @@ static const struct token token_list[] = {
        [ACTION_OF_SET_VLAN_VID_VLAN_VID] = {
                .name = "vlan_vid",
                .help = "VLAN id",
-               .next = NEXT(action_of_set_vlan_vid, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_of_set_vlan_vid,
+                            NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_of_set_vlan_vid,
                              vlan_vid)),
@@ -3785,7 +4057,8 @@ static const struct token token_list[] = {
        [ACTION_OF_SET_VLAN_PCP_VLAN_PCP] = {
                .name = "vlan_pcp",
                .help = "VLAN priority",
-               .next = NEXT(action_of_set_vlan_pcp, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_of_set_vlan_pcp,
+                            NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_of_set_vlan_pcp,
                              vlan_pcp)),
@@ -3802,7 +4075,7 @@ static const struct token token_list[] = {
        [ACTION_OF_POP_MPLS_ETHERTYPE] = {
                .name = "ethertype",
                .help = "EtherType",
-               .next = NEXT(action_of_pop_mpls, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_of_pop_mpls, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_of_pop_mpls,
                              ethertype)),
@@ -3820,7 +4093,7 @@ static const struct token token_list[] = {
        [ACTION_OF_PUSH_MPLS_ETHERTYPE] = {
                .name = "ethertype",
                .help = "EtherType",
-               .next = NEXT(action_of_push_mpls, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_of_push_mpls, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_of_push_mpls,
                              ethertype)),
@@ -3928,7 +4201,7 @@ static const struct token token_list[] = {
        [ACTION_SET_IPV4_SRC_IPV4_SRC] = {
                .name = "ipv4_addr",
                .help = "new IPv4 source address to set",
-               .next = NEXT(action_set_ipv4_src, NEXT_ENTRY(IPV4_ADDR)),
+               .next = NEXT(action_set_ipv4_src, NEXT_ENTRY(COMMON_IPV4_ADDR)),
                .args = ARGS(ARGS_ENTRY_HTON
                        (struct rte_flow_action_set_ipv4, ipv4_addr)),
                .call = parse_vc_conf,
@@ -3945,7 +4218,7 @@ static const struct token token_list[] = {
        [ACTION_SET_IPV4_DST_IPV4_DST] = {
                .name = "ipv4_addr",
                .help = "new IPv4 destination address to set",
-               .next = NEXT(action_set_ipv4_dst, NEXT_ENTRY(IPV4_ADDR)),
+               .next = NEXT(action_set_ipv4_dst, NEXT_ENTRY(COMMON_IPV4_ADDR)),
                .args = ARGS(ARGS_ENTRY_HTON
                        (struct rte_flow_action_set_ipv4, ipv4_addr)),
                .call = parse_vc_conf,
@@ -3962,7 +4235,7 @@ static const struct token token_list[] = {
        [ACTION_SET_IPV6_SRC_IPV6_SRC] = {
                .name = "ipv6_addr",
                .help = "new IPv6 source address to set",
-               .next = NEXT(action_set_ipv6_src, NEXT_ENTRY(IPV6_ADDR)),
+               .next = NEXT(action_set_ipv6_src, NEXT_ENTRY(COMMON_IPV6_ADDR)),
                .args = ARGS(ARGS_ENTRY_HTON
                        (struct rte_flow_action_set_ipv6, ipv6_addr)),
                .call = parse_vc_conf,
@@ -3979,7 +4252,7 @@ static const struct token token_list[] = {
        [ACTION_SET_IPV6_DST_IPV6_DST] = {
                .name = "ipv6_addr",
                .help = "new IPv6 destination address to set",
-               .next = NEXT(action_set_ipv6_dst, NEXT_ENTRY(IPV6_ADDR)),
+               .next = NEXT(action_set_ipv6_dst, NEXT_ENTRY(COMMON_IPV6_ADDR)),
                .args = ARGS(ARGS_ENTRY_HTON
                        (struct rte_flow_action_set_ipv6, ipv6_addr)),
                .call = parse_vc_conf,
@@ -3996,7 +4269,7 @@ static const struct token token_list[] = {
        [ACTION_SET_TP_SRC_TP_SRC] = {
                .name = "port",
                .help = "new source port number to set",
-               .next = NEXT(action_set_tp_src, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_tp_src, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_set_tp, port)),
                .call = parse_vc_conf,
@@ -4013,7 +4286,7 @@ static const struct token token_list[] = {
        [ACTION_SET_TP_DST_TP_DST] = {
                .name = "port",
                .help = "new destination port number to set",
-               .next = NEXT(action_set_tp_dst, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_tp_dst, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_set_tp, port)),
                .call = parse_vc_conf,
@@ -4044,7 +4317,7 @@ static const struct token token_list[] = {
        [ACTION_SET_TTL_TTL] = {
                .name = "ttl_value",
                .help = "new ttl value to set",
-               .next = NEXT(action_set_ttl, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_ttl, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_set_ttl, ttl_value)),
                .call = parse_vc_conf,
@@ -4060,7 +4333,7 @@ static const struct token token_list[] = {
        [ACTION_SET_MAC_SRC_MAC_SRC] = {
                .name = "mac_addr",
                .help = "new source mac address",
-               .next = NEXT(action_set_mac_src, NEXT_ENTRY(MAC_ADDR)),
+               .next = NEXT(action_set_mac_src, NEXT_ENTRY(COMMON_MAC_ADDR)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_set_mac, mac_addr)),
                .call = parse_vc_conf,
@@ -4076,7 +4349,7 @@ static const struct token token_list[] = {
        [ACTION_SET_MAC_DST_MAC_DST] = {
                .name = "mac_addr",
                .help = "new destination mac address to set",
-               .next = NEXT(action_set_mac_dst, NEXT_ENTRY(MAC_ADDR)),
+               .next = NEXT(action_set_mac_dst, NEXT_ENTRY(COMMON_MAC_ADDR)),
                .args = ARGS(ARGS_ENTRY_HTON
                             (struct rte_flow_action_set_mac, mac_addr)),
                .call = parse_vc_conf,
@@ -4091,7 +4364,7 @@ static const struct token token_list[] = {
        [ACTION_INC_TCP_SEQ_VALUE] = {
                .name = "value",
                .help = "the value to increase TCP sequence number by",
-               .next = NEXT(action_inc_tcp_seq, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_inc_tcp_seq, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
                .call = parse_vc_conf,
        },
@@ -4105,7 +4378,7 @@ static const struct token token_list[] = {
        [ACTION_DEC_TCP_SEQ_VALUE] = {
                .name = "value",
                .help = "the value to decrease TCP sequence number by",
-               .next = NEXT(action_dec_tcp_seq, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_dec_tcp_seq, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
                .call = parse_vc_conf,
        },
@@ -4119,7 +4392,7 @@ static const struct token token_list[] = {
        [ACTION_INC_TCP_ACK_VALUE] = {
                .name = "value",
                .help = "the value to increase TCP acknowledgment number by",
-               .next = NEXT(action_inc_tcp_ack, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_inc_tcp_ack, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
                .call = parse_vc_conf,
        },
@@ -4133,7 +4406,7 @@ static const struct token token_list[] = {
        [ACTION_DEC_TCP_ACK_VALUE] = {
                .name = "value",
                .help = "the value to decrease TCP acknowledgment number by",
-               .next = NEXT(action_dec_tcp_ack, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_dec_tcp_ack, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
                .call = parse_vc_conf,
        },
@@ -4216,7 +4489,8 @@ static const struct token token_list[] = {
        [ACTION_MODIFY_FIELD_DST_LEVEL] = {
                .name = "dst_level",
                .help = "destination field level",
-               .next = NEXT(action_modify_field_dst, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_modify_field_dst,
+                            NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
                                        dst.level)),
                .call = parse_vc_conf,
@@ -4224,7 +4498,8 @@ static const struct token token_list[] = {
        [ACTION_MODIFY_FIELD_DST_OFFSET] = {
                .name = "dst_offset",
                .help = "destination field bit offset",
-               .next = NEXT(action_modify_field_dst, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_modify_field_dst,
+                            NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
                                        dst.offset)),
                .call = parse_vc_conf,
@@ -4245,7 +4520,8 @@ static const struct token token_list[] = {
        [ACTION_MODIFY_FIELD_SRC_LEVEL] = {
                .name = "src_level",
                .help = "source field level",
-               .next = NEXT(action_modify_field_src, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_modify_field_src,
+                            NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
                                        src.level)),
                .call = parse_vc_conf,
@@ -4253,7 +4529,8 @@ static const struct token token_list[] = {
        [ACTION_MODIFY_FIELD_SRC_OFFSET] = {
                .name = "src_offset",
                .help = "source field bit offset",
-               .next = NEXT(action_modify_field_src, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_modify_field_src,
+                            NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
                                        src.offset)),
                .call = parse_vc_conf,
@@ -4262,7 +4539,7 @@ static const struct token token_list[] = {
                .name = "src_value",
                .help = "source immediate value",
                .next = NEXT(NEXT_ENTRY(ACTION_MODIFY_FIELD_WIDTH),
-                       NEXT_ENTRY(UNSIGNED)),
+                       NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
                                        src.value)),
                .call = parse_vc_conf,
@@ -4271,7 +4548,7 @@ static const struct token token_list[] = {
                .name = "width",
                .help = "number of bits to copy",
                .next = NEXT(NEXT_ENTRY(ACTION_NEXT),
-                       NEXT_ENTRY(UNSIGNED)),
+                       NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
                                        width)),
                .call = parse_vc_conf,
@@ -4311,7 +4588,7 @@ static const struct token token_list[] = {
        },
        [SET_RAW_INDEX] = {
                .name = "{index}",
-               .type = "UNSIGNED",
+               .type = "COMMON_UNSIGNED",
                .help = "index of raw_encap/raw_decap data",
                .next = NEXT(next_item),
                .call = parse_port,
@@ -4344,14 +4621,14 @@ static const struct token token_list[] = {
        [ACTION_SET_TAG_INDEX] = {
                .name = "index",
                .help = "index of tag array",
-               .next = NEXT(action_set_tag, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_tag, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY(struct rte_flow_action_set_tag, index)),
                .call = parse_vc_conf,
        },
        [ACTION_SET_TAG_DATA] = {
                .name = "data",
                .help = "tag value",
-               .next = NEXT(action_set_tag, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_tag, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY
                             (struct rte_flow_action_set_tag, data)),
                .call = parse_vc_conf,
@@ -4359,7 +4636,7 @@ static const struct token token_list[] = {
        [ACTION_SET_TAG_MASK] = {
                .name = "mask",
                .help = "mask for tag value",
-               .next = NEXT(action_set_tag, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_tag, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY
                             (struct rte_flow_action_set_tag, mask)),
                .call = parse_vc_conf,
@@ -4375,7 +4652,7 @@ static const struct token token_list[] = {
        [ACTION_SET_META_DATA] = {
                .name = "data",
                .help = "metadata value",
-               .next = NEXT(action_set_meta, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_meta, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY
                             (struct rte_flow_action_set_meta, data)),
                .call = parse_vc_conf,
@@ -4383,7 +4660,7 @@ static const struct token token_list[] = {
        [ACTION_SET_META_MASK] = {
                .name = "mask",
                .help = "mask for metadata value",
-               .next = NEXT(action_set_meta, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_meta, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY
                             (struct rte_flow_action_set_meta, mask)),
                .call = parse_vc_conf,
@@ -4399,7 +4676,7 @@ static const struct token token_list[] = {
        [ACTION_SET_IPV4_DSCP_VALUE] = {
                .name = "dscp_value",
                .help = "new IPv4 DSCP value to set",
-               .next = NEXT(action_set_ipv4_dscp, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_ipv4_dscp, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY
                             (struct rte_flow_action_set_dscp, dscp)),
                .call = parse_vc_conf,
@@ -4415,7 +4692,7 @@ static const struct token token_list[] = {
        [ACTION_SET_IPV6_DSCP_VALUE] = {
                .name = "dscp_value",
                .help = "new IPv6 DSCP value to set",
-               .next = NEXT(action_set_ipv6_dscp, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_set_ipv6_dscp, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY
                             (struct rte_flow_action_set_dscp, dscp)),
                .call = parse_vc_conf,
@@ -4433,7 +4710,7 @@ static const struct token token_list[] = {
                .help = "flow age timeout value",
                .args = ARGS(ARGS_ENTRY_BF(struct rte_flow_action_age,
                                           timeout, 24)),
-               .next = NEXT(action_age, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_age, NEXT_ENTRY(COMMON_UNSIGNED)),
                .call = parse_vc_conf,
        },
        [ACTION_SAMPLE] = {
@@ -4447,7 +4724,7 @@ static const struct token token_list[] = {
        [ACTION_SAMPLE_RATIO] = {
                .name = "ratio",
                .help = "flow sample ratio value",
-               .next = NEXT(action_sample, NEXT_ENTRY(UNSIGNED)),
+               .next = NEXT(action_sample, NEXT_ENTRY(COMMON_UNSIGNED)),
                .args = ARGS(ARGS_ENTRY_ARB
                             (offsetof(struct action_sample_data, conf) +
                              offsetof(struct rte_flow_action_sample, ratio),
@@ -4461,68 +4738,144 @@ static const struct token token_list[] = {
        },
        [ACTION_SAMPLE_INDEX_VALUE] = {
                .name = "{index}",
-               .type = "UNSIGNED",
+               .type = "COMMON_UNSIGNED",
                .help = "unsigned integer value",
                .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
                .call = parse_vc_action_sample_index,
                .comp = comp_set_sample_index,
        },
-       /* Shared action destroy arguments. */
-       [SHARED_ACTION_DESTROY_ID] = {
+       [ACTION_CONNTRACK] = {
+               .name = "conntrack",
+               .help = "create a conntrack object",
+               .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
+               .priv = PRIV_ACTION(CONNTRACK,
+                                   sizeof(struct rte_flow_action_conntrack)),
+               .call = parse_vc,
+       },
+       [ACTION_CONNTRACK_UPDATE] = {
+               .name = "conntrack_update",
+               .help = "update a conntrack object",
+               .next = NEXT(action_update_conntrack),
+               .priv = PRIV_ACTION(CONNTRACK,
+                                   sizeof(struct rte_flow_modify_conntrack)),
+               .call = parse_vc,
+       },
+       [ACTION_CONNTRACK_UPDATE_DIR] = {
+               .name = "dir",
+               .help = "update a conntrack object direction",
+               .next = NEXT(action_update_conntrack),
+               .call = parse_vc_action_conntrack_update,
+       },
+       [ACTION_CONNTRACK_UPDATE_CTX] = {
+               .name = "ctx",
+               .help = "update a conntrack object context",
+               .next = NEXT(action_update_conntrack),
+               .call = parse_vc_action_conntrack_update,
+       },
+       /* Indirect action destroy arguments. */
+       [INDIRECT_ACTION_DESTROY_ID] = {
                .name = "action_id",
-               .help = "specify a shared action id to destroy",
-               .next = NEXT(next_sa_destroy_attr,
-                            NEXT_ENTRY(SHARED_ACTION_ID)),
+               .help = "specify a indirect action id to destroy",
+               .next = NEXT(next_ia_destroy_attr,
+                            NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)),
                .args = ARGS(ARGS_ENTRY_PTR(struct buffer,
-                                           args.sa_destroy.action_id)),
-               .call = parse_sa_destroy,
+                                           args.ia_destroy.action_id)),
+               .call = parse_ia_destroy,
        },
-       /* Shared action create arguments. */
-       [SHARED_ACTION_CREATE_ID] = {
+       /* Indirect action create arguments. */
+       [INDIRECT_ACTION_CREATE_ID] = {
                .name = "action_id",
-               .help = "specify a shared action id to create",
-               .next = NEXT(next_sa_create_attr,
-                            NEXT_ENTRY(SHARED_ACTION_ID)),
+               .help = "specify a indirect action id to create",
+               .next = NEXT(next_ia_create_attr,
+                            NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)),
                .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.attr.group)),
        },
-       [ACTION_SHARED] = {
-               .name = "shared",
-               .help = "apply shared action by id",
-               .priv = PRIV_ACTION(SHARED, 0),
-               .next = NEXT(NEXT_ENTRY(SHARED_ACTION_ID2PTR)),
+       [ACTION_INDIRECT] = {
+               .name = "indirect",
+               .help = "apply indirect action by id",
+               .priv = PRIV_ACTION(INDIRECT, 0),
+               .next = NEXT(NEXT_ENTRY(INDIRECT_ACTION_ID2PTR)),
                .args = ARGS(ARGS_ENTRY_ARB(0, sizeof(uint32_t))),
                .call = parse_vc,
        },
-       [SHARED_ACTION_ID2PTR] = {
+       [INDIRECT_ACTION_ID2PTR] = {
                .name = "{action_id}",
-               .type = "SHARED_ACTION_ID",
-               .help = "shared action id",
+               .type = "INDIRECT_ACTION_ID",
+               .help = "indirect action id",
                .next = NEXT(NEXT_ENTRY(ACTION_NEXT)),
-               .call = parse_sa_id2ptr,
+               .call = parse_ia_id2ptr,
                .comp = comp_none,
        },
-       [SHARED_ACTION_INGRESS] = {
+       [INDIRECT_ACTION_INGRESS] = {
                .name = "ingress",
                .help = "affect rule to ingress",
-               .next = NEXT(next_sa_create_attr),
-               .call = parse_sa,
+               .next = NEXT(next_ia_create_attr),
+               .call = parse_ia,
        },
-       [SHARED_ACTION_EGRESS] = {
+       [INDIRECT_ACTION_EGRESS] = {
                .name = "egress",
                .help = "affect rule to egress",
-               .next = NEXT(next_sa_create_attr),
-               .call = parse_sa,
+               .next = NEXT(next_ia_create_attr),
+               .call = parse_ia,
        },
-       [SHARED_ACTION_TRANSFER] = {
+       [INDIRECT_ACTION_TRANSFER] = {
                .name = "transfer",
                .help = "affect rule to transfer",
-               .next = NEXT(next_sa_create_attr),
-               .call = parse_sa,
+               .next = NEXT(next_ia_create_attr),
+               .call = parse_ia,
        },
-       [SHARED_ACTION_SPEC] = {
+       [INDIRECT_ACTION_SPEC] = {
                .name = "action",
-               .help = "specify action to share",
+               .help = "specify action to create indirect handle",
+               .next = NEXT(next_action),
+       },
+       [ACTION_POL_G] = {
+               .name = "g_actions",
+               .help = "submit a list of associated actions for green",
                .next = NEXT(next_action),
+               .call = parse_mp,
+       },
+       [ACTION_POL_Y] = {
+               .name = "y_actions",
+               .help = "submit a list of associated actions for yellow",
+               .next = NEXT(next_action),
+       },
+       [ACTION_POL_R] = {
+               .name = "r_actions",
+               .help = "submit a list of associated actions for red",
+               .next = NEXT(next_action),
+       },
+
+       /* Top-level command. */
+       [ADD] = {
+               .name = "add",
+               .type = "port meter policy {port_id} {arg}",
+               .help = "add port meter policy",
+               .next = NEXT(NEXT_ENTRY(ITEM_POL_PORT)),
+               .call = parse_init,
+       },
+       /* Sub-level commands. */
+       [ITEM_POL_PORT] = {
+               .name = "port",
+               .help = "add port meter policy",
+               .next = NEXT(NEXT_ENTRY(ITEM_POL_METER)),
+       },
+       [ITEM_POL_METER] = {
+               .name = "meter",
+               .help = "add port meter policy",
+               .next = NEXT(NEXT_ENTRY(ITEM_POL_POLICY)),
+       },
+       [ITEM_POL_POLICY] = {
+               .name = "policy",
+               .help = "add port meter policy",
+               .next = NEXT(NEXT_ENTRY(ACTION_POL_R),
+                               NEXT_ENTRY(ACTION_POL_Y),
+                               NEXT_ENTRY(ACTION_POL_G),
+                               NEXT_ENTRY(COMMON_POLICY_ID),
+                               NEXT_ENTRY(COMMON_PORT_ID)),
+               .args = ARGS(ARGS_ENTRY(struct buffer, args.policy.policy_id),
+                               ARGS_ENTRY(struct buffer, port)),
+               .call = parse_mp,
        },
 };
 
@@ -4708,9 +5061,9 @@ parse_init(struct context *ctx, const struct token *token,
        return len;
 }
 
-/** Parse tokens for shared action commands. */
+/** Parse tokens for indirect action commands. */
 static int
-parse_sa(struct context *ctx, const struct token *token,
+parse_ia(struct context *ctx, const struct token *token,
         const char *str, unsigned int len,
         void *buf, unsigned int size)
 {
@@ -4723,7 +5076,7 @@ parse_sa(struct context *ctx, const struct token *token,
        if (!out)
                return len;
        if (!out->command) {
-               if (ctx->curr != SHARED_ACTION)
+               if (ctx->curr != INDIRECT_ACTION)
                        return -1;
                if (sizeof(*out) > size)
                        return -1;
@@ -4735,26 +5088,26 @@ parse_sa(struct context *ctx, const struct token *token,
                return len;
        }
        switch (ctx->curr) {
-       case SHARED_ACTION_CREATE:
-       case SHARED_ACTION_UPDATE:
+       case INDIRECT_ACTION_CREATE:
+       case INDIRECT_ACTION_UPDATE:
                out->args.vc.actions =
                        (void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),
                                               sizeof(double));
                out->args.vc.attr.group = UINT32_MAX;
                /* fallthrough */
-       case SHARED_ACTION_QUERY:
+       case INDIRECT_ACTION_QUERY:
                out->command = ctx->curr;
                ctx->objdata = 0;
                ctx->object = out;
                ctx->objmask = NULL;
                return len;
-       case SHARED_ACTION_EGRESS:
+       case INDIRECT_ACTION_EGRESS:
                out->args.vc.attr.egress = 1;
                return len;
-       case SHARED_ACTION_INGRESS:
+       case INDIRECT_ACTION_INGRESS:
                out->args.vc.attr.ingress = 1;
                return len;
-       case SHARED_ACTION_TRANSFER:
+       case INDIRECT_ACTION_TRANSFER:
                out->args.vc.attr.transfer = 1;
                return len;
        default:
@@ -4763,9 +5116,9 @@ parse_sa(struct context *ctx, const struct token *token,
 }
 
 
-/** Parse tokens for shared action destroy command. */
+/** Parse tokens for indirect action destroy command. */
 static int
-parse_sa_destroy(struct context *ctx, const struct token *token,
+parse_ia_destroy(struct context *ctx, const struct token *token,
                 const char *str, unsigned int len,
                 void *buf, unsigned int size)
 {
@@ -4778,8 +5131,8 @@ parse_sa_destroy(struct context *ctx, const struct token *token,
        /* Nothing else to do if there is no buffer. */
        if (!out)
                return len;
-       if (!out->command || out->command == SHARED_ACTION) {
-               if (ctx->curr != SHARED_ACTION_DESTROY)
+       if (!out->command || out->command == INDIRECT_ACTION) {
+               if (ctx->curr != INDIRECT_ACTION_DESTROY)
                        return -1;
                if (sizeof(*out) > size)
                        return -1;
@@ -4787,13 +5140,13 @@ parse_sa_destroy(struct context *ctx, const struct token *token,
                ctx->objdata = 0;
                ctx->object = out;
                ctx->objmask = NULL;
-               out->args.sa_destroy.action_id =
+               out->args.ia_destroy.action_id =
                        (void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),
                                               sizeof(double));
                return len;
        }
-       action_id = out->args.sa_destroy.action_id
-                   + out->args.sa_destroy.action_id_n++;
+       action_id = out->args.ia_destroy.action_id
+                   + out->args.ia_destroy.action_id_n++;
        if ((uint8_t *)action_id > (uint8_t *)out + size)
                return -1;
        ctx->objdata = 0;
@@ -4802,6 +5155,47 @@ parse_sa_destroy(struct context *ctx, const struct token *token,
        return len;
 }
 
+/** Parse tokens for meter policy action commands. */
+static int
+parse_mp(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 != ITEM_POL_POLICY)
+                       return -1;
+               if (sizeof(*out) > size)
+                       return -1;
+               out->command = ctx->curr;
+               ctx->objdata = 0;
+               ctx->object = out;
+               ctx->objmask = NULL;
+               out->args.vc.data = (uint8_t *)out + size;
+               return len;
+       }
+       switch (ctx->curr) {
+       case ACTION_POL_G:
+               out->args.vc.actions =
+                       (void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),
+                                       sizeof(double));
+               out->command = ctx->curr;
+               ctx->objdata = 0;
+               ctx->object = out;
+               ctx->objmask = NULL;
+               return len;
+       default:
+               return -1;
+       }
+}
+
 /** Parse tokens for validate/create commands. */
 static int
 parse_vc(struct context *ctx, const struct token *token,
@@ -4835,34 +5229,34 @@ parse_vc(struct context *ctx, const struct token *token,
        default:
                ctx->object = &out->args.vc.attr;
                break;
-       case TUNNEL_SET:
-       case TUNNEL_MATCH:
+       case VC_TUNNEL_SET:
+       case VC_TUNNEL_MATCH:
                ctx->object = &out->args.vc.tunnel_ops;
                break;
        }
        ctx->objmask = NULL;
        switch (ctx->curr) {
-       case GROUP:
-       case PRIORITY:
+       case VC_GROUP:
+       case VC_PRIORITY:
                return len;
-       case TUNNEL_SET:
+       case VC_TUNNEL_SET:
                out->args.vc.tunnel_ops.enabled = 1;
                out->args.vc.tunnel_ops.actions = 1;
                return len;
-       case TUNNEL_MATCH:
+       case VC_TUNNEL_MATCH:
                out->args.vc.tunnel_ops.enabled = 1;
                out->args.vc.tunnel_ops.items = 1;
                return len;
-       case INGRESS:
+       case VC_INGRESS:
                out->args.vc.attr.ingress = 1;
                return len;
-       case EGRESS:
+       case VC_EGRESS:
                out->args.vc.attr.egress = 1;
                return len;
-       case TRANSFER:
+       case VC_TRANSFER:
                out->args.vc.attr.transfer = 1;
                return len;
-       case PATTERN:
+       case ITEM_PATTERN:
                out->args.vc.pattern =
                        (void *)RTE_ALIGN_CEIL((uintptr_t)(out + 1),
                                               sizeof(double));
@@ -4943,7 +5337,7 @@ 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);
+               static const enum index prefix[] = NEXT_ENTRY(COMMON_PREFIX);
 
        case ITEM_PARAM_IS:
                index = 0;
@@ -5061,6 +5455,44 @@ parse_vc_item_ecpri_type(struct context *ctx, const struct token *token,
        return len;
 }
 
+/** Parse meter color action type. */
+static int
+parse_vc_action_meter_color_type(struct context *ctx, const struct token *token,
+                               const char *str, unsigned int len,
+                               void *buf, unsigned int size)
+{
+       struct rte_flow_action *action_data;
+       struct rte_flow_action_meter_color *conf;
+       enum rte_color color;
+
+       (void)buf;
+       (void)size;
+       /* Token name must match. */
+       if (parse_default(ctx, token, str, len, NULL, 0) < 0)
+               return -1;
+       switch (ctx->curr) {
+       case ACTION_METER_COLOR_GREEN:
+               color = RTE_COLOR_GREEN;
+       break;
+       case ACTION_METER_COLOR_YELLOW:
+               color = RTE_COLOR_YELLOW;
+       break;
+       case ACTION_METER_COLOR_RED:
+               color = RTE_COLOR_RED;
+       break;
+       default:
+               return -1;
+       }
+
+       if (!ctx->object)
+               return len;
+       action_data = ctx->object;
+       conf = (struct rte_flow_action_meter_color *)
+                                       (uintptr_t)(action_data->conf);
+       conf->color = color;
+       return len;
+}
+
 /** Parse RSS action. */
 static int
 parse_vc_action_rss(struct context *ctx, const struct token *token,
@@ -6273,6 +6705,42 @@ parse_vc_modify_field_id(struct context *ctx, const struct token *token,
        return len;
 }
 
+/** Parse the conntrack update, not a rte_flow_action. */
+static int
+parse_vc_action_conntrack_update(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_modify_conntrack *ct_modify = NULL;
+
+       (void)size;
+       if (ctx->curr != ACTION_CONNTRACK_UPDATE_CTX &&
+           ctx->curr != ACTION_CONNTRACK_UPDATE_DIR)
+               return -1;
+       /* 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;
+       ct_modify = (struct rte_flow_modify_conntrack *)out->args.vc.data;
+       if (ctx->curr == ACTION_CONNTRACK_UPDATE_DIR) {
+               ct_modify->new_ct.is_original_dir =
+                               conntrack_context.is_original_dir;
+               ct_modify->direction = 1;
+       } else {
+               uint32_t old_dir;
+
+               old_dir = ct_modify->new_ct.is_original_dir;
+               memcpy(&ct_modify->new_ct, &conntrack_context,
+                      sizeof(conntrack_context));
+               ct_modify->new_ct.is_original_dir = old_dir;
+               ct_modify->state = 1;
+       }
+       return len;
+}
+
 /** Parse tokens for destroy command. */
 static int
 parse_destroy(struct context *ctx, const struct token *token,
@@ -6360,8 +6828,20 @@ parse_dump(struct context *ctx, const struct token *token,
                ctx->objdata = 0;
                ctx->object = out;
                ctx->objmask = NULL;
+               return len;
+       }
+       switch (ctx->curr) {
+       case DUMP_ALL:
+       case DUMP_ONE:
+               out->args.dump.mode = (ctx->curr == DUMP_ALL) ? true : false;
+               out->command = ctx->curr;
+               ctx->objdata = 0;
+               ctx->object = out;
+               ctx->objmask = NULL;
+               return len;
+       default:
+               return -1;
        }
-       return len;
 }
 
 /** Parse tokens for query command. */
@@ -7059,7 +7539,7 @@ parse_port(struct context *ctx, const struct token *token,
 }
 
 static int
-parse_sa_id2ptr(struct context *ctx, const struct token *token,
+parse_ia_id2ptr(struct context *ctx, const struct token *token,
                const char *str, unsigned int len,
                void *buf, unsigned int size)
 {
@@ -7076,9 +7556,9 @@ parse_sa_id2ptr(struct context *ctx, const struct token *token,
        ctx->object = action;
        if (ret != (int)len)
                return ret;
-       /* set shared action */
+       /* set indirect action */
        if (action) {
-               action->conf = port_shared_action_get_by_id(ctx->port, id);
+               action->conf = port_action_handle_get_by_id(ctx->port, id);
                ret = (action->conf) ? ret : -1;
        }
        return ret;
@@ -7616,27 +8096,27 @@ static void
 cmd_flow_parsed(const struct buffer *in)
 {
        switch (in->command) {
-       case SHARED_ACTION_CREATE:
-               port_shared_action_create(
+       case INDIRECT_ACTION_CREATE:
+               port_action_handle_create(
                                in->port, in->args.vc.attr.group,
-                               &((const struct rte_flow_shared_action_conf) {
+                               &((const struct rte_flow_indir_action_conf) {
                                        .ingress = in->args.vc.attr.ingress,
                                        .egress = in->args.vc.attr.egress,
                                        .transfer = in->args.vc.attr.transfer,
                                }),
                                in->args.vc.actions);
                break;
-       case SHARED_ACTION_DESTROY:
-               port_shared_action_destroy(in->port,
-                                          in->args.sa_destroy.action_id_n,
-                                          in->args.sa_destroy.action_id);
+       case INDIRECT_ACTION_DESTROY:
+               port_action_handle_destroy(in->port,
+                                          in->args.ia_destroy.action_id_n,
+                                          in->args.ia_destroy.action_id);
                break;
-       case SHARED_ACTION_UPDATE:
-               port_shared_action_update(in->port, in->args.vc.attr.group,
+       case INDIRECT_ACTION_UPDATE:
+               port_action_handle_update(in->port, in->args.vc.attr.group,
                                          in->args.vc.actions);
                break;
-       case SHARED_ACTION_QUERY:
-               port_shared_action_query(in->port, in->args.sa.action_id);
+       case INDIRECT_ACTION_QUERY:
+               port_action_handle_query(in->port, in->args.ia.action_id);
                break;
        case VALIDATE:
                port_flow_validate(in->port, &in->args.vc.attr,
@@ -7655,8 +8135,10 @@ cmd_flow_parsed(const struct buffer *in)
        case FLUSH:
                port_flow_flush(in->port);
                break;
-       case DUMP:
-               port_flow_dump(in->port, in->args.dump.file);
+       case DUMP_ONE:
+       case DUMP_ALL:
+               port_flow_dump(in->port, in->args.dump.mode,
+                               in->args.dump.rule, in->args.dump.file);
                break;
        case QUERY:
                port_flow_query(in->port, in->args.query.rule,
@@ -7681,6 +8163,10 @@ cmd_flow_parsed(const struct buffer *in)
        case TUNNEL_LIST:
                port_flow_tunnel_list(in->port);
                break;
+       case ACTION_POL_G:
+               port_meter_policy_add(in->port, in->args.policy.policy_id,
+                                       in->args.vc.actions);
+               break;
        default:
                break;
        }
@@ -7727,7 +8213,8 @@ update_fields(uint8_t *buf, struct rte_flow_item *item, uint16_t next_proto)
                break;
        case RTE_FLOW_ITEM_TYPE_IPV4:
                ipv4 = (struct rte_ipv4_hdr *)buf;
-               ipv4->version_ihl = 0x45;
+               if (!ipv4->version_ihl)
+                       ipv4->version_ihl = RTE_IPV4_VHL_DEF;
                if (next_proto && ipv4->next_proto_id == 0)
                        ipv4->next_proto_id = (uint8_t)next_proto;
                break;
@@ -7945,8 +8432,18 @@ cmd_set_raw_parsed_sample(const struct buffer *in)
                                        (const void *)action->conf, size);
                        action->conf = &sample_vf[idx];
                        break;
+               case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP:
+                       size = sizeof(struct rte_flow_action_vxlan_encap);
+                       parse_setup_vxlan_encap_data(&sample_vxlan_encap[idx]);
+                       action->conf = &sample_vxlan_encap[idx].conf;
+                       break;
+               case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP:
+                       size = sizeof(struct rte_flow_action_nvgre_encap);
+                       parse_setup_nvgre_encap_data(&sample_nvgre_encap[idx]);
+                       action->conf = &sample_nvgre_encap[idx];
+                       break;
                default:
-                       printf("Error - Not supported action\n");
+                       fprintf(stderr, "Error - Not supported action\n");
                        return;
                }
                rte_memcpy(data, action, sizeof(struct rte_flow_action));
@@ -8071,13 +8568,15 @@ cmd_set_raw_parsed(const struct buffer *in)
                                break;
                        }
                        if (gtp_psc != i + 1) {
-                               printf("Error - GTP PSC does not follow GTP\n");
+                               fprintf(stderr,
+                                       "Error - GTP PSC does not follow GTP\n");
                                goto error;
                        }
                        gtp = item->spec;
                        if ((gtp->v_pt_rsv_flags & 0x07) != 0x04) {
                                /* Only E flag should be set. */
-                               printf("Error - GTP unsupported flags\n");
+                               fprintf(stderr,
+                                       "Error - GTP unsupported flags\n");
                                goto error;
                        } else {
                                struct rte_gtp_hdr_ext_word ext_word = {
@@ -8093,7 +8592,8 @@ cmd_set_raw_parsed(const struct buffer *in)
                        break;
                case RTE_FLOW_ITEM_TYPE_GTP_PSC:
                        if (gtp_psc >= 0) {
-                               printf("Error - Multiple GTP PSC items\n");
+                               fprintf(stderr,
+                                       "Error - Multiple GTP PSC items\n");
                                goto error;
                        } else {
                                const struct rte_flow_item_gtp_psc
@@ -8107,8 +8607,8 @@ cmd_set_raw_parsed(const struct buffer *in)
 
                                if (opt->pdu_type & 0x0F) {
                                        /* Support the minimal option only. */
-                                       printf("Error - GTP PSC option with "
-                                              "extra fields not supported\n");
+                                       fprintf(stderr,
+                                               "Error - GTP PSC option with extra fields not supported\n");
                                        goto error;
                                }
                                psc.len = sizeof(psc);
@@ -8126,7 +8626,7 @@ cmd_set_raw_parsed(const struct buffer *in)
                        size = sizeof(struct rte_flow_item_pfcp);
                        break;
                default:
-                       printf("Error - Not supported item\n");
+                       fprintf(stderr, "Error - Not supported item\n");
                        goto error;
                }
                *total_size += size;
@@ -8254,7 +8754,8 @@ cmd_show_set_raw_parsed(void *parsed_result, struct cmdline *cl, void *data)
                all = 1;
                index = 0;
        } else if (index >= RAW_ENCAP_CONFS_MAX_NUM) {
-               printf("index should be 0-%u\n", RAW_ENCAP_CONFS_MAX_NUM - 1);
+               fprintf(stderr, "index should be 0-%u\n",
+                       RAW_ENCAP_CONFS_MAX_NUM - 1);
                return;
        }
        do {