net/bnxt: cleanup VNIC after flow validate

When an application issues flow validate, we free the temporary
filter that is created. But the vnic is not freed up. This can
potentially interfere with subsequent flow creation. So free the vnic.

Reviewed-by: Rahul Gupta <rahul.gupta@broadcom.com>
Reviewed-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index 33f4b07..2e2b21d 100644 (file)
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1355,6 +1355,25 @@ ret:
        return rc;
 }
 
+static
+struct bnxt_vnic_info *find_matching_vnic(struct bnxt *bp,
+                                         struct bnxt_filter_info *filter)
+{
+       struct bnxt_vnic_info *vnic = NULL;
+       unsigned int i;
+
+       for (i = 0; i < bp->max_vnics; i++) {
+               vnic = &bp->vnic_info[i];
+               if (vnic->fw_vnic_id != INVALID_VNIC_ID &&
+                   filter->dst_id == vnic->fw_vnic_id) {
+                       PMD_DRV_LOG(DEBUG, "Found matching VNIC Id %d\n",
+                                   vnic->ff_pool_idx);
+                       return vnic;
+               }
+       }
+       return NULL;
+}
+
 static int
 bnxt_flow_validate(struct rte_eth_dev *dev,
                   const struct rte_flow_attr *attr,
@@ -1363,6 +1382,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
                   struct rte_flow_error *error)
 {
        struct bnxt *bp = dev->data->dev_private;
+       struct bnxt_vnic_info *vnic = NULL;
        struct bnxt_filter_info *filter;
        int ret = 0;
 
@@ -1378,6 +1398,26 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
 
        ret = bnxt_validate_and_parse_flow(dev, pattern, actions, attr,
                                           error, filter);
+
+       vnic = find_matching_vnic(bp, filter);
+       if (vnic) {
+               if (STAILQ_EMPTY(&vnic->filter)) {
+                       rte_free(vnic->fw_grp_ids);
+                       bnxt_hwrm_vnic_ctx_free(bp, vnic);
+                       bnxt_hwrm_vnic_free(bp, vnic);
+                       vnic->rx_queue_cnt = 0;
+                       bp->nr_vnics--;
+                       PMD_DRV_LOG(DEBUG, "Free VNIC\n");
+               }
+       }
+
+       if (filter->filter_type == HWRM_CFA_EM_FILTER)
+               bnxt_hwrm_clear_em_filter(bp, filter);
+       else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)
+               bnxt_hwrm_clear_ntuple_filter(bp, filter);
+       else
+               bnxt_hwrm_clear_l2_filter(bp, filter);
+
        /* No need to hold on to this filter if we are just validating flow */
        filter->fw_l2_filter_id = UINT64_MAX;
        bnxt_free_filter(bp, filter);
@@ -1414,7 +1454,7 @@ bnxt_match_filter(struct bnxt *bp, struct bnxt_filter_info *nf)
        struct rte_flow *flow;
        int i;
 
