@@ -115,7 +115,6 @@ static void cmd_help_brief_parsed(__attribute__((unused)) void *parsed_result,
"information.\n"
" help config : Configuration information.\n"
" help ports : Configuring ports.\n"
- " help flowdir : Flow Director filter help.\n"
" help registers : Reading and setting port registers.\n"
" help filters : Filters configuration help.\n"
" help all : All of the above sections.\n\n"
@@ -490,71 +489,6 @@ static void cmd_help_long_parsed(void *parsed_result,
);
}
-
- if (show_all || !strcmp(res->section, "flowdir")) {
-
- cmdline_printf(
- cl,
- "\n"
- "Flow director mode:\n"
- "-------------------\n\n"
-
- "add_signature_filter (port_id) (ip|udp|tcp|sctp)"
- " src (src_ip_address) (src_port)"
- " dst (dst_ip_address) (dst_port)"
- " flexbytes (flexbytes_values) vlan (vlan_id)"
- " queue (queue_id)\n"
- " Add a signature filter.\n\n"
-
- "upd_signature_filter (port_id) (ip|udp|tcp|sctp)"
- " src (src_ip_address) (src_port)"
- " dst (dst_ip_address) (dst_port)"
- " flexbytes (flexbytes_values) vlan (vlan_id)"
- " queue (queue_id)\n"
- " Update a signature filter.\n\n"
-
- "rm_signature_filter (port_id) (ip|udp|tcp|sctp)"
- " src (src_ip_address) (src_port)"
- " dst (dst_ip_address) (dst_port)"
- " flexbytes (flexbytes_values) vlan (vlan_id)\n"
- " Remove a signature filter.\n\n"
-
- "add_perfect_filter (port_id) (ip|udp|tcp|sctp)"
- " src (src_ip_address) (src_port)"
- " dst (dst_ip_address) (dst_port)"
- " flexbytes (flexbytes_values) vlan (vlan_id)"
- " queue (queue_id) soft (soft_id)\n"
- " Add a perfect filter.\n\n"
-
- "upd_perfect_filter (port_id) (ip|udp|tcp|sctp)"
- " src (src_ip_address) (src_port)"
- " dst (dst_ip_address) (dst_port)"
- " flexbytes (flexbytes_values) vlan (vlan_id)"
- " queue (queue_id)\n"
- " Update a perfect filter.\n\n"
-
- "rm_perfect_filter (port_id) (ip|udp|tcp|sctp)"
- " src (src_ip_address) (src_port)"
- " dst (dst_ip_address) (dst_port)"
- " flexbytes (flexbytes_values) vlan (vlan_id)"
- " soft (soft_id)\n"
- " Remove a perfect filter.\n\n"
-
- "set_masks_filter (port_id) only_ip_flow (0|1)"
- " src_mask (ip_src_mask) (src_port_mask)"
- " dst_mask (ip_dst_mask) (dst_port_mask)"
- " flexbytes (0|1) vlan_id (0|1) vlan_prio (0|1)\n"
- " Set IPv4 filter masks.\n\n"
-
- "set_ipv6_masks_filter (port_id) only_ip_flow (0|1)"
- " src_mask (ip_src_mask) (src_port_mask)"
- " dst_mask (ip_dst_mask) (dst_port_mask)"
- " flexbytes (0|1) vlan_id (0|1) vlan_prio (0|1)"
- " compare_dst (0|1)\n"
- " Set IPv6 filter masks.\n\n"
- );
- }
-
if (show_all || !strcmp(res->section, "ports")) {
cmdline_printf(
@@ -750,7 +684,7 @@ cmdline_parse_token_string_t cmd_help_long_help =
cmdline_parse_token_string_t cmd_help_long_section =
TOKEN_STRING_INITIALIZER(struct cmd_help_long_result, section,
- "all#control#display#config#flowdir#"
+ "all#control#display#config#"
"ports#registers#filters");
cmdline_parse_inst_t cmd_help_long = {
@@ -4361,503 +4295,6 @@ cmdline_parse_inst_t cmd_set_allmulti_mode_one = {
},
};
-/* *** ADD/REMOVE A PKT FILTER *** */
-struct cmd_pkt_filter_result {
- cmdline_fixed_string_t pkt_filter;
- uint8_t port_id;
- cmdline_fixed_string_t protocol;
- cmdline_fixed_string_t src;
- cmdline_ipaddr_t ip_src;
- uint16_t port_src;
- cmdline_fixed_string_t dst;
- cmdline_ipaddr_t ip_dst;
- uint16_t port_dst;
- cmdline_fixed_string_t flexbytes;
- uint16_t flexbytes_value;
- cmdline_fixed_string_t vlan;
- uint16_t vlan_id;
- cmdline_fixed_string_t queue;
- int8_t queue_id;
- cmdline_fixed_string_t soft;
- uint8_t soft_id;
-};
-
-static void
-cmd_pkt_filter_parsed(void *parsed_result,
- __attribute__((unused)) struct cmdline *cl,
- __attribute__((unused)) void *data)
-{
- struct rte_fdir_filter fdir_filter;
- struct cmd_pkt_filter_result *res = parsed_result;
-
- memset(&fdir_filter, 0, sizeof(struct rte_fdir_filter));
-
- if (res->ip_src.family == AF_INET)
- fdir_filter.ip_src.ipv4_addr = res->ip_src.addr.ipv4.s_addr;
- else
- memcpy(&(fdir_filter.ip_src.ipv6_addr),
- &(res->ip_src.addr.ipv6),
- sizeof(struct in6_addr));
-
- if (res->ip_dst.family == AF_INET)
- fdir_filter.ip_dst.ipv4_addr = res->ip_dst.addr.ipv4.s_addr;
- else
- memcpy(&(fdir_filter.ip_dst.ipv6_addr),
- &(res->ip_dst.addr.ipv6),
- sizeof(struct in6_addr));
-
- fdir_filter.port_dst = rte_cpu_to_be_16(res->port_dst);
- fdir_filter.port_src = rte_cpu_to_be_16(res->port_src);
-
- if (!strcmp(res->protocol, "udp"))
- fdir_filter.l4type = RTE_FDIR_L4TYPE_UDP;
- else if (!strcmp(res->protocol, "tcp"))
- fdir_filter.l4type = RTE_FDIR_L4TYPE_TCP;
- else if (!strcmp(res->protocol, "sctp"))
- fdir_filter.l4type = RTE_FDIR_L4TYPE_SCTP;
- else /* default only IP */
- fdir_filter.l4type = RTE_FDIR_L4TYPE_NONE;
-
- if (res->ip_dst.family == AF_INET6)
- fdir_filter.iptype = RTE_FDIR_IPTYPE_IPV6;
- else
- fdir_filter.iptype = RTE_FDIR_IPTYPE_IPV4;
-
- fdir_filter.vlan_id = rte_cpu_to_be_16(res->vlan_id);
- fdir_filter.flex_bytes = rte_cpu_to_be_16(res->flexbytes_value);
-
- if (!strcmp(res->pkt_filter, "add_signature_filter"))
- fdir_add_signature_filter(res->port_id, res->queue_id,
- &fdir_filter);
- else if (!strcmp(res->pkt_filter, "upd_signature_filter"))
- fdir_update_signature_filter(res->port_id, res->queue_id,
- &fdir_filter);
- else if (!strcmp(res->pkt_filter, "rm_signature_filter"))
- fdir_remove_signature_filter(res->port_id, &fdir_filter);
- else if (!strcmp(res->pkt_filter, "add_perfect_filter"))
- fdir_add_perfect_filter(res->port_id, res->soft_id,
- res->queue_id,
- (uint8_t) (res->queue_id < 0),
- &fdir_filter);
- else if (!strcmp(res->pkt_filter, "upd_perfect_filter"))
- fdir_update_perfect_filter(res->port_id, res->soft_id,
- res->queue_id,
- (uint8_t) (res->queue_id < 0),
- &fdir_filter);
- else if (!strcmp(res->pkt_filter, "rm_perfect_filter"))
- fdir_remove_perfect_filter(res->port_id, res->soft_id,
- &fdir_filter);
-
-}
-
-
-cmdline_parse_token_num_t cmd_pkt_filter_port_id =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_result,
- port_id, UINT8);
-cmdline_parse_token_string_t cmd_pkt_filter_protocol =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- protocol, "ip#tcp#udp#sctp");
-cmdline_parse_token_string_t cmd_pkt_filter_src =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- src, "src");
-cmdline_parse_token_ipaddr_t cmd_pkt_filter_ip_src =
- TOKEN_IPADDR_INITIALIZER(struct cmd_pkt_filter_result,
- ip_src);
-cmdline_parse_token_num_t cmd_pkt_filter_port_src =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_result,
- port_src, UINT16);
-cmdline_parse_token_string_t cmd_pkt_filter_dst =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- dst, "dst");
-cmdline_parse_token_ipaddr_t cmd_pkt_filter_ip_dst =
- TOKEN_IPADDR_INITIALIZER(struct cmd_pkt_filter_result,
- ip_dst);
-cmdline_parse_token_num_t cmd_pkt_filter_port_dst =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_result,
- port_dst, UINT16);
-cmdline_parse_token_string_t cmd_pkt_filter_flexbytes =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- flexbytes, "flexbytes");
-cmdline_parse_token_num_t cmd_pkt_filter_flexbytes_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_result,
- flexbytes_value, UINT16);
-cmdline_parse_token_string_t cmd_pkt_filter_vlan =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- vlan, "vlan");
-cmdline_parse_token_num_t cmd_pkt_filter_vlan_id =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_result,
- vlan_id, UINT16);
-cmdline_parse_token_string_t cmd_pkt_filter_queue =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- queue, "queue");
-cmdline_parse_token_num_t cmd_pkt_filter_queue_id =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_result,
- queue_id, INT8);
-cmdline_parse_token_string_t cmd_pkt_filter_soft =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- soft, "soft");
-cmdline_parse_token_num_t cmd_pkt_filter_soft_id =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_result,
- soft_id, UINT16);
-
-
-cmdline_parse_token_string_t cmd_pkt_filter_add_signature_filter =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- pkt_filter, "add_signature_filter");
-cmdline_parse_inst_t cmd_add_signature_filter = {
- .f = cmd_pkt_filter_parsed,
- .data = NULL,
- .help_str = "add a signature filter",
- .tokens = {
- (void *)&cmd_pkt_filter_add_signature_filter,
- (void *)&cmd_pkt_filter_port_id,
- (void *)&cmd_pkt_filter_protocol,
- (void *)&cmd_pkt_filter_src,
- (void *)&cmd_pkt_filter_ip_src,
- (void *)&cmd_pkt_filter_port_src,
- (void *)&cmd_pkt_filter_dst,
- (void *)&cmd_pkt_filter_ip_dst,
- (void *)&cmd_pkt_filter_port_dst,
- (void *)&cmd_pkt_filter_flexbytes,
- (void *)&cmd_pkt_filter_flexbytes_value,
- (void *)&cmd_pkt_filter_vlan,
- (void *)&cmd_pkt_filter_vlan_id,
- (void *)&cmd_pkt_filter_queue,
- (void *)&cmd_pkt_filter_queue_id,
- NULL,
- },
-};
-
-
-cmdline_parse_token_string_t cmd_pkt_filter_upd_signature_filter =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- pkt_filter, "upd_signature_filter");
-cmdline_parse_inst_t cmd_upd_signature_filter = {
- .f = cmd_pkt_filter_parsed,
- .data = NULL,
- .help_str = "update a signature filter",
- .tokens = {
- (void *)&cmd_pkt_filter_upd_signature_filter,
- (void *)&cmd_pkt_filter_port_id,
- (void *)&cmd_pkt_filter_protocol,
- (void *)&cmd_pkt_filter_src,
- (void *)&cmd_pkt_filter_ip_src,
- (void *)&cmd_pkt_filter_port_src,
- (void *)&cmd_pkt_filter_dst,
- (void *)&cmd_pkt_filter_ip_dst,
- (void *)&cmd_pkt_filter_port_dst,
- (void *)&cmd_pkt_filter_flexbytes,
- (void *)&cmd_pkt_filter_flexbytes_value,
- (void *)&cmd_pkt_filter_vlan,
- (void *)&cmd_pkt_filter_vlan_id,
- (void *)&cmd_pkt_filter_queue,
- (void *)&cmd_pkt_filter_queue_id,
- NULL,
- },
-};
-
-
-cmdline_parse_token_string_t cmd_pkt_filter_rm_signature_filter =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- pkt_filter, "rm_signature_filter");
-cmdline_parse_inst_t cmd_rm_signature_filter = {
- .f = cmd_pkt_filter_parsed,
- .data = NULL,
- .help_str = "remove a signature filter",
- .tokens = {
- (void *)&cmd_pkt_filter_rm_signature_filter,
- (void *)&cmd_pkt_filter_port_id,
- (void *)&cmd_pkt_filter_protocol,
- (void *)&cmd_pkt_filter_src,
- (void *)&cmd_pkt_filter_ip_src,
- (void *)&cmd_pkt_filter_port_src,
- (void *)&cmd_pkt_filter_dst,
- (void *)&cmd_pkt_filter_ip_dst,
- (void *)&cmd_pkt_filter_port_dst,
- (void *)&cmd_pkt_filter_flexbytes,
- (void *)&cmd_pkt_filter_flexbytes_value,
- (void *)&cmd_pkt_filter_vlan,
- (void *)&cmd_pkt_filter_vlan_id,
- NULL
- },
-};
-
-
-cmdline_parse_token_string_t cmd_pkt_filter_add_perfect_filter =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- pkt_filter, "add_perfect_filter");
-cmdline_parse_inst_t cmd_add_perfect_filter = {
- .f = cmd_pkt_filter_parsed,
- .data = NULL,
- .help_str = "add a perfect filter",
- .tokens = {
- (void *)&cmd_pkt_filter_add_perfect_filter,
- (void *)&cmd_pkt_filter_port_id,
- (void *)&cmd_pkt_filter_protocol,
- (void *)&cmd_pkt_filter_src,
- (void *)&cmd_pkt_filter_ip_src,
- (void *)&cmd_pkt_filter_port_src,
- (void *)&cmd_pkt_filter_dst,
- (void *)&cmd_pkt_filter_ip_dst,
- (void *)&cmd_pkt_filter_port_dst,
- (void *)&cmd_pkt_filter_flexbytes,
- (void *)&cmd_pkt_filter_flexbytes_value,
- (void *)&cmd_pkt_filter_vlan,
- (void *)&cmd_pkt_filter_vlan_id,
- (void *)&cmd_pkt_filter_queue,
- (void *)&cmd_pkt_filter_queue_id,
- (void *)&cmd_pkt_filter_soft,
- (void *)&cmd_pkt_filter_soft_id,
- NULL,
- },
-};
-
-
-cmdline_parse_token_string_t cmd_pkt_filter_upd_perfect_filter =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- pkt_filter, "upd_perfect_filter");
-cmdline_parse_inst_t cmd_upd_perfect_filter = {
- .f = cmd_pkt_filter_parsed,
- .data = NULL,
- .help_str = "update a perfect filter",
- .tokens = {
- (void *)&cmd_pkt_filter_upd_perfect_filter,
- (void *)&cmd_pkt_filter_port_id,
- (void *)&cmd_pkt_filter_protocol,
- (void *)&cmd_pkt_filter_src,
- (void *)&cmd_pkt_filter_ip_src,
- (void *)&cmd_pkt_filter_port_src,
- (void *)&cmd_pkt_filter_dst,
- (void *)&cmd_pkt_filter_ip_dst,
- (void *)&cmd_pkt_filter_port_dst,
- (void *)&cmd_pkt_filter_flexbytes,
- (void *)&cmd_pkt_filter_flexbytes_value,
- (void *)&cmd_pkt_filter_vlan,
- (void *)&cmd_pkt_filter_vlan_id,
- (void *)&cmd_pkt_filter_queue,
- (void *)&cmd_pkt_filter_queue_id,
- (void *)&cmd_pkt_filter_soft,
- (void *)&cmd_pkt_filter_soft_id,
- NULL,
- },
-};
-
-
-cmdline_parse_token_string_t cmd_pkt_filter_rm_perfect_filter =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_result,
- pkt_filter, "rm_perfect_filter");
-cmdline_parse_inst_t cmd_rm_perfect_filter = {
- .f = cmd_pkt_filter_parsed,
- .data = NULL,
- .help_str = "remove a perfect filter",
- .tokens = {
- (void *)&cmd_pkt_filter_rm_perfect_filter,
- (void *)&cmd_pkt_filter_port_id,
- (void *)&cmd_pkt_filter_protocol,
- (void *)&cmd_pkt_filter_src,
- (void *)&cmd_pkt_filter_ip_src,
- (void *)&cmd_pkt_filter_port_src,
- (void *)&cmd_pkt_filter_dst,
- (void *)&cmd_pkt_filter_ip_dst,
- (void *)&cmd_pkt_filter_port_dst,
- (void *)&cmd_pkt_filter_flexbytes,
- (void *)&cmd_pkt_filter_flexbytes_value,
- (void *)&cmd_pkt_filter_vlan,
- (void *)&cmd_pkt_filter_vlan_id,
- (void *)&cmd_pkt_filter_soft,
- (void *)&cmd_pkt_filter_soft_id,
- NULL,
- },
-};
-
-/* *** SETUP MASKS FILTER *** */
-struct cmd_pkt_filter_masks_result {
- cmdline_fixed_string_t filter_mask;
- uint8_t port_id;
- cmdline_fixed_string_t src_mask;
- uint32_t ip_src_mask;
- uint16_t ipv6_src_mask;
- uint16_t port_src_mask;
- cmdline_fixed_string_t dst_mask;
- uint32_t ip_dst_mask;
- uint16_t ipv6_dst_mask;
- uint16_t port_dst_mask;
- cmdline_fixed_string_t flexbytes;
- uint8_t flexbytes_value;
- cmdline_fixed_string_t vlan_id;
- uint8_t vlan_id_value;
- cmdline_fixed_string_t vlan_prio;
- uint8_t vlan_prio_value;
- cmdline_fixed_string_t only_ip_flow;
- uint8_t only_ip_flow_value;
- cmdline_fixed_string_t comp_ipv6_dst;
- uint8_t comp_ipv6_dst_value;
-};
-
-static void
-cmd_pkt_filter_masks_parsed(void *parsed_result,
- __attribute__((unused)) struct cmdline *cl,
- __attribute__((unused)) void *data)
-{
- struct rte_fdir_masks fdir_masks;
- struct cmd_pkt_filter_masks_result *res = parsed_result;
-
- memset(&fdir_masks, 0, sizeof(struct rte_fdir_masks));
-
- fdir_masks.only_ip_flow = res->only_ip_flow_value;
- fdir_masks.vlan_id = res->vlan_id_value;
- fdir_masks.vlan_prio = res->vlan_prio_value;
- fdir_masks.dst_ipv4_mask = res->ip_dst_mask;
- fdir_masks.src_ipv4_mask = res->ip_src_mask;
- fdir_masks.src_port_mask = res->port_src_mask;
- fdir_masks.dst_port_mask = res->port_dst_mask;
- fdir_masks.flexbytes = res->flexbytes_value;
-
- fdir_set_masks(res->port_id, &fdir_masks);
-}
-
-cmdline_parse_token_string_t cmd_pkt_filter_masks_filter_mask =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- filter_mask, "set_masks_filter");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_port_id =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- port_id, UINT8);
-cmdline_parse_token_string_t cmd_pkt_filter_masks_only_ip_flow =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- only_ip_flow, "only_ip_flow");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_only_ip_flow_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- only_ip_flow_value, UINT8);
-cmdline_parse_token_string_t cmd_pkt_filter_masks_src_mask =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- src_mask, "src_mask");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_ip_src_mask =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- ip_src_mask, UINT32);
-cmdline_parse_token_num_t cmd_pkt_filter_masks_port_src_mask =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- port_src_mask, UINT16);
-cmdline_parse_token_string_t cmd_pkt_filter_masks_dst_mask =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- dst_mask, "dst_mask");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_ip_dst_mask =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- ip_dst_mask, UINT32);
-cmdline_parse_token_num_t cmd_pkt_filter_masks_port_dst_mask =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- port_dst_mask, UINT16);
-cmdline_parse_token_string_t cmd_pkt_filter_masks_flexbytes =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- flexbytes, "flexbytes");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_flexbytes_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- flexbytes_value, UINT8);
-cmdline_parse_token_string_t cmd_pkt_filter_masks_vlan_id =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- vlan_id, "vlan_id");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_vlan_id_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- vlan_id_value, UINT8);
-cmdline_parse_token_string_t cmd_pkt_filter_masks_vlan_prio =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- vlan_prio, "vlan_prio");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_vlan_prio_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- vlan_prio_value, UINT8);
-
-cmdline_parse_inst_t cmd_set_masks_filter = {
- .f = cmd_pkt_filter_masks_parsed,
- .data = NULL,
- .help_str = "setup masks filter",
- .tokens = {
- (void *)&cmd_pkt_filter_masks_filter_mask,
- (void *)&cmd_pkt_filter_masks_port_id,
- (void *)&cmd_pkt_filter_masks_only_ip_flow,
- (void *)&cmd_pkt_filter_masks_only_ip_flow_value,
- (void *)&cmd_pkt_filter_masks_src_mask,
- (void *)&cmd_pkt_filter_masks_ip_src_mask,
- (void *)&cmd_pkt_filter_masks_port_src_mask,
- (void *)&cmd_pkt_filter_masks_dst_mask,
- (void *)&cmd_pkt_filter_masks_ip_dst_mask,
- (void *)&cmd_pkt_filter_masks_port_dst_mask,
- (void *)&cmd_pkt_filter_masks_flexbytes,
- (void *)&cmd_pkt_filter_masks_flexbytes_value,
- (void *)&cmd_pkt_filter_masks_vlan_id,
- (void *)&cmd_pkt_filter_masks_vlan_id_value,
- (void *)&cmd_pkt_filter_masks_vlan_prio,
- (void *)&cmd_pkt_filter_masks_vlan_prio_value,
- NULL,
- },
-};
-
-static void
-cmd_pkt_filter_masks_ipv6_parsed(void *parsed_result,
- __attribute__((unused)) struct cmdline *cl,
- __attribute__((unused)) void *data)
-{
- struct rte_fdir_masks fdir_masks;
- struct cmd_pkt_filter_masks_result *res = parsed_result;
-
- memset(&fdir_masks, 0, sizeof(struct rte_fdir_masks));
-
- fdir_masks.set_ipv6_mask = 1;
- fdir_masks.only_ip_flow = res->only_ip_flow_value;
- fdir_masks.vlan_id = res->vlan_id_value;
- fdir_masks.vlan_prio = res->vlan_prio_value;
- fdir_masks.dst_ipv6_mask = res->ipv6_dst_mask;
- fdir_masks.src_ipv6_mask = res->ipv6_src_mask;
- fdir_masks.src_port_mask = res->port_src_mask;
- fdir_masks.dst_port_mask = res->port_dst_mask;
- fdir_masks.flexbytes = res->flexbytes_value;
- fdir_masks.comp_ipv6_dst = res->comp_ipv6_dst_value;
-
- fdir_set_masks(res->port_id, &fdir_masks);
-}
-
-cmdline_parse_token_string_t cmd_pkt_filter_masks_filter_mask_ipv6 =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- filter_mask, "set_ipv6_masks_filter");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_src_mask_ipv6_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- ipv6_src_mask, UINT16);
-cmdline_parse_token_num_t cmd_pkt_filter_masks_dst_mask_ipv6_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- ipv6_dst_mask, UINT16);
-
-cmdline_parse_token_string_t cmd_pkt_filter_masks_comp_ipv6_dst =
- TOKEN_STRING_INITIALIZER(struct cmd_pkt_filter_masks_result,
- comp_ipv6_dst, "compare_dst");
-cmdline_parse_token_num_t cmd_pkt_filter_masks_comp_ipv6_dst_value =
- TOKEN_NUM_INITIALIZER(struct cmd_pkt_filter_masks_result,
- comp_ipv6_dst_value, UINT8);
-
-cmdline_parse_inst_t cmd_set_ipv6_masks_filter = {
- .f = cmd_pkt_filter_masks_ipv6_parsed,
- .data = NULL,
- .help_str = "setup ipv6 masks filter",
- .tokens = {
- (void *)&cmd_pkt_filter_masks_filter_mask_ipv6,
- (void *)&cmd_pkt_filter_masks_port_id,
- (void *)&cmd_pkt_filter_masks_only_ip_flow,
- (void *)&cmd_pkt_filter_masks_only_ip_flow_value,
- (void *)&cmd_pkt_filter_masks_src_mask,
- (void *)&cmd_pkt_filter_masks_src_mask_ipv6_value,
- (void *)&cmd_pkt_filter_masks_port_src_mask,
- (void *)&cmd_pkt_filter_masks_dst_mask,
- (void *)&cmd_pkt_filter_masks_dst_mask_ipv6_value,
- (void *)&cmd_pkt_filter_masks_port_dst_mask,
- (void *)&cmd_pkt_filter_masks_flexbytes,
- (void *)&cmd_pkt_filter_masks_flexbytes_value,
- (void *)&cmd_pkt_filter_masks_vlan_id,
- (void *)&cmd_pkt_filter_masks_vlan_id_value,
- (void *)&cmd_pkt_filter_masks_vlan_prio,
- (void *)&cmd_pkt_filter_masks_vlan_prio_value,
- (void *)&cmd_pkt_filter_masks_comp_ipv6_dst,
- (void *)&cmd_pkt_filter_masks_comp_ipv6_dst_value,
- NULL,
- },
-};
-
/* *** SETUP ETHERNET LINK FLOW CONTROL *** */
struct cmd_link_flow_ctrl_set_result {
cmdline_fixed_string_t set;
@@ -8888,14 +8325,6 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_write_reg_bit_field,
(cmdline_parse_inst_t *)&cmd_write_reg_bit,
(cmdline_parse_inst_t *)&cmd_read_rxd_txd,
- (cmdline_parse_inst_t *)&cmd_add_signature_filter,
- (cmdline_parse_inst_t *)&cmd_upd_signature_filter,
- (cmdline_parse_inst_t *)&cmd_rm_signature_filter,
- (cmdline_parse_inst_t *)&cmd_add_perfect_filter,
- (cmdline_parse_inst_t *)&cmd_upd_perfect_filter,
- (cmdline_parse_inst_t *)&cmd_rm_perfect_filter,
- (cmdline_parse_inst_t *)&cmd_set_masks_filter,
- (cmdline_parse_inst_t *)&cmd_set_ipv6_masks_filter,
(cmdline_parse_inst_t *)&cmd_stop,
(cmdline_parse_inst_t *)&cmd_mac_addr,
(cmdline_parse_inst_t *)&cmd_set_qmap,
@@ -1768,60 +1768,6 @@ set_qmap(portid_t port_id, uint8_t is_rx, uint16_t queue_id, uint8_t map_value)
}
}
-void
-fdir_add_signature_filter(portid_t port_id, uint8_t queue_id,
- struct rte_fdir_filter *fdir_filter)
-{
- int diag;
-
- if (port_id_is_invalid(port_id))
- return;
-
- diag = rte_eth_dev_fdir_add_signature_filter(port_id, fdir_filter,
- queue_id);
- if (diag == 0)
- return;
-
- printf("rte_eth_dev_fdir_add_signature_filter for port_id=%d failed "
- "diag=%d\n", port_id, diag);
-}
-
-void
-fdir_update_signature_filter(portid_t port_id, uint8_t queue_id,
- struct rte_fdir_filter *fdir_filter)
-{
- int diag;
-
- if (port_id_is_invalid(port_id))
- return;
-
- diag = rte_eth_dev_fdir_update_signature_filter(port_id, fdir_filter,
- queue_id);
- if (diag == 0)
- return;
-
- printf("rte_eth_dev_fdir_update_signature_filter for port_id=%d failed "
- "diag=%d\n", port_id, diag);
-}
-
-void
-fdir_remove_signature_filter(portid_t port_id,
- struct rte_fdir_filter *fdir_filter)
-{
- int diag;
-
- if (port_id_is_invalid(port_id))
- return;
-
- diag = rte_eth_dev_fdir_remove_signature_filter(port_id, fdir_filter);
- if (diag == 0)
- return;
-
- printf("rte_eth_dev_fdir_add_signature_filter for port_id=%d failed "
- "diag=%d\n", port_id, diag);
-
-}
-
static inline void
print_fdir_mask(struct rte_eth_fdir_masks *mask)
{
@@ -1963,76 +1909,6 @@ fdir_get_infos(portid_t port_id)
}
void
-fdir_add_perfect_filter(portid_t port_id, uint16_t soft_id, uint8_t queue_id,
- uint8_t drop, struct rte_fdir_filter *fdir_filter)
-{
- int diag;
-
- if (port_id_is_invalid(port_id))
- return;
-
- diag = rte_eth_dev_fdir_add_perfect_filter(port_id, fdir_filter,
- soft_id, queue_id, drop);
- if (diag == 0)
- return;
-
- printf("rte_eth_dev_fdir_add_perfect_filter for port_id=%d failed "
- "diag=%d\n", port_id, diag);
-}
-
-void
-fdir_update_perfect_filter(portid_t port_id, uint16_t soft_id, uint8_t queue_id,
- uint8_t drop, struct rte_fdir_filter *fdir_filter)
-{
- int diag;
-
- if (port_id_is_invalid(port_id))
- return;
-
- diag = rte_eth_dev_fdir_update_perfect_filter(port_id, fdir_filter,
- soft_id, queue_id, drop);
- if (diag == 0)
- return;
-
- printf("rte_eth_dev_fdir_update_perfect_filter for port_id=%d failed "
- "diag=%d\n", port_id, diag);
-}
-
-void
-fdir_remove_perfect_filter(portid_t port_id, uint16_t soft_id,
- struct rte_fdir_filter *fdir_filter)
-{
- int diag;
-
- if (port_id_is_invalid(port_id))
- return;
-
- diag = rte_eth_dev_fdir_remove_perfect_filter(port_id, fdir_filter,
- soft_id);
- if (diag == 0)
- return;
-
- printf("rte_eth_dev_fdir_update_perfect_filter for port_id=%d failed "
- "diag=%d\n", port_id, diag);
-}
-
-void
-fdir_set_masks(portid_t port_id, struct rte_fdir_masks *fdir_masks)
-{
- int diag;
-
- if (port_id_is_invalid(port_id))
- return;
-
- diag = rte_eth_dev_fdir_set_masks(port_id, fdir_masks);
- if (diag == 0)
- return;
-
- printf("rte_eth_dev_set_masks_filter for port_id=%d failed "
- "diag=%d\n", port_id, diag);
-}
-
-void
fdir_set_flex_mask(portid_t port_id, struct rte_eth_fdir_flex_mask *cfg)
{
struct rte_port *port;
@@ -518,23 +518,7 @@ void close_port(portid_t pid);
int all_ports_stopped(void);
int port_is_started(portid_t port_id);
void pmd_test_exit(void);
-
-void fdir_add_signature_filter(portid_t port_id, uint8_t queue_id,
- struct rte_fdir_filter *fdir_filter);
-void fdir_update_signature_filter(portid_t port_id, uint8_t queue_id,
- struct rte_fdir_filter *fdir_filter);
-void fdir_remove_signature_filter(portid_t port_id,
- struct rte_fdir_filter *fdir_filter);
void fdir_get_infos(portid_t port_id);
-void fdir_add_perfect_filter(portid_t port_id, uint16_t soft_id,
- uint8_t queue_id, uint8_t drop,
- struct rte_fdir_filter *fdir_filter);
-void fdir_update_perfect_filter(portid_t port_id, uint16_t soft_id,
- uint8_t queue_id, uint8_t drop,
- struct rte_fdir_filter *fdir_filter);
-void fdir_remove_perfect_filter(portid_t port_id, uint16_t soft_id,
- struct rte_fdir_filter *fdir_filter);
-void fdir_set_masks(portid_t port_id, struct rte_fdir_masks *fdir_masks);
void fdir_set_flex_mask(portid_t port_id,
struct rte_eth_fdir_flex_mask *cfg);
void fdir_set_flex_payload(portid_t port_id,