summaryrefslogtreecommitdiff
path: root/drivers/net/softnic
diff options
context:
space:
mode:
authorJasvinder Singh <jasvinder.singh@intel.com>2018-10-31 11:58:22 +0000
committerCristian Dumitrescu <cristian.dumitrescu@intel.com>2018-11-02 11:20:57 +0100
commitce13d80c36688db41175fb6cc722912114338e8a (patch)
tree2e93aae1d6ae323ce846c47757697c5a81de4185 /drivers/net/softnic
parent331ce43dc564309decdfa9a1f024d4f87a5917d4 (diff)
downloaddpdk-ce13d80c36688db41175fb6cc722912114338e8a.zip
dpdk-ce13d80c36688db41175fb6cc722912114338e8a.tar.gz
dpdk-ce13d80c36688db41175fb6cc722912114338e8a.tar.xz
net/softnic: fix mixing enum values
Fix mixing enum types enum rte_table_action_policer and enum rte_mtr_policer_action for dereference of policer action. Coverity issue 323483, 323511 Fixes: 7e30e444c3e4 ("net/softnic: support flow meter action") Fixes: 8a917ef88db7 ("net/softnic: update policer actions") Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Diffstat (limited to 'drivers/net/softnic')
-rw-r--r--drivers/net/softnic/rte_eth_softnic_flow.c6
-rw-r--r--drivers/net/softnic/rte_eth_softnic_internals.h3
-rw-r--r--drivers/net/softnic/rte_eth_softnic_meter.c23
3 files changed, 28 insertions, 4 deletions
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c b/drivers/net/softnic/rte_eth_softnic_flow.c
index 285af46..b4aaa06 100644
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ b/drivers/net/softnic/rte_eth_softnic_flow.c
@@ -1624,11 +1624,11 @@ flow_rule_action_get(struct pmd_internals *softnic,
/* RTE_TABLE_ACTION_METER */
rule_action->mtr.mtr[0].meter_profile_id = meter_profile_id;
rule_action->mtr.mtr[0].policer[e_RTE_METER_GREEN] =
- (enum rte_table_action_policer)m->params.action[RTE_MTR_GREEN];
+ softnic_table_action_policer(m->params.action[RTE_MTR_GREEN]);
rule_action->mtr.mtr[0].policer[e_RTE_METER_YELLOW] =
- (enum rte_table_action_policer)m->params.action[RTE_MTR_YELLOW];
+ softnic_table_action_policer(m->params.action[RTE_MTR_YELLOW]);
rule_action->mtr.mtr[0].policer[e_RTE_METER_RED] =
- (enum rte_table_action_policer)m->params.action[RTE_MTR_RED];
+ softnic_table_action_policer(m->params.action[RTE_MTR_RED]);
rule_action->mtr.tc_mask = 1;
rule_action->action_mask |= 1 << RTE_TABLE_ACTION_MTR;
break;
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h
index e12b8ae..31698b9 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -828,6 +828,9 @@ softnic_table_action_profile_create(struct pmd_internals *p,
const char *name,
struct softnic_table_action_profile_params *params);
+enum rte_table_action_policer
+softnic_table_action_policer(enum rte_mtr_policer_action action);
+
/**
* Pipeline
*/
diff --git a/drivers/net/softnic/rte_eth_softnic_meter.c b/drivers/net/softnic/rte_eth_softnic_meter.c
index 73ecf3b..7b747ba 100644
--- a/drivers/net/softnic/rte_eth_softnic_meter.c
+++ b/drivers/net/softnic/rte_eth_softnic_meter.c
@@ -65,6 +65,27 @@ softnic_mtr_meter_profile_find(struct pmd_internals *p,
return NULL;
}
+enum rte_table_action_policer
+softnic_table_action_policer(enum rte_mtr_policer_action action)
+{
+ switch (action) {
+ case MTR_POLICER_ACTION_COLOR_GREEN:
+ return RTE_TABLE_ACTION_POLICER_COLOR_GREEN;
+
+ /* FALLTHROUGH */
+ case MTR_POLICER_ACTION_COLOR_YELLOW:
+ return RTE_TABLE_ACTION_POLICER_COLOR_YELLOW;
+
+ /* FALLTHROUGH */
+ case MTR_POLICER_ACTION_COLOR_RED:
+ return RTE_TABLE_ACTION_POLICER_COLOR_RED;
+
+ /* FALLTHROUGH */
+ default:
+ return RTE_TABLE_ACTION_POLICER_DROP;
+ }
+}
+
static int
meter_profile_check(struct rte_eth_dev *dev,
uint32_t meter_profile_id,
@@ -542,7 +563,7 @@ pmd_mtr_policer_actions_update(struct rte_eth_dev *dev,
for (i = 0; i < RTE_MTR_COLORS; i++)
if (action_mask & (1 << i))
action.mtr.mtr[0].policer[i] =
- (enum rte_table_action_policer)actions[i];
+ softnic_table_action_policer(actions[i]);
/* Re-add the rule */
status = softnic_pipeline_table_rule_add(p,