Implement meter profile update function
Signed-off-by: Jasvinder Singh <jasvinder.si...@intel.com>
---
drivers/net/softnic/rte_eth_softnic_internals.h | 14 ++++
drivers/net/softnic/rte_eth_softnic_meter.c | 104 +++++++++++++++++++++++-
drivers/net/softnic/rte_eth_softnic_pipeline.c | 12 +++
3 files changed, 129 insertions(+), 1 deletion(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h
b/drivers/net/softnic/rte_eth_softnic_internals.h
index 50b7295..784035f 100644
--- 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_action_meter_profile {
+ TAILQ_ENTRY(softnic_table_action_meter_profile) node;
+ uint32_t meter_profile_id;
+ struct rte_table_action_meter_profile profile;
+};
+
+TAILQ_HEAD(softnic_table_action_meter_profile_list,
+ softnic_table_action_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_action_meter_profile_list meter_profiles;
};
struct pipeline {
@@ -620,6 +630,10 @@ struct softnic_mtr_meter_profile *
softnic_mtr_meter_profile_find(struct pmd_internals *p,
uint32_t meter_profile_id);
+struct softnic_mtr_meter_profile *
+softnic_table_meter_profile_find(struct softnic_table *table,
+ uint32_t meter_profile_id);
+
extern const struct rte_mtr_ops pmd_mtr_ops;
/**
diff --git a/drivers/net/softnic/rte_eth_softnic_meter.c
b/drivers/net/softnic/rte_eth_softnic_meter.c
index 5103bda..e5c8f09 100644
--- a/drivers/net/softnic/rte_eth_softnic_meter.c
+++ b/drivers/net/softnic/rte_eth_softnic_meter.c
@@ -332,6 +332,108 @@ 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 rte_table_action_meter_profile profile;
+ struct softnic_table_rule_action action;
+ struct softnic_mtr_meter_profile *mp_in, *mp_out;
+ 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_in = softnic_mtr_meter_profile_find(p, meter_profile_id);
+ if (mp_in == NULL)
+ return -rte_mtr_error_set(error,
+ EINVAL,
+ RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+ NULL,
+ "Meter profile not valid");
+
+ /* MTR object current meter profile */
+ mp_out = softnic_mtr_meter_profile_find(p, m->params.meter_profile_id);
+ if (mp_out == NULL)
+ return -rte_mtr_error_set(error,
+ EINVAL,
+ RTE_MTR_ERROR_TYPE_METER_PROFILE_ID,
+ NULL,
+ "MTR object current meter profile invalid");
+
+ /* 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) {
+ memset(&profile, 0, sizeof(profile));
+
+ profile.alg = RTE_TABLE_ACTION_METER_TRTCM;
+ profile.trtcm.cir = mp_in->params.trtcm_rfc2698.cir;
+ profile.trtcm.pir = mp_in->params.trtcm_rfc2698.pir;
+ profile.trtcm.cbs = mp_in->params.trtcm_rfc2698.cbs;
+ profile.trtcm.pbs = mp_in->params.trtcm_rfc2698.pbs;
+
+ /* Add meter profile to pipeline table */
+ status = softnic_pipeline_table_mtr_profile_add(p,
+ m->flow->pipeline->name,
+ m->flow->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 */
+ memset(&action, 0, sizeof(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,
+ m->flow->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");
+
+ /* Update flow meter action */
+ memcpy(&m->flow->action, &action, sizeof(m->flow->action));
+ }
+
+ /* Fill in */
+ m->params.meter_profile_id = meter_profile_id;
+
+ /* Update dependencies*/
+ mp_out->n_users--;
+ mp_in->n_users++;
+
+ return 0;
+}
+
const struct rte_mtr_ops pmd_mtr_ops = {
.capabilities_get = NULL,
@@ -343,7 +445,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..26d10a1 100644
--- 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_action_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;
--
2.9.3