-       for (i = bp->max_vnics; i >= 0; i--) {
+       for (i = bp->max_vnics - 1; i >= 0; i--) {
                struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
 
                if (vnic->fw_vnic_id == INVALID_VNIC_ID)
@@ -1484,7 +1524,6 @@ bnxt_flow_create(struct rte_eth_dev *dev,
        struct bnxt_filter_info *filter;
        bool update_flow = false;
        struct rte_flow *flow;
-       unsigned int i;
        int ret = 0;
        uint32_t tun_type;
 
@@ -1585,15 +1624,7 @@ bnxt_flow_create(struct rte_eth_dev *dev,
                ret = bnxt_hwrm_set_ntuple_filter(bp, filter->dst_id, filter);
        }
 
-       for (i = 0; i < bp->max_vnics; i++) {
-               vnic = &bp->vnic_info[i];
-               if (vnic->fw_vnic_id != INVALID_VNIC_ID &&
-                   filter->dst_id == vnic->fw_vnic_id) {
-                       PMD_DRV_LOG(ERR, "Found matching VNIC Id %d\n",
-                                   vnic->ff_pool_idx);
-                       break;
-               }
-       }
+       vnic = find_matching_vnic(bp, filter);
 done:
        if (!ret || update_flow) {
                flow->filter = filter;
@@ -1734,26 +1765,9 @@ done:
                 */
                if (vnic && STAILQ_EMPTY(&vnic->flow_list)) {
                        rte_free(vnic->fw_grp_ids);
-                       if (vnic->rx_queue_cnt > 1) {
-                               if (BNXT_CHIP_THOR(bp)) {
-                                       int j;
-
-                                       for (j = 0; j < vnic->num_lb_ctxts;
-                                            j++) {
-                                               bnxt_hwrm_vnic_ctx_free(bp,
-                                                                        vnic,
-                                                                        vnic->fw_grp_ids[j]);
-                                               vnic->fw_grp_ids[j] =
-                                                       INVALID_HW_RING_ID;
-                                       }
-                                       vnic->num_lb_ctxts = 0;
-                               } else {
-                                       bnxt_hwrm_vnic_ctx_free(bp,
-                                                               vnic,
-                                                               vnic->rss_rule);
-                                       vnic->rss_rule = INVALID_HW_RING_ID;
-                               }
-                       }
+                       if (vnic->rx_queue_cnt > 1)
+                               bnxt_hwrm_vnic_ctx_free(bp, vnic);
+
                        bnxt_hwrm_vnic_free(bp, vnic);
                        vnic->rx_queue_cnt = 0;
                        bp->nr_vnics--;

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 5cb3949..89697b8 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1776,8 +1776,9 @@ int bnxt_hwrm_vnic_ctx_alloc(struct bnxt *bp,
        return rc;
 }
 
-int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp,
-                           struct bnxt_vnic_info *vnic, uint16_t ctx_idx)
+static
+int _bnxt_hwrm_vnic_ctx_free(struct bnxt *bp,
+                            struct bnxt_vnic_info *vnic, uint16_t ctx_idx)
 {
        int rc = 0;
        struct hwrm_vnic_rss_cos_lb_ctx_free_input req = {.req_type = 0 };
@@ -1800,6 +1801,28 @@ int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp,
        return rc;
 }
 
+int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic)
+{
+       int rc = 0;
+
+       if (BNXT_CHIP_THOR(bp)) {
+               int j;
+
+               for (j = 0; j < vnic->num_lb_ctxts; j++) {
+                       rc = _bnxt_hwrm_vnic_ctx_free(bp,
+                                                     vnic,
+                                                     vnic->fw_grp_ids[j]);
+                       vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
+               }
+               vnic->num_lb_ctxts = 0;
+       } else {
+               rc = _bnxt_hwrm_vnic_ctx_free(bp, vnic, vnic->rss_rule);
+               vnic->rss_rule = INVALID_HW_RING_ID;
+       }
+
+       return rc;
+}
+
 int bnxt_hwrm_vnic_free(struct bnxt *bp, struct bnxt_vnic_info *vnic)
 {
        int rc = 0;
@@ -2416,7 +2439,7 @@ void bnxt_free_tunnel_ports(struct bnxt *bp)
 
 void bnxt_free_all_hwrm_resources(struct bnxt *bp)
 {
-       int i, j;
+       int i;
 
        if (bp->vnic_info == NULL)
                return;
@@ -2436,17 +2459,7 @@ void bnxt_free_all_hwrm_resources(struct bnxt *bp)
 
                bnxt_clear_hwrm_vnic_filters(bp, vnic);
 
-               if (BNXT_CHIP_THOR(bp)) {
-                       for (j = 0; j < vnic->num_lb_ctxts; j++) {
-                               bnxt_hwrm_vnic_ctx_free(bp, vnic,
-                                                       vnic->fw_grp_ids[j]);
-                               vnic->fw_grp_ids[j] = INVALID_HW_RING_ID;
-                       }
-                       vnic->num_lb_ctxts = 0;
-               } else {
-                       bnxt_hwrm_vnic_ctx_free(bp, vnic, vnic->rss_rule);
-                       vnic->rss_rule = INVALID_HW_RING_ID;
-               }
+               bnxt_hwrm_vnic_ctx_free(bp, vnic);
 
                bnxt_hwrm_vnic_tpa_cfg(bp, vnic, false);
 

diff --git a/drivers/net/bnxt/bnxt_hwrm.h b/drivers/net/bnxt/bnxt_hwrm.h
index 3a49c49..07181d4 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.h
+++ b/drivers/net/bnxt/bnxt_hwrm.h
@@ -112,8 +112,7 @@ int bnxt_hwrm_vnic_qcfg(struct bnxt *bp, struct bnxt_vnic_info *vnic,
                                int16_t fw_vf_id);
 int bnxt_hwrm_vnic_ctx_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic,
                             uint16_t ctx_idx);
-int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic,
-                           uint16_t ctx_idx);
+int bnxt_hwrm_vnic_ctx_free(struct bnxt *bp, struct bnxt_vnic_info *vnic);
 int bnxt_hwrm_vnic_free(struct bnxt *bp, struct bnxt_vnic_info *vnic);
 int bnxt_hwrm_vnic_rss_cfg(struct bnxt *bp,
                           struct bnxt_vnic_info *vnic);