net/iavf: fix VLAN insertion

[dpdk.git] / drivers / net / i40e / i40e_fdir.c

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index da089ba..df2a5aa 100644 (file)
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -22,6 +22,7 @@
 #include <rte_sctp.h>
 #include <rte_hash_crc.h>
 #include <rte_bitmap.h>
+#include <rte_os_shim.h>
 
 #include "i40e_logs.h"
 #include "base/i40e_type.h"
@@ -159,7 +160,7 @@ i40e_fdir_setup(struct i40e_pf *pf)
        int err = I40E_SUCCESS;
        char z_name[RTE_MEMZONE_NAMESIZE];
        const struct rte_memzone *mz = NULL;
-       struct rte_eth_dev *eth_dev = pf->adapter->eth_dev;
+       struct rte_eth_dev *eth_dev = &rte_eth_devices[pf->dev_data->port_id];
        uint16_t i;
 
        if ((pf->flags & I40E_FLAG_FDIR) == 0) {
@@ -263,10 +264,10 @@ i40e_fdir_setup(struct i40e_pf *pf)
        return I40E_SUCCESS;
 
 fail_mem:
-       i40e_dev_rx_queue_release(pf->fdir.rxq);
+       i40e_rx_queue_release(pf->fdir.rxq);
        pf->fdir.rxq = NULL;
 fail_setup_rx:
-       i40e_dev_tx_queue_release(pf->fdir.txq);
+       i40e_tx_queue_release(pf->fdir.txq);
        pf->fdir.txq = NULL;
 fail_setup_tx:
        i40e_vsi_release(vsi);
@@ -283,7 +284,6 @@ i40e_fdir_teardown(struct i40e_pf *pf)
 {
        struct i40e_hw *hw = I40E_PF_TO_HW(pf);
        struct i40e_vsi *vsi;
-       struct rte_eth_dev *dev = pf->adapter->eth_dev;
 
        vsi = pf->fdir.fdir_vsi;
        if (!vsi)
@@ -300,11 +300,9 @@ i40e_fdir_teardown(struct i40e_pf *pf)
        if (err)
                PMD_DRV_LOG(DEBUG, "Failed to do FDIR RX switch off");
 
-       i40e_dev_rx_queue_release(pf->fdir.rxq);
-       rte_eth_dma_zone_free(dev, "fdir_rx_ring", pf->fdir.rxq->queue_id);
+       i40e_rx_queue_release(pf->fdir.rxq);
        pf->fdir.rxq = NULL;
-       i40e_dev_tx_queue_release(pf->fdir.txq);
-       rte_eth_dma_zone_free(dev, "fdir_tx_ring", pf->fdir.txq->queue_id);
+       i40e_tx_queue_release(pf->fdir.txq);
        pf->fdir.txq = NULL;
        i40e_vsi_release(vsi);
        pf->fdir.fdir_vsi = NULL;
@@ -1606,18 +1604,22 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf,
        }
 
        /* Check if the configuration is conflicted */
-       if (pf->fdir.inset_flag[pctype] &&
-           memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
-               return -1;
+       if (pf->fdir.flow_count[pctype] &&
+           memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t))) {
+               PMD_DRV_LOG(ERR, "Conflict with the first rule's input set.");
+               return -EINVAL;
+       }
 
-       if (pf->fdir.inset_flag[pctype] &&
+       if (pf->fdir.flow_count[pctype] &&
            !memcmp(&pf->fdir.input_set[pctype], &input_set, sizeof(uint64_t)))
                return 0;
 
        num = i40e_generate_inset_mask_reg(hw, input_set, mask_reg,
                                                 I40E_INSET_MASK_NUM_REG);
-       if (num < 0)
+       if (num < 0) {
+               PMD_DRV_LOG(ERR, "Invalid pattern mask.");
                return -EINVAL;
+       }
 
        if (pf->support_multi_driver) {
                for (i = 0; i < num; i++)
@@ -1661,7 +1663,6 @@ i40e_flow_set_fdir_inset(struct i40e_pf *pf,
        I40E_WRITE_FLUSH(hw);
 
        pf->fdir.input_set[pctype] = input_set;
-       pf->fdir.inset_flag[pctype] = 1;
        return 0;
 }
 
@@ -1762,18 +1763,16 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
        i40e_fdir_filter_convert(filter, &check_filter);
 
        if (add) {
-               if (filter->input.flow_ext.is_flex_flow) {
+               /* configure the input set for common PCTYPEs*/
+               if (!filter->input.flow_ext.customized_pctype &&
+                   !filter->input.flow_ext.pkt_template) {
                        ret = i40e_flow_set_fdir_inset(pf, pctype,
                                        filter->input.flow_ext.input_set);
-                       if (ret == -1) {
-                               PMD_DRV_LOG(ERR, "Conflict with the"
-                                           " first rule's input set.");
-                               return -EINVAL;
-                       } else if (ret == -EINVAL) {
-                               PMD_DRV_LOG(ERR, "Invalid pattern mask.");
-                               return -EINVAL;
-                       }
+                       if (ret < 0)
+                               return ret;
+               }
 
+               if (filter->input.flow_ext.is_flex_flow) {
                        for (i = 0; i < filter->input.flow_ext.raw_id; i++) {
                                layer_idx = filter->input.flow_ext.layer_idx;
                                field_idx = layer_idx * I40E_MAX_FLXPLD_FIED + i;
@@ -1887,11 +1886,13 @@ i40e_flow_add_del_fdir_filter(struct rte_eth_dev *dev,
        }
 
        if (add) {
+               fdir_info->flow_count[pctype]++;
                fdir_info->fdir_actual_cnt++;
                if (fdir_info->fdir_invalprio == 1 &&
                                fdir_info->fdir_guarantee_free_space > 0)
                        fdir_info->fdir_guarantee_free_space--;
        } else {
+               fdir_info->flow_count[pctype]--;
                fdir_info->fdir_actual_cnt--;
                if (fdir_info->fdir_invalprio == 1 &&
                                fdir_info->fdir_guarantee_free_space <