From: Bernard Iremonger <bernard.iremonger@intel.com>
To: dev@dpdk.org, beilei.xing@intel.com, jingjing.wu@intel.com
Cc: helin.zhang@intel.com, Bernard Iremonger <bernard.iremonger@intel.com>
Subject: [dpdk-dev] [PATCH v1 4/4] net/i40e: parse QinQ pattern
Date: Fri, 3 Mar 2017 14:48:11 +0000 [thread overview]
Message-ID: <1488552491-20432-5-git-send-email-bernard.iremonger@intel.com> (raw)
In-Reply-To: <1488552491-20432-1-git-send-email-bernard.iremonger@intel.com>
add QinQ pattern.
add i40e_flow_parse_qinq_pattern function.
add i40e_flow_parse_qinq_filter function.
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
drivers/net/i40e/i40e_flow.c | 195 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 192 insertions(+), 3 deletions(-)
diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 49f5d41..a53848f 100644
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright (c) 2016 Intel Corporation. All rights reserved.
+ * Copyright (c) 2016-2017 Intel Corporation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -121,6 +121,18 @@ static int i40e_flow_destroy_tunnel_filter(struct i40e_pf *pf,
static int i40e_flow_flush_fdir_filter(struct i40e_pf *pf);
static int i40e_flow_flush_ethertype_filter(struct i40e_pf *pf);
static int i40e_flow_flush_tunnel_filter(struct i40e_pf *pf);
+static int
+i40e_flow_parse_qinq_filter(struct rte_eth_dev *dev,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_item pattern[],
+ const struct rte_flow_action actions[],
+ struct rte_flow_error *error,
+ union i40e_filter_t *filter);
+static int
+i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,
+ const struct rte_flow_item *pattern,
+ struct rte_flow_error *error,
+ struct i40e_tunnel_filter_conf *filter);
const struct rte_flow_ops i40e_flow_ops = {
.validate = i40e_flow_validate,
@@ -278,6 +290,13 @@ static enum rte_flow_item_type pattern_vxlan_4[] = {
RTE_FLOW_ITEM_TYPE_END,
};
+static enum rte_flow_item_type pattern_qinq_1[] = {
+ RTE_FLOW_ITEM_TYPE_ETH,
+ RTE_FLOW_ITEM_TYPE_VLAN,
+ RTE_FLOW_ITEM_TYPE_VLAN,
+ RTE_FLOW_ITEM_TYPE_END,
+};
+
static struct i40e_valid_pattern i40e_supported_patterns[] = {
/* Ethertype */
{ pattern_ethertype, i40e_flow_parse_ethertype_filter },
@@ -303,6 +322,7 @@ static struct i40e_valid_pattern i40e_supported_patterns[] = {
{ pattern_vxlan_2, i40e_flow_parse_vxlan_filter },
{ pattern_vxlan_3, i40e_flow_parse_vxlan_filter },
{ pattern_vxlan_4, i40e_flow_parse_vxlan_filter },
+ { pattern_qinq_1, i40e_flow_parse_qinq_filter },
};
#define NEXT_ITEM_OF_ACTION(act, actions, index) \
@@ -1126,8 +1146,8 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
return 0;
}
-/* Parse to get the action info of a tunnle filter
- * Tunnel action only supports PF, VF and QUEUE.
+/* Parse to get the action info of a tunnel filter
+ * Tunnel action only supports QUEUE and VF.
*/
static int
i40e_flow_parse_tunnel_action(struct rte_eth_dev *dev,
@@ -1486,6 +1506,144 @@ i40e_flow_parse_vxlan_pattern(__rte_unused struct rte_eth_dev *dev,
}
static int
+i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,
+ const struct rte_flow_item *pattern,
+ struct rte_flow_error *error,
+ struct i40e_tunnel_filter_conf *filter)
+{
+ const struct rte_flow_item *item = pattern;
+ const struct rte_flow_item_eth *eth_spec;
+ const struct rte_flow_item_eth *eth_mask;
+ const struct rte_flow_item_eth *i_eth_spec = NULL;
+ const struct rte_flow_item_eth *i_eth_mask = NULL;
+ const struct rte_flow_item_vlan *vlan_spec = NULL;
+ const struct rte_flow_item_vlan *vlan_mask = NULL;
+ const struct rte_flow_item_vlan *i_vlan_spec = NULL;
+ const struct rte_flow_item_vlan *o_vlan_spec = NULL;
+
+ enum rte_flow_item_type item_type;
+ bool vlan_flag = 0;
+
+ for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
+ if (item->last) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Not support range");
+ return -rte_errno;
+ }
+ item_type = item->type;
+ switch (item_type) {
+ case RTE_FLOW_ITEM_TYPE_ETH:
+ eth_spec = (const struct rte_flow_item_eth *)item->spec;
+ eth_mask = (const struct rte_flow_item_eth *)item->mask;
+ if ((!eth_spec && eth_mask) ||
+ (eth_spec && !eth_mask)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid ether spec/mask");
+ return -rte_errno;
+ }
+
+ if (eth_spec && eth_mask) {
+ /* DST address of inner MAC shouldn't be masked.
+ * SRC address of Inner MAC should be masked.
+ */
+ if (!is_broadcast_ether_addr(ð_mask->dst) ||
+ !is_zero_ether_addr(ð_mask->src) ||
+ eth_mask->type) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid ether spec/mask");
+ return -rte_errno;
+ }
+
+ rte_memcpy(&filter->outer_mac,
+ ð_spec->dst,
+ ETHER_ADDR_LEN);
+ }
+
+ i_eth_spec = eth_spec;
+ i_eth_mask = eth_mask;
+ break;
+ case RTE_FLOW_ITEM_TYPE_VLAN:
+ vlan_spec =
+ (const struct rte_flow_item_vlan *)item->spec;
+ vlan_mask =
+ (const struct rte_flow_item_vlan *)item->mask;
+
+ if (!(vlan_spec && vlan_mask)) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item,
+ "Invalid vlan item");
+ return -rte_errno;
+ }
+
+ if (!vlan_flag) {
+ o_vlan_spec = vlan_spec;
+ vlan_flag = 1;
+ } else {
+ i_vlan_spec = vlan_spec;
+ vlan_flag = 0;
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ /* Check specification and mask to get the filter type */
+ if (vlan_spec && vlan_mask &&
+ (vlan_mask->tci == rte_cpu_to_be_16(I40E_TCI_MASK))) {
+ /* If there's inner vlan */
+ if (vlan_flag)
+ filter->inner_vlan = rte_be_to_cpu_16(o_vlan_spec->tci)
+ & I40E_TCI_MASK;
+ else {
+ /* There is an inner and outer vlan */
+ filter->outer_vlan = rte_be_to_cpu_16(o_vlan_spec->tci)
+ & I40E_TCI_MASK;
+ filter->inner_vlan = rte_be_to_cpu_16(i_vlan_spec->tci)
+ & I40E_TCI_MASK;
+ }
+
+ if (i_eth_spec && i_eth_mask)
+ filter->filter_type =
+ I40E_TUNNEL_FILTER_CUSTOM_QINQ;
+ else {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ NULL,
+ "Invalid filter type");
+ return -rte_errno;
+ }
+ } else if ((!vlan_spec && !vlan_mask) ||
+ (vlan_spec && vlan_mask && vlan_mask->tci == 0x0)) {
+ if (i_eth_spec && i_eth_mask) {
+ filter->filter_type = I40E_TUNNEL_FILTER_CUSTOM_QINQ;
+ } else {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+ "Invalid filter type");
+ return -rte_errno;
+ }
+ } else {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM, NULL,
+ "Not supported by tunnel filter.");
+ return -rte_errno;
+ }
+
+ filter->tunnel_type = I40E_TUNNEL_TYPE_QINQ;
+
+ return 0;
+}
+
+static int
i40e_flow_parse_vxlan_filter(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
@@ -1499,6 +1657,37 @@ i40e_flow_parse_vxlan_filter(struct rte_eth_dev *dev,
ret = i40e_flow_parse_vxlan_pattern(dev, pattern,
error, tunnel_filter);
+
+ if (ret)
+ return ret;
+
+ ret = i40e_flow_parse_tunnel_action(dev, actions, error, tunnel_filter);
+ if (ret)
+ return ret;
+
+ ret = i40e_flow_parse_attr(attr, error);
+ if (ret)
+ return ret;
+
+ cons_filter_type = RTE_ETH_FILTER_TUNNEL;
+
+ return ret;
+}
+
+static int
+i40e_flow_parse_qinq_filter(struct rte_eth_dev *dev,
+ const struct rte_flow_attr *attr,
+ const struct rte_flow_item pattern[],
+ const struct rte_flow_action actions[],
+ struct rte_flow_error *error,
+ union i40e_filter_t *filter)
+{
+ struct i40e_tunnel_filter_conf *tunnel_filter =
+ &filter->consistent_tunnel_filter;
+ int ret;
+
+ ret = i40e_flow_parse_qinq_pattern(dev, pattern,
+ error, tunnel_filter);
if (ret)
return ret;
--
2.10.1
next prev parent reply other threads:[~2017-03-03 14:48 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 14:48 [dpdk-dev] [PATCH v1 0/4] net/i40e: QinQ filter Bernard Iremonger
2017-03-03 14:48 ` [dpdk-dev] [PATCH v1 1/4] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-03 14:48 ` [dpdk-dev] [PATCH v1 2/4] net/i40e: add QinQ wrapper function Bernard Iremonger
2017-03-03 14:48 ` [dpdk-dev] [PATCH v1 3/4] net/i40e: changes to consistent filter set Bernard Iremonger
2017-03-03 14:48 ` Bernard Iremonger [this message]
2017-03-23 16:38 ` [dpdk-dev] [PATCH v2 0/3] net/i40e: QinQ filter Bernard Iremonger
2017-03-28 16:20 ` [dpdk-dev] [PATCH v3 0/5] " Bernard Iremonger
2017-03-29 16:41 ` [dpdk-dev] [PATCH v4 " Bernard Iremonger
2017-03-30 16:01 ` Bernard Iremonger
2017-03-30 16:09 ` [dpdk-dev] [PATCH v5 " Bernard Iremonger
2017-03-31 13:33 ` Ferruh Yigit
2017-03-31 13:37 ` Iremonger, Bernard
2017-03-31 15:18 ` [dpdk-dev] [PATCH v6 " Bernard Iremonger
2017-03-31 16:53 ` Ferruh Yigit
2017-03-31 17:05 ` Iremonger, Bernard
2017-03-31 17:58 ` [dpdk-dev] [PATCH v7 " Bernard Iremonger
2017-04-03 9:24 ` Ferruh Yigit
2017-03-31 17:58 ` [dpdk-dev] [PATCH v7 1/5] net/i40e: initialise L3 MAP register Bernard Iremonger
2017-03-31 17:58 ` [dpdk-dev] [PATCH v7 2/5] net/i40e: add QinQ filter create function Bernard Iremonger
2017-03-31 17:58 ` [dpdk-dev] [PATCH v7 3/5] net/i40e: parse QinQ pattern Bernard Iremonger
2017-03-31 17:58 ` [dpdk-dev] [PATCH v7 4/5] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-31 17:58 ` [dpdk-dev] [PATCH v7 5/5] net/i40e: update tunnel filter restore function Bernard Iremonger
2017-03-31 15:18 ` [dpdk-dev] [PATCH v6 1/5] net/i40e: initialise L3 MAP register Bernard Iremonger
2017-03-31 15:18 ` [dpdk-dev] [PATCH v6 2/5] net/i40e: add QinQ filter create function Bernard Iremonger
2017-03-31 15:18 ` [dpdk-dev] [PATCH v6 3/5] net/i40e: parse QinQ pattern Bernard Iremonger
2017-03-31 15:18 ` [dpdk-dev] [PATCH v6 4/5] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-31 15:18 ` [dpdk-dev] [PATCH v6 5/5] net/i40e: update tunnel filter restore function Bernard Iremonger
2017-03-30 16:09 ` [dpdk-dev] [PATCH v5 1/5] net/i40e: initialise L3 MAP register Bernard Iremonger
2017-03-30 16:09 ` [dpdk-dev] [PATCH v5 2/5] net/i40e: add QinQ filter create function Bernard Iremonger
2017-03-31 9:43 ` Xing, Beilei
2017-03-30 16:09 ` [dpdk-dev] [PATCH v5 3/5] net/i40e: parse QinQ pattern Bernard Iremonger
2017-03-31 0:58 ` Lu, Wenzhuo
2017-03-31 8:01 ` Iremonger, Bernard
2017-03-31 8:27 ` Lu, Wenzhuo
2017-03-30 16:09 ` [dpdk-dev] [PATCH v5 4/5] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-30 16:09 ` [dpdk-dev] [PATCH v5 5/5] net/i40e: update tunnel filter restore function Bernard Iremonger
2017-03-30 16:01 ` [dpdk-dev] [PATCH v4 1/5] net/i40e: initialise L3 MAP register Bernard Iremonger
2017-03-30 16:01 ` [dpdk-dev] [PATCH v4 2/5] net/i40e: add QinQ filter create function Bernard Iremonger
2017-03-30 16:01 ` [dpdk-dev] [PATCH v4 3/5] net/i40e: parse QinQ pattern Bernard Iremonger
2017-03-30 16:01 ` [dpdk-dev] [PATCH v4 4/5] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-30 16:01 ` [dpdk-dev] [PATCH v4 5/5] net/i40e: update tunnel filter restore function Bernard Iremonger
2017-03-29 16:41 ` [dpdk-dev] [PATCH v4 1/5] net/i40e: initialise L3 MAP register Bernard Iremonger
2017-03-30 0:54 ` Lu, Wenzhuo
2017-03-29 16:41 ` [dpdk-dev] [PATCH v4 2/5] net/i40e: add QinQ filter create function Bernard Iremonger
2017-03-30 0:57 ` Lu, Wenzhuo
2017-03-29 16:41 ` [dpdk-dev] [PATCH v4 3/5] net/i40e: parse QinQ pattern Bernard Iremonger
2017-03-29 16:41 ` [dpdk-dev] [PATCH v4 4/5] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-29 16:41 ` [dpdk-dev] [PATCH v4 5/5] net/i40e: update tunnel filter restore function Bernard Iremonger
2017-03-28 16:20 ` [dpdk-dev] [PATCH v3 1/5] net/i40e: add QinQ filter create function Bernard Iremonger
2017-03-28 16:20 ` [dpdk-dev] [PATCH v3 2/5] net/i40e: parse QinQ pattern Bernard Iremonger
2017-03-29 1:25 ` Lu, Wenzhuo
2017-03-29 15:10 ` Iremonger, Bernard
2017-03-29 2:46 ` Xing, Beilei
2017-03-29 6:16 ` Xing, Beilei
2017-03-28 16:20 ` [dpdk-dev] [PATCH v3 3/5] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-28 16:20 ` [dpdk-dev] [PATCH v3 4/5] net/i40e: initialise L3 MAP register Bernard Iremonger
2017-03-29 1:24 ` Xing, Beilei
2017-03-29 8:27 ` Iremonger, Bernard
2017-03-29 1:53 ` Lu, Wenzhuo
2017-03-29 8:56 ` Iremonger, Bernard
2017-03-28 16:20 ` [dpdk-dev] [PATCH v3 5/5] net/i40e: update tunnel filter restore function Bernard Iremonger
2017-03-29 1:54 ` Lu, Wenzhuo
2017-03-23 16:38 ` [dpdk-dev] [PATCH v2 1/3] net/i40e: add QinQ wrapper function Bernard Iremonger
2017-03-28 8:11 ` Lu, Wenzhuo
2017-03-28 11:09 ` Iremonger, Bernard
2017-03-28 13:23 ` Iremonger, Bernard
2017-03-29 0:52 ` Lu, Wenzhuo
2017-03-29 9:11 ` Iremonger, Bernard
2017-03-23 16:38 ` [dpdk-dev] [PATCH v2 2/3] net/i40e: parse QinQ pattern Bernard Iremonger
2017-03-28 8:45 ` Lu, Wenzhuo
2017-03-28 11:12 ` Iremonger, Bernard
2017-03-23 16:38 ` [dpdk-dev] [PATCH v2 3/3] net/i40e: update destroy tunnel filter function Bernard Iremonger
2017-03-28 8:54 ` Lu, Wenzhuo
2017-03-28 11:13 ` Iremonger, Bernard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488552491-20432-5-git-send-email-bernard.iremonger@intel.com \
--to=bernard.iremonger@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=jingjing.wu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).