From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6CC37A0487 for ; Mon, 1 Jul 2019 15:12:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 655D91B9D3; Mon, 1 Jul 2019 15:12:13 +0200 (CEST) Received: from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130]) by dpdk.org (Postfix) with ESMTP id 161921B9CF for ; Mon, 1 Jul 2019 15:12:11 +0200 (CEST) From: Xiaoyu Min To: orika@mellanox.com, Adrien Mazarguil , Wenzhuo Lu , Jingjing Wu , Bernard Iremonger , John McNamara , Marko Kovacevic Cc: dev@dpdk.org Date: Mon, 1 Jul 2019 21:11:59 +0800 Message-Id: <20190701131159.89164-5-jackmin@mellanox.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190624154018.128379-1-jackmin@mellanox.com> References: <20190624154018.128379-1-jackmin@mellanox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 4/4] app/testpmd: match GRE's key and present bits X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" support matching on GRE key and present bits (C,K,S) example testpmd command could be: testpmd>flow create 0 ingress group 1 pattern eth / ipv4 / gre crksv is 0x2000 crksv mask 0xb000 / gre_key key is 0x12345678 / end actions rss queues 1 0 end / mark id 196 / end Which will match GRE packet with k present bit set and key value is 0x12345678. Signed-off-by: Xiaoyu Min --- app/test-pmd/cmdline_flow.c | 40 +++++++++++++++++++++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 +++ 2 files changed, 44 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 201bd9de56..9fd6452a72 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -148,6 +148,9 @@ enum index { ITEM_MPLS_LABEL, ITEM_GRE, ITEM_GRE_PROTO, + ITEM_GRE_CRKSV, + ITEM_GRE_KEY, + ITEM_GRE_KEY_KEY, ITEM_FUZZY, ITEM_FUZZY_THRESH, ITEM_GTP, @@ -485,6 +488,14 @@ struct token { .size = sizeof(((s *)0)->f), \ }) +/** Same as ARGS_ENTRY_HTON() for a single argument, without structure. */ +#define ARGS_ENTRY_HTON_VALUE(s) \ + (&(const struct arg){ \ + .hton = 1, \ + .offset = 0, \ + .size = sizeof(s), \ + }) + /** Parser output buffer layout expected by cmd_flow_parsed(). */ struct buffer { enum index command; /**< Flow command. */ @@ -595,6 +606,7 @@ static const enum index next_item[] = { ITEM_NVGRE, ITEM_MPLS, ITEM_GRE, + ITEM_GRE_KEY, ITEM_FUZZY, ITEM_GTP, ITEM_GTPC, @@ -755,6 +767,13 @@ static const enum index item_mpls[] = { static const enum index item_gre[] = { ITEM_GRE_PROTO, + ITEM_GRE_CRKSV, + ITEM_NEXT, + ZERO, +}; + +static const enum index item_gre_key[] = { + ITEM_GRE_KEY_KEY, ITEM_NEXT, ZERO, }; @@ -1898,6 +1917,27 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre, protocol)), }, + [ITEM_GRE_CRKSV] = { + .name = "crksv", + .help = "GRE's first word (bit0 - bit15)", + .next = NEXT(item_gre, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_gre, + c_rsvd0_ver)), + }, + [ITEM_GRE_KEY] = { + .name = "gre_key", + .help = "match GRE Key", + .priv = PRIV_ITEM(GRE_KEY, + sizeof(rte_be32_t)), + .next = NEXT(item_gre_key), + .call = parse_vc, + }, + [ITEM_GRE_KEY_KEY] = { + .name = "key", + .help = "GRE key", + .next = NEXT(item_gre_key, NEXT_ENTRY(UNSIGNED), item_param), + .args = ARGS(ARGS_ENTRY_HTON_VALUE(rte_be32_t)), + }, [ITEM_FUZZY] = { .name = "fuzzy", .help = "fuzzy pattern match, expect faster than default", diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index cb83a3ce8a..fc3ba8a009 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -3804,6 +3804,10 @@ This section lists supported pattern items and their attributes, if any. - ``protocol {unsigned}``: protocol type. +- ``gre_key``: match GRE optional key field. + + - ``key {unsigned}``: key value. + - ``fuzzy``: fuzzy pattern match, expect faster than default. - ``thresh {unsigned}``: accuracy threshold. -- 2.21.0