net/ice: fix VF index check for DCF
PATCH 1/1 net/ice: fix VF index check for DCF
The vf index in rte_flow command need to check
in order that larger the actual number.
--- drivers/net/ice/ice_switch_filter.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/net/ice/ice_switch_filter.c +11 -5
@@ -1405,6 +1405,16 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,case RTE_FLOW_ACTION_TYPE_VF : rule_info->sw_act.fltr_act =ICE_FWD_TO_VSI ; act_vf = action->conf; + +if (act_vf->id >= ad->real_hw.num_vfs && + !act_vf->original) { +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid vf id" ); +return -rte_errno; + } +if (act_vf->original) rule_info->sw_act.vsi_handle = ad->real_hw.avf.bus.func;
@@ -1667,12 +1677,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,else ret =ice_switch_parse_action (pf, actions, error, &rule_info); -if (ret) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Invalid input action" ); +if (ret) goto error; - }if (meta) { *meta = sw_meta_ptr;
Signature · 1 line
2.19.1
PATCH v2 1/1 net/ice: fix VF index check for DCF
The vf index in rte_flow command need to check
in order that larger the actual number. Also
change some error log for wrong action.
---
v2: change error log
--- drivers/net/ice/ice_switch_filter.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/net/ice/ice_switch_filter.c +12 -6
@@ -1405,6 +1405,16 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,case RTE_FLOW_ACTION_TYPE_VF : rule_info->sw_act.fltr_act =ICE_FWD_TO_VSI ; act_vf = action->conf; + +if (act_vf->id >= ad->real_hw.num_vfs && + !act_vf->original) { +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid vf id" ); +return -rte_errno; + } +if (act_vf->original) rule_info->sw_act.vsi_handle = ad->real_hw.avf.bus.func;
@@ -1415,7 +1425,7 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , actions, -"Invalid action type or queue number" ); +"Invalid action type" );return -rte_errno; } }
@@ -1667,12 +1677,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,else ret =ice_switch_parse_action (pf, actions, error, &rule_info); -if (ret) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Invalid input action" ); +if (ret) goto error; - }if (meta) { *meta = sw_meta_ptr;
Signature · 1 line
2.19.1
Quoted 14 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Wednesday, August 12, 2020 8:57 AM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Lu, Nannan <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v2] net/ice: fix VF index check for DCFThe vf index in
rte_flowcommand need to check in order that larger the actual number. Also change some error log for wrong action.Fixes 829c3106812d ("net/ice: enable switch flow on DCF")
Quoted 8 lines
Signed-off-by Wei Zhao <[email protected]>---
v2: change error log--- drivers/net/ice/ice_switch_filter.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
Quoted 2 lines
--
2.19.1
PATCH v3 1/1 net/ice: fix VF index check for DCF
In reply to Wei ZhaoThe vf index in rte_flow command need to check
in order that larger than actual number. Also
change some error log for wrong action.
---
v2: change error log
v3: add new error log
--- drivers/net/ice/ice_switch_filter.c | 36 ++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 8 deletions(-)
drivers/net/ice/ice_switch_filter.c +28 -8
@@ -1405,6 +1405,16 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,case RTE_FLOW_ACTION_TYPE_VF : rule_info->sw_act.fltr_act =ICE_FWD_TO_VSI ; act_vf = action->conf; + +if (act_vf->id >= ad->real_hw.num_vfs && + !act_vf->original) { +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid vf id" ); +return -rte_errno; + } +if (act_vf->original) rule_info->sw_act.vsi_handle = ad->real_hw.avf.bus.func;
@@ -1415,7 +1425,7 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , actions, -"Invalid action type or queue number" ); +"Invalid action type" );return -rte_errno; } }
@@ -1467,11 +1477,11 @@ ice_switch_parse_action(struct ice_pf *pf,if ((act_qgrop->queue[0 ] + act_qgrop->queue_num) > dev->data->nb_rx_queues) - goto error; + goto error1;for (i =0 ; i < act_qgrop->queue_num -1 ; i++)if (act_qgrop->queue[i +1 ] != act_qgrop->queue[i] +1 ) - goto error; + goto error2; rule_info->sw_act.qgrp_size = act_qgrop->queue_num;break ;
@@ -1511,6 +1521,20 @@ ice_switch_parse_action(struct ice_pf *pf, actions, "Invalid action type or queue number");return -rte_errno; + +error1: +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid queue region indexes" ); +return -rte_errno; + +error2: +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Discontinuous queue region" ); +return -rte_errno; } static int
@@ -1667,12 +1691,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,else ret =ice_switch_parse_action (pf, actions, error, &rule_info); -if (ret) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Invalid input action" ); +if (ret) goto error; - }if (meta) { *meta = sw_meta_ptr;
Signature · 1 line
2.19.1
PATCH v4 1/1 net/ice: fix VF index check for DCF
The vf index in rte_flow command need to check in order that not larger than actual vf number. Also change some error log for wrong action.
---
v2: change error log
v3: add new error log
v4: update error log
--- drivers/net/ice/ice_switch_filter.c | 42 ++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 13 deletions(-)
drivers/net/ice/ice_switch_filter.c +29 -13
@@ -1405,6 +1405,16 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,case RTE_FLOW_ACTION_TYPE_VF : rule_info->sw_act.fltr_act =ICE_FWD_TO_VSI ; act_vf = action->conf; + +if (act_vf->id >= ad->real_hw.num_vfs && + !act_vf->original) { +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid vf id" ); +return -rte_errno; + } +if (act_vf->original) rule_info->sw_act.vsi_handle = ad->real_hw.avf.bus.func;
@@ -1415,7 +1425,7 @@ ice_switch_parse_dcf_action(struct ice_dcf_adapter *ad,rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , actions, -"Invalid action type or queue number" ); +"Invalid action type" );return -rte_errno; } }
@@ -1467,11 +1477,11 @@ ice_switch_parse_action(struct ice_pf *pf,if ((act_qgrop->queue[0 ] + act_qgrop->queue_num) > dev->data->nb_rx_queues) - goto error; + goto error1;for (i =0 ; i < act_qgrop->queue_num -1 ; i++)if (act_qgrop->queue[i +1 ] != act_qgrop->queue[i] +1 ) - goto error; + goto error2; rule_info->sw_act.qgrp_size = act_qgrop->queue_num;break ;
@@ -1511,6 +1521,20 @@ ice_switch_parse_action(struct ice_pf *pf, actions, "Invalid action type or queue number");return -rte_errno; + +error1: +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Invalid queue region indexes" ); +return -rte_errno; + +error2: +rte_flow_error_set (error, +EINVAL ,RTE_FLOW_ERROR_TYPE_ACTION , + actions, +"Discontinuous queue region" ); +return -rte_errno; } static int
@@ -1654,12 +1678,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, rule_info.tun_type = tun_type; ret =ice_switch_check_action (actions, error); -if (ret) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Invalid input action number" ); +if (ret) goto error; - }if (ad->hw.dcf_enabled) ret = ice_switch_parse_dcf_action((void *)ad, actions, error,
@@ -1667,12 +1687,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,else ret =ice_switch_parse_action (pf, actions, error, &rule_info); -if (ret) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_HANDLE ,NULL , -"Invalid input action" ); +if (ret) goto error; - }if (meta) { *meta = sw_meta_ptr;
Signature · 1 line
2.19.1
Quoted 10 lines
-----Original Message-----
From: Zhao1, Wei <[email protected]>
Sent: Thursday, August 13, 2020 10:15 AM
To: [email protected]
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Lu, Nannan <[email protected]>; Zhao1, Wei <[email protected]>
Subject: [PATCH v4] net/ice: fix VF index check for DCF
Quoted 8 lines
The vf index in
rte_flowcommand need to check in order that not larger than actual vf number. Also change some error log for wrong action.Fixes 829c3106812d ("net/ice: enable switch flow on DCF")Signed-off-by Wei Zhao <[email protected]>Tested-by Nannan Lu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi