Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 2273,
    "url": "https://patches.dpdk.org/api/patches/2273/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/1421286361-11504-5-git-send-email-jingjing.wu@intel.com/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<1421286361-11504-5-git-send-email-jingjing.wu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1421286361-11504-5-git-send-email-jingjing.wu@intel.com",
    "date": "2015-01-15T01:46:00",
    "name": "[dpdk-dev,4/5] testpmd: new commands for ntuple filter",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "a95151e6de1c930e045fbb61c03c0c5c8c721fdb",
    "submitter": {
        "id": 47,
        "url": "https://patches.dpdk.org/api/people/47/?format=api",
        "name": "Jingjing Wu",
        "email": "jingjing.wu@intel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/1421286361-11504-5-git-send-email-jingjing.wu@intel.com/mbox/",
    "series": [],
    "comments": "https://patches.dpdk.org/api/patches/2273/comments/",
    "check": "pending",
    "checks": "https://patches.dpdk.org/api/patches/2273/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 0D1EF5A89;\n\tThu, 15 Jan 2015 02:46:32 +0100 (CET)",
            "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby dpdk.org (Postfix) with ESMTP id CB1665686\n\tfor <dev@dpdk.org>; Thu, 15 Jan 2015 02:46:17 +0100 (CET)",
            "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga102.jf.intel.com with ESMTP; 14 Jan 2015 17:43:32 -0800",
            "from shvmail01.sh.intel.com ([10.239.29.42])\n\tby orsmga003.jf.intel.com with ESMTP; 14 Jan 2015 17:40:01 -0800",
            "from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com\n\t[10.239.29.89])\n\tby shvmail01.sh.intel.com with ESMTP id t0F1kDdZ016885;\n\tThu, 15 Jan 2015 09:46:13 +0800",
            "from shecgisg004.sh.intel.com (localhost [127.0.0.1])\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP\n\tid t0F1kB62011567; Thu, 15 Jan 2015 09:46:13 +0800",
            "(from wujingji@localhost)\n\tby shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t0F1kBn6011563; \n\tThu, 15 Jan 2015 09:46:11 +0800"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.09,400,1418112000\"; d=\"scan'208\";a=\"512469795\"",
        "From": "Jingjing Wu <jingjing.wu@intel.com>",
        "To": "dev@dpdk.org",
        "Date": "Thu, 15 Jan 2015 09:46:00 +0800",
        "Message-Id": "<1421286361-11504-5-git-send-email-jingjing.wu@intel.com>",
        "X-Mailer": "git-send-email 1.7.4.1",
        "In-Reply-To": "<1421286361-11504-1-git-send-email-jingjing.wu@intel.com>",
        "References": "<1421286361-11504-1-git-send-email-jingjing.wu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH 4/5] testpmd: new commands for ntuple filter",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <dev.dpdk.org>",
        "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://dpdk.org/ml/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "Following commands of 5tuple and 2tuple filter are removed:\n - add_2tuple_filter (port_id) protocol (pro_value) (pro_mask)\n   dst_port (port_value) (port_mask) flags (flg_value) priority (prio\n   queue (queue_id) index (idx)\n - remove_2tuple_filter (port_id) index (idx)\n - get_2tuple_filter (port_id) index (idx)\n - add_5tuple_filter (port_id) dst_ip (dst_address) src_ip (src_addres\n   dst_port (dst_port_value) src_port (src_port_value) protocol (prot\n   mask (mask_value) flags (flags_value) priority (prio_value)\"\n   queue (queue_id) index (idx)\n - remove_5tuple_filter (port_id) index (idx)\n - get_5tuple_filter (port_id) index (idx)\n\nNew commands are added for 5tuple and 2tuple filter by using filter_ctrl API\nand new ntuple filter structure:\n - 2tuple_filter (port_id) (add|del)\n   dst_port (dst_port_value) protocol (protocol_value)\n   mask (mask_value) tcp_flags (tcp_flags_value)\n   priority (prio_value) queue (queue_id)\n - 5tuple_filter (port_id) (add|del)\n   dst_ip (dst_address) src_ip (src_address)\n   dst_port (dst_port_value) src_port (src_port_value)\n   protocol (protocol_value)\n   mask (mask_value) tcp_flags (tcp_flags_value)\n   priority (prio_value) queue (queue_id)\n\nSigned-off-by: Jingjing Wu <jingjing.wu@intel.com>\n---\n app/test-pmd/cmdline.c | 406 ++++++++++++++++++++++---------------------------\n app/test-pmd/config.c  |  65 --------\n 2 files changed, 186 insertions(+), 285 deletions(-)",
    "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 882a5a2..1d74870 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -664,28 +664,19 @@ static void cmd_help_long_parsed(void *parsed_result,\n \t\t\t\"get_ethertype_filter (port_id) index (idx)\\n\"\n \t\t\t\"    get info of a ethertype filter.\\n\\n\"\n \n-\t\t\t\"add_2tuple_filter (port_id) protocol (pro_value) (pro_mask)\"\n-\t\t\t\" dst_port (port_value) (port_mask) flags (flg_value) priority (prio_value)\"\n-\t\t\t\" queue (queue_id) index (idx)\\n\"\n-\t\t\t\"    add a 2tuple filter.\\n\\n\"\n-\n-\t\t\t\"remove_2tuple_filter (port_id) index (idx)\\n\"\n-\t\t\t\"    remove a 2tuple filter.\\n\\n\"\n-\n-\t\t\t\"get_2tuple_filter (port_id) index (idx)\\n\"\n-\t\t\t\"    get info of a 2tuple filter.\\n\\n\"\n-\n-\t\t\t\"add_5tuple_filter (port_id) dst_ip (dst_address) src_ip (src_address)\"\n-\t\t\t\" dst_port (dst_port_value) src_port (src_port_value) protocol (protocol_value)\"\n-\t\t\t\" mask (mask_value) flags (flags_value) priority (prio_value)\"\n-\t\t\t\" queue (queue_id) index (idx)\\n\"\n-\t\t\t\"    add a 5tuple filter.\\n\\n\"\n-\n-\t\t\t\"remove_5tuple_filter (port_id) index (idx)\\n\"\n-\t\t\t\"    remove a 5tuple filter.\\n\\n\"\n-\n-\t\t\t\"get_5tuple_filter (port_id) index (idx)\\n\"\n-\t\t\t\"    get info of a 5tuple filter.\\n\\n\"\n+\t\t\t\"2tuple_filter (port_id) (add|del)\"\n+\t\t\t\" dst_port (dst_port_value) protocol (protocol_value)\"\n+\t\t\t\" mask (mask_value) tcp_flags (tcp_flags_value)\"\n+\t\t\t\" priority (prio_value) queue (queue_id)\\n\"\n+\t\t\t\"    Add/Del a 2tuple filter.\\n\\n\"\n+\n+\t\t\t\"5tuple_filter (port_id) (add|del)\"\n+\t\t\t\" dst_ip (dst_address) src_ip (src_address)\"\n+\t\t\t\" dst_port (dst_port_value) src_port (src_port_value)\"\n+\t\t\t\" protocol (protocol_value)\"\n+\t\t\t\" mask (mask_value) tcp_flags (tcp_flags_value)\"\n+\t\t\t\" priority (prio_value) queue (queue_id)\\n\"\n+\t\t\t\"    Add/Del a 5tuple filter.\\n\\n\"\n \n \t\t\t\"add_syn_filter (port_id) priority (high|low) queue (queue_id)\"\n \t\t\t\"    add syn filter.\\n\\n\"\n@@ -7491,21 +7482,20 @@ cmdline_parse_inst_t cmd_get_syn_filter = {\n /* *** ADD/REMOVE A 2tuple FILTER *** */\n struct cmd_2tuple_filter_result {\n \tcmdline_fixed_string_t filter;\n-\tuint8_t port_id;\n-\tcmdline_fixed_string_t protocol;\n-\tuint8_t protocol_value;\n-\tuint8_t protocol_mask;\n+\tuint8_t  port_id;\n+\tcmdline_fixed_string_t ops;\n \tcmdline_fixed_string_t dst_port;\n \tuint16_t dst_port_value;\n-\tuint16_t dst_port_mask;\n-\tcmdline_fixed_string_t flags;\n-\tuint8_t flags_value;\n+\tcmdline_fixed_string_t protocol;\n+\tuint8_t protocol_value;\n+\tcmdline_fixed_string_t mask;\n+\tuint8_t  mask_value;\n+\tcmdline_fixed_string_t tcp_flags;\n+\tuint8_t tcp_flags_value;\n \tcmdline_fixed_string_t priority;\n-\tuint8_t priority_value;\n+\tuint8_t  priority_value;\n \tcmdline_fixed_string_t queue;\n-\tuint16_t queue_id;\n-\tcmdline_fixed_string_t index;\n-\tuint16_t index_value;\n+\tuint16_t  queue_id;\n };\n \n static void\n@@ -7513,59 +7503,92 @@ cmd_2tuple_filter_parsed(void *parsed_result,\n \t\t\t__attribute__((unused)) struct cmdline *cl,\n \t\t\t__attribute__((unused)) void *data)\n {\n-\tint ret = 0;\n-\tstruct rte_2tuple_filter filter;\n+\tstruct rte_eth_ntuple_filter filter;\n \tstruct cmd_2tuple_filter_result *res = parsed_result;\n+\tint ret = 0;\n \n-\tmemset(&filter, 0, sizeof(struct rte_2tuple_filter));\n+\tret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_NTUPLE);\n+\tif (ret < 0) {\n+\t\tprintf(\"ntuple filter is not supported on port %u.\\n\",\n+\t\t\tres->port_id);\n+\t\treturn;\n+\t}\n \n-\tif (!strcmp(res->filter, \"add_2tuple_filter\")) {\n-\t\t/* need convert to big endian. */\n-\t\tfilter.dst_port = rte_cpu_to_be_16(res->dst_port_value);\n-\t\tfilter.protocol = res->protocol_value;\n-\t\tfilter.dst_port_mask = (res->dst_port_mask) ? 0 : 1;\n-\t\tfilter.protocol_mask = (res->protocol_mask) ? 0 : 1;\n-\t\tfilter.priority = res->priority_value;\n-\t\tfilter.tcp_flags = res->flags_value;\n-\t\tret = rte_eth_dev_add_2tuple_filter(res->port_id,\n-\t\t\tres->index_value, &filter, res->queue_id);\n-\t} else if (!strcmp(res->filter, \"remove_2tuple_filter\"))\n-\t\tret = rte_eth_dev_remove_2tuple_filter(res->port_id,\n-\t\t\tres->index_value);\n-\telse if (!strcmp(res->filter, \"get_2tuple_filter\"))\n-\t\tget_2tuple_filter(res->port_id, res->index_value);\n+\tmemset(&filter, 0, sizeof(struct rte_eth_ntuple_filter));\n+\n+\tfilter.flags = RTE_2TUPLE_FLAGS;\n+\tfilter.dst_port_mask = (res->mask_value & 0x02) ? UINT16_MAX : 0;\n+\tfilter.proto_mask = (res->mask_value & 0x01) ? UINT8_MAX : 0;\n+\tfilter.proto = res->protocol_value;\n+\tfilter.priority = res->priority_value;\n+\tif (res->tcp_flags_value != 0 && filter.proto != IPPROTO_TCP) {\n+\t\tprintf(\"nonzero tcp_flags is only meaningful\"\n+\t\t\t\" when protocol is TCP.\\n\");\n+\t\treturn;\n+\t}\n+\tif (res->tcp_flags_value > TCP_FLAG_ALL) {\n+\t\tprintf(\"invalid TCP flags.\\n\");\n+\t\treturn;\n+\t}\n+\n+\tif (res->tcp_flags_value != 0) {\n+\t\tfilter.flags |= RTE_NTUPLE_FLAGS_TCP_FLAG;\n+\t\tfilter.tcp_flags = res->tcp_flags_value;\n+\t}\n+\n+\t/* need convert to big endian. */\n+\tfilter.dst_port = rte_cpu_to_be_16(res->dst_port_value);\n+\tfilter.queue = res->queue_id;\n \n+\tif (!strcmp(res->ops, \"add\"))\n+\t\tret = rte_eth_dev_filter_ctrl(res->port_id,\n+\t\t\t\tRTE_ETH_FILTER_NTUPLE,\n+\t\t\t\tRTE_ETH_FILTER_ADD,\n+\t\t\t\t&filter);\n+\telse\n+\t\tret = rte_eth_dev_filter_ctrl(res->port_id,\n+\t\t\t\tRTE_ETH_FILTER_NTUPLE,\n+\t\t\t\tRTE_ETH_FILTER_DELETE,\n+\t\t\t\t&filter);\n \tif (ret < 0)\n-\t\tprintf(\"2tuple filter setting error: (%s)\\n\", strerror(-ret));\n+\t\tprintf(\"2tuple filter programming error: (%s)\\n\",\n+\t\t\tstrerror(-ret));\n+\n }\n \n+cmdline_parse_token_string_t cmd_2tuple_filter_filter =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n+\t\t\t\t filter, \"2tuple_filter\");\n cmdline_parse_token_num_t cmd_2tuple_filter_port_id =\n \tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n \t\t\t\tport_id, UINT8);\n-cmdline_parse_token_string_t cmd_2tuple_filter_protocol =\n+cmdline_parse_token_string_t cmd_2tuple_filter_ops =\n \tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\t protocol, \"protocol\");\n-cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =\n-\tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\t protocol_value, UINT8);\n-cmdline_parse_token_num_t cmd_2tuple_filter_protocol_mask =\n-\tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tprotocol_mask, UINT8);\n+\t\t\t\t ops, \"add#del\");\n cmdline_parse_token_string_t cmd_2tuple_filter_dst_port =\n \tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n \t\t\t\tdst_port, \"dst_port\");\n cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_value =\n \tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n \t\t\t\tdst_port_value, UINT16);\n-cmdline_parse_token_num_t cmd_2tuple_filter_dst_port_mask =\n+cmdline_parse_token_string_t cmd_2tuple_filter_protocol =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n+\t\t\t\tprotocol, \"protocol\");\n+cmdline_parse_token_num_t cmd_2tuple_filter_protocol_value =\n \tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tdst_port_mask, UINT16);\n-cmdline_parse_token_string_t cmd_2tuple_filter_flags =\n+\t\t\t\tprotocol_value, UINT8);\n+cmdline_parse_token_string_t cmd_2tuple_filter_mask =\n \tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tflags, \"flags\");\n-cmdline_parse_token_num_t cmd_2tuple_filter_flags_value =\n+\t\t\t\tmask, \"mask\");\n+cmdline_parse_token_num_t cmd_2tuple_filter_mask_value =\n \tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tflags_value, UINT8);\n+\t\t\t\tmask_value, INT8);\n+cmdline_parse_token_string_t cmd_2tuple_filter_tcp_flags =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n+\t\t\t\ttcp_flags, \"tcp_flags\");\n+cmdline_parse_token_num_t cmd_2tuple_filter_tcp_flags_value =\n+\tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n+\t\t\t\ttcp_flags_value, UINT8);\n cmdline_parse_token_string_t cmd_2tuple_filter_priority =\n \tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n \t\t\t\tpriority, \"priority\");\n@@ -7578,67 +7601,27 @@ cmdline_parse_token_string_t cmd_2tuple_filter_queue =\n cmdline_parse_token_num_t cmd_2tuple_filter_queue_id =\n \tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n \t\t\t\tqueue_id, UINT16);\n-cmdline_parse_token_string_t cmd_2tuple_filter_index =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tindex, \"index\");\n-cmdline_parse_token_num_t cmd_2tuple_filter_index_value =\n-\tTOKEN_NUM_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tindex_value, UINT16);\n-cmdline_parse_token_string_t cmd_2tuple_filter_add_filter =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tfilter, \"add_2tuple_filter\");\n-cmdline_parse_inst_t cmd_add_2tuple_filter = {\n+\n+cmdline_parse_inst_t cmd_2tuple_filter = {\n \t.f = cmd_2tuple_filter_parsed,\n \t.data = NULL,\n \t.help_str = \"add a 2tuple filter\",\n \t.tokens = {\n-\t\t(void *)&cmd_2tuple_filter_add_filter,\n+\t\t(void *)&cmd_2tuple_filter_filter,\n \t\t(void *)&cmd_2tuple_filter_port_id,\n-\t\t(void *)&cmd_2tuple_filter_protocol,\n-\t\t(void *)&cmd_2tuple_filter_protocol_value,\n-\t\t(void *)&cmd_2tuple_filter_protocol_mask,\n+\t\t(void *)&cmd_2tuple_filter_ops,\n \t\t(void *)&cmd_2tuple_filter_dst_port,\n \t\t(void *)&cmd_2tuple_filter_dst_port_value,\n-\t\t(void *)&cmd_2tuple_filter_dst_port_mask,\n-\t\t(void *)&cmd_2tuple_filter_flags,\n-\t\t(void *)&cmd_2tuple_filter_flags_value,\n+\t\t(void *)&cmd_2tuple_filter_protocol,\n+\t\t(void *)&cmd_2tuple_filter_protocol_value,\n+\t\t(void *)&cmd_2tuple_filter_mask,\n+\t\t(void *)&cmd_2tuple_filter_mask_value,\n+\t\t(void *)&cmd_2tuple_filter_tcp_flags,\n+\t\t(void *)&cmd_2tuple_filter_tcp_flags_value,\n \t\t(void *)&cmd_2tuple_filter_priority,\n \t\t(void *)&cmd_2tuple_filter_priority_value,\n \t\t(void *)&cmd_2tuple_filter_queue,\n \t\t(void *)&cmd_2tuple_filter_queue_id,\n-\t\t(void *)&cmd_2tuple_filter_index,\n-\t\t(void *)&cmd_2tuple_filter_index_value,\n-\t\tNULL,\n-\t},\n-};\n-\n-cmdline_parse_token_string_t cmd_2tuple_filter_remove_filter =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tfilter, \"remove_2tuple_filter\");\n-cmdline_parse_inst_t cmd_remove_2tuple_filter = {\n-\t.f = cmd_2tuple_filter_parsed,\n-\t.data = NULL,\n-\t.help_str = \"remove a 2tuple filter\",\n-\t.tokens = {\n-\t\t(void *)&cmd_2tuple_filter_remove_filter,\n-\t\t(void *)&cmd_2tuple_filter_port_id,\n-\t\t(void *)&cmd_2tuple_filter_index,\n-\t\t(void *)&cmd_2tuple_filter_index_value,\n-\t\tNULL,\n-\t},\n-};\n-cmdline_parse_token_string_t cmd_2tuple_filter_get_filter =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_2tuple_filter_result,\n-\t\t\t\tfilter, \"get_2tuple_filter\");\n-cmdline_parse_inst_t cmd_get_2tuple_filter = {\n-\t.f = cmd_2tuple_filter_parsed,\n-\t.data = NULL,\n-\t.help_str = \"get a 2tuple filter\",\n-\t.tokens = {\n-\t\t(void *)&cmd_2tuple_filter_get_filter,\n-\t\t(void *)&cmd_2tuple_filter_port_id,\n-\t\t(void *)&cmd_2tuple_filter_index,\n-\t\t(void *)&cmd_2tuple_filter_index_value,\n \t\tNULL,\n \t},\n };\n@@ -7647,6 +7630,7 @@ cmdline_parse_inst_t cmd_get_2tuple_filter = {\n struct cmd_5tuple_filter_result {\n \tcmdline_fixed_string_t filter;\n \tuint8_t  port_id;\n+\tcmdline_fixed_string_t ops;\n \tcmdline_fixed_string_t dst_ip;\n \tcmdline_ipaddr_t dst_ip_value;\n \tcmdline_fixed_string_t src_ip;\n@@ -7659,14 +7643,12 @@ struct cmd_5tuple_filter_result {\n \tuint8_t protocol_value;\n \tcmdline_fixed_string_t mask;\n \tuint8_t  mask_value;\n-\tcmdline_fixed_string_t flags;\n-\tuint8_t flags_value;\n+\tcmdline_fixed_string_t tcp_flags;\n+\tuint8_t tcp_flags_value;\n \tcmdline_fixed_string_t priority;\n \tuint8_t  priority_value;\n \tcmdline_fixed_string_t queue;\n \tuint16_t  queue_id;\n-\tcmdline_fixed_string_t index;\n-\tuint16_t  index_value;\n };\n \n static void\n@@ -7674,62 +7656,92 @@ cmd_5tuple_filter_parsed(void *parsed_result,\n \t\t\t__attribute__((unused)) struct cmdline *cl,\n \t\t\t__attribute__((unused)) void *data)\n {\n-\tint ret = 0;\n-\tstruct rte_5tuple_filter filter;\n+\tstruct rte_eth_ntuple_filter filter;\n \tstruct cmd_5tuple_filter_result *res = parsed_result;\n+\tint ret = 0;\n \n-\tmemset(&filter, 0, sizeof(struct rte_5tuple_filter));\n+\tret = rte_eth_dev_filter_supported(res->port_id, RTE_ETH_FILTER_NTUPLE);\n+\tif (ret < 0) {\n+\t\tprintf(\"ntuple filter is not supported on port %u.\\n\",\n+\t\t\tres->port_id);\n+\t\treturn;\n+\t}\n \n-\tif (!strcmp(res->filter, \"add_5tuple_filter\")) {\n-\t\tfilter.dst_ip_mask = (res->mask_value & 0x10) ? 0 : 1;\n-\t\tfilter.src_ip_mask = (res->mask_value & 0x08) ? 0 : 1;\n-\t\tfilter.dst_port_mask = (res->mask_value & 0x04) ? 0 : 1;\n-\t\tfilter.src_port_mask = (res->mask_value & 0x02) ? 0 : 1;\n-\t\tfilter.protocol = res->protocol_value;\n-\t\tfilter.protocol_mask = (res->mask_value & 0x01) ? 0 : 1;\n-\t\tfilter.priority = res->priority_value;\n-\t\tfilter.tcp_flags = res->flags_value;\n+\tmemset(&filter, 0, sizeof(struct rte_eth_ntuple_filter));\n \n-\t\tif (res->dst_ip_value.family == AF_INET)\n-\t\t\t/* no need to convert, already big endian. */\n-\t\t\tfilter.dst_ip = res->dst_ip_value.addr.ipv4.s_addr;\n-\t\telse {\n-\t\t\tif (filter.dst_ip_mask == 0) {\n-\t\t\t\tprintf(\"can not support ipv6 involved compare.\\n\");\n-\t\t\t\treturn;\n-\t\t\t}\n-\t\t\tfilter.dst_ip = 0;\n+\tfilter.flags = RTE_5TUPLE_FLAGS;\n+\tfilter.dst_ip_mask = (res->mask_value & 0x10) ? UINT32_MAX : 0;\n+\tfilter.src_ip_mask = (res->mask_value & 0x08) ? UINT32_MAX : 0;\n+\tfilter.dst_port_mask = (res->mask_value & 0x04) ? UINT16_MAX : 0;\n+\tfilter.src_port_mask = (res->mask_value & 0x02) ? UINT16_MAX : 0;\n+\tfilter.proto_mask = (res->mask_value & 0x01) ? UINT8_MAX : 0;\n+\tfilter.proto = res->protocol_value;\n+\tfilter.priority = res->priority_value;\n+\tif (res->tcp_flags_value != 0 && filter.proto != IPPROTO_TCP) {\n+\t\tprintf(\"nonzero tcp_flags is only meaningful\"\n+\t\t\t\" when protocol is TCP.\\n\");\n+\t\treturn;\n+\t}\n+\tif (res->tcp_flags_value > TCP_FLAG_ALL) {\n+\t\tprintf(\"invalid TCP flags.\\n\");\n+\t\treturn;\n+\t}\n+\n+\tif (res->tcp_flags_value != 0) {\n+\t\tfilter.flags |= RTE_NTUPLE_FLAGS_TCP_FLAG;\n+\t\tfilter.tcp_flags = res->tcp_flags_value;\n+\t}\n+\n+\tif (res->dst_ip_value.family == AF_INET)\n+\t\t/* no need to convert, already big endian. */\n+\t\tfilter.dst_ip = res->dst_ip_value.addr.ipv4.s_addr;\n+\telse {\n+\t\tif (filter.dst_ip_mask == 0) {\n+\t\t\tprintf(\"can not support ipv6 involved compare.\\n\");\n+\t\t\treturn;\n \t\t}\n+\t\tfilter.dst_ip = 0;\n+\t}\n \n-\t\tif (res->src_ip_value.family == AF_INET)\n-\t\t\t/* no need to convert, already big endian. */\n-\t\t\tfilter.src_ip = res->src_ip_value.addr.ipv4.s_addr;\n-\t\telse {\n-\t\t\tif (filter.src_ip_mask == 0) {\n-\t\t\t\tprintf(\"can not support ipv6 involved compare.\\n\");\n-\t\t\t\treturn;\n-\t\t\t}\n-\t\t\tfilter.src_ip = 0;\n+\tif (res->src_ip_value.family == AF_INET)\n+\t\t/* no need to convert, already big endian. */\n+\t\tfilter.src_ip = res->src_ip_value.addr.ipv4.s_addr;\n+\telse {\n+\t\tif (filter.src_ip_mask == 0) {\n+\t\t\tprintf(\"can not support ipv6 involved compare.\\n\");\n+\t\t\treturn;\n \t\t}\n-\t\t/* need convert to big endian. */\n-\t\tfilter.dst_port = rte_cpu_to_be_16(res->dst_port_value);\n-\t\tfilter.src_port = rte_cpu_to_be_16(res->src_port_value);\n+\t\tfilter.src_ip = 0;\n+\t}\n+\t/* need convert to big endian. */\n+\tfilter.dst_port = rte_cpu_to_be_16(res->dst_port_value);\n+\tfilter.src_port = rte_cpu_to_be_16(res->src_port_value);\n+\tfilter.queue = res->queue_id;\n \n-\t\tret = rte_eth_dev_add_5tuple_filter(res->port_id,\n-\t\t\tres->index_value, &filter, res->queue_id);\n-\t} else if (!strcmp(res->filter, \"remove_5tuple_filter\"))\n-\t\tret = rte_eth_dev_remove_5tuple_filter(res->port_id,\n-\t\t\tres->index_value);\n-\telse if (!strcmp(res->filter, \"get_5tuple_filter\"))\n-\t\tget_5tuple_filter(res->port_id, res->index_value);\n+\tif (!strcmp(res->ops, \"add\"))\n+\t\tret = rte_eth_dev_filter_ctrl(res->port_id,\n+\t\t\t\tRTE_ETH_FILTER_NTUPLE,\n+\t\t\t\tRTE_ETH_FILTER_ADD,\n+\t\t\t\t&filter);\n+\telse\n+\t\tret = rte_eth_dev_filter_ctrl(res->port_id,\n+\t\t\t\tRTE_ETH_FILTER_NTUPLE,\n+\t\t\t\tRTE_ETH_FILTER_DELETE,\n+\t\t\t\t&filter);\n \tif (ret < 0)\n-\t\tprintf(\"5tuple filter setting error: (%s)\\n\", strerror(-ret));\n+\t\tprintf(\"5tuple filter programming error: (%s)\\n\",\n+\t\t\tstrerror(-ret));\n }\n \n-\n+cmdline_parse_token_string_t cmd_5tuple_filter_filter =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n+\t\t\t\t filter, \"5tuple_filter\");\n cmdline_parse_token_num_t cmd_5tuple_filter_port_id =\n \tTOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,\n \t\t\t\tport_id, UINT8);\n+cmdline_parse_token_string_t cmd_5tuple_filter_ops =\n+\tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n+\t\t\t\t ops, \"add#del\");\n cmdline_parse_token_string_t cmd_5tuple_filter_dst_ip =\n \tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n \t\t\t\tdst_ip, \"dst_ip\");\n@@ -7766,12 +7778,12 @@ cmdline_parse_token_string_t cmd_5tuple_filter_mask =\n cmdline_parse_token_num_t cmd_5tuple_filter_mask_value =\n \tTOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,\n \t\t\t\tmask_value, INT8);\n-cmdline_parse_token_string_t cmd_5tuple_filter_flags =\n+cmdline_parse_token_string_t cmd_5tuple_filter_tcp_flags =\n \tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n-\t\t\t\tflags, \"flags\");\n-cmdline_parse_token_num_t cmd_5tuple_filter_flags_value =\n+\t\t\t\ttcp_flags, \"tcp_flags\");\n+cmdline_parse_token_num_t cmd_5tuple_filter_tcp_flags_value =\n \tTOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,\n-\t\t\t\tflags_value, UINT8);\n+\t\t\t\ttcp_flags_value, UINT8);\n cmdline_parse_token_string_t cmd_5tuple_filter_priority =\n \tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n \t\t\t\tpriority, \"priority\");\n@@ -7784,23 +7796,15 @@ cmdline_parse_token_string_t cmd_5tuple_filter_queue =\n cmdline_parse_token_num_t cmd_5tuple_filter_queue_id =\n \tTOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,\n \t\t\t\tqueue_id, UINT16);\n-cmdline_parse_token_string_t cmd_5tuple_filter_index =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n-\t\t\t\tindex, \"index\");\n-cmdline_parse_token_num_t cmd_5tuple_filter_index_value =\n-\tTOKEN_NUM_INITIALIZER(struct cmd_5tuple_filter_result,\n-\t\t\t\tindex_value, UINT16);\n \n-cmdline_parse_token_string_t cmd_5tuple_filter_add_filter =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n-\t\t\t\t filter, \"add_5tuple_filter\");\n-cmdline_parse_inst_t cmd_add_5tuple_filter = {\n+cmdline_parse_inst_t cmd_5tuple_filter = {\n \t.f = cmd_5tuple_filter_parsed,\n \t.data = NULL,\n-\t.help_str = \"add a 5tuple filter\",\n+\t.help_str = \"add/del a 5tuple filter\",\n \t.tokens = {\n-\t\t(void *)&cmd_5tuple_filter_add_filter,\n+\t\t(void *)&cmd_5tuple_filter_filter,\n \t\t(void *)&cmd_5tuple_filter_port_id,\n+\t\t(void *)&cmd_5tuple_filter_ops,\n \t\t(void *)&cmd_5tuple_filter_dst_ip,\n \t\t(void *)&cmd_5tuple_filter_dst_ip_value,\n \t\t(void *)&cmd_5tuple_filter_src_ip,\n@@ -7813,46 +7817,12 @@ cmdline_parse_inst_t cmd_add_5tuple_filter = {\n \t\t(void *)&cmd_5tuple_filter_protocol_value,\n \t\t(void *)&cmd_5tuple_filter_mask,\n \t\t(void *)&cmd_5tuple_filter_mask_value,\n-\t\t(void *)&cmd_5tuple_filter_flags,\n-\t\t(void *)&cmd_5tuple_filter_flags_value,\n+\t\t(void *)&cmd_5tuple_filter_tcp_flags,\n+\t\t(void *)&cmd_5tuple_filter_tcp_flags_value,\n \t\t(void *)&cmd_5tuple_filter_priority,\n \t\t(void *)&cmd_5tuple_filter_priority_value,\n \t\t(void *)&cmd_5tuple_filter_queue,\n \t\t(void *)&cmd_5tuple_filter_queue_id,\n-\t\t(void *)&cmd_5tuple_filter_index,\n-\t\t(void *)&cmd_5tuple_filter_index_value,\n-\t\tNULL,\n-\t},\n-};\n-\n-cmdline_parse_token_string_t cmd_5tuple_filter_remove_filter =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n-\t\t\t\tfilter, \"remove_5tuple_filter\");\n-cmdline_parse_inst_t cmd_remove_5tuple_filter = {\n-\t.f = cmd_5tuple_filter_parsed,\n-\t.data = NULL,\n-\t.help_str = \"remove a 5tuple filter\",\n-\t.tokens = {\n-\t\t(void *)&cmd_5tuple_filter_remove_filter,\n-\t\t(void *)&cmd_5tuple_filter_port_id,\n-\t\t(void *)&cmd_5tuple_filter_index,\n-\t\t(void *)&cmd_5tuple_filter_index_value,\n-\t\tNULL,\n-\t},\n-};\n-\n-cmdline_parse_token_string_t cmd_5tuple_filter_get_filter =\n-\tTOKEN_STRING_INITIALIZER(struct cmd_5tuple_filter_result,\n-\t\t\t\tfilter, \"get_5tuple_filter\");\n-cmdline_parse_inst_t cmd_get_5tuple_filter = {\n-\t.f = cmd_5tuple_filter_parsed,\n-\t.data = NULL,\n-\t.help_str = \"get a 5tuple filter\",\n-\t.tokens = {\n-\t\t(void *)&cmd_5tuple_filter_get_filter,\n-\t\t(void *)&cmd_5tuple_filter_port_id,\n-\t\t(void *)&cmd_5tuple_filter_index,\n-\t\t(void *)&cmd_5tuple_filter_index_value,\n \t\tNULL,\n \t},\n };\n@@ -8821,12 +8791,8 @@ cmdline_parse_ctx_t main_ctx[] = {\n \t(cmdline_parse_inst_t *)&cmd_add_syn_filter,\n \t(cmdline_parse_inst_t *)&cmd_remove_syn_filter,\n \t(cmdline_parse_inst_t *)&cmd_get_syn_filter,\n-\t(cmdline_parse_inst_t *)&cmd_add_2tuple_filter,\n-\t(cmdline_parse_inst_t *)&cmd_remove_2tuple_filter,\n-\t(cmdline_parse_inst_t *)&cmd_get_2tuple_filter,\n-\t(cmdline_parse_inst_t *)&cmd_add_5tuple_filter,\n-\t(cmdline_parse_inst_t *)&cmd_remove_5tuple_filter,\n-\t(cmdline_parse_inst_t *)&cmd_get_5tuple_filter,\n+\t(cmdline_parse_inst_t *)&cmd_2tuple_filter,\n+\t(cmdline_parse_inst_t *)&cmd_5tuple_filter,\n \t(cmdline_parse_inst_t *)&cmd_add_flex_filter,\n \t(cmdline_parse_inst_t *)&cmd_remove_flex_filter,\n \t(cmdline_parse_inst_t *)&cmd_get_flex_filter,\ndiff --git a/app/test-pmd/config.c b/app/test-pmd/config.c\nindex 97b6525..ae1439e 100644\n--- a/app/test-pmd/config.c\n+++ b/app/test-pmd/config.c\n@@ -2213,73 +2213,8 @@ get_syn_filter(uint8_t port_id)\n \t\tfilter.hig_pri ? \"high\" : \"low\",\n \t\trx_queue);\n }\n-void\n-get_2tuple_filter(uint8_t port_id, uint16_t index)\n-{\n-\tstruct rte_2tuple_filter filter;\n-\tint ret = 0;\n-\tuint16_t rx_queue;\n-\n-\tmemset(&filter, 0, sizeof(filter));\n-\tret = rte_eth_dev_get_2tuple_filter(port_id, index,\n-\t\t\t\t&filter, &rx_queue);\n-\tif (ret < 0) {\n-\t\tif (ret == (-ENOENT))\n-\t\t\tprintf(\"filter[%d] is not enabled\\n\", index);\n-\t\telse\n-\t\t\tprintf(\"get 2tuple filter fails(%s)\\n\", strerror(-ret));\n-\t\treturn;\n-\t} else {\n-\t\tprintf(\"filter[%d]:\\n\", index);\n-\t\tprintf(\"    Destination Port:     0x%04x    mask: %d\\n\",\n-\t\t\trte_be_to_cpu_16(filter.dst_port),\n-\t\t\tfilter.dst_port_mask ? 0 : 1);\n-\t\tprintf(\"    protocol:  0x%02x     mask:%d     tcp_flags: 0x%02x\\n\",\n-\t\t\tfilter.protocol, filter.protocol_mask ? 0 : 1,\n-\t\t\tfilter.tcp_flags);\n-\t\tprintf(\"    priority: %d    queue: %d\\n\",\n-\t\t\tfilter.priority, rx_queue);\n-\t}\n-}\n \n void\n-get_5tuple_filter(uint8_t port_id, uint16_t index)\n-{\n-\tstruct rte_5tuple_filter filter;\n-\tint ret = 0;\n-\tuint16_t rx_queue;\n-\n-\tmemset(&filter, 0, sizeof(filter));\n-\tret = rte_eth_dev_get_5tuple_filter(port_id, index,\n-\t\t\t\t&filter, &rx_queue);\n-\tif (ret < 0) {\n-\t\tif (ret == (-ENOENT))\n-\t\t\tprintf(\"filter[%d] is not enabled\\n\", index);\n-\t\telse\n-\t\t\tprintf(\"get 5tuple filter fails(%s)\\n\", strerror(-ret));\n-\t\treturn;\n-\t} else {\n-\t\tprintf(\"filter[%d]:\\n\", index);\n-\t\tprintf(\"    Destination IP:  0x%08x    mask: %d\\n\",\n-\t\t\t(unsigned)rte_be_to_cpu_32(filter.dst_ip),\n-\t\t\tfilter.dst_ip_mask ? 0 : 1);\n-\t\tprintf(\"    Source IP:       0x%08x    mask: %d\\n\",\n-\t\t\t(unsigned)rte_be_to_cpu_32(filter.src_ip),\n-\t\t\tfilter.src_ip_mask ? 0 : 1);\n-\t\tprintf(\"    Destination Port:       0x%04x    mask: %d\\n\",\n-\t\t\trte_be_to_cpu_16(filter.dst_port),\n-\t\t\tfilter.dst_port_mask ? 0 : 1);\n-\t\tprintf(\"    Source Port:       0x%04x    mask: %d\\n\",\n-\t\t\trte_be_to_cpu_16(filter.src_port),\n-\t\t\tfilter.src_port_mask ? 0 : 1);\n-\t\tprintf(\"    protocol:           0x%02x    mask: %d\\n\",\n-\t\t\tfilter.protocol,\n-\t\t\tfilter.protocol_mask ? 0 : 1);\n-\t\tprintf(\"    priority: %d    flags: 0x%02x    queue: %d\\n\",\n-\t\t\tfilter.priority, filter.tcp_flags, rx_queue);\n-\t}\n-}\n-void\n get_flex_filter(uint8_t port_id, uint16_t index)\n \n {\n",
    "prefixes": [
        "dpdk-dev",
        "4/5"
    ]
}