net/bnxt: fix bumping of L2 filter reference count

[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 2bd492e..4b3b597 100644 (file)
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -867,7 +867,6 @@ bnxt_create_l2_filter(struct bnxt *bp, struct bnxt_filter_info *nf,
                bnxt_free_filter(bp, filter1);
                return NULL;
        }
-       filter1->l2_ref_cnt++;
        return filter1;
 }
 
@@ -994,6 +993,7 @@ bnxt_update_filter_flags_en(struct bnxt_filter_info *filter,
        }
        filter->fw_l2_filter_id = filter1->fw_l2_filter_id;
        filter->l2_ref_cnt = filter1->l2_ref_cnt;
+       filter->flow_id = filter1->flow_id;
        PMD_DRV_LOG(DEBUG,
                "l2_filter: %p fw_l2_filter_id %" PRIx64 " l2_ref_cnt %u\n",
                filter1, filter->fw_l2_filter_id, filter->l2_ref_cnt);
@@ -1036,6 +1036,8 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
                filter->flags = HWRM_CFA_EM_FLOW_ALLOC_INPUT_FLAGS_PATH_RX;
 
        use_ntuple = bnxt_filter_type_check(pattern, error);
+
+start:
        switch (act->type) {
        case RTE_FLOW_ACTION_TYPE_QUEUE:
                /* Allow this flow. Redirect to a VNIC. */
@@ -1191,6 +1193,7 @@ use_vnic:
                }
 
                filter->fw_l2_filter_id = filter1->fw_l2_filter_id;
+               filter->flow_id = filter1->flow_id;
                filter->flags = HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_METER;
                break;
        case RTE_FLOW_ACTION_TYPE_VF:
@@ -1259,6 +1262,7 @@ use_vnic:
                }
 
                filter->fw_l2_filter_id = filter1->fw_l2_filter_id;
+               filter->flow_id = filter1->flow_id;
                break;
        case RTE_FLOW_ACTION_TYPE_RSS:
                rss = (const struct rte_flow_action_rss *)act->conf;
@@ -1422,6 +1426,34 @@ vnic_found:
                PMD_DRV_LOG(DEBUG, "L2 filter created\n");
                bnxt_update_filter_flags_en(filter, filter1, use_ntuple);
                break;
+       case RTE_FLOW_ACTION_TYPE_MARK:
+               if (bp->flags & BNXT_FLAG_RX_VECTOR_PKT_MODE) {
+                       PMD_DRV_LOG(DEBUG,
+                                   "Disable vector processing for mark\n");
+                       rte_flow_error_set(error,
+                                          ENOTSUP,
+                                          RTE_FLOW_ERROR_TYPE_ACTION,
+                                          act,
+                                          "Disable vector processing for mark");
+                       rc = -rte_errno;
+                       goto ret;
+               }
+
+               if (bp->mark_table == NULL) {
+                       rte_flow_error_set(error,
+                                          ENOMEM,
+                                          RTE_FLOW_ERROR_TYPE_ACTION,
+                                          act,
+                                          "Mark table not allocated.");
+                       rc = -rte_errno;
+                       goto ret;
+               }
+
+               filter->valid_flags |= BNXT_FLOW_MARK_FLAG;
+               filter->mark = ((const struct rte_flow_action_mark *)
+                               act->conf)->id;
+               PMD_DRV_LOG(DEBUG, "Mark the flow %d\n", filter->mark);
+               break;
        default:
                rte_flow_error_set(error,
                                   EINVAL,
@@ -1434,20 +1466,17 @@ vnic_found:
 
 done:
        act = bnxt_flow_non_void_action(++act);
-       if (act->type != RTE_FLOW_ACTION_TYPE_END) {
-               rte_flow_error_set(error,
-                                  EINVAL,
-                                  RTE_FLOW_ERROR_TYPE_ACTION,
-                                  act,
-                                  "Invalid action.");
-               rc = -rte_errno;
-               goto ret;
-       }
+       while (act->type != RTE_FLOW_ACTION_TYPE_END)
+               goto start;
 
        return rc;
 ret:
 
-       //TODO: Cleanup according to ACTION TYPE.
+       if (filter1) {
+               bnxt_hwrm_clear_l2_filter(bp, filter1);
+               bnxt_free_filter(bp, filter1);
+       }
+
        if (rte_errno)  {
                if (vnic && STAILQ_EMPTY(&vnic->filter))
                        vnic->rx_queue_cnt = 0;
@@ -1455,7 +1484,7 @@ ret:
                if (rxq && !vnic->rx_queue_cnt)
                        rxq->vnic = &bp->vnic_info[0];
        }
-       return rc;
+       return -rte_errno;
 }
 
 static
@@ -1672,7 +1701,9 @@ bnxt_flow_create(struct rte_eth_dev *dev,
 
        filter = bnxt_get_unused_filter(bp);
        if (filter == NULL) {
-               PMD_DRV_LOG(ERR, "Not enough resources for a new flow.\n");
+               rte_flow_error_set(error, ENOSPC,
+                                  RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+                                  "Not enough resources for a new flow");
                goto free_flow;
        }
 
@@ -1759,6 +1790,17 @@ done:
                STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
                PMD_DRV_LOG(DEBUG, "Successfully created flow.\n");
                STAILQ_INSERT_TAIL(&vnic->flow_list, flow, next);
+               if (filter->valid_flags & BNXT_FLOW_MARK_FLAG) {
+                       PMD_DRV_LOG(DEBUG,
+                                   "Mark action: mark id 0x%x, flow id 0x%x\n",
+                                   filter->mark, filter->flow_id);
+
+                       /* TCAM and EM should be 16-bit only.
+                        * Other modes not supported.
+                        */
+                       bp->mark_table[filter->flow_id & BNXT_FLOW_ID_MASK] =
+                               filter->mark;
+               }
                bnxt_release_flow_lock(bp);
                return flow;
        }
@@ -1774,7 +1816,7 @@ free_flow:
                rte_flow_error_set(error, 0,
                                   RTE_FLOW_ERROR_TYPE_NONE, NULL,
                                   "Flow with pattern exists, updating destination queue");
-       else
+       else if (!rte_errno)
                rte_flow_error_set(error, -ret,
                                   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
                                   "Failed to create flow.");
@@ -1850,6 +1892,11 @@ _bnxt_flow_destroy(struct bnxt *bp,
        if (ret == 0)
                PMD_DRV_LOG(ERR, "Could not find matching flow\n");
 
+       if (filter->valid_flags & BNXT_FLOW_MARK_FLAG) {
+               bp->mark_table[filter->flow_id & BNXT_FLOW_ID_MASK] = 0;
+               filter->flow_id = 0;
+       }
+
        if (filter->filter_type == HWRM_CFA_EM_FILTER)
                ret = bnxt_hwrm_clear_em_filter(bp, filter);
        if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER)