From: Wei Zhao <wei.zhao1@intel.com>
To: dev@dpdk.org
Cc: Wenzhuo Lu <wenzhuo.lu@intel.com>, Wei Zhao <wei.zhao1@intel.com>
Subject: [dpdk-dev] [PATCH v2 08/18] net/ixgbe: restore L2 tunnel filter
Date: Fri, 30 Dec 2016 15:53:00 +0800 [thread overview]
Message-ID: <1483084390-53159-9-git-send-email-wei.zhao1@intel.com> (raw)
In-Reply-To: <1483084390-53159-1-git-send-email-wei.zhao1@intel.com>
Add support for restoring L2 tunnel filter in SW.
Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 69 ++++++++++++++++++++++++++--------------
1 file changed, 46 insertions(+), 23 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 83485a2..5c39ffa 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -7279,7 +7279,8 @@ ixgbe_remove_l2_tn_filter(struct ixgbe_l2_tn_info *l2_tn_info,
/* Add l2 tunnel filter */
static int
ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,
- struct rte_eth_l2_tunnel_conf *l2_tunnel)
+ struct rte_eth_l2_tunnel_conf *l2_tunnel,
+ bool restore)
{
int ret = 0;
struct ixgbe_l2_tn_info *l2_tn_info =
@@ -7287,30 +7288,33 @@ ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,
struct ixgbe_l2_tn_key key;
struct ixgbe_l2_tn_filter *node;
- key.l2_tn_type = l2_tunnel->l2_tunnel_type;
- key.tn_id = l2_tunnel->tunnel_id;
+ if (!restore) {
+ key.l2_tn_type = l2_tunnel->l2_tunnel_type;
+ key.tn_id = l2_tunnel->tunnel_id;
- node = ixgbe_l2_tn_filter_lookup(l2_tn_info, &key);
+ node = ixgbe_l2_tn_filter_lookup(l2_tn_info, &key);
- if (node) {
- PMD_DRV_LOG(ERR, "The L2 tunnel filter already exists!");
- return -EINVAL;
- }
+ if (node) {
+ PMD_DRV_LOG(ERR,
+ "The L2 tunnel filter already exists!");
+ return -EINVAL;
+ }
- node = rte_zmalloc("ixgbe_l2_tn",
- sizeof(struct ixgbe_l2_tn_filter),
- 0);
- if (!node)
- return -ENOMEM;
+ node = rte_zmalloc("ixgbe_l2_tn",
+ sizeof(struct ixgbe_l2_tn_filter),
+ 0);
+ if (!node)
+ return -ENOMEM;
- (void)rte_memcpy(&node->key,
- &key,
- sizeof(struct ixgbe_l2_tn_key));
- node->pool = l2_tunnel->pool;
- ret = ixgbe_insert_l2_tn_filter(l2_tn_info, node);
- if (ret < 0) {
- rte_free(node);
- return ret;
+ (void)rte_memcpy(&node->key,
+ &key,
+ sizeof(struct ixgbe_l2_tn_key));
+ node->pool = l2_tunnel->pool;
+ ret = ixgbe_insert_l2_tn_filter(l2_tn_info, node);
+ if (ret < 0) {
+ rte_free(node);
+ return ret;
+ }
}
switch (l2_tunnel->l2_tunnel_type) {
@@ -7323,7 +7327,7 @@ ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,
break;
}
- if (ret < 0)
+ if ((!restore) && (ret < 0))
(void)ixgbe_remove_l2_tn_filter(l2_tn_info, &key);
return ret;
@@ -7384,7 +7388,8 @@ ixgbe_dev_l2_tunnel_filter_handle(struct rte_eth_dev *dev,
case RTE_ETH_FILTER_ADD:
ret = ixgbe_dev_l2_tunnel_filter_add
(dev,
- (struct rte_eth_l2_tunnel_conf *)arg);
+ (struct rte_eth_l2_tunnel_conf *)arg,
+ FALSE);
break;
case RTE_ETH_FILTER_DELETE:
ret = ixgbe_dev_l2_tunnel_filter_del
@@ -7916,6 +7921,23 @@ ixgbe_syn_filter_restore(struct rte_eth_dev *dev)
}
}
+/* restore L2 tunnel filter */
+static inline void
+ixgbe_l2_tn_filter_restore(struct rte_eth_dev *dev)
+{
+ struct ixgbe_l2_tn_info *l2_tn_info =
+ IXGBE_DEV_PRIVATE_TO_L2_TN_INFO(dev->data->dev_private);
+ struct ixgbe_l2_tn_filter *node;
+ struct rte_eth_l2_tunnel_conf l2_tn_conf;
+
+ TAILQ_FOREACH(node, &l2_tn_info->l2_tn_list, entries) {
+ l2_tn_conf.l2_tunnel_type = node->key.l2_tn_type;
+ l2_tn_conf.tunnel_id = node->key.tn_id;
+ l2_tn_conf.pool = node->pool;
+ (void)ixgbe_dev_l2_tunnel_filter_add(dev, &l2_tn_conf, TRUE);
+ }
+}
+
static int
ixgbe_filter_restore(struct rte_eth_dev *dev)
{
@@ -7923,6 +7945,7 @@ ixgbe_filter_restore(struct rte_eth_dev *dev)
ixgbe_ethertype_filter_restore(dev);
ixgbe_syn_filter_restore(dev);
ixgbe_fdir_filter_restore(dev);
+ ixgbe_l2_tn_filter_restore(dev);
return 0;
}
--
2.5.5
next prev parent reply other threads:[~2016-12-30 7:58 UTC|newest]
Thread overview: 149+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-30 7:52 [dpdk-dev] [PATCH v2 00/18] net/ixgbe: Consistent filter API Wei Zhao
2016-12-30 7:52 ` [dpdk-dev] [PATCH v2 01/18] net/ixgbe: store SYN filter Wei Zhao
2017-01-03 14:33 ` Dai, Wei
2017-01-04 1:46 ` Zhao1, Wei
2017-01-06 16:28 ` Ferruh Yigit
2017-01-10 5:33 ` Zhao1, Wei
2017-01-12 8:12 ` [dpdk-dev] [PATCH v3 00/18] net/ixgbe: Consistent filter API Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 01/18] net/ixgbe: store TCP SYN filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 02/18] net/ixgbe: store flow director filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 03/18] net/ixgbe: store L2 tunnel filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 04/18] net/ixgbe: restore n-tuple filter Add support for restoring n-tuple filter in SW Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 4/9] " Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 05/18] net/ixgbe: restore ether type filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 06/18] net/ixgbe: restore TCP SYN filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 07/18] net/ixgbe: restore flow director filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 08/18] net/ixgbe: restore L2 tunnel filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 09/18] net/ixgbe: store and restore L2 tunnel configuration Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 10/18] net/ixgbe: flush all the filters Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 11/18] net/ixgbe: parse n-tuple filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 12/18] net/ixgbe: parse ethertype filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 13/18] net/ixgbe: parse TCP SYN filter check if the rule is a TCP SYN rule, and get the SYN info Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 14/18] net/ixgbe: parse L2 tunnel filter check if the rule is a L2 tunnel rule, and get the L2 tunnel info Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 15/18] net/ixgbe: parse flow director filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 16/18] net/ixgbe: create consistent filter Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 17/18] net/ixgbe: destroy " Wei Zhao
2017-01-12 8:13 ` [dpdk-dev] [PATCH v3 18/18] net/ixgbe: flush all the filter list Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 00/18] net/ixgbe: Consistent filter API Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 01/18] net/ixgbe: store TCP SYN filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 02/18] net/ixgbe: store flow director filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 03/18] net/ixgbe: store L2 tunnel filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 04/18] net/ixgbe: restore n-tuple filter Add support for restoring n-tuple filter in SW Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 05/18] net/ixgbe: restore ether type filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 06/18] net/ixgbe: restore TCP SYN filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 07/18] net/ixgbe: restore flow director filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 08/18] net/ixgbe: restore L2 tunnel filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 09/18] net/ixgbe: store and restore L2 tunnel configuration Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 10/18] net/ixgbe: flush all the filters Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 11/18] net/ixgbe: parse n-tuple filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 12/18] net/ixgbe: parse ethertype filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 13/18] net/ixgbe: parse TCP SYN filter check if the rule is a TCP SYN rule, and get the SYN info Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 14/18] net/ixgbe: parse L2 tunnel filter check if the rule is a L2 tunnel rule, and get the L2 tunnel info Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 15/18] net/ixgbe: parse flow director filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 16/18] net/ixgbe: create consistent filter Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 17/18] net/ixgbe: destroy " Wei Zhao
2017-01-12 8:40 ` [dpdk-dev] [PATCH v4 18/18] net/ixgbe: flush all the filter list Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 00/18] net/ixgbe: Consistent filter API Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 01/18] net/ixgbe: store TCP SYN filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 02/18] net/ixgbe: store flow director filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 03/18] net/ixgbe: store L2 tunnel filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 04/18] net/ixgbe: restore n-tuple filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 05/18] net/ixgbe: restore ether type filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 06/18] net/ixgbe: restore TCP SYN filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 07/18] net/ixgbe: restore flow director filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 08/18] net/ixgbe: restore L2 tunnel filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 09/18] net/ixgbe: store and restore L2 tunnel configuration Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 10/18] net/ixgbe: flush all the filters Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 11/18] net/ixgbe: parse n-tuple filter Wei Zhao
2017-01-12 15:40 ` Ferruh Yigit
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 12/18] net/ixgbe: parse ethertype filter Wei Zhao
2017-01-12 15:39 ` Ferruh Yigit
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 13/18] net/ixgbe: parse TCP SYN filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 14/18] net/ixgbe: parse L2 tunnel filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 15/18] net/ixgbe: parse flow director filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 16/18] net/ixgbe: create consistent filter Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 17/18] net/ixgbe: destroy " Wei Zhao
2017-01-12 9:17 ` [dpdk-dev] [PATCH v5 18/18] net/ixgbe: flush all the filter list Wei Zhao
2017-01-12 11:38 ` [dpdk-dev] [PATCH v5 00/18] net/ixgbe: Consistent filter API Xing, Beilei
2017-01-13 6:27 ` Dai, Wei
2017-01-12 15:43 ` Ferruh Yigit
2017-01-13 8:12 ` [dpdk-dev] [PATCH v6 " Wei Zhao
2017-01-13 8:12 ` [dpdk-dev] [PATCH v6 01/18] net/ixgbe: store TCP SYN filter Wei Zhao
2017-01-13 8:12 ` [dpdk-dev] [PATCH v6 02/18] net/ixgbe: store flow director filter Wei Zhao
2017-01-13 8:12 ` [dpdk-dev] [PATCH v6 03/18] net/ixgbe: store L2 tunnel filter Wei Zhao
2017-01-13 8:12 ` [dpdk-dev] [PATCH v6 04/18] net/ixgbe: restore n-tuple filter Wei Zhao
2017-01-13 8:12 ` [dpdk-dev] [PATCH v6 05/18] net/ixgbe: restore ether type filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 06/18] net/ixgbe: restore TCP SYN filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 07/18] net/ixgbe: restore flow director filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 08/18] net/ixgbe: restore L2 tunnel filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 09/18] net/ixgbe: store and restore L2 tunnel configuration Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 10/18] net/ixgbe: flush all the filters Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 11/18] net/ixgbe: parse n-tuple filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 12/18] net/ixgbe: parse ethertype filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 13/18] net/ixgbe: parse TCP SYN filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 14/18] net/ixgbe: parse L2 tunnel filter Wei Zhao
2017-01-13 11:18 ` Ferruh Yigit
2017-01-16 13:03 ` Adrien Mazarguil
2017-01-16 16:39 ` Ferruh Yigit
2017-01-16 18:26 ` Adrien Mazarguil
2017-01-17 9:27 ` Zhao1, Wei
2017-01-17 10:03 ` Ferruh Yigit
2017-01-18 1:59 ` Zhao1, Wei
2017-01-18 17:49 ` Ferruh Yigit
2017-01-25 12:17 ` Ferruh Yigit
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 15/18] net/ixgbe: parse flow director filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 16/18] net/ixgbe: create consistent filter Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 17/18] net/ixgbe: destroy " Wei Zhao
2017-01-13 8:13 ` [dpdk-dev] [PATCH v6 18/18] net/ixgbe: flush all the filter list Wei Zhao
2017-01-13 15:54 ` [dpdk-dev] [PATCH v6 00/18] net/ixgbe: Consistent filter API Ferruh Yigit
2017-01-15 2:44 ` Lu, Wenzhuo
2017-01-18 11:04 ` Thomas Monjalon
2016-12-30 7:52 ` [dpdk-dev] [PATCH v2 02/18] net/ixgbe: store flow director filter Wei Zhao
2017-01-02 9:59 ` Xing, Beilei
2017-01-03 3:14 ` Zhao1, Wei
2017-01-03 14:28 ` Dai, Wei
2017-01-04 2:03 ` Zhao1, Wei
2017-01-06 16:31 ` Ferruh Yigit
2017-01-10 5:30 ` Zhao1, Wei
2016-12-30 7:52 ` [dpdk-dev] [PATCH v2 03/18] net/ixgbe: store L2 tunnel filter Wei Zhao
2017-01-02 10:06 ` Xing, Beilei
2016-12-30 7:52 ` [dpdk-dev] [PATCH v2 04/18] net/ixgbe: restore n-tuple filter Wei Zhao
2016-12-30 7:52 ` [dpdk-dev] [PATCH v2 05/18] net/ixgbe: restore ether type filter Wei Zhao
2016-12-30 7:52 ` [dpdk-dev] [PATCH v2 06/18] net/ixgbe: restore TCP SYN filter Wei Zhao
2016-12-30 7:52 ` [dpdk-dev] [PATCH v2 07/18] net/ixgbe: restore flow director filter Wei Zhao
2016-12-30 7:53 ` Wei Zhao [this message]
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 09/18] net/ixgbe: store and restore L2 tunnel configuration Wei Zhao
2017-01-02 10:18 ` Xing, Beilei
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 10/18] net/ixgbe: flush all the filters Wei Zhao
2017-01-06 16:40 ` Ferruh Yigit
2017-01-11 7:51 ` Zhao1, Wei
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 11/18] net/ixgbe: parse n-tuple filter Wei Zhao
2017-01-02 10:41 ` Xing, Beilei
2017-01-02 10:45 ` Xing, Beilei
2017-01-06 16:55 ` Ferruh Yigit
2017-01-11 8:27 ` Zhao1, Wei
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 12/18] net/ixgbe: parse ethertype filter Wei Zhao
2017-01-06 17:11 ` Ferruh Yigit
2017-01-11 8:54 ` Zhao1, Wei
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 13/18] net/ixgbe: parse TCP SYN filter Wei Zhao
2017-01-06 17:19 ` Ferruh Yigit
2017-01-10 5:46 ` Zhao1, Wei
2017-01-11 9:11 ` Zhao1, Wei
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 14/18] net/ixgbe: parse L2 tunnel filter Wei Zhao
2017-01-03 14:07 ` Adrien Mazarguil
2017-01-05 3:12 ` Zhao1, Wei
2017-01-05 8:52 ` Adrien Mazarguil
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 15/18] net/ixgbe: parse flow director filter Wei Zhao
2017-01-02 15:24 ` Xing, Beilei
2017-01-03 3:05 ` Zhao1, Wei
2017-01-03 3:19 ` Zhao1, Wei
2017-01-03 14:08 ` Adrien Mazarguil
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 16/18] net/ixgbe: create consistent filter Wei Zhao
2017-01-03 2:04 ` Xing, Beilei
2017-01-03 3:11 ` Zhao1, Wei
[not found] ` <94479800C636CB44BD422CB454846E013158D036@SHSMSX101.ccr.corp.intel.com>
2017-01-03 3:09 ` Zhao1, Wei
2017-01-03 5:24 ` Xing, Beilei
2017-01-06 17:26 ` Ferruh Yigit
2017-01-10 5:50 ` Zhao1, Wei
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 17/18] net/ixgbe: destroy " Wei Zhao
2016-12-30 7:53 ` [dpdk-dev] [PATCH v2 18/18] net/ixgbe: flush all the filter list Wei Zhao
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=1483084390-53159-9-git-send-email-wei.zhao1@intel.com \
--to=wei.zhao1@intel.com \
--cc=dev@dpdk.org \
--cc=wenzhuo.lu@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).