ethdev: remove legacy N-tuple filter type support
[dpdk.git] / app / test-pmd / cmdline.c
index 12b0e32..d3806ce 100644 (file)
@@ -976,20 +976,6 @@ static void cmd_help_long_parsed(void *parsed_result,
                        "filters:\n"
                        "--------\n\n"
 
-                       "2tuple_filter (port_id) (add|del)"
-                       " dst_port (dst_port_value) protocol (protocol_value)"
-                       " mask (mask_value) tcp_flags (tcp_flags_value)"
-                       " priority (prio_value) queue (queue_id)\n"
-                       "    Add/Del a 2tuple filter.\n\n"
-
-                       "5tuple_filter (port_id) (add|del)"
-                       " dst_ip (dst_address) src_ip (src_address)"
-                       " dst_port (dst_port_value) src_port (src_port_value)"
-                       " protocol (protocol_value)"
-                       " mask (mask_value) tcp_flags (tcp_flags_value)"
-                       " priority (prio_value) queue (queue_id)\n"
-                       "    Add/Del a 5tuple filter.\n\n"
-
                        "flow_director_filter (port_id) mode IP (add|del|update)"
                        " flow (ipv4-other|ipv4-frag|ipv6-other|ipv6-frag)"
                        " src (src_ip_address) dst (dst_ip_address)"
@@ -10421,359 +10407,6 @@ cmdline_parse_inst_t cmd_show_queue_region_info_all = {
        },
 };
 
