net/cnxk: support to delete meter

Implement API to delete meter instance for CNXK platform.

Signed-off-by: Sunil Kumar Kori <skori@marvell.com>
Signed-off-by: Rakesh Kudurumalla <rkudurumalla@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c
index 96f2a33..6d950fd 100644 (file)
--- a/drivers/net/cnxk/cnxk_ethdev_mtr.c
+++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c
@@ -8,6 +8,10 @@
 #define NIX_MTR_COUNT_MAX      73 /* 64(leaf) + 8(mid) + 1(top) */
 #define NIX_MTR_COUNT_PER_FLOW 3  /* 1(leaf) + 1(mid) + 1(top) */
 
+static const enum roc_nix_bpf_level_flag lvl_map[] = {ROC_NIX_BPF_LEVEL_F_LEAF,
+                                                     ROC_NIX_BPF_LEVEL_F_MID,
+                                                     ROC_NIX_BPF_LEVEL_F_TOP};
+
 static struct rte_mtr_capabilities mtr_capa = {
        .n_max = NIX_MTR_COUNT_MAX,
        .n_shared_max = NIX_MTR_COUNT_PER_FLOW,
@@ -466,6 +470,91 @@ cnxk_nix_mtr_create(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
        return 0;
 }
 
+static int
+cnxk_nix_mtr_destroy(struct rte_eth_dev *eth_dev, uint32_t mtr_id,
+                    struct rte_mtr_error *error)
+{
+       struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+       struct roc_nix_bpf_objs profs = {0};
+       struct cnxk_mtr *fm = &dev->mtr;
+       struct roc_nix *nix = &dev->nix;
+       struct cnxk_meter_node *mtr;
+       struct cnxk_meter_node *mid_mtr;
+       struct cnxk_meter_node *top_mtr;
+       int rc = 0;
+
+       mtr = nix_mtr_find(dev, mtr_id);
+       if (mtr == NULL) {
+               return -rte_mtr_error_set(error, ENOENT,
+                                         RTE_MTR_ERROR_TYPE_MTR_ID, &mtr_id,
+                                         "Meter id is invalid.");
+       }
+
+       if (mtr->ref_cnt) {
+               return -rte_mtr_error_set(error, EADDRINUSE,
+                                         RTE_MTR_ERROR_TYPE_MTR_ID, &mtr_id,
+                                         "Meter id in use.");
+       }
+
+       switch (lvl_map[mtr->level]) {
+       case ROC_NIX_BPF_LEVEL_F_LEAF:
+               if (mtr->is_next) {
+                       rc = roc_nix_bpf_connect(nix, ROC_NIX_BPF_LEVEL_F_LEAF,
+                                                mtr->bpf_id,
+                                                ROC_NIX_BPF_ID_INVALID);
+               }
+               break;
+       case ROC_NIX_BPF_LEVEL_F_MID:
+               while ((mtr->prev_cnt) + 1) {
+                       mid_mtr =
+                               nix_mtr_find(dev, mtr->prev_id[mtr->prev_cnt]);
+                       rc = roc_nix_bpf_connect(nix, ROC_NIX_BPF_LEVEL_F_LEAF,
+                                                mid_mtr->bpf_id,
+                                                ROC_NIX_BPF_ID_INVALID);
+                       mtr->prev_cnt--;
+               }
+               if (mtr->is_next) {
+                       rc = roc_nix_bpf_connect(nix, ROC_NIX_BPF_LEVEL_F_MID,
+                                                mtr->bpf_id,
+                                                ROC_NIX_BPF_ID_INVALID);
+               }
+               break;
+       case ROC_NIX_BPF_LEVEL_F_TOP:
+               while (mtr->prev_cnt) {
+                       top_mtr =
+                               nix_mtr_find(dev, mtr->prev_id[mtr->prev_cnt]);
+                       rc = roc_nix_bpf_connect(nix, ROC_NIX_BPF_LEVEL_F_MID,
+                                                top_mtr->bpf_id,
+                                                ROC_NIX_BPF_ID_INVALID);
+                       mtr->prev_cnt--;
+               }
+               break;
+       default:
+               return -rte_mtr_error_set(error, EINVAL,
+                                         RTE_MTR_ERROR_TYPE_MTR_ID, NULL,
+                                         "Invalid meter level");
+       }
+
+       if (rc)
+               goto exit;
+
+       profs.level = mtr->level;
+       profs.count = 1;
+       profs.ids[0] = mtr->bpf_id;
+       rc = roc_nix_bpf_free(nix, &profs, 1);
+       if (rc)
+               goto exit;
+
+       mtr->policy->ref_cnt--;
+       mtr->profile->ref_cnt--;
+       TAILQ_REMOVE(fm, mtr, next);
+       plt_free(mtr->params.dscp_table);
+       plt_free(mtr);
+
+exit:
+       return rc;
+}
+
 const struct rte_mtr_ops nix_mtr_ops = {
        .capabilities_get = cnxk_nix_mtr_capabilities_get,
        .meter_profile_add = cnxk_nix_mtr_profile_add,
@@ -474,6 +563,7 @@ const struct rte_mtr_ops nix_mtr_ops = {
        .meter_policy_add = cnxk_nix_mtr_policy_add,
        .meter_policy_delete = cnxk_nix_mtr_policy_delete,
        .create = cnxk_nix_mtr_create,
+       .destroy = cnxk_nix_mtr_destroy,
 };
 
 int