* [dpdk-dev] [PATCH] net/softnic: fix mixing enum values
@ 2018-10-31 11:34 Jasvinder Singh
2018-10-31 11:58 ` [dpdk-dev] [PATCH v2] " Jasvinder Singh
0 siblings, 1 reply; 3+ messages in thread
From: Jasvinder Singh @ 2018-10-31 11:34 UTC (permalink / raw)
To: dev; +Cc: cristian.dumitrescu
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>
---
drivers/net/softnic/rte_eth_softnic_flow.c | 6 ++---
.../net/softnic/rte_eth_softnic_internals.h | 3 +++
drivers/net/softnic/rte_eth_softnic_meter.c | 23 ++++++++++++++++++-
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 285af462b..b4aaa0696 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 e12b8ae4c..31698b9f0 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 73ecf3b16..f9ae74882 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,
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [dpdk-dev] [PATCH v2] net/softnic: fix mixing enum values
2018-10-31 11:34 [dpdk-dev] [PATCH] net/softnic: fix mixing enum values Jasvinder Singh
@ 2018-10-31 11:58 ` Jasvinder Singh
2018-11-02 11:46 ` Dumitrescu, Cristian
0 siblings, 1 reply; 3+ messages in thread
From: Jasvinder Singh @ 2018-10-31 11:58 UTC (permalink / raw)
To: dev; +Cc: cristian.dumitrescu
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>
---
v2
- fix checkpatch error
drivers/net/softnic/rte_eth_softnic_flow.c | 6 ++---
.../net/softnic/rte_eth_softnic_internals.h | 3 +++
drivers/net/softnic/rte_eth_softnic_meter.c | 23 ++++++++++++++++++-
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 285af462b..b4aaa0696 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 e12b8ae4c..31698b9f0 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 73ecf3b16..7b747ba5d 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,
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH v2] net/softnic: fix mixing enum values
2018-10-31 11:58 ` [dpdk-dev] [PATCH v2] " Jasvinder Singh
@ 2018-11-02 11:46 ` Dumitrescu, Cristian
0 siblings, 0 replies; 3+ messages in thread
From: Dumitrescu, Cristian @ 2018-11-02 11:46 UTC (permalink / raw)
To: Singh, Jasvinder, dev
> -----Original Message-----
> From: Singh, Jasvinder
> Sent: Wednesday, October 31, 2018 11:58 AM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>
> Subject: [PATCH v2] 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>
> ---
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Applied to next-pipeline tree, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-11-02 11:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-31 11:34 [dpdk-dev] [PATCH] net/softnic: fix mixing enum values Jasvinder Singh
2018-10-31 11:58 ` [dpdk-dev] [PATCH v2] " Jasvinder Singh
2018-11-02 11:46 ` Dumitrescu, Cristian
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).