tailq: remove unneeded inclusions
[dpdk.git] / lib / librte_pmd_e1000 / igb_ethdev.c
index 873d65e..49843c1 100644 (file)
@@ -47,7 +47,6 @@
 #include <rte_ethdev.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_atomic.h>
 #include <rte_malloc.h>
@@ -149,43 +148,51 @@ static int eth_igb_rss_reta_update(struct rte_eth_dev *dev,
 static int eth_igb_rss_reta_query(struct rte_eth_dev *dev,
                                  struct rte_eth_rss_reta_entry64 *reta_conf,
                                  uint16_t reta_size);
-static int eth_igb_add_syn_filter(struct rte_eth_dev *dev,
-                       struct rte_syn_filter *filter, uint16_t rx_queue);
-static int eth_igb_remove_syn_filter(struct rte_eth_dev *dev);
-static int eth_igb_get_syn_filter(struct rte_eth_dev *dev,
-                       struct rte_syn_filter *filter, uint16_t *rx_queue);
-static int eth_igb_add_ethertype_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_ethertype_filter *filter, uint16_t rx_queue);
-static int eth_igb_remove_ethertype_filter(struct rte_eth_dev *dev,
-                       uint16_t index);
-static int eth_igb_get_ethertype_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_ethertype_filter *filter, uint16_t *rx_queue);
-static int eth_igb_add_2tuple_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_2tuple_filter *filter, uint16_t rx_queue);
-static int eth_igb_remove_2tuple_filter(struct rte_eth_dev *dev,
-                       uint16_t index);
-static int eth_igb_get_2tuple_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_2tuple_filter *filter, uint16_t *rx_queue);
-static int eth_igb_add_flex_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_flex_filter *filter, uint16_t rx_queue);
-static int eth_igb_remove_flex_filter(struct rte_eth_dev *dev,
-                       uint16_t index);
+
+static int eth_igb_syn_filter_set(struct rte_eth_dev *dev,
+                       struct rte_eth_syn_filter *filter,
+                       bool add);
+static int eth_igb_syn_filter_get(struct rte_eth_dev *dev,
+                       struct rte_eth_syn_filter *filter);
+static int eth_igb_syn_filter_handle(struct rte_eth_dev *dev,
+                       enum rte_filter_op filter_op,
+                       void *arg);
+static int igb_add_2tuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter);
+static int igb_remove_2tuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter);
+static int eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_flex_filter *filter,
+                       bool add);
 static int eth_igb_get_flex_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_flex_filter *filter, uint16_t *rx_queue);
-static int eth_igb_add_5tuple_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_5tuple_filter *filter, uint16_t rx_queue);
-static int eth_igb_remove_5tuple_filter(struct rte_eth_dev *dev,
-                       uint16_t index);
-static int eth_igb_get_5tuple_filter(struct rte_eth_dev *dev,
-                       uint16_t index,
-                       struct rte_5tuple_filter *filter, uint16_t *rx_queue);
+                       struct rte_eth_flex_filter *filter);
+static int eth_igb_flex_filter_handle(struct rte_eth_dev *dev,
+                       enum rte_filter_op filter_op,
+                       void *arg);
+static int igb_add_5tuple_filter_82576(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter);
+static int igb_remove_5tuple_filter_82576(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter);
+static int igb_add_del_ntuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *filter,
+                       bool add);
+static int igb_get_ntuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *filter);
+static int igb_ntuple_filter_handle(struct rte_eth_dev *dev,
+                               enum rte_filter_op filter_op,
+                               void *arg);
+static int igb_add_del_ethertype_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ethertype_filter *filter,
+                       bool add);
+static int igb_ethertype_filter_handle(struct rte_eth_dev *dev,
+                               enum rte_filter_op filter_op,
+                               void *arg);
+static int igb_get_ethertype_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ethertype_filter *filter);
+static int eth_igb_filter_ctrl(struct rte_eth_dev *dev,
+                    enum rte_filter_type filter_type,
+                    enum rte_filter_op filter_op,
+                    void *arg);
 
 /*
  * Define VF Stats MACRO for Non "cleared on read" register
@@ -261,21 +268,7 @@ static struct eth_dev_ops eth_igb_ops = {
        .reta_query           = eth_igb_rss_reta_query,
        .rss_hash_update      = eth_igb_rss_hash_update,
        .rss_hash_conf_get    = eth_igb_rss_hash_conf_get,
-       .add_syn_filter          = eth_igb_add_syn_filter,
-       .remove_syn_filter       = eth_igb_remove_syn_filter,
-       .get_syn_filter          = eth_igb_get_syn_filter,
-       .add_ethertype_filter    = eth_igb_add_ethertype_filter,
-       .remove_ethertype_filter = eth_igb_remove_ethertype_filter,
-       .get_ethertype_filter    = eth_igb_get_ethertype_filter,
-       .add_2tuple_filter       = eth_igb_add_2tuple_filter,
-       .remove_2tuple_filter    = eth_igb_remove_2tuple_filter,
-       .get_2tuple_filter       = eth_igb_get_2tuple_filter,
-       .add_flex_filter         = eth_igb_add_flex_filter,
-       .remove_flex_filter      = eth_igb_remove_flex_filter,
-       .get_flex_filter         = eth_igb_get_flex_filter,
-       .add_5tuple_filter       = eth_igb_add_5tuple_filter,
-       .remove_5tuple_filter    = eth_igb_remove_5tuple_filter,
-       .get_5tuple_filter       = eth_igb_get_5tuple_filter,
+       .filter_ctrl          = eth_igb_filter_ctrl,
 };
 
 /*
@@ -459,8 +452,7 @@ igb_reset_swfw_lock(struct e1000_hw *hw)
 }
 
 static int
-eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
-                  struct rte_eth_dev *eth_dev)
+eth_igb_dev_init(struct rte_eth_dev *eth_dev)
 {
        int error = 0;
        struct rte_pci_device *pci_dev;
@@ -468,6 +460,8 @@ eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
                E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
        struct e1000_vfta * shadow_vfta =
                        E1000_DEV_PRIVATE_TO_VFTA(eth_dev->data->dev_private);
+       struct e1000_filter_info *filter_info =
+               E1000_DEV_PRIVATE_TO_FILTER_INFO(eth_dev->data->dev_private);
        uint32_t ctrl_ext;
 
        pci_dev = eth_dev->pci_dev;
@@ -599,6 +593,13 @@ eth_igb_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
        /* enable support intr */
        igb_intr_enable(eth_dev);
 
+       TAILQ_INIT(&filter_info->flex_list);
+       filter_info->flex_mask = 0;
+       TAILQ_INIT(&filter_info->twotuple_list);
+       filter_info->twotuple_mask = 0;
+       TAILQ_INIT(&filter_info->fivetuple_list);
+       filter_info->fivetuple_mask = 0;
+
        return 0;
 
 err_late:
@@ -611,8 +612,7 @@ err_late:
  * Virtual Function device init
  */
 static int
-eth_igbvf_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
-               struct rte_eth_dev *eth_dev)
+eth_igbvf_dev_init(struct rte_eth_dev *eth_dev)
 {
        struct rte_pci_device *pci_dev;
        struct e1000_hw *hw =
@@ -924,7 +924,12 @@ 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_eth_link link;
+       struct e1000_flex_filter *p_flex;
+       struct e1000_5tuple_filter *p_5tuple, *p_5tuple_next;
+       struct e1000_2tuple_filter *p_2tuple, *p_2tuple_next;
 
        igb_intr_disable(hw);
        igb_pf_reset_hw(hw);
@@ -947,6 +952,31 @@ eth_igb_stop(struct rte_eth_dev *dev)
        /* clear the recorded link status */
        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;
+
+       /* Remove all ntuple filters of the device */
+       for (p_5tuple = TAILQ_FIRST(&filter_info->fivetuple_list);
+            p_5tuple != NULL; p_5tuple = p_5tuple_next) {
+               p_5tuple_next = TAILQ_NEXT(p_5tuple, entries);
+               TAILQ_REMOVE(&filter_info->fivetuple_list,
+                            p_5tuple, entries);
+               rte_free(p_5tuple);
+       }
+       filter_info->fivetuple_mask = 0;
+       for (p_2tuple = TAILQ_FIRST(&filter_info->twotuple_list);
+            p_2tuple != NULL; p_2tuple = p_2tuple_next) {
+               p_2tuple_next = TAILQ_NEXT(p_2tuple, entries);
+               TAILQ_REMOVE(&filter_info->twotuple_list,
+                            p_2tuple, entries);
+               rte_free(p_2tuple);
+       }
+       filter_info->twotuple_mask = 0;
 }
 
 static void
@@ -1248,7 +1278,6 @@ eth_igbvf_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *rte_stats)
        if (rte_stats == NULL)
                return;
 
-       memset(rte_stats, 0, sizeof(*rte_stats));
        rte_stats->ipackets = hw_stats->gprc;
        rte_stats->ibytes = hw_stats->gorc;
        rte_stats->opackets = hw_stats->gptc;
@@ -1346,6 +1375,7 @@ eth_igb_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
                break;
        }
        dev_info->reta_size = ETH_RSS_RETA_SIZE_128;
+       dev_info->flow_type_rss_offloads = IGB_RSS_OFFLOAD_ALL;
 
        dev_info->default_rxconf = (struct rte_eth_rxconf) {
                .rx_thresh = {
@@ -2388,715 +2418,796 @@ eth_igb_rss_reta_query(struct rte_eth_dev *dev,
 #define MAC_TYPE_FILTER_SUP(type)    do {\
        if ((type) != e1000_82580 && (type) != e1000_i350 &&\
                (type) != e1000_82576)\
-               return -ENOSYS;\
+               return -ENOTSUP;\
 } while (0)
 
-/*
- * add the syn filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * filter: ponter to the filter that will be added.
- * rx_queue: the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
 static int
-eth_igb_add_syn_filter(struct rte_eth_dev *dev,
-                       struct rte_syn_filter *filter, uint16_t rx_queue)
+eth_igb_syn_filter_set(struct rte_eth_dev *dev,
+                       struct rte_eth_syn_filter *filter,
+                       bool add)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t synqf, rfctl;
 
-       MAC_TYPE_FILTER_SUP(hw->mac.type);
-
-       if (rx_queue >= IGB_MAX_RX_QUEUE_NUM)
+       if (filter->queue >= IGB_MAX_RX_QUEUE_NUM)
                return -EINVAL;
 
        synqf = E1000_READ_REG(hw, E1000_SYNQF(0));
-       if (synqf & E1000_SYN_FILTER_ENABLE)
-               return -EINVAL;
 
-       synqf = (uint32_t)(((rx_queue << E1000_SYN_FILTER_QUEUE_SHIFT) &
-               E1000_SYN_FILTER_QUEUE) | E1000_SYN_FILTER_ENABLE);
-
-       rfctl = E1000_READ_REG(hw, E1000_RFCTL);
-       if (filter->hig_pri)
-               rfctl |= E1000_RFCTL_SYNQFP;
-       else
-               rfctl &= ~E1000_RFCTL_SYNQFP;
+       if (add) {
+               if (synqf & E1000_SYN_FILTER_ENABLE)
+                       return -EINVAL;
 
-       E1000_WRITE_REG(hw, E1000_SYNQF(0), synqf);
-       E1000_WRITE_REG(hw, E1000_RFCTL, rfctl);
-       return 0;
-}
+               synqf = (uint32_t)(((filter->queue << E1000_SYN_FILTER_QUEUE_SHIFT) &
+                       E1000_SYN_FILTER_QUEUE) | E1000_SYN_FILTER_ENABLE);
 
-/*
- * remove the syn filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
-static int
-eth_igb_remove_syn_filter(struct rte_eth_dev *dev)
-{
-       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+               rfctl = E1000_READ_REG(hw, E1000_RFCTL);
+               if (filter->hig_pri)
+                       rfctl |= E1000_RFCTL_SYNQFP;
+               else
+                       rfctl &= ~E1000_RFCTL_SYNQFP;
 
-       MAC_TYPE_FILTER_SUP(hw->mac.type);
+               E1000_WRITE_REG(hw, E1000_RFCTL, rfctl);
+       } else {
+               if (!(synqf & E1000_SYN_FILTER_ENABLE))
+                       return -ENOENT;
+               synqf = 0;
+       }
 
-       E1000_WRITE_REG(hw, E1000_SYNQF(0), 0);
+       E1000_WRITE_REG(hw, E1000_SYNQF(0), synqf);
+       E1000_WRITE_FLUSH(hw);
        return 0;
 }
 
-/*
- * get the syn filter's info
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * filter: ponter to the filter that returns.
- * *rx_queue: pointer to the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
 static int
-eth_igb_get_syn_filter(struct rte_eth_dev *dev,
-                       struct rte_syn_filter *filter, uint16_t *rx_queue)
+eth_igb_syn_filter_get(struct rte_eth_dev *dev,
+                       struct rte_eth_syn_filter *filter)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        uint32_t synqf, rfctl;
 
-       MAC_TYPE_FILTER_SUP(hw->mac.type);
        synqf = E1000_READ_REG(hw, E1000_SYNQF(0));
        if (synqf & E1000_SYN_FILTER_ENABLE) {
                rfctl = E1000_READ_REG(hw, E1000_RFCTL);
                filter->hig_pri = (rfctl & E1000_RFCTL_SYNQFP) ? 1 : 0;
-               *rx_queue = (uint8_t)((synqf & E1000_SYN_FILTER_QUEUE) >>
+               filter->queue = (uint8_t)((synqf & E1000_SYN_FILTER_QUEUE) >>
                                E1000_SYN_FILTER_QUEUE_SHIFT);
                return 0;
        }
+
        return -ENOENT;
 }
 
-/*
- * add an ethertype filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- * filter: ponter to the filter that will be added.
- * rx_queue: the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
 static int
-eth_igb_add_ethertype_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_ethertype_filter *filter, uint16_t rx_queue)
+eth_igb_syn_filter_handle(struct rte_eth_dev *dev,
+                       enum rte_filter_op filter_op,
+                       void *arg)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t etqf;
+       int ret;
 
        MAC_TYPE_FILTER_SUP(hw->mac.type);
 
-       if (index >= E1000_MAX_ETQF_FILTERS || rx_queue >= IGB_MAX_RX_QUEUE_NUM)
-               return -EINVAL;
-
-       etqf = E1000_READ_REG(hw, E1000_ETQF(index));
-       if (etqf & E1000_ETQF_FILTER_ENABLE)
-               return -EINVAL;  /* filter index is in use. */
-       else
-               etqf = 0;
-
-       etqf |= E1000_ETQF_FILTER_ENABLE | E1000_ETQF_QUEUE_ENABLE;
-       etqf |= (uint32_t)(filter->ethertype & E1000_ETQF_ETHERTYPE);
-       etqf |= rx_queue << E1000_ETQF_QUEUE_SHIFT;
+       if (filter_op == RTE_ETH_FILTER_NOP)
+               return 0;
 
-       if (filter->priority_en) {
-               PMD_INIT_LOG(ERR, "vlan and priority (%d) is not supported"
-                       " in E1000.", filter->priority);
+       if (arg == NULL) {
+               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u",
+                           filter_op);
                return -EINVAL;
        }
 
-       E1000_WRITE_REG(hw, E1000_ETQF(index), etqf);
-       return 0;
+       switch (filter_op) {
+       case RTE_ETH_FILTER_ADD:
+               ret = eth_igb_syn_filter_set(dev,
+                               (struct rte_eth_syn_filter *)arg,
+                               TRUE);
+               break;
+       case RTE_ETH_FILTER_DELETE:
+               ret = eth_igb_syn_filter_set(dev,
+                               (struct rte_eth_syn_filter *)arg,
+                               FALSE);
+               break;
+       case RTE_ETH_FILTER_GET:
+               ret = eth_igb_syn_filter_get(dev,
+                               (struct rte_eth_syn_filter *)arg);
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "unsupported operation %u\n", filter_op);
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
 }
 
-/*
- * remove an ethertype filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
-static int
-eth_igb_remove_ethertype_filter(struct rte_eth_dev *dev, uint16_t index)
+#define MAC_TYPE_FILTER_SUP_EXT(type)    do {\
+       if ((type) != e1000_82580 && (type) != e1000_i350)\
+               return -ENOSYS; \
+} while (0)
+
+/* translate elements in struct rte_eth_ntuple_filter to struct e1000_2tuple_filter_info*/
+static inline int
+ntuple_filter_to_2tuple(struct rte_eth_ntuple_filter *filter,
+                       struct e1000_2tuple_filter_info *filter_info)
 {
-       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       if (filter->queue >= IGB_MAX_RX_QUEUE_NUM)
+               return -EINVAL;
+       if (filter->priority > E1000_2TUPLE_MAX_PRI)
+               return -EINVAL;  /* filter index is out of range. */
+       if (filter->tcp_flags > TCP_FLAG_ALL)
+               return -EINVAL;  /* flags is invalid. */
 
-       MAC_TYPE_FILTER_SUP(hw->mac.type);
+       switch (filter->dst_port_mask) {
+       case UINT16_MAX:
+               filter_info->dst_port_mask = 0;
+               filter_info->dst_port = filter->dst_port;
+               break;
+       case 0:
+               filter_info->dst_port_mask = 1;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "invalid dst_port mask.");
+               return -EINVAL;
+       }
 
-       if (index >= E1000_MAX_ETQF_FILTERS)
+       switch (filter->proto_mask) {
+       case UINT8_MAX:
+               filter_info->proto_mask = 0;
+               filter_info->proto = filter->proto;
+               break;
+       case 0:
+               filter_info->proto_mask = 1;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "invalid protocol mask.");
                return -EINVAL;
+       }
+
+       filter_info->priority = (uint8_t)filter->priority;
+       if (filter->flags & RTE_NTUPLE_FLAGS_TCP_FLAG)
+               filter_info->tcp_flags = filter->tcp_flags;
+       else
+               filter_info->tcp_flags = 0;
 
