From cdbbf1cee72afe96052b5c71490747ad32fa593c Mon Sep 17 00:00:00 2001 From: Jie Zhou Date: Tue, 29 Jun 2021 13:50:18 -0700 Subject: [PATCH] app/testpmd: resolve name collisions with Windows types Resolve name collisions with Windows types. Signed-off-by: Jie Zhou Acked-by: Tal Shnaiderman Acked-by: Dmitry Kozlyuk --- app/test-pmd/cmdline_flow.c | 588 ++++++++++++++++++++---------------- 1 file changed, 330 insertions(+), 258 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 7645b3cc90..4669163eea 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -40,22 +40,22 @@ 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, - INDIRECT_ACTION_ID, - POLICY_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, @@ -104,13 +104,13 @@ enum index { AGED_DESTROY, /* Validate/create arguments. */ - GROUP, - PRIORITY, - INGRESS, - EGRESS, - TRANSFER, - TUNNEL_SET, - TUNNEL_MATCH, + VC_GROUP, + VC_PRIORITY, + VC_INGRESS, + VC_EGRESS, + VC_TRANSFER, + VC_TUNNEL_SET, + VC_TUNNEL_MATCH, /* Dump arguments */ DUMP_ALL, @@ -133,7 +133,7 @@ enum index { INDIRECT_ACTION_DESTROY_ID, /* Validate/create pattern. */ - PATTERN, + ITEM_PATTERN, ITEM_PARAM_IS, ITEM_PARAM_SPEC, ITEM_PARAM_LAST, @@ -895,14 +895,14 @@ static const enum index next_ia_subcmd[] = { }; 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, }; @@ -913,7 +913,7 @@ static const enum index next_destroy_attr[] = { }; static const enum index next_dump_attr[] = { - FILE_PATH, + COMMON_FILE_PATH, END, ZERO, }; @@ -1927,111 +1927,111 @@ 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, }, - [INDIRECT_ACTION_ID] = { + [COMMON_INDIRECT_ACTION_ID] = { .name = "{indirect_action_id}", .type = "INDIRECT_ACTION_ID", .help = "indirect action id", .call = parse_int, .comp = comp_none, }, - [POLICY_ID] = { + [COMMON_POLICY_ID] = { .name = "{policy_id}", .type = "POLCIY_ID", .help = "policy id", @@ -2062,7 +2062,7 @@ static const struct token token_list[] = { .name = "indirect_action", .type = "{command} {port_id} [{arg} [...]]", .help = "manage indirect actions", - .next = NEXT(next_ia_subcmd, NEXT_ENTRY(PORT_ID)), + .next = NEXT(next_ia_subcmd, NEXT_ENTRY(COMMON_PORT_ID)), .args = ARGS(ARGS_ENTRY(struct buffer, port)), .call = parse_ia, }, @@ -2077,7 +2077,7 @@ static const struct token token_list[] = { .name = "update", .help = "update indirect action", .next = NEXT(NEXT_ENTRY(INDIRECT_ACTION_SPEC), - NEXT_ENTRY(INDIRECT_ACTION_ID)), + NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)), .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.attr.group)), .call = parse_ia, }, @@ -2091,42 +2091,44 @@ static const struct token token_list[] = { [INDIRECT_ACTION_QUERY] = { .name = "query", .help = "query indirect action", - .next = NEXT(NEXT_ENTRY(END), NEXT_ENTRY(INDIRECT_ACTION_ID)), + .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 single/all flow rules to file", - .next = NEXT(next_dump_subcmd, NEXT_ENTRY(PORT_ID)), + .next = NEXT(next_dump_subcmd, NEXT_ENTRY(COMMON_PORT_ID)), .args = ARGS(ARGS_ENTRY(struct buffer, port)), .call = parse_dump, }, @@ -2134,8 +2136,8 @@ static const struct token token_list[] = { .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)), @@ -2144,22 +2146,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, @@ -2176,14 +2178,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, }, @@ -2191,21 +2193,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, }, @@ -2213,7 +2215,7 @@ 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, }, @@ -2228,7 +2230,7 @@ static const struct token token_list[] = { [DUMP_ONE] = { .name = "rule", .help = "dump one rule", - .next = NEXT(next_dump_attr, NEXT_ENTRY(RULE_ID)), + .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, @@ -2245,7 +2247,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, }, @@ -2256,54 +2258,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), @@ -2370,7 +2372,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] = { @@ -2390,7 +2392,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] = { @@ -2404,7 +2406,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] = { @@ -2418,7 +2421,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] = { @@ -2431,7 +2435,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] = { @@ -2444,34 +2449,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)), @@ -2490,25 +2495,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)), }, @@ -2522,41 +2527,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)), }, @@ -2570,49 +2581,56 @@ static const struct token token_list[] = { [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(UNSIGNED), item_param), + .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)), }, @@ -2626,7 +2644,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")), @@ -2634,7 +2653,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")), @@ -2642,35 +2662,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)), }, @@ -2684,28 +2709,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)), }, @@ -2719,14 +2748,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)), }, @@ -2740,21 +2770,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)), }, @@ -2768,28 +2798,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)), }, @@ -2803,7 +2837,8 @@ 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_E_TAG] = { @@ -2816,7 +2851,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")), @@ -2831,7 +2867,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] = { @@ -2844,7 +2881,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")), @@ -2852,7 +2890,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")), @@ -2860,7 +2899,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")), @@ -2875,7 +2915,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)), }, @@ -2885,14 +2926,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")), @@ -2900,7 +2943,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")), @@ -2908,7 +2951,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")), @@ -2924,7 +2967,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)), }, @@ -2938,20 +2982,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] = { @@ -2978,20 +3022,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")), @@ -3007,7 +3054,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)), }, @@ -3022,7 +3070,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)), @@ -3030,7 +3078,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)), @@ -3038,7 +3086,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)), @@ -3046,7 +3094,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)), @@ -3062,7 +3110,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)), }, @@ -3077,7 +3126,7 @@ 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)), @@ -3085,7 +3134,7 @@ static const struct token token_list[] = { [ITEM_IPV6_FRAG_EXT_FRAG_DATA] = { .name = "frag_data", .help = "fragment flags and offset", - .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_HTON(struct rte_flow_item_ipv6_frag_ext, hdr.frag_data)), @@ -3093,7 +3142,7 @@ static const struct token token_list[] = { [ITEM_IPV6_FRAG_EXT_ID] = { .name = "packet_id", .help = "fragment packet id", - .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_HTON(struct rte_flow_item_ipv6_frag_ext, hdr.id)), @@ -3108,14 +3157,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)), }, @@ -3130,7 +3181,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)), @@ -3146,7 +3197,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)), @@ -3163,7 +3214,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)), @@ -3181,8 +3232,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)), }, @@ -3199,8 +3250,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)), }, @@ -3214,7 +3265,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")), }, @@ -3228,7 +3280,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] = { @@ -3242,14 +3295,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)), }, @@ -3270,7 +3325,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)), }, @@ -3279,7 +3335,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)), @@ -3296,14 +3352,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)), }, @@ -3317,13 +3375,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)), }, @@ -3338,7 +3396,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)), }, @@ -3352,7 +3411,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)), }, @@ -3366,7 +3425,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] = { @@ -3379,14 +3438,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] = { @@ -3419,7 +3480,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)), }, @@ -3435,7 +3496,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)), }, @@ -3451,7 +3512,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)), }, @@ -3467,21 +3528,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)), @@ -3489,7 +3553,8 @@ 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 @@ -3507,21 +3572,21 @@ static const struct token token_list[] = { [ITEM_INTEGRITY_LEVEL] = { .name = "level", .help = "integrity level", - .next = NEXT(item_integrity_lv, NEXT_ENTRY(UNSIGNED), + .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(UNSIGNED), + .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(UNSIGNED), + .next = NEXT(NEXT_ENTRY(ITEM_NEXT), NEXT_ENTRY(COMMON_UNSIGNED), item_param), .args = ARGS(ARGS_ENTRY(struct rte_flow_item_conntrack, flags)), }, @@ -3567,7 +3632,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, }, @@ -3581,7 +3646,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, }, @@ -3603,7 +3668,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, }, @@ -3625,14 +3690,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, @@ -3676,7 +3741,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), @@ -3697,7 +3762,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), @@ -3712,7 +3777,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), @@ -3750,7 +3815,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, @@ -3758,7 +3823,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, }, @@ -3773,7 +3838,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, @@ -3781,7 +3846,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, @@ -3797,7 +3862,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, @@ -3805,7 +3870,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, }, @@ -3851,7 +3916,7 @@ static const struct token token_list[] = { [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, }, @@ -3867,7 +3932,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, @@ -3891,7 +3957,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, @@ -3936,7 +4002,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)), @@ -3954,7 +4020,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)), @@ -3972,7 +4039,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)), @@ -3989,7 +4057,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)), @@ -4007,7 +4075,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)), @@ -4115,7 +4183,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, @@ -4132,7 +4200,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, @@ -4149,7 +4217,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, @@ -4166,7 +4234,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, @@ -4183,7 +4251,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, @@ -4200,7 +4268,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, @@ -4231,7 +4299,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, @@ -4247,7 +4315,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, @@ -4263,7 +4331,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, @@ -4278,7 +4346,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, }, @@ -4292,7 +4360,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, }, @@ -4306,7 +4374,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, }, @@ -4320,7 +4388,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, }, @@ -4403,7 +4471,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, @@ -4411,7 +4480,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, @@ -4432,7 +4502,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, @@ -4440,7 +4511,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, @@ -4449,7 +4521,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, @@ -4458,7 +4530,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, @@ -4498,7 +4570,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, @@ -4531,14 +4603,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, @@ -4546,7 +4618,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, @@ -4562,7 +4634,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, @@ -4570,7 +4642,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, @@ -4586,7 +4658,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, @@ -4602,7 +4674,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, @@ -4620,7 +4692,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] = { @@ -4634,7 +4706,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), @@ -4648,7 +4720,7 @@ 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, @@ -4687,7 +4759,7 @@ static const struct token token_list[] = { .name = "action_id", .help = "specify a indirect action id to destroy", .next = NEXT(next_ia_destroy_attr, - NEXT_ENTRY(INDIRECT_ACTION_ID)), + NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)), .args = ARGS(ARGS_ENTRY_PTR(struct buffer, args.ia_destroy.action_id)), .call = parse_ia_destroy, @@ -4697,7 +4769,7 @@ static const struct token token_list[] = { .name = "action_id", .help = "specify a indirect action id to create", .next = NEXT(next_ia_create_attr, - NEXT_ENTRY(INDIRECT_ACTION_ID)), + NEXT_ENTRY(COMMON_INDIRECT_ACTION_ID)), .args = ARGS(ARGS_ENTRY(struct buffer, args.vc.attr.group)), }, [ACTION_INDIRECT] = { @@ -4781,8 +4853,8 @@ static const struct token token_list[] = { .next = NEXT(NEXT_ENTRY(ACTION_POL_R), NEXT_ENTRY(ACTION_POL_Y), NEXT_ENTRY(ACTION_POL_G), - NEXT_ENTRY(POLICY_ID), - NEXT_ENTRY(PORT_ID)), + 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, @@ -5139,34 +5211,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)); @@ -5247,7 +5319,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; -- 2.20.1