-/* *** ADD/REMOVE A 2tuple FILTER *** */
-struct cmd_2tuple_filter_result {
-       cmdline_fixed_string_t filter;
-       portid_t port_id;
-       cmdline_fixed_string_t ops;
-       cmdline_fixed_string_t dst_port;
-       uint16_t dst_port_value;
-       cmdline_fixed_string_t protocol;
-       uint8_t protocol_value;
-       cmdline_fixed_string_t mask;
-       uint8_t  mask_value;
-       cmdline_fixed_string_t tcp_flags;
-       uint8_t tcp_flags_value;
-       cmdline_fixed_string_t priority;
-       uint8_t  priority_value;
-       cmdline_fixed_string_t queue;
-       uint16_t  queue_id;
-};
-
-static void
-cmd_2tuple_filter_parsed(void *parsed_result,
-                       __rte_unused struct cmdline *cl,
-                       __rte_unused void *data)
-{
-       struct rte_eth_ntuple_filter filter;
-       struct cmd_2tuple_filter_result *res = parsed_result;
-       int ret = 0;
-
-       ret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_NTUPLE);
-       if (ret < 0) {
-               printf("ntuple filter is not supported on port %u.\n",
-                       res->port_id);
-               return;
-       }
-
-       memset(&filter, 0, sizeof(struct rte_eth_ntuple_filter));
-
-       filter.flags = RTE_2TUPLE_FLAGS;
-       filter.dst_port_mask = (res->mask_value & 0x02) ? UINT16_MAX : 0;
-       filter.proto_mask = (res->mask_value & 0x01) ? UINT8_MAX : 0;
-       filter.proto = res->protocol_value;
-       filter.priority = res->priority_value;
-       if (res->tcp_flags_value != 0 && filter.proto != IPPROTO_TCP) {
-               printf("nonzero tcp_flags is only meaningful"
-                       " when protocol is TCP.\n");
-               return;
-       }
-       if (res->tcp_flags_value > RTE_NTUPLE_TCP_FLAGS_MASK) {
-               printf("invalid TCP flags.\n");
-               return;
-       }
-
-       if (res->tcp_flags_value != 0) {
-               filter.flags |= RTE_NTUPLE_FLAGS_TCP_FLAG;
-               filter.tcp_flags = res->tcp_flags_value;
-       }
-
-       /* need convert to big endian. */
-       filter.dst_port = rte_cpu_to_be_16(res->dst_port_value);
-       filter.queue = res->queue_id;
-
-       if (!strcmp(res->ops, "add"))
-               ret = rte_eth_dev_filter_ctrl(res->port_id,
-                               RTE_ETH_FILTER_NTUPLE,
-                               RTE_ETH_FILTER_ADD,
-                               &filter);
-       else
-               ret = rte_eth_dev_filter_ctrl(res->port_id,
-                               RTE_ETH_FILTER_NTUPLE,
-                               RTE_ETH_FILTER_DELETE,
-                               &filter);
-       if (ret < 0)
-               printf("2tuple filter programming error: (%s)\n",
-                       strerror(-ret));
-
-}
-
-cmdline_parse_token_string_t cmd_2tuple_filter_filter =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                                filter, "2tuple_filter");
-cmdline_parse_token_num_t cmd_2tuple_filter_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               port_id, UINT16);
-cmdline_parse_token_string_t cmd_2tuple_filter_ops =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                                ops, "add#del");
-cmdline_parse_token_string_t cmd_2tuple_filter_dst_port =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                               dst_port, "dst_port");
-cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               dst_port_value, UINT16);
-cmdline_parse_token_string_t cmd_2tuple_filter_protocol =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                               protocol, "protocol");
-cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               protocol_value, UINT8);
-cmdline_parse_token_string_t cmd_2tuple_filter_mask =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                               mask, "mask");
-cmdline_parse_token_num_t cmd_2tuple_filter_mask_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               mask_value, INT8);
-cmdline_parse_token_string_t cmd_2tuple_filter_tcp_flags =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                               tcp_flags, "tcp_flags");
-cmdline_parse_token_num_t cmd_2tuple_filter_tcp_flags_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               tcp_flags_value, UINT8);
-cmdline_parse_token_string_t cmd_2tuple_filter_priority =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                               priority, "priority");
-cmdline_parse_token_num_t cmd_2tuple_filter_priority_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               priority_value, UINT8);
-cmdline_parse_token_string_t cmd_2tuple_filter_queue =
-       TOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,
-                               queue, "queue");
-cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,
-                               queue_id, UINT16);
-
-cmdline_parse_inst_t cmd_2tuple_filter = {
-       .f = cmd_2tuple_filter_parsed,
-       .data = NULL,
-       .help_str = "2tuple_filter <port_id> add|del dst_port <value> protocol "
-               "<value> mask <value> tcp_flags <value> priority <value> queue "
-               "<queue_id>: Add a 2tuple filter",
-       .tokens = {
-               (void *)&cmd_2tuple_filter_filter,
-               (void *)&cmd_2tuple_filter_port_id,
-               (void *)&cmd_2tuple_filter_ops,
-               (void *)&cmd_2tuple_filter_dst_port,
-               (void *)&cmd_2tuple_filter_dst_port_value,
-               (void *)&cmd_2tuple_filter_protocol,
-               (void *)&cmd_2tuple_filter_protocol_value,
-               (void *)&cmd_2tuple_filter_mask,
-               (void *)&cmd_2tuple_filter_mask_value,
-               (void *)&cmd_2tuple_filter_tcp_flags,
-               (void *)&cmd_2tuple_filter_tcp_flags_value,
-               (void *)&cmd_2tuple_filter_priority,
-               (void *)&cmd_2tuple_filter_priority_value,
-               (void *)&cmd_2tuple_filter_queue,
-               (void *)&cmd_2tuple_filter_queue_id,
-               NULL,
-       },
-};
-
-/* *** ADD/REMOVE A 5tuple FILTER *** */
-struct cmd_5tuple_filter_result {
-       cmdline_fixed_string_t filter;
-       portid_t port_id;
-       cmdline_fixed_string_t ops;
-       cmdline_fixed_string_t dst_ip;
-       cmdline_ipaddr_t dst_ip_value;
-       cmdline_fixed_string_t src_ip;
-       cmdline_ipaddr_t src_ip_value;
-       cmdline_fixed_string_t dst_port;
-       uint16_t dst_port_value;
-       cmdline_fixed_string_t src_port;
-       uint16_t src_port_value;
-       cmdline_fixed_string_t protocol;
-       uint8_t protocol_value;
-       cmdline_fixed_string_t mask;
-       uint8_t  mask_value;
-       cmdline_fixed_string_t tcp_flags;
-       uint8_t tcp_flags_value;
-       cmdline_fixed_string_t priority;
-       uint8_t  priority_value;
-       cmdline_fixed_string_t queue;
-       uint16_t  queue_id;
-};
-
-static void
-cmd_5tuple_filter_parsed(void *parsed_result,
-                       __rte_unused struct cmdline *cl,
-                       __rte_unused void *data)
-{
-       struct rte_eth_ntuple_filter filter;
-       struct cmd_5tuple_filter_result *res = parsed_result;
-       int ret = 0;
-
-       ret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_NTUPLE);
-       if (ret < 0) {
-               printf("ntuple filter is not supported on port %u.\n",
-                       res->port_id);
-               return;
-       }
-
-       memset(&filter, 0, sizeof(struct rte_eth_ntuple_filter));
-
-       filter.flags = RTE_5TUPLE_FLAGS;
-       filter.dst_ip_mask = (res->mask_value & 0x10) ? UINT32_MAX : 0;
-       filter.src_ip_mask = (res->mask_value & 0x08) ? UINT32_MAX : 0;
-       filter.dst_port_mask = (res->mask_value & 0x04) ? UINT16_MAX : 0;
-       filter.src_port_mask = (res->mask_value & 0x02) ? UINT16_MAX : 0;
-       filter.proto_mask = (res->mask_value & 0x01) ? UINT8_MAX : 0;
-       filter.proto = res->protocol_value;
-       filter.priority = res->priority_value;
-       if (res->tcp_flags_value != 0 && filter.proto != IPPROTO_TCP) {
-               printf("nonzero tcp_flags is only meaningful"
-                       " when protocol is TCP.\n");
-               return;
-       }
-       if (res->tcp_flags_value > RTE_NTUPLE_TCP_FLAGS_MASK) {
-               printf("invalid TCP flags.\n");
-               return;
-       }
-
-       if (res->tcp_flags_value != 0) {
-               filter.flags |= RTE_NTUPLE_FLAGS_TCP_FLAG;
-               filter.tcp_flags = res->tcp_flags_value;
-       }
-
-       if (res->dst_ip_value.family == AF_INET)
-               /* no need to convert, already big endian. */
-               filter.dst_ip = res->dst_ip_value.addr.ipv4.s_addr;
-       else {
-               if (filter.dst_ip_mask == 0) {
-                       printf("can not support ipv6 involved compare.\n");
-                       return;
-               }
-               filter.dst_ip = 0;
-       }
-
-       if (res->src_ip_value.family == AF_INET)
-               /* no need to convert, already big endian. */
-               filter.src_ip = res->src_ip_value.addr.ipv4.s_addr;
-       else {
-               if (filter.src_ip_mask == 0) {
-                       printf("can not support ipv6 involved compare.\n");
-                       return;
-               }
-               filter.src_ip = 0;
-       }
-       /* need convert to big endian. */
-       filter.dst_port = rte_cpu_to_be_16(res->dst_port_value);
-       filter.src_port = rte_cpu_to_be_16(res->src_port_value);
-       filter.queue = res->queue_id;
-
-       if (!strcmp(res->ops, "add"))
-               ret = rte_eth_dev_filter_ctrl(res->port_id,
-                               RTE_ETH_FILTER_NTUPLE,
-                               RTE_ETH_FILTER_ADD,
-                               &filter);
-       else
-               ret = rte_eth_dev_filter_ctrl(res->port_id,
-                               RTE_ETH_FILTER_NTUPLE,
-                               RTE_ETH_FILTER_DELETE,
-                               &filter);
-       if (ret < 0)
-               printf("5tuple filter programming error: (%s)\n",
-                       strerror(-ret));
-}
-
-cmdline_parse_token_string_t cmd_5tuple_filter_filter =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                                filter, "5tuple_filter");
-cmdline_parse_token_num_t cmd_5tuple_filter_port_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               port_id, UINT16);
-cmdline_parse_token_string_t cmd_5tuple_filter_ops =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                                ops, "add#del");
-cmdline_parse_token_string_t cmd_5tuple_filter_dst_ip =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               dst_ip, "dst_ip");
-cmdline_parse_token_ipaddr_t cmd_5tuple_filter_dst_ip_value =
-       TOKEN_IPADDR_INITIALIZER(struct cmd_5tuple_filter_result,
-                               dst_ip_value);
-cmdline_parse_token_string_t cmd_5tuple_filter_src_ip =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               src_ip, "src_ip");
-cmdline_parse_token_ipaddr_t cmd_5tuple_filter_src_ip_value =
-       TOKEN_IPADDR_INITIALIZER(struct cmd_5tuple_filter_result,
-                               src_ip_value);
-cmdline_parse_token_string_t cmd_5tuple_filter_dst_port =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               dst_port, "dst_port");
-cmdline_parse_token_num_t cmd_5tuple_filter_dst_port_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               dst_port_value, UINT16);
-cmdline_parse_token_string_t cmd_5tuple_filter_src_port =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               src_port, "src_port");
-cmdline_parse_token_num_t cmd_5tuple_filter_src_port_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               src_port_value, UINT16);
-cmdline_parse_token_string_t cmd_5tuple_filter_protocol =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               protocol, "protocol");
-cmdline_parse_token_num_t cmd_5tuple_filter_protocol_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               protocol_value, UINT8);
-cmdline_parse_token_string_t cmd_5tuple_filter_mask =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               mask, "mask");
-cmdline_parse_token_num_t cmd_5tuple_filter_mask_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               mask_value, INT8);
-cmdline_parse_token_string_t cmd_5tuple_filter_tcp_flags =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               tcp_flags, "tcp_flags");
-cmdline_parse_token_num_t cmd_5tuple_filter_tcp_flags_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               tcp_flags_value, UINT8);
-cmdline_parse_token_string_t cmd_5tuple_filter_priority =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               priority, "priority");
-cmdline_parse_token_num_t cmd_5tuple_filter_priority_value =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               priority_value, UINT8);
-cmdline_parse_token_string_t cmd_5tuple_filter_queue =
-       TOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,
-                               queue, "queue");
-cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =
-       TOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,
-                               queue_id, UINT16);
-
-cmdline_parse_inst_t cmd_5tuple_filter = {
-       .f = cmd_5tuple_filter_parsed,
-       .data = NULL,
-       .help_str = "5tuple_filter <port_id> add|del dst_ip <value> "
-               "src_ip <value> dst_port <value> src_port <value> "
-               "protocol <value>  mask <value> tcp_flags <value> "
-               "priority <value> queue <queue_id>: Add/Del a 5tuple filter",
-       .tokens = {
-               (void *)&cmd_5tuple_filter_filter,
-               (void *)&cmd_5tuple_filter_port_id,
-               (void *)&cmd_5tuple_filter_ops,
-               (void *)&cmd_5tuple_filter_dst_ip,
-               (void *)&cmd_5tuple_filter_dst_ip_value,
-               (void *)&cmd_5tuple_filter_src_ip,
-               (void *)&cmd_5tuple_filter_src_ip_value,
-               (void *)&cmd_5tuple_filter_dst_port,
-               (void *)&cmd_5tuple_filter_dst_port_value,
-               (void *)&cmd_5tuple_filter_src_port,
-               (void *)&cmd_5tuple_filter_src_port_value,
-               (void *)&cmd_5tuple_filter_protocol,
-               (void *)&cmd_5tuple_filter_protocol_value,
-               (void *)&cmd_5tuple_filter_mask,
-               (void *)&cmd_5tuple_filter_mask_value,
-               (void *)&cmd_5tuple_filter_tcp_flags,
-               (void *)&cmd_5tuple_filter_tcp_flags_value,
-               (void *)&cmd_5tuple_filter_priority,
-               (void *)&cmd_5tuple_filter_priority_value,
-               (void *)&cmd_5tuple_filter_queue,
-               (void *)&cmd_5tuple_filter_queue_id,
-               NULL,
-       },
-};
-
 /* *** Filters Control *** */
 
 /* *** deal with flow director filter *** */
@@ -19542,8 +19175,6 @@ cmdline_parse_ctx_t main_ctx[] = {
        (cmdline_parse_inst_t *)&cmd_config_rss_hash_key,
        (cmdline_parse_inst_t *)&cmd_dump,
        (cmdline_parse_inst_t *)&cmd_dump_one,
-       (cmdline_parse_inst_t *)&cmd_2tuple_filter,
-       (cmdline_parse_inst_t *)&cmd_5tuple_filter,
        (cmdline_parse_inst_t *)&cmd_add_del_ip_flow_director,
        (cmdline_parse_inst_t *)&cmd_add_del_udp_flow_director,
        (cmdline_parse_inst_t *)&cmd_add_del_sctp_flow_director,