net/softnic: update meter profile

Implement meter profile update 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 50b7295..4b0f54c 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -320,6 +320,15 @@ struct softnic_table_action_profile {
 
 TAILQ_HEAD(softnic_table_action_profile_list, softnic_table_action_profile);
 
+struct softnic_table_meter_profile {
+       TAILQ_ENTRY(softnic_table_meter_profile) node;
+       uint32_t meter_profile_id;
+       struct rte_table_action_meter_profile profile;
+};
+
+TAILQ_HEAD(softnic_table_meter_profile_list,
+       softnic_table_meter_profile);
+
 /**
  * Pipeline
  */
@@ -455,6 +464,7 @@ struct softnic_table {
        struct softnic_table_action_profile *ap;
        struct rte_table_action *a;
        struct flow_list flows;
+       struct softnic_table_meter_profile_list meter_profiles;
 };
 
 struct pipeline {
@@ -813,6 +823,10 @@ softnic_pipeline_table_create(struct pmd_internals *p,
        const char *pipeline_name,
        struct softnic_table_params *params);
 
+struct softnic_table_meter_profile *
+softnic_pipeline_table_meter_profile_find(struct softnic_table *table,
+       uint32_t meter_profile_id);
+
 struct softnic_table_rule_match_acl {
        int ip_version;
 

diff --git a/drivers/net/softnic/rte_eth_softnic_meter.c b/drivers/net/softnic/rte_eth_softnic_meter.c
index 5103bda..68daf8a 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_meter.c
+++ b/drivers/net/softnic/rte_eth_softnic_meter.c
@@ -332,6 +332,107 @@ pmd_mtr_destroy(struct rte_eth_dev *dev,
        return 0;
 }
 
+/* MTR object meter profile update */
+static int
+pmd_mtr_meter_profile_update(struct rte_eth_dev *dev,
+       uint32_t mtr_id,
+       uint32_t meter_profile_id,
+       struct rte_mtr_error *error)
+{
+       struct pmd_internals *p = dev->data->dev_private;
+       struct softnic_mtr_meter_profile *mp_new, *mp_old;
+       struct softnic_mtr *m;
+       int status;
+
+       /* MTR object id must be valid */
+       m = softnic_mtr_find(p, mtr_id);
+       if (m == NULL)
+               return -rte_mtr_error_set(error,
+                       EEXIST,
+                       RTE_MTR_ERROR_TYPE_MTR_ID,
+                       NULL,
+                       "MTR object id not valid");
+
+       /* Meter profile id must be valid */
+       mp_new = softnic_mtr_meter_profile_find(p, meter_profile_id);
+       if (mp_new == NULL)
+               return -rte_mtr_error_set(error,
+                       EINVAL,
+                       RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+                       NULL,
+                       "Meter profile not valid");
+
+       /* MTR object already set to meter profile id */
+       if (m->params.meter_profile_id == meter_profile_id)
+               return 0;
+
+       /*  MTR object owner table update */
+       if (m->flow) {
+               uint32_t table_id = m->flow->table_id;
+               struct softnic_table *table = &m->flow->pipeline->table[table_id];
+               struct softnic_table_rule_action action;
+
+               if (!softnic_pipeline_table_meter_profile_find(table,
+                       meter_profile_id)) {
+                       struct rte_table_action_meter_profile profile;
+
+                       memset(&profile, 0, sizeof(profile));
+
+                       profile.alg = RTE_TABLE_ACTION_METER_TRTCM;
+                       profile.trtcm.cir = mp_new->params.trtcm_rfc2698.cir;
+                       profile.trtcm.pir = mp_new->params.trtcm_rfc2698.pir;
+                       profile.trtcm.cbs = mp_new->params.trtcm_rfc2698.cbs;
+                       profile.trtcm.pbs = mp_new->params.trtcm_rfc2698.pbs;
+
+                       /* Add meter profile to pipeline table */
+                       status = softnic_pipeline_table_mtr_profile_add(p,
+                                       m->flow->pipeline->name,
+                                       table_id,
+                                       meter_profile_id,
+                                       &profile);
+                       if (status)
+                               return -rte_mtr_error_set(error,
+                                       EINVAL,
+                                       RTE_MTR_ERROR_TYPE_UNSPECIFIED,
+                                       NULL,
+                                       "Table meter profile add failed");
+               }
+
+               /* Set meter action */
+               memcpy(&action, &m->flow->action, sizeof(action));
+
+               action.mtr.mtr[0].meter_profile_id = meter_profile_id;
+
+               /* Re-add rule */
+               status = softnic_pipeline_table_rule_add(p,
+                       m->flow->pipeline->name,
+                       table_id,
+                       &m->flow->match,
+                       &action,
+                       &m->flow->data);
+               if (status)
+                       return -rte_mtr_error_set(error,
+                               EINVAL,
+                               RTE_MTR_ERROR_TYPE_UNSPECIFIED,
+                               NULL,
+                               "Pipeline table rule add failed");
+
+               /* Flow: update meter action */
+               memcpy(&m->flow->action, &action, sizeof(m->flow->action));
+       }
+
+       mp_old = softnic_mtr_meter_profile_find(p, m->params.meter_profile_id);
+
+       /* Meter: Set meter profile */
+       m->params.meter_profile_id = meter_profile_id;
+
+       /* Update dependencies*/
+       mp_old->n_users--;
+       mp_new->n_users++;
+
+       return 0;
+}
+
 const struct rte_mtr_ops pmd_mtr_ops = {
        .capabilities_get = NULL,
 
@@ -343,7 +444,7 @@ const struct rte_mtr_ops pmd_mtr_ops = {
        .meter_enable = NULL,
        .meter_disable = NULL,
 
-       .meter_profile_update = NULL,
+       .meter_profile_update = pmd_mtr_meter_profile_update,
        .meter_dscp_table_update = NULL,
        .policer_actions_update = NULL,
        .stats_update = NULL,

diff --git a/drivers/net/softnic/rte_eth_softnic_pipeline.c b/drivers/net/softnic/rte_eth_softnic_pipeline.c
index d1127a1..17830d3 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_pipeline.c
+++ b/drivers/net/softnic/rte_eth_softnic_pipeline.c
@@ -55,6 +55,17 @@ softnic_pipeline_table_free(struct softnic_table *table)
                TAILQ_REMOVE(&table->flows, flow, node);
                free(flow);
        }
+
+       for ( ; ; ) {
+               struct softnic_table_meter_profile *mp;
+
+               mp = TAILQ_FIRST(&table->meter_profiles);
+               if (mp == NULL)
+                       break;
+
+               TAILQ_REMOVE(&table->meter_profiles, mp, node);
+               free(mp);
+       }
 }
 
 void
@@ -988,6 +999,7 @@ softnic_pipeline_table_create(struct pmd_internals *softnic,
        table->ap = ap;
        table->a = action;
        TAILQ_INIT(&table->flows);
+       TAILQ_INIT(&table->meter_profiles);
        pipeline->n_tables++;
 
        return 0;
@@ -1020,3 +1032,16 @@ softnic_pipeline_port_out_find(struct pmd_internals *softnic,
 
        return -1;
 }
+
+struct softnic_table_meter_profile *
+softnic_pipeline_table_meter_profile_find(struct softnic_table *table,
+       uint32_t meter_profile_id)
+{
+       struct softnic_table_meter_profile *mp;
+
+       TAILQ_FOREACH(mp, &table->meter_profiles, node)
+               if (mp->meter_profile_id == meter_profile_id)
+                       return mp;
+
+       return NULL;
+}

diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index 8a15090..11d08d4 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -1680,6 +1680,8 @@ softnic_pipeline_table_mtr_profile_add(struct pmd_internals *softnic,
        struct pipeline *p;
        struct pipeline_msg_req *req;
        struct pipeline_msg_rsp *rsp;
+       struct softnic_table *table;
+       struct softnic_table_meter_profile *mp;
        int status;
 
        /* Check input params */
@@ -1692,20 +1694,40 @@ softnic_pipeline_table_mtr_profile_add(struct pmd_internals *softnic,
                table_id >= p->n_tables)
                return -1;
 
-       if (!pipeline_is_running(p)) {
-               struct rte_table_action *a = p->table[table_id].a;
+       table = &p->table[table_id];
+       mp = softnic_pipeline_table_meter_profile_find(table, meter_profile_id);
+       if (mp)
+               return -1;
 
-               status = rte_table_action_meter_profile_add(a,
+       /* Resource Allocation */
+       mp = calloc(1, sizeof(struct softnic_table_meter_profile));
+       if (mp == NULL)
+               return -1;
+
+       mp->meter_profile_id = meter_profile_id;
+       memcpy(&mp->profile, profile, sizeof(mp->profile));
+
+       if (!pipeline_is_running(p)) {
+               status = rte_table_action_meter_profile_add(table->a,
                        meter_profile_id,
                        profile);
+               if (status) {
+                       free(mp);
+                       return status;
+               }
+
+               /* Add profile to the table. */
+               TAILQ_INSERT_TAIL(&table->meter_profiles, mp, node);
 
                return status;
        }
 
        /* Allocate request */
        req = pipeline_msg_alloc();
-       if (req == NULL)
+       if (req == NULL) {
+               free(mp);
                return -1;
+       }
 
        /* Write request */
        req->type = PIPELINE_REQ_TABLE_MTR_PROFILE_ADD;
@@ -1715,11 +1737,17 @@ softnic_pipeline_table_mtr_profile_add(struct pmd_internals *softnic,
 
        /* Send request and wait for response */
        rsp = pipeline_msg_send_recv(p, req);
-       if (rsp == NULL)
+       if (rsp == NULL) {
+               free(mp);
                return -1;
+       }
 
        /* Read response */
        status = rsp->status;
+       if (status == 0)
+               TAILQ_INSERT_TAIL(&table->meter_profiles, mp, node);
+       else
+               free(mp);
 
        /* Free response */
        pipeline_msg_free(rsp);