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 C70CAA0555 for ; Wed, 19 Feb 2020 12:50:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C01DA1BF87; Wed, 19 Feb 2020 12:50:02 +0100 (CET) Received: from dish-sg.nttdocomo.co.jp (dish-sg.nttdocomo.co.jp [202.19.227.74]) by dpdk.org (Postfix) with ESMTP id 3FEAD1BF87 for ; Wed, 19 Feb 2020 12:50:01 +0100 (CET) X-dD-Source: Outbound Received: from zssg-mailmd103.ddreams.local (zssg-mailmd900.ddreams.local [10.160.172.63]) by zssg-mailou102.ddreams.local (Postfix) with ESMTP id 716A91200E1; Wed, 19 Feb 2020 20:49:59 +0900 (JST) Received: from zssg-mailmf101.ddreams.local (zssg-mailmf900.ddreams.local [10.160.172.84]) by zssg-mailmd103.ddreams.local (dDREAMS) with ESMTP id <0Q5Y00A5067API10@dDREAMS>; Wed, 19 Feb 2020 20:49:59 +0900 (JST) Received: from zssg-mailmf101.ddreams.local (unknown [127.0.0.1]) by zssg-mailmf101.ddreams.local (Postfix) with ESMTP id 528867E603D; Wed, 19 Feb 2020 20:49:59 +0900 (JST) Received: from zssg-mailmf101.ddreams.local (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 515F88E6055; Wed, 19 Feb 2020 20:49:59 +0900 (JST) Received: from localhost (unknown [127.0.0.1]) by IMSVA (Postfix) with SMTP id 4FEF18E6056; Wed, 19 Feb 2020 20:49:59 +0900 (JST) X-IMSS-HAND-OFF-DIRECTIVE: localhost:10026 Received: from zssg-mailmf101.ddreams.local (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3B86D8E6054; Wed, 19 Feb 2020 20:49:58 +0900 (JST) Received: from davinci.ntt-tx.co.jp (unknown [10.160.183.139]) by zssg-mailmf101.ddreams.local (Postfix) with ESMTP; Wed, 19 Feb 2020 20:49:58 +0900 (JST) From: x-fn-spp-ml@ntt-tx.co.jp To: spp@dpdk.org, ferruh.yigit@intel.com, yasufum.o@gmail.com Date: Wed, 19 Feb 2020 20:49:39 +0900 Message-id: <20200219114947.14134-10-x-fn-spp-ml@ntt-tx.co.jp> X-Mailer: git-send-email 2.18.0 In-reply-to: <20200218063720.6597-1-x-fn-spp-ml@ntt-tx.co.jp> References: <20200218063720.6597-1-x-fn-spp-ml@ntt-tx.co.jp> X-TM-AS-GCONF: 00 Subject: [spp] [PATCH v2 09/17] spp_primary: add patterns of rte_flow X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spp-bounces@dpdk.org Sender: "spp" From: Hideyuki Yamashita To support rte_flow in SPP, this patch adds the following patterns of rte_flow. - eth - vlan Additional files should be added when new pattern should be newly supported by SPP. Signed-off-by: Hideyuki Yamashita Signed-off-by: Yasufumi Ogawa --- src/primary/flow/pattern/eth.c | 63 +++++++++++++++++++++++++++++ src/primary/flow/pattern/eth.h | 13 ++++++ src/primary/flow/pattern/vlan.c | 71 +++++++++++++++++++++++++++++++++ src/primary/flow/pattern/vlan.h | 13 ++++++ 4 files changed, 160 insertions(+) create mode 100644 src/primary/flow/pattern/eth.c create mode 100644 src/primary/flow/pattern/eth.h create mode 100644 src/primary/flow/pattern/vlan.c create mode 100644 src/primary/flow/pattern/vlan.h diff --git a/src/primary/flow/pattern/eth.c b/src/primary/flow/pattern/eth.c new file mode 100644 index 0000000..d718b77 --- /dev/null +++ b/src/primary/flow/pattern/eth.c @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation + */ + +#include + +#include "primary/flow/flow.h" +#include "primary/flow/common.h" +#include "eth.h" + +/* Define item "eth" operations */ +struct flow_detail_ops eth_ops_list[] = { + { + .token = "src", + .offset = offsetof(struct rte_flow_item_eth, src), + .size = sizeof(struct rte_ether_addr), + .flg_value = 1, + .parse_detail = str_to_rte_ether_addr, + }, + { + .token = "dst", + .offset = offsetof(struct rte_flow_item_eth, dst), + .size = sizeof(struct rte_ether_addr), + .flg_value = 1, + .parse_detail = str_to_rte_ether_addr, + }, + { + .token = "type", + .offset = offsetof(struct rte_flow_item_eth, type), + .size = sizeof(rte_be16_t), + .flg_value = 1, + .parse_detail = str_to_rte_be16_t, + }, + { + .token = NULL, + }, +}; + +int +append_item_eth_json(const void *element, int buf_size, char *pattern_str) +{ + const struct rte_flow_item_eth *eth = element; + char dst_mac[RTE_ETHER_ADDR_FMT_SIZE] = { 0 }; + char src_mac[RTE_ETHER_ADDR_FMT_SIZE] = { 0 }; + char tmp_str[128] = { 0 }; + + rte_ether_format_addr(dst_mac, RTE_ETHER_ADDR_FMT_SIZE, ð->dst); + rte_ether_format_addr(src_mac, RTE_ETHER_ADDR_FMT_SIZE, ð->src); + + snprintf(tmp_str, 128, + "{\"dst\":\"%s\"," + "\"src\":\"%s\"," + "\"type\":\"0x%04x\"}", + dst_mac, src_mac, eth->type); + + if ((int)strlen(pattern_str) + (int)strlen(tmp_str) + > buf_size) + return -1; + + strncat(pattern_str, tmp_str, strlen(tmp_str)); + + return 0; +} diff --git a/src/primary/flow/pattern/eth.h b/src/primary/flow/pattern/eth.h new file mode 100644 index 0000000..550813e --- /dev/null +++ b/src/primary/flow/pattern/eth.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation + */ + +#ifndef _PRIMARY_FLOW_PATTERN_ETH_H_ +#define _PRIMARY_FLOW_PATTERN_ETH_H_ + +extern struct flow_detail_ops eth_ops_list[]; + +int append_item_eth_json(const void *element, int buf_size, + char *pattern_str); + +#endif diff --git a/src/primary/flow/pattern/vlan.c b/src/primary/flow/pattern/vlan.c new file mode 100644 index 0000000..3ca8ebc --- /dev/null +++ b/src/primary/flow/pattern/vlan.c @@ -0,0 +1,71 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation + */ + +#include + +#include "primary/flow/flow.h" +#include "primary/flow/common.h" +#include "vlan.h" + +/* Define item "vlan" operations */ +struct flow_detail_ops vlan_ops_list[] = { + { + .token = "tci", + .offset = offsetof(struct rte_flow_item_vlan, tci), + .size = sizeof(rte_be16_t), + .flg_value = 1, + .parse_detail = str_to_tci, + }, + { + .token = "pcp", + .offset = offsetof(struct rte_flow_item_vlan, tci), + .size = sizeof(rte_be16_t), + .flg_value = 1, + .parse_detail = set_pcp_in_tci, + }, + { + .token = "dei", + .offset = offsetof(struct rte_flow_item_vlan, tci), + .size = sizeof(rte_be16_t), + .flg_value = 1, + .parse_detail = set_dei_in_tci, + }, + { + .token = "vid", + .offset = offsetof(struct rte_flow_item_vlan, tci), + .size = sizeof(rte_be16_t), + .flg_value = 1, + .parse_detail = set_vid_in_tci, + }, + { + .token = "inner_type", + .offset = offsetof(struct rte_flow_item_vlan, inner_type), + .size = sizeof(rte_be16_t), + .flg_value = 1, + .parse_detail = str_to_rte_be16_t, + }, + { + .token = NULL, + }, +}; + +int +append_item_vlan_json(const void *element, int buf_size, char *pattern_str) +{ + const struct rte_flow_item_vlan *vlan = element; + char tmp_str[128] = { 0 }; + + snprintf(tmp_str, 128, + "{\"tci\":\"0x%04x\"," + "\"inner_type\":\"0x%04x\"}", + vlan->tci, vlan->inner_type); + + if ((int)strlen(pattern_str) + (int)strlen(tmp_str) + > buf_size) + return -1; + + strncat(pattern_str, tmp_str, strlen(tmp_str)); + + return 0; +} diff --git a/src/primary/flow/pattern/vlan.h b/src/primary/flow/pattern/vlan.h new file mode 100644 index 0000000..50aef96 --- /dev/null +++ b/src/primary/flow/pattern/vlan.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2019 Nippon Telegraph and Telephone Corporation + */ + +#ifndef _PRIMARY_FLOW_PATTERN_VLAN_H_ +#define _PRIMARY_FLOW_PATTERN_VLAN_H_ + +extern struct flow_detail_ops vlan_ops_list[]; + +int append_item_vlan_json(const void *element, int buf_size, + char *pattern_str); + +#endif -- 2.17.1