* [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type [not found] <20200403031320.26144-1-wei.zhao1@intel.com> @ 2020-04-03 3:13 ` Wei Zhao 2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth Wei Zhao 2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item Wei Zhao 2 siblings, 0 replies; 4+ messages in thread From: Wei Zhao @ 2020-04-03 3:13 UTC (permalink / raw) To: qi.z.zhang; +Cc: Wei Zhao, stable The default tunnle type for swicth filter change to new defination of ICE_SW_TUN_AND_NON_TUN in order that the rule will be apply to more packet type. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index ed02d9805..d9bdf9637 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1091,7 +1091,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, uint16_t lkups_num = 0; const struct rte_flow_item *item = pattern; uint16_t item_num = 0; - enum ice_sw_tunnel_type tun_type = ICE_NON_TUN; + enum ice_sw_tunnel_type tun_type = + ICE_SW_TUN_AND_NON_TUN; struct ice_pattern_match_item *pattern_match_item = NULL; for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { -- 2.19.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth [not found] <20200403031320.26144-1-wei.zhao1@intel.com> 2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type Wei Zhao @ 2020-04-03 3:13 ` Wei Zhao 2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item Wei Zhao 2 siblings, 0 replies; 4+ messages in thread From: Wei Zhao @ 2020-04-03 3:13 UTC (permalink / raw) To: qi.z.zhang; +Cc: Wei Zhao, stable The action number can only be one for DCF or PF switch filter, not support multiple actions. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index d9bdf9637..cc48f22dd 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1073,6 +1073,46 @@ ice_switch_parse_action(struct ice_pf *pf, 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 ice_switch_parse_pattern_action(struct ice_adapter *ad, struct ice_pattern_match_item *array, @@ -1158,6 +1198,14 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, 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) ret = ice_switch_parse_dcf_action(actions, error, &rule_info); else -- 2.19.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item [not found] <20200403031320.26144-1-wei.zhao1@intel.com> 2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type Wei Zhao 2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth Wei Zhao @ 2020-04-03 3:13 ` Wei Zhao 2 siblings, 0 replies; 4+ messages in thread From: Wei Zhao @ 2020-04-03 3:13 UTC (permalink / raw) To: qi.z.zhang; +Cc: Wei Zhao, stable The input set for inner type of vlan item should be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER. This mac vlan filter is also part of DCF switch filter. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 81d069e99..686f9c3e3 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -911,7 +911,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vlan_spec->inner_type; list[t].m_u.vlan_hdr.type = vlan_mask->inner_type; - input_set |= ICE_INSET_VLAN_OUTER; + input_set |= ICE_INSET_ETHERTYPE; } t++; } -- 2.19.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20200403024353.24681-1-wei.zhao1@intel.com>]
[parent not found: <20200403044609.27512-1-wei.zhao1@intel.com>]
* [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type [not found] ` <20200403044609.27512-1-wei.zhao1@intel.com> @ 2020-04-03 4:46 ` Wei Zhao 0 siblings, 0 replies; 4+ messages in thread From: Wei Zhao @ 2020-04-03 4:46 UTC (permalink / raw) To: dev; +Cc: qi.z.zhang, nannan.lu, qi.fu, yuan.peng, stable, Wei Zhao The default tunnle type for swicth filter change to new defination of ICE_SW_TUN_AND_NON_TUN in order that the rule will be apply to more packet type. Cc: stable@dpdk.org Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao <wei.zhao1@intel.com> --- drivers/net/ice/ice_switch_filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index ed02d9805..d9bdf9637 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1091,7 +1091,8 @@ ice_switch_parse_pattern_action(struct ice_adapter *ad, uint16_t lkups_num = 0; const struct rte_flow_item *item = pattern; uint16_t item_num = 0; - enum ice_sw_tunnel_type tun_type = ICE_NON_TUN; + enum ice_sw_tunnel_type tun_type = + ICE_SW_TUN_AND_NON_TUN; struct ice_pattern_match_item *pattern_match_item = NULL; for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) { -- 2.19.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-03 5:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20200403031320.26144-1-wei.zhao1@intel.com>
2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type Wei Zhao
2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 06/13] net/ice: add action number check for swicth Wei Zhao
2020-04-03 3:13 ` [dpdk-stable] [PATCH v4 11/13] net/ice: fix input set of VLAN item Wei Zhao
[not found] <20200403024353.24681-1-wei.zhao1@intel.com>
[not found] ` <20200403044609.27512-1-wei.zhao1@intel.com>
2020-04-03 4:46 ` [dpdk-stable] [PATCH v4 05/13] net/ice: change default tunnle type Wei Zhao
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).