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

net/ice: add action number check for switch

Browse Source 
The action number can only be one for DCF or PF
switch filter, not support multiple actions.

Fixes: 47d460d63233 ("net/ice: rework switch filter")
Cc: stable@dpdk.org

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
This commit is contained in:
Wei Zhao 2020-04-03 12:46:02 +08:00 committed by Ferruh Yigit
parent 6bc7628c5e
commit 3428c6b6ec
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/net/ice/ice_switch_filter.c
View File

@ -1073,6 +1073,46 @@ error:
return -rte_errno; return -rte_errno;
} }
static int
ice_switch_check_action(const struct rte_flow_action *actions,
struct rte_flow_error *error)
{
const struct rte_flow_action *action;
enum rte_flow_action_type action_type;
uint16_t actions_num = 0;
for (action = actions; action->type !=
RTE_FLOW_ACTION_TYPE_END; action++) {
action_type = action->type;
switch (action_type) {
case RTE_FLOW_ACTION_TYPE_VF:
case RTE_FLOW_ACTION_TYPE_RSS:
case RTE_FLOW_ACTION_TYPE_QUEUE:
case RTE_FLOW_ACTION_TYPE_DROP:
actions_num++;
break;
case RTE_FLOW_ACTION_TYPE_VOID:
continue;
default:
rte_flow_error_set(error,
EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
actions,
"Invalid action type");
return -rte_errno;
}
}
if (actions_num > 1) {
rte_flow_error_set(error,
EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
actions,
"Invalid action number");
return -rte_errno;
}
return 0;
}
static int static int
ice_switch_parse_pattern_action(struct ice_adapter *ad, ice_switch_parse_pattern_action(struct ice_adapter *ad,
struct ice_pattern_match_item *array, struct ice_pattern_match_item *array,
@ -1158,6 +1198,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad,
goto error; goto error;
} }
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");
goto error;
}
if (ad->hw.dcf_enabled) if (ad->hw.dcf_enabled)
ret = ice_switch_parse_dcf_action(actions, error, &rule_info); ret = ice_switch_parse_dcf_action(actions, error, &rule_info);
else else