From: Wei Zhao <wei.zhao1@intel.com>
To: dev@dpdk.org
Cc: wenzhuo.lu@intel.com, Wei Zhao <wei.zhao1@intel.com>
Subject: [PATCH v3 04/11] net/e1000: restore flex type filter
Date: Fri, 9 Jun 2017 11:11:41 +0800 [thread overview]
Message-ID: <1496977908-2149-5-git-send-email-wei.zhao1@intel.com> (raw)
In-Reply-To: <1496977908-2149-1-git-send-email-wei.zhao1@intel.com>
Add support for restoring flex type filter in SW.
Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
---
drivers/net/e1000/igb_ethdev.c | 189 ++++++++++++++++++++++++++---------------
1 file changed, 122 insertions(+), 67 deletions(-)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 9d8e4bf..7f12f06 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -781,6 +781,22 @@ static int igb_ntuple_filter_uninit(struct rte_eth_dev *eth_dev)
return 0;
}
+/* Remove all flex filters of the device */
+static int igb_flex_filter_uninit(struct rte_eth_dev *eth_dev)
+{
+ struct e1000_filter_info *filter_info =
+ E1000_DEV_PRIVATE_TO_FILTER_INFO(eth_dev->data->dev_private);
+ struct e1000_flex_filter *p_flex;
+
+ while ((p_flex = TAILQ_FIRST(&filter_info->flex_list))) {
+ TAILQ_REMOVE(&filter_info->flex_list, p_flex, entries);
+ rte_free(p_flex);
+ }
+ filter_info->flex_mask = 0;
+
+ return 0;
+}
+
static int
eth_igb_dev_init(struct rte_eth_dev *eth_dev)
{
@@ -999,6 +1015,9 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev)
/* remove all ntuple filters of the device */
igb_ntuple_filter_uninit(eth_dev);
+ /* remove all flex filters of the device */
+ igb_flex_filter_uninit(eth_dev);
+
return 0;
}
@@ -1501,11 +1520,8 @@ static void
eth_igb_stop(struct rte_eth_dev *dev)
{
struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- struct e1000_filter_info *filter_info =
- E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
struct rte_eth_link link;
- struct e1000_flex_filter *p_flex;
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
igb_intr_disable(hw);
@@ -1534,13 +1550,6 @@ eth_igb_stop(struct rte_eth_dev *dev)
memset(&link, 0, sizeof(link));
rte_igb_dev_atomic_write_link_status(dev, &link);
- /* Remove all flex filters of the device */
- while ((p_flex = TAILQ_FIRST(&filter_info->flex_list))) {
- TAILQ_REMOVE(&filter_info->flex_list, p_flex, entries);
- rte_free(p_flex);
- }
- filter_info->flex_mask = 0;
-
if (!rte_intr_allow_others(intr_handle))
/* resume to the default handler */
rte_intr_callback_register(intr_handle,
@@ -3905,6 +3914,45 @@ igb_remove_2tuple_filter(struct rte_eth_dev *dev,
return 0;
}
+/* inject a igb flex filter to HW */
+static inline void
+igb_inject_flex_filter(struct rte_eth_dev *dev,
+ struct e1000_flex_filter *filter)
+{
+ struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ uint32_t wufc, queueing;
+ uint32_t reg_off;
+ uint8_t i, j = 0;
+
+ wufc = E1000_READ_REG(hw, E1000_WUFC);
+ if (filter->index < E1000_MAX_FHFT)
+ reg_off = E1000_FHFT(filter->index);
+ else
+ reg_off = E1000_FHFT_EXT(filter->index - E1000_MAX_FHFT);
+
+ E1000_WRITE_REG(hw, E1000_WUFC, wufc | E1000_WUFC_FLEX_HQ |
+ (E1000_WUFC_FLX0 << filter->index));
+ queueing = filter->filter_info.len |
+ (filter->queue << E1000_FHFT_QUEUEING_QUEUE_SHIFT) |
+ (filter->filter_info.priority <<
+ E1000_FHFT_QUEUEING_PRIO_SHIFT);
+ E1000_WRITE_REG(hw, reg_off + E1000_FHFT_QUEUEING_OFFSET,
+ queueing);
+
+ for (i = 0; i < E1000_FLEX_FILTERS_MASK_SIZE; i++) {
+ E1000_WRITE_REG(hw, reg_off,
+ filter->filter_info.dwords[j]);
+ reg_off += sizeof(uint32_t);
+ E1000_WRITE_REG(hw, reg_off,
+ filter->filter_info.dwords[++j]);
+ reg_off += sizeof(uint32_t);
+ E1000_WRITE_REG(hw, reg_off,
+ (uint32_t)filter->filter_info.mask[i]);
+ reg_off += sizeof(uint32_t) * 2;
+ ++j;
+ }
+}
+
static inline struct e1000_flex_filter *
eth_igb_flex_filter_lookup(struct e1000_flex_filter_list *filter_list,
struct e1000_flex_filter_info *key)
@@ -3920,18 +3968,48 @@ eth_igb_flex_filter_lookup(struct e1000_flex_filter_list *filter_list,
return NULL;
}
-static int
+/* remove a flex byte filter
+ * @param
+ * dev: Pointer to struct rte_eth_dev.
+ * filter: the pointer of the filter will be removed.
+ */
+static void
+igb_remove_flex_filter(struct rte_eth_dev *dev,
+ struct e1000_flex_filter *filter)
+{
+ struct e1000_filter_info *filter_info =
+ E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
+ struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ uint32_t wufc, i;
+ uint32_t reg_off;
+
+ wufc = E1000_READ_REG(hw, E1000_WUFC);
+ if (filter->index < E1000_MAX_FHFT)
+ reg_off = E1000_FHFT(filter->index);
+ else
+ reg_off = E1000_FHFT_EXT(filter->index - E1000_MAX_FHFT);
+
+ for (i = 0; i < E1000_FHFT_SIZE_IN_DWD; i++)
+ E1000_WRITE_REG(hw, reg_off + i * sizeof(uint32_t), 0);
+
+ E1000_WRITE_REG(hw, E1000_WUFC, wufc &
+ (~(E1000_WUFC_FLX0 << filter->index)));
+
+ filter_info->flex_mask &= ~(1 << filter->index);
+ TAILQ_REMOVE(&filter_info->flex_list, filter, entries);
+ rte_free(filter);
+}
+
+int
eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
struct rte_eth_flex_filter *filter,
bool add)
{
- struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct e1000_filter_info *filter_info =
E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
struct e1000_flex_filter *flex_filter, *it;
- uint32_t wufc, queueing, mask;
- uint32_t reg_off;
- uint8_t shift, i, j = 0;
+ uint32_t mask;
+ uint8_t shift, i;
flex_filter = rte_zmalloc("e1000_flex_filter",
sizeof(struct e1000_flex_filter), 0);
@@ -3951,15 +4029,20 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
flex_filter->filter_info.mask[i] = mask;
}
- wufc = E1000_READ_REG(hw, E1000_WUFC);
+ it = eth_igb_flex_filter_lookup(&filter_info->flex_list,
+ &flex_filter->filter_info);
+ if (it == NULL && !add) {
+ PMD_DRV_LOG(ERR, "filter doesn't exist.");
+ rte_free(flex_filter);
+ return -ENOENT;
+ }
+ if (it != NULL && add) {
+ PMD_DRV_LOG(ERR, "filter exists.");
+ rte_free(flex_filter);
+ return -EEXIST;
+ }
if (add) {
- if (eth_igb_flex_filter_lookup(&filter_info->flex_list,
- &flex_filter->filter_info) != NULL) {
- PMD_DRV_LOG(ERR, "filter exists.");
- rte_free(flex_filter);
- return -EEXIST;
- }
flex_filter->queue = filter->queue;
/*
* look for an unused flex filter index
@@ -3981,52 +4064,10 @@ eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
return -ENOSYS;
}
- if (flex_filter->index < E1000_MAX_FHFT)
- reg_off = E1000_FHFT(flex_filter->index);
- else
- reg_off = E1000_FHFT_EXT(flex_filter->index - E1000_MAX_FHFT);
-
- E1000_WRITE_REG(hw, E1000_WUFC, wufc | E1000_WUFC_FLEX_HQ |
- (E1000_WUFC_FLX0 << flex_filter->index));
- queueing = filter->len |
- (filter->queue << E1000_FHFT_QUEUEING_QUEUE_SHIFT) |
- (filter->priority << E1000_FHFT_QUEUEING_PRIO_SHIFT);
- E1000_WRITE_REG(hw, reg_off + E1000_FHFT_QUEUEING_OFFSET,
- queueing);
- for (i = 0; i < E1000_FLEX_FILTERS_MASK_SIZE; i++) {
- E1000_WRITE_REG(hw, reg_off,
- flex_filter->filter_info.dwords[j]);
- reg_off += sizeof(uint32_t);
- E1000_WRITE_REG(hw, reg_off,
- flex_filter->filter_info.dwords[++j]);
- reg_off += sizeof(uint32_t);
- E1000_WRITE_REG(hw, reg_off,
- (uint32_t)flex_filter->filter_info.mask[i]);
- reg_off += sizeof(uint32_t) * 2;
- ++j;
- }
- } else {
- it = eth_igb_flex_filter_lookup(&filter_info->flex_list,
- &flex_filter->filter_info);
- if (it == NULL) {
- PMD_DRV_LOG(ERR, "filter doesn't exist.");
- rte_free(flex_filter);
- return -ENOENT;
- }
+ igb_inject_flex_filter(dev, flex_filter);
- if (it->index < E1000_MAX_FHFT)
- reg_off = E1000_FHFT(it->index);
- else
- reg_off = E1000_FHFT_EXT(it->index - E1000_MAX_FHFT);
-
- for (i = 0; i < E1000_FHFT_SIZE_IN_DWD; i++)
- E1000_WRITE_REG(hw, reg_off + i * sizeof(uint32_t), 0);
- E1000_WRITE_REG(hw, E1000_WUFC, wufc &
- (~(E1000_WUFC_FLX0 << it->index)));
-
- filter_info->flex_mask &= ~(1 << it->index);
- TAILQ_REMOVE(&filter_info->flex_list, it, entries);
- rte_free(it);
+ } else {
+ igb_remove_flex_filter(dev, it);
rte_free(flex_filter);
}
@@ -5528,6 +5569,19 @@ igb_ethertype_filter_restore(struct rte_eth_dev *dev)
}
}
+/* restore flex byte filter */
+static inline void
+igb_flex_filter_restore(struct rte_eth_dev *dev)
+{
+ struct e1000_filter_info *filter_info =
+ E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
+ struct e1000_flex_filter *flex_filter;
+
+ TAILQ_FOREACH(flex_filter, &filter_info->flex_list, entries) {
+ igb_inject_flex_filter(dev, flex_filter);
+ }
+}
+
/* restore all types filter */
static int
igb_filter_restore(struct rte_eth_dev *dev)
@@ -5535,6 +5589,7 @@ igb_filter_restore(struct rte_eth_dev *dev)
igb_ntuple_filter_restore(dev);
igb_ethertype_filter_restore(dev);
igb_syn_filter_restore(dev);
+ igb_flex_filter_restore(dev);
return 0;
}
--
2.9.3
next prev parent reply other threads:[~2017-06-09 3:21 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 7:12 [PATCH 00/11] net/e1000: Consistent filter API Wei Zhao
2017-05-23 7:12 ` [PATCH 01/11] net/e1000: store and restore TCP SYN filter Wei Zhao
2017-05-23 7:12 ` [PATCH 02/11] net/e1000: restore n-tuple filter Wei Zhao
2017-05-23 7:12 ` [PATCH 03/11] net/e1000: restore ether type filter Wei Zhao
2017-05-23 7:12 ` [PATCH 04/11] net/e1000: restore flex " Wei Zhao
2017-05-23 7:12 ` [PATCH 05/11] net/e1000: parse n-tuple filter Wei Zhao
2017-05-23 7:12 ` [PATCH 06/11] net/e1000: parse ethertype filter Wei Zhao
2017-05-23 7:12 ` [PATCH 07/11] net/e1000: parse TCP SYN filter Wei Zhao
2017-05-23 7:12 ` [PATCH 08/11] net/e1000: parse flex filter Wei Zhao
2017-05-23 7:12 ` [PATCH 09/11] net/e1000: create consistent filter Wei Zhao
2017-05-23 7:13 ` [PATCH 10/11] net/e1000: destroy " Wei Zhao
2017-05-23 7:13 ` [PATCH 11/11] net/e1000: flush all the filter Wei Zhao
2017-05-29 11:01 ` [PATCH 00/11] net/e1000: Consistent filter API Ferruh Yigit
2017-05-31 3:17 ` Zhao1, Wei
2017-06-02 6:36 ` Wei Zhao
2017-06-02 6:36 ` [PATCH v2 01/11] net/e1000: store and restore TCP SYN filter Wei Zhao
2017-06-02 7:51 ` Lu, Wenzhuo
2017-06-02 6:36 ` [PATCH v2 02/11] net/e1000: restore n-tuple filter Wei Zhao
2017-06-02 7:56 ` Lu, Wenzhuo
2017-06-02 8:00 ` Zhao1, Wei
2017-06-02 6:36 ` [PATCH v2 03/11] net/e1000: restore ether type filter Wei Zhao
2017-06-02 8:08 ` Lu, Wenzhuo
2017-06-02 6:36 ` [PATCH v2 04/11] net/e1000: restore flex " Wei Zhao
2017-06-02 8:17 ` Lu, Wenzhuo
2017-06-02 6:36 ` [PATCH v2 05/11] net/e1000: parse n-tuple filter Wei Zhao
2017-06-05 1:21 ` Lu, Wenzhuo
2017-06-05 1:55 ` Zhao1, Wei
2017-06-05 2:36 ` Lu, Wenzhuo
2017-06-05 2:39 ` Zhao1, Wei
2017-06-02 6:36 ` [PATCH v2 06/11] net/e1000: parse ethertype filter Wei Zhao
2017-06-05 3:13 ` Lu, Wenzhuo
2017-06-05 3:26 ` Zhao1, Wei
2017-06-02 6:36 ` [PATCH v2 07/11] net/e1000: parse TCP SYN filter Wei Zhao
2017-06-05 3:16 ` Lu, Wenzhuo
2017-06-02 6:36 ` [PATCH v2 08/11] net/e1000: parse flex filter Wei Zhao
2017-06-05 3:38 ` Lu, Wenzhuo
2017-06-05 3:41 ` Zhao1, Wei
2017-06-02 6:36 ` [PATCH v2 09/11] net/e1000: create consistent filter Wei Zhao
2017-06-05 5:14 ` Lu, Wenzhuo
2017-06-02 6:36 ` [PATCH v2 10/11] net/e1000: destroy " Wei Zhao
2017-06-05 5:41 ` Lu, Wenzhuo
2017-06-05 6:00 ` Zhao1, Wei
2017-06-05 6:08 ` Lu, Wenzhuo
2017-06-02 6:36 ` [PATCH v2 11/11] net/e1000: flush all the filter Wei Zhao
2017-06-05 6:09 ` Lu, Wenzhuo
2017-06-09 3:11 ` [PATCH 00/11] net/e1000: Consistent filter API Wei Zhao
2017-06-09 3:11 ` [PATCH v3 01/11] net/e1000: store and restore TCP SYN filter Wei Zhao
2017-06-09 3:11 ` [PATCH v3 02/11] net/e1000: restore n-tuple filter Wei Zhao
2017-06-09 3:11 ` [PATCH v3 03/11] net/e1000: restore ether type filter Wei Zhao
2017-06-09 3:11 ` Wei Zhao [this message]
2017-06-09 3:11 ` [PATCH v3 05/11] net/e1000: parse n-tuple filter Wei Zhao
2017-06-09 12:29 ` Ferruh Yigit
2017-06-12 7:47 ` Zhao1, Wei
2017-06-09 3:11 ` [PATCH v3 06/11] net/e1000: parse ethertype filter Wei Zhao
2017-06-09 3:11 ` [PATCH v3 07/11] net/e1000: parse TCP SYN filter Wei Zhao
2017-06-09 3:11 ` [PATCH v3 08/11] net/e1000: parse flex filter Wei Zhao
2017-06-09 12:23 ` Ferruh Yigit
2017-06-12 3:25 ` Zhao1, Wei
2017-06-09 3:11 ` [PATCH v3 09/11] net/e1000: create consistent filter Wei Zhao
2017-06-09 3:11 ` [PATCH v3 10/11] net/e1000: destroy " Wei Zhao
2017-06-09 3:11 ` [PATCH v3 11/11] net/e1000: flush all the filter Wei Zhao
2017-06-12 6:30 ` [PATCH 00/11] net/e1000: Consistent filter API Wei Zhao
2017-06-12 6:30 ` [PATCH v4] net/e1000: parse n-tuple filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 01/11] net/e1000: store and restore TCP SYN filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 02/11] net/e1000: restore n-tuple filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 03/11] net/e1000: restore ether type filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 04/11] net/e1000: restore flex " Wei Zhao
2017-06-12 6:30 ` [PATCH v4 05/11] net/e1000: parse n-tuple filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 06/11] net/e1000: parse ethertype filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 07/11] net/e1000: parse TCP SYN filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 08/11] net/e1000: parse flex filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 09/11] net/e1000: create consistent filter Wei Zhao
2017-06-12 6:30 ` [PATCH v4 10/11] net/e1000: destroy " Wei Zhao
2017-06-12 6:30 ` [PATCH v4 11/11] net/e1000: flush all the filter Wei Zhao
2017-06-12 6:48 ` [PATCH 00/11] net/e1000: Consistent filter API Wei Zhao
2017-06-12 6:48 ` [PATCH v5 01/11] net/e1000: store and restore TCP SYN filter Wei Zhao
2017-06-12 10:45 ` Ferruh Yigit
2017-06-14 8:59 ` Zhao1, Wei
2017-06-12 6:48 ` [PATCH v5 02/11] net/e1000: restore n-tuple filter Wei Zhao
2017-06-12 6:48 ` [PATCH v5 03/11] net/e1000: restore ether type filter Wei Zhao
2017-06-12 6:48 ` [PATCH v5 04/11] net/e1000: restore flex " Wei Zhao
2017-06-12 6:48 ` [PATCH v5 05/11] net/e1000: parse n-tuple filter Wei Zhao
2017-06-12 6:48 ` [PATCH v5 06/11] net/e1000: parse ethertype filter Wei Zhao
2017-06-12 6:48 ` [PATCH v5 07/11] net/e1000: parse TCP SYN filter Wei Zhao
2017-06-12 6:48 ` [PATCH v5 08/11] net/e1000: parse flex filter Wei Zhao
2017-06-12 6:48 ` [PATCH v5 09/11] net/e1000: create consistent filter Wei Zhao
2017-06-12 6:48 ` [PATCH v5 10/11] net/e1000: destroy " Wei Zhao
2017-06-12 6:48 ` [PATCH v5 11/11] net/e1000: flush all the filter Wei Zhao
2017-06-12 10:47 ` [PATCH 00/11] net/e1000: Consistent filter API Ferruh Yigit
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=1496977908-2149-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.