-       E1000_WRITE_REG(hw, E1000_ETQF(index), 0);
        return 0;
 }
 
-/*
- * get an ethertype filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- * filter: ponter to the filter that will be gotten.
- * *rx_queue: the ponited of the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
-static int
-eth_igb_get_ethertype_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_ethertype_filter *filter, uint16_t *rx_queue)
+static inline struct e1000_2tuple_filter *
+igb_2tuple_filter_lookup(struct e1000_2tuple_filter_list *filter_list,
+                       struct e1000_2tuple_filter_info *key)
 {
-       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t etqf;
-
-       MAC_TYPE_FILTER_SUP(hw->mac.type);
+       struct e1000_2tuple_filter *it;
 
-       if (index >= E1000_MAX_ETQF_FILTERS)
-               return -EINVAL;
-
-       etqf = E1000_READ_REG(hw, E1000_ETQF(index));
-       if (etqf & E1000_ETQF_FILTER_ENABLE) {
-               filter->ethertype = etqf & E1000_ETQF_ETHERTYPE;
-               filter->priority_en = 0;
-               *rx_queue = (etqf & E1000_ETQF_QUEUE) >> E1000_ETQF_QUEUE_SHIFT;
-               return 0;
+       TAILQ_FOREACH(it, filter_list, entries) {
+               if (memcmp(key, &it->filter_info,
+                       sizeof(struct e1000_2tuple_filter_info)) == 0) {
+                       return it;
+               }
        }
-       return -ENOENT;
+       return NULL;
 }
 
-#define MAC_TYPE_FILTER_SUP_EXT(type)    do {\
-       if ((type) != e1000_82580 && (type) != e1000_i350)\
-               return -ENOSYS; \
-} while (0)
-
 /*
- * add a 2tuple filter
+ * igb_add_2tuple_filter - add a 2tuple filter
  *
  * @param
  * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- * filter: ponter to the filter that will be added.
- * rx_queue: the queue id the filter assigned to.
+ * ntuple_filter: ponter to the filter that will be added.
  *
  * @return
  *    - On success, zero.
  *    - On failure, a negative value.
  */
 static int
-eth_igb_add_2tuple_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_2tuple_filter *filter, uint16_t rx_queue)
+igb_add_2tuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t ttqf, imir = 0;
-       uint32_t imir_ext = 0;
-
-       MAC_TYPE_FILTER_SUP_EXT(hw->mac.type);
+       struct e1000_filter_info *filter_info =
+               E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
+       struct e1000_2tuple_filter *filter;
+       uint32_t ttqf = E1000_TTQF_DISABLE_MASK;
+       uint32_t imir, imir_ext = E1000_IMIREXT_SIZE_BP;
+       int i, ret;
+
+       filter = rte_zmalloc("e1000_2tuple_filter",
+                       sizeof(struct e1000_2tuple_filter), 0);
+       if (filter == NULL)
+               return -ENOMEM;
 
-       if (index >= E1000_MAX_TTQF_FILTERS ||
-               rx_queue >= IGB_MAX_RX_QUEUE_NUM ||
-               filter->priority > E1000_2TUPLE_MAX_PRI)
-               return -EINVAL;  /* filter index is out of range. */
-       if  (filter->tcp_flags > TCP_FLAG_ALL)
-               return -EINVAL;  /* flags is invalid. */
+       ret = ntuple_filter_to_2tuple(ntuple_filter,
+                                     &filter->filter_info);
+       if (ret < 0) {
+               rte_free(filter);
+               return ret;
+       }
+       if (igb_2tuple_filter_lookup(&filter_info->twotuple_list,
+                                        &filter->filter_info) != NULL) {
+               PMD_DRV_LOG(ERR, "filter exists.");
+               rte_free(filter);
+               return -EEXIST;
+       }
+       filter->queue = ntuple_filter->queue;
 
-       ttqf = E1000_READ_REG(hw, E1000_TTQF(index));
-       if (ttqf & E1000_TTQF_QUEUE_ENABLE)
-               return -EINVAL;  /* filter index is in use. */
+       /*
+        * look for an unused 2tuple filter index,
+        * and insert the filter to list.
+        */
+       for (i = 0; i < E1000_MAX_TTQF_FILTERS; i++) {
+               if (!(filter_info->twotuple_mask & (1 << i))) {
+                       filter_info->twotuple_mask |= 1 << i;
+                       filter->index = i;
+                       TAILQ_INSERT_TAIL(&filter_info->twotuple_list,
+                                         filter,
+                                         entries);
+                       break;
+               }
+       }
+       if (i >= E1000_MAX_TTQF_FILTERS) {
+               PMD_DRV_LOG(ERR, "2tuple filters are full.");
+               rte_free(filter);
+               return -ENOSYS;
+       }
 
-       imir = (uint32_t)(filter->dst_port & E1000_IMIR_DSTPORT);
-       if (filter->dst_port_mask == 1) /* 1b means not compare. */
+       imir = (uint32_t)(filter->filter_info.dst_port & E1000_IMIR_DSTPORT);
+       if (filter->filter_info.dst_port_mask == 1) /* 1b means not compare. */
                imir |= E1000_IMIR_PORT_BP;
        else
                imir &= ~E1000_IMIR_PORT_BP;
 
-       imir |= filter->priority << E1000_IMIR_PRIORITY_SHIFT;
+       imir |= filter->filter_info.priority << E1000_IMIR_PRIORITY_SHIFT;
 
-       ttqf = 0;
        ttqf |= E1000_TTQF_QUEUE_ENABLE;
-       ttqf |= (uint32_t)(rx_queue << E1000_TTQF_QUEUE_SHIFT);
-       ttqf |= (uint32_t)(filter->protocol & E1000_TTQF_PROTOCOL_MASK);
-       if (filter->protocol_mask == 1)
-               ttqf |= E1000_TTQF_MASK_ENABLE;
-       else
+       ttqf |= (uint32_t)(filter->queue << E1000_TTQF_QUEUE_SHIFT);
+       ttqf |= (uint32_t)(filter->filter_info.proto & E1000_TTQF_PROTOCOL_MASK);
+       if (filter->filter_info.proto_mask == 0)
                ttqf &= ~E1000_TTQF_MASK_ENABLE;
 
-       imir_ext |= E1000_IMIR_EXT_SIZE_BP;
        /* tcp flags bits setting. */
