From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 756DFA046B for ; Mon, 24 Jun 2019 17:40:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 94CC31BCB1; Mon, 24 Jun 2019 17:40:26 +0200 (CEST) Received: from git-send-mailer.rdmz.labs.mlnx (unknown [37.142.13.130]) by dpdk.org (Postfix) with ESMTP id 65C141BC70 for ; Mon, 24 Jun 2019 17:40:23 +0200 (CEST) From: Xiaoyu Min To: Adrien Mazarguil , John McNamara , Marko Kovacevic , Thomas Monjalon , Ferruh Yigit , Andrew Rybchenko Cc: dev@dpdk.org Date: Mon, 24 Jun 2019 23:40:15 +0800 Message-Id: <20190624154018.128379-2-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 1/4] ethdev: add GRE key field to flow API 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" Add new rte_flow_item_gre_key in order to match the optional key field. Signed-off-by: Xiaoyu Min --- doc/guides/prog_guide/rte_flow.rst | 9 +++++++++ lib/librte_ethdev/rte_flow.c | 1 + lib/librte_ethdev/rte_flow.h | 27 +++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index a34d012e55..e900a53e3c 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -980,6 +980,15 @@ Matches a GRE header. - ``protocol``: protocol type. - Default ``mask`` matches protocol only. +Item: ``GRE_KEY`` +^^^^^^^^^^^^^^^^^ + +Matches a GRE key field. +This should be preceded by item ``GRE`` + +- ``key``: key value. +- Default ``mask`` matches key only. + Item: ``FUZZY`` ^^^^^^^^^^^^^^^ diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c index 3277be1edb..1cd5f4d263 100644 --- a/lib/librte_ethdev/rte_flow.c +++ b/lib/librte_ethdev/rte_flow.c @@ -55,6 +55,7 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = { MK_FLOW_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)), MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)), MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)), + MK_FLOW_ITEM(GRE_KEY, sizeof(struct rte_flow_item_gre_key)), MK_FLOW_ITEM(FUZZY, sizeof(struct rte_flow_item_fuzzy)), MK_FLOW_ITEM(GTP, sizeof(struct rte_flow_item_gtp)), MK_FLOW_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)), diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index f3a8fb103f..a708ccd53b 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -289,6 +289,13 @@ enum rte_flow_item_type { */ RTE_FLOW_ITEM_TYPE_GRE, + /** + * Matches a GRE optional key field. + * + * See struct rte_flow_item_gre_key. + */ + RTE_FLOW_ITEM_TYPE_GRE_KEY, + /** * [META] * @@ -856,6 +863,26 @@ static const struct rte_flow_item_gre rte_flow_item_gre_mask = { }; #endif +/** + * RTE_FLOW_ITEM_GRE_KEY. + * + * Matches the presence of a GRE key. + * + * Normally preceding by: + * + * - RTE_FLOW_ITEM_TYPE_GRE + */ +struct rte_flow_item_gre_key { + rte_be32_t key; /**< Application specific key value (K bit). */ +}; + +/** Default mask for RTE_FLOW_ITEM_TYPE_GRE_KEY. */ +#ifndef __cplusplus +static const struct rte_flow_item_gre_key rte_flow_item_gre_key_mask = { + .key = RTE_BE32(UINT32_MAX), +}; +#endif + /** * RTE_FLOW_ITEM_TYPE_FUZZY * -- 2.21.0