net/bnxt: fix duplicate pattern for 5tuple filter

[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 475faac..41b23cc 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -590,6 +590,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
        if (rc)
                goto error;
 
+       bp->flags |= BNXT_FLAG_INIT_DONE;
        return 0;
 
 error:
@@ -635,6 +636,7 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        }
        bnxt_set_hwrm_link_config(bp, false);
        bnxt_hwrm_port_clr_stats(bp);
+       bp->flags &= ~BNXT_FLAG_INIT_DONE;
        bnxt_shutdown_nic(bp);
        bp->dev_stopped = 1;
 }
@@ -1730,9 +1732,9 @@ bnxt_match_and_validate_ether_filter(struct bnxt *bp,
        int match = 0;
        *ret = 0;
 
-       if (efilter->ether_type != ETHER_TYPE_IPv4 &&
-               efilter->ether_type != ETHER_TYPE_IPv6) {
-               RTE_LOG(ERR, PMD, "unsupported ether_type(0x%04x) in"
+       if (efilter->ether_type == ETHER_TYPE_IPv4 ||
+               efilter->ether_type == ETHER_TYPE_IPv6) {
+               RTE_LOG(ERR, PMD, "invalid ether_type(0x%04x) in"
                        " ethertype filter.", efilter->ether_type);
                *ret = -EINVAL;
                goto exit;
@@ -1960,7 +1962,8 @@ parse_ntuple_filter(struct bnxt *bp,
 
 static struct bnxt_filter_info*
 bnxt_match_ntuple_filter(struct bnxt *bp,
-                        struct bnxt_filter_info *bfilter)
+                        struct bnxt_filter_info *bfilter,
+                        struct bnxt_vnic_info **mvnic)
 {
        struct bnxt_filter_info *mfilter = NULL;
        int i;
@@ -1979,8 +1982,11 @@ bnxt_match_ntuple_filter(struct bnxt *bp,
                            bfilter->dst_port == mfilter->dst_port &&
                            bfilter->dst_port_mask == mfilter->dst_port_mask &&
                            bfilter->flags == mfilter->flags &&
-                           bfilter->enables == mfilter->enables)
+                           bfilter->enables == mfilter->enables) {
+                               if (mvnic)
+                                       *mvnic = vnic;
                                return mfilter;
+                       }
                }
        }
        return NULL;
@@ -1992,7 +1998,7 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
                       enum rte_filter_op filter_op)
 {
        struct bnxt_filter_info *bfilter, *mfilter, *filter1;
-       struct bnxt_vnic_info *vnic, *vnic0;
+       struct bnxt_vnic_info *vnic, *vnic0, *mvnic;
        int ret;
 
        if (nfilter->flags != RTE_5TUPLE_FLAGS) {
@@ -2030,12 +2036,22 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
        bfilter->ethertype = 0x800;
        bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
 
-       mfilter = bnxt_match_ntuple_filter(bp, bfilter);
+       mfilter = bnxt_match_ntuple_filter(bp, bfilter, &mvnic);
 
-       if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD) {
-               RTE_LOG(ERR, PMD, "filter exists.");
+       if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
+           bfilter->dst_id == mfilter->dst_id) {
+               RTE_LOG(ERR, PMD, "filter exists.\n");
                ret = -EEXIST;
                goto free_filter;
+       } else if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
+                  bfilter->dst_id != mfilter->dst_id) {
+               mfilter->dst_id = vnic->fw_vnic_id;
+               ret = bnxt_hwrm_set_ntuple_filter(bp, mfilter->dst_id, mfilter);
+               STAILQ_REMOVE(&mvnic->filter, mfilter, bnxt_filter_info, next);
+               STAILQ_INSERT_TAIL(&vnic->filter, mfilter, next);
+               RTE_LOG(ERR, PMD, "filter with matching pattern exists.\n");
+               RTE_LOG(ERR, PMD, " Updated it to the new destination queue\n");
+               goto free_filter;
        }
        if (mfilter == NULL && filter_op == RTE_ETH_FILTER_DELETE) {
                RTE_LOG(ERR, PMD, "filter doesn't exist.");
@@ -2057,11 +2073,11 @@ bnxt_cfg_ntuple_filter(struct bnxt *bp,
                }
                ret = bnxt_hwrm_clear_ntuple_filter(bp, mfilter);
 
-               STAILQ_REMOVE(&vnic->filter, mfilter, bnxt_filter_info,
-                             next);
+               STAILQ_REMOVE(&vnic->filter, mfilter, bnxt_filter_info, next);
                bnxt_free_filter(bp, mfilter);
-               bfilter->fw_l2_filter_id = -1;
+               mfilter->fw_l2_filter_id = -1;
                bnxt_free_filter(bp, bfilter);
+               bfilter->fw_l2_filter_id = -1;
        }
 
        return 0;