-       if (filter->tcp_flags & TCP_FLAG_ALL) {
-               if (filter->tcp_flags & TCP_UGR_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_UGR;
-               if (filter->tcp_flags & TCP_ACK_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_ACK;
-               if (filter->tcp_flags & TCP_PSH_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_PSH;
-               if (filter->tcp_flags & TCP_RST_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_RST;
-               if (filter->tcp_flags & TCP_SYN_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_SYN;
-               if (filter->tcp_flags & TCP_FIN_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_FIN;
-               imir_ext &= ~E1000_IMIR_EXT_CTRL_BP;
+       if (filter->filter_info.tcp_flags & TCP_FLAG_ALL) {
+               if (filter->filter_info.tcp_flags & TCP_URG_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_URG;
+               if (filter->filter_info.tcp_flags & TCP_ACK_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_ACK;
+               if (filter->filter_info.tcp_flags & TCP_PSH_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_PSH;
+               if (filter->filter_info.tcp_flags & TCP_RST_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_RST;
+               if (filter->filter_info.tcp_flags & TCP_SYN_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_SYN;
+               if (filter->filter_info.tcp_flags & TCP_FIN_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_FIN;
        } else
-               imir_ext |= E1000_IMIR_EXT_CTRL_BP;
-       E1000_WRITE_REG(hw, E1000_IMIR(index), imir);
-       E1000_WRITE_REG(hw, E1000_TTQF(index), ttqf);
-       E1000_WRITE_REG(hw, E1000_IMIREXT(index), imir_ext);
+               imir_ext |= E1000_IMIREXT_CTRL_BP;
+       E1000_WRITE_REG(hw, E1000_IMIR(i), imir);
+       E1000_WRITE_REG(hw, E1000_TTQF(i), ttqf);
+       E1000_WRITE_REG(hw, E1000_IMIREXT(i), imir_ext);
        return 0;
 }
 
 /*
- * remove a 2tuple filter
+ * igb_remove_2tuple_filter - remove a 2tuple filter
  *
  * @param
  * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
+ * ntuple_filter: ponter to the filter that will be removed.
  *
  * @return
  *    - On success, zero.
  *    - On failure, a negative value.
  */
 static int
-eth_igb_remove_2tuple_filter(struct rte_eth_dev *dev,
-                       uint16_t index)
+igb_remove_2tuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter)
 {
        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_2tuple_filter_info filter_2tuple;
+       struct e1000_2tuple_filter *filter;
+       int ret;
+
+       memset(&filter_2tuple, 0, sizeof(struct e1000_2tuple_filter_info));
+       ret = ntuple_filter_to_2tuple(ntuple_filter,
+                                     &filter_2tuple);
+       if (ret < 0)
+               return ret;
 
-       MAC_TYPE_FILTER_SUP_EXT(hw->mac.type);
+       filter = igb_2tuple_filter_lookup(&filter_info->twotuple_list,
+                                        &filter_2tuple);
+       if (filter == NULL) {
+               PMD_DRV_LOG(ERR, "filter doesn't exist.");
+               return -ENOENT;
+       }
 
-       if (index >= E1000_MAX_TTQF_FILTERS)
-               return -EINVAL;  /* filter index is out of range */
+       filter_info->twotuple_mask &= ~(1 << filter->index);
+       TAILQ_REMOVE(&filter_info->twotuple_list, filter, entries);
+       rte_free(filter);
 
-       E1000_WRITE_REG(hw, E1000_TTQF(index), 0);
-       E1000_WRITE_REG(hw, E1000_IMIR(index), 0);
-       E1000_WRITE_REG(hw, E1000_IMIREXT(index), 0);
+       E1000_WRITE_REG(hw, E1000_TTQF(filter->index), E1000_TTQF_DISABLE_MASK);
+       E1000_WRITE_REG(hw, E1000_IMIR(filter->index), 0);
+       E1000_WRITE_REG(hw, E1000_IMIREXT(filter->index), 0);
        return 0;
 }
 
-/*
- * get a 2tuple filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- * filter: ponter to the filter that returns.
- * *rx_queue: pointer of the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
-static int
-eth_igb_get_2tuple_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_2tuple_filter *filter, uint16_t *rx_queue)
+static inline struct e1000_flex_filter *
+eth_igb_flex_filter_lookup(struct e1000_flex_filter_list *filter_list,
+                       struct e1000_flex_filter_info *key)
 {
-       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t imir, ttqf, imir_ext;
-
-       MAC_TYPE_FILTER_SUP_EXT(hw->mac.type);
-
-       if (index >= E1000_MAX_TTQF_FILTERS)
-               return -EINVAL;  /* filter index is out of range. */
+       struct e1000_flex_filter *it;
 
-       ttqf = E1000_READ_REG(hw, E1000_TTQF(index));
-       if (ttqf & E1000_TTQF_QUEUE_ENABLE) {
-               imir = E1000_READ_REG(hw, E1000_IMIR(index));
-               filter->protocol = ttqf & E1000_TTQF_PROTOCOL_MASK;
-               filter->protocol_mask = (ttqf & E1000_TTQF_MASK_ENABLE) ? 1 : 0;
-               *rx_queue = (ttqf & E1000_TTQF_RX_QUEUE_MASK) >>
-                               E1000_TTQF_QUEUE_SHIFT;
-               filter->dst_port = (uint16_t)(imir & E1000_IMIR_DSTPORT);
-               filter->dst_port_mask = (imir & E1000_IMIR_PORT_BP) ? 1 : 0;
-               filter->priority = (imir & E1000_IMIR_PRIORITY) >>
-                       E1000_IMIR_PRIORITY_SHIFT;
-
-               imir_ext = E1000_READ_REG(hw, E1000_IMIREXT(index));
-               if (!(imir_ext & E1000_IMIR_EXT_CTRL_BP)) {
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_UGR)
-                               filter->tcp_flags |= TCP_UGR_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_ACK)
-                               filter->tcp_flags |= TCP_ACK_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_PSH)
-                               filter->tcp_flags |= TCP_PSH_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_RST)
-                               filter->tcp_flags |= TCP_RST_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_SYN)
-                               filter->tcp_flags |= TCP_SYN_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_FIN)
-                               filter->tcp_flags |= TCP_FIN_FLAG;
-               } else
-                       filter->tcp_flags = 0;
-               return 0;
+       TAILQ_FOREACH(it, filter_list, entries) {
+               if (memcmp(key, &it->filter_info,
+                       sizeof(struct e1000_flex_filter_info)) == 0)
+                       return it;
        }
-       return -ENOENT;
+
+       return NULL;
 }
 
-/*
- * add a flex filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- * filter: ponter to the filter that will be added.
- * rx_queue: the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *     - On failure, a negative value.
- */
 static int
-eth_igb_add_flex_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_flex_filter *filter, uint16_t rx_queue)
+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);
-       uint32_t wufc, en_bits = 0;
-       uint32_t queueing = 0;
-       uint32_t reg_off = 0;
-       uint8_t i, j = 0;
-
-       MAC_TYPE_FILTER_SUP_EXT(hw->mac.type);
-
-       if (index >= E1000_MAX_FLEXIBLE_FILTERS)
-               return -EINVAL;  /* filter index is out of range. */
+       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;
+
+       flex_filter = rte_zmalloc("e1000_flex_filter",
+                       sizeof(struct e1000_flex_filter), 0);
+       if (flex_filter == NULL)
+               return -ENOMEM;
 
-       if (filter->len == 0 || filter->len > E1000_MAX_FLEX_FILTER_LEN ||
-               filter->len % 8 != 0 ||
-               filter->priority > E1000_MAX_FLEX_FILTER_PRI)
-               return -EINVAL;
+       flex_filter->filter_info.len = filter->len;
+       flex_filter->filter_info.priority = filter->priority;
+       memcpy(flex_filter->filter_info.dwords, filter->bytes, filter->len);
+       for (i = 0; i < RTE_ALIGN(filter->len, CHAR_BIT) / CHAR_BIT; i++) {
+               mask = 0;
+               /* reverse bits in flex filter's mask*/
+               for (shift = 0; shift < CHAR_BIT; shift++) {
+                       if (filter->mask[i] & (0x01 << shift))
+                               mask |= (0x80 >> shift);
+               }
+               flex_filter->filter_info.mask[i] = mask;
+       }
 
        wufc = E1000_READ_REG(hw, E1000_WUFC);
-       en_bits = E1000_WUFC_FLEX_HQ | (E1000_WUFC_FLX0 << index);
-       if ((wufc & en_bits) == en_bits)
-               return -EINVAL;  /* the filter is in use. */
-
-       E1000_WRITE_REG(hw, E1000_WUFC,
-               wufc | E1000_WUFC_FLEX_HQ | (E1000_WUFC_FLX0 << index));
-
-       j = 0;
-       if (index < E1000_MAX_FHFT)
-               reg_off = E1000_FHFT(index);
+       if (flex_filter->index < E1000_MAX_FHFT)
+               reg_off = E1000_FHFT(flex_filter->index);
        else
-               reg_off = E1000_FHFT_EXT(index - E1000_MAX_FHFT);
-
-       for (i = 0; i < 16; i++) {
-               E1000_WRITE_REG(hw, reg_off + i*4*4, filter->dwords[j]);
-               E1000_WRITE_REG(hw, reg_off + (i*4+1)*4, filter->dwords[++j]);
-               E1000_WRITE_REG(hw, reg_off + (i*4+2)*4,
-                               (uint32_t)filter->mask[i]);
-               ++j;
-       }
-       queueing |= filter->len |
-               (rx_queue << E1000_FHFT_QUEUEING_QUEUE_SHIFT) |
-               (filter->priority << E1000_FHFT_QUEUEING_PRIO_SHIFT);
-       E1000_WRITE_REG(hw, reg_off + E1000_FHFT_QUEUEING_OFFSET, queueing);
-       return 0;
-}
-
-/*
- * remove a flex filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
-static int
-eth_igb_remove_flex_filter(struct rte_eth_dev *dev,
-                               uint16_t index)
-{
-       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t wufc, reg_off = 0;
-       uint8_t i;
-
-       MAC_TYPE_FILTER_SUP_EXT(hw->mac.type);
+               reg_off = E1000_FHFT_EXT(flex_filter->index - E1000_MAX_FHFT);
+
+       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
+                * and insert the filter into the list.
+                */
+               for (i = 0; i < E1000_MAX_FLEX_FILTERS; i++) {
+                       if (!(filter_info->flex_mask & (1 << i))) {
+                               filter_info->flex_mask |= 1 << i;
+                               flex_filter->index = i;
+                               TAILQ_INSERT_TAIL(&filter_info->flex_list,
+                                       flex_filter,
+                                       entries);
+                               break;
+                       }
+               }
+               if (i >= E1000_MAX_FLEX_FILTERS) {
+                       PMD_DRV_LOG(ERR, "flex filters are full.");
+                       rte_free(flex_filter);
+                       return -ENOSYS;
+               }
 
-       if (index >= E1000_MAX_FLEXIBLE_FILTERS)
-               return -EINVAL;  /* filter index is out of range. */
+               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;
+               }
 
-       wufc = E1000_READ_REG(hw, E1000_WUFC);
-       E1000_WRITE_REG(hw, E1000_WUFC, wufc & (~(E1000_WUFC_FLX0 << index)));
+               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)));
 
