d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/softnic: fix mixing enum values

Browse Source 
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: 7e30e444c3 ("net/softnic: support flow meter action")
Fixes: 8a917ef88d ("net/softnic: update policer actions")

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
This commit is contained in:
Jasvinder Singh 2018-10-31 11:58:22 +00:00 committed by Cristian Dumitrescu
parent 331ce43dc5
commit ce13d80c36
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/softnic/rte_eth_softnic_flow.c
View File

@ -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;

3
drivers/net/softnic/rte_eth_softnic_internals.h
View File

@ -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
*/

23
drivers/net/softnic/rte_eth_softnic_meter.c
View File

@ -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,