net/softnic: create meter object

implement meter object create function.

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>

diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h
index 1db9310..50b7295 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -82,8 +82,19 @@ struct softnic_mtr_meter_profile {
 
 TAILQ_HEAD(softnic_mtr_meter_profile_list, softnic_mtr_meter_profile);
 
+/* MTR meter object */
+struct softnic_mtr {
+       TAILQ_ENTRY(softnic_mtr) node;
+       uint32_t mtr_id;
+       struct rte_mtr_params params;
+       struct rte_flow *flow;
+};
+
+TAILQ_HEAD(softnic_mtr_list, softnic_mtr);
+
 struct mtr_internals {
        struct softnic_mtr_meter_profile_list meter_profiles;
+       struct softnic_mtr_list mtrs;
 };
 
 /**
@@ -601,6 +612,10 @@ softnic_mtr_init(struct pmd_internals *p);
 void
 softnic_mtr_free(struct pmd_internals *p);
 
+struct softnic_mtr *
+softnic_mtr_find(struct pmd_internals *p,
+       uint32_t mtr_id);
+
 struct softnic_mtr_meter_profile *
 softnic_mtr_meter_profile_find(struct pmd_internals *p,
        uint32_t meter_profile_id);

diff --git a/drivers/net/softnic/rte_eth_softnic_meter.c b/drivers/net/softnic/rte_eth_softnic_meter.c
index f3205bd..12dd79c 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_meter.c
+++ b/drivers/net/softnic/rte_eth_softnic_meter.c
@@ -17,12 +17,27 @@ softnic_mtr_init(struct pmd_internals *p)
        /* Initialize meter profiles list */
        TAILQ_INIT(&p->mtr.meter_profiles);
 
+       /* Initialize MTR objects list */
+       TAILQ_INIT(&p->mtr.mtrs);
+
        return 0;
 }
 
 void
 softnic_mtr_free(struct pmd_internals *p)
 {
+       /* Remove MTR objects */
+       for ( ; ; ) {
+               struct softnic_mtr *m;
+
+               m = TAILQ_FIRST(&p->mtr.mtrs);
+               if (m == NULL)
+                       break;
+
+               TAILQ_REMOVE(&p->mtr.mtrs, m, node);
+               free(m);
+       }
+
        /* Remove meter profiles */
        for ( ; ; ) {
                struct softnic_mtr_meter_profile *mp;
@@ -164,13 +179,119 @@ pmd_mtr_meter_profile_delete(struct rte_eth_dev *dev,
        return 0;
 }
 
+struct softnic_mtr *
+softnic_mtr_find(struct pmd_internals *p, uint32_t mtr_id)
+{
+       struct softnic_mtr_list *ml = &p->mtr.mtrs;
+       struct softnic_mtr *m;
+
+       TAILQ_FOREACH(m, ml, node)
+               if (m->mtr_id == mtr_id)
+                       return m;
+
+       return NULL;
+}
+
+
+static int
+mtr_check(struct pmd_internals *p,
+       uint32_t mtr_id,
+       struct rte_mtr_params *params,
+       int shared,
+       struct rte_mtr_error *error)
+{
+       /* MTR id valid  */
+       if (softnic_mtr_find(p, mtr_id))
+               return -rte_mtr_error_set(error,
+                       EEXIST,
+                       RTE_MTR_ERROR_TYPE_MTR_ID,
+                       NULL,
+                       "MTR object already exists");
+
+       /* MTR params must not be NULL */
+       if (params == NULL)
+               return -rte_mtr_error_set(error,
+                       EINVAL,
+                       RTE_MTR_ERROR_TYPE_MTR_PARAMS,
+                       NULL,
+                       "MTR object params null");
+
+       /* Previous meter color not supported */
+       if (params->use_prev_mtr_color)
+               return -rte_mtr_error_set(error,
+                       EINVAL,
+                       RTE_MTR_ERROR_TYPE_MTR_PARAMS,
+                       NULL,
+                       "Previous meter color not supported");
+
+       /* Shared MTR object not supported */
+       if (shared)
+               return -rte_mtr_error_set(error,
+                       EINVAL,
+                       RTE_MTR_ERROR_TYPE_SHARED,
+                       NULL,
+                       "Shared MTR object not supported");
+
+       return 0;
+}
+
+/* MTR object create */
+static int
+pmd_mtr_create(struct rte_eth_dev *dev,
+       uint32_t mtr_id,
+       struct rte_mtr_params *params,
+       int shared,
+       struct rte_mtr_error *error)
+{
+       struct pmd_internals *p = dev->data->dev_private;
+       struct softnic_mtr_list *ml = &p->mtr.mtrs;
+       struct softnic_mtr_meter_profile *mp;
+       struct softnic_mtr *m;
+       int status;
+
+       /* Check parameters */
+       status = mtr_check(p, mtr_id, params, shared, error);
+       if (status)
+               return status;
+
+       /* Meter profile must exist */
+       mp = softnic_mtr_meter_profile_find(p, params->meter_profile_id);
+       if (mp == NULL)
+               return -rte_mtr_error_set(error,
+                       EINVAL,
+                       RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+                       NULL,
+                       "Meter profile id not valid");
+
+       /* Memory allocation */
+       m = calloc(1, sizeof(struct softnic_mtr));
+       if (m == NULL)
+               return -rte_mtr_error_set(error,
+                       ENOMEM,
+                       RTE_MTR_ERROR_TYPE_UNSPECIFIED,
+                       NULL,
+                       "Memory alloc failed");
+
+       /* Fill in */
+       m->mtr_id = mtr_id;
+       memcpy(&m->params, params, sizeof(m->params));
+
+       /* Add to list */
+       TAILQ_INSERT_TAIL(ml, m, node);
+
+       /* Update dependencies */
+       mp->n_users++;
+
+       return 0;
+}
+
 const struct rte_mtr_ops pmd_mtr_ops = {
        .capabilities_get = NULL,
 
        .meter_profile_add = pmd_mtr_meter_profile_add,
        .meter_profile_delete = pmd_mtr_meter_profile_delete,
 
-       .create = NULL,
+       .create = pmd_mtr_create,
        .destroy = NULL,
        .meter_enable = NULL,
        .meter_disable = NULL,