-       if (index < E1000_MAX_FHFT)
-               reg_off = E1000_FHFT(index);
-       else
-               reg_off = E1000_FHFT_EXT(index - E1000_MAX_FHFT);
+               filter_info->flex_mask &= ~(1 << it->index);
+               TAILQ_REMOVE(&filter_info->flex_list, it, entries);
+               rte_free(it);
+               rte_free(flex_filter);
+       }
 
-       for (i = 0; i < 64; i++)
-               E1000_WRITE_REG(hw, reg_off + i*4, 0);
        return 0;
 }
 
-/*
- * get a flex filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- * filter: ponter to the filter that returns.
- * *rx_queue: the pointer of the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
 static int
-eth_igb_get_flex_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_flex_filter *filter, uint16_t *rx_queue)
+eth_igb_get_flex_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_flex_filter *filter)
 {
        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, wufc_en = 0;
-       uint8_t i, j;
-
-       MAC_TYPE_FILTER_SUP_EXT(hw->mac.type);
 
-       if (index >= E1000_MAX_FLEXIBLE_FILTERS)
-               return -EINVAL;  /* filter index is out of range. */
+       memset(&flex_filter, 0, sizeof(struct e1000_flex_filter));
+       flex_filter.filter_info.len = filter->len;
+       flex_filter.filter_info.priority = filter->priority;
+       memcpy(flex_filter.filter_info.dwords, filter->bytes, filter->len);
+       memcpy(flex_filter.filter_info.mask, filter->mask,
+                       RTE_ALIGN(filter->len, sizeof(char)) / sizeof(char));
+
+       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.");
+               return -ENOENT;
+       }
 
        wufc = E1000_READ_REG(hw, E1000_WUFC);
-       wufc_en = E1000_WUFC_FLEX_HQ | (E1000_WUFC_FLX0 << index);
+       wufc_en = E1000_WUFC_FLEX_HQ | (E1000_WUFC_FLX0 << it->index);
 
        if ((wufc & wufc_en) == wufc_en) {
                uint32_t reg_off = 0;
-               j = 0;
-               if (index < E1000_MAX_FHFT)
-                       reg_off = E1000_FHFT(index);
+               if (it->index < E1000_MAX_FHFT)
+                       reg_off = E1000_FHFT(it->index);
                else
-                       reg_off = E1000_FHFT_EXT(index - E1000_MAX_FHFT);
-
-               for (i = 0; i < 16; i++, j = i * 2) {
-                       filter->dwords[j] =
-                               E1000_READ_REG(hw, reg_off + i*4*4);
-                       filter->dwords[j+1] =
-                               E1000_READ_REG(hw, reg_off + (i*4+1)*4);
-                       filter->mask[i] =
-                               E1000_READ_REG(hw, reg_off + (i*4+2)*4);
-               }
+                       reg_off = E1000_FHFT_EXT(it->index - E1000_MAX_FHFT);
+
                queueing = E1000_READ_REG(hw,
                                reg_off + E1000_FHFT_QUEUEING_OFFSET);
                filter->len = queueing & E1000_FHFT_QUEUEING_LEN;
                filter->priority = (queueing & E1000_FHFT_QUEUEING_PRIO) >>
                        E1000_FHFT_QUEUEING_PRIO_SHIFT;
-               *rx_queue = (queueing & E1000_FHFT_QUEUEING_QUEUE) >>
+               filter->queue = (queueing & E1000_FHFT_QUEUEING_QUEUE) >>
                        E1000_FHFT_QUEUEING_QUEUE_SHIFT;
                return 0;
        }
        return -ENOENT;
 }
 
-/*
- * add a 5tuple filter
- *
- * @param
- * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates.
- * filter: ponter to the filter that will be added.
- * rx_queue: the queue id the filter assigned to.
- *
- * @return
- *    - On success, zero.
- *    - On failure, a negative value.
- */
 static int
-eth_igb_add_5tuple_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_5tuple_filter *filter, uint16_t rx_queue)
+eth_igb_flex_filter_handle(struct rte_eth_dev *dev,
+                       enum rte_filter_op filter_op,
+                       void *arg)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t ftqf, spqf = 0;
-       uint32_t imir = 0;
-       uint32_t imir_ext = 0;
+       struct rte_eth_flex_filter *filter;
+       int ret = 0;
 
-       if (hw->mac.type != e1000_82576)
-               return -ENOSYS;
+       MAC_TYPE_FILTER_SUP(hw->mac.type);
+
+       if (filter_op == RTE_ETH_FILTER_NOP)
+               return ret;
+
+       if (arg == NULL) {
+               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u",
+                           filter_op);
+               return -EINVAL;
+       }
+
+       filter = (struct rte_eth_flex_filter *)arg;
+       if (filter->len == 0 || filter->len > E1000_MAX_FLEX_FILTER_LEN
+           || filter->len % sizeof(uint64_t) != 0) {
+               PMD_DRV_LOG(ERR, "filter's length is out of range");
+               return -EINVAL;
+       }
+       if (filter->priority > E1000_MAX_FLEX_FILTER_PRI) {
+               PMD_DRV_LOG(ERR, "filter's priority is out of range");
+               return -EINVAL;
+       }
+
+       switch (filter_op) {
+       case RTE_ETH_FILTER_ADD:
+               ret = eth_igb_add_del_flex_filter(dev, filter, TRUE);
+               break;
+       case RTE_ETH_FILTER_DELETE:
+               ret = eth_igb_add_del_flex_filter(dev, filter, FALSE);
+               break;
+       case RTE_ETH_FILTER_GET:
+               ret = eth_igb_get_flex_filter(dev, filter);
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "unsupported operation %u", filter_op);
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
 
-       if (index >= E1000_MAX_FTQF_FILTERS ||
-               rx_queue >= IGB_MAX_RX_QUEUE_NUM_82576)
+/* translate elements in struct rte_eth_ntuple_filter to struct e1000_5tuple_filter_info*/
+static inline int
+ntuple_filter_to_5tuple_82576(struct rte_eth_ntuple_filter *filter,
+                       struct e1000_5tuple_filter_info *filter_info)
+{
+       if (filter->queue >= IGB_MAX_RX_QUEUE_NUM_82576)
+               return -EINVAL;
+       if (filter->priority > E1000_2TUPLE_MAX_PRI)
                return -EINVAL;  /* filter index is out of range. */
+       if (filter->tcp_flags > TCP_FLAG_ALL)
+               return -EINVAL;  /* flags is invalid. */
 
-       ftqf = E1000_READ_REG(hw, E1000_FTQF(index));
-       if (ftqf & E1000_FTQF_QUEUE_ENABLE)
-               return -EINVAL;  /* filter index is in use. */
-
-       ftqf = 0;
-       ftqf |= filter->protocol & E1000_FTQF_PROTOCOL_MASK;
-       if (filter->src_ip_mask == 1) /* 1b means not compare. */
-               ftqf |= E1000_FTQF_SOURCE_ADDR_MASK;
-       if (filter->dst_ip_mask == 1)
-               ftqf |= E1000_FTQF_DEST_ADDR_MASK;
-       if (filter->src_port_mask == 1)
-               ftqf |= E1000_FTQF_SOURCE_PORT_MASK;
-       if (filter->protocol_mask == 1)
-               ftqf |= E1000_FTQF_PROTOCOL_COMP_MASK;
-       ftqf |= (rx_queue << E1000_FTQF_QUEUE_SHIFT) & E1000_FTQF_QUEUE_MASK;
-       ftqf |= E1000_FTQF_VF_MASK_EN;
-       ftqf |= E1000_FTQF_QUEUE_ENABLE;
-       E1000_WRITE_REG(hw, E1000_FTQF(index), ftqf);
-       E1000_WRITE_REG(hw, E1000_DAQF(index), filter->dst_ip);
-       E1000_WRITE_REG(hw, E1000_SAQF(index), filter->src_ip);
+       switch (filter->dst_ip_mask) {
+       case UINT32_MAX:
+               filter_info->dst_ip_mask = 0;
+               filter_info->dst_ip = filter->dst_ip;
+               break;
+       case 0:
+               filter_info->dst_ip_mask = 1;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "invalid dst_ip mask.");
+               return -EINVAL;
+       }
 
-       spqf |= filter->src_port & E1000_SPQF_SRCPORT;
-       E1000_WRITE_REG(hw, E1000_SPQF(index), spqf);
+       switch (filter->src_ip_mask) {
+       case UINT32_MAX:
+               filter_info->src_ip_mask = 0;
+               filter_info->src_ip = filter->src_ip;
+               break;
+       case 0:
+               filter_info->src_ip_mask = 1;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "invalid src_ip mask.");
+               return -EINVAL;
+       }
 
