net/bnxt: cleanup comments

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

diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index c42cbf1..85d2354 100644 (file)
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -17,7 +17,6 @@
 #include "bnxt_ring.h"
 #include "bnxt_rxq.h"
 #include "bnxt_vnic.h"
-#include "bnxt_util.h"
 #include "hsi_struct_def_dpdk.h"
 
 static int
@@ -1088,10 +1087,6 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
                    vnic->fw_vnic_id != INVALID_HW_RING_ID)
                        goto use_vnic;
 
-               //if (!rxq ||
-                   //bp->vnic_info[0].fw_grp_ids[act_q->index] !=
-                   //INVALID_HW_RING_ID ||
-                   //!rxq->rx_deferred_start) {
                if (!rxq ||
                    bp->vnic_info[0].fw_grp_ids[act_q->index] !=
                    INVALID_HW_RING_ID) {
@@ -1161,7 +1156,7 @@ use_vnic:
                                           RTE_FLOW_ERROR_TYPE_ACTION,
                                           act,
                                           "Filter not available");
-                       rc = -ENOSPC;
+                       rc = -rte_errno;
                        goto ret;
                }
 
@@ -1251,7 +1246,7 @@ use_vnic:
                                           RTE_FLOW_ERROR_TYPE_ACTION,
                                           act,
                                           "New filter not available");
-                       rc = -ENOSPC;
+                       rc = -rte_errno;
                        goto ret;
                }
 
@@ -1321,9 +1316,6 @@ use_vnic:
                        }
                        rxq = bp->rx_queues[rss->queue[i]];
 
-                       //if (bp->vnic_info[0].fw_grp_ids[rss->queue[i]] !=
-                           //INVALID_HW_RING_ID ||
-                           //!rxq->rx_deferred_start) {
                        if (bp->vnic_info[0].fw_grp_ids[rss->queue[i]] !=
                            INVALID_HW_RING_ID) {
                                PMD_DRV_LOG(ERR,
@@ -1415,7 +1407,7 @@ vnic_found:
                                           RTE_FLOW_ERROR_TYPE_ACTION,
                                           act,
                                           "New filter not available");
-                       rc = -ENOSPC;
+                       rc = -rte_errno;
                        goto ret;
                }
 
@@ -1520,7 +1512,6 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
                        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");
                }
        }
@@ -1753,36 +1744,20 @@ bnxt_flow_create(struct rte_eth_dev *dev,
        vnic = find_matching_vnic(bp, filter);
 done:
        if (!ret || update_flow) {
-               flow->filter = filter;
-               flow->vnic = vnic;
-               /* VNIC is set only in case of queue or RSS action */
-               if (vnic) {
-                       /*
-                        * RxQ0 is not used for flow filters.
-                        */
-
-                       if (update_flow) {
-                               ret = -EXDEV;
-                               goto free_flow;
-                       }
-                       STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
-               }
-               PMD_DRV_LOG(ERR, "Successfully created flow.\n");
-               STAILQ_INSERT_TAIL(&vnic->flow_list, flow, next);
-               bnxt_release_flow_lock(bp);
-               return flow;
-       }
-       if (!ret) {
                flow->filter = filter;
                flow->vnic = vnic;
                if (update_flow) {
                        ret = -EXDEV;
                        goto free_flow;
                }
+
+               STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
                PMD_DRV_LOG(ERR, "Successfully created flow.\n");
                STAILQ_INSERT_TAIL(&vnic->flow_list, flow, next);
+               bnxt_release_flow_lock(bp);
                return flow;
        }
+
 free_filter:
        bnxt_free_filter(bp, filter);
 free_flow:
@@ -1925,7 +1900,6 @@ done:
 
                        bnxt_hwrm_vnic_free(bp, vnic);
                        vnic->rx_queue_cnt = 0;
-                       bp->nr_vnics--;
                }
        } else {
                rte_flow_error_set(error, -ret,
@@ -1941,6 +1915,7 @@ static int
 bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
 {
        struct bnxt *bp = dev->data->dev_private;
+       struct bnxt_filter_info *filter = NULL;
        struct bnxt_vnic_info *vnic;
        struct rte_flow *flow;
        unsigned int i;
@@ -1949,11 +1924,12 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
        bnxt_acquire_flow_lock(bp);
        for (i = 0; i < bp->max_vnics; i++) {
                vnic = &bp->vnic_info[i];
-               if (vnic->fw_vnic_id == INVALID_VNIC_ID)
+               if (vnic && vnic->fw_vnic_id == INVALID_VNIC_ID)
                        continue;
 
-               STAILQ_FOREACH(flow, &vnic->flow_list, next) {
-                       struct bnxt_filter_info *filter = flow->filter;
+               while (!STAILQ_EMPTY(&vnic->flow_list)) {
+                       flow = STAILQ_FIRST(&vnic->flow_list);
+                       filter = flow->filter;
 
                        if (filter->filter_type ==
                            HWRM_CFA_TUNNEL_REDIRECT_FILTER &&
@@ -1974,7 +1950,7 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
                                ret = bnxt_hwrm_clear_em_filter(bp, filter);
                        if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)
                                ret = bnxt_hwrm_clear_ntuple_filter(bp, filter);
-                       else if (!i)
+                       else if (i)
                                ret = bnxt_hwrm_clear_l2_filter(bp, filter);
 
                        if (ret) {
@@ -1988,10 +1964,27 @@ bnxt_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
                                return -rte_errno;
                        }
 done:
-                       bnxt_free_filter(bp, filter);
                        STAILQ_REMOVE(&vnic->flow_list, flow,
                                      rte_flow, next);
+
+                       STAILQ_REMOVE(&vnic->filter,
+                                     filter,
+                                     bnxt_filter_info,
+                                     next);
+                       bnxt_free_filter(bp, filter);
+
                        rte_free(flow);
+
+                       /* If this was the last flow associated with this vnic,
+                        * switch the queue back to RSS pool.
+                        */
+                       if (STAILQ_EMPTY(&vnic->flow_list)) {
+                               rte_free(vnic->fw_grp_ids);
+                               if (vnic->rx_queue_cnt > 1)
+                                       bnxt_hwrm_vnic_ctx_free(bp, vnic);
+                               bnxt_hwrm_vnic_free(bp, vnic);
+                               vnic->rx_queue_cnt = 0;
+                       }
                }
        }