From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jasvinder Singh Subject: [PATCH 08/10] net/softnic: update policer actions Date: Fri, 7 Sep 2018 19:13:55 +0100 Message-ID: <20180907181357.23915-9-jasvinder.singh@intel.com> References: <20180907181357.23915-1-jasvinder.singh@intel.com> Cc: cristian.dumitrescu@intel.com To: dev@dpdk.org Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 530DD5B26 for ; Fri, 7 Sep 2018 20:15:06 +0200 (CEST) In-Reply-To: <20180907181357.23915-1-jasvinder.singh@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Implement meter object policer actions function. Signed-off-by: Jasvinder Singh --- drivers/net/softnic/rte_eth_softnic_meter.c | 127 +++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/drivers/net/softnic/rte_eth_softnic_meter.c b/drivers/net/softnic/rte_eth_softnic_meter.c index 9344f37..41af9c7 100644 --- a/drivers/net/softnic/rte_eth_softnic_meter.c +++ b/drivers/net/softnic/rte_eth_softnic_meter.c @@ -504,6 +504,131 @@ pmd_mtr_meter_dscp_table_update(struct rte_eth_dev *dev, return 0; } +static int +softnic_table_policer_actions_update(struct pmd_internals *p, + struct softnic_mtr *m, + uint32_t action_mask, + enum rte_mtr_policer_action *actions, + struct rte_mtr_error *error) +{ + struct rte_flow *mflow = m->flow; + uint32_t i; + int status; + + /* Update meter policer actions */ + for (i = 0; i < RTE_MTR_COLORS; i++) { + if ((action_mask >> i) & 1) + mflow->action.mtr.mtr[0].policer[i] = + (enum rte_table_action_policer)actions[i]; + } + + /* Re-add new rule */ + status = softnic_pipeline_table_rule_add(p, + mflow->pipeline->name, + mflow->table_id, + &mflow->match, + &mflow->action, + &mflow->data); + if (status) { + rte_mtr_error_set(error, + EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Pipeline table rule re-add failed"); + return -1; + } + + /* Reset the meter stats */ + struct pipeline *pipeline = mflow->pipeline; + struct softnic_table *table = &pipeline->table[mflow->table_id]; + uint32_t tc_mask = 1 << 0; + + status = rte_table_action_meter_read(table->a, + mflow->data, + tc_mask, + NULL, + 1); + if (status) { + rte_mtr_error_set(error, + EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + "Meter stats reset failed"); + return -1; + } + + return 0; +} + +/* MTR object policer action update */ +static int +pmd_mtr_policer_actions_update(struct rte_eth_dev *dev, + uint32_t mtr_id, + uint32_t action_mask, + enum rte_mtr_policer_action *actions, + struct rte_mtr_error *error) +{ + struct pmd_internals *p = dev->data->dev_private; + struct softnic_mtr *m; + uint32_t i; + 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, + rte_strerror(EEXIST)); + + /* Policer actions */ + if (actions == NULL) + return -rte_mtr_error_set(error, + EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + rte_strerror(EINVAL)); + + /* Valid Policer actions */ + for (i = 0; i < RTE_MTR_COLORS; i++) { + if ((action_mask >> i) & 1) { + if (actions[i] != MTR_POLICER_ACTION_COLOR_GREEN && + actions[i] != MTR_POLICER_ACTION_COLOR_YELLOW && + actions[i] != MTR_POLICER_ACTION_COLOR_RED && + actions[i] != MTR_POLICER_ACTION_DROP) + return -rte_mtr_error_set(error, + EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + rte_strerror(EINVAL)); + } + } + + /* MTR object owner valid? */ + if (m->flow) { + status = softnic_table_policer_actions_update(p, + m, + action_mask, + actions, + error); + if (status) + return -rte_mtr_error_set(error, + EINVAL, + RTE_MTR_ERROR_TYPE_UNSPECIFIED, + NULL, + rte_strerror(EINVAL)); + } + + /* Update MTR object policer actions */ + for (i = 0; i < RTE_MTR_COLORS; i++) { + if ((action_mask >> i) & 1) + m->params.action[i] = actions[i]; + } + + return 0; +} + const struct rte_mtr_ops pmd_mtr_ops = { .capabilities_get = NULL, @@ -517,7 +642,7 @@ const struct rte_mtr_ops pmd_mtr_ops = { .meter_profile_update = pmd_mtr_meter_profile_update, .meter_dscp_table_update = pmd_mtr_meter_dscp_table_update, - .policer_actions_update = NULL, + .policer_actions_update = pmd_mtr_policer_actions_update, .stats_update = NULL, .stats_read = NULL, -- 2.9.3