-       imir |= (uint32_t)(filter->dst_port & E1000_IMIR_DSTPORT);
-       if (filter->dst_port_mask == 1) /* 1b means not compare. */
-               imir |= E1000_IMIR_PORT_BP;
+       switch (filter->dst_port_mask) {
+       case UINT16_MAX:
+               filter_info->dst_port_mask = 0;
+               filter_info->dst_port = filter->dst_port;
+               break;
+       case 0:
+               filter_info->dst_port_mask = 1;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "invalid dst_port mask.");
+               return -EINVAL;
+       }
+
+       switch (filter->src_port_mask) {
+       case UINT16_MAX:
+               filter_info->src_port_mask = 0;
+               filter_info->src_port = filter->src_port;
+               break;
+       case 0:
+               filter_info->src_port_mask = 1;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "invalid src_port mask.");
+               return -EINVAL;
+       }
+
+       switch (filter->proto_mask) {
+       case UINT8_MAX:
+               filter_info->proto_mask = 0;
+               filter_info->proto = filter->proto;
+               break;
+       case 0:
+               filter_info->proto_mask = 1;
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "invalid protocol mask.");
+               return -EINVAL;
+       }
+
+       filter_info->priority = (uint8_t)filter->priority;
+       if (filter->flags & RTE_NTUPLE_FLAGS_TCP_FLAG)
+               filter_info->tcp_flags = filter->tcp_flags;
        else
-               imir &= ~E1000_IMIR_PORT_BP;
-       imir |= filter->priority << E1000_IMIR_PRIORITY_SHIFT;
+               filter_info->tcp_flags = 0;
 
-       imir_ext |= E1000_IMIR_EXT_SIZE_BP;
-       /* tcp flags bits setting. */
-       if (filter->tcp_flags & TCP_FLAG_ALL) {
-               if (filter->tcp_flags & TCP_UGR_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_UGR;
-               if (filter->tcp_flags & TCP_ACK_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_ACK;
-               if (filter->tcp_flags & TCP_PSH_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_PSH;
-               if (filter->tcp_flags & TCP_RST_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_RST;
-               if (filter->tcp_flags & TCP_SYN_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_SYN;
-               if (filter->tcp_flags & TCP_FIN_FLAG)
-                       imir_ext |= E1000_IMIR_EXT_CTRL_FIN;
-       } else
-               imir_ext |= E1000_IMIR_EXT_CTRL_BP;
-       E1000_WRITE_REG(hw, E1000_IMIR(index), imir);
-       E1000_WRITE_REG(hw, E1000_IMIREXT(index), imir_ext);
        return 0;
 }
 
+static inline struct e1000_5tuple_filter *
+igb_5tuple_filter_lookup_82576(struct e1000_5tuple_filter_list *filter_list,
+                       struct e1000_5tuple_filter_info *key)
+{
+       struct e1000_5tuple_filter *it;
+
+       TAILQ_FOREACH(it, filter_list, entries) {
+               if (memcmp(key, &it->filter_info,
+                       sizeof(struct e1000_5tuple_filter_info)) == 0) {
+                       return it;
+               }
+       }
+       return NULL;
+}
+
 /*
- * remove a 5tuple filter
+ * igb_add_5tuple_filter_82576 - add a 5tuple filter
  *
  * @param
  * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates
+ * ntuple_filter: ponter to the filter that will be added.
  *
  * @return
  *    - On success, zero.
  *    - On failure, a negative value.
  */
 static int
-eth_igb_remove_5tuple_filter(struct rte_eth_dev *dev,
-                               uint16_t index)
+igb_add_5tuple_filter_82576(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter)
 {
        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_5tuple_filter *filter;
+       uint32_t ftqf = E1000_FTQF_VF_BP | E1000_FTQF_MASK;
+       uint32_t spqf, imir, imir_ext = E1000_IMIREXT_SIZE_BP;
+       uint8_t i;
+       int ret;
+
+       filter = rte_zmalloc("e1000_5tuple_filter",
+                       sizeof(struct e1000_5tuple_filter), 0);
+       if (filter == NULL)
+               return -ENOMEM;
+
+       ret = ntuple_filter_to_5tuple_82576(ntuple_filter,
+                                           &filter->filter_info);
+       if (ret < 0) {
+               rte_free(filter);
+               return ret;
+       }
+
+       if (igb_5tuple_filter_lookup_82576(&filter_info->fivetuple_list,
+                                        &filter->filter_info) != NULL) {
+               PMD_DRV_LOG(ERR, "filter exists.");
+               rte_free(filter);
+               return -EEXIST;
+       }
+       filter->queue = ntuple_filter->queue;
 
-       if (hw->mac.type != e1000_82576)
+       /*
+        * look for an unused 5tuple filter index,
+        * and insert the filter to list.
+        */
+       for (i = 0; i < E1000_MAX_FTQF_FILTERS; i++) {
+               if (!(filter_info->fivetuple_mask & (1 << i))) {
+                       filter_info->fivetuple_mask |= 1 << i;
+                       filter->index = i;
+                       TAILQ_INSERT_TAIL(&filter_info->fivetuple_list,
+                                         filter,
+                                         entries);
+                       break;
+               }
+       }
+       if (i >= E1000_MAX_FTQF_FILTERS) {
+               PMD_DRV_LOG(ERR, "5tuple filters are full.");
+               rte_free(filter);
                return -ENOSYS;
+       }
 
-       if (index >= E1000_MAX_FTQF_FILTERS)
-               return -EINVAL;  /* filter index is out of range. */
+       ftqf |= filter->filter_info.proto & E1000_FTQF_PROTOCOL_MASK;
+       if (filter->filter_info.src_ip_mask == 0) /* 0b means compare. */
+               ftqf &= ~E1000_FTQF_MASK_SOURCE_ADDR_BP;
+       if (filter->filter_info.dst_ip_mask == 0)
+               ftqf &= ~E1000_FTQF_MASK_DEST_ADDR_BP;
+       if (filter->filter_info.src_port_mask == 0)
+               ftqf &= ~E1000_FTQF_MASK_SOURCE_PORT_BP;
+       if (filter->filter_info.proto_mask == 0)
+               ftqf &= ~E1000_FTQF_MASK_PROTO_BP;
+       ftqf |= (filter->queue << E1000_FTQF_QUEUE_SHIFT) &
+               E1000_FTQF_QUEUE_MASK;
+       ftqf |= E1000_FTQF_QUEUE_ENABLE;
+       E1000_WRITE_REG(hw, E1000_FTQF(i), ftqf);
+       E1000_WRITE_REG(hw, E1000_DAQF(i), filter->filter_info.dst_ip);
+       E1000_WRITE_REG(hw, E1000_SAQF(i), filter->filter_info.src_ip);
+
+       spqf = filter->filter_info.src_port & E1000_SPQF_SRCPORT;
+       E1000_WRITE_REG(hw, E1000_SPQF(i), spqf);
+
+       imir = (uint32_t)(filter->filter_info.dst_port & E1000_IMIR_DSTPORT);
+       if (filter->filter_info.dst_port_mask == 1) /* 1b means not compare. */
+               imir |= E1000_IMIR_PORT_BP;
+       else
+               imir &= ~E1000_IMIR_PORT_BP;
+       imir |= filter->filter_info.priority << E1000_IMIR_PRIORITY_SHIFT;
 
-       E1000_WRITE_REG(hw, E1000_FTQF(index), 0);
-       E1000_WRITE_REG(hw, E1000_DAQF(index), 0);
-       E1000_WRITE_REG(hw, E1000_SAQF(index), 0);
-       E1000_WRITE_REG(hw, E1000_SPQF(index), 0);
-       E1000_WRITE_REG(hw, E1000_IMIR(index), 0);
-       E1000_WRITE_REG(hw, E1000_IMIREXT(index), 0);
+       /* tcp flags bits setting. */
+       if (filter->filter_info.tcp_flags & TCP_FLAG_ALL) {
+               if (filter->filter_info.tcp_flags & TCP_URG_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_URG;
+               if (filter->filter_info.tcp_flags & TCP_ACK_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_ACK;
+               if (filter->filter_info.tcp_flags & TCP_PSH_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_PSH;
+               if (filter->filter_info.tcp_flags & TCP_RST_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_RST;
+               if (filter->filter_info.tcp_flags & TCP_SYN_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_SYN;
+               if (filter->filter_info.tcp_flags & TCP_FIN_FLAG)
+                       imir_ext |= E1000_IMIREXT_CTRL_FIN;
+       } else
+               imir_ext |= E1000_IMIREXT_CTRL_BP;
+       E1000_WRITE_REG(hw, E1000_IMIR(i), imir);
+       E1000_WRITE_REG(hw, E1000_IMIREXT(i), imir_ext);
        return 0;
 }
 
 /*
- * get a 5tuple filter
+ * igb_remove_5tuple_filter_82576 - remove a 5tuple filter
  *
  * @param
  * dev: Pointer to struct rte_eth_dev.
- * index: the index the filter allocates
- * filter: ponter to the filter that returns
- * *rx_queue: pointer of the queue id the filter assigned to
+ * ntuple_filter: ponter to the filter that will be removed.
  *
  * @return
  *    - On success, zero.
  *    - On failure, a negative value.
  */
 static int
-eth_igb_get_5tuple_filter(struct rte_eth_dev *dev, uint16_t index,
-                       struct rte_5tuple_filter *filter, uint16_t *rx_queue)
+igb_remove_5tuple_filter_82576(struct rte_eth_dev *dev,
+                               struct rte_eth_ntuple_filter *ntuple_filter)
 {
        struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-       uint32_t spqf, ftqf, imir, imir_ext;
-
-       if (hw->mac.type != e1000_82576)
-               return -ENOSYS;
+       struct e1000_filter_info *filter_info =
+               E1000_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
+       struct e1000_5tuple_filter_info filter_5tuple;
+       struct e1000_5tuple_filter *filter;
+       int ret;
 
-       if (index >= E1000_MAX_FTQF_FILTERS)
-               return -EINVAL;  /* filter index is out of range. */
+       memset(&filter_5tuple, 0, sizeof(struct e1000_5tuple_filter_info));
+       ret = ntuple_filter_to_5tuple_82576(ntuple_filter,
+                                           &filter_5tuple);
+       if (ret < 0)
+               return ret;
 
-       ftqf = E1000_READ_REG(hw, E1000_FTQF(index));
-       if (ftqf & E1000_FTQF_QUEUE_ENABLE) {
-               filter->src_ip_mask =
-                       (ftqf & E1000_FTQF_SOURCE_ADDR_MASK) ? 1 : 0;
-               filter->dst_ip_mask =
-                       (ftqf & E1000_FTQF_DEST_ADDR_MASK) ? 1 : 0;
-               filter->src_port_mask =
-                       (ftqf & E1000_FTQF_SOURCE_PORT_MASK) ? 1 : 0;
-               filter->protocol_mask =
-                       (ftqf & E1000_FTQF_PROTOCOL_COMP_MASK) ? 1 : 0;
-               filter->protocol =
-                       (uint8_t)ftqf & E1000_FTQF_PROTOCOL_MASK;
-               *rx_queue = (uint16_t)((ftqf & E1000_FTQF_QUEUE_MASK) >>
-                               E1000_FTQF_QUEUE_SHIFT);
-
-               spqf = E1000_READ_REG(hw, E1000_SPQF(index));
-               filter->src_port = spqf & E1000_SPQF_SRCPORT;
-
-               filter->dst_ip = E1000_READ_REG(hw, E1000_DAQF(index));
-               filter->src_ip = E1000_READ_REG(hw, E1000_SAQF(index));
-
-               imir = E1000_READ_REG(hw, E1000_IMIR(index));
-               filter->dst_port_mask = (imir & E1000_IMIR_PORT_BP) ? 1 : 0;
-               filter->dst_port = (uint16_t)(imir & E1000_IMIR_DSTPORT);
-               filter->priority = (imir & E1000_IMIR_PRIORITY) >>
-                       E1000_IMIR_PRIORITY_SHIFT;
-
-               imir_ext = E1000_READ_REG(hw, E1000_IMIREXT(index));
-               if (!(imir_ext & E1000_IMIR_EXT_CTRL_BP)) {
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_UGR)
-                               filter->tcp_flags |= TCP_UGR_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_ACK)
-                               filter->tcp_flags |= TCP_ACK_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_PSH)
-                               filter->tcp_flags |= TCP_PSH_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_RST)
-                               filter->tcp_flags |= TCP_RST_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_SYN)
-                               filter->tcp_flags |= TCP_SYN_FLAG;
-                       if (imir_ext & E1000_IMIR_EXT_CTRL_FIN)
-                               filter->tcp_flags |= TCP_FIN_FLAG;
-               } else
-                       filter->tcp_flags = 0;
-               return 0;
+       filter = igb_5tuple_filter_lookup_82576(&filter_info->fivetuple_list,
+                                        &filter_5tuple);
+       if (filter == NULL) {
+               PMD_DRV_LOG(ERR, "filter doesn't exist.");
+               return -ENOENT;
        }
-       return -ENOENT;
+
+       filter_info->fivetuple_mask &= ~(1 << filter->index);
+       TAILQ_REMOVE(&filter_info->fivetuple_list, filter, entries);
+       rte_free(filter);
+
+       E1000_WRITE_REG(hw, E1000_FTQF(filter->index),
+                       E1000_FTQF_VF_BP | E1000_FTQF_MASK);
+       E1000_WRITE_REG(hw, E1000_DAQF(filter->index), 0);
+       E1000_WRITE_REG(hw, E1000_SAQF(filter->index), 0);
+       E1000_WRITE_REG(hw, E1000_SPQF(filter->index), 0);
+       E1000_WRITE_REG(hw, E1000_IMIR(filter->index), 0);
+       E1000_WRITE_REG(hw, E1000_IMIREXT(filter->index), 0);
+       return 0;
 }
 
 static int
@@ -3149,6 +3260,385 @@ eth_igb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        return 0;
 }
 
+/*
+ * igb_add_del_ntuple_filter - add or delete a ntuple filter
+ *
+ * @param
+ * dev: Pointer to struct rte_eth_dev.
+ * ntuple_filter: Pointer to struct rte_eth_ntuple_filter
+ * add: if true, add filter, if false, remove filter
+ *
+ * @return
+ *    - On success, zero.
+ *    - On failure, a negative value.
+ */
+static int
+igb_add_del_ntuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter,
+                       bool add)
+{
+       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       int ret;
+
+       switch (ntuple_filter->flags) {
+       case RTE_5TUPLE_FLAGS:
+       case (RTE_5TUPLE_FLAGS | RTE_NTUPLE_FLAGS_TCP_FLAG):
+               if (hw->mac.type != e1000_82576)
+                       return -ENOTSUP;
+               if (add)
+                       ret = igb_add_5tuple_filter_82576(dev,
+                                                         ntuple_filter);
+               else
+                       ret = igb_remove_5tuple_filter_82576(dev,
+                                                            ntuple_filter);
+               break;
+       case RTE_2TUPLE_FLAGS:
+       case (RTE_2TUPLE_FLAGS | RTE_NTUPLE_FLAGS_TCP_FLAG):
+               if (hw->mac.type != e1000_82580 && hw->mac.type != e1000_i350)
+                       return -ENOTSUP;
+               if (add)
+                       ret = igb_add_2tuple_filter(dev, ntuple_filter);
+               else
+                       ret = igb_remove_2tuple_filter(dev, ntuple_filter);
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return ret;
+}
+
+/*
+ * igb_get_ntuple_filter - get a ntuple filter
+ *
+ * @param
+ * dev: Pointer to struct rte_eth_dev.
+ * ntuple_filter: Pointer to struct rte_eth_ntuple_filter
+ *
+ * @return
+ *    - On success, zero.
+ *    - On failure, a negative value.
+ */
+static int
+igb_get_ntuple_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ntuple_filter *ntuple_filter)
+{
+       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_5tuple_filter_info filter_5tuple;
+       struct e1000_2tuple_filter_info filter_2tuple;
+       struct e1000_5tuple_filter *p_5tuple_filter;
+       struct e1000_2tuple_filter *p_2tuple_filter;
+       int ret;
+
+       switch (ntuple_filter->flags) {
+       case RTE_5TUPLE_FLAGS:
+       case (RTE_5TUPLE_FLAGS | RTE_NTUPLE_FLAGS_TCP_FLAG):
+               if (hw->mac.type != e1000_82576)
+                       return -ENOTSUP;
+               memset(&filter_5tuple,
+                       0,
+                       sizeof(struct e1000_5tuple_filter_info));
+               ret = ntuple_filter_to_5tuple_82576(ntuple_filter,
+                                                   &filter_5tuple);
+               if (ret < 0)
+                       return ret;
+               p_5tuple_filter = igb_5tuple_filter_lookup_82576(
+                                       &filter_info->fivetuple_list,
+                                       &filter_5tuple);
+               if (p_5tuple_filter == NULL) {
+                       PMD_DRV_LOG(ERR, "filter doesn't exist.");
+                       return -ENOENT;
+               }
+               ntuple_filter->queue = p_5tuple_filter->queue;
+               break;
+       case RTE_2TUPLE_FLAGS:
+       case (RTE_2TUPLE_FLAGS | RTE_NTUPLE_FLAGS_TCP_FLAG):
+               if (hw->mac.type != e1000_82580 && hw->mac.type != e1000_i350)
+                       return -ENOTSUP;
+               memset(&filter_2tuple,
+                       0,
+                       sizeof(struct e1000_2tuple_filter_info));
+               ret = ntuple_filter_to_2tuple(ntuple_filter, &filter_2tuple);
+               if (ret < 0)
+                       return ret;
+               p_2tuple_filter = igb_2tuple_filter_lookup(
+                                       &filter_info->twotuple_list,
+                                       &filter_2tuple);
+               if (p_2tuple_filter == NULL) {
+                       PMD_DRV_LOG(ERR, "filter doesn't exist.");
+                       return -ENOENT;
+               }
+               ntuple_filter->queue = p_2tuple_filter->queue;
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+
+       return 0;
+}
+
+/*
+ * igb_ntuple_filter_handle - Handle operations for ntuple filter.
+ * @dev: pointer to rte_eth_dev structure
+ * @filter_op:operation will be taken.
+ * @arg: a pointer to specific structure corresponding to the filter_op
+ */
+static int
+igb_ntuple_filter_handle(struct rte_eth_dev *dev,
+                               enum rte_filter_op filter_op,
+                               void *arg)
+{
+       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       int ret;
+
+       MAC_TYPE_FILTER_SUP(hw->mac.type);
+
+       if (filter_op == RTE_ETH_FILTER_NOP)
+               return 0;
+
+       if (arg == NULL) {
+               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
+                           filter_op);
+               return -EINVAL;
+       }
+
+       switch (filter_op) {
+       case RTE_ETH_FILTER_ADD:
+               ret = igb_add_del_ntuple_filter(dev,
+                       (struct rte_eth_ntuple_filter *)arg,
+                       TRUE);
+               break;
+       case RTE_ETH_FILTER_DELETE:
+               ret = igb_add_del_ntuple_filter(dev,
+                       (struct rte_eth_ntuple_filter *)arg,
+                       FALSE);
+               break;
+       case RTE_ETH_FILTER_GET:
+               ret = igb_get_ntuple_filter(dev,
+                       (struct rte_eth_ntuple_filter *)arg);
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
+               ret = -EINVAL;
+               break;
+       }
+       return ret;
+}
+
+static inline int
+igb_ethertype_filter_lookup(struct e1000_filter_info *filter_info,
+                       uint16_t ethertype)
+{
+       int i;
+
+       for (i = 0; i < E1000_MAX_ETQF_FILTERS; i++) {
+               if (filter_info->ethertype_filters[i] == ethertype &&
+                   (filter_info->ethertype_mask & (1 << i)))
+                       return i;
+       }
+       return -1;
+}
+
+static inline int
+igb_ethertype_filter_insert(struct e1000_filter_info *filter_info,
+                       uint16_t ethertype)
+{
+       int i;
+
+       for (i = 0; i < E1000_MAX_ETQF_FILTERS; i++) {
+               if (!(filter_info->ethertype_mask & (1 << i))) {
+                       filter_info->ethertype_mask |= 1 << i;
+                       filter_info->ethertype_filters[i] = ethertype;
+                       return i;
+               }
+       }
+       return -1;
+}
+
+static inline int
+igb_ethertype_filter_remove(struct e1000_filter_info *filter_info,
+                       uint8_t idx)
+{
+       if (idx >= E1000_MAX_ETQF_FILTERS)
+               return -1;
+       filter_info->ethertype_mask &= ~(1 << idx);
+       filter_info->ethertype_filters[idx] = 0;
+       return idx;
+}
+
+
+static int
+igb_add_del_ethertype_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ethertype_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);
+       uint32_t etqf = 0;
+       int ret;
+
+       if (filter->ether_type == ETHER_TYPE_IPv4 ||
+               filter->ether_type == ETHER_TYPE_IPv6) {
+               PMD_DRV_LOG(ERR, "unsupported ether_type(0x%04x) in"
+                       " ethertype filter.", filter->ether_type);
+               return -EINVAL;
+       }
+
+       if (filter->flags & RTE_ETHTYPE_FLAGS_MAC) {
+               PMD_DRV_LOG(ERR, "mac compare is unsupported.");
+               return -EINVAL;
+       }
+       if (filter->flags & RTE_ETHTYPE_FLAGS_DROP) {
+               PMD_DRV_LOG(ERR, "drop option is unsupported.");
+               return -EINVAL;
+       }
+
+       ret = igb_ethertype_filter_lookup(filter_info, filter->ether_type);
+       if (ret >= 0 && add) {
+               PMD_DRV_LOG(ERR, "ethertype (0x%04x) filter exists.",
+                           filter->ether_type);
+               return -EEXIST;
+       }
+       if (ret < 0 && !add) {
+               PMD_DRV_LOG(ERR, "ethertype (0x%04x) filter doesn't exist.",
+                           filter->ether_type);
+               return -ENOENT;
+       }
+
+       if (add) {
+               ret = igb_ethertype_filter_insert(filter_info,
+                       filter->ether_type);
+               if (ret < 0) {
+                       PMD_DRV_LOG(ERR, "ethertype filters are full.");
+                       return -ENOSYS;
+               }
+
+               etqf |= E1000_ETQF_FILTER_ENABLE | E1000_ETQF_QUEUE_ENABLE;
+               etqf |= (uint32_t)(filter->ether_type & E1000_ETQF_ETHERTYPE);
+               etqf |= filter->queue << E1000_ETQF_QUEUE_SHIFT;
+       } else {
+               ret = igb_ethertype_filter_remove(filter_info, (uint8_t)ret);
+               if (ret < 0)
+                       return -ENOSYS;
+       }
+       E1000_WRITE_REG(hw, E1000_ETQF(ret), etqf);
+       E1000_WRITE_FLUSH(hw);
+
+       return 0;
+}
+
+static int
+igb_get_ethertype_filter(struct rte_eth_dev *dev,
+                       struct rte_eth_ethertype_filter *filter)
+{
+       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);
+       uint32_t etqf;
+       int ret;
+
+       ret = igb_ethertype_filter_lookup(filter_info, filter->ether_type);
+       if (ret < 0) {
+               PMD_DRV_LOG(ERR, "ethertype (0x%04x) filter doesn't exist.",
+                           filter->ether_type);
+               return -ENOENT;
+       }
+
+       etqf = E1000_READ_REG(hw, E1000_ETQF(ret));
+       if (etqf & E1000_ETQF_FILTER_ENABLE) {
+               filter->ether_type = etqf & E1000_ETQF_ETHERTYPE;
+               filter->flags = 0;
+               filter->queue = (etqf & E1000_ETQF_QUEUE) >>
+                               E1000_ETQF_QUEUE_SHIFT;
+               return 0;
+       }
+
+       return -ENOENT;
+}
+
+/*
+ * igb_ethertype_filter_handle - Handle operations for ethertype filter.
+ * @dev: pointer to rte_eth_dev structure
+ * @filter_op:operation will be taken.
+ * @arg: a pointer to specific structure corresponding to the filter_op
+ */
+static int
+igb_ethertype_filter_handle(struct rte_eth_dev *dev,
+                               enum rte_filter_op filter_op,
+                               void *arg)
+{
+       struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       int ret;
+
+       MAC_TYPE_FILTER_SUP(hw->mac.type);
+
+       if (filter_op == RTE_ETH_FILTER_NOP)
+               return 0;
+
+       if (arg == NULL) {
+               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
+                           filter_op);
+               return -EINVAL;
+       }
+
+       switch (filter_op) {
+       case RTE_ETH_FILTER_ADD:
+               ret = igb_add_del_ethertype_filter(dev,
+                       (struct rte_eth_ethertype_filter *)arg,
+                       TRUE);
+               break;
+       case RTE_ETH_FILTER_DELETE:
+               ret = igb_add_del_ethertype_filter(dev,
+                       (struct rte_eth_ethertype_filter *)arg,
+                       FALSE);
+               break;
+       case RTE_ETH_FILTER_GET:
+               ret = igb_get_ethertype_filter(dev,
+                       (struct rte_eth_ethertype_filter *)arg);
+               break;
+       default:
+               PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
+               ret = -EINVAL;
+               break;
+       }
+       return ret;
+}
+
+static int
+eth_igb_filter_ctrl(struct rte_eth_dev *dev,
+                    enum rte_filter_type filter_type,
+                    enum rte_filter_op filter_op,
+                    void *arg)
+{
+       int ret = -EINVAL;
+
+       switch (filter_type) {
+       case RTE_ETH_FILTER_NTUPLE:
+               ret = igb_ntuple_filter_handle(dev, filter_op, arg);
+               break;
+       case RTE_ETH_FILTER_ETHERTYPE:
+               ret = igb_ethertype_filter_handle(dev, filter_op, arg);
+               break;
+       case RTE_ETH_FILTER_SYN:
+               ret = eth_igb_syn_filter_handle(dev, filter_op, arg);
+               break;
+       case RTE_ETH_FILTER_FLEXIBLE:
+               ret = eth_igb_flex_filter_handle(dev, filter_op, arg);
+               break;
+       default:
+               PMD_DRV_LOG(WARNING, "Filter type (%d) not supported",
+                                                       filter_type);
+               break;
+       }
+
+       return ret;
+}
+
 static struct rte_driver pmd_igb_drv = {
        .type = PMD_PDEV,
        .init = rte_igb_pmd_init,